Changeset 11124 for trunk/src/bp-friends/bp-friends-filters.php

Timestamp:

09/20/2016 02:42:15 PM (8 years ago)

Author:

dcavins

Message:

Use new function BP_Friends_Friendships::get_friendships().

Take advantage of the caching introduced
in BP_Friends_Friendships::get_friendships()
by using get_friendships() as the underlying function in
get_friend_user_ids(), get_friendship_id(), total_friend_count(),
check_is_friend(),
and delete_all_for_user().

Props dcavins, boonebgorges.

Fixes #6978.

File:

• trunk/src/bp-friends/bp-friends-filters.php (modified) (1 diff)

trunk/src/bp-friends/bp-friends-filters.php

@@ -29 +29 @@
 
     // Stop if user isn't logged in.
-    if ( ! is_user_logged_in() ) {
+    if ( ! $user_id = bp_loggedin_user_id() ) {
         return;
     }
 
-    $bp = buddypress();
+    $maybe_friend_ids = wp_parse_id_list( $user_ids_sql );
 
-    // Fetch whether or not the user is a friend of the current user.
-    $friend_status = $wpdb->get_results( $wpdb->prepare( "SELECT initiator_user_id, friend_user_id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id IN ( {$user_ids_sql} ) ) OR (initiator_user_id IN ( {$user_ids_sql} ) AND friend_user_id = %d )", bp_loggedin_user_id(), bp_loggedin_user_id() ) );
-
-    // Keep track of members that have a friendship status with the current user.
-    $friend_user_ids = array();
-
-    // The "friend" is the user ID in the pair who is *not* the logged in user.
-    foreach ( (array) $friend_status as $fs ) {
-        $friend_id = bp_loggedin_user_id() == $fs->initiator_user_id ? $fs->friend_user_id : $fs->initiator_user_id;
-        $friend_user_ids[] = $friend_id;
-
-        if ( isset( $user_query->results[ $friend_id ] ) ) {
-            if ( 0 == $fs->is_confirmed ) {
-                $status = $fs->initiator_user_id == bp_loggedin_user_id() ? 'pending' : 'awaiting_response';
-            } else {
-                $status = 'is_friend';
-            }
-
-            $user_query->results[ $friend_id ]->is_friend         = $fs->is_confirmed;
-            $user_query->results[ $friend_id ]->friendship_status = $status;
-        }
-    }
-
-    // The rest are not friends with the current user, so set status accordingly.
-    $not_friends = array_diff( $user_query->user_ids, $friend_user_ids );
-    foreach ( (array) $not_friends as $nf ) {
-        if ( bp_loggedin_user_id() == $nf ) {
-            continue;
-        }
-
-        if ( isset( $user_query->results[ $nf ] ) ) {
-            $user_query->results[ $nf ]->friendship_status = 'not_friends';
+    foreach ( $maybe_friend_ids as $friend_id ) {
+        $status = BP_Friends_Friendship::check_is_friend( $user_id, $friend_id );
+        $user_query->results[ $friend_id ]->friendship_status = $status;
+        if ( 'is_friend' == $status ) {
+            $user_query->results[ $friend_id ]->is_friend = 1;
         }
     }