[PROD-8364] Activity Filter & Sorting

src/bp-activity/bp-activity-filters.php

@@ -193,6 +193,10 @@
 
 add_filter( 'bp_ajax_querystring', 'bb_activity_directory_set_pagination', 20, 2 );
 
+// Update activity date_update when any reaction.
+add_filter( 'bp_activity_add_user_favorite', 'bb_activity_update_date_updated_on_reactions', 10, 2 );
+add_filter( 'bp_activity_remove_user_favorite', 'bb_activity_update_date_updated_on_reactions', 10, 2 );
+
 /** Functions *****************************************************************/
 
 /**
@@ -3795,3 +3799,82 @@ function bb_activity_directory_set_pagination( $querystring, $object ) {
 
 	return http_build_query( $querystring );
 }
+
+/**
+ * Update date_updated on reactions.
+ *
+ * @since BuddyBoss [BBVERSION]
+ *
+ * @param int $activity_id ID of the activity item being favorited.
+ * @param int $user_id     ID of the user doing the favoriting.
+ *
+ * @return void
+ */
+function bb_activity_update_date_updated_on_reactions( $activity_id, $user_id ) {
+	$time = bp_core_current_time();
+
+	$activity = new BP_Activity_Activity( $activity_id );
+	if ( 'activity_comment' === $activity->type || in_array( $activity->privacy, array( 'media', 'document', 'video' ), true ) ) {
+
+		// Check if the item_id and secondary_item_id are same.
+		if ( $activity->item_id === $activity->secondary_item_id && ! in_array( $activity->privacy, array( 'media', 'document', 'video' ), true ) ) {
+
+			// Update the date_updated of the parent activity item.
+			bb_activity_update_date_updated( $activity->item_id, $time );
+
+			// Clear the cache for the parent activity item.
+			bp_activity_clear_cache_for_activity( $activity );
+		} else {
+			// Get the parent activity id if the activity is a comment or the sub media, document, video activity.
+			$main_activity_object = bb_activity_get_comment_parent_activity_object( $activity );
+
+			// Update the date_updated of the parent activity item.
+			bb_activity_update_date_updated( $main_activity_object->id, $time );
+
+			// Clear the cache for the parent activity item.
+			bp_activity_clear_cache_for_activity( $main_activity_object );
+
+			// If individual medias activity then also get the most parent activity.
+			if (
+				(
+					(
+						in_array( $main_activity_object->privacy, array( 'media', 'document', 'video' ), true ) &&
+						'activity_update' === $main_activity_object->type
+					)
+				) && ! empty( $main_activity_object->secondary_item_id )
+			) {
+
+				// Update the date_updated of the parent activity item.
+				bb_activity_update_date_updated( $main_activity_object->secondary_item_id, $this->date_updated );
+
+				$intermediate_activity = new BP_Activity_Activity( $main_activity_object->secondary_item_id );
+				if ( ! empty( $intermediate_activity->id ) ) {
+
+					// Clear the cache for the parent activity item.
+					bp_activity_clear_cache_for_activity( $intermediate_activity );
+					unset( $intermediate_activity );
+				}
+			}
+
+			// Get the parent comment activity object.
+			$parent_comment_activity_object = bb_activity_get_comment_parent_comment_activity_object( $activity, $main_activity_object->id );
+
+			// Update the date_updated of the parent comment activity item.
+			bb_activity_update_date_updated( $parent_comment_activity_object->id, $time );
+
+			// Clear the cache for the parent activity item.
+			bp_activity_clear_cache_for_activity( $parent_comment_activity_object );
+
+		}
+	}
+
+	// Update the date_updated of the activity item.
+	bb_activity_update_date_updated( $activity_id, $time );
+
+	// Clear the cache for the activity item.
+	bp_activity_clear_cache_for_activity( $activity );
+
+	if ( class_exists( 'BuddyBoss\Performance\Cache' ) ) {
+		BuddyBoss\Performance\Cache::instance()->purge_by_component( 'bp_activity' );
+	}
+}

src/bp-activity/bp-activity-functions.php

@@ -2102,6 +2102,7 @@ function bp_activity_add( $args = '' ) {
 			'item_id'           => false,                              // Optional: The ID of the specific item being recorded, e.g. a blog_id.
 			'secondary_item_id' => false,                              // Optional: A second ID used to further filter e.g. a comment_id.
 			'recorded_time'     => bp_core_current_time(),             // The GMT time that this activity was recorded.
+			'updated_time'      => bp_core_current_time(),             // The GMT time that this activity was recorded.
 			'hide_sitewide'     => false,                              // Should this be hidden on the sitewide activity feed?
 			'is_spam'           => false,                              // Is this activity item to be marked as spam?
 			'privacy'           => 'public',                           // privacy of the activity.
@@ -2130,6 +2131,7 @@ function bp_activity_add( $args = '' ) {
 	$activity->item_id           = $r['item_id'];
 	$activity->secondary_item_id = $r['secondary_item_id'];
 	$activity->date_recorded     = ( empty( $r['id'] ) || $r['status'] === bb_get_activity_scheduled_status() || ( bb_get_activity_scheduled_status() === $activity->status && $r['status'] === bb_get_activity_published_status() ) ) && $r['recorded_time'] ? $r['recorded_time'] : $activity->date_recorded;
+	$activity->date_updated      = ( empty( $r['id'] ) || $r['status'] === bb_get_activity_scheduled_status() || ( bb_get_activity_scheduled_status() === $activity->status && $r['status'] === bb_get_activity_published_status() ) ) && $r['recorded_time'] ? $r['recorded_time'] : ( $r['updated_time'] ? $r['updated_time'] : bp_core_current_time() );
 	$activity->hide_sitewide     = $r['hide_sitewide'];
 	$activity->is_spam           = $r['is_spam'];
 	$activity->privacy           = $r['privacy'];
@@ -2223,6 +2225,7 @@ function bp_activity_post_update( $args = '' ) {
 			'privacy'       => 'public',
 			'status'        => bb_get_activity_published_status(),
 			'recorded_time' => bp_core_current_time(),
+			'updated_time'  => bp_core_current_time(),
 			'error_type'    => 'bool',
 		)
 	);
@@ -2296,6 +2299,7 @@ function bp_activity_post_update( $args = '' ) {
 					'item_id'           => $activity->item_id,
 					'secondary_item_id' => $activity->secondary_item_id,
 					'recorded_time'     => ! empty( $r['recorded_time'] ) ? $r['recorded_time'] : $activity->date_recorded,
+					'updated_time'      => ! empty( $r['updated_time'] ) ? $r['updated_time'] : bp_core_current_time(),
 					'hide_sitewide'     => $activity->hide_sitewide,
 					'is_spam'           => $activity->is_spam,
 					'privacy'           => $r['privacy'],
@@ -2326,6 +2330,7 @@ function bp_activity_post_update( $args = '' ) {
 				'hide_sitewide' => $r['hide_sitewide'],
 				'privacy'       => $r['privacy'],
 				'recorded_time' => $r['recorded_time'],
+				'updated_time'  => $r['updated_time'],
 				'status'        => $r['status'],
 				'error_type'    => $r['error_type'],
 			)
@@ -2560,6 +2565,8 @@ function bp_activity_post_type_update( $post = null ) {
 		} else {
 			$activity->content = $activity_summary;
 		}
+
+		$activity->date_updated = bp_core_current_time();
 	}
 
 	// Save the updated activity.
@@ -3205,6 +3212,7 @@ function bp_activity_get_activity_id( $args = '' ) {
 			'action'            => false,
 			'content'           => false,
 			'date_recorded'     => false,
+			'date_updated'      => false,
 		)
 	);
 
@@ -3228,7 +3236,8 @@ function bp_activity_get_activity_id( $args = '' ) {
 			$r['secondary_item_id'],
 			$r['action'],
 			$r['content'],
-			$r['date_recorded']
+			$r['date_recorded'],
+			$r['date_updated']
 		),
 		$r,
 		$args
@@ -3275,6 +3284,7 @@ function bp_activity_delete( $args = '' ) {
 			'item_id'           => false,
 			'secondary_item_id' => false,
 			'date_recorded'     => false,
+			'date_updated'      => false,
 			'hide_sitewide'     => false,
 		)
 	);
@@ -5549,6 +5559,7 @@ function bp_activity_get_edit_data( $activity_id = 0 ) {
 			'group_avatar'          => $group_avatar,
 			'link_image_index_save' => $link_image_index_save,
 			'date_recorded'         => $activity->date_recorded,
+			'date_updated'          => $activity->date_updated,
 			'status'                => $activity->status,
 		);
 
@@ -7398,6 +7409,103 @@ function_exists( 'bb_document_get_published_status' ) &&
 	}
 }
 
+/**
+ * Update the date_updated of an activity item.
+ *
+ * @since BuddyBoss [BBVERSION]
+ *
+ * @param int    $activity_id Activity ID.
+ * @param string $time        Time to update.
+ *
+ * @return bool True on success.
+ */
+function bb_activity_update_date_updated( $activity_id, $time ) {
+	global $wpdb;
+
+	// Check if the time is empty then exit.
+	if ( empty( $time ) ) {
+		return false;
+	}
+
+	// Validate the date format (e.g., Y-m-d H:i:s).
+	$date = DateTime::createFromFormat( 'Y-m-d H:i:s', $time );
+
+	// Check if the date format is valid.
+	if ( false === $date || $date->format( 'Y-m-d H:i:s' ) !== $time ) {
+		return false;
+	}
+
+	unset( $date );
+
+	$bp = buddypress();
+
+	$q = $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET date_updated = %s WHERE id = %d", $time, $activity_id ); // phpcs:ignore
+
+	if ( false === $wpdb->query( $q ) ) { // phpcs:ignore
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * Get parent activity id of the activity item.
+ *
+ * @since BuddyBoss [BBVERSION]
+ *
+ * @param object $activity Activity object.
+ *
+ * @return object Activity object.
+ */
+function bb_activity_get_comment_parent_activity_object( $activity ) {
+
+	$is_media = in_array( $activity->privacy, array( 'media', 'document', 'video' ), true );
+
+	// Loop through find the parent id until the item_id and secondary_item_id are same.
+	while (
+		$activity->item_id !== $activity->secondary_item_id &&
+		(
+			// Get medias individual activity if muliple uploaded.
+			( $is_media && 'groups' !== $activity->component ) ||
+			( ! $is_media && 'activity_comment' === $activity->type )
+		)
+	) {
+		$temp_activity = new BP_Activity_Activity( $activity->item_id );
+		if ( empty( $temp_activity->id ) ) {
+			unset( $temp_activity );
+			return $activity;
+		}
+		$activity = $temp_activity;
+	}
+
+	return $activity;
+}
+
+/**
+ * Get top level parent comment id of the activity item.
+ *
+ * @since BuddyBoss [BBVERSION]
+ *
+ * @param object $activity         Activity object.
+ * @param int    $main_activity_id Main activity ID.
+ *
+ * @return object Activity object.
+ */
+function bb_activity_get_comment_parent_comment_activity_object( $activity, $main_activity_id ) {
+
+	// Loop through find the id based on the secondary_item_id and having a type is activity_comment and item_id and secondary_item_id equal to $main_activity_id.
+	while ( $activity->secondary_item_id !== $main_activity_id || 'activity_comment' !== $activity->type ) {
+		$temp_activity = new BP_Activity_Activity( $activity->secondary_item_id );
+		if ( empty( $temp_activity->id ) ) {
+			unset( $temp_activity );
+			return $activity;
+		}
+		$activity = $temp_activity;
+	}
+
+	return $activity;
+}
+
 /**
  * If a blog component is disabled, then display activity action for existing blog activity.
  *

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

@@ -218,7 +218,13 @@ function bp_has_activities( $args = '' ) {
 			: ( isset( $_REQUEST['scope'] ) ? $_REQUEST['scope'] : 'all' )
 		);
 
-	$scope = bp_activity_default_scope( $scope );
+	if ( bp_is_user_activity() || bp_is_activity_directory() ) {
+
+		// Scope from the heartbeat passed from the filter dropdown.	
+		$scope = ! empty( $args['scope'] ) ? $args['scope'] : $scope;
+	}	
+
+	$scope = bp_activity_default_scope( $scope );	
 
 	// Group filtering.
 	if ( bp_is_group() ) {
@@ -335,7 +341,25 @@ function bp_has_activities( $args = '' ) {
 		$r['filter'] = array(
 			'object' => $_GET['afilter'],
 		);
-	} elseif ( ! empty( $r['user_id'] ) || ! empty( $r['object'] ) || ! empty( $r['action'] ) || ! empty( $r['primary_id'] ) || ! empty( $r['secondary_id'] ) || ! empty( $r['offset'] ) || ! empty( $r['since'] ) ) {
+	} elseif (
+		( 
+			'just-me' === $scope &&
+			bp_is_activity_directory()
+		) ||
+		(
+			! empty( $r['user_id'] ) ||
+			! empty( $r['object'] ) ||
+			! empty( $r['action'] ) ||
+			! empty( $r['primary_id'] ) ||
+			! empty( $r['secondary_id'] ) ||
+			! empty( $r['offset'] ) ||
+			! empty( $r['since'] )
+		)
+	) {
+		if ( 'just-me' === $scope && bp_is_activity_directory() ) {
+			$r['user_id'] = bp_loggedin_user_id();
+		}
+
 		$r['filter'] = array(
 			'user_id'      => $r['user_id'],
 			'object'       => $r['object'],
@@ -774,6 +798,15 @@ function bp_activity_date_recorded() {
 	echo bp_get_activity_date_recorded();
 }
 
+/**
+ * Output the date the activity was updated.
+ *
+ * @since BuddyBoss [BBVERSION]
+ */
+function bb_activity_date_updated() {
+	echo bb_get_activity_date_updated();
+}
+
 /**
  * Return the date the activity was recorded.
  *
@@ -796,6 +829,28 @@ function bp_get_activity_date_recorded() {
 	return apply_filters( 'bp_get_activity_date_recorded', $activities_template->activity->date_recorded );
 }
 
+/**
+ * Return the date the activity was updated.
+ *
+ * @since BuddyBoss [BBVERSION]
+ *
+ * @global object $activities_template {@link BP_Activity_Template}
+ *
+ * @return string The date the activity was updated.
+ */
+function bb_get_activity_date_updated() {
+	global $activities_template;
+
+	/**
+	 * Filters the date the activity was updated.
+	 *
+	 * @since BuddyBoss [BBVERSION]
+	 *
+	 * @param int $date_updated The activity's date.
+	 */
+	return apply_filters( 'bb_get_activity_date_updated', $activities_template->activity->date_updated );
+}
+
 /**
  * Output the display name of the member who posted the activity.
  *