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

Timestamp:

12/11/2021 01:40:24 PM (3 years ago)

Author:

imath

Message:

Make sure the new_avatar activity can use the avatar crop results

Since [13175] the BP_Attachment_Avatar::crop() method include the timestamp the avatar was generated on into its returned array. This array is now transported into the action the function creating a new_avatar activity hooks to. This function (bp_members_new_avatar_activity()) now accepts 3 more parameters included the transported crop results. This makes it possible to use the timestamp when the avatar was generated on as the new_avatar activity recorded time. Doing so, we don't need to add an extra activity meta to store the name of the avatar file to be sure to display the avatar the user had at the time the activity was created.

Props vapvarun, oztaser

See #8581

File:

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

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

@@ -167 +167 @@
  *
  * @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 ) {
+ * @since 10.0.0 Adds the `$type`, `$crop_data` and `$cropped_avatar` parameters.
+ *
+ * @param int    $user_id        The user id the avatar was set for.
+ * @param string $type           The way the avatar was set ('camera' or `crop`).
+ * @param array  $crop_data      Array of parameters passed to the crop handler.
+ * @param array  $cropped_avatar Array containing the full, thumb avatar and the timestamp.
+ */
+function bp_members_new_avatar_activity( $user_id = 0, $type = '', $crop_data = array(), $cropped_avatar = array() ) {
 
     // Bail if activity component is not active.
@@ -231 +235 @@
     }
 
+    $recorded_time = '';
+    if ( isset( $cropped_avatar['timestamp'] ) && $cropped_avatar['timestamp'] ) {
+        $recorded_time = date( 'Y-m-d H:i:s', $cropped_avatar['timestamp'] );
+    }
+
     // Add the activity.
-    bp_activity_add(
+    $activity_id = bp_activity_add(
         array(
-            'user_id'   => $user_id,
-            'component' => $bp->members->id,
-            'type'      => 'new_avatar',
+            'user_id'       => $user_id,
+            'component'     => $bp->members->id,
+            'type'          => 'new_avatar',
+            'recorded_time' => $recorded_time,
         )
     );
 }
-add_action( 'bp_members_avatar_uploaded', 'bp_members_new_avatar_activity' );
+add_action( 'bp_members_avatar_uploaded', 'bp_members_new_avatar_activity', 10, 4 );