Changeset 8095

Timestamp:

03/09/2014 07:29:51 PM (11 years ago)

Author:

boonebgorges

Message:

When deleting activity items, delete corresponding notifications

See #5289

Props imath

Location:

trunk

Files:

• bp-activity/bp-activity-notifications.php (modified) (1 diff)
• tests/testcases/activity/notifications.php (modified) (1 diff)

trunk/bp-activity/bp-activity-notifications.php

@@ -377 +377 @@
 add_action( 'bp_activity_screen_single_activity_permalink', 'bp_activity_remove_screen_notifications_single_activity_permalink' );
 
+/**
+ * Delete at-mention notifications when the corresponding activity item is deleted.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param array $activity_ids_deleted IDs of deleted activity items.
+ */
+function bp_activity_at_mention_delete_notification( $activity_ids_deleted = array() ) {
+    // Let's delete all without checking if content contains any mentions
+    // to avoid a query to get the activity
+    if ( bp_is_active( 'notifications' ) && ! empty( $activity_ids_deleted ) ) {
+        foreach ( $activity_ids_deleted as $activity_id ) {
+            bp_notifications_delete_all_notifications_by_type( $activity_id, buddypress()->activity->id );
+        }
+    }
+}
+add_action( 'bp_activity_deleted_activities', 'bp_activity_at_mention_delete_notification', 10 );

trunk/tests/testcases/activity/notifications.php

@@ -207 +207 @@
 
     /**
+     * @group bp_notifications_delete_all_notifications_by_type
+     * @group bp_activity_at_mention_delete_notification
+     */
+    public function test_bp_activity_at_mention_delete_notification() {
+        $this->create_notifications();
+
+        $notifications = BP_Notifications_Notification::get( array(
+            'item_id' => $this->a1,
+        ) );
+
+        // Double check it's there
+        $this->assertEquals( array( $this->a1 ), wp_list_pluck( $notifications, 'item_id' ) );
+
+        bp_activity_delete( array(
+            'id' => $this->a1,
+        ) );
+
+        $notifications = BP_Notifications_Notification::get( array(
+            'item_id' => $this->a1,
+        ) );
+
+        $this->assertEmpty( $notifications );
+    }
+
+    /**
      * Creates two notifications for $u1, one of which is for mentions
      */