Ticket #3794: 3794.04.patch

src/bp-activity/bp-activity-functions.php

@@ -668 +668 @@
                 $user_id = bp_displayed_user_id();
         }
 
-        // Get favorites for user.
-        $favs = bp_get_user_meta( $user_id, 'bp_favorite_activities', true );
+        // Check cache
+        $favs = wp_cache_get( 'bp_activity_user_' . $user_id . '_favorites', 'bp' );
+
+        if ( empty( $favs ) ) {
+                // Get favorites for user.
+                $favs = bp_relationships_get_object_ids( 'activity_favorites', $user_id );
+
+                // Set the cache
+                wp_cache_set( 'bp_activity_user_' . $user_id . '_favorites', $favs, 'bp' );
+        }
 
         /**
          * Filters the favorited activity items for a specified user.
@@ -710 +718 @@
                 $user_id = bp_loggedin_user_id();
         }
 
-        $my_favs = bp_get_user_meta( $user_id, 'bp_favorite_activities', true );
-        if ( empty( $my_favs ) || ! is_array( $my_favs ) ) {
+        $my_favs = bp_activity_get_user_favorites( $user_id );
+        if ( ! is_array( $my_favs ) ) {
                 $my_favs = array();
         }
 
@@ -720 +728 @@
                 return false;
         }
 
-        // Add to user's favorites.
-        $my_favs[] = $activity_id;
+        if ( ! bp_relationships_add( 'activity_favorites', $user_id, $activity_id ) ) {
+                return false;
+        }
+
+        // Reset the cache
+        wp_cache_delete( 'bp_activity_user_' . $user_id . '_favorites', 'bp' );
+
+        // Update the total number of activities the user favorites
+        $my_favs_count = (int) bp_get_user_meta( $user_id, 'bp_activity_favorites_count', true );
+        bp_update_user_meta( $user_id, 'bp_activity_favorites_count', $my_favs_count + 1 );
 
         // Update the total number of users who have favorited this activity.
         $fav_count = bp_activity_get_meta( $activity_id, 'favorite_count' );
         $fav_count = !empty( $fav_count ) ? (int) $fav_count + 1 : 1;
 
-        // Update user meta.
-        bp_update_user_meta( $user_id, 'bp_favorite_activities', $my_favs );
-
         // Update activity meta counts.
         if ( bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count ) ) {
 
@@ -791 +804 @@
                 $user_id = bp_loggedin_user_id();
         }
 
-        $my_favs = bp_get_user_meta( $user_id, 'bp_favorite_activities', true );
-        $my_favs = array_flip( (array) $my_favs );
-
-        // Bail if the user has not previously favorited the item.
-        if ( ! isset( $my_favs[ $activity_id ] ) ) {
+        // Bail if favorites could not be removed for the user.
+        if ( ! bp_relationships_remove_by_object_ids( 'activity_favorites', $activity_id, $user_id ) ) {
                 return false;
         }
 
-        // Remove the fav from the user's favs.
-        unset( $my_favs[$activity_id] );
-        $my_favs = array_unique( array_flip( $my_favs ) );
+        // Reset the cache
+        wp_cache_delete( 'bp_activity_user_' . $user_id . '_favorites', 'bp' );
+
+        // Update the total number of activities the user favorites
+        $my_favs_count = (int) bp_get_user_meta( $user_id, 'bp_activity_favorites_count', true );
+
+        if ( ! empty( $my_favs_count ) ) {
+                bp_update_user_meta( $user_id, 'bp_activity_favorites_count', $my_favs_count - 1 );
+        }
 
         // Update the total number of users who have favorited this activity.
         $fav_count = bp_activity_get_meta( $activity_id, 'favorite_count' );
+
         if ( ! empty( $fav_count ) ) {
 
                 // Deduct from total favorites.
                 if ( bp_activity_update_meta( $activity_id, 'favorite_count', (int) $fav_count - 1 ) ) {
 
-                        // Update users favorites.
-                        if ( bp_update_user_meta( $user_id, 'bp_favorite_activities', $my_favs ) ) {
-
-                                /**
-                                 * Fires if bp_update_user_meta() is successful and before returning a true value for success.
-                                 *
-                                 * @since 1.2.1
-                                 *
-                                 * @param int $activity_id ID of the activity item being unfavorited.
-                                 * @param int $user_id     ID of the user doing the unfavoriting.
-                                 */
-                                do_action( 'bp_activity_remove_user_favorite', $activity_id, $user_id );
-
-                                // Success.
-                                return true;
-
-                        // Error updating.
-                        } else {
-                                return false;
-                        }
+                        /**
+                         * Fires if bp_update_user_meta() is successful and before returning a true value for success.
+                         *
+                         * @since 1.2.1
+                         *
+                         * @param int $activity_id ID of the activity item being unfavorited.
+                         * @param int $user_id     ID of the user doing the unfavoriting.
+                         */
+                        do_action( 'bp_activity_remove_user_favorite', $activity_id, $user_id );
+
+                        // Success.
+                        return true;
 
                 // Error updating favorite count.
                 } else {
@@ -843 +852 @@
 }
 
 /**
+ * Remove favorites and update Users favorites count
+ *
+ * @since 2.5.0
+ *
+ * @param array|int $deleted List of deleted activities or the deleted activity ID
+ */
+function bp_activity_remove_user_favorites( $deleted ) {
+        // Get the users to update favorites count for
+        $user_ids = bp_relationships_get_item_ids( 'activity_favorites', $deleted );
+
+        // No users favorited one of the deleted activities
+        if ( empty( $user_ids ) ) {
+                return;
+        }
+
+        $user_ids = array_unique( $user_ids );
+
+        // Remove favorites
+        bp_relationships_remove_by_object_ids( 'activity_favorites', $deleted );
+
+        // Update Users favorites count
+        foreach ( $user_ids as $user_id ) {
+                // Reset the cache for the user
+                wp_cache_delete( 'bp_activity_user_' . $user_id . '_favorites', 'bp' );
+
+                // Get the favorites for the user
+                $favs = bp_activity_get_user_favorites( $user_id );
+
+                // Update the user's count
+                bp_update_user_meta( $user_id, 'bp_activity_favorites_count', count( $favs ) );
+        }
+}
+
+/**
  * Check whether an activity item exists with a given content string.
  *
  * @since 1.1.0
@@ -1055 +1098 @@
         // Clear the user's activity from the sitewide stream and clear their activity tables.
         bp_activity_delete( array( 'user_id' => $user_id ) );
 
+        // Remove Favorites
+        bp_relationships_remove_by_item_ids( 'activity_favorites', $user_id );
+
         // Remove any usermeta.
-        bp_delete_user_meta( $user_id, 'bp_latest_update'       );
-        bp_delete_user_meta( $user_id, 'bp_favorite_activities' );
+        bp_delete_user_meta( $user_id, 'bp_latest_update'            );
+        bp_delete_user_meta( $user_id, 'bp_activity_favorites_count' );
 
         // Execute additional code
         do_action( 'bp_activity_remove_data', $user_id ); // Deprecated! Do not use!
@@ -2279 +2325 @@
                 return false;
         }
 
+        // Remove favorites and Update User count
+        bp_activity_remove_user_favorites( $activity_ids_deleted );
+
         // Check if the user's latest update has been deleted.
         $user_id = empty( $args['user_id'] )
                 ? bp_loggedin_user_id()

src/bp-activity/bp-activity-loader.php

@@ -117 +117 @@
                         'search_string'         => __( 'Search Activity...', 'buddypress' ),
                         'global_tables'         => $global_tables,
                         'meta_tables'           => $meta_tables,
+                        'relationship_types'    => array( 'activity_favorites' ),
                 );
 
                 parent::setup_globals( $args );

src/bp-activity/bp-activity-template.php

@@ -290 +290 @@
                 $this->disable_blogforum_replies = (bool) bp_core_get_root_option( 'bp-disable-blogforum-comments' );
 
                 // Get an array of the logged in user's favorite activities.
-                $this->my_favs = maybe_unserialize( bp_get_user_meta( bp_loggedin_user_id(), 'bp_favorite_activities', true ) );
+                $this->my_favs = bp_activity_get_user_favorites( bp_loggedin_user_id() );
 
                 // Fetch specific activity items based on ID's.
                 if ( !empty( $include ) ) {

src/bp-activity/classes/class-bp-activity-activity.php

@@ -1701 +1701 @@
          */
         public static function total_favorite_count( $user_id ) {
 
-                // Get activities from user meta.
-                $favorite_activity_entries = bp_get_user_meta( $user_id, 'bp_favorite_activities', true );
-                if ( ! empty( $favorite_activity_entries ) ) {
-                        return count( maybe_unserialize( $favorite_activity_entries ) );
-                }
-
-                // No favorites.
-                return 0;
+                // Get favorites count from user meta.
+                return (int) bp_get_user_meta( $user_id, 'bp_activity_favorites_count', true );
         }
 
         /**

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

@@ -54 +54 @@
         // Install the signups table.
         bp_core_maybe_install_signups();
 
+        // Install Object Relationships
+        bp_core_install_object_relationships();
+
         // Notifications.
         if ( !empty( $active_components['notifications'] ) ) {
                 bp_core_install_notifications();
@@ -526 +529 @@
         $wpdb->query( "ALTER TABLE {$wpdb->signups} ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST" );
         $wpdb->query( "ALTER TABLE {$wpdb->signups} DROP INDEX domain" );
 }
+
+/**
+ * Install the object relationships table.
+ *
+ * @since 2.5.0
+ */
+function bp_core_install_object_relationships() {
+        $sql             = array();
+        $charset_collate = bp_core_set_charset();
+        $bp_prefix       = bp_core_get_table_prefix();
+
+        $sql = array( "CREATE TABLE {$bp_prefix}bp_object_relationships (
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                type varchar(75) NOT NULL,
+                                item_id bigint(20) NOT NULL,
+                                object_id bigint(20) NOT NULL,
+                                KEY type (type),
+                                KEY item_id (item_id),
+                                KEY object_id (object_id)
+                        ) {$charset_collate};" );
+
+        dbDelta( $sql );
+}

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

@@ -25 +25 @@
 require dirname( __FILE__ ) . '/classes/class-bp-attachment.php';
 require dirname( __FILE__ ) . '/classes/class-bp-attachment-avatar.php';
 require dirname( __FILE__ ) . '/classes/class-bp-attachment-cover-image.php';
+require dirname( __FILE__ ) . '/classes/class-bp-object-relationships.php';

src/bp-core/bp-core-component.php

@@ -301 +301 @@
                         $this->register_meta_tables( $r['meta_tables'] );
                 }
 
+                // Set the specific relationship types for the component
+                if ( ! empty( $r['relationship_types'] ) ) {
+                        bp_relationships_register_types( $this->id, $r['relationship_types'] );
+                }
+
                 /** BuddyPress *******************************************************
                  */
 

src/bp-core/bp-core-functions.php

@@ -2591 +2591 @@
 
         return $bp->upload_dir;
 }
+
+/** Object Relationships ******************************************************/
+
+/**
+ * Register the relationship types for the component.
+ *
+ * @since  2.5.0
+ *
+ * @param  string $component The component ID (eg: activity).
+ * @param  array  $types     The list of relationships type to add.
+ */
+function bp_relationships_register_types( $component, $types = array() ) {
+        return buddypress()->object_relationships->register_types( $component, $types );
+}
+
+/**
+ * Make sure a relationship is valid and active.
+ *
+ * @since  2.5.0
+ *
+ * @param  string $type The type to check.
+ * @return bool         True if valid, false otherwise.
+ */
+function bp_relationships_is_active_type( $type = '' ) {
+        $relationship_types = buddypress()->object_relationships->types;
+
+        return ! empty( buddypress()->object_relationships->types[ $type ] );
+}
+
+/**
+ * Add a new relationship between 2 objects
+ *
+ * @since  2.5.0
+ *
+ * @param  string  $type      The name of the relationship (eg: activity_favorites)
+ * @param  int     $item_id   The ID of the first object
+ * @param  int     $object_id The ID of the second object
+ * @return bool               True if the relationships was successfuly created. False otherwise.
+ */
+function bp_relationships_add( $type = '', $item_id = 0, $object_id = 0 ) {
+        return buddypress()->object_relationships->add( array(
+                'type'      => sanitize_key( $type ),
+                'item_id'   => (int) $item_id,
+                'object_id' => (int) $object_id,
+        ) );
+}
+
+/**
+ * Get The item ids for the requested object_ids
+ *
+ * @since  2.5.0
+ *
+ * @param  string           $type       The name of the relationship (eg: activity_favorites).
+ * @param  int|array|string $object_ids An object ID or a list of object IDs.
+ * @return array            the list of item IDs.
+ */
+function bp_relationships_get_item_ids( $type = '', $object_ids ) {
+        return buddypress()->object_relationships->get( array(
+                'type'  => sanitize_key( $type ),
+                'in'    => $object_ids,
+        ) );
+}
+
+/**
+ * Get The object ids for the requested item_ids
+ *
+ * @since  2.5.0
+ *
+ * @param  string           $type       The name of the relationship (eg: activity_favorites).
+ * @param  int|array|string $item_ids   An item ID or a list of item IDs.
+ * @return array            the list of object IDs.
+ */
+function bp_relationships_get_object_ids( $type = '', $item_ids ) {
+        return buddypress()->object_relationships->get( array(
+                'type'  => sanitize_key( $type ),
+                'field' => 'object_id',
+                'in'    => $item_ids,
+        ) );
+}
+
+/**
+ * Remove relationships using item ids for a given object ID (or all)
+ *
+ * @since  2.5.0
+ *
+ * @param  string            $type      The name of the relationship (eg: activity_favorites).
+ * @param  int|array|string  $item_ids  An item ID or a list of item IDs.
+ * @param  int               $object_id 0 to remove for all, a specific value to restrict.
+ * @return bool              True if the relationships was successfuly deleted. False otherwise.
+ */
+function bp_relationships_remove_by_item_ids( $type = '', $item_ids, $object_id = 0 ) {
+        return buddypress()->object_relationships->remove( array(
+                'type'  => sanitize_key( $type ),
+                'field' => 'object_id',
+                'in'    => $item_ids,
+                'for'   => (int) $object_id,
+        ) );
+}
+
+/**
+ * Remove relationships using object ids for a given item ID (or all)
+ *
+ * @since  2.5.0
+ *
+ * @param  string            $type        The name of the relationship (eg: activity_favorites).
+ * @param  int|array|string  $object_ids  An object ID or a list of object IDs.
+ * @param  int               $item_id     0 to remove for all, a specific value to restrict.
+ * @return bool              True if the relationships was successfuly deleted. False otherwise.
+ */
+function bp_relationships_remove_by_object_ids( $type = '', $object_ids, $item_id = 0 ) {
+        return buddypress()->object_relationships->remove( array(
+                'type' => sanitize_key( $type ),
+                'in'   => $object_ids,
+                'for'  => (int) $item_id,
+        ) );
+}

src/bp-core/bp-core-loader.php

@@ -250 +250 @@
                 // bp-notifications instead.
                 $bp->core->table_name_notifications = $bp->table_prefix . 'bp_notifications';
 
+                // Init the object relationships
+                $bp->object_relationships = new BP_Object_Relationships;
+
                 /**
                  * Used to determine if user has admin rights on current content. If the
                  * logged in user is viewing their own profile and wants to delete

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

@@ -260 +260 @@
                 if ( $raw_db_version < 9615 ) {
                         bp_update_to_2_3();
                 }
+
+                // 2.5.0
+                if ( $raw_db_version < 10449 ) {
+                        bp_update_to_2_5();
+                }
         }
 
         /** All done! *************************************************************/
@@ -484 +489 @@
 }
 
 /**
+ * 2.5.0 update routine.
+ *
+ * - Add relationships table.
+ *
+ * @since 2.5.0
+ */
+function bp_update_to_2_5() {
+        // Install Object Relationships
+        bp_core_install_object_relationships();
+
+        // Migrate Member Favorites
+        bp_migrate_activity_favorites();
+}
+
+/**
  * Updates the component field for new_members type.
  *
  * @since 2.2.0
@@ -535 +555 @@
 }
 
 /**
+ * Migrate the Members favorites
+ *
+ * @since  2.5.0
+ */
+function bp_migrate_activity_favorites() {
+        global $wpdb;
+
+        $user_favorites = $wpdb->get_results( "SELECT user_id, meta_value FROM {$wpdb->usermeta} WHERE meta_key = 'bp_favorite_activities'" );
+
+        foreach( $user_favorites as $user_favorite ) {
+                $activity_ids = maybe_unserialize( $user_favorite->meta_value );
+
+                if ( empty( $activity_ids ) ) {
+                        continue;
+                }
+
+                // Validate Favorites
+                $favorites = bp_activity_get_specific( array( 'activity_ids' => $activity_ids, 'show_hidden' => true ) );
+
+                if ( empty( $favorites['activities'] ) ) {
+                        continue;
+                }
+
+                // Update Count
+                bp_update_user_meta( $user_favorite->user_id, 'bp_activity_favorites_count', count( $favorites['activities'] ) );
+
+                // Remove no more used meta
+                bp_delete_user_meta( $user_favorite->user_id, 'bp_favorite_activities' );
+
+                foreach ( $favorites['activities'] as $activity ) {
+                        bp_relationships_add( 'activity_favorites', $user_favorite->user_id, $activity->id );
+                }
+
+        }
+}
+
+/**
  * Redirect user to BP's What's New page on first page load after activation.
  *
  * @since 1.7.0

src/bp-core/classes/class-bp-object-relationships.php

@@ +1 @@
+<?php
+/**
+ * Core component classes.
+ *
+ * @package BuddyPress
+ * @subpackage Core
+ * @since 2.5.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * BuddyPress objects relationship class.
+ *
+ * @since 2.5.0
+ */
+final class BP_Object_Relationships {
+        /**
+         * Name of the relationships table.
+         *
+         * @var string
+         */
+        public $table_name = '';
+
+        /**
+         * Available relationship types.
+         *
+         * @var array
+         */
+        public $types = array();
+
+        /**
+         * Constructor
+         *
+         * @since 2.5.0
+         */
+        public function __construct() {
+                $this->table_name = bp_core_get_table_prefix() . 'bp_object_relationships';
+        }
+
+        /**
+         * Register relationship types, making sure they are unique
+         *
+         * @since 2.5.0
+         *
+         * @param string $component The component ID
+         * @param array  $types     The list of relationships type to add
+         */
+        public function register_types( $component, $types = array() ) {
+                foreach ( (array) $types as $type ) {
+                        $type = sanitize_key( $type );
+
+                        if ( ! isset( $this->types[ $type ] ) ) {
+                                $this->types[ $type ] = bp_is_active( $component );
+                        }
+                }
+        }
+
+        /**
+         * Add a relationship.
+         *
+         * @since 2.5.0
+         *
+         * @param array $args.
+         * @return bool True on success, false otherwise
+         */
+        public function add( $args = array() ) {
+                global $wpdb;
+
+                $r = array_intersect_key( $args, array(
+                        'type'      => '',
+                        'item_id'   => 0,
+                        'object_id' => 0,
+                ) );
+
+                if ( ! bp_relationships_is_active_type( $r['type'] ) || empty( $r['item_id'] ) || empty( $r['object_id'] ) ) {
+                        return false;
+                }
+
+                $added = $wpdb->insert(
+                        $this->table_name,
+                        $r,
+                        array( '%s', '%d', '%d' )
+                );
+
+                return (bool) $added;
+        }
+
+        /**
+         * Validate the query arguments
+         *
+         * @since 2.5.0
+         *
+         * @param  array      $args the query arguments
+         * @return bool|array Validated query arguments or false.
+         */
+        public function validate_query_args( $args = array() ) {
+                $r = wp_parse_args( $args, array(
+                        'type'    => '',
+                        'field'   => 'item_id',
+                        'in'      => array(),
+                ) );
+
+                if ( ( 'item_id' !== $r['field'] && 'object_id' !== $r['field'] ) || ! bp_relationships_is_active_type( $r['type'] ) || empty( $r['in'] ) ) {
+                        return false;
+                }
+
+                $r['in_field'] = 'object_id';
+
+                if ( $r['field'] !== 'item_id' ) {
+                        $r['in_field'] = 'item_id';
+                }
+
+                return $r;
+        }
+
+        /**
+         * Set the IN clause for a query
+         *
+         * @since 2.5.0
+         *
+         * @param  string $in_field Name of the field
+         * @param  array  $in List of object/item IDs
+         * @return string The where clause.
+         */
+        public function set_in( $in_field = '', $in = array() ) {
+                global $wpdb;
+
+                $in = wp_parse_id_list( $in );
+
+                if ( 1 === count( $in ) ) {
+                        return $wpdb->prepare( "{$in_field} = %d", reset( $in ) );
+                } else {
+                        $in = join( ',', $in );
+                        return "{$in_field} IN ({$in})";
+                }
+        }
+
+        /**
+         * Get item ids for a given object id or vice versa
+         *
+         * @since 2.5.0
+         *
+         * @param  array $args.
+         * @return array List of item ids or object ids
+         */
+        public function get( $args = array() ) {
+                global $wpdb;
+
+                $r = $this->validate_query_args( $args );
+
+                if ( ! is_array( $r ) ) {
+                        return false;
+                }
+
+                $sql = array(
+                        'select' => sprintf( 'SELECT %s FROM %s', $r['field'], $this->table_name ),
+                        'where'  => array(
+                                'type' => $wpdb->prepare( 'type = %s', $r['type'] ),
+                                'in'   => $this->set_in( $r['in_field'], $r['in'] ),
+                        ),
+                );
+
+                $sql['where'] = 'WHERE ' . join( ' AND ', $sql['where'] );
+
+                return $wpdb->get_col( join( ' ', $sql ) );
+        }
+
+        /**
+         * Remove item ids for a given object id or vice versa
+         *
+         * @since 2.5.0
+         *
+         * @param  array $args.
+         * @return array List of item ids or object ids
+         */
+        public function remove( $args = array() ) {
+                global $wpdb;
+
+                $r = $this->validate_query_args( $args );
+
+                if ( ! is_array( $r ) ) {
+                        return false;
+                }
+
+                $sql = array(
+                        'select' => sprintf( 'DELETE FROM %s', $this->table_name ),
+                        'where'  => array(
+                                'type' => $wpdb->prepare( 'type = %s', $r['type'] ),
+                                'in'   => $this->set_in( $r['in_field'], $r['in'] ),
+                        ),
+                );
+
+                if ( ! empty( $r['for'] ) ) {
+                        $sql['where']['for'] = $wpdb->prepare( "{$r['field']} = %d", $r['for'] );
+                }
+
+                $sql['where'] = 'WHERE ' . join( ' AND ', $sql['where'] );
+
+                return (bool) $wpdb->query( join( ' ', $sql ) );
+        }
+}

src/bp-loader.php

@@ -328 +328 @@
                 /** Versions **********************************************************/
 
                 $this->version    = '2.5.0-alpha';
-                $this->db_version = 10071;
+                $this->db_version = 10449;
 
                 /** Loading ***********************************************************/
 

tests/phpunit/testcases/activity/functions.php

@@ -1316 +1316 @@
                 $this->assertTrue( bp_activity_add_user_favorite( $a, $u ) );
 
                 $this->assertFalse( bp_activity_add_user_favorite( $a, $u ) );
-                $this->assertSame( array( $a ), bp_activity_get_user_favorites( $u ) );
+                $this->assertEquals( array( $a ), bp_activity_get_user_favorites( $u ) );
+                $this->assertEquals( 1, bp_activity_get_meta( $a, 'favorite_count' ) );
+
+                $this->set_current_user( $current_user );
+        }
+
+        /**
+         * @group favorites
+         * @group bp_activity_remove_user_favorite
+         */
+        public function test_remove_user_favorite_bad_activity_id() {
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $a = $this->factory->activity->create();
+
+                // bp_activity_add_user_favorite() requires a logged-in user.
+                $current_user = bp_loggedin_user_id();
+                $this->set_current_user( $u1 );
+
+                // Only favorite for user 1
+                bp_activity_add_user_favorite( $a, $u1 );
+
+                $this->set_current_user( $u2 );
+
+                // Removing for user 2 should fail
+                $this->assertFalse( bp_activity_remove_user_favorite( $a, $u2 ) );
                 $this->assertEquals( 1, bp_activity_get_meta( $a, 'favorite_count' ) );
 
                 $this->set_current_user( $current_user );
@@ -1326 +1351 @@
          * @group favorites
          * @group bp_activity_add_user_favorite
          */
-        public function test_add_user_favorite_not_yet_favorited() {
+        public function test_add_user_favorite_empty_activity_id() {
                 $u = $this->factory->user->create();
-                $a = $this->factory->activity->create();
 
                 // bp_activity_add_user_favorite() requires a logged-in user.
                 $current_user = bp_loggedin_user_id();
                 $this->set_current_user( $u );
-                $this->assertTrue( bp_activity_add_user_favorite( $a, $u ) );
+
+                // an empty activity id should not be favorited
+                $this->assertFalse( bp_activity_add_user_favorite( 0, $u ) );
 
                 $this->set_current_user( $current_user );
         }
@@ -1342 +1368 @@
          * @group favorites
          * @group bp_activity_remove_user_favorite
          */
-        public function test_remove_user_favorite_bad_activity_id() {
+        public function test_remove_user_favorite_good_activity_id() {
+                $u = $this->factory->user->create();
+                $a = $this->factory->activity->create();
+
+                // bp_activity_add_user_favorite() requires a logged-in user.
+                $current_user = bp_loggedin_user_id();
+                $this->set_current_user( $u );
+
+                bp_activity_add_user_favorite( $a, $u );
+
+                // Removing the favorite
+                $this->assertTrue( bp_activity_remove_user_favorite( $a, $u ) );
+                $this->assertEquals( 0, bp_activity_get_meta( $a, 'favorite_count' ) );
+
+                $this->set_current_user( $current_user );
+        }
+
+        /**
+         * @group favorites
+         * @group bp_activity_get_user_favorites()
+         */
+        public function test_bp_activity_get_user_favorites() {
+                $u = $this->factory->user->create();
+
+                $activities = array(
+                        $this->factory->activity->create(),
+                        $this->factory->activity->create(),
+                        $this->factory->activity->create()
+                );
+
+                // bp_activity_add_user_favorite() requires a logged-in user.
+                $current_user = bp_loggedin_user_id();
+                $this->set_current_user( $u );
+
+                // Only favorite last 2 elements of the array
+                bp_activity_add_user_favorite( $activities[1], $u );
+                bp_activity_add_user_favorite( $activities[2], $u );
+
+                array_shift( $activities );
+
+                $this->assertEquals( $activities, bp_activity_get_user_favorites( $u ) );
+
+                $this->set_current_user( $current_user );
+        }
+
+        /**
+         * @group favorites
+         * @group bp_activity_total_favorites_for_user
+         */
+        public function test_bp_activity_total_favorites_for_user() {
                 $u1 = $this->factory->user->create();
                 $u2 = $this->factory->user->create();
-                $a = $this->factory->activity->create();
+
+                $activities = array(
+                        $this->factory->activity->create(),
+                        $this->factory->activity->create()
+                );
 
                 // bp_activity_add_user_favorite() requires a logged-in user.
                 $current_user = bp_loggedin_user_id();
                 $this->set_current_user( $u1 );
 
-                // Only favorite for user 1
-                bp_activity_add_user_favorite( $a, $u1 );
+                // Only add favorites to user 1
+                bp_activity_add_user_favorite( $activities[0], $u1 );
+                bp_activity_add_user_favorite( $activities[1], $u1 );
 
-                // Removing for user 2 should fail
-                $this->assertFalse( bp_activity_remove_user_favorite( $a, $u2 ) );
-                $this->assertEquals( 1, bp_activity_get_meta( $a, 'favorite_count' ) );
+                $this->assertEquals( 2, bp_activity_total_favorites_for_user( $u1 ) );
+
+                $this->set_current_user( $u2 );
+
+                $this->assertEquals( 0, bp_activity_total_favorites_for_user( $u2 ) );
 
                 $this->set_current_user( $current_user );
         }
 
         /**
+         * @group favorites
+         * @group bp_activity_total_favorites_for_user
+         * @group bp_activity_remove_user_favorites
+         */
+        public function test_count_user_favorite_after_activity_removed() {
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $a1 = $this->factory->activity->create();
+                $a2 = $this->factory->activity->create();
+
+                // bp_activity_add_user_favorite() requires a logged-in user.
+                $current_user = bp_loggedin_user_id();
+                $this->set_current_user( $u1 );
+
+                // favorite activity
+                bp_activity_add_user_favorite( $a1, $u1 );
+
+                $this->set_current_user( $u2 );
+
+                // favorite activities
+                bp_activity_add_user_favorite( $a1, $u2 );
+                bp_activity_add_user_favorite( $a2, $u2 );
+
+                // Delete the activity
+                bp_activity_delete_by_activity_id( $a1 );
+
+                $this->assertEquals( 0, bp_activity_total_favorites_for_user( $u1 ) );
+                $this->assertEquals( 1, bp_activity_total_favorites_for_user( $u2 ) );
+
+                $this->set_current_user( $current_user );
+        }
+
+        /**
+         * @group favorites
+         * @group bp_activity_favorites_migrate
+         */
+        public function test_bp_activity_favorites_migrate() {
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $activities = $this->factory->activity->create_many( 10 );
+
+                $user_meta_favorites = array( $u1 => array(), $u2 => array() );
+
+                foreach ( $activities as $activity_id ) {
+                        $modulo = $activity_id % 2;
+
+                        if ( empty( $modulo ) ) {
+                                $user_meta_favorites[ $u2 ][] = $activity_id;
+                        } else {
+                                $user_meta_favorites[ $u1 ][] = $activity_id;
+                        }
+                }
+
+                bp_update_user_meta( $u1, 'bp_favorite_activities', $user_meta_favorites[ $u1 ] );
+                bp_update_user_meta( $u2, 'bp_favorite_activities', $user_meta_favorites[ $u2 ] );
+
+                // migrate
+                bp_migrate_activity_favorites();
+
+                $migrated = array(
+                        $u1 => bp_activity_get_user_favorites( $u1 ),
+                        $u2 => bp_activity_get_user_favorites( $u2 )
+                );
+
+                $this->assertEquals( sort( $user_meta_favorites[ $u1 ] ), sort( $migrated[ $u1 ] ) );
+                $this->assertEquals( sort( $user_meta_favorites[ $u2 ] ), sort( $migrated[ $u2 ] ) );
+        }
+
+        /**
          * @group bp_activity_post_update
          */
         public function test_bp_activity_post_update_empty_content() {