<!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>[12709] sites/trunk/common/includes/slack/announce/lib.php: Slack: Send any `/here` broadcasts for #meta-learn to #meta and #training.</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/12709">12709</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/12709","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>2023-07-04 01:31:57 +0000 (Tue, 04 Jul 2023)</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: Send any `/here` broadcasts for #meta-learn to #meta and #training.
See https://wordpress.slack.com/archives/C02QB8GMM/p1688366423625449</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 2023-07-03 20:06:02 UTC (rev 12708)
+++ sites/trunk/common/includes/slack/announce/lib.php 2023-07-04 01:31:57 UTC (rev 12709)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,24 +31,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $channel_info['channel'] ?? false;
</span><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">+/**
+ * Get the list of whitelisted users for a channel.
+ * Includes parent channel whitelisted users.
+ *
+ * @param string $channel The channel to get the whitelist for.
+ * @return array
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function get_whitelist_for_channel( $channel ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $whitelist = get_whitelist();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $whitelist = get_whitelist();
+ $users = $whitelist[ $channel ] ?? [];
+ $parent_channels = get_parent_channels( $channel );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = [];
-
- if ( ! empty( $whitelist[ $channel ] ) ) {
- $users = $whitelist[ $channel ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $parent_channels as $parent ) {
+ $users = array_merge( $users, $whitelist[ $parent ] ?? [] );
</ins><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">- $parent_channel = get_parent_channel( $channel );
- if ( $parent_channel && ! empty( $whitelist[ $parent_channel ] ) ) {
- $users = array_merge( $users, $whitelist[ $parent_channel ] );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Some users are listed twice, due to array_merge() in config & parent channel above.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = array_unique( $users );
-
- return $users;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array_unique( $users );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</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">@@ -116,39 +116,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> printf( "Your linked WordPress.org account that needs to be granted access is '%s'.", $user );
</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">-function get_parent_channel( $channel ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Return the parent channels for a channel.
+ *
+ * @param string $channel The channel to get the parent channel for. eg. 'foobar-example'
+ * @return array|false The parent channels, or false if there is no parent channel.
+ */
+function get_parent_channels( $channel ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Private groups are not actually channels.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'privategroup' === $channel ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- list( $parent_channel, ) = explode( '-', $channel, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ list( $root, ) = explode( '-', $channel, 2 );
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch ( $parent_channel ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch ( $root ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'accessibility':
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_channel = 'core';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $root = 'core';
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'community':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_channel = 'community-team';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $root = 'community-team';
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No parent channel!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $parent_channel === $channel ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $root === $channel ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- // 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( $parent_channel ) ) {
- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 ) ) {
+ return false;
+ }
+
+ $parent_channels = array( $root );
</ins><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">- return $parent_channel;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $parent_channels;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function run( $data ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,10 +270,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $send->send( $channel_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Broadcast this message as a non-@here to the "parent" channel too.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_channel = get_parent_channel( $channel );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_channels = get_parent_channels( $channel );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Validate the parent channel exists.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $parent_channel ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $parent_channels ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">@@ -267,7 +284,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text = mb_substr( $text, 0, 100 ) . '...';
</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">- $send->set_text( 'In #' . $channel . ': ' . $text );
- $send->send( '#' . $parent_channel );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $parent_channels as $parent_channel ) {
+ $send->set_text( 'In #' . $channel . ': ' . $text );
+ $send->send( '#' . $parent_channel );
+ }
</ins><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>