Changeset 11587

Timestamp:

02/21/2022 07:33:21 AM (3 years ago)

Author:

dd32

Message:

Make: Automatically correct mis-typed cross-posts to the full URI that make requires.

This allows crossposts to be written in three formats, and converts it to the first format:

• +make.wordpress.org/meta/ (correct, and auto-populated by the dropdowns)
• +make.wordpress.org/meta (common, when being manually typed outside of the o2 post editor)
• +meta (by those who are used to P2 on WordPress.com)

This should reduce some confusion with xposts not working correctly.
See #6052.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-o2-posting-access/wporg-o2-allow-crossposting.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-o2-posting-access/wporg-o2-allow-crossposting.php

@@ -42 +42 @@
         // List all sites in the auto-complete.
         add_action( 'init', [ $this, 'override_o2_xposts_get_data' ], 9 ); // before o2_Xposts::get_data();
+
+        // Filter new posts & comments to fix/expand short xposts.
+        add_filter( 'preprocess_comment', [ $this, 'preprocess_comment' ] );
+        add_filter( 'o2_create_post', [ $this, 'o2_create_post' ] );
     }
 
@@ -140 +144 @@
         return $allcaps;
     }
+
+
+    /**
+     * Filter newly created comments to correct any mis-typed crossposts.
+     */
+    public function preprocess_comment( $comment_data ) {
+        $comment_data['comment_content'] = $this->correct_xposts( $comment_data['comment_content'] );
+
+        return $comment_data;
+    }
+
+    /**
+     * Filter newly created posts to correct any mis-typed crossposts.
+     */
+    public function o2_create_post( $post ) {
+        $post->post_content = addslashes( $this->correct_xposts( stripslashes( $post->post_content ) ) );
+
+        return $post;
+    }
+
+    /**
+     * Corrects xposts from either +site or +domain/site to +domain/site/ as required on make.wordpress.org.
+     */
+    protected function correct_xposts( $string ) {
+        $current_site = get_blog_details();
+
+        return preg_replace_callback(
+            o2_Xposts::XPOSTS_REGEX,
+            function( $m ) use( $current_site ) {
+                $site = $m[1];
+                $site = str_replace( $current_site->domain, '', $site );
+                $site = trim( $site, '/' );
+
+                $sites = get_sites( [
+                    'fields'     => 'ids',
+                    'network_id' => $current_site->site_id,
+                    'domain'     => $current_site->domain,
+                    'path'       => "/{$site}/",
+                ] );
+
+                // If site could not be found, or there's multiple, let o2 deal with it.
+                if ( count( $sites ) !== 1 ) {
+                    return $m[0];
+                }
+
+                $correct = "make.wordpress.org/{$site}/";
+                if ( $m[1] !== $correct ) {
+                    return str_replace( $m[1], $correct, $m[0] );
+                }
+
+                return $m[0];
+            },
+            $string
+        );
+    }
+
 }