<!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>[10957] sites/trunk/api.wordpress.org/public_html/dotorg/helpscout: Helpscout: Display Slack user details in the profile information.</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/10957">10957</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/10957","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-05-06 06:43:29 +0000 (Thu, 06 May 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'>Helpscout: Display Slack user details in the profile information.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorghelpscoutcommonphp">sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/common.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorghelpscoutdpophp">sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/dpo.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorghelpscoutprofilephp">sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/profile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmldotorghelpscoutcommonphp"></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/helpscout/common.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/helpscout/common.php 2021-05-06 05:55:52 UTC (rev 10956)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/common.php 2021-05-06 06:43:29 UTC (rev 10957)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?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">+$wp_init_host = 'https://wordpress.org/';
</ins><span class="cx" style="display: block; padding: 0 10px"> $base_dir = dirname( dirname( __DIR__ ) );
</span><span class="cx" style="display: block; padding: 0 10px"> require( $base_dir . '/wp-init.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,4 +25,18 @@
</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"> // get the info from HS
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-return json_decode( $data );
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$data = json_decode( $data );
+
+// If this is related to a slack user, fetch their details instead.
+if (
+ isset ( $data->customer->email, $data->ticket->subject ) &&
+ false !== stripos( $data->customer->email, 'slack' ) &&
+ preg_match( '/(\S+)@chat.wordpress.org/i', $data->ticket->subject, $m )
+) {
+ $user = get_user_by( 'slug', $m[1] );
+ if ( $user ) {
+ $data->customer->email = $user->user_email;
+ }
+}
+
+return $data;
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmldotorghelpscoutdpophp"></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/helpscout/dpo.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/helpscout/dpo.php 2021-05-06 05:55:52 UTC (rev 10956)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/dpo.php 2021-05-06 06:43:29 UTC (rev 10957)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Add current DPO Export/Erasure status for the customer.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$wp_init_host = 'https://wordpress.org/';
</del><span class="cx" style="display: block; padding: 0 10px"> // $request is the validated HelpScout request.
</span><span class="cx" style="display: block; padding: 0 10px"> $request = include __DIR__ . '/common.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,8 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( get_user_by( 'login', 'wordpressdotorg' )->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // default empty output
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$html = '';
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$html = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $email = $request->customer->email;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= sprintf(
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmldotorghelpscoutprofilephp"></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/helpscout/profile.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/helpscout/profile.php 2021-05-06 05:55:52 UTC (rev 10956)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/profile.php 2021-05-06 06:43:29 UTC (rev 10957)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,6 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // default empty output
</span><span class="cx" style="display: block; padding: 0 10px"> $html = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$user = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Look up a user based on email address
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset ( $request->customer->email ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,6 +62,32 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// If this is related to a slack user, include the details of the slack account.
+if ( $user || preg_match( '/(\S+@chat.wordpress.org)/i', $request->ticket->subject, $m ) ) {
+
+ if ( $user ) {
+ $slack_user = $wpdb->get_row( $sql = $wpdb->prepare(
+ 'SELECT * FROM slack_users WHERE user_id = %d',
+ $user->ID
+ ) );
+ } else {
+ $slack_user = $wpdb->get_row( $sql = $wpdb->prepare(
+ 'SELECT * FROM slack_users WHERE profiledata LIKE %s',
+ '%' . $wpdb->esc_like( '"email":"' . $m[1] . '"' ) . '%',
+ ) );
+ }
+
+ if ( $slack_user ) {
+ $slack_data = json_decode( $slack_user->profiledata );
+ $html .= '<hr/>';
+ $html .= '<ul>';
+ $html .= '<li>Slack: <a href="https://wordpress.slack.com/archives/' . $slack_user->dm_id . '">' . esc_html( $slack_data->profile->display_name_normalized ?? $slack_data->profile->display_name ) . '</a></li>';
+ $html .= '<li>Account ' . ( !empty( $slack_data->deleted ) ? 'Deactivated' : 'Enabled' ) . '</li>';
+ $html .= '<li>Last Updated: ' . gmdate( 'Y-m-d H:i:s', $slack_data->updated ) . '</li>';
+ $html .= '</ul>';
+ }
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // response to HS is just HTML to display in the sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> $response = array( 'html' => $html );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>