Changeset 13308

Timestamp:

08/08/2022 08:14:57 PM (2 years ago)

Author:

imath

Message:

Activity: restrict rich logging items to the site-wide stream

10.0.0 introduced richer activities about user's interaction with their profile or with groups (eg: user A changed their profile image). Displaying these richer activities into the self user or self group streams is less helpful and we are now restricting this extended version of these activity types to the site-wide activity stream.

Props dcavins

Fixes #8604

File:

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

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

@@ -1460 +1460 @@
             $activity          = $activities_template->activity;
             $user_id           = $activity->user_id;
+            $personal_types    = array( 'new_avatar', 'new_member', 'updated_profile' );
+
+            // Do not use generated-content activities when displaying a personal activity stream.
+            if ( (int) $user_id === (int) bp_displayed_user_id() && in_array( $activity_type, $personal_types, true ) ) {
+                return false;
+            }
 
             // Set generated content properties.
@@ -1564 +1570 @@
 
             if ( 'created_group' === $activity_type || 'joined_group' === $activity_type ) {
-                $group = bp_get_group( $activity->item_id );
+                $group         = bp_get_group( $activity->item_id );
+                $current_group = groups_get_current_group();
+
+                // Do not use generated-content activities when displaying a group activity stream.
+                if ( (int) $group->id === (int) $current_group->id ) {
+                    return false;
+                }
 
                 if ( isset( $bp->avatar->show_avatars ) && $bp->avatar->show_avatars && ! bp_disable_group_avatar_uploads() ) {