Changeset 12851 for trunk/src/bp-members/bp-members-activity.php

Timestamp:

02/21/2021 08:10:55 PM (6 years ago)

Author:

imath

Message:

The new_avatar activity belongs to the Members component

The activity generated when members add/update their profile photo wasn't migrated to the Members component during the 6.0.0 milestone. This commit's goal is to repare this oversight.

See #8156
See #8407
Fixes #8408

File:

• trunk/src/bp-members/bp-members-activity.php (modified) (3 diffs)

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

@@ -26 +26 @@
                 __( 'New Members', 'buddypress' ),
                 array( 'activity' )
+        );
+
+        // Register the activity stream actions for this component.
+        bp_activity_set_action(
+                // Older avatar activity items use 'profile' for component. See r4273.
+                buddypress()->members->id,
+                'new_avatar',
+                __( 'Member changed profile picture', 'buddypress' ),
+                'bp_members_format_activity_action_new_avatar',
+                __( 'Updated Profile Photos', 'buddypress' )
         );
 
@@ -69 +79 @@
 
 /**
+ * Format 'new_avatar' activity actions.
+ *
+ * @since 8.0.0
+ *
+ * @param string $action   Static activity action.
+ * @param object $activity Activity object.
+ * @return string
+ */
+function bp_members_format_activity_action_new_avatar( $action, $activity ) {
+        $userlink = bp_core_get_userlink( $activity->user_id );
+
+        /* translators: %s: user link */
+        $action = sprintf( esc_html__( '%s changed their profile picture', 'buddypress' ), $userlink );
+
+        // Legacy filter - pass $user_id instead of $activity.
+        if ( has_filter( 'bp_xprofile_new_avatar_action' ) ) {
+                $action = apply_filters( 'bp_xprofile_new_avatar_action', $action, $activity->user_id );
+        }
+
+        /** This filter is documented in wp-includes/deprecated.php */
+        $action = apply_filters_deprecated( 'bp_xprofile_format_activity_action_new_avatar', array( $action, $activity ), '8.0.0', 'bp_members_format_activity_action_new_avatar' );
+
+        /**
+         * Filters the formatted 'new_avatar' activity stream action.
+         *
+         * @since 8.0.0
+         *
+         * @param string $action   Formatted action for activity stream.
+         * @param object $activity Activity object.
+         */
+        return apply_filters( 'bp_members_format_activity_action_new_avatar', $action, $activity );
+}
+
+/**
  * Create a "became a registered user" activity item when a user activates his account.
  *
@@ -98 +142 @@
 }
 add_action( 'bp_core_activated_user', 'bp_core_new_user_activity' );
+
+/**
+ * Adds an activity stream item when a user has uploaded a new avatar.
+ *
+ * @since 8.0.0
+ *
+ * @param int $user_id The user id the avatar was set for.
+ */
+function bp_members_new_avatar_activity( $user_id = 0 ) {
+
+        // Bail if activity component is not active.
+        if ( ! bp_is_active( 'activity' ) ) {
+                return false;
+        }
+
+        if ( empty( $user_id ) ) {
+                $user_id = bp_displayed_user_id();
+        }
+
+        /** This filter is documented in wp-includes/deprecated.php */
+        $user_id = apply_filters_deprecated( 'bp_xprofile_new_avatar_user_id', array( $user_id ), '8.0.0', 'bp_members_new_avatar_user_id' );
+
+        /**
+         * Filters the user ID when a user has uploaded a new avatar.
+         *
+         * @since 8.0.0
+         *
+         * @param int $user_id ID of the user the avatar was set for.
+         */
+        $user_id = apply_filters( 'bp_members_new_avatar_user_id', $user_id );
+
+        // Add the activity.
+        bp_activity_add( array(
+                'user_id'   => $user_id,
+                'component' => buddypress()->members->id,
+                'type'      => 'new_avatar'
+        ) );
+}
+add_action( 'bp_members_avatar_uploaded', 'bp_members_new_avatar_activity' );