Ticket #6780: 6780.01.patch

src/bp-friends/bp-friends-activity.php

@@ -384 +384 @@
         ) );
 }
 add_action( 'friends_friendship_accepted', 'bp_friends_friendship_accepted_activity', 10, 4 );
+
+/**
+ * Deletes friendship activity items when a user is deleted.
+ *
+ * @since 2.5.0
+ *
+ * @param int $user_id The ID of the user being deleted.
+ */
+function bp_friends_delete_activity_on_user_delete( $user_id = 0 ) {
+        if ( ! bp_is_active( 'activity' ) ) {
+                return;
+        }
+
+        bp_activity_delete( array(
+                'component'         => buddypress()->friends->id,
+                'type'              => 'friendship_created',
+                'secondary_item_id' => $user_id
+        ) );
+}
+add_action( 'friends_remove_data', 'bp_friends_delete_activity_on_user_delete' );
+ No newline at end of file

tests/phpunit/testcases/friends/activity.php

@@ -108 +108 @@
                 friends_add_friend( $u2, $u1 );
                 $friendship_id = friends_get_friendship_id( $u2, $u1 );
 
-                // Set current user to u1 to accepte the friendship
+                // Set current user to u1 to accept the friendship
                 $this->set_current_user( $u1 );
                 friends_accept_friendship( $friendship_id );
 
@@ -184 +184 @@
 
                 $this->assertTrue( count( $check['activities'] ) == 1 );
         }
+
+        /**
+         * @group friends_delete_activity
+         */
+        public function test_delete_friendship_activity_on_user_delete() {
+                $old_user = get_current_user_id();
+
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+
+                friends_add_friend( $u2, $u1 );
+                $friendship_id = friends_get_friendship_id( $u2, $u1 );
+
+                // Set current user to u1 to accept the friendship
+                $this->set_current_user( $u1 );
+                friends_accept_friendship( $friendship_id );
+
+                // Reset the current user
+                $this->set_current_user( $old_user );
+
+                // Delete $u1.
+                wp_delete_user( $u1 );
+
+                // 'friendship_created' activity item should not exist.
+                $friendship_activity = bp_activity_get( array(
+                        'component'   => buddypress()->friends->id,
+                        'filter'      => array(
+                                'action' => array( 'friendship_created' ),
+                                'primary_id' => $friendship_id,
+                        )
+                ) );
+
+                $this->assertEmpty( $friendship_activity['activities'] );
+        }
 }