Changeset 7109

Timestamp:

06/09/2020 02:51:52 AM (4 years ago)

Author:

johnjamesjacoby

Message:

BuddyPress: Mark all replies when marking topic notifications as read.

This commit fixes a regression - introduced in r6845 - that was causing marking topic notifications as read to fail. It fixes it by looping through all replies to a topic and attempting to mark them all individually. It is not a particularly optimized approach, but it does resolve the regression in such a way that accounts for both topic IDs and reply IDs.

In branches/2.6, for 2.6.6.

Fixes #3213.

File:

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

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

@@ -93 +93 @@
         $filter = 'bbp_single_new_subscription_notification';
         $text   = ! empty( $secondary_item_id )
-            ? sprintf( esc_html__( 'You have %d new reply to %2$s from %3$s', 'bbpress' ), $action_item_count, $topic_title, bp_core_get_user_displayname( $secondary_item_id ) )
-            : sprintf( esc_html__( 'You have %d new reply to %s',             'bbpress' ), $action_item_count, $topic_title );
+            ? sprintf( esc_html__( 'You have %1$d new reply to %2$s from %3$s', 'bbpress' ), $action_item_count, $topic_title, bp_core_get_user_displayname( $secondary_item_id ) )
+            : sprintf( esc_html__( 'You have %1$d new reply to %2$s',           'bbpress' ), $action_item_count, $topic_title );
     }
 
@@ -155 +155 @@
     // Notify the topic author if not the current reply author
     if ( $author_id !== $topic_author_id ) {
-        $args['secondary_item_id'] = $secondary_item_id ;
+        $args['secondary_item_id'] = $secondary_item_id;
 
         bp_notifications_add_notification( $args );
@@ -190 +190 @@
     // Get required data
     $user_id  = bp_loggedin_user_id();
-    $topic_id = intval( $_GET['topic_id'] );
+    $topic_id = absint( $_GET['topic_id'] );
+
+    // By default, Redirect to this topic ID
+    $redirect_id = $topic_id;
 
     // Check nonce
@@ -204 +207 @@
     if ( ! bbp_has_errors() ) {
 
-        // Attempt to clear notifications for the current user from this topic
-        $success = bp_notifications_mark_notifications_by_item_id( $user_id, $topic_id, bbp_get_component_name(), 'bbp_new_reply' );
+        // Get these once
+        $post_type = bbp_get_reply_post_type();
+        $component = bbp_get_component_name();
+
+        // Attempt to clear notifications for this topic
+        $marked    = bp_notifications_mark_notifications_by_item_id( $user_id, $topic_id, $component, 'bbp_new_reply' );
+
+        // Get all reply IDs for the topic
+        $replies   = bbp_get_all_child_ids( $topic_id, $post_type );
+
+        // If topic has replies
+        if ( ! empty( $replies ) ) {
+
+            // Loop through each reply and attempt to mark it
+            foreach ( $replies as $reply_id ) {
+
+                // Attempt to mark notification for this reply ID
+                $marked = bp_notifications_mark_notifications_by_item_id( $user_id, $reply_id, $component, 'bbp_new_reply' );
+
+                // If marked, redirect to this reply ID
+                if ( ! empty( $marked ) ) {
+                    $redirect_id = $reply_id;
+                }
+            }
+        }
 
         // Do additional subscriptions actions
-        do_action( 'bbp_notifications_handler', $success, $user_id, $topic_id, $action );
+        do_action( 'bbp_notifications_handler', $marked, $user_id, $topic_id, $action );
     }
 
     // Redirect to the topic
-    $redirect = bbp_get_reply_url( $topic_id );
+    $redirect = bbp_get_reply_url( $redirect_id );
 
     // Redirect