<!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>[11878] sites/trunk/common/includes/slack/announce/lib.php: Slack: Announce: Properly handle private channels.</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/11878">11878</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/11878","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>2022-05-25 03:05:50 +0000 (Wed, 25 May 2022)</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: Properly handle private channels.
Older slack private channels send their channel_name as 'privategroup', but newer slack channels send their actual name.
To resolve this, we'll check the Slack API to verify the channels metadata.
The `/here` handler was getting caught on this fine detail, and treating some (but not all!) private groups as public channels.
This is what caused a private channel to broadcast to a public channel, and an incorrect fix was tried via <a href="http://meta.trac.wordpress.org/changeset/11875">r11875</a>.
Reverts <a href="http://meta.trac.wordpress.org/changeset/11875">[11875]</a>.</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 2022-05-25 02:12:42 UTC (rev 11877)
+++ sites/trunk/common/includes/slack/announce/lib.php 2022-05-25 03:05:50 UTC (rev 11878)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,6 +5,32 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once __DIR__ . '/config.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function api_call( $method, $content = array() ) {
+ $content['token'] = SLACK_TOKEN;
+ $content = http_build_query( $content );
+ $context = stream_context_create( array(
+ 'http' => array(
+ 'method' => 'POST',
+ 'header' => 'Content-Type: application/x-www-form-urlencoded' . PHP_EOL,
+ 'content' => $content,
+ ),
+ ) );
+
+ $response = file_get_contents( 'https://slack.com/api/' . $method, false, $context );
+ return json_decode( $response, true );
+}
+
+function get_channel_info( $channel_id ) {
+ $channel_info = api_call(
+ 'conversations.info',
+ array(
+ 'channel' => $channel_id,
+ )
+ );
+
+ return $channel_info['channel'] ?? false;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function get_whitelist_for_channel( $channel ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $whitelist = get_whitelist();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,10 +154,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function run( $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $channel = $data['channel_name'];
- $user = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* Respond with a 200 ASAP.
+ * The inline API calls might delay this more than 3s, which will cause Slack to error (or retry).
+ * We don't need to respond with the body until later, but the 200 header must make it back within 3s.
+ */
+ http_response_code( 200 );
+ ignore_user_abort( true );
+ flush();
+
+ $channel = $data['channel_name'];
+ $channel_id = $data['channel_id'];
+ $user = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> $slack_profiledata = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $channel_info = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Slack sends the channel_name as 'privategroup' for old private channels, but the actual private channel name for newer private channels.
+ if ( 'privategroup' !== $channel ) {
+ $channel_info = get_channel_info( $channel_id );
+
+ if (
+ $channel_info &&
+ ( channel_info['is_private'] || $channel_info['is_group'] || $channel_info['is_mpim'] )
+ ) {
+ $channel = 'privategroup';
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Find the user_login for the Slack user_id
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $data['user_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $db_row = $wpdb->get_row( $wpdb->prepare(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,13 +250,8 @@
</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"> // By sending the channel ID, we can post to private groups.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $send->send( $data['channel_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $send->send( $channel_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If it was broadcast in a private channel, don't try to broadcast to the public parent channel.
- if ( 'privategroup' === $channel ) {
- return;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Broadcast this message as a non-@here to the "parent" channel too.
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_channel = get_parent_channel( $channel );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,6 +269,5 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $send->set_text( 'In #' . $channel . ': ' . $text );
</span><span class="cx" style="display: block; padding: 0 10px"> $send->send( '#' . $parent_channel );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><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>