Changeset 14152

Timestamp:

10/29/2024 02:31:15 AM (7 months ago)

Author:

dd32

Message:

Plugin Directory: Standardise on the data exposed for closed plugins.

See #7057.

Location:

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

Files:

• api/routes/class-plugin.php (modified) (1 diff)
• class-template.php (modified) (1 diff)
• jobs/class-api-update-updater.php (modified) (1 diff)

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

@@ -62 +62 @@
                 'description' => $close_text,
                 'closed'      => true,
-                'closed_date' => $close_data['date'] ?: false,
+                'closed_date' => $close_data['date'] ? gmdate( 'Y-m-d', strtotime( $close_data['date'] ) ) : false,
                 'reason'      => $close_data['public'] ? $close_data['reason'] : false,
                 'reason_text' => $close_data['public'] ? $close_data['label'] : false,

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

@@ -1091 +1091 @@
         }
 
-        $result['label'] = self::get_close_reasons()[ $result['reason'] ] ?? _x( 'Unknown', 'unknown close reason', 'wporg-plugins' );
-        $days_closed     = $result['date'] ? (int) ( ( time() - strtotime( $result['date'] ) ) / DAY_IN_SECONDS ) : false;
+        $result['label'] = self::get_close_reasons()[ $result['reason'] ] ?? false;
+
+        // If not known reason, use 'unknown'.
+        if ( ! $result['label'] ) {
+            $result['reason'] = 'unknown';
+            $result['label']  = _x( 'Unknown', 'unknown close reason', 'wporg-plugins' );
+        }
 
         // If it's closed for more than 60 days, it's by author request, or we're unsure about the close date, it's publicly known.
+        $days_closed = $result['date'] ? (int) ( ( time() - strtotime( $result['date'] ) ) / DAY_IN_SECONDS ) : false;
         if ( ! $result['date'] || $days_closed >= 60 || 'author-request' === $result['reason'] ) {
             $result['public'] = true;

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-api-update-updater.php

@@ -83 +83 @@
 
         if ( in_array( $post->post_status, array( 'disabled', 'closed' ) ) ) {
-            $closed_data           = Template::get_close_data( $post );
-            $meta['closed_at']     = $closed_data['date'] ?? false;
-            if ( $closed_data['public'] ?? false ) {
-                $meta['closed_reason'] = $closed_data['reason'];
-                $meta['closed_label']  = $closed_data['label'];
+            $closed_data = Template::get_close_data( $post );
+            if ( $closed_data ) {
+                // Close date is sometimes unknown, only include the Day of closure.
+                $meta['closed_at'] = $closed_data['date'] ? gmdate( 'Y-m-d', strtotime( $closed_data['date'] ) ) : false;
+                if ( $closed_data['public'] ) {
+                    $meta['closed_reason'] = $closed_data['reason'] ?: 'unknown';
+                    $meta['closed_label']  = $closed_data['label'];
+                }
             }
         }