Changeset 8053

Timestamp:

03/06/2014 01:28:03 AM (11 years ago)

Author:

r-a-y

Message:

Cache the unread inbox count for a user.

This commit:

• Caches calls to BP_Messages_Thread::get_inbox_count()
• Invalidates the cache when a new message is sent or deleted
• Adds a unit test

See #5414

Location:

trunk

Files:

• bp-messages/bp-messages-cache.php (modified) (1 diff)
• bp-messages/bp-messages-classes.php (modified) (4 diffs)
• tests/testcases/messages/functions.php (added)

trunk/bp-messages/bp-messages-cache.php

@@ -25 +25 @@
 
 /**
+ * Clears unread count cache for each recipient after a message is sent.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param BP_Messages_Message $message
+ */
+function bp_messages_clear_unread_count_cache_on_message_save( BP_Messages_Message $message ) {
+    foreach ( (array) $message->recipients as $recipient ) {
+        wp_cache_delete( $recipient->user_id, 'bp_messages_unread_count' );
+    }
+}
+add_action( 'messages_message_after_save', 'bp_messages_clear_unread_count_cache_on_message_save' );
+
+/**
+ * Clears unread count cache for the logged-in user after a message is deleted.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param int|array $thread_ids If single thread, the thread ID. Otherwise, an
+ *  array of thread IDs
+ */
+function bp_messages_clear_unread_count_cache_on_message_delete( $thread_ids ) {
+    wp_cache_delete( bp_loggedin_user_id(), 'bp_messages_unread_count' );
+}
+add_action( 'messages_before_delete_thread', 'bp_messages_clear_unread_count_cache_on_message_delete' );
+
+/**
  * Invalidates cache for notices.
  * 

trunk/bp-messages/bp-messages-classes.php

@@ -301 +301 @@
         $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 0 WHERE user_id = %d AND thread_id = %d", bp_loggedin_user_id(), $thread_id );
         $wpdb->query($sql);
+
+        wp_cache_delete( bp_loggedin_user_id(), 'bp_messages_unread_count' );
     }
 
@@ -315 +317 @@
         $sql = $wpdb->prepare( "UPDATE {$bp->messages->table_name_recipients} SET unread_count = 1 WHERE user_id = %d AND thread_id = %d", bp_loggedin_user_id(), $thread_id );
         $wpdb->query($sql);
+
+        wp_cache_delete( bp_loggedin_user_id(), 'bp_messages_unread_count' );
     }
 
@@ -383 +387 @@
 
     /**
-     * Gets the inbox message count for a user.
+     * Gets the unread message count for a user.
      *
      * @since BuddyPress (1.0.0)
@@ -397 +401 @@
         }
 
-        $sql = $wpdb->prepare( "SELECT SUM(unread_count) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0 AND sender_only = 0", $user_id );
-        $unread_count = $wpdb->get_var( $sql );
-
-        if ( empty( $unread_count ) || is_wp_error( $unread_count ) ) {
-            return 0;
+        $unread_count = wp_cache_get( $user_id, 'bp_messages_unread_count' );
+
+        if ( false === $unread_count ) {
+            $unread_count = (int) $wpdb->get_var( $wpdb->prepare( "SELECT SUM(unread_count) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0 AND sender_only = 0", $user_id ) );
+
+            wp_cache_set( $user_id, $unread_count, 'bp_messages_unread_count' );
         }