Changeset 7307

Timestamp:

06/26/2025 12:32:48 AM (6 months ago)

Author:

johnjamesjacoby

Message:

Extend - BuddyPress - Notifications: redirect to reply when clicking a notification.

This change ensures that members are redirected to the appropriate reply URL rather than the parent topic URL.

It also now marks replies before marking the topic, and combines the updated rows together.

Props cjerrells.

In branches/2.6, for 2.6.14.

Fixes #3638.

File:

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

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

@@ -207 +207 @@
     if ( ! bbp_has_errors() ) {
 
+        // Default to nothing marked
+        $reply_marked = $topic_marked = $marked = false;
+
         // 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_type( $user_id, $component, 'bbp_new_reply_' . $topic_id );
+        $c_action  = 'bbp_new_reply_' . $topic_id;
 
         // Get all reply IDs for the topic
@@ -223 +224 @@
             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' );
+                // Attempt to clear notification for this user & reply ID
+                $reply_marked = bp_notifications_mark_notifications_by_item_id( $user_id, $reply_id, $component, $c_action );
 
                 // If marked, redirect to this reply ID
-                if ( ! empty( $marked ) ) {
+                if ( ! empty( $reply_marked ) ) {
                     $redirect_id = $reply_id;
                 }
@@ -233 +234 @@
         }
 
+        // Attempt to clear notifications for this user & topic
+        $topic_marked = bp_notifications_mark_notifications_by_type( $user_id, $component, $c_action );
+
+        // Maybe combine updated/marked rows
+        if ( is_numeric( $topic_marked ) || is_numeric( $reply_marked ) ) {
+            $marked = (int) $topic_marked + (int) $reply_marked;
+        }
+
         // Do additional subscriptions actions
         do_action( 'bbp_notifications_handler', $marked, $user_id, $topic_id, $action );