PROD-7724 - Fix: Count of connection and following in members page.

src/bp-activity/classes/class-bp-activity-follow.php

@@ -243,14 +243,83 @@ public static function get_counts( $user_id ) {
 		$followers = wp_cache_get( 'bp_total_follower_for_user_' . $user_id, 'bp' );
 
 		if ( false === $followers ) {
-			$followers = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->activity->table_name_follow} WHERE leader_id = %d", $user_id ) );
+			/**
+			 * Retrieves the count of users following a specific user.
+			 *
+			 * @since BuddyBoss [BBVERSION]
+			 *
+			 * @param int $user_id The user ID for whom the follower count is being retrieved.
+			 *
+			 * @return int The count of followers for the specified user.
+			 */
+			$sql['select'] = "SELECT COUNT(u.id) FROM {$bp->activity->table_name_follow} u";
+			/**
+			 * Filters the SELECT clause for retrieving the follower count.
+			 *
+			 * @since BuddyBoss [BBVERSION]
+			 *
+			 * @param string $select The SELECT clause of the SQL query.
+			 * @param string $type   The type of data being queried, e.g., 'follower_id'.
+			 */
+			$sql['select'] = apply_filters( 'bp_user_query_join_sql', $sql['select'], 'follower_id' );
+
+			$sql['where'][] = $wpdb->prepare( "u.leader_id = %d", $user_id );
+			/**
+			 * Filters the WHERE clause for retrieving the follower count.
+			 *
+			 * @since BuddyBoss [BBVERSION]
+			 *
+			 * @param array  $where Array of WHERE clause conditions.
+			 * @param string $type  The type of data being queried, e.g., 'follower_id'.
+			 */
+			$sql['where'] = apply_filters( 'bp_user_query_where_sql', $sql['where'], 'follower_id' );
+
+			$where_sql = 'WHERE ' . join( ' AND ', $sql['where'] );
+
+			$sql       = "{$sql['select']} {$where_sql}";
+			$followers = $wpdb->get_var( $sql );
 			wp_cache_set( 'bp_total_follower_for_user_' . $user_id, $followers, 'bp' );
 		}
 
 		$following = wp_cache_get( 'bp_total_following_for_user_' . $user_id, 'bp' );
 
 		if ( false === $following ) {
-			$following = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->activity->table_name_follow} WHERE follower_id = %d", $user_id ) );
+			$sql = array();
+			/**
+			 * Retrieves the count of users being followed by a specific user.
+			 *
+			 * @since BuddyBoss [BBVERSION]
+			 *
+			 * @param int $user_id The user ID for whom the follow count is being retrieved.
+			 *
+			 * @return int The count of users the specified user is following.
+			 */
+			$sql['select'] = "SELECT COUNT(u.id) FROM {$bp->activity->table_name_follow} u";
+			/**
+			 * Filters the SELECT clause for retrieving the follow count.
+			 *
+			 * @since BuddyBoss [BBVERSION]
+			 *
+			 * @param string $select The SELECT clause of the SQL query.
+			 * @param string $type   The type of data being queried, e.g., 'leader_id'.
+			 */
+			$sql['select'] = apply_filters( 'bp_user_query_join_sql', $sql['select'], 'leader_id' );
+
+			$sql['where'][] = $wpdb->prepare( "u.follower_id = %d", $user_id );
+			/**
+			 * Filters the WHERE clause for retrieving the follow count.
+			 *
+			 * @since BuddyBoss [BBVERSION]
+			 *
+			 * @param array  $where Array of WHERE clause conditions.
+			 * @param string $type  The type of data being queried, e.g., 'leader_id'.
+			 */
+			$sql['where'] = apply_filters( 'bp_user_query_where_sql', $sql['where'], 'leader_id' );
+
+			$where_sql = 'WHERE ' . join( ' AND ', $sql['where'] );
+
+			$sql       = "{$sql['select']} {$where_sql}";
+			$following = $wpdb->get_var( $sql );
 			wp_cache_set( 'bp_total_following_for_user_' . $user_id, $following, 'bp' );
 		}
 

src/bp-core/bp-core-update.php

@@ -503,6 +503,10 @@ function bp_version_updater() {
 			bb_update_to_2_6_70();
 		}
 
+		if ( $raw_db_version < 21171 ) {
+			bb_update_to_2_7_21();
+		}
+
 		if ( $raw_db_version !== $current_db ) {
 			// @todo - Write only data manipulate migration here. ( This is not for DB structure change ).
 
@@ -3804,3 +3808,23 @@ function bb_update_to_2_6_70() {
 		}
 	}
 }
+
+/**
+ * Fixed count for my connection.
+ *
+ * @since BuddyBoss [BBVERSION]
+ */
+function bb_update_to_2_7_21() {
+	if ( ! bp_is_active( 'moderation' ) ) {
+		return;
+	}
+	$is_already_run = get_transient( 'bb_update_to_2_7_21' );
+	if ( $is_already_run ) {
+		return;
+	}
+
+	// Set a transient to avoid running the update multiple times within an hour.
+	set_transient( 'bb_update_to_2_7_21', 'yes', HOUR_IN_SECONDS );
+
+	bb_create_background_member_friends_count();
+}

src/bp-friends/classes/class-bp-friends-friendship.php

@@ -380,7 +380,33 @@ public static function get_friendship_ids_for_user( $user_id ) {
 		$friendship_ids = wp_cache_get( $cache_key, 'bp_friends_friendships_for_user' );
 
 		if ( false === $friendship_ids ) {
-			$friendship_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d OR friend_user_id = %d) ORDER BY date_created DESC", $user_id, $user_id ) );
+			// Initialize the SQL query components.
+			$sql['select'] = "SELECT id FROM {$bp->friends->table_name}";
+			/**
+			 * Filters the SELECT clause for retrieving friendship IDs.
+			 *
+			 * @since BuddyBoss [BBVERSION]
+			 *
+			 * @param string $select  The SELECT clause of the SQL query.
+			 * @param int    $user_id The user ID for whom friendship IDs are being fetched.
+			 */
+			$sql['select'] = apply_filters( 'bb_get_friendship_ids_for_user_select_sql', $sql['select'], $user_id );
+
+			$sql['where'][] = $wpdb->prepare( "(initiator_user_id = %d OR friend_user_id = %d)", $user_id, $user_id );
+			/**
+			 * Filters the WHERE clause for retrieving friendship IDs.
+			 *
+			 * @since BuddyBoss [BBVERSION]
+			 *
+			 * @param array $where   Array of WHERE clause conditions.
+			 * @param int   $user_id The user ID for whom friendship IDs are being fetched.
+			 */
+			$sql['where'] = apply_filters( 'bb_get_friendship_ids_for_user_where_sql', $sql['where'], $user_id );
+			$where_sql    = 'WHERE ' . join( ' AND ', $sql['where'] );
+
+			$sql            = "{$sql['select']} {$where_sql} ORDER BY date_created DESC";
+			$friendship_ids = $wpdb->get_col( $sql );
+
 			wp_cache_set( $cache_key, $friendship_ids, 'bp_friends_friendships_for_user' );
 		}
 

src/bp-moderation/bp-moderation-filters.php

@@ -283,23 +283,6 @@ function bp_moderation_block_member() {
 				friends_remove_friend( bp_loggedin_user_id(), $item_id );
 			}
 
-			if (
-				function_exists( 'bp_is_following' ) &&
-				bp_is_following(
-					array(
-						'leader_id'   => $item_id,
-						'follower_id' => bp_loggedin_user_id(),
-					)
-				)
-			) {
-				bp_stop_following(
-					array(
-						'leader_id'   => $item_id,
-						'follower_id' => bp_loggedin_user_id(),
-					)
-				);
-			}
-
 			$response['button'] = bp_moderation_get_report_button(
 				array(
 					'button_attr' => array(
@@ -1076,3 +1059,32 @@ function bb_moderation_async_request_batch_process( $batch ) {
 }
 add_action( 'bb_async_request_batch_process', 'bb_moderation_async_request_batch_process', 10, 1 );
 
+/**
+ * Filters the WHERE clause for friendship IDs to exclude suspended users.
+ *
+ * @since BuddyBoss [BBVERSION]
+ *
+ * @param array $where   Array of WHERE clause conditions.
+ * @param int   $user_id The user ID for whom friendship IDs are being fetched.
+ *
+ * @return array Modified array of WHERE clause conditions.
+ */
+function bb_moderation_get_friendship_ids_for_user_where_sql( $where, $user_id ) {
+	global $wpdb;
+	$moderated_user_ids = bb_moderation_moderated_user_ids();
+
+	// If there are any suspended users, add conditions to exclude them.
+	if ( ! empty( $moderated_user_ids ) ) {
+		$placeholders = implode( ', ', array_fill( 0, count( $moderated_user_ids ), '%d' ) );
+
+		$where[] = $wpdb->prepare(
+			"(initiator_user_id NOT IN ( {$placeholders} ) AND friend_user_id NOT IN ( {$placeholders} ))",
+			...$moderated_user_ids,
+			...$moderated_user_ids
+		);
+	}
+
+	return $where;
+}
+
+add_filter( 'bb_get_friendship_ids_for_user_where_sql', 'bb_moderation_get_friendship_ids_for_user_where_sql', 10, 2 );

src/bp-moderation/classes/suspend/class-bp-suspend-member.php

@@ -676,6 +676,7 @@ protected function get_related_contents( $member_id, $args = array() ) {
 		$action           = ! empty( $args['action'] ) ? $args['action'] : '';
 		$page             = ! empty( $args['page'] ) ? $args['page'] : - 1;
 		$related_contents = array();
+		$member_id        = (int) $member_id;
 
 		$related_contents[ BP_Suspend_Comment::$type ] = BP_Suspend_Comment::get_member_comment_ids( $member_id, $action, $page );
 

src/bp-templates/bp-nouveau/js/buddypress-nouveau.js

@@ -2263,6 +2263,23 @@ window.bp = window.bp || {};
 							item.find( '.followers-wrap' ).replaceWith( response.data.count );
 						}
 
+						// Update the following count.
+						if ( $( self.objectNavParent + ' [data-bp-scope="following"]' ).length ) {
+							var following_count = Number( $( self.objectNavParent + ' [data-bp-scope="following"] span' ).html() ) || 0;
+
+							if ( -1 !== $.inArray( action, [ 'unfollow' ] ) ) {
+								following_count -= 1;
+							} else if ( -1 !== $.inArray( action, [ 'follow' ] ) ) {
+								following_count += 1;
+							}
+
+							if ( following_count < 0 ) {
+								following_count = 0;
+							}
+
+							$( self.objectNavParent + ' [data-bp-scope="following"] span' ).html( following_count );
+						}
+
 						target.parent().replaceWith( response.data.contents );
 					}
 				}

src/class-buddypress.php

@@ -330,7 +330,7 @@ private function setup_globals() {
 
 		/** Versions */
 		$this->version    = defined( 'BP_PLATFORM_VERSION' ) ? BP_PLATFORM_VERSION : ( defined( 'BP_VERSION' ) ? BP_VERSION : '1.0.0' );
-		$this->db_version = 21161;
+		$this->db_version = 21171;
 
 		/** Loading */