Changeset 10457

Timestamp:

01/19/2016 07:55:22 PM (9 years ago)

Author:

imath

Message:

Make sure notifications are marked as read when loading new mentions from the activity directory.

When a user has new mentions, the mentions tab of the activity directory displays the count of the new mantions available. When clicking on this tab, we need to make sure the corresponding notification entries are marked as read by the Notifications component.

Fixes #6687

Location:

trunk

Files:

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

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

@@ -134 +134 @@
     bp_delete_user_meta( $user_id, 'bp_new_mention_count' );
     bp_delete_user_meta( $user_id, 'bp_new_mentions'      );
+
+    /**
+     * Fires once mentions has been reset for a given user.
+     *
+     * @since  2.5.0
+     *
+     * @param  int $user_id The id of the user whose unread mentions are being reset.
+     */
+    do_action( 'bp_activity_clear_new_mentions', $user_id );
 }
 

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

@@ -500 +500 @@
  *
  * @since 1.5.0
- *
+ * @since 2.5.0 Add the $user_id parameter
+ *
+ * @param int $user_id The id of the user whose notifications are marked as read.
  * @uses bp_notifications_mark_all_notifications_by_type()
  */
-function bp_activity_remove_screen_notifications() {
+function bp_activity_remove_screen_notifications( $user_id = 0 ) {
     if ( ! bp_is_active( 'notifications' ) ) {
         return;
     }
 
-    // Only mark read if you're looking at your own mentions.
-    if ( ! bp_is_my_profile() ) {
+    // Only mark read if the current user is looking at his own mentions.
+    if ( empty( $user_id ) || (int) $user_id !== (int) bp_loggedin_user_id() ) {
         return;
     }
 
-    bp_notifications_mark_notifications_by_type( bp_loggedin_user_id(), buddypress()->activity->id, 'new_at_mention' );
-}
-add_action( 'bp_activity_screen_mentions', 'bp_activity_remove_screen_notifications' );
+    bp_notifications_mark_notifications_by_type( $user_id, buddypress()->activity->id, 'new_at_mention' );
+}
+add_action( 'bp_activity_clear_new_mentions', 'bp_activity_remove_screen_notifications', 10, 1 );
 
 /**

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

@@ -243 +243 @@
 
     /**
+     * @group bp_activity_remove_screen_notifications
+     * @group mentions
+     * @ticket BP6687
+     */
+    public function test_bp_activity_remove_screen_notifications_on_new_mentions_cleared() {
+        $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' ) );
+        $this->assertEquals( 1, bp_get_total_mention_count_for_user( $this->u1 ) );
+
+        // Clear notifications for $this->u1
+        bp_activity_clear_new_mentions( $this->u1 );
+
+        $notifications = BP_Notifications_Notification::get( array(
+            'item_id' => $this->a1,
+        ) );
+
+        $this->assertEmpty( $notifications, 'Notifications should be cleared when new mention metas are removed' );
+        $this->assertEmpty( bp_get_total_mention_count_for_user( $this->u1 ) );
+    }
+
+    /**
      * Creates two notifications for $u1, one of which is for mentions
      */