Changeset 7184 for branches/2.6/src/includes/extend/buddypress/notifications.php

Timestamp:

01/04/2021 03:36:00 AM (4 years ago)

Author:

johnjamesjacoby

Message:

BuddyPress: add topic ID to bbp_new_reply notification type.

This commit adds more context to otherwise vague topic reply notifications, and also more accurately marks notifications as read when clicking on the adminbar menu to view them.

In branches/2.6 for 2.6.7. Fixes #3341.

Props konnektiv.

File:

• branches/2.6/src/includes/extend/buddypress/notifications.php (modified) (4 diffs)

branches/2.6/src/includes/extend/buddypress/notifications.php

@@ -63 +63 @@
 
     // Bail if not the notification action we are looking for
-    if ( 'bbp_new_reply' !== $component_action_name ) {
+    if ( 0 !== strpos( $component_action_name, 'bbp_new_reply' ) ) {
         return $content;
     }
@@ -87 +87 @@
     if ( $action_item_count > 1 ) {
         $filter = 'bbp_multiple_new_subscription_notification';
-        $text   = sprintf( esc_html__( 'You have %d new replies', 'bbpress' ), $action_item_count );
+        $text   = sprintf( esc_html__( 'You have %1$d new replies to %2$s', 'bbpress' ), $action_item_count, $topic_title );
 
     // Single
@@ -149 +149 @@
         'item_id'          => $reply_id,
         'component_name'   => bbp_get_component_name(),
-        'component_action' => 'bbp_new_reply',
+        'component_action' => 'bbp_new_reply_' . $topic_id,
         'date_notified'    => get_post( $reply_id )->post_date,
     );
@@ -212 +212 @@
 
         // Attempt to clear notifications for this topic
-        $marked    = bp_notifications_mark_notifications_by_item_id( $user_id, $topic_id, $component, 'bbp_new_reply' );
+        $marked    = bp_notifications_mark_notifications_by_type( $user_id, $component, 'bbp_new_reply_' . $topic_id );
 
         // Get all reply IDs for the topic