<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13748] sites/trunk/common/includes/slack/announce/lib.php: Slack: Announce: Fix the parent channels for #accessibility.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/13748">13748</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/13748","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-05-23 01:06:52 +0000 (Thu, 23 May 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkcommonincludesslackannouncelibphp">sites/trunk/common/includes/slack/announce/lib.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkcommonincludesslackannouncelibphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/common/includes/slack/announce/lib.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/common/includes/slack/announce/lib.php 2024-05-23 00:48:51 UTC (rev 13747)
+++ sites/trunk/common/includes/slack/announce/lib.php 2024-05-23 01:06:52 UTC (rev 13748)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,6 +44,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_channels = get_parent_channels( $channel );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $parent_channels as $parent ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Avoid any circular references.
+ if ( ! $parent || $parent === $channel ) {
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $users = array_merge( $users, $whitelist[ $parent ] ?? [] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,11 +137,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Some channels parents are not a 1:1 match.
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $root ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'accessibility':
</del><span class="cx" style="display: block; padding: 0 10px"> case 'design':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'feature':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'performance':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'tide':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'core':
</ins><span class="cx" style="display: block; padding: 0 10px"> $root = 'core';
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'mentorship': // Such as #mentorship-cohort-july-2023
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,25 +157,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $root = 'core';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // No parent channel!
- if ( $root === $channel ) {
- return false;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $parent_channels = [];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For when a channel has multiple parents.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Accessibility is a sub-team of Core, but is a parent channel itself.
+ if ( 'accessibility' === $root ) {
+ $parent_channels[] = 'core';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return array_unique( $parent_channels ) ?: false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>