<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][13357] trunk: Eventually include inactive users in group's members count</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/13357">13357</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13357","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-11-07 20:32:51 +0000 (Mon, 07 Nov 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://buddypress.trac.wordpress.org/ticket/7614">#7614</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupmemberqueryphp">trunk/src/bp-groups/classes/class-bp-group-member-query.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupsfunctionsphp">trunk/tests/phpunit/testcases/groups/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsclassesclassbpgroupmemberqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/classes/class-bp-group-member-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-group-member-query.php 2022-11-05 17:49:55 UTC (rev 13356)
+++ trunk/src/bp-groups/classes/class-bp-group-member-query.php 2022-11-07 20:32:51 UTC (rev 13357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,6 +547,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If a `count` query is performed, the function is used to validate active users.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 10.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 11.0.0 Include inactive users added by a community administrators to the group members count.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function populate_extras() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->query_vars_raw['count'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -554,9 +555,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Validate active users.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the total active users.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->total_users = count( $this->results );
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/groups/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/functions.php 2022-11-05 17:49:55 UTC (rev 13356)
+++ trunk/tests/phpunit/testcases/groups/functions.php 2022-11-07 20:32:51 UTC (rev 13357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,6 +366,33 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group total_member_count
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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 );
+ }
+
+ /**
+ * @group total_member_count
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket BP8688
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_total_member_count_groups_spammed_user() {
</span></span></pre>
</div>
</div>
</body>
</html>