Changeset 12613

Timestamp:

06/02/2023 02:56:21 AM (3 years ago)

Author:

dd32

Message:

API: Helpscout: We don't need a record of deleted emails.

Reverts [12612].

Location:

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout

Files:

• common.php (modified) (2 diffs)
• webhook.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/common.php

@@ -468 +468 @@
  * Keep a cached copy of the received emails in the database for querying.
  *
+ * @param string $event   Event name.
  * @param object $request Helpscout request object / Conversation object.
  */
-function log_email( $request ) {
+function log_email( $event, $request ) {
     global $wpdb;
 
-    if ( empty( $request->id ) || ! isset( $request->status ) ) {
-        trigger_error( 'Missing required properties on request object: ' . $_SERVER['HTTP_X_HELPSCOUT_EVENT'], E_USER_NOTICE );
+    if ( str_starts_with( $event, 'convo.' ) ) {
+        return;
+    }
+
+    if ( empty( $request->id ) ) {
         return;
     }
@@ -481 +485 @@
     $meta = $row ? $wpdb->get_results( $wpdb->prepare( 'SELECT meta_key, meta_value FROM %i WHERE helpscout_id = %d', "{$wpdb->base_prefix}helpscout_meta", $request->id ), ARRAY_A ) : [];
 
-    // We don't need to know about spam.
-    if ( 'spam' === $request->status ) {
+    // We don't need to know about deleted items or spam.
+    if ( 'convo.deleted' === $event || 'spam' === $request->status ) {
         if ( $row ) {
             $wpdb->delete( 'wporg_helpscout', [ 'id' => $request->id ] );

sites/trunk/api.wordpress.org/public_html/dotorg/helpscout/webhook.php

@@ -21 +21 @@
 
 // Record the email in the database.
-if ( str_starts_with( $event, 'convo.' ) ) {
-    log_email( $request );
-}
+log_email( $event, $request );
 
 /**