<!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>[7663] sites/trunk/common/includes/slack/announce: Slack: Update the Announce whitelists to consistently use WordPress.org usernames rather than non-unique deprecated slack user_names.</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/7663">7663</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/7663","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>2018-09-12 05:15:50 +0000 (Wed, 12 Sep 2018)</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 Announce whitelists to consistently use WordPress.org usernames rather than non-unique deprecated slack user_names.
See <a href="http://meta.trac.wordpress.org/ticket/3799">#3799</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkcommonincludesslackannounceconfigphp">sites/trunk/common/includes/slack/announce/config.php</a></li>
<li><a href="#sitestrunkcommonincludesslackannouncelibphp">sites/trunk/common/includes/slack/announce/lib.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkcommonincludesslackannounceconfigphp"></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/config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/common/includes/slack/announce/config.php 2018-09-12 03:25:57 UTC (rev 7662)
+++ sites/trunk/common/includes/slack/announce/config.php 2018-09-12 05:15:50 UTC (rev 7663)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,6 +8,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns a whitelist of users by channel.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * As slack has deprecated the usage of user_names, please use WordPress.org user_logins here. Case Sensitive.
+ * See https://api.slack.com/changelog/2017-09-the-one-about-usernames
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * The array keys are the channel name (omit #) and the
</span><span class="cx" style="display: block; padding: 0 10px"> * values are an array of users.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,8 +24,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'courtneypk',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hlashbrooke',
</span><span class="cx" style="display: block; padding: 0 10px"> 'iandunn',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'rocio',
- 'vedanshu',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '_DorsVenabili', // @rocio on Slack
+ 'vedjain', // @vendanshu on Slack
</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"> return array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,13 +35,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'rianrietveld',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'bbpress' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'jjj',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'johnjamesjacoby', // @jjj on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'netweb',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'buddypress' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'boone',
- 'djpaul',
- 'jjj',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'boonebgorges', // @boone on Slack
+ 'DJPaul',
+ 'johnjamesjacoby', // @jjj on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'cli' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'danielbachhuber',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,12 +54,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'audrasjb',
</span><span class="cx" style="display: block; padding: 0 10px"> 'danieltj',
</span><span class="cx" style="display: block; padding: 0 10px"> 'desrosj',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'jeffpaul',
- 'jon_bossenger',
- 'joshuawold',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'JeffPaul',
+ 'psykro', // @jon_bossenger on Slack
+ 'JoshuaWold',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'pbiron',
</span><span class="cx" style="display: block; padding: 0 10px"> 'welcher',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Whitney',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'whitneyyadrich', // @Whitney on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'core-bootstrap' => array_merge( get_committers(), array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'schlessera',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'core-committers' => get_committers(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'core-customize' => array_merge( get_committers(), array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'celloexpressions',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'jeffpaul',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'JeffPaul',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ocean90',
</span><span class="cx" style="display: block; padding: 0 10px"> 'valendesigns',
</span><span class="cx" style="display: block; padding: 0 10px"> 'voldemortensen',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,8 +77,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'westonruter',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'core-docs' => array_merge( get_committers(), array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'drew',
- 'kenshino',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'DrewAPicture', // @drew on Slack
+ 'Kenshino',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'omarreiss',
</span><span class="cx" style="display: block; padding: 0 10px"> 'johnbillion',
</span><span class="cx" style="display: block; padding: 0 10px"> 'atimmer',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,9 +87,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'azaozz',
</span><span class="cx" style="display: block; padding: 0 10px"> 'gziolo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'iseulde',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'jeffpaul',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'JeffPaul',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'karmatosed',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'matias',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'matveb', // @matias on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mcsf',
</span><span class="cx" style="display: block; padding: 0 10px"> 'youknowriad',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,15 +97,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'sc0ttkclark',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'core-test' => array_merge( get_committers(), array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'boren',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ryan', // @boren on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'core-https' => array_merge( get_committers(), array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'eric',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ericlewis', // @eric on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'tollmanz',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'core-i18n' => array_merge( get_committers(), array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ocean90',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sergey',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'SergeyBiryukov', // @sergey on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'swissspidy',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'core-js' => array_merge( get_committers(), array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'desrosj',
</span><span class="cx" style="display: block; padding: 0 10px"> 'joemcgill',
</span><span class="cx" style="display: block; padding: 0 10px"> 'karmatosed',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mike',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mikeschroder', // @mike on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ocean90',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'core-multisite' => array_merge( get_committers(), array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'azaozz',
</span><span class="cx" style="display: block; padding: 0 10px"> 'casiepa',
</span><span class="cx" style="display: block; padding: 0 10px"> 'desrosj',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Heather Burns',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'idea15', // @Heather Burns on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'core-restapi' => array_merge( get_committers(), array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'danielbachhuber',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,20 +160,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'design' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'boemedia',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hugobaeta',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'joshuawold',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'JoshuaWold',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'karmatosed',
</span><span class="cx" style="display: block; padding: 0 10px"> 'melchoyce',
</span><span class="cx" style="display: block; padding: 0 10px"> 'mizejewski',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'design-dashicons' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'empireoflight',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'EmpireOfLight',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'docs' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'drew',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'DrewAPicture', // @drew on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hlashbrooke',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'kenshino',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Kenshino',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'lizkaraffa',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'zzap',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'milana_cap', // @zzap on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'feature-notifications' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'johnbillion',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,32 +186,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'swissspidy',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'forums' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'clorith',
- 'ipstenu',
- 'jan_dembowski',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Clorith',
+ 'Ipstenu',
+ 'jdembowski', // @jan_dembowski on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'macmanx',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'glotpress' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ocean90',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'gregross',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'GregRoss',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'hosting-community' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ataylorme',
- 'mike',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'andrew.taylor', // @ataylorme on Slack
+ 'mikeschroder', // @mike on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'jadonn',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'marketing' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sararosso',
- 'gidgey',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'rosso99', // @sararosso on Slack
+ 'bridgetwillard', // @gidgey on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'obenland',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sergey',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'SergeyBiryukov', // @sergey on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'tellyworth',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta-devhub' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'coffee2code',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'drew',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'DrewAPicture', // @drew on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta-i18n' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ocean90',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,22 +219,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta-wordcamp' => $wordcamp_central,
</span><span class="cx" style="display: block; padding: 0 10px"> 'polyglots' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'casiepa',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'coachbirgit',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'CoachBirgit',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'deconf',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'nao',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Nao',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ocean90',
</span><span class="cx" style="display: block; padding: 0 10px"> 'petya',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sergey',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'SergeyBiryukov', // @sergey on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'tobifjellner',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'polyglots-events' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'casiepa',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'coachbirgit',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'CoachBirgit',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'deconf',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'nao',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Nao',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'ocean90',
</span><span class="cx" style="display: block; padding: 0 10px"> 'petya',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sergey',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'SergeyBiryukov', // @sergey on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'tobifjellner',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'themereview' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'karmatosed',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'tide' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'jeffpaul',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'JeffPaul',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'lukecarbis',
</span><span class="cx" style="display: block; padding: 0 10px"> 'valendesigns',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'donkiely',
</span><span class="cx" style="display: block; padding: 0 10px"> 'liljimmi',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bethsoderberg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'courtneyengle',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'courane01', // @courtneyengle on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'chanthaboune',
</span><span class="cx" style="display: block; padding: 0 10px"> 'melindahelt',
</span><span class="cx" style="display: block; padding: 0 10px"> 'juliekuehl',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,20 +263,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> // NOTE: Private Groups need not be listed here. All members of Private Groups have access to /announce & /here
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcus' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'alx',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'cronkled', // @alx on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'camikaos',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'randy_hicks',
- 'bishop',
- 'dustinmeza',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'vc27', // @randy_hicks on Slack
+ 'andrealeebishop', // @bishop on Slack
+ 'DustinMeza',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcus-contributor-day' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'alx',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'cronkled', // @alx on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> 'camikaos',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'drew',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'DrewAPicture', // @drew on Slack
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wptv' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'jerrysarcastic',
- 'roseapplemedia',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'JerrySarcastic',
+ 'RoseAppleMedia',
</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">@@ -280,12 +283,34 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function get_committers() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'dd32', 'nacin', 'mark', 'helen', 'azaozz', 'westi',
- 'nb', 'sergey', 'ocean90', 'wonderboymusic', 'drew', 'johnbillion',
- 'jorbin', 'boone', 'jeremyfelt', 'pento', 'obenland', 'iseulde',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'dd32', 'nacin', 'helen', 'azaozz', 'westi',
+ 'ocean90', 'wonderboymusic', 'johnbillion',
+ 'jorbin', 'jeremyfelt', 'pento', 'obenland', 'iseulde',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'westonruter', 'afercia', 'karmatosed', 'rmccue', 'michaelarestad',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'swissspidy', 'rachelbaker', 'joehoyle', 'melchoyce', 'eric', 'mike',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'swissspidy', 'rachelbaker', 'joehoyle', 'melchoyce',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'peterwilsoncc', 'joemcgill', 'davidakennedy', 'adamsilverstein',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'jnylen', 'flixos90', 'iandunn', 'kadamwhite', 'matias',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'flixos90', 'iandunn', 'kadamwhite',
+
+ 'markjaquith', // @mark on Slack
+ 'nbachiyski', // @nb on Slack
+ 'SergeyBiryukov', // @sergey on Slack
+ 'DrewAPicture', // @drew on Slack
+ 'boonebgorges', // @boone on Slack
+ 'ericlewis', // @eric on Slack
+ 'mikeschroder', // @mike on Slack
+ 'jnylen0', // @jnylen on Slack
+ 'matveb', // @matias on Slack
</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">+
+// This is not all deputies; it's only the ones who want to receive `/deputies` pings
+function get_pingable_worcamp_deputies() {
+ return array(
+ '00Sleepy', '_DorsVenabili', 'adityakane', 'andreamiddleton', 'bph', 'brandondove', 'camikaos',
+ 'chanthaboune', 'courtneypk', 'drebbits', 'francina', 'gounder', 'heysherie', 'hlashbrooke',
+ 'karenalma', 'kcristiano', 'kdrewien', 'Kenshino', 'mayukojpn', 'mikelking', 'miss_jwo',
+ 'remediosgraphic', 'Savione', 'vc27', 'yaycheryl',
+
+ 'coreymckrill', 'iandunn', // todo remove after testing
+ );
+}
</ins></span></pre></div>
<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 2018-09-12 03:25:57 UTC (rev 7662)
+++ sites/trunk/common/includes/slack/announce/lib.php 2018-09-12 05:15:50 UTC (rev 7663)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,26 +84,26 @@
</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"> if ( $data['command'] === '/committers' ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This command seems to not be used actively, in preference for the slack @committers group pings.
</ins><span class="cx" style="display: block; padding: 0 10px"> $committers = get_committers();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $user, $committers, true ) ) {
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // TODO: Note that pinging users by `@username` is deprecated, and we now have WordPress.org usernames in the above list.
+ // This should be upadted to ping users by the `<@U.....>` format.
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( "*@committers:* %s\n_(cc: %s)_", $data['text'], '@' . implode( ', @', $committers ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $data['command'] === '/deputies' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This is not all deputies; it's only the ones who want to receive `/deputies` pings
- $pingable_deputies = array(
- '00sleepy', '_dorsvenabili', 'adityakane', 'andreamiddleton', 'bph', 'brandondove', 'camikaos',
- 'chanthaboune', 'courtneypk', 'drebbits', 'francina', 'gounder', 'heysherie', 'hlashbrooke',
- 'karenalma', 'kcristiano', 'kdrewien', 'kenshino', 'mayukojpn', 'mikelking', 'miss_jwo',
- 'remediosgraphic', 'savione', 'vc27', 'yaycheryl',
- );
- $pingable_deputies = array( 'coreymckrill', 'iandunn' ); // todo remove after testing
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pingable_deputies = get_pingable_worcamp_deputies();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $user, $pingable_deputies, true ) ) {
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // TODO: Note that pinging users by `@username` is deprecated, and we have WordPress.org usernames in the above list.
+ // This should be upadted to ping users by the `<@U.....>` format.
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( "*/deputies:* %s\n_(CC: %s)_", $data['text'], '@' . implode( ', @', $pingable_deputies ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_user_whitelisted( $user, $channel ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>