Changeset 7374 for trunk/bp-friends/bp-friends-classes.php

Timestamp:

09/07/2013 01:02:33 AM (12 years ago)

Author:

boonebgorges

Message:

Rework "Cancel Friendship Request" button UX in member directories

Member directories have friendship action buttons for each user: notably,
Add Friend for non-friends and Remove Friend for existing friends. When
A has sent a friendship request to B, the button becomes "Cancel Friendship
Request". However, it makes no sense for B to see the same button text for
the pending request, since it's not hers to cancel.

This changeset makes it so that B will see "Friendship Requested", and
the button will lead to B's Friend Requests page, so that she can accept
or reject the request using the latter existing UI.

Fixes #5157

Props terraling

File:

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

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

@@ -183 +183 @@
     }
 
-    public static function check_is_friend( $loggedin_userid, $possible_friend_userid ) {
-        global $wpdb, $bp;
-
-        if ( empty( $loggedin_userid ) || empty( $possible_friend_userid ) )
-            return false;
-
-        $result = $wpdb->get_results( $wpdb->prepare( "SELECT id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id = %d) OR (initiator_user_id = %d AND friend_user_id = %d)", $loggedin_userid, $possible_friend_userid, $possible_friend_userid, $loggedin_userid ) );
-
-        if ( !empty( $result ) ) {
+    /**
+     * Check friendship status between two users
+     *
+     * Note that 'pending' means that $initiator_userid has sent a friend
+     * request to $possible_friend_userid that has not yet been approved,
+     * while 'awaiting_response' is the other way around ($possible_friend_userid
+     * sent the initial request)
+     *
+     * @param int $initiator_userid The id of the user who is the initiator
+     *   of the potential friendship/request.
+     * @param int $possible_friend_userid The id of the user who is the
+     *   recipient of the potential friendship/request.
+     * @return string The friendship status, from among 'not_friends',
+     *   'is_friend', 'pending', and 'awaiting_response'
+     */
+    public static function check_is_friend( $initiator_userid, $possible_friend_userid ) {
+        global $wpdb, $bp;
+
+        if ( empty( $initiator_userid ) || empty( $possible_friend_userid ) ) {
+            return false;
+        }
+
+        $result = $wpdb->get_results( $wpdb->prepare( "SELECT id, initiator_user_id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id = %d) OR (initiator_user_id = %d AND friend_user_id = %d)", $initiator_userid, $possible_friend_userid, $possible_friend_userid, $initiator_userid ) );
+
+        if ( ! empty( $result ) ) {
             if ( 0 == (int) $result[0]->is_confirmed ) {
-                return 'pending';
+                $status = $initiator_userid == $result[0]->initiator_user_id ? 'pending' : 'awaiting_response';
             } else {
-                return 'is_friend';
+                $status = 'is_friend';
             }
         } else {
-            return 'not_friends';
-        }
+            $status = 'not_friends';
+        }
+
+        return $status;
     }