Changeset 13135

Timestamp:

11/01/2021 05:43:00 PM (3 years ago)

Author:

imath

Message:

Activity: make sure Activity author is synced with Post Type author

When the author of a Post has been updated, the corresponding user_id into the related Post Type Activity needs to be updated as well.

Props rigsbyx

Fixes #8579

Location:

trunk

Files:

• src/bp-activity/bp-activity-functions.php (modified) (1 diff)
• tests/phpunit/testcases/activity/actions.php (modified) (2 diffs)

trunk/src/bp-activity/bp-activity-functions.php

@@ -2312 +2312 @@
     $activity = new BP_Activity_Activity( $activity_id );
 
+    // Check if the Post author has changed.
+    if ( (int) $post->post_author !== (int) $activity->user_id ) {
+        $activity->user_id = (int) $post->post_author;
+    }
+
     if ( ! empty( $post->post_content ) ) {
         $activity_summary = bp_activity_create_summary( $post->post_content, (array) $activity );

trunk/tests/phpunit/testcases/activity/actions.php

@@ -169 +169 @@
     }
 
-    protected function activity_exists_for_post( $post_id, $action ) {
+    /**
+     * @ticket BP8579
+     * @group bp_activity_catch_transition_post_type_status
+     * @group activity_tracking
+     */
+    public function test_bp_activity_catch_transition_post_type_status_publish_publish_author_changed() {
+        $u1 = self::factory()->user->create(
+            array(
+                'role' => 'auhor',
+            )
+        );
+
+        $u2 = self::factory()->user->create(
+            array(
+                'role' => 'auhor',
+            )
+        );
+
+        $post_id = self::factory()->post->create( array(
+            'post_status' => 'publish',
+            'post_author' => $u1,
+            'post_type'   => 'post',
+        ) );
+
+        $post = get_post( $post_id );
+
+        // 'new' => 'publish'
+        $this->assertTrue( $this->activity_exists_for_post( $post_id, 'new_post' ), 'Published post type should have activity' );
+
+        $post->post_author = $u2;
+
+        wp_update_post( $post );
+
+        $a = $this->activity_exists_for_post( $post_id, 'new_post', true );
+
+        $this->assertSame( $u2, $a->user_id, 'The Activity about a published post type should be updated when the post author has changed.' );
+    }
+
+    /**
+     * @ticket BP8579
+     * @group bp_activity_catch_transition_post_type_status
+     * @group activity_tracking
+     */
+    public function test_bp_activity_catch_transition_post_type_status_publish_publish_content_changed() {
+        $u1 = self::factory()->user->create(
+            array(
+                'role' => 'auhor',
+            )
+        );
+
+        $u2 = self::factory()->user->create(
+            array(
+                'role' => 'auhor',
+            )
+        );
+
+        $post_id = self::factory()->post->create( array(
+            'post_status' => 'publish',
+            'post_author' => $u1,
+            'post_type'   => 'post',
+        ) );
+
+        $post = get_post( $post_id );
+
+        // 'new' => 'publish'
+        $this->assertTrue( $this->activity_exists_for_post( $post_id, 'new_post' ), 'Published post type should have activity' );
+
+        $post->post_content = "This time {$u2} has not edited the post";
+
+        wp_update_post( $post );
+
+        $a = $this->activity_exists_for_post( $post_id, 'new_post', true );
+
+        $this->assertSame( $post->post_content, $a->content, 'The Activity about a published post type should be updated when the post content has changed.' );
+    }
+
+    protected function activity_exists_for_post( $post_id, $action, $get_object = false ) {
         $a = bp_activity_get( array(
             'action'            => $action,
@@ -176 +252 @@
         ) );
 
+        if ( $get_object ) {
+            return reset( $a['activities'] );
+        }
+
         return ! empty( $a['activities'] );
     }