Changeset 7663

Timestamp:

09/12/2018 05:15:50 AM (6 years ago)

Author:

dd32

Message:

Slack: Update the Announce whitelists to consistently use WordPress.org usernames rather than non-unique deprecated slack user_names.

See #3799.

Location:

sites/trunk/common/includes/slack/announce

Files:

• config.php (modified) (18 diffs)
• lib.php (modified) (2 diffs)

sites/trunk/common/includes/slack/announce/config.php

@@ -8 +8 @@
 /**
  * Returns a whitelist of users by channel.
+ *
+ * As slack has deprecated the usage of user_names, please use WordPress.org user_logins here. Case Sensitive.
+ * See https://api.slack.com/changelog/2017-09-the-one-about-usernames
  *
  * The array keys are the channel name (omit #) and the
@@ -22 +25 @@
         'hlashbrooke',
         'iandunn',
-        'rocio',
-        'vedanshu',
+        '_DorsVenabili', // @rocio on Slack
+        'vedjain', // @vendanshu on Slack
     );
 
@@ -33 +36 @@
         ),
         'bbpress' => array(
-            'jjj',
+            'johnjamesjacoby', // @jjj on Slack
             'netweb',
         ),
         'buddypress' => array(
-            'boone',
-            'djpaul',
-            'jjj',
+            'boonebgorges', // @boone on Slack
+            'DJPaul',
+            'johnjamesjacoby', // @jjj on Slack
         ),
         'cli' => array(
@@ -52 +55 @@
             'danieltj',
             'desrosj',
-            'jeffpaul',
-            'jon_bossenger',
-            'joshuawold',
+            'JeffPaul',
+            'psykro', // @jon_bossenger on Slack
+            'JoshuaWold',
             'pbiron',
             'welcher',
-            'Whitney',
+            'whitneyyadrich', // @Whitney on Slack
         ) ),
         'core-bootstrap' => array_merge( get_committers(), array(
@@ -68 +71 @@
         'core-customize' => array_merge( get_committers(), array(
             'celloexpressions',
-            'jeffpaul',
+            'JeffPaul',
             'ocean90',
             'valendesigns',
@@ -75 +78 @@
         ) ),
         'core-docs' => array_merge( get_committers(), array(
-            'drew',
-            'kenshino',
+            'DrewAPicture', // @drew on Slack
+            'Kenshino',
             'omarreiss',
             'johnbillion',
@@ -85 +88 @@
             'gziolo',
             'iseulde',
-            'jeffpaul',
-            'karmatosed',
-            'matias',
+            'JeffPaul',
+            'karmatosed',
+            'matveb', // @matias on Slack
             'mcsf',
             'youknowriad',
@@ -95 +98 @@
         ) ),
         'core-test' => array_merge( get_committers(), array(
-            'boren',
+            'ryan', // @boren on Slack
         ) ),
         'core-https' => array_merge( get_committers(), array(
-            'eric',
+            'ericlewis', // @eric on Slack
             'tollmanz',
         ) ),
         'core-i18n' => array_merge( get_committers(), array(
             'ocean90',
-            'sergey',
+            'SergeyBiryukov', // @sergey on Slack
             'swissspidy',
         ) ),
@@ -116 +119 @@
             'joemcgill',
             'karmatosed',
-            'mike',
+            'mikeschroder', // @mike on Slack
             'ocean90',
         ) ),
@@ -137 +140 @@
             'casiepa',
             'desrosj',
-            'Heather Burns',
+            'idea15', // @Heather Burns on Slack
         ) ),
         'core-restapi' => array_merge( get_committers(), array(
@@ -158 +161 @@
             'boemedia',
             'hugobaeta',
-            'joshuawold',
+            'JoshuaWold',
             'karmatosed',
             'melchoyce',
@@ -164 +167 @@
         ),
         'design-dashicons' => array(
-            'empireoflight',
+            'EmpireOfLight',
         ),
         'docs' => array(
-            'drew',
+            'DrewAPicture', // @drew on Slack
             'hlashbrooke',
-            'kenshino',
+            'Kenshino',
             'lizkaraffa',
-            'zzap',
+            'milana_cap', // @zzap on Slack
         ),
         'feature-notifications' => array(
@@ -184 +187 @@
         ),
         'forums' => array(
-            'clorith',
-            'ipstenu',
-            'jan_dembowski',
+            'Clorith',
+            'Ipstenu',
+            'jdembowski', // @jan_dembowski on Slack
             'macmanx',
         ),
         'glotpress' => array(
             'ocean90',
-            'gregross',
+            'GregRoss',
         ),
         'hosting-community' => array(
-            'ataylorme',
-            'mike',
+            'andrew.taylor', // @ataylorme on Slack
+            'mikeschroder', // @mike on Slack
             'jadonn',
         ),
         'marketing' => array(
-            'sararosso',
-            'gidgey',
+            'rosso99', // @sararosso on Slack
+            'bridgetwillard', // @gidgey on Slack
         ),
         'meta' => array(
             'obenland',
-            'sergey',
+            'SergeyBiryukov', // @sergey on Slack
             'tellyworth',
         ),
         'meta-devhub' => array(
             'coffee2code',
-            'drew',
+            'DrewAPicture', // @drew on Slack
         ),
         'meta-i18n' => array(
@@ -217 +220 @@
         'polyglots' => array(
             'casiepa',
-            'coachbirgit',
+            'CoachBirgit',
             'deconf',
-            'nao',
+            'Nao',
             'ocean90',
             'petya',
-            'sergey',
+            'SergeyBiryukov', // @sergey on Slack
             'tobifjellner',
         ),
         'polyglots-events' => array(
             'casiepa',
-            'coachbirgit',
+            'CoachBirgit',
             'deconf',
-            'nao',
+            'Nao',
             'ocean90',
             'petya',
-            'sergey',
+            'SergeyBiryukov', // @sergey on Slack
             'tobifjellner',
         ),
@@ -245 +248 @@
         ),
         'tide' => array(
-            'jeffpaul',
+            'JeffPaul',
             'lukecarbis',
             'valendesigns',
@@ -254 +257 @@
             'liljimmi',
             'bethsoderberg',
-            'courtneyengle',
+            'courane01', // @courtneyengle on Slack
             'chanthaboune',
             'melindahelt',
@@ -261 +264 @@
         // NOTE: Private Groups need not be listed here. All members of Private Groups have access to /announce & /here
         'wcus' => array(
-            'alx',
+            'cronkled', // @alx on Slack
             'camikaos',
-            'randy_hicks',
-            'bishop',
-            'dustinmeza',
+            'vc27', // @randy_hicks on Slack
+            'andrealeebishop', // @bishop on Slack
+            'DustinMeza',
         ),
         'wcus-contributor-day' => array(
-            'alx',
+            'cronkled', // @alx on Slack
             'camikaos',
-            'drew',
+            'DrewAPicture', // @drew on Slack
         ),
         'wptv' => array(
-            'jerrysarcastic',
-            'roseapplemedia',
+            'JerrySarcastic',
+            'RoseAppleMedia',
         ),
     );
@@ -281 +284 @@
 function get_committers() {
     return array(
-        'dd32', 'nacin', 'mark', 'helen', 'azaozz', 'westi',
-        'nb', 'sergey', 'ocean90', 'wonderboymusic', 'drew', 'johnbillion',
-        'jorbin', 'boone', 'jeremyfelt', 'pento', 'obenland', 'iseulde',
+        'dd32', 'nacin', 'helen', 'azaozz', 'westi',
+        'ocean90', 'wonderboymusic', 'johnbillion',
+        'jorbin', 'jeremyfelt', 'pento', 'obenland', 'iseulde',
         'westonruter', 'afercia', 'karmatosed', 'rmccue', 'michaelarestad',
-        'swissspidy', 'rachelbaker', 'joehoyle', 'melchoyce', 'eric', 'mike',
+        'swissspidy', 'rachelbaker', 'joehoyle', 'melchoyce',
         'peterwilsoncc', 'joemcgill', 'davidakennedy', 'adamsilverstein',
-        'jnylen', 'flixos90', 'iandunn', 'kadamwhite', 'matias',
+        'flixos90', 'iandunn', 'kadamwhite',
+
+        'markjaquith',    // @mark on Slack
+        'nbachiyski',     // @nb on Slack
+        'SergeyBiryukov', // @sergey on Slack
+        'DrewAPicture',   // @drew on Slack
+        'boonebgorges',   // @boone on Slack
+        'ericlewis',      // @eric on Slack
+        'mikeschroder',   // @mike on Slack
+        'jnylen0',        // @jnylen on Slack
+        'matveb',         // @matias on Slack
     );
 }
+
+// This is not all deputies; it's only the ones who want to receive `/deputies` pings
+function get_pingable_worcamp_deputies() {
+    return array(
+        '00Sleepy', '_DorsVenabili', 'adityakane', 'andreamiddleton', 'bph', 'brandondove', 'camikaos',
+        'chanthaboune', 'courtneypk', 'drebbits', 'francina', 'gounder', 'heysherie', 'hlashbrooke',
+        'karenalma', 'kcristiano', 'kdrewien', 'Kenshino', 'mayukojpn', 'mikelking', 'miss_jwo',
+        'remediosgraphic', 'Savione', 'vc27', 'yaycheryl',
+
+        'coreymckrill', 'iandunn', // todo remove after testing
+    );
+}

sites/trunk/common/includes/slack/announce/lib.php

@@ -85 +85 @@
 
     if ( $data['command'] === '/committers' ) {
+        // This command seems to not be used actively, in preference for the slack @committers group pings.
         $committers = get_committers();
         if ( ! in_array( $user, $committers, true ) ) {
@@ -90 +91 @@
         }
 
+        // TODO: Note that pinging users by `@username` is deprecated, and we now have WordPress.org usernames in the above list.
+        // This should be upadted to ping users by the `<@U.....>` format.
+
         $text = sprintf( "*@committers:* %s\n_(cc: %s)_", $data['text'], '@' . implode( ', @', $committers ) );
     } elseif ( $data['command'] === '/deputies' ) {
-        // This is not all deputies; it's only the ones who want to receive `/deputies` pings
-        $pingable_deputies = array(
-            '00sleepy', '_dorsvenabili', 'adityakane', 'andreamiddleton', 'bph', 'brandondove', 'camikaos',
-            'chanthaboune', 'courtneypk', 'drebbits', 'francina', 'gounder', 'heysherie', 'hlashbrooke',
-            'karenalma', 'kcristiano', 'kdrewien', 'kenshino', 'mayukojpn', 'mikelking', 'miss_jwo',
-            'remediosgraphic', 'savione', 'vc27', 'yaycheryl',
-        );
-        $pingable_deputies = array( 'coreymckrill', 'iandunn' ); // todo remove after testing
+        $pingable_deputies = get_pingable_worcamp_deputies();
 
         if ( ! in_array( $user, $pingable_deputies, true ) ) {
             return;
         }
+
+        // TODO: Note that pinging users by `@username` is deprecated, and we have WordPress.org usernames in the above list.
+        // This should be upadted to ping users by the `<@U.....>` format.
 
         $text = sprintf( "*/deputies:* %s\n_(CC: %s)_", $data['text'], '@' . implode( ', @', $pingable_deputies ) );