Changeset 8105

Timestamp:

03/10/2014 08:36:19 PM (11 years ago)

Author:

r-a-y

Message:

Cache the friendship request user IDs for a given user.

This commit:

• Caches calls to BP_Friends_Friendship::get_friendship_request_user_ids()
• Invalidates the friend request cache when a friendship is saved or removed
• Adds unit tests

See #5435, #5414

Location:

trunk

Files:

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

trunk/bp-friends/bp-friends-cache.php

@@ -32 +32 @@
 add_action( 'friends_friendship_deleted',  'friends_clear_friend_object_cache' );
 
+/**
+ * Clear the friend request cache for the user not initiating the friendship.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param int $friend_user_id The user ID not initiating the friendship
+ */
+function bp_friends_clear_request_cache( $friend_user_id ) {
+    wp_cache_delete( $friend_user_id, 'bp_friends_requests' );
+}
+
+/**
+ * Clear the friend request cache when a friendship is saved.
+ *
+ * A friendship is deemed saved when a friendship is requested or accepted.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param int $friendship_id The friendship ID
+ * @param int $initiator_user_id The user ID initiating the friendship
+ * @param int $friend_user_id The user ID not initiating the friendship
+ */
+function bp_friends_clear_request_cache_on_save( $friendship_id, $initiator_user_id, $friend_user_id ) {
+    bp_friends_clear_request_cache( $friend_user_id );
+}
+add_action( 'friends_friendship_requested', 'bp_friends_clear_request_cache_on_save', 10, 3 );
+add_action( 'friends_friendship_accepted',  'bp_friends_clear_request_cache_on_save', 10, 3 );
+
+/**
+ * Clear the friend request cache when a friendship is removed.
+ *
+ * A friendship is deemed removed when a friendship is withdrawn or rejected.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param int $friendship_id The friendship ID
+ * @param BP_Friends_Friendship $friendship
+ */
+function bp_friends_clear_request_cache_on_remove( $friendship_id, BP_Friends_Friendship $friendship ) {
+    bp_friends_clear_request_cache( $friendship->friend_user_id );  
+}
+add_action( 'friends_friendship_withdrawn', 'bp_friends_clear_request_cache_on_remove', 10, 2 );
+add_action( 'friends_friendship_rejected',  'bp_friends_clear_request_cache_on_remove', 10, 2 );
+
 // List actions to clear super cached pages on, if super cache is installed
 add_action( 'friends_friendship_rejected',  'bp_core_clear_cache' );

trunk/bp-friends/bp-friends-classes.php

@@ -227 +227 @@
      */
     public static function get_friendship_request_user_ids( $user_id ) {
-        global $wpdb, $bp;
-
-        return $wpdb->get_col( $wpdb->prepare( "SELECT initiator_user_id FROM {$bp->friends->table_name} WHERE friend_user_id = %d AND is_confirmed = 0", $user_id ) );
+        $friend_requests = wp_cache_get( $user_id, 'bp_friends_requests' );
+
+        if ( false === $friend_requests ) {
+            global $wpdb, $bp;
+
+            $friend_requests = $wpdb->get_col( $wpdb->prepare( "SELECT initiator_user_id FROM {$bp->friends->table_name} WHERE friend_user_id = %d AND is_confirmed = 0", $user_id ) );
+
+            wp_cache_set( $user_id, $friend_requests, 'bp_friends_requests' );
+        }
+
+        return $friend_requests;
     }