Changeset 8249

Timestamp:

04/07/2014 05:33:26 PM (11 years ago)

Author:

boonebgorges

Message:

By default, BP_Activity_Activity::get_registered_components() should not return components with only last_activity items

Since moving last_activity items to be stored in the activity database, the
'members' component now has activity associated with it. However, these items
are not "real" activity items, in the sense that you would want to query them
when pulling up an activity stream. BP core has excluded these items from
general activity queries elsewhere. But in BP_Activity_Activity::get_registered_components(),
we continued to return the members component, even when the only activity
items associated with it were of the 'last_activity' variety. Though BP does
not natively use this method anymore, it did break some plugins that were
expecting a more sanitized list of components.

Fixes #5519

Location:

trunk

Files:

• bp-activity/bp-activity-classes.php (modified) (1 diff)
• tests/testcases/activity/class.BP_Activity_Activity.php (modified) (1 diff)

trunk/bp-activity/bp-activity-classes.php

@@ -1106 +1106 @@
 
     /**
-     * Get a list of components that have recorded activity associated with them
-     *
+     * Get a list of components that have recorded activity associated with them.
+     *
+     * @param bool $skip_last_activity If true, components will not be
+     *        included if the only activity type associated with them is
+     *        'last_activity'. (Since 2.0.0, 'last_activity' is stored in
+     *        the activity table, but these items are not full-fledged
+     *        activity items.) Default: true.
      * @return array List of component names.
      */
-    public static function get_recorded_components() {
+    public static function get_recorded_components( $skip_last_activity = true ) {
         global $wpdb, $bp;
-        return $wpdb->get_col( "SELECT DISTINCT component FROM {$bp->activity->table_name} ORDER BY component ASC" );
+
+        if ( $skip_last_activity ) {
+            $components = $wpdb->get_col( "SELECT DISTINCT component FROM {$bp->activity->table_name} WHERE action != '' AND action != 'last_activity' ORDER BY component ASC" );
+        } else {
+            $components = $wpdb->get_col( "SELECT DISTINCT component FROM {$bp->activity->table_name} ORDER BY component ASC" );
+        }
+
+        return $components;
     }
 

trunk/tests/testcases/activity/class.BP_Activity_Activity.php

@@ -444 +444 @@
 
     /**
+     * @group get_recorded_components
+     */
+    public function test_get_recorded_components_skip_last_activity_false() {
+        $a1 = $this->factory->activity->create( array(
+            'component' => 'members',
+            'action' => 'last_activity',
+        ) );
+        $a2 = $this->factory->activity->create( array(
+            'component' => 'groups',
+            'action' => 'created_group',
+        ) );
+        $a3 = $this->factory->activity->create( array(
+            'component' => 'friends',
+            'action' => 'friendship_accepted',
+        ) );
+
+        $found = BP_Activity_Activity::get_recorded_components( false );
+        sort( $found );
+
+        $this->assertSame( array( 'friends', 'groups', 'members' ), BP_Activity_Activity::get_recorded_components( false ) );
+    }
+
+    /**
+     * @group get_recorded_components
+     */
+    public function test_get_recorded_components_skip_last_activity_true_filter_empty_component() {
+        $a1 = $this->factory->activity->create( array(
+            'component' => 'members',
+            'action' => 'last_activity',
+        ) );
+        $a2 = $this->factory->activity->create( array(
+            'component' => 'groups',
+            'action' => 'created_group',
+        ) );
+        $a3 = $this->factory->activity->create( array(
+            'component' => 'friends',
+            'action' => 'friendship_accepted',
+        ) );
+
+        $found = BP_Activity_Activity::get_recorded_components( true );
+        sort( $found );
+
+        $this->assertSame( array( 'friends', 'groups' ), BP_Activity_Activity::get_recorded_components() );
+    }
+
+    /**
+     * @group get_recorded_components
+     */
+    public function test_get_recorded_components_skip_last_activity_true_members_component_not_empty() {
+        $a1 = $this->factory->activity->create( array(
+            'component' => 'members',
+            'action' => 'last_activity',
+        ) );
+        $a2 = $this->factory->activity->create( array(
+            'component' => 'groups',
+            'action' => 'created_group',
+        ) );
+        $a3 = $this->factory->activity->create( array(
+            'component' => 'friends',
+            'action' => 'friendship_accepted',
+        ) );
+        $a4 = $this->factory->activity->create( array(
+            'component' => 'members',
+            'action' => 'foo',
+        ) );
+
+        $found = BP_Activity_Activity::get_recorded_components( true );
+        sort( $found );
+
+        $this->assertSame( array( 'friends', 'groups', 'members' ), BP_Activity_Activity::get_recorded_components() );
+    }
+
+    /**
+     * @group get_recorded_components
+     */
+    public function test_get_recorded_components_skip_last_activity_true_la_in_multiple_components() {
+        $a1 = $this->factory->activity->create( array(
+            'component' => 'members',
+            'action' => 'last_activity',
+        ) );
+        $a2 = $this->factory->activity->create( array(
+            'component' => 'groups',
+            'action' => 'created_group',
+        ) );
+        $a3 = $this->factory->activity->create( array(
+            'component' => 'friends',
+            'action' => 'friendship_accepted',
+        ) );
+        $a4 = $this->factory->activity->create( array(
+            'component' => 'groups',
+            'action' => 'last_activity',
+        ) );
+
+        $found = BP_Activity_Activity::get_recorded_components( true );
+        sort( $found );
+
+        $this->assertSame( array( 'friends', 'groups', ), BP_Activity_Activity::get_recorded_components() );
+    }
+    /**
      * @group activity_action
      */