Ticket #6210: 6210.01.patch

src/bp-core/admin/bp-core-admin-schema.php

@@ -54 +54 @@
         // Install the signups table.
         bp_core_maybe_install_signups();
 
-        // Notifications.
+        // Create/update the invitations table.
+        bp_core_install_invitations();
+
+        // Notifications
         if ( !empty( $active_components['notifications'] ) ) {
                 bp_core_install_notifications();
         }
@@ -564 +567 @@
          */
         do_action( 'bp_core_install_emails' );
 }
+
+/**
+ * Install database tables for the Invitations API
+ *
+ * @since 2.6.0
+ *
+ * @uses bp_core_set_charset()
+ * @uses bp_core_get_table_prefix()
+ * @uses dbDelta()
+ */
+function bp_core_install_invitations() {
+        $sql             = array();
+        $charset_collate = bp_core_set_charset();
+        $bp_prefix       = bp_core_get_table_prefix();
+        $sql[] = "CREATE TABLE {$bp_prefix}bp_invitations (
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                user_id bigint(20) NOT NULL,
+                                inviter_id bigint(20) NOT NULL,
+                                invitee_email varchar(100) DEFAULT NULL,
+                                component_name varchar(75) NOT NULL,
+                                component_action varchar(75) NOT NULL,
+                                item_id bigint(20) NOT NULL,
+                                secondary_item_id bigint(20) DEFAULT NULL,
+                                type varchar(12) NOT NULL DEFAULT 'invite',
+                                content longtext DEFAULT '',
+                                date_modified datetime NOT NULL,
+                                invite_sent tinyint(1) NOT NULL DEFAULT '0',
+                                accepted tinyint(1) NOT NULL DEFAULT '0',
+                                KEY user_id (user_id),
+                                KEY inviter_id (inviter_id),
+                                KEY invitee_email (invitee_email),
+                                KEY component_name (component_name),
+                                KEY component_action (component_action),
+                                KEY item_id (item_id),
+                                KEY secondary_item_id (secondary_item_id),
+                                KEY type (type),
+                                KEY invite_sent (invite_sent),
+                                KEY accepted (accepted)
+                                ) {$charset_collate};";
+        dbDelta( $sql );
+}

src/bp-core/bp-core-classes.php

@@ -30 +30 @@
 require dirname( __FILE__ ) . '/classes/class-bp-email.php';
 require dirname( __FILE__ ) . '/classes/class-bp-email-delivery.php';
 require dirname( __FILE__ ) . '/classes/class-bp-phpmailer.php';
+require dirname( __FILE__ ) . '/classes/class-bp-invitations-component.php';
+require dirname( __FILE__ ) . '/classes/class-bp-invitations-invitation.php';

new file src/bp-core/bp-core-invitations.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress invitations functions.
+ *
+ * @package BuddyPress
+ * @subpackage Invitations
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/** Set up ********************************************************************/
+
+/**
+ * Start the invitations component.
+ * This is a very minimal component that has no screens/navigation items of its
+ * own, only a database.
+ *
+ * @since 2.7.0
+ */
+function bp_setup_invitations_component() {
+        buddypress()->invitations = new BP_Invitations_Component();
+}
+add_action( 'bp_setup_components', 'bp_setup_invitations_component', 1 );
+
+
+/** Create ********************************************************************/
+
+/**
+ * Add an invitation to a specific user, from a specific user, related to a
+ * specific component.
+ *
+ * @since 2.7.0
+ *
+ * @param array $args {
+ *     Array of arguments describing the invitation. All are optional.
+ *         @type int    $user_id ID of the invited user.
+ *         @type int    $inviter_id ID of the user who created the invitation.
+ *         @type string $invitee_email Email address of the invited user.
+ *         @type string $component_name Name of the related component.
+ *         @type string $component_action Name of the related component action.
+ *         @type int    $item_id ID associated with the invitation and component.
+ *         @type int    $secondary_item_id secondary ID associated with the
+ *                              invitation and component.
+ *         @type string $type @TODO.
+ *         @type string $content Extra information provided by the requester
+ *                              or inviter.
+ *         @type string $date_modified Date the invitation was last modified.
+ *         @type int    $invite_sent Has the invitation been sent, or is it a
+ *                       draft invite?
+ * }
+ * @return int|bool ID of the newly created invitation on success, false
+ *         on failure.
+ */
+function bp_invitations_add_invitation( $args = array() ) {
+
+        $r = wp_parse_args( $args, array(
+                'user_id'           => 0,
+                'invitee_email'         => '',
+                'inviter_id'            => 0,
+                'component_name'    => '',
+                'component_action'  => '',
+                'item_id'           => 0,
+                'secondary_item_id' => 0,
+                'type'                          => 'invite',
+                'content'                       => '',
+                'date_modified'     => bp_core_current_time(),
+                'invite_sent'       => 0,
+                'accepted'          => 0
+        ) );
+
+        // Invitations must have an invitee and inviter.
+        if ( ! ( ( $r['user_id'] || $r['invitee_email'] ) && $r['inviter_id'] ) ) {
+                return false;
+        }
+
+        /**
+         * Is this user allowed to extend invitations from this component/item?
+         *
+         * @since 2.7.0
+         *
+         * @param array $r Describes the invitation to be added.
+         */
+        if ( ! apply_filters( 'bp_invitations_allow_invitation', true, $r ) ) {
+                return false;
+        }
+
+        // Avoid creating duplicate invitations.
+        $existing = bp_invitations_get_invitations( array(
+                'user_id'           => $r['user_id'],
+                'invitee_email'     => $r['invitee_email'],
+                'inviter_id'        => $r['inviter_id'],
+                'component_name'    => $r['component_name'],
+                'component_action'  => $r['component_action'],
+                'item_id'           => $r['item_id'],
+                'secondary_item_id' => $r['secondary_item_id'],
+        ) );
+
+        if ( $existing ) {
+                return false;
+        }
+
+        // Set up the new invitation as a draft.
+        $invitation                    = new BP_Invitations_Invitation;
+        $invitation->user_id           = $r['user_id'];
+        $invitation->inviter_id        = $r['inviter_id'];
+        $invitation->invitee_email     = $r['invitee_email'];
+        $invitation->component_name    = $r['component_name'];
+        $invitation->component_action  = $r['component_action'];
+        $invitation->item_id           = $r['item_id'];
+        $invitation->secondary_item_id = $r['secondary_item_id'];
+        $invitation->type              = $r['type'];
+        $invitation->content           = $r['content'];
+        $invitation->date_modified     = $r['date_modified'];
+        $invitation->invite_sent       = 0;
+        $invitation->accepted          = 0;
+
+        $save_success = $invitation->save();
+
+        // "Send" the invite if necessary.
+        if ( $r['invite_sent'] && $save_success ) {
+                $sent = bp_invitations_send_invitation_by_id( $save_success );
+                if ( ! $sent ) {
+                        return false;
+                }
+        }
+
+        return $save_success;
+}
+
+function bp_invitations_send_invitation_by_id( $invitation_id ) {
+        $updated = false;
+
+        $invitation = bp_invitations_get_invitation_by_id( $invitation_id );
+
+        // Different uses may need different actions on sending. Plugins can hook in here to perform their own tasks.
+        do_action( 'bp_invitations_send_invitation_by_id_before_send', $invitation_id, $invitation );
+
+        // Plugins can stop the process here.
+        $allowed = apply_filters( 'bp_invitations_send_invitation_by_id', true, $invitation_id, $invitation );
+
+        if ( $allowed ) {
+                /*
+                 * Before creating a sent invitation, check for outstanding requests to the same item.
+                 * A sent invitation + a request = acceptance.
+                 */
+                $request_args = array(
+                        'user_id'           => $invitation->user_id,
+                        'invitee_email'     => $invitation->invitee_email,
+                        'component_name'    => $invitation->component_name,
+                        'component_action'  => $invitation->component_action,
+                        'item_id'           => $invitation->item_id,
+                        'secondary_item_id' => $invitation->secondary_item_id,
+                );
+                $request = bp_invitations_get_requests( $request_args );
+
+                if ( ! empty( $request ) ) {
+                        // Accept the request.
+                        return bp_invitations_accept_request( $request_args );
+                }
+
+                $updated = bp_invitations_mark_sent_by_id( $invitation_id );
+        }
+
+        return $updated;
+}
+
+/**
+ * Add a request to an item for a specific user, related to a
+ * specific component.
+ *
+ * @since 2.7.0
+ *
+ * @param array $args {
+ *     Array of arguments describing the invitation. All are optional.
+ *         @type int    $user_id ID of the invited user.
+ *         @type int    $inviter_id ID of the user who created the invitation.
+ *         @type string $component_name Name of the related component.
+ *         @type string $component_action Name of the related component action.
+ *         @type int    $item_id ID associated with the invitation and component.
+ *         @type int    $secondary_item_id secondary ID associated with the
+ *                              invitation and component.
+ *         @type string $type @TODO.
+ *         @type string $content Extra information provided by the requester
+ *                              or inviter.
+ *         @type string $date_modified Date the invitation was last modified.
+ *         @type int    $invite_sent Has the invitation been sent, or is it a
+ *                       draft invite?
+ * }
+ * @return int|bool ID of the newly created invitation on success, false
+ *         on failure.
+ */
+function bp_invitations_add_request( $args = array() ) {
+
+        $r = wp_parse_args( $args, array(
+                'user_id'           => 0,
+                'inviter_id'        => 0,
+                'invitee_email'     => '',
+                'component_name'    => '',
+                'component_action'  => '',
+                'item_id'           => 0,
+                'secondary_item_id' => 0,
+                'type'              => 'request',
+                'content'           => '',
+                'date_modified'     => bp_core_current_time(),
+                'invite_sent'       => 0,
+                'accepted'          => 0
+        ) );
+
+        // If there is no invitee, bail.
+        if ( ! ( $r['user_id'] ) ) {
+                return false;
+        }
+
+        /**
+         * Is the item accepting requests?
+         *
+         * @since 2.7.0
+         *
+         * @param array $r Describes the invitation to be added.
+         */
+        if ( ! apply_filters( 'bp_invitations_allow_request', true, $r ) ) {
+                return false;
+        }
+
+
+        // Check for existing duplicate requests.
+        $existing = bp_invitations_get_requests( array(
+                'user_id'           => $r['user_id'],
+                'invitee_email'     => $r['invitee_email'],
+                'component_name'    => $r['component_name'],
+                'component_action'  => $r['component_action'],
+                'item_id'           => $r['item_id'],
+                'secondary_item_id' => $r['secondary_item_id'],
+        ) );
+
+        if ( $existing ) {
+                return false;
+        }
+
+        /*
+         * Check for outstanding invitations to the same item.
+         * A request + a sent invite = acceptance.
+         */
+        $invite = bp_invitations_get_invitations( array(
+                'user_id'           => $r['user_id'],
+                'invitee_email'     => $r['invitee_email'],
+                'component_name'    => $r['component_name'],
+                'component_action'  => $r['component_action'],
+                'item_id'           => $r['item_id'],
+                'secondary_item_id' => $r['secondary_item_id'],
+                'invite_sent'       => 'sent'
+        ) );
+
+        if ( $invite ) {
+                // Accept the invite.
+                return bp_invitations_accept_invitation( array(
+                        'user_id'           => $r['user_id'],
+                        'invitee_email'     => $r['invitee_email'],
+                        'component_name'    => $r['component_name'],
+                        'component_action'  => $r['component_action'],
+                        'item_id'           => $r['item_id'],
+                        'secondary_item_id' => $r['secondary_item_id'],
+                ) );
+        } else {
+                // Set up the new invitation
+                $request                    = new BP_Invitations_Invitation;
+                $request->user_id           = $r['user_id'];
+                $request->inviter_id        = $r['inviter_id'];
+                $request->invitee_email     = $r['invitee_email'];
+                $request->component_name    = $r['component_name'];
+                $request->component_action  = $r['component_action'];
+                $request->item_id           = $r['item_id'];
+                $request->secondary_item_id = $r['secondary_item_id'];
+                $request->type              = $r['type'];
+                $request->content           = $r['content'];
+                $request->date_modified     = $r['date_modified'];
+                $request->invite_sent       = $r['invite_sent'];
+                $request->accepted          = $r['accepted'];
+
+                // Save the new invitation.
+                return $request->save();
+        }
+}
+
+/** Retrieve ******************************************************************/
+
+/**
+ * Get a specific invitation by its ID.
+ *
+ * @since 2.7.0
+ *
+ * @param int $id ID of the invitation.
+ * @return BP_Invitations_Invitation object
+ */
+function bp_invitations_get_invitation_by_id( $id ) {
+        $invitation = wp_cache_get( 'invitation_id_' . $id, 'bp_invitations' );
+        if ( false === $invitation ) {
+                $invitation = new BP_Invitations_Invitation( $id );
+                wp_cache_set( 'invitation_id_' . $id, $invitation, 'bp_invitations' );
+        }
+        return $invitation;
+}
+
+/**
+ * Get invitations, based on provided filter parameters.
+ *
+ * @since 2.7.0
+ *
+ * @param array $args {
+ *     Associative array of arguments. All arguments but $page and
+ *     $per_page can be treated as filter values for get_where_sql()
+ *     and get_query_clauses(). All items are optional.
+ *     @type int|array    $id                ID of invitation being updated.
+ *                                           Can be an array of IDs.
+ *     @type int|array    $user_id           ID of user being queried. Can be an
+ *                                           Can be an array of IDs.
+ *     @type int|array    $inviter_id        ID of user who created the
+ *                                           invitation. Can be an array of IDs.
+ *     @type string|array $invitee_email     Email address of invited users
+ *                                                       being queried. Can be an array of
+ *                                           addresses.
+ *     @type string|array $component_name    Name of the component to filter by.
+ *                                           Can be an array of component names.
+ *     @type string|array $component_action  Name of the action to filter by.
+ *                                           Can be an array of actions.
+ *     @type int|array    $item_id           ID of associated item.
+ *                                           Can be an array of multiple item IDs.
+ *     @type int|array    $secondary_item_id ID of secondary associated item.
+ *                                           Can be an array of multiple IDs.
+ *     @type string|array $type              Type of item. An "invite" is sent
+ *                                           from one user to another.
+ *                                           A "request" is submitted by a
+ *                                           user and no inviter is required.
+ *                                           'all' returns all. Default: 'all'.
+ *     @type string       $invite_sent       Limit to draft, sent or all
+ *                                           'draft' limits to unsent invites,
+ *                                           'sent' returns only sent invites,
+ *                                           'all' returns all. Default: 'all'.
+ *     @type bool         $accepted          Limit to accepted or
+ *                                           not-yet-accepted invitations.
+ *                                           'accepted' returns accepted invites,
+ *                                           'pending' returns pending invites,
+ *                                           'all' returns all. Default: 'pending'
+ *     @type string       $search_terms      Term to match against component_name
+ *                                           or component_action fields.
+ *     @type string       $order_by          Database column to order by.
+ *     @type string       $sort_order        Either 'ASC' or 'DESC'.
+ *     @type string       $order_by          Field to order results by.
+ *     @type string       $sort_order        ASC or DESC.
+ *     @type int          $page              Number of the current page of results.
+ *                                           Default: false (no pagination,
+ *                                           all items).
+ *     @type int          $per_page          Number of items to show per page.
+ *                                           Default: false (no pagination,
+ *                                           all items).
+ * }
+ *
+ * @return array Located invitations.
+ */
+function bp_invitations_get_invitations( $args ) {
+        // Default to returning invitations, not requests.
+        if ( empty( $args['type'] ) ) {
+                $args['type'] = 'invite';
+        }
+        return BP_Invitations_Invitation::get( $args );
+}
+
+/**
+ * Get requests, based on provided filter parameters. This is the
+ * Swiss Army Knife function. When possible, use the filter_invitations
+ * functions that take advantage of caching.
+ *
+ * @since 2.7.0
+ *
+ * @param array $args {
+ *     Associative array of arguments. All arguments but $page and
+ *     $per_page can be treated as filter values for get_where_sql()
+ *     and get_query_clauses(). All items are optional.
+ *     @type int|array    $id ID of invitation. Can be an array of IDs.
+ *     @type int|array    $user_id ID of user being queried. Can be an
+ *                        array of user IDs.
+ *     @type string|array $invitee_email Email address of invited users
+ *                                    being queried. Can be an array of addresses.
+ *     @type string|array $component_name Name of the component to
+ *                        filter by. Can be an array of component names.
+ *     @type string|array $component_action Name of the action to
+ *                        filter by. Can be an array of actions.
+ *     @type int|array    $item_id ID of associated item. Can be an array
+ *                        of multiple item IDs.
+ *     @type int|array    $secondary_item_id ID of secondary associated
+ *                        item. Can be an array of multiple IDs.
+ *     @type string       $invite_sent Limit to draft, sent or all
+ *                        invitations. 'draft' returns only unsent
+ *                        invitations, 'sent' returns only sent
+ *                        invitations, 'all' returns all. Default: 'all'.
+ *     @type string       $search_terms Term to match against
+ *                        component_name or component_action fields.
+ *     @type string       $order_by Database column to order by.
+ *     @type string       $sort_order Either 'ASC' or 'DESC'.
+ *     @type string       $order_by Field to order results by.
+ *     @type string       $sort_order ASC or DESC.
+ *     @type int          $page Number of the current page of results.
+ *                        Default: false (no pagination - all items).
+ *     @type int          $per_page Number of items to show per page.
+ *                        Default: false (no pagination - all items).
+ * }
+ * @return array Located invitations.
+ */
+function bp_invitations_get_requests( $args ) {
+        // Set request-specific parameters.
+        $args['type']        = 'request';
+        $args['inviter_id']  = 0;
+        $args['invite_sent'] = 'all';
+
+        return BP_Invitations_Invitation::get( $args );
+}
+
+/**
+ * @param array $args {
+ *     Array of optional arguments.
+ *     @type string $component_name    Name of the component to filter by.
+ *     @type string $component_action  Name of the action to filter by.
+ *     @type int    $item_id           ID of associated item. Can be an array
+ *                                     of multiple item IDs.
+ *     @type int    $secondary_item_id ID of secondary associated item.
+ *                                     Can be an array of multiple IDs.
+ *     @type string $type              Type of invite: invite or request.
+ *                                     Default: invite.
+ *     @type string $invite_sent       Limit to draft, sent or all invitations.
+ *                                     'draft' returns only unsent invitations,
+ *                                     'sent' returns only sent invitations,
+ *                                     'all' returns all. Default: 'sent'.
+ *     @type bool   $accepted          Limit to accepted or not-yet-accepted
+ *                                     invitations.
+ *                                     'accepted' returns only accepted invites,
+ *                                     'pending' returns only pending invites,
+ *                                     'all' returns all. Default: 'pending'
+ *     @type string $sort_order        Order of results. 'ASC' or 'DESC'.
+ *     @type int    $page              Which page of results to return.
+ *     @type string $per_page          How many invites to include on each page
+ *                                     of results.
+ * }
+ */
+function bp_get_user_invitations( $user_id = 0, $args = array(), $invitee_email = false ) {
+        $r = bp_parse_args( $args, array(
+                'inviter_id'        => 0,
+                'component_name'    => '',
+                'component_action'  => '',
+                'item_id'           => false,
+                'secondary_item_id' => false,
+                'type'              => 'invite',
+                'invite_sent'       => 'sent',
+                'accepted'          => 'pending',
+                'orderby'           => 'id',
+                'sort_order'        => 'ASC',
+                'page'              => false,
+                'per_page'          => false
+        ), 'bp_get_user_invitations' );
+        $invitations = array();
+
+        // Two cases: we're searching by email address or user ID.
+        if ( ! empty( $invitee_email ) && is_email( $invitee_email ) ) {
+                // Get invitations out of the cache, or query for all if necessary
+                $encoded_email = rawurlencode( $invitee_email );
+                $invitations = wp_cache_get( 'all_to_user_' . $encoded_email, 'bp_invitations' );
+                if ( false === $invitations ) {
+                        $all_args = array(
+                                'invitee_email' => $invitee_email,
+                                'invite_sent' => 'all',
+                                'accepted'    => 'all'
+                        );
+                        $invitations = bp_invitations_get_invitations( $all_args );
+                        wp_cache_set( 'all_to_user_' . $encoded_email, $invitations, 'bp_invitations' );
+                }
+        } else {
+                // Default to displayed user or logged-in user if no ID is passed
+                if ( empty( $user_id ) ) {
+                        $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
+                }
+                // Get invitations out of the cache, or query for all if necessary
+                $invitations = wp_cache_get( 'all_to_user_' . $user_id, 'bp_invitations' );
+                if ( false === $invitations ) {
+                        $all_args = array(
+                                'user_id'     => $user_id,
+                                'invite_sent' => 'all',
+                                'accepted'    => 'all',
+                                'type'        => 'all'
+                        );
+                        $invitations = bp_invitations_get_invitations( $all_args );
+                        wp_cache_set( 'all_to_user_' . $user_id, $invitations, 'bp_invitations' );
+                }
+        }
+
+        // Pass the list of invitations to the filter.
+        $invitations = BP_Invitations_Invitation::filter_invitations_by_arguments( $invitations, $r );
+
+        if ( 'request' == $r['type'] ) {
+                $filter_hook_name = 'bp_get_user_requests';
+        } else {
+                $filter_hook_name = 'bp_get_user_invitations';
+        }
+
+        /**
+         * Fires before finalization of group creation and cookies are set.
+         *
+         * This hook is a variable hook dependent on the current step
+         * in the creation process.
+         *
+         * @since 2.7.0
+         */
+        return apply_filters( $filter_hook_name, $invitations, $user_id, $args );
+}
+
+function bp_get_user_requests( $user_id = 0, $args = array() ){
+        // Requests are a type of invitation, so we can use our main function.
+        $args['type']        = 'request';
+        // Passing 'all' ensures that all statuses are returned.
+        $args['invite_sent'] = 'all';
+
+        // Filter the results on the `bp_get_user_requests` hook.
+        return bp_get_user_invitations( $user_id, $args );
+}
+
+/**
+ * Get outgoing invitations from a user.
+ * We get and cache all of the outgoing invitations from a user. We'll
+ * filter the complete result set in PHP, in order to take advantage of
+ * the cache.
+ *
+ * @since 2.7.0
+ *
+ * @param array $args {
+ *     Array of optional arguments.
+ *     @type int|array    $user_id ID of user being queried. Can be an
+ *                        array of user IDs.
+ *     @type string|array $invitee_email Email address of invited users
+ *                                    being queried. Can be an array of addresses.
+ *     @type string|array $component_name Name of the component to
+ *                        filter by. Can be an array of component names.
+ *     @type string|array $component_action Name of the action to
+ *                        filter by. Can be an array of actions.
+ *     @type int|array    $item_id ID of associated item. Can be an array
+ *                        of multiple item IDs.
+ *     @type int|array    $secondary_item_id ID of secondary associated
+ *                        item. Can be an array of multiple IDs.
+ *     @type string       $invite_sent Limit to draft, sent or all
+ *                        invitations. 'draft' returns only unsent
+ *                        invitations, 'sent' returns only sent
+ *                        invitations, 'all' returns all. Default: 'all'.
+ *     @type string       $order_by Database column to order by.
+ *     @type string       $sort_order Either 'ASC' or 'DESC'.
+ * }
+ * @return array $invitations Array of invitation results.
+ *               (Returns an empty array if none found.)
+ */
+function bp_get_invitations_from_user( $inviter_id = 0, $args = array() ) {
+        $r = bp_parse_args( $args, array(
+                'component_name'    => '',
+                'component_action'  => '',
+                'item_id'           => null,
+                'secondary_item_id' => null,
+                'type'              => 'invite',
+                'invite_sent'       => 'all',
+                'accepted'          => false,
+                'orderby'           => 'id',
+                'sort_order'        => 'ASC',
+                'page'              => false,
+                'per_page'          => false
+        ), 'bp_get_invitations_from_user' );
+        $invitations = array();
+
+        // Default to displayed user if no ID is passed
+        if ( empty( $inviter_id ) ) {
+                $inviter_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
+        }
+
+        // Get invitations out of the cache, or query if necessary
+        $invitations = wp_cache_get( 'all_from_user_' . $inviter_id, 'bp_invitations' );
+        if ( false === $invitations ) {
+                $args = array(
+                        'inviter_id' => $inviter_id,
+                        'invite_sent' => 'all'
+                );
+                $invitations = bp_invitations_get_invitations( $args );
+                wp_cache_set( 'all_from_user_' . $inviter_id, $invitations, 'bp_invitations' );
+        }
+
+        // Pass the list of invitations to the filter.
+        $invitations = BP_Invitations_Invitation::filter_invitations_by_arguments( $invitations, $r );
+
+        /**
+         * Fires before finalization of group creation and cookies are set.
+         *
+         * This hook is a variable hook dependent on the current step
+         * in the creation process.
+         *
+         * @since 2.7.0
+         */
+        return apply_filters( 'bp_get_invitations_from_user', $invitations, $inviter_id, $args );
+}
+
+/** Update ********************************************************************/
+
+/**
+ * Accept invitation, based on provided filter parameters.
+ *
+ * @since 2.7.0
+ *
+ * @see BP_Invitations_Invitation::get() for a description of
+ *      accepted update/where arguments.
+ *
+ * @param array $update_args Associative array of fields to update,
+ *              and the values to update them to. Of the format
+ *              array( 'user_id' => 4, 'component_name' => 'groups', )
+ *
+ * @return int|bool Number of rows updated on success, false on failure.
+ */
+function bp_invitations_accept_invitation( $args = array() ) {
+        /*
+         * Some basic info is required to accept an invitation,
+         * because we'll need to mark all similar invitations and requests.
+         * The following, except the optional 'secondary_item_id', are required.
+         */
+        $r = bp_parse_args( $args, array(
+                'user_id'           => 0,
+                'invitee_email'     => '',
+                'component_name'    => '',
+                'component_action'  => '',
+                'item_id'           => null,
+                'secondary_item_id' => null,
+        ), 'bp_get_invitations_from_user' );
+
+        if ( ! ( ( $r['user_id'] || $r['invitee_email'] ) && $r['component_name'] && $r['component_action'] && $r['item_id'] ) ) {
+                return false;
+        }
+
+        //@TODO: access check (invitee or site admin)?
+        $success = false;
+        if ( apply_filters( 'bp_invitations_accept_invitation', true, $args ) ) {
+                // Mark invitations & requests to this item for this user.
+                $success = bp_invitations_mark_accepted( $r );
+        }
+        return $success;
+}
+
+/**
+ * Accept invitation, based on provided filter parameters.
+ *
+ * @since 2.7.0
+ *
+ * @see BP_Invitations_Invitation::get() for a description of
+ *      accepted update/where arguments.
+ *
+ * @param array $update_args Associative array of fields to update,
+ *              and the values to update them to. Of the format
+ *              array( 'user_id' => 4, 'component_name' => 'groups', )
+ *
+ * @return bool Number of rows updated on success, false on failure.
+ */
+function bp_invitations_accept_request( $args = array() ) {
+        /*
+         * Some basic info is required to accept an invitation,
+         * because we'll need to accept all similar invitations and requests.
+         * The following, except the optional 'secondary_item_id', are required.
+         */
+        $r = bp_parse_args( $args, array(
+                'user_id'           => 0,
+                'component_name'    => '',
+                'component_action'  => '',
+                'item_id'           => null,
+                'secondary_item_id' => null,
+        ), 'bp_get_invitations_from_user' );
+
+        if ( ! ( $r['user_id'] && $r['component_name'] && $r['component_action'] && $r['item_id'] ) ) {
+                return false;
+        }
+
+        //@TODO: access check (object admin or site admin)?
+        $success = false;
+        if ( apply_filters( 'bp_invitations_accept_request', true, $args ) ) {
+                // Delete all related invitations & requests to this item for this user.
+                $success = bp_invitations_mark_accepted( $r );
+        }
+        return $success;
+}
+
+/**
+ * Update invitation, based on provided filter parameters.
+ *
+ * @since 2.7.0
+ *
+ * @see BP_Invitations_Invitation::get() for a description of
+ *      accepted update/where arguments.
+ *
+ * @param array $update_args Associative array of fields to update,
+ *              and the values to update them to. Of the format
+ *              array( 'user_id' => 4, 'component_name' => 'groups', )
+ * @param array $where_args Associative array of columns/values, to
+ *              determine which invitations should be updated. Formatted as
+ *              array( 'item_id' => 7, 'component_action' => 'members', )
+ * @return int|bool Number of rows updated on success, false on failure.
+ */
+function bp_invitations_update_invitation( $update_args = array(), $where_args = array() ) {
+        //@TODO: access check (invitee, inviter or site admin)?
+        return BP_Invitations_Invitation::update( $update_args, $where_args );
+}
+
+/**
+ * Mark invitation as sent by invitation ID.
+ *
+ * @since 2.7.0
+ *
+ * @param int $id The ID of the invitation to mark as sent.
+ * @return bool True on success, false on failure.
+ */
+function bp_invitations_mark_sent_by_id( $id ) {
+        //@TODO: access check (inviter or site admin)?
+        return BP_Invitations_Invitation::mark_sent( $id );
+}
+
+/**
+ * Mark invitations as sent that are found by user_id, inviter_id,
+ * invitee_email, component name and action, optional item id,
+ * optional secondary item id.
+ *
+ * @since 2.7.0
+ *
+ * @param array $args {
+ *     Associative array of arguments. All arguments but $page and
+ *     $per_page can be treated as filter values for get_where_sql()
+ *     and get_query_clauses(). All items are optional.
+ *     @type int|array    $user_id ID of user being queried. Can be an
+ *                        array of user IDs.
+ *     @type int|array    $inviter_id ID of user who created the
+ *                        invitation. Can be an array of user IDs.
+ *                        Special cases
+ *     @type string|array $invitee_email Email address of invited users
+ *                                    being queried. Can be an array of addresses.
+ *     @type string|array $component_name Name of the component to
+ *                        filter by. Can be an array of component names.
+ *     @type string|array $component_action Name of the action to
+ *                        filter by. Can be an array of actions.
+ *     @type int|array    $item_id ID of associated item. Can be an array
+ *                        of multiple item IDs.
+ *     @type int|array    $secondary_item_id ID of secondary associated
+ *                        item. Can be an array of multiple IDs.
+ * }
+ */
+function bp_invitations_mark_sent( $args ) {
+        //@TODO: access check (inviter or site admin)?
+        return BP_Invitations_Invitation::mark_sent_by_data( $args );
+}
+
+/**
+ * Mark invitation as accepted by invitation ID.
+ *
+ * @since 2.7.0
+ *
+ * @param int $id The ID of the invitation to mark as sent.
+ * @return bool True on success, false on failure.
+ */
+function bp_invitations_mark_accepted_by_id( $id ) {
+        //@TODO: access check (invitee or site admin)?
+        return BP_Invitations_Invitation::mark_accepted( $id );
+}
+
+/**
+ * Mark invitations as sent that are found by user_id, inviter_id,
+ * invitee_email, component name and action, optional item id,
+ * optional secondary item id.
+ *
+ * @since 2.7.0
+ *
+ * @param array $args {
+ *     Associative array of arguments. All arguments but $page and
+ *     $per_page can be treated as filter values for get_where_sql()
+ *     and get_query_clauses(). All items are optional.
+ *     @type int|array    $user_id ID of user being queried. Can be an
+ *                        array of user IDs.
+ *     @type int|array    $inviter_id ID of user who created the
+ *                        invitation. Can be an array of user IDs.
+ *                        Special cases
+ *     @type string|array $invitee_email Email address of invited users
+ *                                    being queried. Can be an array of addresses.
+ *     @type string|array $component_name Name of the component to
+ *                        filter by. Can be an array of component names.
+ *     @type string|array $component_action Name of the action to
+ *                        filter by. Can be an array of actions.
+ *     @type int|array    $item_id ID of associated item. Can be an array
+ *                        of multiple item IDs.
+ *     @type int|array    $secondary_item_id ID of secondary associated
+ *                        item. Can be an array of multiple IDs.
+ * }
+ */
+function bp_invitations_mark_accepted( $args ) {
+        //@TODO: access check (invitee or site admin)?
+        return BP_Invitations_Invitation::mark_accepted_by_data( $args );
+}
+
+/** Delete ********************************************************************/
+
+/**
+ * Delete a specific invitation by its ID.
+ *
+ * Used when rejecting invitations or membership requests.
+ *
+ * @since 2.7.0
+ *
+ * @param int $id ID of the invitation to delete.
+ * @return int|false Number of rows deleted on success, false on failure.
+ */
+function bp_invitations_delete_invitation_by_id( $id ) {
+        //@TODO: access check (invitee, inviter or site admin)?
+        return BP_Invitations_Invitation::delete_by_id( $id );
+}
+
+/**
+ * Delete an invitation or invitations by query data.
+ *
+ * Used when declining invitations.
+ *
+ * @since 2.7.0
+ *
+ * @see bp_invitations_get_invitations() for a description of
+ *      accepted where arguments.
+ *
+ * @param array $args {
+ *     Associative array of arguments. All arguments but $page and
+ *     $per_page can be treated as filter values for get_where_sql()
+ *     and get_query_clauses(). All items are optional.
+ *     @type int|array    $user_id ID of user being queried. Can be an
+ *                        array of user IDs.
+ *     @type int|array    $inviter_id ID of user who created the
+ *                        invitation. Can be an array of user IDs.
+ *                        Special cases
+ *     @type string|array $invitee_email Email address of invited users
+ *                                    being queried. Can be an array of addresses.
+ *     @type string|array $component_name Name of the component to
+ *                        filter by. Can be an array of component names.
+ *     @type string|array $component_action Name of the action to
+ *                        filter by. Can be an array of actions.
+ *     @type int|array    $item_id ID of associated item. Can be an array
+ *                        of multiple item IDs.
+ *     @type int|array    $secondary_item_id ID of secondary associated
+ *                        item. Can be an array of multiple IDs.
+ *     @type string       $type Invite or request.
+ * }
+ * @return int|false Number of rows deleted on success, false on failure.
+ */
+function bp_invitations_delete_invitations( $args ) {
+        //@TODO: access check (invitee, inviter or site admin)?
+        if ( empty( $args['type'] ) ) {
+                $args['type'] = 'invite';
+        }
+        return BP_Invitations_Invitation::delete( $args );
+}
+
+/**
+ * Delete a request or requests by query data.
+ *
+ * Used when rejecting membership requests.
+ *
+ * @since 2.7.0
+ *
+ * @see bp_invitations_get_invitations() for a description of
+ *      accepted where arguments.
+ *
+ * @param array $args {
+ *     Associative array of arguments. All arguments but $page and
+ *     $per_page can be treated as filter values for get_where_sql()
+ *     and get_query_clauses(). All items are optional.
+ *     @type int|array    $user_id ID of user being queried. Can be an
+ *                        array of user IDs.
+ *     @type int|array    $inviter_id ID of user who created the
+ *                        invitation. Can be an array of user IDs.
+ *                        Special cases
+ *     @type string|array $invitee_email Email address of invited users
+ *                                    being queried. Can be an array of addresses.
+ *     @type string|array $component_name Name of the component to
+ *                        filter by. Can be an array of component names.
+ *     @type string|array $component_action Name of the action to
+ *                        filter by. Can be an array of actions.
+ *     @type int|array    $item_id ID of associated item. Can be an array
+ *                        of multiple item IDs.
+ *     @type int|array    $secondary_item_id ID of secondary associated
+ *                        item. Can be an array of multiple IDs.
+ * }
+ * @return int|false Number of rows deleted on success, false on failure.
+ */
+function bp_invitations_delete_requests( $args ) {
+        //@TODO: access check
+        $args['type'] = 'request';
+        return BP_Invitations_Invitation::delete( $args );
+}
+
+/**
+ * Delete all invitations by component.
+ *
+ * Used when clearing out invitations for an entire component. Possibly used
+ * when deactivating a component that created invitations.
+ *
+ * @since 2.7.0
+ *
+ * @param string $component_name Name of the associated component.
+ * @param string $component_action Optional. Name of the associated action.
+ * @return int|false Number of rows deleted on success, false on failure.
+ */
+function bp_invitations_delete_all_invitations_by_component( $component_name, $component_action = false ) {
+        //@TODO: access check
+        return BP_Invitations_Invitation::delete( array(
+                'component_name'    => $component_name,
+                'component_action'  => $component_action,
+        ) );
+}
+
+/** Helpers *******************************************************************/
+
+/**
+ * Return an array of component names that are currently active and have
+ * registered Invitations callbacks.
+ * @TODO: Useful or not?
+ *
+ * @since 2.7.0
+ *
+ * @return array
+ */
+function bp_invitations_get_registered_components() {
+
+        // Load BuddyPress
+        $bp = buddypress();
+
+        // Setup return value
+        $component_names = array();
+
+        // Get the active components
+        $active_components = array_keys( $bp->active_components );
+
+        // Loop through components, look for callbacks, add to return value
+        foreach ( $active_components as $component ) {
+                if ( ! empty( $bp->$component->invitation_callback ) ) {
+                        $component_names[] = $component;
+                }
+        }
+
+        // Return active components with registered invitations callbacks
+        return apply_filters( 'bp_invitations_get_registered_components', $component_names, $active_components );
+}
+
+/* Caching ********************************************************************/
+
+/**
+ * Invalidate 'all_from_user_' and 'all_to_user_' caches when saving.
+ *
+ * @since 2.7.0
+ *
+ * @param BP_Invitations_Invitation $n Invitation object.
+ */
+function bp_invitations_clear_user_caches_after_save( BP_Invitations_Invitation $n ) {
+        // User_id could be empty if a non-member is being invited via email.
+        if ( $n->user_id ) {
+                wp_cache_delete( 'all_to_user_' . $n->user_id, 'bp_invitations' );
+        }
+        // Inviter_id could be empty if this is a request for membership.
+        if ( $n->inviter_id ) {
+                wp_cache_delete( 'all_from_user_' . $n->inviter_id, 'bp_invitations' );
+        }
+}
+add_action( 'bp_invitation_after_save', 'bp_invitations_clear_user_caches_after_save' );
+
+/**
+ * Invalidate 'all_from_user_' and 'all_to_user_' caches when
+ * updating or deleting.
+ *
+ * @since 2.7.0
+ *
+ * @param int $args Invitation deletion arguments.
+ */
+function bp_invitations_clear_user_caches_before_update( $args ) {
+        // Pull up a list of invitations matching the args (those about to be updated or deleted)
+        $invites = BP_Invitations_Invitation::get( $args );
+
+        $user_ids = array();
+        $inviter_ids = array();
+        foreach ( $invites as $i ) {
+                $user_ids[]     = $i->user_id;
+                $inviter_ids[]  = $i->inviter_id;
+        }
+
+        foreach ( array_unique( $user_ids ) as $user_id ) {
+                wp_cache_delete( 'all_to_user_' . $user_id, 'bp_invitations' );
+        }
+
+        foreach ( array_unique( $inviter_ids ) as $inviter_id ) {
+                wp_cache_delete( 'all_from_user_' . $inviter_id, 'bp_invitations' );
+        }
+}
+add_action( 'bp_invitation_before_update', 'bp_invitations_clear_user_caches_before_update' );
+add_action( 'bp_invitation_before_delete', 'bp_invitations_clear_user_caches_before_update' );
+ No newline at end of file

src/bp-core/bp-core-update.php

@@ -275 +275 @@
                 if ( $raw_db_version < 10440 ) {
                         bp_update_to_2_5();
                 }
+
+                // 2.5.0
+                if ( $raw_db_version < 10800 ) {
+                        bp_update_to_2_6();
+                }
         }
 
         /* All done! *************************************************************/
@@ -514 +519 @@
 }
 
 /**
+ * 2.6.0 update routine.
+ *
+ * - Create invitations table.
+ *
+ * @since 2.6.0
+ */
+function bp_update_to_2_6() {
+        bp_core_install_invitations();
+}
+
+/**
  * Updates the component field for new_members type.
  *
  * @since 2.2.0

new file src/bp-core/classes/class-bp-invitations-component.php

@@ +1 @@
+<?php
+/**
+ * Initializes the Invitations skeleton component.
+ *
+ * @package BuddyPress
+ * @subpackage Invitations
+ * @since 2.6.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Extends the component class to set up the Invitations component.
+ */
+class BP_Invitations_Component extends BP_Component {
+
+        /**
+         * Start the invitations component creation process.
+         *
+         * @since 2.6.0
+         */
+        public function __construct() {
+                parent::start(
+                        'invitations',
+                        _x( 'Invitations', 'Page <title>', 'buddypress' ),
+                        buddypress()->plugin_dir,
+                        array()
+                );
+        }
+
+        /**
+         * Include invitations component files.
+         *
+         * @since 1.9.0
+         *
+         * @see BP_Component::includes() for a description of arguments.
+         *
+         * @param array $includes See BP_Component::includes() for a description.
+         */
+        public function includes( $includes = array() ) {
+        }
+
+        /**
+         * Set up component global data.
+         *
+         * @since 2.6.0
+         *
+         * @see BP_Component::setup_globals() for a description of arguments.
+         *
+         * @param array $args See BP_Component::setup_globals() for a description.
+         */
+        public function setup_globals( $args = array() ) {
+                $bp = buddypress();
+
+                // Define a slug, if necessary.
+                if ( ! defined( 'BP_INVITATIONS_SLUG' ) ) {
+                        define( 'BP_INVITATIONS_SLUG', $this->id );
+                }
+
+                // Global tables for the invitations component.
+                $global_tables = array(
+                        'table_name'      => $bp->table_prefix . 'bp_invitations',
+                );
+
+                // All globals for the invitations component.
+                // Note that global_tables is included in this array.
+                $args = array(
+                        'slug'          => BP_INVITATIONS_SLUG,
+                        'has_directory' => false,
+                        'search_string' => __( 'Search Invitations...', 'buddypress' ),
+                        'global_tables' => $global_tables,
+                );
+
+                parent::setup_globals( $args );
+        }
+
+        /**
+         * Set up component navigation.
+         *
+         * @since 2.6.0
+         *
+         * @see BP_Component::setup_nav() for a description of arguments.
+         *
+         * @param array $main_nav Optional. See BP_Component::setup_nav() for
+         *                        description.
+         * @param array $sub_nav  Optional. See BP_Component::setup_nav() for
+         *                        description.
+         */
+        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+        }
+
+        /**
+         * Set up the component entries in the WordPress Admin Bar.
+         *
+         * @since 2.6.0
+         *
+         * @see BP_Component::setup_nav() for a description of the $wp_admin_nav
+         *      parameter array.
+         *
+         * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
+         *                            description.
+         */
+        public function setup_admin_bar( $wp_admin_nav = array() ) {
+        }
+
+        /**
+         * Set up the title for pages and <title>.
+         *
+         * @since 2.6.0
+         */
+        public function setup_title() {
+        }
+
+        /**
+         * Set up cache groups.
+         *
+         * @since 2.6.0
+         */
+        public function setup_cache_groups() {
+
+                // Global groups.
+                wp_cache_add_global_groups( array(
+                        'bp_invitations'
+                ) );
+
+                parent::setup_cache_groups();
+        }
+}

new file src/bp-core/classes/class-bp-invitations-invitation.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Invitations Class
+ *
+ * @package BuddyPress
+ * @subpackage Invitations
+ *
+ * @since 2.7.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * BuddyPress Invitations.
+ *
+ * Use this class to create, access, edit, or delete BuddyPress Invitations.
+ *
+ * @since 2.7.0
+ */
+class BP_Invitations_Invitation {
+
+        /**
+         * The invitation ID.
+         *
+         * @since 2.7.0
+         * @access public
+         * @var int
+         */
+        public $id;
+
+        /**
+         * The ID of the invited user.
+         *
+         * @since 2.7.0
+         * @access public
+         * @var int
+         */
+        public $user_id;
+
+        /**
+         * The ID of the user who created the invitation.
+         *
+         * @since 2.7.0
+         * @access public
+         * @var int
+         */
+        public $inviter_id;
+
+        /**
+         * The email address of the invited user.
+         * Used when extending an invitation to someone who does not belong to the site.
+         *
+         * @since 2.7.0
+         * @access public
+         * @var string
+         */
+        public $invitee_email;
+
+        /**
+         * The name of the related component.
+         *
+         * @since 2.7.0
+         * @access public
+         * @var string
+         */
+        public $component_name;
+
+        /**
+         * The name of the related component action.
+         *
+         * @since 2.7.0
+         * @access public
+         * @var string
+         */
+        public $component_action;
+
+        /**
+         * The ID associated with the invitation and component.
+         * Example: the group ID if a group invitation
+         *
+         * @since 2.7.0
+         * @access public
+         * @var int
+         */
+        public $item_id;
+
+        /**
+         * The secondary ID associated with the invitation and component.
+         * Example: a taxonomy term ID if invited to a site's category-specific RSS feed
+         *
+         * @since 2.7.0
+         * @access public
+         * @var int
+         */
+        public $secondary_item_id = null;
+
+
+        /**
+         * Invite or request.
+         *
+         * @since 2.7.0
+         * @access public
+         * @var string
+         */
+        public $type;
+
+        /**
+         * Extra information provided by the requester or inviter.
+         *
+         * @since 2.7.0
+         * @access public
+         * @var string
+         */
+        public $content;
+
+        /**
+         * The date the invitation was last modified.
+         *
+         * @since 2.7.0
+         * @access public
+         * @var string
+         */
+        public $date_modified;
+
+        /**
+         * Has the invitation been sent, or is it a draft invite?
+         *
+         * @since 2.7.0
+         * @access public
+         * @var bool
+         */
+        public $invite_sent;
+
+        /**
+         * Has the invitation been accepted by the invitee?
+         *
+         * @since 2.7.0
+         * @access public
+         * @var bool
+         */
+        public $accepted;
+
+        /** Public Methods ****************************************************/
+
+        /**
+         * Constructor method.
+         *
+         * @since 2.7.0
+         *
+         * @param int $id Optional. Provide an ID to access an existing
+         *        invitation item.
+         */
+        public function __construct( $id = 0 ) {
+                if ( ! empty( $id ) ) {
+                        $this->id = $id;
+                        $this->populate();
+                }
+        }
+
+        /**
+         * Update or insert invitation details into the database.
+         *
+         * @since 2.7.0
+         *
+         * @global wpdb $wpdb WordPress database object.
+         *
+         * @return bool True on success, false on failure.
+         */
+        public function save() {
+
+                // Return value
+                $retval = false;
+
+                // Default data and format
+                $data = array(
+                        'user_id'           => $this->user_id,
+                        'inviter_id'        => $this->inviter_id,
+                        'invitee_email'     => $this->invitee_email,
+                        'component_name'    => $this->component_name,
+                        'component_action'  => $this->component_action,
+                        'item_id'           => $this->item_id,
+                        'secondary_item_id' => $this->secondary_item_id,
+                        'type'              => $this->type,
+                        'content'           => $this->content,
+                        'date_modified'     => $this->date_modified,
+                        'invite_sent'       => $this->invite_sent,
+                        'accepted'          => $this->accepted,
+                );
+                $data_format = array( '%d', '%d', '%s', '%s', '%s', '%d', '%d', '%s', '%s', '%s', '%d', '%d' );
+
+                do_action_ref_array( 'bp_invitation_before_save', array( &$this ) );
+
+                // Update
+                if ( ! empty( $this->id ) ) {
+                        $result = self::_update( $data, array( 'ID' => $this->id ), $data_format, array( '%d' ) );
+                // Insert
+                } else {
+                        $result = self::_insert( $data, $data_format );
+                }
+
+                // Set the invitation ID if successful
+                if ( ! empty( $result ) && ! is_wp_error( $result ) ) {
+                        global $wpdb;
+
+                        $this->id = $wpdb->insert_id;
+                        $retval   = $wpdb->insert_id;
+                }
+
+                do_action_ref_array( 'bp_invitation_after_save', array( &$this ) );
+
+                // Return the result
+                return $retval;
+        }
+
+        /**
+         * Fetch data for an existing invitation from the database.
+         *
+         * @since 2.7.0
+         *
+         * @global BuddyPress $bp The one true BuddyPress instance.
+         * @global wpdb $wpdb WordPress database object.
+         */
+        public function populate() {
+                global $wpdb;
+                $bp = buddypress();
+
+                // Fetch the invitation
+                $invitation = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->invitations->table_name} WHERE id = %d", $this->id ) );
+
+                // Set up the invitation data
+                if ( ! empty( $invitation ) && ! is_wp_error( $invitation ) ) {
+                        $this->user_id           = $invitation->user_id;
+                        $this->inviter_id        = $invitation->inviter_id;
+                        $this->invitee_email     = $invitation->invitee_email;
+                        $this->component_name    = $invitation->component_name;
+                        $this->component_action  = $invitation->component_action;
+                        $this->item_id           = $invitation->item_id;
+                        $this->secondary_item_id = $invitation->secondary_item_id;
+                        $this->type              = $invitation->type;
+                        $this->content           = $invitation->content;
+                        $this->date_modified     = $invitation->date_modified;
+                        $this->invite_sent       = $invitation->invite_sent;
+                        $this->accepted          = $invitation->accepted;
+                }
+        }
+
+        /** Protected Static Methods ******************************************/
+
+        /**
+         * Create a invitation entry.
+         *
+         * @since 2.7.0
+         *
+         * @param array $data {
+         *     Array of invitation data, passed to {@link wpdb::insert()}.
+         *         @type int $user_id ID of the invited user.
+         *         @type int $inviter_id ID of the user who created the invitation.
+         *         @type string $invitee_email Email address of the invited user.
+         *         @type string $component_name Name of the related component.
+         *         @type string $component_action Name of the related component action.
+         *         @type int item_id ID associated with the invitation and component.
+         *         @type int secondary_item_id secondary ID associated with the
+         *                       invitation and component.
+         *         @type string content Extra information provided by the requester
+         *                       or inviter.
+         *         @type string date_modified Date the invitation was last modified.
+         *         @type int invite_sent Has the invitation been sent, or is it a
+         *                       draft invite?
+         * }
+         * @param array $data_format See {@link wpdb::insert()}.
+         * @return int|false The number of rows inserted, or false on error.
+         */
+        protected static function _insert( $data = array(), $data_format = array() ) {
+                global $wpdb;
+                return $wpdb->insert( buddypress()->invitations->table_name, $data, $data_format );
+        }
+
+        /**
+         * Update invitations.
+         *
+         * @since 2.7.0
+         *
+         * @see wpdb::update() for further description of paramater formats.
+         *
+         * @param array $data Array of invitation data to update, passed to
+         *        {@link wpdb::update()}. Accepts any property of a
+         *        BP_Invitations_Invitation object.
+         * @param array $where The WHERE params as passed to wpdb::update().
+         *        Typically consists of array( 'ID' => $id ) to specify the ID
+         *        of the item being updated. See {@link wpdb::update()}.
+         * @param array $data_format See {@link wpdb::insert()}.
+         * @param array $where_format See {@link wpdb::insert()}.
+         * @return int|false The number of rows updated, or false on error.
+         */
+        protected static function _update( $data = array(), $where = array(), $data_format = array(), $where_format = array() ) {
+                global $wpdb;
+                return $wpdb->update( buddypress()->invitations->table_name, $data, $where, $data_format, $where_format );
+        }
+
+        /**
+         * Delete invitations.
+         *
+         * @since 2.7.0
+         *
+         * @see wpdb::update() for further description of paramater formats.
+         *
+         * @param array $where Array of WHERE clauses to filter by, passed to
+         *        {@link wpdb::delete()}. Accepts any property of a
+         *        BP_Invitations_Invitation object.
+         * @param array $where_format See {@link wpdb::insert()}.
+         * @return int|false The number of rows updated, or false on error.
+         */
+        protected static function _delete( $where = array(), $where_format = array() ) {
+                global $wpdb;
+                return $wpdb->delete( buddypress()->invitations->table_name, $where, $where_format );
+        }
+
+        /**
+         * Assemble the WHERE clause of a get() SQL statement.
+         *
+         * Used by BP_Invitations_Invitation::get() to create its WHERE
+         * clause.
+         *
+         * @since 2.7.0
+         *
+         * @param array $args See {@link BP_Invitations_Invitation::get()}
+         *        for more details.
+         * @return string WHERE clause.
+         */
+        protected static function get_where_sql( $args = array() ) {
+                global $wpdb;
+
+                $where_conditions = array();
+                $where            = '';
+
+                // id
+                if ( ! empty( $args['id'] ) ) {
+                        $id_in = implode( ',', wp_parse_id_list( $args['id'] ) );
+                        $where_conditions['id'] = "id IN ({$id_in})";
+                }
+
+                // user_id
+                if ( ! empty( $args['user_id'] ) ) {
+                        $user_id_in = implode( ',', wp_parse_id_list( $args['user_id'] ) );
+                        $where_conditions['user_id'] = "user_id IN ({$user_id_in})";
+                }
+
+                // inviter_id. 0 can be meaningful, in the case of requests.
+                if ( ! empty( $args['inviter_id'] ) || 0 === $args['inviter_id'] ) {
+                        $inviter_id_in = implode( ',', wp_parse_id_list( $args['inviter_id'] ) );
+                        $where_conditions['inviter_id'] = "inviter_id IN ({$inviter_id_in})";
+                }
+
+                // invitee_email
+                if ( ! empty( $args['invitee_email'] ) ) {
+                        if ( ! is_array( $args['invitee_email'] ) ) {
+                                $invitee_emails = explode( ',', $args['invitee_email'] );
+                        } else {
+                                $invitee_emails = $args['invitee_email'];
+                        }
+
+                        $email_clean = array();
+                        foreach ( $invitee_emails as $email ) {
+                                $email_clean[] = $wpdb->prepare( '%s', $email );
+                        }
+
+                        $invitee_email_in = implode( ',', $email_clean );
+                        $where_conditions['invitee_email'] = "invitee_email IN ({$invitee_email_in})";
+                }
+
+                // component_name
+                if ( ! empty( $args['component_name'] ) ) {
+                        if ( ! is_array( $args['component_name'] ) ) {
+                                $component_names = explode( ',', $args['component_name'] );
+                        } else {
+                                $component_names = $args['component_name'];
+                        }
+
+                        $cn_clean = array();
+                        foreach ( $component_names as $cn ) {
+                                $cn_clean[] = $wpdb->prepare( '%s', $cn );
+                        }
+
+                        $cn_in = implode( ',', $cn_clean );
+                        $where_conditions['component_name'] = "component_name IN ({$cn_in})";
+                }
+
+                // component_action
+                if ( ! empty( $args['component_action'] ) ) {
+                        if ( ! is_array( $args['component_action'] ) ) {
+                                $component_actions = explode( ',', $args['component_action'] );
+                        } else {
+                                $component_actions = $args['component_action'];
+                        }
+
+                        $ca_clean = array();
+                        foreach ( $component_actions as $ca ) {
+                                $ca_clean[] = $wpdb->prepare( '%s', $ca );
+                        }
+
+                        $ca_in = implode( ',', $ca_clean );
+                        $where_conditions['component_action'] = "component_action IN ({$ca_in})";
+                }
+
+                // item_id
+                if ( ! empty( $args['item_id'] ) ) {
+                        $item_id_in = implode( ',', wp_parse_id_list( $args['item_id'] ) );
+                        $where_conditions['item_id'] = "item_id IN ({$item_id_in})";
+                }
+
+                // secondary_item_id
+                if ( ! empty( $args['secondary_item_id'] ) ) {
+                        $secondary_item_id_in = implode( ',', wp_parse_id_list( $args['secondary_item_id'] ) );
+                        $where_conditions['secondary_item_id'] = "secondary_item_id IN ({$secondary_item_id_in})";
+                }
+
+                // type
+                if ( ! empty( $args['type'] ) && 'all' !== $args['type'] ) {
+                        if ( 'invite' == $args['type'] || 'request' == $args['type'] ) {
+                                $type_clean = $wpdb->prepare( '%s', $args['type'] );
+                                $where_conditions['type'] = "type = {$type_clean}";
+                        }
+                }
+
+                // invite_sent
+                // Only create a where statement if something less than "all" has been
+                // specifically requested.
+                if ( ! empty( $args['invite_sent'] ) && 'all' !== $args['invite_sent'] ) {
+                        if ( $args['invite_sent'] == 'draft' ) {
+                                $where_conditions['invite_sent'] = "invite_sent = 0";
+                        } else if ( $args['invite_sent'] == 'sent' ) {
+                                $where_conditions['invite_sent'] = "invite_sent = 1";
+                        }
+                }
+
+                // accepted
+                if ( ! empty( $args['accepted'] ) && 'all' !== $args['accepted'] ) {
+                        if ( $args['accepted'] == 'pending' ) {
+                                $where_conditions['accepted'] = "accepted = 0";
+                        } else if ( $args['accepted'] == 'accepted' ) {
+                                $where_conditions['accepted'] = "accepted = 1";
+                        }
+                }
+
+                // search_terms
+                if ( ! empty( $args['search_terms'] ) ) {
+                        $search_terms_like = '%' . bp_esc_like( $args['search_terms'] ) . '%';
+                        $where_conditions['search_terms'] = $wpdb->prepare( "( component_name LIKE %s OR component_action LIKE %s )", $search_terms_like, $search_terms_like );
+                }
+
+                // Custom WHERE
+                if ( ! empty( $where_conditions ) ) {
+                        $where = 'WHERE ' . implode( ' AND ', $where_conditions );
+                }
+
+                return $where;
+        }
+
+        /**
+         * Assemble the ORDER BY clause of a get() SQL statement.
+         *
+         * Used by BP_Invitations_Invitation::get() to create its ORDER BY
+         * clause.
+         *
+         * @since 2.7.0
+         *
+         * @param array $args See {@link BP_Invitations_Invitation::get()}
+         *        for more details.
+         * @return string ORDER BY clause.
+         */
+        protected static function get_order_by_sql( $args = array() ) {
+
+                // Setup local variable
+                $conditions = array();
+                $retval     = '';
+
+                // Order by
+                if ( ! empty( $args['order_by'] ) ) {
+                        $order_by               = implode( ', ', (array) $args['order_by'] );
+                        $conditions['order_by'] = "{$order_by}";
+                }
+
+                // Sort order direction
+                if ( ! empty( $args['sort_order'] ) && in_array( $args['sort_order'], array( 'ASC', 'DESC' ) ) ) {
+                        $sort_order               = $args['sort_order'];
+                        $conditions['sort_order'] = "{$sort_order}";
+                }
+
+                // Custom ORDER BY
+                if ( ! empty( $conditions ) ) {
+                        $retval = 'ORDER BY ' . implode( ' ', $conditions );
+                }
+
+                return $retval;
+        }
+
+        /**
+         * Assemble the LIMIT clause of a get() SQL statement.
+         *
+         * Used by BP_Invitations_Invitation::get() to create its LIMIT clause.
+         *
+         * @since 2.7.0
+         *
+         * @param array $args See {@link BP_Invitations_Invitation::get()}
+         *        for more details.
+         * @return string LIMIT clause.
+         */
+        protected static function get_paged_sql( $args = array() ) {
+                global $wpdb;
+
+                // Setup local variable
+                $retval = '';
+
+                // Custom LIMIT
+                if ( ! empty( $args['page'] ) && ! empty( $args['per_page'] ) ) {
+                        $page     = absint( $args['page']     );
+                        $per_page = absint( $args['per_page'] );
+                        $offset   = $per_page * ( $page - 1 );
+                        $retval   = $wpdb->prepare( "LIMIT %d, %d", $offset, $per_page );
+                }
+
+                return $retval;
+        }
+
+        /**
+         * Assemble query clauses, based on arguments, to pass to $wpdb methods.
+         *
+         * The insert(), update(), and delete() methods of {@link wpdb} expect
+         * arguments of the following forms:
+         *
+         * - associative arrays whose key/value pairs are column => value, to
+         *   be used in WHERE, SET, or VALUES clauses
+         * - arrays of "formats", which tell $wpdb->prepare() which type of
+         *   value to expect when sanitizing (eg, array( '%s', '%d' ))
+         *
+         * This utility method can be used to assemble both kinds of params,
+         * out of a single set of associative array arguments, such as:
+         *
+         *     $args = array(
+         *         'user_id' => 4,
+         *         'component_name' => 'groups',
+         *     );
+         *
+         * This will be converted to:
+         *
+         *     array(
+         *         'data' => array(
+         *             'user_id' => 4,
+         *             'component_name' => 'groups',
+         *         ),
+         *         'format' => array(
+         *             '%d',
+         *             '%s',
+         *         ),
+         *     )
+         *
+         * which can easily be passed as arguments to the $wpdb methods.
+         *
+         * @since 2.7.0
+         *
+         * @param $args Associative array of filter arguments.
+         *        See {@BP_Invitations_Invitation::get()} for a breakdown.
+         * @return array Associative array of 'data' and 'format' args.
+         */
+        protected static function get_query_clauses( $args = array() ) {
+                $where_clauses = array(
+                        'data'   => array(),
+                        'format' => array(),
+                );
+
+                // id
+                if ( ! empty( $args['id'] ) ) {
+                        $where_clauses['data']['id'] = absint( $args['id'] );
+                        $where_clauses['format'][] = '%d';
+                }
+
+                // user_id
+                if ( ! empty( $args['user_id'] ) ) {
+                        $where_clauses['data']['user_id'] = absint( $args['user_id'] );
+                        $where_clauses['format'][] = '%d';
+                }
+
+                // inviter_id
+                if ( ! empty( $args['inviter_id'] ) ) {
+                        $where_clauses['data']['inviter_id'] = absint( $args['inviter_id'] );
+                        $where_clauses['format'][] = '%d';
+                }
+
+                // invitee_email
+                if ( ! empty( $args['invitee_email'] ) ) {
+                        $where_clauses['data']['invitee_email'] = $args['invitee_email'];
+                        $where_clauses['format'][] = '%s';
+                }
+
+                // component_name
+                if ( ! empty( $args['component_name'] ) ) {
+                        $where_clauses['data']['component_name'] = $args['component_name'];
+                        $where_clauses['format'][] = '%s';
+                }
+
+                // component_action
+                if ( ! empty( $args['component_action'] ) ) {
+                        $where_clauses['data']['component_action'] = $args['component_action'];
+                        $where_clauses['format'][] = '%s';
+                }
+
+                // item_id
+                if ( ! empty( $args['item_id'] ) ) {
+                        $where_clauses['data']['item_id'] = absint( $args['item_id'] );
+                        $where_clauses['format'][] = '%d';
+                }
+
+                // secondary_item_id
+                if ( ! empty( $args['secondary_item_id'] ) ) {
+                        $where_clauses['data']['secondary_item_id'] = absint( $args['secondary_item_id'] );
+                        $where_clauses['format'][] = '%d';
+                }
+
+                // type
+                if ( ! empty( $args['type'] ) && 'all' !== $args['type'] ) {
+                        if ( 'invite' == $args['type'] || 'request' == $args['type'] ) {
+                                $where_clauses['data']['type'] = $args['type'];
+                                $where_clauses['format'][] = '%s';
+                        }
+                }
+
+                // invite_sent
+                // Only create a where statement if something less than "all" has been
+                // specifically requested.
+                if ( ! empty( $args['invite_sent'] ) && 'all' !== $args['invite_sent'] ) {
+                        if ( $args['invite_sent'] == 'draft' ) {
+                                $where_clauses['data']['invite_sent'] = 0;
+                                $where_clauses['format'][] = '%d';
+                        } else if ( $args['invite_sent'] == 'sent' ) {
+                                $where_clauses['data']['invite_sent'] = 1;
+                                $where_clauses['format'][] = '%d';
+                        }
+                }
+
+                // accepted
+                if ( ! empty( $args['accepted'] ) && 'all' !== $args['accepted'] ) {
+                        if ( $args['accepted'] == 'pending' ) {
+                                $where_clauses['data']['accepted'] = 0;
+                                $where_clauses['format'][] = '%d';
+                        } else if ( $args['accepted'] == 'accepted' ) {
+                                $where_clauses['data']['accepted'] = 1;
+                                $where_clauses['format'][] = '%d';
+                        }
+                }
+
+                return $where_clauses;
+        }
+
+        /** Public Static Methods *********************************************/
+
+        /**
+         * @TODO: use?
+         * Check that a specific invitation is for a specific user.
+         *
+         * @since 2.7.0
+         *
+         * @param int $user_id ID of the user being checked.
+         * @param int $invitation_id ID of the invitation being checked.
+         * @return bool True if the invitation belongs to the user, otherwise
+         *         false.
+         */
+        public static function check_access( $user_id, $invitation_id ) {
+                global $wpdb;
+
+                $bp = buddypress();
+
+                return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->core->table_name_invitations} WHERE id = %d AND user_id = %d", $invitation_id, $user_id ) );
+        }
+
+        /**
+         * Get invitations, based on provided filter parameters.
+         *
+         * @since 2.7.0
+         *
+         * @param array $args {
+         *     Associative array of arguments. All arguments but $page and
+         *     $per_page can be treated as filter values for get_where_sql()
+         *     and get_query_clauses(). All items are optional.
+         *     @type int|array    $id                ID of invitation being updated.
+         *                                           Can be an array of IDs.
+         *     @type int|array    $user_id           ID of user being queried. Can be an
+         *                                           Can be an array of IDs.
+         *     @type int|array    $inviter_id        ID of user who created the
+         *                                           invitation. Can be an array of IDs.
+         *     @type string|array $invitee_email     Email address of invited users
+         *                                                       being queried. Can be an array of
+         *                                           addresses.
+         *     @type string|array $component_name    Name of the component to filter by.
+         *                                           Can be an array of component names.
+         *     @type string|array $component_action  Name of the action to filter by.
+         *                                           Can be an array of actions.
+         *     @type int|array    $item_id           ID of associated item.
+         *                                           Can be an array of multiple item IDs.
+         *     @type int|array    $secondary_item_id ID of secondary associated item.
+         *                                           Can be an array of multiple IDs.
+         *     @type string|array $type              Type of item. An "invite" is sent
+         *                                           from one user to another.
+         *                                           A "request" is submitted by a
+         *                                           user and no inviter is required.
+         *                                           'all' returns all. Default: 'all'.
+         *     @type string       $invite_sent       Limit to draft, sent or all
+         *                                           'draft' limits to unsent invites,
+         *                                           'sent' returns only sent invites,
+         *                                           'all' returns all. Default: 'all'.
+         *     @type bool         $accepted          Limit to accepted or
+         *                                           not-yet-accepted invitations.
+         *                                           'accepted' returns accepted invites,
+         *                                           'pending' returns pending invites,
+         *                                           'all' returns all. Default: 'pending'
+         *     @type string       $search_terms      Term to match against component_name
+         *                                           or component_action fields.
+         *     @type string       $order_by          Database column to order by.
+         *     @type string       $sort_order        Either 'ASC' or 'DESC'.
+         *     @type string       $order_by          Field to order results by.
+         *     @type string       $sort_order        ASC or DESC.
+         *     @type int          $page              Number of the current page of results.
+         *                                           Default: false (no pagination,
+         *                                           all items).
+         *     @type int          $per_page          Number of items to show per page.
+         *                                           Default: false (no pagination,
+         *                                           all items).
+         * }
+         *
+         * @return array Located invitations.
+         */
+        public static function get( $args = array() ) {
+                global $wpdb;
+
+                // Parse the arguments
+                $r  = wp_parse_args( $args, array(
+                        'id'                => false,
+                        'user_id'           => false,
+                        'inviter_id'        => false,
+                        'invitee_email'     => false,
+                        'component_name'    => bp_invitations_get_registered_components(),
+                        'component_action'  => false,
+                        'item_id'           => false,
+                        'secondary_item_id' => false,
+                        'type'              => 'all',
+                        'invite_sent'       => 'all',
+                        'accepted'          => 'pending',
+                        'search_terms'      => '',
+                        'order_by'          => false,
+                        'sort_order'        => false,
+                        'page'              => false,
+                        'per_page'          => false,
+                ) );
+
+                // SELECT
+                $select_sql = "SELECT *";
+
+                // FROM
+                $from_sql   = "FROM " . buddypress()->invitations->table_name;
+
+                // WHERE
+                $where_sql  = self::get_where_sql( array(
+                        'id'                => $r['id'],
+                        'user_id'           => $r['user_id'],
+                        'inviter_id'            => $r['inviter_id'],
+                        'invitee_email'     => $r['invitee_email'],
+                        'component_name'    => $r['component_name'],
+                        'component_action'  => $r['component_action'],
+                        'item_id'           => $r['item_id'],
+                        'secondary_item_id' => $r['secondary_item_id'],
+                        'type'              => $r['type'],
+                        'invite_sent'       => $r['invite_sent'],
+                        'accepted'          => $r['accepted'],
+                        'search_terms'      => $r['search_terms'],
+                ) );
+
+                // ORDER BY
+                $order_sql  = self::get_order_by_sql( array(
+                        'order_by'   => $r['order_by'],
+                        'sort_order' => $r['sort_order']
+                ) );
+
+                // LIMIT %d, %d
+                $pag_sql    = self::get_paged_sql( array(
+                        'page'     => $r['page'],
+                        'per_page' => $r['per_page'],
+                ) );
+
+                $sql = "{$select_sql} {$from_sql} {$where_sql} {$order_sql} {$pag_sql}";
+
+                return $wpdb->get_results( $sql );
+        }
+
+        /**
+         * Get a count of total invitations matching a set of arguments.
+         *
+         * @since 2.7.0
+         *
+         * @see BP_Invitations_Invitation::get() for a description of
+         *      arguments.
+         *
+         * @param array $args See {@link BP_Invitations_Invitation::get()}.
+         * @return int Count of located items.
+         */
+        public static function get_total_count( $args ) {
+                global $wpdb;
+
+                /**
+                 * Default component_name to active_components
+                 *
+                 * @see http://buddypress.trac.wordpress.org/ticket/5300
+                 */
+                // $args = wp_parse_args( $args, array(
+                //      'component_name' => bp_invitations_get_registered_components()
+                // ) );
+
+                // Load BuddyPress
+                $bp = buddypress();
+
+                // Build the query
+                $select_sql = "SELECT COUNT(*)";
+                $from_sql   = "FROM {$bp->invitations->table_name}";
+                $where_sql  = self::get_where_sql( $args );
+                $sql        = "{$select_sql} {$from_sql} {$where_sql}";
+
+                // Return the queried results
+                return $wpdb->get_var( $sql );
+        }
+
+        /**
+         * Update invitations.
+         *
+         * @since 2.7.0
+         *
+         * @see BP_Invitations_Invitation::get() for a description of
+         *      accepted update/where arguments.
+         *
+         * @param array $update_args Associative array of fields to update,
+         *        and the values to update them to. Of the format
+         *            array( 'user_id' => 4, 'component_name' => 'groups', )
+         * @param array $where_args Associative array of columns/values, to
+         *        determine which rows should be updated. Of the format
+         *            array( 'item_id' => 7, 'component_action' => 'members', )
+         * @return int|bool Number of rows updated on success, false on failure.
+         */
+        public static function update( $update_args = array(), $where_args = array() ) {
+                $update = self::get_query_clauses( $update_args );
+                $where  = self::get_query_clauses( $where_args  );
+
+                do_action( 'bp_invitation_before_update', $where_args, $update_args );
+
+                $retval = self::_update( $update['data'], $where['data'], $update['format'], $where['format'] );
+
+                return $retval;
+        }
+
+        /**
+         * Delete invitations.
+         *
+         * @since 2.7.0
+         *
+         * @see BP_Invitations_Invitation::get() for a description of
+         *      accepted where arguments.
+         *
+         * @param array $args Associative array of columns/values, to determine
+         *        which rows should be deleted.  Of the format
+         *            array( 'item_id' => 7, 'component_action' => 'members', )
+         * @return int|bool Number of rows deleted on success, false on failure.
+         */
+        public static function delete( $args = array() ) {
+                $where = self::get_query_clauses( $args );
+
+                do_action( 'bp_invitation_before_delete', $args );
+
+                return self::_delete( $where['data'], $where['format'] );
+        }
+
+        /** Convenience methods ***********************************************/
+
+        /**
+         * Delete a single invitation by ID.
+         *
+         * @since 2.7.0
+         *
+         * @see BP_Invitations_Invitation::delete() for explanation of
+         *      return value.
+         *
+         * @param int $id ID of the invitation item to be deleted.
+         * @return bool True on success, false on failure.
+         */
+        public static function delete_by_id( $id ) {
+                return self::delete( array(
+                        'id' => $id,
+                ) );
+        }
+
+        /** Sent status ***********************************************************/
+
+        /**
+         * Mark specific invitations as sent by invitation ID.
+         *
+         * @since 2.7.0
+         *
+         * @param int $id The ID of the invitation to mark as sent.
+         */
+        public static function mark_sent( $id = 0 ) {
+
+                if ( ! $id ) {
+                        return false;
+                }
+
+                // Values to be updated
+                $update_args = array(
+                        'invite_sent' => 1,
+                );
+
+                // WHERE clauses
+                $where_args = array(
+                        'id' => $id,
+                );
+
+                return self::update( $update_args, $where_args );
+        }
+
+        /**
+         * Mark invitations as sent that are found by user_id, inviter_id, item id, and optional
+         * secondary item id, and component name and action.
+         *
+         * @since 2.7.0
+         *
+         * @param int $user_id ID of user being invited.
+         * @param int $inviter_id ID of user who created the invitation.
+         * @param string $component_name The component that the invitations
+         *        are associated with.
+         * @param string $component_action The action that the invitations
+         *        are associated with.
+         * @param int $item_id The ID of the item associated with the
+         *        invitations.
+         * @param string $secondary_item_id Optional. ID of the secondary
+         *        associated item.
+         */
+        public static function mark_sent_by_data( $args ) {
+
+                // Values to be updated
+                $update_args = array(
+                        'invite_sent' => 1,
+                );
+
+                return self::update( $update_args, $args );
+        }
+
+        /** Accepted status ***********************************************************/
+
+        /**
+         * Mark specific invitations as accepted by invitation ID.
+         *
+         * @since 2.7.0
+         *
+         * @param int $id The ID of the invitation to mark as sent.
+         */
+        public static function mark_accepted( $id = 0 ) {
+
+                if ( ! $id ) {
+                        return false;
+                }
+
+                // Values to be updated
+                $update_args = array(
+                        'accepted' => 1,
+                );
+
+                // WHERE clauses
+                $where_args = array(
+                        'id' => $id,
+                );
+
+                return self::update( $update_args, $where_args );
+        }
+
+        /**
+         * Mark invitations as accepted that are found by user_id, inviter_id,
+         * item id, and optional secondary item id, and component name and action.
+         *
+         * @since 2.7.0
+         *
+         * @param int $user_id ID of user being invited.
+         * @param int $inviter_id ID of user who created the invitation.
+         * @param string $component_name The component that the invitations
+         *        are associated with.
+         * @param string $component_action The action that the invitations
+         *        are associated with.
+         * @param int $item_id The ID of the item associated with the
+         *        invitations.
+         * @param string $secondary_item_id Optional. ID of the secondary
+         *        associated item.
+         */
+        public static function mark_accepted_by_data( $args ) {
+
+                // Values to be updated
+                $update_args = array(
+                        'accepted' => 1,
+                );
+
+                return self::update( $update_args, $args );
+        }
+
+        /**
+         * Filter a list of invitations based on an array of arguments.
+         *
+         * @since 2.7.0
+         *
+         * @param array $invitations List of invitation objects to filter.
+         * @param array $r {
+         *     Array of optional arguments.
+         *     @type int|array    $user_id ID of user being queried. Can be an
+         *                        array of user IDs.
+         *     @type string|array $invitee_email Email address of invited users
+         *                                    being queried. Can be an array of addresses.
+         *     @type string|array $component_name Name of the component to
+         *                        filter by. Can be an array of component names.
+         *     @type string|array $component_action Name of the action to
+         *                        filter by. Can be an array of actions.
+         *     @type int|array    $item_id ID of associated item. Can be an array
+         *                        of multiple item IDs.
+         *     @type int|array    $secondary_item_id ID of secondary associated
+         *                        item. Can be an array of multiple IDs.
+         *     @type string       $invite_sent Limit to draft, sent or all
+         *                        invitations. 'draft' returns only unsent
+         *                        invitations, 'sent' returns only sent
+         *                        invitations, 'all' returns all. Default: 'all'.
+         *     @type string       $order_by Database column to order by.
+         *     @type string       $sort_order Either 'ASC' or 'DESC'.
+         * }
+         *
+         * @return array Filtered list of invitations
+         */
+        public static function filter_invitations_by_arguments( $invitations, $args ) {
+            // Normalize group data.
+                foreach ( $invitations as &$invitation ) {
+                        // Integer values.
+                        foreach ( array( 'id', 'user_id', 'inviter_id', 'item_id', 'secondary_item_id' ) as $index ) {
+                                $invitation->{$index} = intval( $invitation->{$index} );
+                        }
+                        // Boolean values.
+                        $invitation->invite_sent = (bool) $invitation->invite_sent;
+                        $invitation->accepted    = (bool) $invitation->accepted;
+                }
+                // Normalize arguments.
+                $r = wp_parse_args( $args, array(
+                        'user_id'           => false,
+                        'inviter_id'        => false,
+                        'invitee_email'     => false,
+                        'component_name'    => false,
+                        'component_action'  => false,
+                        'item_id'           => false,
+                        'secondary_item_id' => false,
+                        'type'              => false,
+                        'invite_sent'       => false,
+                        'accepted'          => false,
+                        'order_by'          => false,
+                        'sort_order'        => 'ASC',
+                        'page'              => false,
+                        'per_page'          => false,
+                ) );
+
+                // Filter the results
+                // Assemble filter array for use in `wp_list_filter()`.
+                $filters = wp_array_slice_assoc( $r, array( 'user_id', 'inviter_id', 'component_name', 'component_action', 'item_id', 'secondary_item_id', 'type', 'invite_sent', 'accepted' ) );
+
+                foreach ( $filters as $filter_name => $filter_value ) {
+                        if ( ! $filter_value ) {
+                                unset( $filters[ $filter_name ] );
+                        } elseif ( 'type' == $filter_name ) {
+                                // Special case for handling type values.
+                                switch ( $filter_value ) {
+                                        case 'invite':
+                                                $filters[ $filter_name ] = 'invite';
+                                                break;
+                                        case 'request':
+                                                $filters[ $filter_name ] = 'request';
+                                                break;
+                                        default:
+                                                // Treat any other value as 'all'--no filtering.
+                                                unset( $filters[ $filter_name ] );
+                                                break;
+                                }
+                        } elseif ( 'invite_sent' == $filter_name ) {
+                                // Special case for handling invite_sent values.
+                                switch ( $filter_value ) {
+                                        case 'draft':
+                                                $filters[ $filter_name ] = 0;
+                                                break;
+                                        case 'sent':
+                                                $filters[ $filter_name ] = 1;
+                                                break;
+                                        default:
+                                                // Treat any other value as 'all'--no filtering.
+                                                unset( $filters[ $filter_name ] );
+                                                break;
+                                }
+                        } elseif ( 'accepted' == $filter_name ) {
+                                // Special case for handling invite_sent values.
+                                switch ( $filter_value ) {
+                                        case 'pending':
+                                                $filters[ $filter_name ] = 0;
+                                                break;
+                                        case 'accepted':
+                                                $filters[ $filter_name ] = 1;
+                                                break;
+                                        default:
+                                                // Treat any other value as 'pending'--no filtering.
+                                                unset( $filters[ $filter_name ] );
+                                                break;
+                                }
+                        }
+                }
+
+                if ( ! empty( $filters ) ) {
+                        $invitations = self::invite_list_filter( $invitations, $filters );
+                }
+
+                // Sort the results on a column name.
+                if ( in_array( $r['order_by'], array( 'component_name', 'component_action', 'item_id', 'secondary_item_id' ) ) ) {
+                        $invitations = bp_sort_by_key( $invitations, $r['order_by'] );
+                }
+
+                // Adjust the sort direction of the results.
+                if ( 'DESC' === strtoupper( $r['sort_order'] ) ) {
+                        // `true` to preserve keys.
+                        $invitations = array_reverse( $invitations, true );
+                }
+
+                // Paginate the results.
+                if ( $r['per_page'] ) {
+                        $start       = ( $r['page'] - 1 ) * ( $r['per_page'] );
+                        $invitations = array_slice( $invitations, $start, $r['per_page'] );
+                }
+
+                return $invitations;
+        }
+
+        /**
+         * Filters a list of objects, based on a set of key => value arguments.
+         * Almost an exact copy of `wp_list_filter()`, this function allows the
+         * filters to be arrays of values for an `IN()` analog.
+         *
+         * @since 2.7.0
+         *
+         * @param array  $list     An array of objects to filter.
+         * @param array  $args     Optional. An array of key => value arguments to match
+         *                         against each object. Default empty array.
+         * @param string $operator Optional. The logical operation to perform. 'AND' means
+         *                         all elements from the array must match. 'OR' means only
+         *                         one element needs to match. 'NOT' means no elements may
+         *                         match. Default 'AND'.
+         * @return array Array of found values.
+         */
+        private static function invite_list_filter( $list, $args = array(), $operator = 'AND' ) {
+            if ( ! is_array( $list ) ){
+                return array();
+            }
+
+            if ( empty( $args ) ) {
+                return $list;
+            }
+
+            $operator = strtoupper( $operator );
+            $count = count( $args );
+            $filtered = array();
+
+            foreach ( $list as $key => $obj ) {
+                $to_match = (array) $obj;
+
+                $matched = 0;
+                foreach ( $args as $m_key => $m_value ) {
+                    if ( array_key_exists( $m_key, $to_match ) ) {
+                        if ( is_array( $m_value) && in_array( $to_match[ $m_key ], $m_value ) ) {
+                                $matched++;
+                        } elseif ( $m_value == $to_match[ $m_key ] ) {
+                                $matched++;
+                        }
+                    }
+                }
+
+                if ( ( 'AND' == $operator && $matched == $count )
+                  || ( 'OR' == $operator && $matched > 0 )
+                  || ( 'NOT' == $operator && 0 == $matched ) ) {
+                    $filtered[$key] = $obj;
+                }
+            }
+
+            return $filtered;
+        }
+}

src/bp-groups/bp-groups-actions.php

@@ -551 +551 @@
         ) );
 }
 add_action( 'bp_actions', 'groups_action_group_feed' );
+
+/**
+ * Clean up requests/invites when a member leaves a group.
+ *
+ * @since 2.7.0
+ *
+ * @return int|false Number of rows changed on success. False on failure.
+ */
+function groups_action_clean_up_invites_requests( $user_id, $group_id ) {
+        $bp = buddypress();
+
+        $args = array(
+                'user_id'          => $user_id,
+                'component_name'   => $bp->groups->id,
+                'component_action' => $bp->groups->id . '_invite',
+                'item_id'          => $group_id,
+                'type'             => 'all',
+                'invite_sent'      => 'all',
+                'accepted'         => 'all'
+        );
+        bp_invitations_delete_invitations( $args );
+}
+add_action( 'bp_groups_member_after_delete', 'groups_action_clean_up_invites_requests', 10, 2 );

src/bp-groups/bp-groups-functions.php

@@ -480 +480 @@
         if ( empty( $user_id ) )
                 $user_id = bp_loggedin_user_id();
 
-        // Check if the user has an outstanding invite. If so, delete it.
-        if ( groups_check_user_has_invite( $user_id, $group_id ) )
+        // Check if the user has any outstanding invites. If so, delete it.
+        if ( groups_check_user_has_invite( $user_id, $group_id ) ) {
                 groups_delete_invite( $user_id, $group_id );
+        }
 
         // Check if the user has an outstanding request. If so, delete it.
-        if ( groups_check_for_membership_request( $user_id, $group_id ) )
-                groups_delete_membership_request( null, $user_id, $group_id );
+        if ( groups_check_for_membership_request( $user_id, $group_id ) ) {
+                groups_delete_membership_request( false, $user_id, $group_id );
+        }
 
         // User is already a member, just return true.
-        if ( groups_is_user_member( $user_id, $group_id ) )
+        if ( groups_is_user_member( $user_id, $group_id ) ) {
                 return true;
+        }
 
         $new_member                = new BP_Groups_Member;
         $new_member->group_id      = $group_id;
@@ -501 +504 @@
         $new_member->date_modified = bp_core_current_time();
         $new_member->is_confirmed  = 1;
 
-        if ( !$new_member->save() )
+        if ( ! $new_member->save() )
                 return false;
 
         $bp = buddypress();
@@ -1047 +1050 @@
  */
 function groups_get_invites_for_user( $user_id = 0, $limit = false, $page = false, $exclude = false ) {
 
-        if ( empty( $user_id ) )
+        if ( empty( $user_id ) ) {
                 $user_id = bp_loggedin_user_id();
+        }
 
         return BP_Groups_Member::get_invites( $user_id, $limit, $page, $exclude );
 }
@@ -1062 +1066 @@
  * @return int
  */
 function groups_get_invite_count_for_user( $user_id = 0 ) {
+
         if ( empty( $user_id ) ) {
                 $user_id = bp_loggedin_user_id();
         }
 
-        return BP_Groups_Member::get_invite_count_for_user( $user_id );
+        $count = wp_cache_get( $user_id, 'bp_group_invite_count' );
+
+        if ( false === $count ) {
+                $count = BP_Groups_Member::get_invite_count_for_user( $user_id );
+                wp_cache_set( $user_id, $count, 'bp_group_invite_count' );
+        }
+
+        return $count;
+}
+
+/**
+ * Get an array of group IDs to which a user is invited.
+ *
+ * @since 2.7.0
+ *
+ * @param int $user_id The user ID.
+ *
+ * @return array Array of group IDs.
+ */
+function groups_get_invited_to_group_ids( $user_id = 0 ) {
+
+        if ( empty( $user_id ) ) {
+                $user_id = bp_loggedin_user_id();
+        }
+
+        return BP_Groups_Member::get_invited_to_group_ids( $user_id );
 }
 
 /**
  * Invite a user to a group.
  *
  * @since 1.0.0
+ * @since 2.7.0 Added 'content' parameter.
  *
  * @param array|string $args {
  *     Array of arguments.
@@ -1082 +1113 @@
  *                                 ID of the logged-in user.
  *     @type string $date_modified Optional. Modified date for the invitation.
  *                                 Default: current date/time.
+ *     @type string $content       Optional. Message to invitee.
  *     @type bool   $is_confirmed  Optional. Whether the invitation should be
  *                                 marked confirmed. Default: false.
  * }
@@ -1094 +1126 @@
                 'group_id'      => false,
                 'inviter_id'    => bp_loggedin_user_id(),
                 'date_modified' => bp_core_current_time(),
+                'content'       => '',
                 'is_confirmed'  => 0
         );
 
         $args = wp_parse_args( $args, $defaults );
-        extract( $args, EXTR_SKIP );
 
-        if ( ! $user_id || ! $group_id || ! $inviter_id ) {
+        if ( ! $args['user_id'] || ! $args['group_id'] || ! $args['inviter_id'] ) {
                 return false;
         }
 
         // If the user has already requested membership, accept the request.
-        if ( $membership_id = groups_check_for_membership_request( $user_id, $group_id ) ) {
-                groups_accept_membership_request( $membership_id, $user_id, $group_id );
+        if ( groups_check_for_membership_request( $args['user_id'], $args['group_id'] ) ) {
+                groups_accept_membership_request( null, $args['user_id'], $args['group_id'] );
 
         // Otherwise, create a new invitation.
-        } elseif ( ! groups_is_user_member( $user_id, $group_id ) && ! groups_check_user_has_invite( $user_id, $group_id, 'all' ) ) {
-                $invite                = new BP_Groups_Member;
-                $invite->group_id      = $group_id;
-                $invite->user_id       = $user_id;
-                $invite->date_modified = $date_modified;
-                $invite->inviter_id    = $inviter_id;
-                $invite->is_confirmed  = $is_confirmed;
-
-                if ( !$invite->save() )
+        } elseif ( ! groups_is_user_member( $args['user_id'], $args['group_id'] ) && ! groups_check_has_invite_from_user( $args['user_id'], $args['group_id'], $args['inviter_id'], 'all' ) ) {
+
+                $bp = buddypress();
+
+                $args = array(
+                        'user_id'           => $args['user_id'],
+                        'inviter_id'            => $args['inviter_id'],
+                        'component_name'    => $bp->groups->id,
+                        'component_action'  => $bp->groups->id . '_invite',
+                        'item_id'           => $args['group_id'],
+                        'content'           => $args['content'],
+                        'date_modified'     => $args['date_modified']
+                );
+                if ( ! bp_invitations_add_invitation( $args ) ) {
                         return false;
+                }
 
                 /**
                  * Fires after the creation of a new group invite.
@@ -1134 +1172 @@
 }
 
 /**
- * Uninvite a user from a group.
- *
- * Functionally, this is equivalent to removing a user from a group.
+ * Unextend a group invitation.
  *
  * @since 1.0.0
  *
- * @param int $user_id  ID of the user.
- * @param int $group_id ID of the group.
+ * @param int $user_id    ID of the user.
+ * @param int $group_id   ID of the group.
+ * @param int $inviter_id ID of the inviter.
+ *
  * @return bool True on success, false on failure.
  */
-function groups_uninvite_user( $user_id, $group_id ) {
+function groups_uninvite_user( $user_id, $group_id, $inviter_id = false ) {
 
-        if ( ! BP_Groups_Member::delete_invite( $user_id, $group_id ) )
+        if ( ! BP_Groups_Member::delete_invite( $user_id, $group_id, $inviter_id ) ) {
                 return false;
+        }
 
         /**
          * Fires after uninviting a user from a group.
          *
          * @since 1.0.0
+         * @since 2.7.0 Added $inviter_id parameter
          *
          * @param int $group_id ID of the group being uninvited from.
          * @param int $user_id  ID of the user being uninvited.
          */
-        do_action( 'groups_uninvite_user', $group_id, $user_id );
+        do_action( 'groups_uninvite_user', $group_id, $user_id, $inviter_id );
 
         return true;
 }
@@ -1174 +1214 @@
  * @return bool True when the user is a member of the group, otherwise false.
  */
 function groups_accept_invite( $user_id, $group_id ) {
+        $bp = buddypress();
+        $accept_args = array(
+                'user_id'           => $user_id,
+                'component_name'    => $bp->groups->id,
+                'component_action'  => $bp->groups->id . '_invite',
+                'item_id'           => $group_id,
+        );
 
         // If the user is already a member (because BP at one point allowed two invitations to
         // slip through), delete all existing invitations/requests and return true.
         if ( groups_is_user_member( $user_id, $group_id ) ) {
                 if ( groups_check_user_has_invite( $user_id, $group_id ) ) {
-                        groups_delete_invite( $user_id, $group_id );
+                        bp_invitations_mark_accepted( $accept_args );
                 }
 
                 if ( groups_check_for_membership_request( $user_id, $group_id ) ) {
@@ -1192 +1239 @@
         $member = new BP_Groups_Member( $user_id, $group_id );
         $member->accept_invite();
 
-        if ( !$member->save() ) {
+        if ( ! $member->save() ) {
                 return false;
         }
 
         // Remove request to join.
-        if ( $member->check_for_membership_request( $user_id, $group_id ) ) {
-                $member->delete_request( $user_id, $group_id );
+        if ( groups_check_for_membership_request( $user_id, $group_id ) ) {
+                groups_delete_membership_request( null, $user_id, $group_id );
         }
 
+        // Mark invitation as accepted.
+        bp_invitations_mark_accepted( $accept_args );
+
         // Modify group meta.
         groups_update_groupmeta( $group_id, 'last_activity', bp_core_current_time() );
 
@@ -1222 +1272 @@
  *
  * @since 1.0.0
  *
- * @param int $user_id  ID of the user.
- * @param int $group_id ID of the group.
+ * @param int $user_id    ID of the user.
+ * @param int $group_id   ID of the group.
+ * @param int $inviter_id ID of the inviter.
+ *
  * @return bool True on success, false on failure.
  */
-function groups_reject_invite( $user_id, $group_id ) {
-        if ( ! BP_Groups_Member::delete_invite( $user_id, $group_id ) )
+function groups_reject_invite( $user_id, $group_id, $inviter_id = false ) {
+        if ( ! BP_Groups_Member::delete_invite( $user_id, $group_id, $inviter_id ) ) {
                 return false;
+        }
 
         /**
          * Fires after a user rejects a group invitation.
@@ -1250 +1303 @@
  *
  * @param int $user_id  ID of the invited user.
  * @param int $group_id ID of the group.
+ * @param int $inviter_id ID of the inviter.
+ *
  * @return bool True on success, false on failure.
  */
-function groups_delete_invite( $user_id, $group_id ) {
-        if ( ! BP_Groups_Member::delete_invite( $user_id, $group_id ) )
+function groups_delete_invite( $user_id, $group_id, $inviter_id = false ) {
+        if ( ! BP_Groups_Member::delete_invite( $user_id, $group_id, $inviter_id ) ) {
                 return false;
+        }
 
         /**
          * Fires after the deletion of a group invitation.
@@ -1278 +1334 @@
  * @param int $group_id ID of the group.
  */
 function groups_send_invites( $user_id, $group_id ) {
+        $bp = buddypress();
 
-        if ( empty( $user_id ) )
+        if ( empty( $user_id ) ) {
                 $user_id = bp_loggedin_user_id();
+        }
 
         // Send friend invites.
+        $success = 0;
         $invited_users = groups_get_invites_for_group( $user_id, $group_id );
-        $group = groups_get_group( array( 'group_id' => $group_id ) );
 
-        for ( $i = 0, $count = count( $invited_users ); $i < $count; ++$i ) {
-                $member = new BP_Groups_Member( $invited_users[$i], $group_id );
+        $invite_args = array(
+                'inviter_id'       => $user_id,
+                'component_name'   => $bp->groups->id,
+                'component_action' => $bp->groups->id . '_invite',
+                'item_id'          => $group_id,
+        );
 
-                // Send the actual invite.
-                groups_notification_group_invites( $group, $member, $user_id );
+        foreach ( $invited_users as $invited_user_id ) {
+                // Send the notification and associated email.
+                groups_notification_single_group_invite( $group_id, $invited_user_id, $user_id, false );
 
-                $member->invite_sent = 1;
-                $member->save();
+                $invite_args['user_id'] = $invited_user_id;
+                if ( bp_invitations_mark_sent( $invite_args ) ) {
+                        $success++;
+                }
         }
 
         /**
@@ -1307 +1372 @@
          * @param int   $user_id       ID of the inviting user.
          */
         do_action( 'groups_send_invites', $group_id, $invited_users, $user_id );
+
+        if ( $success == count( $invited_users ) ) {
+                return true;
+        } else {
+                return false;
+        }
 }
 
 /**
@@ -1324 +1395 @@
 }
 
 /**
+ * Get invitations to a given group filtered by arguments. Cached.
+ *
+ * @since 2.7.0
+ *
+ * @param int   $group_id ID of the group.
+ * @param array $args     Invitation arguments.
+ *                        See `bp_invitations_get_invitations()` for list.
+ *
+ * @return array {
+ *                array $invites     Matching invitation objects.
+ *                int   $total_count Total number of invites to group.
+ *                }                   user but have not yet accepted.
+ */
+function groups_get_invites_for_group_by_data( $group_id, $args = array() ) {
+        return BP_Groups_Group::get_invitations_by_data( $group_id, $args );
+}
+
+/**
  * Check to see whether a user has already been invited to a group.
  *
  * By default, the function checks for invitations that have been sent.
@@ -1343 +1432 @@
 }
 
 /**
+ * Check to see whether a user has already been invited to a group by a particular user.
+ *
+ * By default, the function checks for invitations that have been sent.
+ * Entering 'all' as the $type parameter will return unsent invitations as
+ * well (useful to make sure AJAX requests are not duplicated).
+ *
+ * @since 1.0.0
+ *
+ * @param int    $user_id  ID of potential group member.
+ * @param int    $group_id ID of potential group.
+ * @param string $type     Optional. Use 'sent' to check for sent invites,
+ *                         'all' to check for all. Default: 'sent'.
+ * @return bool True if an invitation is found, otherwise false.
+ */
+function groups_check_has_invite_from_user( $user_id, $group_id, $inviter_id = 0, $type = 'sent' ) {
+        return BP_Groups_Member::check_has_invite_from_user( $user_id, $group_id, $inviter_id, $type = 'sent' );
+}
+
+/**
+ * Get the details of a single group invitation.
+ *
+ * @since 1.0.0
+ *
+ * @param int $user_id    ID of the inviting user.
+ * @param int $group_id   ID of the group.
+ * @param int $inviter_id ID of the inviting user.
+ *
+ * @return array $invitation Details of group invitation.
+ */
+function groups_get_single_invite( $user_id, $group_id, $inviter_id ) {
+        $bp = buddypress();
+
+        if ( empty( $user_id ) || empty( $group_id ) || empty( $inviter_id ) ) {
+                return false;
+        }
+
+        $args = array(
+                'inviter_id'        => $inviter_id,
+                'component_name'    => $bp->groups->id,
+                'component_action'  => $bp->groups->id . '_invite',
+                'item_id'           => $group_id,
+                'invite_sent'       => 'all',
+                'accepted'          => 'all'
+        );
+        $invite = bp_get_user_invitations( $user_id, $args );
+        if ( $invite ) {
+                return current( $invite );
+        }
+}
+
+/**
  * Delete all invitations to a given group.
  *
  * @since 1.0.0
@@ -1351 +1491 @@
  * @return int|null Number of rows records deleted on success, null on failure.
  */
 function groups_delete_all_group_invites( $group_id ) {
+        // DC: updated
         return BP_Groups_Group::delete_all_invites( $group_id );
 }
 
@@ -1535 +1676 @@
                 groups_accept_invite( $requesting_user_id, $group_id );
                 return true;
         }
+        $bp = buddypress();
+
+        $request_args = array(
+                'user_id'           => $requesting_user_id,
+                'component_name'   => $bp->groups->id,
+                'component_action' => $bp->groups->id . '_invite',
+                'item_id'           => $group_id,
+                'content'           => isset( $_POST['group-request-membership-comments'] ) ? $_POST['group-request-membership-comments'] : '',
+        );
 
-        $requesting_user                = new BP_Groups_Member;
-        $requesting_user->group_id      = $group_id;
-        $requesting_user->user_id       = $requesting_user_id;
-        $requesting_user->inviter_id    = 0;
-        $requesting_user->is_admin      = 0;
-        $requesting_user->user_title    = '';
-        $requesting_user->date_modified = bp_core_current_time();
-        $requesting_user->is_confirmed  = 0;
-        $requesting_user->comments      = isset( $_POST['group-request-membership-comments'] ) ? $_POST['group-request-membership-comments'] : '';
-
-        if ( $requesting_user->save() ) {
+        if ( $request_id = bp_invitations_add_request( $request_args ) ) {
                 $admins = groups_get_group_admins( $group_id );
 
                 // Saved okay, now send the email notification.
                 for ( $i = 0, $count = count( $admins ); $i < $count; ++$i )
-                        groups_notification_new_membership_request( $requesting_user_id, $admins[$i]->user_id, $group_id, $requesting_user->id );
+                        groups_notification_new_membership_request( $requesting_user_id, $admins[$i]->user_id, $group_id, $request_id );
 
                 /**
                  * Fires after the creation of a new membership request.
@@ -1563 +1703 @@
                  * @param int   $group_id            ID of the group being requested to.
                  * @param int   $requesting_user->id ID of the user requesting membership.
                  */
-                do_action( 'groups_membership_requested', $requesting_user_id, $admins, $group_id, $requesting_user->id );
+                do_action( 'groups_membership_requested', $requesting_user_id, $admins, $group_id, $request_id );
 
                 return true;
         }
@@ -1575 +1715 @@
  * Accept a pending group membership request.
  *
  * @since 1.0.0
+ * @since 2.7.0 Deprecated $membership_id argument.
  *
- * @param int $membership_id ID of the membership object.
- * @param int $user_id       Optional. ID of the user who requested membership.
+ * @param int $membership_id Deprecated 2.7.0. ID of the membership object.
+ * @param int $user_id       ID of the user who requested membership.
  *                           Provide this value along with $group_id to override
  *                           $membership_id.
- * @param int $group_id      Optional. ID of the group to which membership is being
+ * @param int $group_id      ID of the group to which membership is being
  *                           requested. Provide this value along with $user_id to
  *                           override $membership_id.
  * @return bool True on success, false on failure.
  */
 function groups_accept_membership_request( $membership_id, $user_id = 0, $group_id = 0 ) {
 
-        if ( !empty( $user_id ) && !empty( $group_id ) ) {
-                $membership = new BP_Groups_Member( $user_id, $group_id );
-        } else {
-                $membership = new BP_Groups_Member( false, false, $membership_id );
+        if ( ! empty( $membership_id ) ){
+                _deprecated_argument( __METHOD__, '2.0.0', sprintf( __( 'Argument `membership_id` passed to %1$s  is deprecated. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) );
         }
 
+        if ( ! $user_id || ! $group_id ) {
+                return false;
+        }
+
+        $membership = new BP_Groups_Member( $user_id, $group_id );
+
         $membership->accept_request();
 
-        if ( !$membership->save() ) {
+        if ( ! $membership->save() ) {
                 return false;
         }
 
-        // Check if the user has an outstanding invite, if so delete it.
-        if ( groups_check_user_has_invite( $membership->user_id, $membership->group_id ) ) {
-                groups_delete_invite( $membership->user_id, $membership->group_id );
-        }
+        // Mark the request & any invitations as accepted.
+        $bp = buddypress();
+        $request_args = array(
+                'user_id'          => $user_id,
+                'component_name'   => $bp->groups->id,
+                'component_action' => $bp->groups->id . '_invite',
+                'item_id'          => $group_id,
+        );
+        bp_invitations_accept_request( $request_args );
 
         /**
          * Fires after a group membership request has been accepted.
@@ -1622 +1772 @@
  * Reject a pending group membership request.
  *
  * @since 1.0.0
+ * @since 2.7.0 Deprecated $membership_id argument.
  *
- * @param int $membership_id ID of the membership object.
+ * @param int $membership_id Deprecated 2.7.0. ID of the membership object.
  * @param int $user_id       Optional. ID of the user who requested membership.
  *                           Provide this value along with $group_id to override
  *                           $membership_id.
@@ -1633 +1784 @@
  * @return bool True on success, false on failure.
  */
 function groups_reject_membership_request( $membership_id, $user_id = 0, $group_id = 0 ) {
-        if ( !$membership = groups_delete_membership_request( $membership_id, $user_id, $group_id ) ) {
+        if ( ! empty( $membership_id ) ){
+                _deprecated_argument( __METHOD__, '2.0.0', sprintf( __( 'Argument `membership_id` passed to %1$s  is deprecated. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) );
+        }
+
+        if ( ! $membership = groups_delete_membership_request( false, $user_id, $group_id ) ) {
                 return false;
         }
 
@@ -1646 +1801 @@
          * @param int  $group_id ID of the group that was rejected membership to.
          * @param bool $value    If membership was accepted.
          */
-        do_action( 'groups_membership_rejected', $membership->user_id, $membership->group_id, false );
+        do_action( 'groups_membership_rejected', $user_id, $group_id, false );
 
         return true;
 }
@@ -1655 +1810 @@
  * Delete a pending group membership request.
  *
  * @since 1.2.0
+ * @since 2.7.0 Deprecated $membership_id argument.
  *
- * @param int $membership_id ID of the membership object.
- * @param int $user_id       Optional. ID of the user who requested membership.
+ * @param int $membership_id Deprecated 2.7.0. ID of the membership object.
+ * @param int $user_id       ID of the user who requested membership.
  *                           Provide this value along with $group_id to override
  *                           $membership_id.
- * @param int $group_id      Optional. ID of the group to which membership is being
+ * @param int $group_id      ID of the group to which membership is being
  *                           requested. Provide this value along with $user_id to
  *                           override $membership_id.
  * @return bool True on success, false on failure.
  */
 function groups_delete_membership_request( $membership_id, $user_id = 0, $group_id = 0 ) {
-        if ( !empty( $user_id ) && !empty( $group_id ) )
-                $membership = new BP_Groups_Member( $user_id, $group_id );
-        else
-                $membership = new BP_Groups_Member( false, false, $membership_id );
+        if ( ! empty( $membership_id ) ){
+                _deprecated_argument( __METHOD__, '2.0.0', sprintf( __( 'Argument `membership_id` passed to %1$s  is deprecated. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) );
+        }
 
-        if ( ! BP_Groups_Member::delete_request( $membership->user_id, $membership->group_id ) )
+        if ( ! BP_Groups_Member::delete_request( $user_id, $group_id ) ) {
                 return false;
+        }
 
-        return $membership;
+        return true;
 }
 
 /**
@@ -1691 +1847 @@
 }
 
 /**
+ * Get an array of group IDs to which a user has requested membership.
+ *
+ * @since 2.7.0
+ *
+ * @param int $user_id The user ID.
+ *
+ * @return array Array of group IDs.
+ */
+function groups_get_membership_requested_group_ids( $user_id = 0 ) {
+        if ( empty( $user_id ) ) {
+                $user_id = bp_loggedin_user_id();
+        }
+
+        return BP_Groups_Member::get_membership_requested_group_ids( $user_id );
+}
+
+/**
  * Accept all pending membership requests to a group.
  *
  * @since 1.0.2
@@ -1701 +1874 @@
 function groups_accept_all_pending_membership_requests( $group_id ) {
         $user_ids = BP_Groups_Member::get_all_membership_request_user_ids( $group_id );
 
-        if ( !$user_ids )
+        if ( ! $user_ids ) {
                 return false;
+        }
 
-        foreach ( (array) $user_ids as $user_id )
+        foreach ( (array) $user_ids as $user_id ) {
                 groups_accept_membership_request( false, $user_id, $group_id );
+        }
 
         /**
          * Fires after the acceptance of all pending membership requests to a group.

src/bp-groups/bp-groups-notifications.php

@@ -257 +257 @@
                 return;
         }
 
-        // @todo $inviter_ud may be used for caching, test without it
-        $inviter_ud      = bp_core_get_core_userdata( $inviter_user_id );
         $invited_user_id = $member->user_id;
 
+        groups_notification_single_group_invite( $group->id, $invited_user_id, $inviter_user_id );
+}
+
+/**
+ * Notify a member they have been invited to a group.
+ *
+ * @since 2.7.0
+ *
+ * @param BP_Groups_Group  $group      Group object.
+ * @param int              $user_id    ID of invitee.
+ * @param int              $inviter_id ID of the user who sent the invite.
+ * @param bool             $resend     Whether to send more than one email.
+ */
+function groups_notification_single_group_invite( $group_id, $user_id, $inviter_id, $resend = false ) {
+        // Get invitation.
+        $invite = groups_get_single_invite( $user_id, $group_id, $inviter_id );
+
+        // Bail if no invite, or if member has already been notified.
+        if ( ! $invite || ( $invite->invite_sent && ! $resend ) ) {
+                return false;
+        }
+
+        // Get group object.
+        $group = groups_get_group( array( 'group_id' => $group_id ) );
+
         // Trigger a BuddyPress Notification.
         if ( bp_is_active( 'notifications' ) ) {
                 bp_notifications_add_notification( array(
-                        'user_id'          => $invited_user_id,
-                        'item_id'          => $group->id,
+                        'user_id'          => $user_id,
+                        'item_id'          => $group_id,
                         'component_name'   => buddypress()->groups->id,
                         'component_action' => 'group_invite',
                 ) );
@@ -279 +302 @@
         $invited_link = bp_core_get_user_domain( $invited_user_id ) . bp_get_groups_slug();
         $args         = array(
                 'tokens' => array(
-                        'group'        => $group,
-                        'group.url'    => bp_get_group_permalink( $group ),
-                        'group.name'   => $group->name,
-                        'inviter.name' => bp_core_get_userlink( $inviter_user_id, true, false, true ),
-                        'inviter.url'  => bp_core_get_user_domain( $inviter_user_id ),
-                        'inviter.id'   => $inviter_user_id,
-                        'invites.url'  => esc_url( $invited_link . '/invites/' ),
+                        'group'          => $group,
+                        'group.url'      => bp_get_group_permalink( $group ),
+                        'group.name'     => $group->name,
+                        'inviter.name'   => bp_core_get_userlink( $inviter_user_id, true, false, true ),
+                        'inviter.url'    => bp_core_get_user_domain( $inviter_user_id ),
+                        'inviter.id'     => $inviter_user_id,
+                        'invites.url'    => esc_url( $invited_link . '/invites/' ),
+                        'invite.content' => $invite->content,
                 ),
         );
+
         bp_send_email( 'groups-invitation', (int) $invited_user_id, $args );
 }
 

src/bp-groups/bp-groups-screens.php

@@ -1274 +1274 @@
         }
 
         $request_action = (string) bp_action_variable( 1 );
-        $membership_id  = (int) bp_action_variable( 2 );
+        $user_id        = (int) bp_action_variable( 2 );
+        $group_id       = bp_get_current_group_id();
 
-        if ( !empty( $request_action ) && !empty( $membership_id ) ) {
-                if ( 'accept' == $request_action && is_numeric( $membership_id ) ) {
+        if ( ! empty( $request_action ) && ! empty( $user_id ) ) {
+                if ( 'accept' == $request_action && is_numeric( $user_id ) ) {
 
                         // Check the nonce first.
-                        if ( !check_admin_referer( 'groups_accept_membership_request' ) )
+                        if ( ! check_admin_referer( 'groups_accept_membership_request' ) ) {
                                 return false;
+                        }
 
                         // Accept the membership request.
-                        if ( !groups_accept_membership_request( $membership_id ) )
+                        if ( ! groups_accept_membership_request( false, $user_id, $group_id ) ) {
                                 bp_core_add_message( __( 'There was an error accepting the membership request. Please try again.', 'buddypress' ), 'error' );
-                        else
+                        } else {
                                 bp_core_add_message( __( 'Group membership request accepted', 'buddypress' ) );
+                        }
 
-                } elseif ( 'reject' == $request_action && is_numeric( $membership_id ) ) {
+                } elseif ( 'reject' == $request_action && is_numeric( $user_id ) ) {
                         /* Check the nonce first. */
-                        if ( !check_admin_referer( 'groups_reject_membership_request' ) )
+                        if ( ! check_admin_referer( 'groups_reject_membership_request' ) ) {
                                 return false;
+                        }
 
                         // Reject the membership request.
-                        if ( !groups_reject_membership_request( $membership_id ) )
+                        if ( ! groups_reject_membership_request(false, $user_id, $group_id ) ) {
                                 bp_core_add_message( __( 'There was an error rejecting the membership request. Please try again.', 'buddypress' ), 'error' );
-                        else
+                        } else {
                                 bp_core_add_message( __( 'Group membership request rejected', 'buddypress' ) );
+                        }
                 }
 
+                // Was the member added to the group?
+                $membership_id = groups_is_user_member( $user_id, $group_id );
+
                 /**
                  * Fires before the redirect if a group membership request has been handled.
                  *
                  * @since 1.0.0
+                 * @since 2.7.0 Added user ID and group ID parameters.
                  *
                  * @param int    $id             ID of the group that was edited.
                  * @param string $request_action Membership request action being performed.
-                 * @param int    $membership_id  The key of the action_variables array that you want.
+                 * @param int    $membership_id  The membership ID of the new user; false if rejected.
+                 * @param int    $user_id        The ID of the requesting user.
+                 * @param int    $group_id       The ID of the requested group.
                  */
-                do_action( 'groups_group_request_managed', $bp->groups->current_group->id, $request_action, $membership_id );
+                do_action( 'groups_group_request_managed', $bp->groups->current_group->id, $request_action, $membership_id, $user_id, $group_id );
                 bp_core_redirect( bp_get_group_permalink( groups_get_current_group() ) . 'admin/membership-requests/' );
         }
 

src/bp-groups/bp-groups-template.php

@@ -5317 +5317 @@
                  *
                  * @param string $value URL to use to reject a membership request.
                  */
-                return apply_filters( 'bp_get_group_request_reject_link', wp_nonce_url( bp_get_group_permalink( groups_get_current_group() ) . 'admin/membership-requests/reject/' . $requests_template->request->membership_id, 'groups_reject_membership_request' ) );
+                return apply_filters( 'bp_get_group_request_reject_link', wp_nonce_url( bp_get_group_permalink( groups_get_current_group() ) . 'admin/membership-requests/reject/' . $requests_template->request->user_id, 'groups_reject_membership_request' ) );
         }
 
 /**
@@ -5341 +5341 @@
                  *
                  * @param string $value URL to use to accept a membership request.
                  */
-                return apply_filters( 'bp_get_group_request_accept_link', wp_nonce_url( bp_get_group_permalink( groups_get_current_group() ) . 'admin/membership-requests/accept/' . $requests_template->request->membership_id, 'groups_accept_membership_request' ) );
+                return apply_filters( 'bp_get_group_request_accept_link', wp_nonce_url( bp_get_group_permalink( groups_get_current_group() ) . 'admin/membership-requests/accept/' . $requests_template->request->user_id, 'groups_accept_membership_request' ) );
         }
 
 /**

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

@@ -127 +127 @@
                 }
 
                 $bp  = buddypress();
-                $sql = array(
-                        'select'  => "SELECT user_id FROM {$bp->groups->table_name_members}",
-                        'where'   => array(),
-                        'orderby' => '',
-                        'order'   => '',
-                );
-
-                /* WHERE clauses *****************************************************/
-
-                // Group id.
-                $sql['where'][] = $wpdb->prepare( "group_id = %d", $this->query_vars['group_id'] );
-
-                // If is_confirmed.
-                $is_confirmed = ! empty( $this->query_vars['is_confirmed'] ) ? 1 : 0;
-                $sql['where'][] = $wpdb->prepare( "is_confirmed = %d", $is_confirmed );
 
-                // If invite_sent.
-                if ( ! is_null( $this->query_vars['invite_sent'] ) ) {
-                        $invite_sent = ! empty( $this->query_vars['invite_sent'] ) ? 1 : 0;
-                        $sql['where'][] = $wpdb->prepare( "invite_sent = %d", $invite_sent );
-                }
-
-                // If inviter_id.
-                if ( ! is_null( $this->query_vars['inviter_id'] ) ) {
-                        $inviter_id = $this->query_vars['inviter_id'];
+                /*
+                * Two overarching cases:
+                * 1. We're searching for invited/membership requested members.
+                *    Then, 'is_confirmed', 'invite_sent' or 'inviter_id' will not be
+                *    the default value.
+                * 2. We're searching for confirmed members of the group:
+                *    members, mods, admins, and banned users.
+                */
+                if ( ! $this->query_vars['is_confirmed'] || ! is_null( $this->query_vars['invite_sent'] ) || ! is_null( $this->query_vars['inviter_id'] ) ) {
+
+                        // Case 1: Searching for invitations and requests.
+                        $invite_args = array( 'type' => 'all' );
+
+                        // If invite_sent.
+                        if ( ! is_null( $this->query_vars['invite_sent'] ) ) {
+                                $invite_args['invite_sent'] = ! empty( $this->query_vars['invite_sent'] ) ? 'sent' : 'draft';
+                                // $sql['where'][] = $wpdb->prepare( "invite_sent = %d", $invite_sent );
+                        }
 
-                        // Empty: inviter_id = 0. (pass false, 0, or empty array).
-                        if ( empty( $inviter_id ) ) {
-                                $sql['where'][] = "inviter_id = 0";
+                        // 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;
+                                        }
+                                }
+                        }
 
-                        // The string 'any' matches any non-zero value (inviter_id != 0).
-                        } elseif ( 'any' === $inviter_id ) {
-                                $sql['where'][] = "inviter_id != 0";
+                        /*
+                         * 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['sort_order'] = 'ASC';
+                        }
 
-                        // Assume that a list of inviter IDs has been passed.
+                        $invites = groups_get_invites_for_group_by_data( $this->query_vars['group_id'], $invite_args );
+                        if ( $invites['invites'] ) {
+                                $this->group_member_ids = wp_list_pluck( $invites['invites'], 'user_id' );
                         } else {
-                                // Parse and sanitize.
-                                $inviter_ids = wp_parse_id_list( $inviter_id );
-                                if ( ! empty( $inviter_ids ) ) {
-                                        $inviter_ids_sql = implode( ',', $inviter_ids );
-                                        $sql['where'][] = "inviter_id IN ({$inviter_ids_sql})";
-                                }
+                                $this->group_member_ids = array( 0 );
                         }
-                }
 
-                // Role information is stored as follows: admins have
-                // is_admin = 1, mods have is_mod = 1, banned have is_banned =
-                // 1, and members have all three set to 0.
-                $roles = !empty( $this->query_vars['group_role'] ) ? $this->query_vars['group_role'] : array();
-                if ( is_string( $roles ) ) {
-                        $roles = explode( ',', $roles );
-                }
+                        // Case 2: Searching for members.
+                } else {
+                        $sql = array(
+                                'select'  => "SELECT user_id FROM {$bp->groups->table_name_members}",
+                                'where'   => array(),
+                                'orderby' => '',
+                                'order'   => '',
+                        );
+
+                        /* WHERE clauses *****************************************************/
+
+                        // Group id.
+                        $sql['where'][] = $wpdb->prepare( "group_id = %d", $this->query_vars['group_id'] );
+
+                        // Role information is stored as follows: admins have
+                        // is_admin = 1, mods have is_mod = 1, banned have is_banned =
+                        // 1, and members have all three set to 0.
+                        $roles = !empty( $this->query_vars['group_role'] ) ? $this->query_vars['group_role'] : array();
+                        if ( is_string( $roles ) ) {
+                                $roles = explode( ',', $roles );
+                        }
 
-                // Sanitize: Only 'admin', 'mod', 'member', and 'banned' are valid.
-                $allowed_roles = array( 'admin', 'mod', 'member', 'banned' );
-                foreach ( $roles as $role_key => $role_value ) {
-                        if ( ! in_array( $role_value, $allowed_roles ) ) {
-                                unset( $roles[ $role_key ] );
+                        // Sanitize: Only 'admin', 'mod', 'member', and 'banned' are valid.
+                        $allowed_roles = array( 'admin', 'mod', 'member', 'banned' );
+                        foreach ( $roles as $role_key => $role_value ) {
+                                if ( ! in_array( $role_value, $allowed_roles ) ) {
+                                        unset( $roles[ $role_key ] );
+                                }
                         }
-                }
 
-                $roles = array_unique( $roles );
+                        $roles = array_unique( $roles );
 
-                // When querying for a set of roles containing 'member' (for
-                // which there is no dedicated is_ column), figure out a list
-                // of columns *not* to match.
-                $roles_sql = '';
-                if ( in_array( 'member', $roles ) ) {
-                        $role_columns = array();
-                        foreach ( array_diff( $allowed_roles, $roles ) as $excluded_role ) {
-                                $role_columns[] = 'is_' . $excluded_role . ' = 0';
-                        }
+                        // When querying for a set of roles containing 'member' (for
+                        // which there is no dedicated is_ column), figure out a list
+                        // of columns *not* to match.
+                        $roles_sql = '';
+                        if ( in_array( 'member', $roles ) ) {
+                                $role_columns = array();
+                                foreach ( array_diff( $allowed_roles, $roles ) as $excluded_role ) {
+                                        $role_columns[] = 'is_' . $excluded_role . ' = 0';
+                                }
 
-                        if ( ! empty( $role_columns ) ) {
-                                $roles_sql = '(' . implode( ' AND ', $role_columns ) . ')';
-                        }
+                                if ( ! empty( $role_columns ) ) {
+                                        $roles_sql = '(' . implode( ' AND ', $role_columns ) . ')';
+                                }
 
-                // When querying for a set of roles *not* containing 'member',
-                // simply construct a list of is_* = 1 clauses.
-                } else {
-                        $role_columns = array();
-                        foreach ( $roles as $role ) {
-                                $role_columns[] = 'is_' . $role . ' = 1';
-                        }
+                        // When querying for a set of roles *not* containing 'member',
+                        // simply construct a list of is_* = 1 clauses.
+                        } else {
+                                $role_columns = array();
+                                foreach ( $roles as $role ) {
+                                        $role_columns[] = 'is_' . $role . ' = 1';
+                                }
 
-                        if ( ! empty( $role_columns ) ) {
-                                $roles_sql = '(' . implode( ' OR ', $role_columns ) . ')';
+                                if ( ! empty( $role_columns ) ) {
+                                        $roles_sql = '(' . implode( ' OR ', $role_columns ) . ')';
+                                }
                         }
-                }
 
-                if ( ! empty( $roles_sql ) ) {
-                        $sql['where'][] = $roles_sql;
-                }
+                        if ( ! empty( $roles_sql ) ) {
+                                $sql['where'][] = $roles_sql;
+                        }
 
-                $sql['where'] = ! empty( $sql['where'] ) ? 'WHERE ' . implode( ' AND ', $sql['where'] ) : '';
+                        $sql['where'] = ! empty( $sql['where'] ) ? 'WHERE ' . implode( ' AND ', $sql['where'] ) : '';
 
-                // We fetch group members in order of last_joined, regardless
-                // of 'type'. If the 'type' value is not 'last_joined' or
-                // 'first_joined', the order will be overridden in
-                // BP_Group_Member_Query::set_orderby().
-                $sql['orderby'] = "ORDER BY date_modified";
-                $sql['order']   = 'first_joined' === $this->query_vars['type'] ? 'ASC' : 'DESC';
+                        // We fetch group members in order of last_joined, regardless
+                        // of 'type'. If the 'type' value is not 'last_joined' or
+                        // 'first_joined', the order will be overridden in
+                        // BP_Group_Member_Query::set_orderby().
+                        $sql['orderby'] = "ORDER BY date_modified";
+                        $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']}" );
+                        $this->group_member_ids = $wpdb->get_col( "{$sql['select']} {$sql['where']} {$sql['orderby']} {$sql['order']}" );
+                }
 
                 /**
                  * Filters the member IDs for the current group member query.
@@ -312 +344 @@
                 $bp     = buddypress();
                 $extras = $wpdb->get_results( $wpdb->prepare( "SELECT id, user_id, date_modified, is_admin, is_mod, comments, user_title, invite_sent, is_confirmed, inviter_id, is_banned FROM {$bp->groups->table_name_members} WHERE user_id IN ({$user_ids_sql}) AND group_id = %d", $this->query_vars['group_id'] ) );
 
+                $pending_memberships = groups_get_invites_for_group_by_data( $this->query_vars['group_id'], array( 'type' => 'all' ) );
+                $invites = $pending_memberships['invites'];
+
+                // Keep a running list of whose data we're trying to complete.
+                $user_ids = explode( ',', $user_ids_sql );
+
                 foreach ( (array) $extras as $extra ) {
                         if ( isset( $this->results[ $extra->user_id ] ) ) {
                                 // The user_id is provided for backward compatibility.
@@ -322 +360 @@
                                 $this->results[ $extra->user_id ]->date_modified = $extra->date_modified;
                                 $this->results[ $extra->user_id ]->user_title    = $extra->user_title;
                                 $this->results[ $extra->user_id ]->comments      = $extra->comments;
-                                $this->results[ $extra->user_id ]->invite_sent   = (int) $extra->invite_sent;
-                                $this->results[ $extra->user_id ]->inviter_id    = (int) $extra->inviter_id;
                                 $this->results[ $extra->user_id ]->is_confirmed  = (int) $extra->is_confirmed;
                                 $this->results[ $extra->user_id ]->membership_id = (int) $extra->id;
+
+                                // This information is stored in the invitations table.
+                                foreach ( $invites as $invite ) {
+                                        if ( $invite->user_id == $extra->user_id ) {
+                                                $this->results[ $extra->user_id ]->invite_sent   = (int) $invite->invite_sent;
+                                                $this->results[ $extra->user_id ]->inviter_id    = (int) $invite->inviter_id;
+                                                break;
+                                        }
+                                }
+
+                                // We no longer need to complete this user's info.
+                                $user_ids = array_diff( $user_ids, array( $extra->user_id ) );
+                        }
+                }
+
+                // Now we build the results for the pending members that have no entry in the groups table.
+                if ( $user_ids ) {
+                        foreach ( $invites as $invite ) {
+
+                                if ( ! in_array( $invite->user_id, $user_ids ) ) {
+                                        continue;
+                                }
+
+                                // Skip unsent invites.
+                                if ( 'invite' == $invite->type && ! $invite->invite_sent ) {
+                                        continue;
+                                }
+
+                                $this->results[ $invite->user_id ]->user_id       = $invite->user_id;
+                                $this->results[ $invite->user_id ]->is_admin      = 0;
+                                $this->results[ $invite->user_id ]->is_mod        = 0;
+                                $this->results[ $invite->user_id ]->is_banned     = 0;
+                                $this->results[ $invite->user_id ]->date_modified = $invite->date_modified;
+                                $this->results[ $invite->user_id ]->user_title    = '';
+                                $this->results[ $invite->user_id ]->comments      = $invite->content;
+                                $this->results[ $invite->user_id ]->is_confirmed  = 0;
+                                $this->results[ $invite->user_id ]->membership_id = null;
+                                $this->results[ $invite->user_id ]->invitation_id = $invite->id;
+
+                                // This information is stored in the invitations table.
+                                $this->results[ $invite->user_id ]->invite_sent   = (int) $invite->invite_sent;
+                                $this->results[ $invite->user_id ]->inviter_id    = $invite->inviter_id;
+
+                                // We no longer need to complete this user's info.
+                                $user_ids = array_diff( $user_ids, array( $invite->user_id ) );
                         }
                 }
 

src/bp-groups/classes/class-bp-groups-group.php

@@ -474 +474 @@
          *               user but have not yet accepted.
          */
         public static function get_invites( $user_id, $group_id ) {
-                global $wpdb;
+                $bp = buddypress();
+
+                $args = array(
+                        'component_name'    => $bp->groups->id,
+                        'component_action'  => $bp->groups->id . '_invite',
+                        'item_id'           => $group_id,
+                        'accepted'          => 0
+                );
+                $invites = bp_get_invitations_from_user( $user_id, $args );
+
+                return wp_list_pluck( $invites, 'user_id' );
+        }
+
+        /**
+         * Get invitations to a given group filtered by arguments. Cached.
+         *
+         * @since 2.7.0
+         *
+         * @param int   $group_id ID of the group.
+         * @param array $args     Invitation arguments.
+         *                        See `bp_invitations_get_invitations()` for list.
+         *
+         * @return array {
+         *                array $invites     Matching invitation objects.
+         *                int   $total_count Total number of invites to group.
+         *                }
+         */
+        public static function get_invitations_by_data( $group_id, $args ) {
 
                 $bp = buddypress();
 
-                return $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->groups->table_name_members} WHERE group_id = %d and is_confirmed = 0 AND inviter_id = %d", $group_id, $user_id ) );
+                $r = bp_parse_args( $args, array(
+                        'inviter_id'        => false,
+                        'secondary_item_id' => false,
+                        'type'              => 'invite',
+                        'invite_sent'       => 'all',
+                        'accepted'          => 'pending',
+                        'orderby'           => 'id',
+                        'sort_order'        => 'DESC',
+                        'page'              => false,
+                        'per_page'          => false
+                ), 'bp_get_group_invitations' );
+
+                $invites = wp_cache_get( 'bp_membership_invitations_for_group_' . $group_id, 'bp' );
+
+                if ( false === $invites ) {
+                        $all_args = array(
+                                'component_name'    => $bp->groups->id,
+                                'component_action'  => $bp->groups->id . '_invite',
+                                'item_id'           => $group_id,
+                                'type'              => 'all'
+                        );
+                        $invites = bp_invitations_get_invitations( $all_args );
+                        wp_cache_set( 'bp_membership_invitations_for_group_' . $group_id, $invites, 'bp' );
+                }
+
+                $type_args = array( 'type' => $r['type'] );
+                $invites_by_type = BP_Invitations_Invitation::filter_invitations_by_arguments( $invites, $type_args );
+                $total_count = count( $invites_by_type );
+
+                // Filter the results.
+                $invites = BP_Invitations_Invitation::filter_invitations_by_arguments( $invites, $r );
+
+                return array( 'invites' => $invites, 'total' => $total_count );
         }
 
         /**
@@ -662 +721 @@
          * }
          */
         public static function get_membership_requests( $group_id, $limit = null, $page = null ) {
-                global $wpdb;
+                $bp = buddypress();
 
-                if ( !empty( $limit ) && !empty( $page ) ) {
-                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+                $args = array( 'type' => 'request' );
+                if ( $limit ) {
+                        $args['per_page'] = $limit;
+                }
+                if ( $page ) {
+                        $args['page'] = $page;
                 }
 
-                $bp = buddypress();
+                return self::get_invitations_by_data( $group_id, $args );
+
+                // $requests = wp_cache_get( 'bp_membership_requests_for_group_' . $group_id, 'bp' );
 
-                $paged_requests = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 0 AND inviter_id = 0{$pag_sql}", $group_id ) );
-                $total_requests = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 0 AND inviter_id = 0", $group_id ) );
+                // if ( false === $requests ) {
+                //      $args = array(
+                //              'component_name'    => $bp->groups->id,
+                //              'component_action'  => $bp->groups->id . '_invite',
+                //              'item_id'           => $group_id,
+                //      );
+                //      $requests = bp_invitations_get_requests( $args );
+                //      wp_cache_set( 'bp_membership_requests_for_group_' . $group_id, $requests, 'bp' );
+                // }
 
-                return array( 'requests' => $paged_requests, 'total' => $total_requests );
+                // $total_count = count( $requests );
+
+                // // Pagination filtering, if necessary
+                // if ( $limit || $page ) {
+                //      $filter = array();
+                //      if ( $limit ) {
+                //              $filter['per_page'] = $limit;
+                //      }
+                //      if ( $page ) {
+                //              $filter['page'] = $page;
+                //      }
+                //      $requests = BP_Invitations_Invitation::filter_invitations_by_arguments( $requests, $filter );
+                // }
+
+                // return array( 'requests' => $requests, 'total' => $total_count );
         }
 
         /**
@@ -1407 +1493 @@
 
                 // Fetch the logged-in user's status within each group.
                 if ( is_user_logged_in() ) {
-                        $user_status_results = $wpdb->get_results( $wpdb->prepare( "SELECT group_id, is_confirmed, invite_sent FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id IN ( {$group_ids} ) AND is_banned = 0", bp_loggedin_user_id() ) );
+                        $user_status_results = $wpdb->get_results( $wpdb->prepare( "SELECT group_id, is_confirmed FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id IN ( {$group_ids} ) AND is_banned = 0", bp_loggedin_user_id() ) );
+                        $invited_to_groups = groups_get_invited_to_group_ids();
+                        $requested_groups  = groups_get_membership_requested_group_ids();
                 } else {
                         $user_status_results = array();
+                        $invited_to_groups   = array();
+                        $requested_groups    = array();
                 }
 
                 // Reindex.
@@ -1423 +1513 @@
                         $gid = $paged_groups[ $i ]->id;
 
                         if ( isset( $user_status[ $gid ] ) ) {
-
                                 // The is_confirmed means the user is a member.
                                 if ( $user_status[ $gid ]->is_confirmed ) {
                                         $is_member = '1';
-
+                                }
                                 // The invite_sent means the user has been invited.
-                                } elseif ( $user_status[ $gid ]->invite_sent ) {
+                        } elseif ( in_array( $gid, $invited_to_groups ) ) {
                                         $is_invited = '1';
 
                                 // User has sent request, but has not been confirmed.
-                                } else {
+                        } elseif ( in_array( $gid, $requested_groups ) ) {
                                         $is_pending = '1';
-                                }
                         }
 
                         $paged_groups[ $i ]->is_member = $is_member;
@@ -1472 +1560 @@
          *                  failure.
          */
         public static function delete_all_invites( $group_id ) {
-                global $wpdb;
-
                 $bp = buddypress();
 
-                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE group_id = %d AND invite_sent = 1", $group_id ) );
+                if ( empty( $group_id ) ) {
+                        return false;
+                }
+
+                $args = array(
+                        'component_name'   => $bp->groups->id,
+                        'component_action' => $bp->groups->id . '_invite',
+                        'item_id'          => $group_id,
+                        'type'             => 'invite'
+                );
+
+                return bp_invitations_delete_invitations( $args );
         }
 
         /**

src/bp-groups/classes/class-bp-groups-member.php

@@ -736 +736 @@
          * }
          */
         public static function get_invites( $user_id, $limit = false, $page = false, $exclude = false ) {
-                global $wpdb;
 
-                $pag_sql = ( !empty( $limit ) && !empty( $page ) ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
+                $group_ids = self::get_invited_to_group_ids( $user_id );
 
-                if ( !empty( $exclude ) ) {
-                        $exclude     = implode( ',', wp_parse_id_list( $exclude ) );
-                        $exclude_sql = " AND g.id NOT IN ({$exclude})";
-                } else {
-                        $exclude_sql = '';
+                // Remove excluded groups.
+                if ( $exclude ) {
+                        $group_ids = array_diff( $group_ids, wp_parse_id_list( $exclude ) );
                 }
 
-                $bp = buddypress();
+                // Avoid passing an empty array.
+                if ( ! $group_ids ) {
+                        $group_ids = array( 0 );
+                }
 
-                $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND m.is_confirmed = 0 AND m.inviter_id != 0 AND m.invite_sent = 1 AND m.user_id = %d {$exclude_sql} ORDER BY m.date_modified ASC {$pag_sql}", $user_id ) );
+                // Get a filtered list of groups.
+                $args = array(
+                        'include'     => $group_ids,
+                        'show_hidden' => true,
+                        'per_page'    => $limit,
+                        'page'        => $page,
+                );
+                $groups = groups_get_groups( $args );
 
-                return array( 'groups' => $paged_groups, 'total' => self::get_invite_count_for_user( $user_id ) );
+                return array( 'groups' => $groups['groups'], 'total' => groups_get_invite_count_for_user( $user_id ) );
         }
 
         /**
@@ -763 +770 @@
          * @return int
          */
         public static function get_invite_count_for_user( $user_id = 0 ) {
-                global $wpdb;
+                $group_ids = self::get_invited_to_group_ids( $user_id );
 
+                return count( array_unique( $group_ids ) );
+        }
+
+        /**
+         * Get an array of group IDs to which a user is invited.
+         *
+         * @since 2.7.0
+         *
+         * @param int $user_id The user ID.
+         *
+         * @return array Array of group IDs.
+         */
+        public static function get_invited_to_group_ids( $user_id = 0 ) {
                 $bp = buddypress();
 
-                $count = wp_cache_get( $user_id, 'bp_group_invite_count' );
+                // Get invites.
+                $args = array(
+                        'component_name'    => $bp->groups->id,
+                        'component_action'  => $bp->groups->id . '_invite',
+                        'invite_sent'       => 'sent',
+                );
+                $invites = bp_get_user_invitations( $user_id, $args );
 
-                if ( false === $count ) {
-                        $count = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND m.is_confirmed = 0 AND m.inviter_id != 0 AND m.invite_sent = 1 AND m.user_id = %d", $user_id ) );
-                        wp_cache_set( $user_id, $count, 'bp_group_invite_count' );
+                if ( $invites ) {
+                        $group_ids = array_unique( wp_list_pluck( $invites, 'item_id' ) );
+                } else {
+                        $group_ids = array();
                 }
 
-                return $count;
+                return $group_ids;
         }
 
         /**
@@ -789 +816 @@
          * @return int|null The ID of the invitation if found, otherwise null.
          */
         public static function check_has_invite( $user_id, $group_id, $type = 'sent' ) {
-                global $wpdb;
+                $bp = buddypress();
 
-                if ( empty( $user_id ) )
+                if ( ! $user_id || ! $group_id ){
                         return false;
+                }
 
-                $bp  = buddypress();
-                $sql = "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id != 0";
+                $args = array(
+                        'component_name'   => $bp->groups->id,
+                        'component_action' => $bp->groups->id . '_invite',
+                        'item_id'          => $group_id,
+                        'invite_sent'      => $type,
+                );
+                $invites = bp_get_user_invitations( $user_id, $args );
 
-                if ( 'sent' == $type )
-                        $sql .= " AND invite_sent = 1";
+                if ( $invites ) {
+                        return current( $invites )->id;
+                } else {
+                        // If nothing found, mimic the previous behavior.
+                        return 0;
+                }
+        }
+
+        /**
+         * Check whether a user has an outstanding invitation to a given group.
+         *
+         * @since 1.6.0
+         *
+         * @param int    $user_id   ID of the potential invitee.
+         * @param int    $group_id   ID of the group.
+         * @param int    $inviter_id ID of the inviter. Defaults to logged-in user.
+         * @param string $type     If 'sent', results are limited to those invitations
+         *                         that have actually been sent (non-draft). Default: 'sent'.
+         * @return int|null The ID of the invitation if found, otherwise null.
+         */
+        public static function check_has_invite_from_user( $user_id, $group_id, $inviter_id, $type = 'sent' ) {
+                $bp = buddypress();
 
-                return $wpdb->get_var( $wpdb->prepare( $sql, $user_id, $group_id ) );
+                if ( ! $user_id || ! $group_id ){
+                        return false;
+                }
+
+                if ( ! $inviter_id ) {
+                        $inviter_id = bp_loggedin_user_id();
+                }
+
+                $args = array(
+                        'inviter_id'       => $inviter_id,
+                        'component_name'   => $bp->groups->id,
+                        'component_action' => $bp->groups->id . '_invite',
+                        'item_id'          => $group_id,
+                        'invite_sent'      => $type,
+                );
+                $invites = bp_get_user_invitations( $user_id, $args );
+
+                if ( $invites ) {
+                        return current( $invites )->id;
+                } else {
+                        // If nothing found, mimic the previous behavior.
+                        return 0;
+                }
         }
 
         /**
@@ -810 +885 @@
          *
          * @global WPDB $wpdb
          *
-         * @param  int $user_id  ID of the user.
-         * @param  int $group_id ID of the group.
+         * @param  int $user_id    ID of the user.
+         * @param  int $group_id   ID of the group.
+         * @param  int $inviter_id ID of the inviter. Specify if you want to delete
+         *                         a specific invite. Leave false if you want to
+         *                         delete all invites to this group.
          * @return int Number of records deleted.
          */
-        public static function delete_invite( $user_id, $group_id ) {
-                global $wpdb;
+        public static function delete_invite( $user_id, $group_id, $inviter_id = false ) {
+                //@TODO: add inviter_id as argument.
+                $bp = buddypress();
 
-                if ( empty( $user_id ) ) {
+                if ( empty( $user_id ) || empty( $group_id ) ) {
                         return false;
                 }
 
-                $table_name = buddypress()->groups->table_name_members;
-
-                $sql = "DELETE FROM {$table_name}
-                                WHERE user_id = %d
-                                        AND group_id = %d
-                                        AND is_confirmed = 0
-                                        AND inviter_id != 0";
-
-                $prepared = $wpdb->prepare( $sql, $user_id, $group_id );
+                $args = array(
+                        'user_id'          => $user_id,
+                        'inviter_id'       => $inviter_id,
+                        'component_name'   => $bp->groups->id,
+                        'component_action' => $bp->groups->id . '_invite',
+                        'item_id'          => $group_id,
+                        'type'             => 'invite'
+                );
 
-                return $wpdb->query( $prepared );
+                return bp_invitations_delete_invitations( $args );
         }
 
         /**
@@ -844 +922 @@
          * @return int Number of records deleted.
          */
         public static function delete_request( $user_id, $group_id ) {
-                global $wpdb;
+                $bp = buddypress();
 
-                if ( empty( $user_id ) )
+                if ( empty( $user_id ) || empty( $group_id ) ) {
                         return false;
+                }
 
-                $bp = buddypress();
+                $args = array(
+                        'user_id'          => $user_id,
+                        'component_name'   => $bp->groups->id,
+                        'component_action' => $bp->groups->id . '_invite',
+                        'item_id'          => $group_id,
+                );
 
-                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id = 0 AND invite_sent = 0", $user_id, $group_id ) );
+                return bp_invitations_delete_requests( $args );
         }
 
         /**
@@ -965 +1049 @@
          * @return int|null ID of the membership if found, otherwise false.
          */
         public static function check_for_membership_request( $user_id, $group_id ) {
-                global $wpdb;
+                $bp = buddypress();
 
-                if ( empty( $user_id ) )
+                if ( ! $user_id || ! $group_id ){
                         return false;
+                }
 
+                $args = array(
+                        'component_name'   => $bp->groups->id,
+                        'component_action' => $bp->groups->id . '_invite',
+                        'item_id'          => $group_id,
+                );
+                $requests = bp_get_user_requests( $user_id, $args );
+
+                if ( $requests ) {
+                        return current( $requests )->id;
+                } else {
+                        // If nothing found, mimic the previous behavior.
+                        return 0;
+                }
+        }
+
+        /**
+         * Get an array of group IDs to which a user has requested membership.
+         *
+         * @since 2.7.0
+         *
+         * @param int $user_id The user ID.
+         *
+         * @return array Array of group IDs.
+         */
+        public static function get_membership_requested_group_ids( $user_id = 0 ) {
                 $bp = buddypress();
 
-                return $wpdb->query( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND is_banned = 0 AND inviter_id = 0", $user_id, $group_id ) );
+                // Get invites.
+                $args = array(
+                        'component_name'    => $bp->groups->id,
+                        'component_action'  => $bp->groups->id . '_invite',
+                        'invite_sent'       => 'sent',
+                );
+                $requests = bp_get_user_requests( $user_id, $args );
+
+                if ( $requests ) {
+                        $group_ids = array_unique( wp_list_pluck( $requests, 'item_id' ) );
+                } else {
+                        $group_ids = array();
+                }
+
+                return $group_ids;
         }
 
         /**
@@ -1061 +1185 @@
          * @return array IDs of users with outstanding membership requests.
          */
         public static function get_all_membership_request_user_ids( $group_id ) {
-                global $wpdb;
-
                 $bp = buddypress();
 
-                return $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_confirmed = 0 AND inviter_id = 0", $group_id ) );
+                $args = array(
+                        'component_name'   => $bp->groups->id,
+                        'component_action' => $bp->groups->id . '_invite',
+                        'item_id'          => $group_id,
+                );
+                $requests = bp_invitations_get_requests( $args );
+
+                return wp_list_pluck( $requests, 'user_id' );
         }
 
         /**

src/bp-groups/classes/class-bp-groups-membership-requests-template.php

@@ -133 +133 @@
                         // request must match the membership id, not the ID of
                         // the user (as it's returned by BP_Group_Member_Query).
                         $this->requests[ $rk ]->user_id = $rv->ID;
-                        $this->requests[ $rk ]->id      = $rv->membership_id;
+                        $this->requests[ $rk ]->id      = $rv->invitation_id;
 
                         // Miscellaneous values.
                         $this->requests[ $rk ]->group_id   = $r['group_id'];

src/bp-loader.php

@@ -503 +503 @@
                 require( $this->plugin_dir . 'bp-core/bp-core-moderation.php'       );
                 require( $this->plugin_dir . 'bp-core/bp-core-loader.php'           );
                 require( $this->plugin_dir . 'bp-core/bp-core-customizer-email.php' );
+                require( $this->plugin_dir . 'bp-core/bp-core-invitations.php'      );
 
                 if ( ! $this->do_autoload ) {
                         require( $this->plugin_dir . 'bp-core/bp-core-classes.php' );
@@ -578 +579 @@
                         'BP_Walker_Category_Checklist' => 'core',
                         'BP_Walker_Nav_Menu_Checklist' => 'core',
                         'BP_Walker_Nav_Menu'           => 'core',
+                        'BP_Invitations_Component'     => 'core',
+                        'BP_Invitations_Invitation'    => 'core',
 
                         'BP_Core_Friends_Widget' => 'friends',
 

new file tests/phpunit/testcases/core/invitations.php

@@ +1 @@
+<?php
+/**
+ * @group core
+ * @group invitations
+ */
+class BP_Tests_Invitations extends BP_UnitTestCase {
+        public function test_bp_invitations_add_invitation_vanilla() {
+                global $wpdb;
+                $old_current_user = get_current_user_id();
+
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $u3 = $this->factory->user->create();
+                $this->set_current_user( $u1 );
+
+                // Create a couple of invitations.
+                $invite_args = array(
+                        'user_id'           => $u3,
+                        'inviter_id'            => $u1,
+                        'component_name'    => 'cakes',
+                        'component_action'  => 'cupcakes',
+                        'item_id'           => 1,
+                        'invite_sent'       => 1,
+                );
+                $i1 = bp_invitations_add_invitation( $invite_args );
+                $invite_args['inviter_id'] = $u2;
+                $i2 = bp_invitations_add_invitation( $invite_args );
+
+                $get_invites = array(
+                        'user_id'        => $u3,
+                        'component_name' => 'cakes',
+                );
+                $invites = bp_invitations_get_invitations( $u3, $get_invites );
+                $this->assertEqualSets( array( $i1, $i2 ), wp_list_pluck( $invites, 'id' ) );
+
+                $this->set_current_user( $old_current_user );
+        }
+
+        public function test_bp_invitations_add_invitation_avoid_duplicates() {
+                global $wpdb;
+                $old_current_user = get_current_user_id();
+
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $this->set_current_user( $u1 );
+
+                // Create an invitation.
+                $invite_args = array(
+                        'user_id'           => $u2,
+                        'inviter_id'            => $u1,
+                        'component_name'    => 'blogs',
+                        'component_action'  => 'blog_invite',
+                        'item_id'           => 1,
+                        'invite_sent'       => 1,
+                );
+                $i1 = bp_invitations_add_invitation( $invite_args );
+                // Attempt to create a duplicate.
+                $this->assertFalse( bp_invitations_add_invitation( $invite_args ) );
+
+                $this->set_current_user( $old_current_user );
+        }
+
+        public function test_bp_invitations_add_invitation_invite_plus_request_should_accept() {
+                global $wpdb;
+                $old_current_user = get_current_user_id();
+
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $u3 = $this->factory->user->create();
+                $this->set_current_user( $u1 );
+
+                // Create an invitation.
+                $invite_args = array(
+                        'user_id'           => $u3,
+                        'inviter_id'            => $u1,
+                        'component_name'    => 'cakes',
+                        'component_action'  => 'cupcakes',
+                        'item_id'           => 1,
+                        'invite_sent'       => 1,
+                );
+                $i1 = bp_invitations_add_invitation( $invite_args );
+
+                // Create a request.
+                $request_args = array(
+                        'user_id'           => $u3,
+                        'component_name'    => 'cakes',
+                        'component_action'  => 'cupcakes',
+                        'item_id'           => 1,
+                );
+                $r1 = bp_invitations_add_request( $request_args );
+
+                $get_invites = array(
+                        'user_id'          => $u3,
+                        'component_name'   => 'cakes',
+                        'component_action' => 'cupcakes',
+                        'accepted'         => 'accepted'
+                );
+                $invites = bp_invitations_get_invitations( $get_invites );
+                $this->assertEqualSets( array( $i1 ), wp_list_pluck( $invites, 'id' ) );
+
+                $this->set_current_user( $old_current_user );
+        }
+
+        public function test_bp_invitations_add_invitation_unsent_invite_plus_request_should_not_accept() {
+                global $wpdb;
+                $old_current_user = get_current_user_id();
+
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $u3 = $this->factory->user->create();
+                $this->set_current_user( $u1 );
+
+                // Create an invitation.
+                $invite_args = array(
+                        'user_id'           => $u3,
+                        'inviter_id'            => $u1,
+                        'component_name'    => 'cakes',
+                        'component_action'  => 'cupcakes',
+                        'item_id'           => 1,
+                        'invite_sent'       => 0,
+                );
+                $i1 = bp_invitations_add_invitation( $invite_args );
+
+                // Create a request.
+                $request_args = array(
+                        'user_id'           => $u3,
+                        'component_name'    => 'cakes',
+                        'component_action'  => 'cupcakes',
+                        'item_id'           => 1,
+                );
+                $r1 = bp_invitations_add_request( $request_args );
+
+                $get_invites = array(
+                        'user_id'          => $u3,
+                        'component_name'   => 'cakes',
+                        'component_action' => 'cupcakes',
+                        'accepted'         => 'accepted'
+                );
+                $invites = bp_invitations_get_invitations( $get_invites );
+                $this->assertEqualSets( array(), wp_list_pluck( $invites, 'id' ) );
+
+                $this->set_current_user( $old_current_user );
+        }
+
+        public function test_bp_invitations_add_invitation_unsent_invite_plus_request_then_send_invite_should_accept() {
+                global $wpdb;
+                $old_current_user = get_current_user_id();
+
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $u3 = $this->factory->user->create();
+                $this->set_current_user( $u1 );
+
+                // Create an invitation.
+                $invite_args = array(
+                        'user_id'           => $u3,
+                        'inviter_id'            => $u1,
+                        'component_name'    => 'cakes',
+                        'component_action'  => 'cupcakes',
+                        'item_id'           => 1,
+                        'invite_sent'       => 0,
+                );
+                $i1 = bp_invitations_add_invitation( $invite_args );
+
+                // Create a request.
+                $request_args = array(
+                        'user_id'           => $u3,
+                        'component_name'    => 'cakes',
+                        'component_action'  => 'cupcakes',
+                        'item_id'           => 1,
+                );
+                $r1 = bp_invitations_add_request( $request_args );
+
+                bp_invitations_send_invitation_by_id( $i1 );
+
+                $get_invites = array(
+                        'user_id'          => $u3,
+                        'component_name'   => 'cakes',
+                        'component_action' => 'cupcakes',
+                        'accepted'         => 'accepted'
+                );
+                $invites = bp_invitations_get_invitations( $get_invites );
+                $this->assertEqualSets( array( $i1, $r1 ), wp_list_pluck( $invites, 'id' ) );
+
+                $this->set_current_user( $old_current_user );
+        }
+
+        public function test_bp_invitations_add_request_vanilla() {
+                global $wpdb;
+                $old_current_user = get_current_user_id();
+
+                $u1 = $this->factory->user->create();
+                $this->set_current_user( $u1 );
+
+                // Create a couple of requests.
+                $request_args = array(
+                        'user_id'           => $u1,
+                        'component_name'    => 'cakes',
+                        'component_action'  => 'cupcakes',
+                        'item_id'           => 7,
+                );
+                $r1 = bp_invitations_add_request( $request_args );
+                $request_args['item_id'] = 4;
+                $r2 = bp_invitations_add_request( $request_args );
+
+                $get_requests = array(
+                        'user_id'        => $u1,
+                        'component_name' => 'cakes',
+                        'component_action'  => 'cupcakes',
+                );
+                $requests = bp_invitations_get_requests( $get_requests );
+                $this->assertEqualSets( array( $r1, $r2 ), wp_list_pluck( $requests, 'id' ) );
+
+                $this->set_current_user( $old_current_user );
+        }
+
+        public function test_bp_invitations_add_request_avoid_duplicates() {
+                global $wpdb;
+                $old_current_user = get_current_user_id();
+
+                $u1 = $this->factory->user->create();
+                $this->set_current_user( $u1 );
+
+                // Create a couple of requests.
+                $request_args = array(
+                        'user_id'           => $u1,
+                        'component_name'    => 'cakes',
+                        'component_action'  => 'cupcakes',
+                        'item_id'           => 7,
+                );
+                $r1 = bp_invitations_add_request( $request_args );
+                // Attempt to create a duplicate.
+                $this->assertFalse( bp_invitations_add_request( $request_args ) );
+
+                $this->set_current_user( $old_current_user );
+        }
+
+        public function test_bp_invitations_add_request_request_plus_sent_invite_should_accept() {
+                global $wpdb;
+                $old_current_user = get_current_user_id();
+
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $this->set_current_user( $u1 );
+
+                // Create a request.
+                $request_args = array(
+                        'user_id'           => $u2,
+                        'component_name'    => 'cakes',
+                        'component_action'  => 'cupcakes',
+                        'item_id'           => 1,
+                );
+                $r1 = bp_invitations_add_request( $request_args );
+
+                // Create an invitation.
+                $invite_args = array(
+                        'user_id'           => $u2,
+                        'inviter_id'            => $u1,
+                        'component_name'    => 'cakes',
+                        'component_action'  => 'cupcakes',
+                        'item_id'           => 1,
+                        'invite_sent'       => 1,
+                );
+                $i1 = bp_invitations_add_invitation( $invite_args );
+
+                $get_invites = array(
+                        'user_id'          => $u2,
+                        'component_name'   => 'cakes',
+                        'component_action' => 'cupcakes',
+                        'accepted'         => 'accepted'
+                );
+                $invites = bp_invitations_get_invitations( $get_invites );
+                $this->assertEqualSets( array( $r1, $i1 ), wp_list_pluck( $invites, 'id' ) );
+
+                $this->set_current_user( $old_current_user );
+        }
+
+        public function test_bp_get_user_invitations_should_hit_cache() {
+                global $wpdb;
+                $old_current_user = get_current_user_id();
+
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $u3 = $this->factory->user->create();
+                $this->set_current_user( $u1 );
+
+                // Create a couple of invitations.
+                $invite_args = array(
+                        'user_id'           => $u3,
+                        'inviter_id'            => $u1,
+                        'component_name'    => 'blogs',
+                        'component_action'  => 'blog_invite',
+                        'item_id'           => 1,
+                        'type'                          => 'invite',
+                        'invite_sent'       => 1,
+                );
+                $i1 = bp_invitations_add_invitation( $invite_args );
+                $invite_args['inviter_id'] = $u2;
+                $i2 = bp_invitations_add_invitation( $invite_args );
+
+                // Get the invitations.
+                $invites = bp_get_user_invitations( $u3 );
+                $num_queries = $wpdb->num_queries;
+                // Get them again.
+                $invites = bp_get_user_invitations( $u3 );
+                $this->assertSame( $num_queries, $wpdb->num_queries );
+                // Even changing the args shouldn't require a re-query.
+                $invites = bp_get_user_invitations( $u3, array( 'component_name' => 'beep_beep', 'invite_sent' => 'draft' ) );
+                $this->assertSame( $num_queries, $wpdb->num_queries );
+
+                $this->set_current_user( $old_current_user );
+        }
+}

tests/phpunit/testcases/groups/class-bp-groups-member.php

@@ -5 +5 @@
  */
 class BP_Tests_BP_Groups_Member_TestCases extends BP_UnitTestCase {
         public static function invite_user_to_group( $user_id, $group_id, $inviter_id ) {
-                $invite                = new BP_Groups_Member;
-                $invite->group_id      = $group_id;
-                $invite->user_id       = $user_id;
-                $invite->date_modified = bp_core_current_time();
-                $invite->inviter_id    = $inviter_id;
-                $invite->is_confirmed  = 0;
-                $invite->invite_sent   = 1;
-
-                $invite->save();
-                return $invite->id;
+                $bp = buddypress();
+
+                $args = array(
+                        'user_id'          => $user_id,
+                        'inviter_id'       => $inviter_id,
+                        'component_name'   => $bp->groups->id,
+                        'component_action' => $bp->groups->id . '_invite',
+                        'item_id'          => $group_id,
+                        'invite_sent'      => 1,
+                );
+                return bp_invitations_add_invitation( $args );
         }
 
         public static function create_group_membership_request( $user_id, $group_id ) {
-                $request                = new BP_Groups_Member;
-                $request->group_id      = $group_id;
-                $request->user_id       = $user_id;
-                $request->date_modified = bp_core_current_time();
-                $request->inviter_id    = 0;
-                $request->is_confirmed  = 0;
-
-                $request->save();
-                return $request->id;
+                // $request                = new BP_Groups_Member;
+                // $request->group_id      = $group_id;
+                // $request->user_id       = $user_id;
+                // $request->date_modified = bp_core_current_time();
+                // $request->inviter_id    = 0;
+                // $request->is_confirmed  = 0;
+
+                // $request->save();
+                // return $request->id;
+
+                $bp = buddypress();
+
+                $args = array(
+                        'user_id'          => $user_id,
+                        'component_name'   => $bp->groups->id,
+                        'component_action' => $bp->groups->id . '_invite',
+                        'item_id'          => $group_id,
+                );
+                return bp_invitations_add_request( $args );
         }
 
         public function test_get_recently_joined_with_filter() {
@@ -990 +1001 @@
                 $this->assertTrue( is_numeric( $member ) && $member > 0 );
                 // Check that the invite has been removed.
                 $invite = groups_check_user_has_invite( $u2, $g1, 'all' );
-                $this->assertTrue( is_null( $invite ) );
+                $this->assertEquals( $invite, 0 );
         }
 
         /**
@@ -1024 +1035 @@
                 groups_accept_invite( $u2, $g1 );
 
                 // Check that the membership request has been removed.
-                $this->assertTrue( 0 == groups_check_for_membership_request( $u2, $g1 ) );
+                $this->assertEquals( groups_check_for_membership_request( $u2, $g1 ), 0 );
         }
 
         /**
@@ -1178 +1189 @@
                 groups_send_membership_request( $u1, $g1 );
 
                 // Get group invitations of any type, from any user in the group.
-                $member = new BP_Groups_Member( $u1, $g1 );
+                // $member = new BP_Groups_Member( $u1, $g1 );
 
-                groups_accept_membership_request( $member->id );
+                groups_accept_membership_request( false, $u1, $g1 );
 
                 // User should now be a group member.
                 $member = groups_is_user_member( $u1, $g1 );

tests/phpunit/testcases/groups/template.php

@@ -688 +688 @@
                 // Check each expected value. If there are more in the results,
                 // that's OK
                 foreach ( get_object_vars( $expected ) as $k => $v ) {
-                        $this->assertEquals( $v, $requests_template->requests[0]->{$k} );
+                        $this->assertEquals( $v, current( $requests_template->requests )->{$k} );
                 }
         }