Changeset 13748 for sites/trunk/common/includes/slack/announce/lib.php

Timestamp:

05/23/2024 01:06:52 AM (2 years ago)

Author:

dd32

Message:

Slack: Announce: Fix the parent channels for #accessibility.

Previously sub-channels of accessibility couldn't inherit permissions from #accessibility due to it's only parent being #core.
This resolves that to mark both #core and #accessibility to be parents of #accessibility-$NAME.

See ​https://wordpress.slack.com/archives/C02QB8GMM/p1716398834795689?thread_ts=1716235708.408869&cid=C02QB8GMM.

File:

• sites/trunk/common/includes/slack/announce/lib.php (modified) (3 diffs)

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

@@ -45 +45 @@
 
         foreach ( (array) $parent_channels as $parent ) {
+                // Avoid any circular references.
+                if ( ! $parent || $parent === $channel ) {
+                        continue;
+                }
+
                 $users = array_merge( $users, $whitelist[ $parent ] ?? [] );
         }
@@ -133 +138 @@
         // Some channels parents are not a 1:1 match.
         switch ( $root ) {
-                case 'accessibility':
                 case 'design':
                 case 'feature':
                 case 'performance':
                 case 'tide':
+                case 'core':
                         $root = 'core';
                         break;
@@ -153 +158 @@
         }
 
-        // No parent channel!
-        if ( $root === $channel ) {
-                return false;
-        }
-
         $parent_channels = [];
 
         // For when a channel has multiple parents.
-        switch ( $channel ) {
-                case 'meta-learn':
-                        $parent_channels[] = 'training';
-                        // Intentional Fallthrough.
-                default:
-                        // Is it an actual channel? Assume that there'll always be at least one whitelisted user for the parent channel.
-                        if ( get_whitelist_for_channel( $root ) ) {
-                                $parent_channels[] = $root;
-                        }
+
+        // Accessibility is a sub-team of Core, but is a parent channel itself.
+        if ( 'accessibility' === $root ) {
+                $parent_channels[] = 'core';
+        }
+
+        // Learn is a sub-team of Training, plus of #meta.
+        if ( 'meta-learn' === $channel ) {
+                $parent_channels[] = 'training';
+        }
+
+        // Is it an actual channel? Assume that there'll always be at least one whitelisted user for the parent channel.
+        if (
+                $root !== $channel &&
+                get_whitelist_for_channel( $root )
+        ) {
+                $parent_channels[] = $root;
         }