Changeset 9257 for trunk/src/bp-activity/bp-activity-template.php

Timestamp:

12/22/2014 09:46:50 PM (10 years ago)

Author:

r-a-y

Message:

Activity: Support multiple scopes in bp_has_activities().

This commit:

• Allows the 'scope' parameter to support multiple scopes. For example, scope=friends,mentions. This can be a comma-delimited string or an array.
• Makes the 'scope' parameter available across the bp_has_activities() stack. Previously, 'scope' was only available for use in the bp_has_activities() loop.
• Parses scopes using the BP_Activity_Query class to handle complex conditions.
• Allows components to declare their own custom activity scopes. Components can also override existing activity arguments by setting the 'override' key in their scope callback. For an example, see how the friends component declares the 'friends' scope in bp_friends_filter_activity_scope(). Previously, it was not possible for components or third-party plugins to declare their own scopes without doing a fair bit of workarounds.

See #4988.

File:

• trunk/src/bp-activity/bp-activity-template.php (modified) (4 diffs)

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

@@ -202 +202 @@
             'in'                => false,
             'filter'            => false,
+            'scope'             => false,
             'search_terms'      => false,
             'meta_query'        => false,
@@ -253 +254 @@
                 'filter_query'      => $filter_query,
                 'filter'            => $filter,
+                'scope'             => $scope,
                 'show_hidden'       => $show_hidden,
                 'exclude'           => $exclude,
@@ -614 +616 @@
     }
 
+    // Search terms
     if ( empty( $search_terms ) && ! empty( $_REQUEST['s'] ) )
         $search_terms = $_REQUEST['s'];
 
-    // If you have passed a "scope" then this will override any filters you have passed.
-    if ( 'just-me' == $scope || 'friends' == $scope || 'groups' == $scope || 'favorites' == $scope || 'mentions' == $scope ) {
-        if ( 'just-me' == $scope )
-            $display_comments = 'stream';
-
-        // determine which user_id applies
-        if ( empty( $user_id ) )
+    // Set some default arguments when using a scope
+    if ( ! empty( $scope ) ) {
+        // Determine which user ID applies
+        if ( empty( $user_id ) ) {
             $user_id = bp_displayed_user_id() ? bp_displayed_user_id() : bp_loggedin_user_id();
-
-        // are we displaying user specific activity?
-        if ( is_numeric( $user_id ) ) {
-            $show_hidden = ( $user_id == bp_loggedin_user_id() && $scope != 'friends' ) ? 1 : 0;
-
-            switch ( $scope ) {
-                case 'friends':
-                    if ( bp_is_active( 'friends' ) )
-                        $friends = friends_get_friend_user_ids( $user_id );
-                        if ( empty( $friends ) )
-                            return false;
-
-                        $user_id = implode( ',', (array) $friends );
-                    break;
-                case 'groups':
-                    if ( bp_is_active( 'groups' ) ) {
-                        $groups = groups_get_user_groups( $user_id );
-                        if ( empty( $groups['groups'] ) )
-                            return false;
-
-                        $object = $bp->groups->id;
-                        $primary_id = implode( ',', (array) $groups['groups'] );
-
-                        $user_id = 0;
-                    }
-                    break;
-                case 'favorites':
-                    $favs = bp_activity_get_user_favorites( $user_id );
-                    if ( empty( $favs ) )
-                        return false;
-
-                    $in = implode( ',', (array) $favs );
-                    $display_comments = true;
-                    $user_id = 0;
-                    break;
-                case 'mentions':
-
-                    // Are mentions disabled?
-                    if ( ! bp_activity_do_mentions() ) {
-                        return false;
-                    }
-
-                    // Start search at @ symbol and stop search at closing tag delimiter.
-                    $search_terms     = '@' . bp_activity_get_user_mentionname( $user_id ) . '<';
-                    $display_comments = 'stream';
-                    $user_id = 0;
-                    break;
-            }
+        }
+
+        // Should we show all items regardless of sitewide visibility?
+        if ( ! empty( $user_id ) ) {
+            $show_hidden = ( $user_id == bp_loggedin_user_id() ) ? 1 : 0;
         }
     }
@@ -713 +670 @@
         'in'                => $in,
         'filter'            => $filter,
+        'scope'             => $scope,
         'search_terms'      => $search_terms,
         'meta_query'        => $meta_query,