<!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>[12467] sites/trunk/api.wordpress.org/public_html/dotorg/helpscout: HelpScout: Display all themes/plugins mentioned in the email always, and then a list of themes/plugins owned by the account that's contacting us.</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/12467">12467</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/12467","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-14 07:07:13 +0000 (Tue, 14 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: Display all themes/plugins mentioned in the email always, and then a list of themes/plugins owned by the account that's contacting us.
Follow up to <a href="http://meta.trac.wordpress.org/changeset/12464">[12464]</a>.</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>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorghelpscoutwebhookphp">sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/webhook.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmldotorghelpscoutclasshelpscoutphp">sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/class-helpscout.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmldotorghelpscoutclasshelpscoutphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/class-helpscout.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/class-helpscout.php 2023-03-13 16:04:19 UTC (rev 12466)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/class-helpscout.php 2023-03-14 07:07:13 UTC (rev 12467)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,84 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-namespace WordPressdotorg\API\HelpScout;
-
-/**
- * Simple HelpScout client.
- *
- * @see WordPressdotorg\Plugin_Directory\Clients
- */
-class API {
- const API_BASE = 'https://api.helpscout.net';
-
- /**
- * The HTTP timeout for the HelpScout API.
- */
- const TIMEOUT = 5;
-
- public static function api( $url, $args = null, $method = 'GET' ) {
- // Verify the configuration variables are available.
- if ( ! defined( 'HELPSCOUT_APP_ID' ) || ! defined( 'HELPSCOUT_APP_SECRET' ) ) {
- return false;
- }
-
- // Prepend API URL host-less URLs
- if ( ! str_starts_with( $url, self::API_BASE ) ) {
- $url = self::API_BASE . '/' . ltrim( $url, '/' );
- }
-
- if ( 'GET' === $method && $args ) {
- $url = add_query_arg( $args, $url );
- }
-
- $request = wp_remote_request(
- $url,
- array(
- 'method' => $method,
- 'headers' => [
- 'Accept' => 'application/json',
- 'Authorization' => self::get_auth_string(),
- ],
- 'timeout' => self::TIMEOUT,
- 'body' => ( 'POST' === $method && $args ) ? $args : null,
- )
- );
-
- return json_decode( wp_remote_retrieve_body( $request ) );
- }
-
- /**
- * Fetch an Authorization token for accessing HelpScout Resources.
- */
- protected static function get_auth_string() {
- $token = get_site_transient( __CLASS__ . 'get_auth_token' );
- if ( $token && is_array( $token ) && $token['exp'] > time() ) {
- return 'BEARER ' . $token['token'];
- }
-
- $request = wp_remote_post(
- self::API_BASE . '/v2/oauth2/token',
- array(
- 'timeout' => self::TIMEOUT,
- 'body' => array(
- 'grant_type' => 'client_credentials',
- 'client_id' => HELPSCOUT_APP_ID,
- 'client_secret' => HELPSCOUT_APP_SECRET
- )
- )
- );
-
- $response = is_wp_error( $request ) ? false : json_decode( wp_remote_retrieve_body( $request ) );
-
- if ( ! $response || empty( $response->access_token ) ) {
- return false;
- }
-
- // Cache the token for 1 minute less than what it's valid for.
- $token = $response->access_token;
- $expiry = $response->expires_in - MINUTE_IN_SECONDS;
-
- set_site_transient( __CLASS__ . 'get_auth_token', [ 'exp' => time() + $expiry, 'token' => $token ], $expiry );
-
- return 'BEARER ' . $token;
- }
-
-}
</del></span></pre></div>
<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 16:04:19 UTC (rev 12466)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/common.php 2023-03-14 07:07:13 UTC (rev 12467)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use WordPressdotorg\API\HelpScout\API as Helpscout_API;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WordPressdotorg\MU_Plugins\Utilities\HelpScout;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $wp_init_host ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_init_host = 'https://api.wordpress.org/';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,8 +7,6 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-include_once __DIR__ . '/class-helpscout.php';
-
</del><span class="cx" style="display: block; padding: 0 10px"> // function to verify signature from HelpScout
</span><span class="cx" style="display: block; padding: 0 10px"> function is_from_helpscout( $data, $signature ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'HELPSCOUT_SECRET_KEY' ) || ! $signature ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,6 +18,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return hash_equals( $signature, $calculated );
</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">+/**
+ * Caching wrapper around the HelpScout conversation API.
+ */
+function get_email_thread( $thread_id, $force = false ) {
+ wp_cache_add_global_groups( 'helpscout-thread' );
+
+ if ( $thread = wp_cache_get( $thread_id, 'helpscout-thread' ) ) {
+ if ( ! $force ) {
+ return $thread;
+ }
+ }
+
+ $email_obj = Helpscout::instance()->get( '/v2/conversations/' . $thread_id . '?embed=threads' );
+
+ wp_cache_set( $thread_id, $email_obj, 'helpscout-thread', 6 * HOUR_IN_SECONDS );
+
+ return $email_obj;
+}
+
+/**
+ * Get the user associated with a HelpScout email.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function get_user_email_for_email( $request ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $email = $request->customer->email ?? false;
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = $request->ticket->subject ?? '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +89,7 @@
</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"> // Fetch the email.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email_obj = Helpscout_API::api( '/v2/conversations/' . $request->ticket->id . '?embed=threads' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email_obj = get_email_thread( $request->ticket->id );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $email_obj->_embedded->threads ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $email_obj->_embedded->threads as $thread ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'customer' !== $thread->type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,15 +131,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = $request->ticket->subject ?? '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $possible = [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'themes' => [],
- 'plugins' => []
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'themes' => [],
+ 'plugins' => [],
</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">+ // Reported themes, shortcut, assume the slug is the title.. since it is..
+ if ( str_starts_with( $subject, 'Reported Theme:' ) ) {
+ $possible['themes'][] = sanitize_title_with_dashes( trim( explode( ':', $request->ticket->subject )[1] ) );
+ }
+
+ $regexes = [
+ '!/([^/]+\.)?wordpress.org/(?<type>plugins|themes)/(?P<slug>[^/]+)/?!im',
+ '!(?P<type>Plugin|Theme):\s*(?P<slug>[a-z0-9-]+)$!im',
+ '!(?P<type>plugins|themes)\.(trac|svn)\.wordpress\.org/(browser/)?(?P<slug>[^/]+)!im',
+ ];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Fetch the email.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email_obj = Helpscout_API::api( '/v2/conversations/' . $request->ticket->id . '?embed=threads' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email_obj = get_email_thread( $request->ticket->id );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $email_obj->_embedded->threads ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $email_obj->_embedded->threads as $thread ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'customer' !== $thread->type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $thread->body ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">@@ -126,14 +157,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Extract matches from the email.
</span><span class="cx" style="display: block; padding: 0 10px"> $email_body = strip_tags( str_replace( '<br>', "\n", $thread->body ) );
</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 ( ! 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 );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $regexes as $regex ) {
+ if ( ! preg_match_all( $regex, $email_body, $m ) ) {
+ continue;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $m ) {
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $m[0] as $i => $match ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $match, 'developer.wordpress.org' ) || str_contains( $match, 'make.wordpress.org' ) ) {
+ continue; // Sometimes it picks up the references to devhub or make in threads we don't want.
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = strtolower( $m['type'][ $i ] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_ends_with( $type, 's' ) ) {
+ $type .= 's';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $slug = strtolower( $m['slug'][ $i ] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $possible[ $type ][] = $slug;
</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">@@ -140,7 +179,10 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $possible;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $possible['themes'] = array_unique( $possible['themes'] );
+ $possible['plugins'] = array_unique( $possible['plugins'] );
+
+ return array_filter( $possible );
</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"> // HelpScout sends json data in the POST, so grab it from the input directly.
</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 16:04:19 UTC (rev 12466)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/plugins-themes.php 2023-03-14 07:07:13 UTC (rev 12467)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,172 +1,185 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Simple sidebar to list plugin/theme details.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace WordPressdotorg\API\HelpScout;
+/**
+ * Simple sidebar to list plugin/theme details.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
+
+Plugins mentioned in this email:
+ - Plugin 1
+ - Plugin 2
+
+Themes mentioned in this email:
+ - Theme 3
+
+Plugins owned by this user:
+ - Plugin 1
+
+Themes owned by this user:
+ - Theme 3
+
+*/
+
</ins><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="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">+ob_start();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // look up profile url by email
</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">-foreach ( [
- /* site_id => [ textual singular, post_type ] */
- WPORG_PLUGIN_DIRECTORY_BLOGID => [ 'plugin', 'plugin' ],
- WPORG_THEME_DIRECTORY_BLOGID => [ 'theme', 'repopackage' ]
-] as $site_id => $details ) {
- list( $type, $post_type ) = $details;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$sites = [
+ 'themes' => WPORG_THEME_DIRECTORY_BLOGID,
+ 'plugins' => WPORG_PLUGIN_DIRECTORY_BLOGID,
+];
+$repo_post_types = [
+ 'themes' => 'repopackage',
+ 'plugins' => 'plugin',
+];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_this_inbox = ( "{$type}s@wordpress.org" === $request->mailbox->email );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Mentioned in email
+$mentioned = get_plugin_or_theme_from_email( $request );
+foreach ( $mentioned as $type => $slugs ) {
+ switch_to_blog( $sites[ $type ] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch_to_blog( $site_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ids = get_posts( [
+ 'fields' => 'ids',
+ 'post_name__in' => $slugs,
+ 'post_type' => $repo_post_types, // Cannot be 'all', as that only queries for known post_type
+ 'post_status' => 'any',
+ 'orderby' => 'post_title',
+ 'order' => 'ASC',
+ ] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slugs = [];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post_ids ) {
+ echo '<p><strong>' . ucwords( $type ) . ' mentioned in this email:</strong></p>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'plugin' === $type && $user ) {
- // Committer to a plugin.
- $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
- );
-
- // TODO: Would be nice to pull for support reps too, but that's less common.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display_items( $post_ids );
</ins><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">- // Reported themes, shortcut, assume the slug is the title.. since it is..
- if (
- 'theme' === $type &&
- str_starts_with( $request->ticket->subject ?? '', 'Reported Theme:' )
- ) {
- $slugs[] = sanitize_title_with_dashes( trim( explode( ':', $request->ticket->subject )[1] ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ restore_current_blog();
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; 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;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Owned by user.
+if ( $user ) {
+ foreach ( $sites as $type => $_blog_id ) {
+ switch_to_blog( $_blog_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $lookup_by_user = false;
- $slugs = $mentioned[ "{$type}s" ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $items = get_user_items( $user );
+ if ( $items ) {
+ echo '<p><strong>' . ucwords( $type ) . ' owned by this user:</strong></p>';
+
+ display_items( $items );
</ins><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', array_unique( $slugs ) ) ) . '"' : '';
- $or_slugs = $slugs ? "post_name IN( {$slugs} )" : '';
- $post_author = $lookup_by_user ? $wpdb->prepare( "post_author = %s", $lookup_by_user ) : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ restore_current_blog();
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = implode( ' OR ', array_filter( [ $post_author, $or_slugs ] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_user_items( $user ) {
+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $where ) {
- continue;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $user ) {
+ return [];
+ }
</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 ( {$where} )
- GROUP BY post_status
- ORDER BY FIELD( post_status, 'new', 'pending', 'publish', 'disabled', 'delisted', 'closed', 'approved', 'suspended', 'rejected', 'draft' )",
- $post_type,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ids = [];
+ $slugs = [];
+ $wheres = [];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $counts && 'check_email' === $source ) {
- $html .= '<p><strong>Note: ' . ucwords( $type ) . ' may not be authored the email author.</strong><p>';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( WPORG_PLUGIN_DIRECTORY_BLOGID === get_current_blog_id() ) {
+ // Committer to a plugin.
+ $committer_plugins = $wpdb->get_col( $wpdb->prepare( 'SELECT path FROM `' . PLUGINS_TABLE_PREFIX . 'svn_access' . '` WHERE user = %s', $user->user_login ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $counts ) {
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $committer_plugins as $plugin ) {
+ $plugin = ltrim( $plugin, '/' );
+ if ( $plugin ) {
+ $slugs[] = $plugin;
+ }
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $counts ) {
- $total = array_sum( wp_list_pluck( $counts, 'count' ) );
- $ids = wp_parse_id_list( implode( ',', wp_list_pluck( $counts, 'ids' ) ) );
- $post_statii = implode(
- ', ',
- array_map(
- function( $i ) {
- return sprintf( "%s: %s (%s)", $i->post_status, $i->count, $i->titles );
- },
- $counts
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $slugs ) {
+ $slugs = '"' . implode( '", "', array_map( 'esc_sql', array_unique( $slugs ) ) ) . '"';
+ $wheres[] = "post_name IN( {$slugs} )";
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html .= sprintf(
- '<p><a href="%s" title="%s">%s</a></p>',
- add_query_arg( [ 'post_type' => $post_type, 'author' => $user->ID ?? '' ], admin_url( 'edit.php' ) ),
- esc_attr( $post_statii ),
- ucwords( _n( "$total $type", "{$total} {$type}s", $total ) ) // Real bad internationalisation where internationalisation will never be used.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wheres[] = $wpdb->prepare( "post_author = %d", $user->ID );
+
+ if ( $wheres ) {
+ $where = implode( ' OR ', $wheres );
+
+ $ids = $wpdb->get_col(
+ "SELECT ID
+ FROM $wpdb->posts
+ WHERE post_type IN( 'plugin', 'repopackage' ) AND {$where}
+ ORDER BY FIELD( post_status, 'new', 'pending', 'publish', 'disabled', 'delisted', 'closed', 'approved', 'suspended', 'rejected', 'draft' ), post_title",
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // plugins@ and themes@ - expand and provide direct links.
- if ( $is_this_inbox ) {
- $html .= '<ul>';
- foreach ( $ids as $post_id ) {
- $post = get_post( $post_id );
- $post_status = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $ids;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch ( $post->post_status ) {
- // Plugins
- case 'rejected':
- $post_status = '(Rejected)';
- break;
- case 'closed':
- case 'disabled':
- $post_status = '(Closed)';
- break;
- case 'pending':
- case 'new':
- $post_status = '(In Review)';
- break;
- case 'approved':
- $post_status = '(Approved)';
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function display_items( $post_ids ) {
+ echo '<ul>';
+ foreach ( $post_ids as $post_id ) {
+ $post = get_post( $post_id );
+ $post_status = '';
+ $style = 'color: green;';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Themes
- case 'draft':
- $post_status = '(In Review or Rejected)';
- break;
- case 'suspended':
- $post_status = '(Suspended)';
- break;
- case 'delisted':
- $post_status = '(Delisted)';
- break;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch ( $post->post_status ) {
+ // Plugins
+ case 'rejected':
+ $post_status = '(Rejected)';
+ $style = 'color: red;';
+ break;
+ case 'closed':
+ case 'disabled':
+ $post_status = '(Closed)';
+ $style = 'color: red;';
+ break;
+ case 'pending':
+ case 'new':
+ $post_status = '(In Review)';
+ $style = '';
+ break;
+ case 'approved':
+ $post_status = '(Approved)';
+ $style = '';
+ 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">- $html .= sprintf(
- '<li><a href="%s">%s</a> <a href="%s">#</a> %s</li>',
- /* get_edit_post_link( $post ), // Won't work as post type not registered */
- esc_url( add_query_arg( [ 'action' => 'edit', 'post' => $post_id ], admin_url( 'post.php' ) ) ),
- esc_html( $post->post_title ),
- get_permalink( $post ),
- esc_html( $post_status )
- );
- }
- $html .= '</ul>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Themes
+ case 'draft':
+ $post_status = '(In Review or Rejected)';
+ $style = '';
+ break;
+ case 'suspended':
+ $post_status = '(Suspended)';
+ $style = 'color: red;';
+ break;
+ case 'delisted':
+ $post_status = '(Delisted)';
+ $style = 'color: red;';
+ break;
</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">+ printf(
+ '<li><a href="%1$s" style="%2$s">%3$s</a> <a href="%4$s" style="%2$s">#</a> %5$s</li>',
+ /* 1 get_edit_post_link( $post ), // Won't work as post type not registered */
+ /* 1 */ esc_url( add_query_arg( [ 'action' => 'edit', 'post' => $post_id ], admin_url( 'post.php' ) ) ),
+ /* 2 */ esc_attr( $style ),
+ /* 3 */ esc_html( $post->post_title ),
+ /* 4 get_permalink( $post ), */
+ /* 4 */ esc_url( home_url( "/{$post->post_name}/" ) ),
+ /* 5 */ esc_html( $post_status )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- restore_current_blog();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ echo '</ul>';
</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"> // response to HS is just HTML to display in the sidebar
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-echo json_encode( array( 'html' => $html ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+echo json_encode( array( 'html' => ob_get_clean() ) );
</ins></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmldotorghelpscoutwebhookphp"></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/webhook.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/webhook.php 2023-03-13 16:04:19 UTC (rev 12466)
+++ sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/webhook.php 2023-03-14 07:07:13 UTC (rev 12467)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,3 +22,6 @@
</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">+
+// Warm the caches.
+get_email_thread( $request->id, true );
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>