<!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>[9221] sites/trunk/common/includes/slack/announce/lib.php: Slack: Allow the `/here` command to respect the users Slack avatar and display_name.</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/9221">9221</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/9221","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>2019-10-22 04:41:16 +0000 (Tue, 22 Oct 2019)</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: Allow the `/here` command to respect the users Slack avatar and display_name. Especially useful where real names are set in Slack and their WordPress.org username isn't obviously the same.
See <a href="http://meta.trac.wordpress.org/ticket/4747">#4747</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 2019-10-22 01:39:21 UTC (rev 9220)
+++ sites/trunk/common/includes/slack/announce/lib.php 2019-10-22 04:41:16 UTC (rev 9221)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,17 +62,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $channel = $data['channel_name'];
</span><span class="cx" style="display: block; padding: 0 10px"> $user = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slack_profiledata = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = $wpdb->get_var( $wpdb->prepare(
- "SELECT user_login
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $db_row = $wpdb->get_row( $wpdb->prepare(
+ "SELECT user_login, profiledata
</ins><span class="cx" style="display: block; padding: 0 10px"> FROM slack_users
</span><span class="cx" style="display: block; padding: 0 10px"> JOIN {$wpdb->users} ON slack_users.user_id = {$wpdb->users}.id
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE slack_id = %s",
</span><span class="cx" style="display: block; padding: 0 10px"> $data['user_id']
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $user = $db_row->user_login ?? false;
+ $slack_profiledata = json_decode( ($db_row->profiledata ?? '{}'), true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Default back to the historical 'user_name' Slack field.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = $data['user_name'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,15 +101,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $command = 'group';
</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">+ // Use their Slack Display name, falling back to their WordPress.org login if that's not available.
+ $display_name = $user;
+ if ( ! empty( $slack_profiledata['display_name'] ) ) {
+ $display_name = $slack_profiledata['display_name'];
+ }
+
+ $avatar = false;
+ // Respect the avatar set in Slack, and prefer it over their Gravatar.
+ if ( ! empty( $slack_profiledata['image_192'] ) ) {
+ $avatar = $slack_profiledata['image_192'];
+ }
+ $get_avatar = __NAMESPACE__ . '\\' . 'get_avatar';
+ if ( ! $avatar && function_exists( $get_avatar ) ) {
+ $avatar = call_user_func( $get_avatar, $data['user_name'], $data['user_id'], $data['team_id'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( "<!%s> %s", $command, $data['text'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $send = new Send( \Dotorg\Slack\Send\WEBHOOK );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $send->set_username( $user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $send->set_username( $display_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $send->set_text( $text );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $get_avatar = __NAMESPACE__ . '\\' . 'get_avatar';
- if ( function_exists( $get_avatar ) ) {
- $send->set_icon( call_user_func( $get_avatar, $data['user_name'], $data['user_id'], $data['team_id'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $avatar ) {
+ $send->set_icon( $avatar );
</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"> // By sending the channel ID, we can post to private groups.
</span></span></pre>
</div>
</div>
</body>
</html>