Changeset 12432 for trunk/src/bp-groups/classes/class-bp-group-member-query.php

Timestamp:

08/12/2019 08:43:44 PM (6 years ago)

Author:

dcavins

Message:

Update BP_Group_Member_Query for Invitation API compatibility.

• Update logic in BP_Group_Member_Query to account for the migration of unconfirmed members to the bp_invitations table.

See #6210.

File:

• trunk/src/bp-groups/classes/class-bp-group-member-query.php (modified) (2 diffs)

trunk/src/bp-groups/classes/class-bp-group-member-query.php

@@ -232 +232 @@
         $sql['order']   = 'first_joined' === $this->query_vars['type'] ? 'ASC' : 'DESC';
 
-        $this->group_member_ids = $wpdb->get_col( "{$sql['select']} {$sql['where']} {$sql['orderby']} {$sql['order']}" );
+        $group_member_ids = $wpdb->get_col( "{$sql['select']} {$sql['where']} {$sql['orderby']} {$sql['order']}" );
+
+        $invited_member_ids = array();
+
+        // If appropriate, fetch invitations and add them to the results.
+        if ( ! $is_confirmed || ! is_null( $this->query_vars['invite_sent'] ) || ! is_null( $this->query_vars['inviter_id'] ) ) {
+            $invite_args = array(
+                'item_id' => $this->query_vars['group_id'],
+                'fields'  => 'user_ids',
+                'type'    => 'all',
+            );
+
+            if ( ! is_null( $this->query_vars['invite_sent'] ) ) {
+                $invite_args['invite_sent'] = ! empty( $this->query_vars['invite_sent'] ) ? 'sent' : 'draft';
+            }
+
+            // If inviter_id.
+            if ( ! is_null( $this->query_vars['inviter_id'] ) ) {
+                $inviter_id = $this->query_vars['inviter_id'];
+
+                // Empty: inviter_id = 0. (pass false, 0, or empty array).
+                if ( empty( $inviter_id ) ) {
+                    $invite_args['type'] = 'request';
+
+                /*
+                * The string 'any' matches any non-zero value (inviter_id != 0).
+                * These are invitations, not requests.
+                */
+                } elseif ( 'any' === $inviter_id ) {
+                    $invite_args['type'] = 'invite';
+
+                // Assume that a list of inviter IDs has been passed.
+                } else {
+                    $invite_args['type'] = 'invite';
+                    // Parse and sanitize.
+                    $inviter_ids = wp_parse_id_list( $inviter_id );
+                    if ( ! empty( $inviter_ids ) ) {
+                        $invite_args['inviter_id'] = $inviter_ids;
+                    }
+                }
+            }
+
+            /*
+             * If first_joined is the "type" of query, sort the oldest
+             * requests and invitations to the top.
+             */
+            if ( 'first_joined' === $this->query_vars['type'] ) {
+                $invite_args['order_by']   = 'date_modified';
+                $invite_args['sort_order'] = 'ASC';
+            }
+
+            $invited_member_ids = groups_get_invites( $invite_args );
+        }
+
+        $this->group_member_ids = array_merge( $group_member_ids, $invited_member_ids );
 
         /**
@@ -331 +385 @@
         }
 
+        // Add accurate invitation info from the invitations table.
+        $invites = groups_get_invites( array(
+            'user_id' => $user_ids_sql,
+            'item_id' => $this->query_vars['group_id'],
+            'type'    => 'all',
+        ) );
+        foreach ( $invites as $invite ) {
+            if ( isset( $this->results[ $invite->user_id ] ) ) {
+                $this->results[ $invite->user_id ]->comments      = $invite->content;
+                $this->results[ $invite->user_id ]->is_confirmed  = 0;
+                $this->results[ $invite->user_id ]->invitation_id = $invite->id;
+                $this->results[ $invite->user_id ]->invite_sent   = (int) $invite->invite_sent;
+                $this->results[ $invite->user_id ]->inviter_id    = $invite->inviter_id;
+
+                // Backfill properties that are not being set above.
+                if ( ! isset( $this->results[ $invite->user_id ]->user_id ) ) {
+                    $this->results[ $invite->user_id ]->user_id = $invite->user_id;
+                }
+                if ( ! isset( $this->results[ $invite->user_id ]->is_admin ) ) {
+                    $this->results[ $invite->user_id ]->is_admin = 0;
+                }
+                if ( ! isset( $this->results[ $invite->user_id ]->is_mod ) ) {
+                    $this->results[ $invite->user_id ]->is_mod = 0;
+                }
+                if ( ! isset( $this->results[ $invite->user_id ]->is_banned ) ) {
+                    $this->results[ $invite->user_id ]->is_banned = 0;
+                }
+                if ( ! isset( $this->results[ $invite->user_id ]->date_modified ) ) {
+                    $this->results[ $invite->user_id ]->date_modified = $invite->date_modified;
+                }
+                if ( ! isset( $this->results[ $invite->user_id ]->user_title ) ) {
+                    $this->results[ $invite->user_id ]->user_title = '';
+                }
+                if ( ! isset( $this->results[ $invite->user_id ]->membership_id ) ) {
+                    $this->results[ $invite->user_id ]->membership_id = 0;
+                }
+            }
+        }
+
         // Don't filter other BP_User_Query objects on the same page.
         remove_action( 'bp_user_query_populate_extras', array( $this, 'populate_group_member_extras' ), 10 );