<!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>[12464] sites/trunk/api.wordpress.org/public_html/dotorg/helpscout: Helpscout: When an email comes into plugins@ or themes@ and the email author doesn't have any plugins/themes, see if they've mentioned one and link to that instead.</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/12464">12464</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/12464","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>2023-03-13 06:19:16 +0000 (Mon, 13 Mar 2023)</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: When an email comes into plugins@ or themes@ and the email author doesn't have any plugins/themes, see if they've mentioned one and link to that instead.</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_htmldotorghelpscoutpluginsthemesphp">sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/plugins-themes.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 2023-03-13 04:20:40 UTC (rev 12463)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/common.php 2023-03-13 06:19:16 UTC (rev 12464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,6 +107,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $user->user_email ?? $email;
</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">+function get_plugin_or_theme_from_email( $request ) {
+ $subject = $request->ticket->subject ?? '';
+
+ $possible = [
+ 'themes' => [],
+ 'plugins' => []
+ ];
+
+ // Fetch the email.
+ $email_obj = Helpscout_API::api( '/v2/conversations/' . $request->ticket->id . '?embed=threads' );
+ if ( ! empty( $email_obj->_embedded->threads ) ) {
+ foreach ( $email_obj->_embedded->threads as $thread ) {
+ if ( 'customer' !== $thread->type ) {
+ continue;
+ }
+
+ // Extract matches from the email.
+ $email_body = strip_tags( str_replace( '<br>', "\n", $thread->body ) );
+
+ if ( ! preg_match_all( '!/(?<type>plugins|themes)/(?P<slug>[a-z0-9-]+)/?!im', $email_body, $m ) ) {
+ preg_match_all( '!(?P<type>Plugin|Theme):\s*(?P<slug>[a-z0-9-]+)$!im', $email_body, $m );
+ }
+
+ if ( $m ) {
+ foreach ( $m[0] as $i => $match ) {
+ $type = strtolower( $m['type'][ $i ] );
+ $slug = strtolower( $m['slug'][ $i ] );
+ $possible[ $type ][] = $slug;
+ }
+ }
+ }
+ }
+
+ return $possible;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // HelpScout sends json data in the POST, so grab it from the input directly.
</span><span class="cx" style="display: block; padding: 0 10px"> $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmldotorghelpscoutpluginsthemesphp"></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/plugins-themes.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/plugins-themes.php 2023-03-13 04:20:40 UTC (rev 12463)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/plugins-themes.php 2023-03-13 06:19:16 UTC (rev 12464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,11 +11,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $email = get_user_email_for_email( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_user_by( 'email', $email );
</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 ( ! $user ) {
- echo json_encode( array( 'html' => $html ) );
- die();
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( [
</span><span class="cx" style="display: block; padding: 0 10px"> /* site_id => [ textual singular, post_type ] */
</span><span class="cx" style="display: block; padding: 0 10px"> WPORG_PLUGIN_DIRECTORY_BLOGID => [ 'plugin', 'plugin' ],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,15 +18,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ] as $site_id => $details ) {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $type, $post_type ) = $details;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_this_inbox = ( "{$type}s@wordpress.org" === $request->mailbox->email );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $slugs = [];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'plugin' === $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( 'plugin' === $type && $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Committer to a plugin.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slugs = $wpdb->get_col( $wpdb->prepare( 'SELECT path FROM `' . PLUGINS_TABLE_PREFIX . 'svn_access' . '` WHERE user = %s', $user->user_login ) );
- $slugs = array_filter( array_map( function( $slug ) {
- return ltrim( $slug, '/' ) ?: false;
- }, $slugs ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $committer_plugins = $wpdb->get_col( $wpdb->prepare( 'SELECT path FROM `' . PLUGINS_TABLE_PREFIX . 'svn_access' . '` WHERE user = %s', $user->user_login ) );
+ array_map(
+ function( $slug ) use( $slugs ) {
+ $slug = ltrim( $slug, '/' );
+ if ( $slug ) {
+ $slugs[] = $slug;
+ }
+ },
+ $committer_plugins
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: Would be nice to pull for support reps too, but that's less common.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,19 +48,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $slugs[] = sanitize_title_with_dashes( trim( explode( ':', $request->ticket->subject )[1] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slugs = $slugs ? '"' . implode( '", "', array_map( 'esc_sql', $slugs ) ) . '"' : '';
- $or_slugs = $slugs ? "OR post_name IN( {$slugs} )" : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lookup_by_user = $user ? $user->ID : false;
+ $counts = false;
+ $sources = [
+ 'by_email_author'
+ ];
+ if ( $is_this_inbox ) {
+ $sources[] = 'check_email';
+ }
+ foreach ( $sources as $source ) {
+ if ( 'check_email' === $source ) {
+ // Check the email for a plugin/theme name.
+ $mentioned = get_plugin_or_theme_from_email( $request );
+ if ( empty( $mentioned[ "{$type}s"] ) ) {
+ break;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $counts = $wpdb->get_results( $wpdb->prepare(
- "SELECT post_status, COUNT(*) as count, group_concat( ID ORDER BY post_title ) as ids, group_concat( post_title ORDER BY post_title SEPARATOR ', ' ) as titles
- FROM $wpdb->posts
- WHERE post_type = %s AND ( post_author = %s {$or_slugs} )
- GROUP BY post_status
- ORDER BY FIELD( post_status, 'new', 'pending', 'publish', 'disabled', 'delisted', 'closed', 'approved', 'suspended', 'rejected', 'draft' )",
- $post_type,
- $user->ID
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lookup_by_user = false;
+ $slugs = $mentioned[ "{$type}s" ];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slugs = $slugs ? '"' . implode( '", "', array_map( 'esc_sql', array_unique( $slugs ) ) ) . '"' : '';
+ $or_slugs = $slugs ? "post_name IN( {$slugs} )" : '';
+ $post_author = $lookup_by_user ? $wpdb->prepare( "post_author = %s", $lookup_by_user ) : '';
+
+ $where = implode( ' OR ', array_filter( [ $post_author, $or_slugs ] ) );
+
+ if ( ! $where ) {
+ continue;
+ }
+
+ $counts = $wpdb->get_results( $wpdb->prepare(
+ "SELECT post_status, COUNT(*) as count, group_concat( ID ORDER BY post_title ) as ids, group_concat( post_title ORDER BY post_title SEPARATOR ', ' ) as titles
+ FROM $wpdb->posts
+ WHERE post_type = %s AND ( {$where} )
+ GROUP BY post_status
+ ORDER BY FIELD( post_status, 'new', 'pending', 'publish', 'disabled', 'delisted', 'closed', 'approved', 'suspended', 'rejected', 'draft' )",
+ $post_type,
+ ) );
+
+ if ( $counts && 'check_email' === $source ) {
+ $html .= '<p><strong>Note: ' . ucwords( $type ) . ' may not be authored the email author.</strong><p>';
+ }
+
+ if ( $counts ) {
+ break;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $counts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $total = array_sum( wp_list_pluck( $counts, 'count' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = wp_parse_id_list( implode( ',', wp_list_pluck( $counts, 'ids' ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,13 +111,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p><a href="%s" title="%s">%s</a></p>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_query_arg( [ 'post_type' => $post_type, 'author' => $user->ID ], admin_url( 'edit.php' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_query_arg( [ 'post_type' => $post_type, 'author' => $user->ID ?? '' ], admin_url( 'edit.php' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $post_statii ),
</span><span class="cx" style="display: block; padding: 0 10px"> ucwords( _n( "$total $type", "{$total} {$type}s", $total ) ) // Real bad internationalisation where internationalisation will never be used.
</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"> // plugins@ and themes@ - expand and provide direct links.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( "{$type}s@wordpress.org" === $request->mailbox->email ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $is_this_inbox ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html .= '<ul>';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $ids as $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span></span></pre>
</div>
</div>
</body>
</html>