Changeset 10824

Timestamp:

03/17/2021 01:34:10 AM (4 years ago)

Author:

dd32

Message:

Slack: Update the /subgroup command, take two.

This fixes a few errors in the initial change to upgrade to the new conversations.* api endpoints.

See r10823

File:

• sites/trunk/api.wordpress.org/public_html/dotorg/slack/subgroup.php (modified) (8 diffs)

sites/trunk/api.wordpress.org/public_html/dotorg/slack/subgroup.php

@@ -2 +2 @@
 
 namespace Dotorg\Slack\Subgroup;
+use const Dotorg\Slack\WORDPRESSORG_USER_ID as WORDPRESSORG_SLACK_USER_ID;
 
 require dirname( dirname( __DIR__ ) ) . '/includes/slack-config.php';
@@ -22 +23 @@
 // Confirm it came from Slack.
 if ( $_POST['token'] !== WEBHOOK_TOKEN ) {
-    die;
+    die( "Invalid Token" );
 }
 
 $current_group_id = $_POST['channel_id'];
 
-// If it didn't come from a group, die.
-if ( $current_group_id[0] !== 'G' ) {
-    die;
-}
+// Note: We no longer check to see if the calling channel is a group, as the below list command will limit it to private channels.
+// Groups can begin with `G` (old created groups) or `C` (private channel), public channels also begin with `C` so the below check is safer.
 
 // Get a list of all groups @wordpressdotorg is in.
@@ -41 +40 @@
         'limit'            => 999,
     ]
-);
+)['channels'];
 
 // Find the group that we are in right now.
-foreach ( $groups['channels'] as $group ) {
+foreach ( $groups as $group ) {
     if ( $group['id'] === $current_group_id ) {
         $found = true;
@@ -61 +60 @@
 }
 
+// Get the current groups members.
+$members = api_call(
+    // https://api.slack.com/methods/conversations.members
+    'conversations.members',
+    [
+        'channel' => $group['id'],
+        'limit'   => 999,
+    ]
+)['members'];
+
 // Ensure the calling user is in the main group.
-if ( ! in_array( $_POST['user_id'], $group['members'], true ) ) {
+if ( ! in_array( $_POST['user_id'], $members, true ) ) {
     die;
 }
@@ -79 +88 @@
             'conversations.create',
             [
-                'name' => $subcommand,
+                'name'       => $subcommand,
                 'is_private' => true,
             ]
@@ -95 +104 @@
                 'text'    => sprintf(
                     'Group %s created by <@%s>.',
-                    $new_group['group']['name'],
+                    $new_group['channel']['name'],
                     $_POST['user_id']
                 ),
@@ -103 +112 @@
 
         // Invite all current parent channel members to the new channel.
-        $members = api_call(
-            // https://api.slack.com/methods/conversations.members
-            'conversations.members',
-            [
-                'channel' => 'CMYKV0D7B',
-                'limit'            => 999,
-            ]
-        );
-        if ( empty( $members['members'] ) ) {
-            die( sprintf( "Group %s created, but could not invite members.", $new_group['group']['name'] ) );
-        }
-
+        // Note: Cannot invite self.
         api_call(
             // https://api.slack.com/methods/conversations.invite
             'conversations.invite',
             [
-                'channel' => $new_group['group']['id'],
-                'users'   => implode( ',', $members['members'] ),
+                'channel' => $new_group['channel']['id'],
+                'users'   => implode( ',', array_diff( $members, [ WORDPRESSORG_SLACK_USER_ID ] ) ),
             ]
         );
@@ -152 +150 @@
         foreach ( $groups as $group ) {
             if ( strpos( $group['name'], $parent_group['name'] . '-' ) === 0 ) {
-                if ( ! in_array( $_POST['user_id'], $group['members'], true ) ) {
+
+                $group_members = api_call(
+                    // https://api.slack.com/methods/conversations.members
+                    'conversations.members',
+                    [
+                        'channel' => $group['id'],
+                        'limit'   => 999,
+                    ]
+                );
+
+                if ( ! in_array( $_POST['user_id'], $group_members['members'], true ) ) {
                     $groups_to_add[] = $group['name'];
                 }