Changeset 12594

Timestamp:

05/18/2023 03:26:43 AM (17 months ago)

Author:

dd32

Message:

Plugin Directory: Clear the assigned reviewer on the appropriate status transitions (->approved and ->publish).

See #6993.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin

Files:

• class-customizations.php (modified) (2 diffs)
• class-status-transitions.php (modified) (4 diffs)
• metabox/class-reviewer.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php

@@ -69 +69 @@
         add_action( 'save_post', array( __NAMESPACE__ . '\Metabox\Author_Notice', 'save_post' ) );
         add_action( 'save_post', array( __NAMESPACE__ . '\Metabox\Reviewer', 'save_post' ) );
-
-        // Audit logs
-        add_action( 'updated_postmeta', array( $this, 'updated_postmeta' ), 10, 4 );
     }
 
@@ -858 +855 @@
         return $keys;
     }
-
-    /**
-     * Watch for post_meta updates and log accordingly.
-     */
-    public function updated_postmeta( $meta_id, $post_id, $meta_key, $meta_value ) {
-        if ( 'assigned_reviewer' === $meta_key && $meta_value ) {
-            $reviewer = get_user_by( 'id', $meta_value );
-            Tools::audit_log(
-                sprintf(
-                    'Assigned to <a href="%s">%s</a>.',
-                    esc_url( 'https://profiles.wordpress.org/' . $reviewer->user_nicename . '/' ),
-                    $reviewer->display_name ?: $reviewer->user_login
-                ),
-                get_post( $post_id )
-            );
-        } elseif ( 'assigned_reviewer' === $meta_key && ! $meta_value ) {
-            Tools::audit_log( 'Unassigned.', get_post( $post_id ) );
-        }
-    }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php

@@ -8 +8 @@
 use WordPressdotorg\Plugin_Directory\Email\Plugin_Approved as Plugin_Approved_Email;
 use WordPressdotorg\Plugin_Directory\Email\Plugin_Rejected as Plugin_Rejected_Email;
+use WordPressdotorg\Plugin_Directory\Admin\Metabox\Reviewer as Reviewer_Metabox;
 
 /**
@@ -135 +136 @@
             case 'approved':
                 $this->approved( $post->ID, $post );
+                $this->clear_reviewer( $post );
                 break;
 
             case 'rejected':
                 $this->rejected( $post->ID, $post );
+                $this->clear_reviewer( $post );
                 break;
 
@@ -144 +147 @@
                 $this->clean_closed_date( $post->ID );
                 $this->set_translation_status( $post, 'active' );
+                $this->clear_reviewer( $post );
                 break;
 
@@ -364 +368 @@
     }
 
+    /**
+     * Clear the assigned reviewer.
+     *
+     * @param \WP_Post $post Post object.
+     */
+    public function clear_reviewer( $post ) {
+        // Unset the reviewer, but don't log it, as the triggering status changes should've been logged in some form.
+        Reviewer_Metabox::set_reviewer( $post, false, false );
+    }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-reviewer.php

@@ -103 +103 @@
         }
 
-        update_post_meta( $post_id, 'assigned_reviewer', $reviewer_id );
-        update_post_meta( $post_id, 'assigned_reviewer_time', time() );
+        self::set_reviewer( $post_id, $reviewer_id );
 
         $assigned_reviewer = get_post_meta( $post_id, 'assigned_reviewer', true );
@@ -127 +126 @@
         $reviewer_id = absint( $_POST['assigned_reviewer'] ?? 0 );
 
-        update_post_meta( $post_id, 'assigned_reviewer', $reviewer_id );
-        update_post_meta( $post_id, 'assigned_reviewer_time', time() );
+        self::set_reviewer( $post_id, $reviewer_id );
+    }
+
+    /**
+     * Set the reviewer for a post.
+     *
+     * @param int|WP_Post $post     Post object or ID.
+     * @param int|WP_User $reviewer Reviewer User object or ID.
+     * @param bool        $log_it   Whether to log the change. Optional.
+     * @return bool
+     */
+    public static function set_reviewer( $post, $reviewer, $log_it = true ) {
+        $post             = get_post( $post );
+        $current_reviewer = get_post_meta( $post->ID, 'assigned_reviewer', true );
+        $reviewer         = is_object( $reviewer ) ? $reviewer : get_user_by( 'id', $reviewer );
+        $reviewer_id      = $reviewer->ID ?? 0;
+
+        if ( $current_reviewer == $reviewer_id || ! $post ) {
+            return false;
+        }
+
+        if ( ! $reviewer ) {
+            delete_post_meta( $post->ID, 'assigned_reviewer' );
+            delete_post_meta( $post->ID, 'assigned_reviewer_time' );
+        } else {
+            update_post_meta( $post->ID, 'assigned_reviewer', $reviewer_id );
+            update_post_meta( $post->ID, 'assigned_reviewer_time', time() );
+        }
+
+        // Audit logging.
+        if ( $log_it ) {
+            $message = 'Unassigned.';
+            if ( $reviewer ) {
+                $message = sprintf(
+                    'Assigned to <a href="%s">%s</a>.',
+                    esc_url( 'https://profiles.wordpress.org/' . $reviewer->user_nicename . '/' ),
+                    $reviewer->display_name ?: $reviewer->user_login
+                );
+            }
+
+            Tools::audit_log( $message, $post );
+        }
+
+        return true;
     }
 }