Changeset 14218

Timestamp:

11/28/2024 01:50:26 AM (18 months ago)

Author:

dd32

Message:

Plugin Directory: Release Confirmation: Allow a plugin reviewer to undo a release discard state.

Fixes #7708.

Location:

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

Files:

• api/routes/class-plugin-release-confirmation.php (modified) (2 diffs)
• class-plugin-directory.php (modified) (1 diff)
• class-template.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-release-confirmation.php

@@ -60 +60 @@
             ],
             'permission_callback' => [ $this, 'permission_can_access_plugin' ],
+        ] );
+
+        register_rest_route( 'plugins/v1', '/plugin/(?P<plugin_slug>[^/]+)/release-confirmation/(?P<plugin_tag>[^/]+)/undo-discard', [
+            'methods'             => \WP_REST_Server::READABLE, // TODO: This really should be a POST
+            'callback'            => [ $this, 'undo_discard_release' ],
+            'args'                => [
+                'plugin_slug' => [
+                    'validate_callback' => [ $this, 'validate_plugin_slug_callback' ],
+                ],
+                'plugin_tag' => [
+                    'validate_callback' => [ $this, 'validate_plugin_tag_callback' ],
+                ]
+            ],
+            'permission_callback' => function( $request ) {
+                if ( current_user_can( 'plugin_review' ) ) {
+                    return $this->permission_can_access_plugin( $request );
+                }
+
+                return false;
+            },
         ] );
 
@@ -243 +263 @@
 
     /**
+     * A simple endpoint to undo discarding a release.
+     */
+    public function undo_discard_release( $request ) {
+        $plugin     = Plugin_Directory::get_plugin_post( $request['plugin_slug'] );
+        $tag        = $request['plugin_tag'];
+        $release    = Plugin_Directory::get_release( $plugin, $tag );
+        $result     = [
+            'location' => wp_get_referer() ?: home_url( '/developers/releases/' ),
+        ];
+        header( 'Location: ' . $result['location'] );
+
+        if ( ! $release || empty( $release['discarded'] ) ) {
+            // Not found or not discarded.
+            $result['confirmed'] = false;
+            return $result;
+        }
+
+        // Log this action.
+        Tools::audit_log(
+            sprintf(
+                'Release %s discard reverted. Originally discarded by %s at %s',
+                $tag,
+                $release['discarded']['user'],
+                date( 'Y-m-d H:i:s', $release['discarded']['time'] )
+            ),
+            $plugin
+        );
+
+        // Remove the discard state.
+        unset( $release['discarded'] );
+        $release['undo-discard'] = true;
+
+        Plugin_Directory::add_release( $plugin, $release );
+
+        return $result;
+    }
+
+    /**
      * Send a Access email
      */

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

@@ -1868 +1868 @@
                 $release[ $k ] = $v;
             }
+        }
+
+        /*
+         * Allow a discarded release to be reset.
+         * See API\Routes\Plugin_Release_Confirmation::undo_discard_release()
+         */
+        if ( isset( $data['undo-discard'] ) && ! empty( $release['discarded'] ) && empty( $data['discarded'] ) ) {
+            unset( $release['discarded'] );
         }
 

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

@@ -988 +988 @@
         } elseif ( 'discard' === $what ) {
             $endpoint = 'plugin/%s/release-confirmation/%s/discard';
+        } elseif ( 'undo-discard' === $what ) {
+            $endpoint = 'plugin/%s/release-confirmation/%s/undo-discard';
         } else {
             return '';