Changeset 14848

Timestamp:

04/28/2026 06:50:25 AM (4 months ago)

Author:

dd32

Message:

Slack: Subgroups: alphabetize list, allow #foo-planning root, fix dialog labels.

File:

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

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

@@ -969 +969 @@
 
 /*
- * Channels ending in -team are private workspaces for a (often public) base
- * channel — `#wcus-team` for `#wcus`. Subgroups should follow the base
- * channel's name (`wcus-foo`), not the team's (`wcus-team-foo`), so users in
- * the public base channel discover them naturally. Notifications still go to
- * the channel where /subgroup was invoked.
+ * Channels ending in -team or -planning are private workspaces for a (often
+ * public) base channel — `#wcus-team` or `#wcus-planning` for `#wcus`.
+ * Subgroups should follow the base channel's name (`wcus-foo`), not the
+ * workspace's (`wcus-team-foo`), so users in the public base channel discover
+ * them naturally. Notifications still go to the channel where /subgroup was
+ * invoked.
  */
 function derive_prefix_name( $channel_name ) {
-        if ( substr( $channel_name, -5 ) === '-team' ) {
-                return substr( $channel_name, 0, -5 );
+        foreach ( [ '-team', '-planning' ] as $suffix ) {
+                if ( str_ends_with( $channel_name, $suffix ) ) {
+                        return substr( $channel_name, 0, -strlen( $suffix ) );
+                }
         }
         return $channel_name;
@@ -990 +993 @@
                 }
         }
+        usort( $out, function ( $a, $b ) {
+                return strcmp( $a['name'], $b['name'] );
+        } );
         return $out;
 }
@@ -1139 +1145 @@
                                                 'confirm'   => [
                                                         'title'   => [ 'type' => 'plain_text', 'text' => 'Rotate channel?' ],
-                                                        'text'    => [ 'type' => 'mrkdwn', 'text' => "Archive <#{$g['id']}> with a year suffix and create a fresh `{$g['name']}` with only you as a member." ],
+                                                        'text'    => [ 'type' => 'mrkdwn', 'text' => "Archive `{$g['name']}` with a year suffix and create a fresh copy with only you as a member." ],
                                                         'confirm' => [ 'type' => 'plain_text', 'text' => 'Rotate' ],
                                                         'deny'    => [ 'type' => 'plain_text', 'text' => 'Cancel' ],
@@ -1152 +1158 @@
                                                 'confirm'   => [
                                                         'title'   => [ 'type' => 'plain_text', 'text' => 'Archive channel?' ],
-                                                        'text'    => [ 'type' => 'mrkdwn', 'text' => "Archive <#{$g['id']}>?" ],
+                                                        'text'    => [ 'type' => 'mrkdwn', 'text' => "Archive `{$g['name']}`?" ],
                                                         'confirm' => [ 'type' => 'plain_text', 'text' => 'Archive' ],
                                                         'deny'    => [ 'type' => 'plain_text', 'text' => 'Cancel' ],
@@ -1246 +1252 @@
                                 'text' => [
                                         'type' => 'mrkdwn',
-                                        'text' => sprintf( 'Renaming <#%s>.', $channel_id ),
+                                        'text' => sprintf( 'Renaming `%s`.', $current_name ),
                                 ],
                         ],