<!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>[10824] sites/trunk/api.wordpress.org/public_html/dotorg/slack/subgroup.php: Slack: Update the /subgroup command, take two.</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/10824">10824</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/10824","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>2021-03-17 01:34:10 +0000 (Wed, 17 Mar 2021)</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: Update the /subgroup command, take two.
This fixes a few errors in the initial change to upgrade to the new `conversations.*` api endpoints.
See <a href="http://meta.trac.wordpress.org/changeset/10823">r10823</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorgslacksubgroupphp">sites/trunk/api.wordpress.org/public_html/dotorg/slack/subgroup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmldotorgslacksubgroupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/dotorg/slack/subgroup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/dotorg/slack/subgroup.php 2021-03-17 00:52:21 UTC (rev 10823)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/slack/subgroup.php 2021-03-17 01:34:10 UTC (rev 10824)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace Dotorg\Slack\Subgroup;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use const Dotorg\Slack\WORDPRESSORG_USER_ID as WORDPRESSORG_SLACK_USER_ID;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require dirname( dirname( __DIR__ ) ) . '/includes/slack-config.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,15 +22,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Confirm it came from Slack.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_POST['token'] !== WEBHOOK_TOKEN ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- die;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ die( "Invalid Token" );
</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"> $current_group_id = $_POST['channel_id'];
</span><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 didn't come from a group, die.
-if ( $current_group_id[0] !== 'G' ) {
- die;
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Note: We no longer check to see if the calling channel is a group, as the below list command will limit it to private channels.
+// Groups can begin with `G` (old created groups) or `C` (private channel), public channels also begin with `C` so the below check is safer.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get a list of all groups @wordpressdotorg is in.
</span><span class="cx" style="display: block; padding: 0 10px"> $groups = api_call(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,10 +39,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'types' => 'private_channel',
</span><span class="cx" style="display: block; padding: 0 10px"> 'limit' => 999,
</span><span class="cx" style="display: block; padding: 0 10px"> ]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+)['channels'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Find the group that we are in right now.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-foreach ( $groups['channels'] as $group ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+foreach ( $groups as $group ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $group['id'] === $current_group_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $found = true;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,8 +59,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> die( sprintf( 'Call this from the main `%s` group.', substr( $group['name'], 0, $pos ) ) );
</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 current groups members.
+$members = api_call(
+ // https://api.slack.com/methods/conversations.members
+ 'conversations.members',
+ [
+ 'channel' => $group['id'],
+ 'limit' => 999,
+ ]
+)['members'];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Ensure the calling user is in the main group.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! in_array( $_POST['user_id'], $group['members'], true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! in_array( $_POST['user_id'], $members, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> die;
</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">@@ -78,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $new_group = api_call(
</span><span class="cx" style="display: block; padding: 0 10px"> 'conversations.create',
</span><span class="cx" style="display: block; padding: 0 10px"> [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => $subcommand,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => $subcommand,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'is_private' => true,
</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">@@ -94,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'channel' => $group['id'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'text' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Group %s created by <@%s>.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_group['group']['name'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_group['channel']['name'],
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['user_id']
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'as_user' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,24 +111,13 @@
</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"> // Invite all current parent channel members to the new channel.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $members = api_call(
- // https://api.slack.com/methods/conversations.members
- 'conversations.members',
- [
- 'channel' => 'CMYKV0D7B',
- 'limit' => 999,
- ]
- );
- if ( empty( $members['members'] ) ) {
- die( sprintf( "Group %s created, but could not invite members.", $new_group['group']['name'] ) );
- }
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Note: Cannot invite self.
</ins><span class="cx" style="display: block; padding: 0 10px"> api_call(
</span><span class="cx" style="display: block; padding: 0 10px"> // https://api.slack.com/methods/conversations.invite
</span><span class="cx" style="display: block; padding: 0 10px"> 'conversations.invite',
</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' => $new_group['group']['id'],
- 'users' => implode( ',', $members['members'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'channel' => $new_group['channel']['id'],
+ 'users' => implode( ',', array_diff( $members, [ WORDPRESSORG_SLACK_USER_ID ] ) ),
</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">@@ -151,7 +149,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_group = $group;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $groups as $group ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $group['name'], $parent_group['name'] . '-' ) === 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $_POST['user_id'], $group['members'], true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $group_members = api_call(
+ // https://api.slack.com/methods/conversations.members
+ 'conversations.members',
+ [
+ 'channel' => $group['id'],
+ 'limit' => 999,
+ ]
+ );
+
+ if ( ! in_array( $_POST['user_id'], $group_members['members'], true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $groups_to_add[] = $group['name'];
</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>