Changeset 13357

Timestamp:

11/07/2022 08:32:51 PM (22 months ago)

Author:

imath

Message:

Eventually include inactive users in group's members count

When the Community Site Administrator decides to add an inactive user
as a member of a group from the Group's WP Admin screen, we need to
include them into the group's members count to remain consistent with the
fact:

• an activity is created inside the group to inform this inactive user

joined the group

• the group's members list is including this user.

Props dcavins, sjregan, espellcaste

Closes ​https://github.com/buddypress/buddypress/pull/33
Fixes #7614

Location:

trunk

Files:

• src/bp-groups/classes/class-bp-group-member-query.php (modified) (2 diffs)
• tests/phpunit/testcases/groups/functions.php (modified) (1 diff)

trunk/src/bp-groups/classes/class-bp-group-member-query.php

@@ -548 +548 @@
      *
      * @since 10.3.0
+     * @since 11.0.0 Include inactive users added by a community administrators to the group members count.
      */
     public function populate_extras() {
@@ -555 +556 @@
 
         // Validate active users.
-        $active_users    = array_filter( BP_Core_User::get_last_activity( $this->user_ids ) );
-        $active_user_ids = array_keys( $active_users );
-        $this->results   = array_intersect( $this->user_ids, $active_user_ids );
+        if ( ! bp_current_user_can( 'bp_moderate' ) ) {
+            $active_users    = array_filter( BP_Core_User::get_last_activity( $this->user_ids ) );
+            $active_user_ids = array_keys( $active_users );
+            $this->results   = array_intersect( $this->user_ids, $active_user_ids );
+        } else {
+            $this->results = $this->user_ids;
+        }
 
         // Set the total active users.

trunk/tests/phpunit/testcases/groups/functions.php

@@ -363 +363 @@
 
         $this->assertEquals( 1, groups_get_total_member_count( $g1 ) );
+    }
+
+    /**
+     * @group total_member_count
+     * @ticket BP7614
+     */
+    public function test_total_member_count_groups_inactive_user_from_admin() {
+        $current_user = get_current_user_id();
+        $u1           = self::factory()->user->create(
+            array(
+                'role' => 'administrator',
+            )
+        );
+        $u2           = wp_insert_user( array(
+            'user_pass'  => 'barfoo',
+            'user_login' => 'barfoo',
+            'user_email' => 'barfoo@buddypress.org',
+        ) );
+
+        $this->set_current_user( $u1 );
+        $g1 = self::factory()->group->create();
+
+        groups_join_group( $g1, $u2 );
+
+        $this->assertEquals( 2, groups_get_total_member_count( $g1 ) );
+
+        $this->set_current_user( $current_user );
     }