Changeset 8202

Timestamp:

03/29/2014 01:00:36 AM (11 years ago)

Author:

r-a-y

Message:

Messages: Reformat new message notifications.

This commit changes the single message notification link to go
directly to the message thread in question and not the message inbox.

When the message thread is viewed, new messages are marked as read.

Fixes #5479

Location:

trunk

Files:

• bp-core/deprecated/2.0.php (modified) (1 diff)
• bp-messages/bp-messages-notifications.php (modified) (3 diffs)
• bp-messages/bp-messages-template.php (modified) (1 diff)

trunk/bp-core/deprecated/2.0.php

@@ -24 +24 @@
     _deprecated_function( __FUNCTION__, '2.0', 'bp_blogs_catch_transition_post_status()' );
 }
+
+/**
+ * @deprecated BuddyPress (2.0.0)
+ */
+function bp_messages_screen_inbox_mark_notifications() {
+    _deprecated_function( __FUNCTION__, '2.0', 'bp_messages_screen_conversation_mark_notifications()' );
+}

trunk/bp-messages/bp-messages-notifications.php

@@ -121 +121 @@
             $filter = 'bp_messages_multiple_new_message_notification';
         } else {
-            if ( !empty( $secondary_item_id ) ) {
-                $text = sprintf( __('You have %d new message from %s', 'buddypress' ), (int) $total_items, bp_core_get_user_displayname( $secondary_item_id ) );
+            // get message thread ID
+            $message   = new BP_Messages_Message( $item_id );
+            $thread_id = $message->thread_id;
+
+            $link = bp_get_message_thread_view_link( $thread_id );
+
+            if ( ! empty( $secondary_item_id ) ) {
+                $text = sprintf( __( '%2$s sent you a new private message', 'buddypress' ), bp_core_get_user_displayname( $secondary_item_id ) );
             } else {
-                $text = sprintf( __('You have %d new message',         'buddypress' ), (int) $total_items );
+                $text = sprintf( __( 'You have %d new private messages', 'buddypress' ), (int) $total_items );
             }
             $filter = 'bp_messages_single_new_message_notification';
@@ -168 +174 @@
 
 /**
- * Mark new message notifications when member views their inbox.
- *
- * @since BuddyPress (1.9.0)
- */
-function bp_messages_screen_inbox_mark_notifications() {
-    if ( bp_is_active( 'notifications' ) ) {
-        bp_notifications_mark_notifications_by_type( bp_loggedin_user_id(), buddypress()->messages->id, 'new_message' );
-    }
-}
-add_action( 'messages_screen_inbox', 'bp_messages_screen_inbox_mark_notifications', 10 );
-
-/**
  * Mark new message notification when member reads a message thread directly.
  *
@@ -186 +180 @@
 function bp_messages_screen_conversation_mark_notifications() {
     if ( bp_is_active( 'notifications' ) ) {
-        bp_notifications_mark_notifications_by_item_id( bp_loggedin_user_id(), (int) bp_action_variable( 0 ), buddypress()->messages->id, 'new_message' );
-    }
-}
-add_action( 'messages_screen_conversation', 'bp_messages_screen_inbox_mark_notifications', 10 );
+        global $thread_template;
+
+        // get unread PM notifications for the user
+        $new_pm_notifications = BP_Notifications_Notification::get( array(
+            'user_id'           => bp_loggedin_user_id(),
+            'component_name'    => buddypress()->messages->id,
+            'component_action'  => 'new_message',
+            'is_new'            => 1,
+        ) );
+        $unread_message_ids = wp_list_pluck( $new_pm_notifications, 'item_id' );
+
+        // no unread PMs, so stop!
+        if ( empty( $unread_message_ids ) ) {
+            return;
+        }
+
+        // get the unread message ids for this thread only
+        $message_ids = array_intersect( $unread_message_ids, wp_list_pluck( $thread_template->thread->messages, 'id' ) );
+
+        // mark each notification for each PM message as read
+        foreach ( $message_ids as $message_id ) {
+            bp_notifications_mark_notifications_by_item_id( bp_loggedin_user_id(), (int) $message_id, buddypress()->messages->id, 'new_message' );
+        }
+    }
+}
+add_action( 'thread_loop_start', 'bp_messages_screen_conversation_mark_notifications', 10 );
 
 /**

trunk/bp-messages/bp-messages-template.php

@@ -307 +307 @@
     }
 
-function bp_message_thread_view_link() {
-    echo bp_get_message_thread_view_link();
-}
-    function bp_get_message_thread_view_link() {
-        global $messages_template, $bp;
-        return apply_filters( 'bp_get_message_thread_view_link', trailingslashit( bp_loggedin_user_domain() . $bp->messages->slug . '/view/' . $messages_template->thread->thread_id ) );
+function bp_message_thread_view_link( $thread_id = 0 ) {
+    echo bp_get_message_thread_view_link( $thread_id );
+}
+    function bp_get_message_thread_view_link( $thread_id = 0 ) {
+        global $messages_template;
+
+        if ( empty( $messages_template ) && (int) $thread_id > 0 ) {
+            $thread_id = (int) $thread_id;
+        } else {
+            $thread_id = $messages_template->thread->thread_id;
+        }
+
+        return apply_filters( 'bp_get_message_thread_view_link', trailingslashit( bp_loggedin_user_domain() . buddypress()->messages->slug . '/view/' . $thread_id ) );
     }