Changeset 13370

Timestamp:

11/19/2022 10:26:02 AM (22 months ago)

Author:

imath

Message:

Silently introduce block support for Activity content

Functions and filters bringing support for Block based activity content are disabled by default. We're adding these so that it's easier to progress on building a Block Based activity post form from a feature as a plugin and the BP Attachments BuddyPress Add-on. To allow Activity content to support blocks, we simply need to use this filter add_filter( 'bp_is_activity_blocks_active', '__return_true' ); .

This commit also allowes community users to share more than 2 links when these links are coming from the website BuddyPress is activated on.

Closes ​https://github.com/buddypress/buddypress/pull/38
Fixes #8765

Location:

trunk

Files:

• src/bp-activity/bp-activity-block-functions.php (added)
• src/bp-activity/classes/class-bp-activity-component.php (modified) (1 diff)
• src/bp-core/bp-core-moderation.php (modified) (4 diffs)
• tests/phpunit/testcases/core/functions.php (modified) (1 diff)

trunk/src/bp-activity/classes/class-bp-activity-component.php

@@ -78 +78 @@
         if ( bp_is_active( $this->id, 'embeds' ) ) {
             $includes[] = 'embeds';
+        }
+
+        /*
+         * Activity blocks feature.
+         *
+         * By default this feature is inactive. We're including specific block functions
+         * in version 11.0.0 so these can be used by BuddyPress Add-ons such as BP Attachments
+         * or BP Activity Block Editor.
+         */
+        if ( bp_is_active( $this->id, 'blocks' ) ) {
+            $includes[] = 'block-functions';
         }
 

trunk/src/bp-core/bp-core-moderation.php

@@ -78 +78 @@
 
     // Define local variable(s).
-    $_post     = array();
-    $match_out = '';
+    $_post   = array();
+    $matches = '';
 
     /** User Data ************************************************************
@@ -91 +91 @@
         // If data exists, map it.
         if ( ! empty( $user ) ) {
-            $_post['author'] = $user->display_name;
-            $_post['email']  = $user->user_email;
-            $_post['url']    = $user->user_url;
+            $_post['user_id'] = $user->ID;
+            $_post['author']  = $user->display_name;
+            $_post['email']   = $user->user_email;
+            $_post['url']     = $user->user_url;
         }
     }
@@ -112 +113 @@
 
         // How many links?
-        $num_links = preg_match_all( '/(http|ftp|https):\/\//i', $content, $match_out );
-
-        // Allow for bumping the max to include the user's URL.
+        $num_links = preg_match_all( '/(http|ftp|https):\/\/(.+?)([\s\'"])/i', $content, $matches );
+
+        // Neutralize the current site's URL.
+        if ( isset( $matches[0] ) && is_array( $matches[0] ) ) {
+            foreach ( $matches[0] as $found_url ) {
+                if ( 0 === strpos( $found_url, home_url() ) ) {
+                    $num_links -=1;
+                }
+            }
+        }
+
+        // Allow for bumping the max according to the user's URL or content data.
         if ( ! empty( $_post['url'] ) ) {
+            $user_url = $_post['url'];
 
             /**
@@ -121 +132 @@
              *
              * @since 1.6.0
+             * @since 11.0.0 Introduced the $content parameter as WordPress did the same in 4.7.0.
              *
-             * @param string $num_links How many links found.
-             * @param string $value     User's url.
+             * @param string $num_links    How many links found.
+             * @param string $user_url     User's url.
+             * @param array  $content      The content being moderated.
              */
-            $num_links = apply_filters( 'comment_max_links_url', $num_links, $_post['url'] );
+            $num_links = apply_filters( 'comment_max_links_url', $num_links, $user_url, $content );
         }
 

trunk/tests/phpunit/testcases/core/functions.php

@@ -918 +918 @@
         $this->assertTrue( 2 === count( $versions ) );
     }
+
+    /**
+     * Override the comment max links option.
+     */
+    public function override_comment_max_links() {
+        return 2;
+    }
+
+    /**
+     * @ticket BP8765
+     */
+    public function test_bp_core_check_for_moderation() {
+        $u = self::factory()->user->create();
+        //<a href="%1$s">Hello</a>
+        $content = sprintf(
+            '<!-- wp:paragraph -->
+            <p><strong>%1$s %2$s!</p>
+            <!-- /wp:paragraph -->',
+            'Hello',
+            'World'
+        );
+
+        add_filter( 'pre_option_comment_max_links', array( $this, 'override_comment_max_links' ), 10, 0 );
+
+        $test = bp_core_check_for_moderation( $u, '', $content );
+        $this->assertTrue( $test );
+
+        $content = sprintf(
+            '<!-- wp:paragraph -->
+            <p><strong>%1$s %2$s!</p>
+            <!-- /wp:paragraph -->',
+            'Hello',
+            '<a href="https://foo.bar">World</a>'
+        );
+
+        $test = bp_core_check_for_moderation( $u, '', $content );
+        $this->assertTrue( $test );
+
+        $content = sprintf(
+            '<!-- wp:paragraph -->
+            <p><strong>%1$s %2$s!</p>
+            <!-- /wp:paragraph -->',
+            '<a href="https://bar.foo">Hello</a>',
+            '<a href="https://foo.bar">World</a>'
+        );
+
+        $test = bp_core_check_for_moderation( $u, '', $content );
+        $this->assertFalse( $test );
+
+        $content = sprintf(
+            '<!-- wp:paragraph -->
+            <p><strong>%1$s %2$s !</p>
+            <!-- /wp:paragraph -->
+            <!-- wp:bp/image-attachment {"align":"center","url":"%3$s/bp-attachments/public/members/admin/view/635168b2e5aae34973bcb0c1f0bd86fd/","src":"%3$s/wp-content/uploads/buddypress/public/members/1/bp-6-0-0-slated.jpg"} /-->',
+            'Hello',
+            'World',
+            home_url()
+        );
+
+        $test = bp_core_check_for_moderation( $u, '', $content );
+        $this->assertTrue( $test );
+
+        remove_filter( 'pre_option_comment_max_links', array( $this, 'override_comment_max_links' ), 10, 0 );
+    }
 }