<!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][13870] trunk: Groups: improve group activity moderation delegation to admins & mods</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/13870">13870</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/13870","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>2024-05-24 05:43:34 +0000 (Fri, 24 May 2024)</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'>Groups: improve group activity moderation delegation to admins & mods
- Introduce a new BP Groups global setting to let Site Administrators decide whether group admins & mods can delete their group activities or not.
- NB: Group creators can keep the control about who can delete their group activities using group role promotion (allow: promote some members as mods or admins. Disallow: do not promote anyone).
- Make sure the `bp_groups_filter_activity_user_can_delete()` filter takes in account this setting and behaves as expected (eventually allowing group admins/mods to delete group activities).
- Add unit tests
This ticket is a perfect example of a great collaborative work between all members of the BP Team. Great job {U+01F4AA}.
Props: emaralive, vapvarun, dcavins, espellcaste, needle
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8728">#8728</a>
Closes https://github.com/buddypress/buddypress/pull/278</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcoreadminbpcoreadminsettingsphp">trunk/src/bp-core/admin/bp-core-admin-settings.php</a></li>
<li><a href="#trunksrcbpcorebpcoreoptionsphp">trunk/src/bp-core/bp-core-options.php</a></li>
<li><a href="#trunksrcbpcoreclassesclassbpadminphp">trunk/src/bp-core/classes/class-bp-admin.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsactivityphp">trunk/src/bp-groups/bp-groups-activity.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupsactivityphp">trunk/tests/phpunit/testcases/groups/activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcoreadminbpcoreadminsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/admin/bp-core-admin-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/admin/bp-core-admin-settings.php 2024-05-23 05:42:06 UTC (rev 13869)
+++ trunk/src/bp-core/admin/bp-core-admin-settings.php 2024-05-24 05:43:34 UTC (rev 13870)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,6 +351,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * 'Enable group activity deletions.
+ *
+ * @since 14.0.0
+ */
+function bp_admin_setting_callback_group_activity_deletions() {
+?>
+ <input id="bp-disable-group-activity-deletions" name="bp-disable-group-activity-deletions" type="checkbox" value="1" <?php checked( ! bp_disable_group_activity_deletions() ); ?> />
+ <label for="bp-disable-group-activity-deletions"><?php esc_html_e( "Allow group administrators and moderators to delete activity items from their group's activity stream", 'buddypress' ); ?></label>
+<?php
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** Account settings Section ************************************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -435,6 +447,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp-disable-cover-image-uploads',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp-disable-group-avatar-uploads',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp-disable-group-cover-image-uploads',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'bp-disable-group-activity-deletions',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'bp_disable_blogforum_comments',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp-disable-profile-sync',
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp_restrict_group_creation',
</span></span></pre></div>
<a id="trunksrcbpcorebpcoreoptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-options.php 2024-05-23 05:42:06 UTC (rev 13869)
+++ trunk/src/bp-core/bp-core-options.php 2024-05-24 05:43:34 UTC (rev 13870)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,6 +62,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Group Cover image uploads.
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp-disable-group-cover-image-uploads' => false,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allow Group Activity Deletions.
+ 'bp-disable-group-activity-deletions' => false,
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Allow users to delete their own accounts.
</span><span class="cx" style="display: block; padding: 0 10px"> 'bp-disable-account-deletion' => false,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,6 +589,27 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Are group activity deletions disabled?
+ *
+ * @since 14.0.0
+ *
+ * @param bool $default Optional. Fallback value if not found in the database.
+ * Default: false.
+ * @return bool True if group activity deletions are disabled, otherwise false.
+ */
+function bp_disable_group_activity_deletions( $default = false ) {
+
+ /**
+ * Filters whether or not group creator, group admin or group mod are able to delete group activity posts.
+ *
+ * @since 14.0.0
+ *
+ * @param bool $value Whether or not group creator, group admin or group mod are able to delete group activity post.
+ */
+ return (bool) apply_filters( 'bp_disable_group_activity_deletions', (bool) bp_get_option( 'bp-disable-group-activity-deletions', $default ) );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Are members able to delete their own accounts?
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</span></span></pre></div>
<a id="trunksrcbpcoreclassesclassbpadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/classes/class-bp-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/classes/class-bp-admin.php 2024-05-23 05:42:06 UTC (rev 13869)
+++ trunk/src/bp-core/classes/class-bp-admin.php 2024-05-24 05:43:34 UTC (rev 13870)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,6 +569,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_settings_field( 'bp-disable-group-cover-image-uploads', __( 'Group Cover Image Uploads', 'buddypress' ), 'bp_admin_setting_callback_group_cover_image_uploads', 'buddypress', 'bp_groups' );
</span><span class="cx" style="display: block; padding: 0 10px"> register_setting( 'buddypress', 'bp-disable-group-cover-image-uploads', 'intval' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Allow group activity deletions.
+ add_settings_field( 'bp-disable-group-activity-deletions', esc_html__( 'Group Activity Deletions', 'buddypress' ), 'bp_admin_setting_callback_group_activity_deletions', 'buddypress', 'bp_groups' );
+ register_setting( 'buddypress', 'bp-disable-group-activity-deletions', 'intval' );
</ins><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"> /* Activity Section **************************************************/
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsactivityphp"></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/bp-groups-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-activity.php 2024-05-23 05:42:06 UTC (rev 13869)
+++ trunk/src/bp-groups/bp-groups-activity.php 2024-05-24 05:43:34 UTC (rev 13870)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -650,22 +650,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_groups_filter_activity_user_can_delete( $retval, $activity ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Bail if no current user.
- if ( ! is_user_logged_in() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bail if no current user or group activity deletions are disabled.
+ if ( ! is_user_logged_in() || bp_disable_group_activity_deletions() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $retval;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $activity->component ) || 'groups' !== $activity->component ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $activity->component ) || 'groups' !== $activity->component ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $retval;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Trust the passed value for administrators.
- if ( bp_current_user_can( 'bp_moderate' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The first conditional statement will trust the passed value for administrators.
+ // The second conditional statement does not allow "site admin" activity posts to be deleted by "non site admins".
+ if ( bp_current_user_can( 'bp_moderate' ) || bp_user_can( $activity->user_id, 'bp_moderate' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $retval;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Group administrators or moderators can delete content in that group that doesn't belong to them.
</del><span class="cx" style="display: block; padding: 0 10px"> $group_id = $activity->item_id;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Group administrators or moderators can delete content in which deletions are allowed for that group.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( groups_is_user_admin( bp_loggedin_user_id(), $group_id ) || groups_is_user_mod( bp_loggedin_user_id(), $group_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $retval = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupsactivityphp"></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/activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/activity.php 2024-05-23 05:42:06 UTC (rev 13869)
+++ trunk/tests/phpunit/testcases/groups/activity.php 2024-05-24 05:43:34 UTC (rev 13870)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,4 +353,152 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $args;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket BP8728
+ */
+ public function test_user_can_delete_group_activity() {
+ $u1 = self::factory()->user->create();
+ $u2 = self::factory()->user->create();
+ $original_user = bp_loggedin_user_id();
+
+ $this->set_current_user( $u1 );
+
+ $g = self::factory()->group->create();
+
+ $a = self::factory()->activity->create(
+ array(
+ 'user_id' => $u2,
+ 'component' => buddypress()->groups->id,
+ 'type' => 'activity_update',
+ 'item_id' => $g,
+ 'content' => 'Random content',
+ )
+ );
+
+ // Activity for group creator.
+ $b = self::factory()->activity->create(
+ array(
+ 'user_id' => $u1,
+ 'component' => buddypress()->groups->id,
+ 'type' => 'activity_update',
+ 'item_id' => $g,
+ 'content' => 'Random content',
+ )
+ );
+
+ // Add user to group.
+ self::add_user_to_group( $u2, $g );
+
+ $activity = self::factory()->activity->get_object_by_id( $a );
+ $activity_b = self::factory()->activity->get_object_by_id( $b );
+
+ // User can delete his own activity.
+ $this->set_current_user( $u2 );
+ $this->assertTrue( bp_activity_user_can_delete( $activity ) );
+
+ // Activity from site admins can't be deleted by non site admins.
+ $this->set_current_user( $u2 );
+ $this->assertFalse( bp_activity_user_can_delete( $activity_b ) );
+
+ // Activity from site admins can be deleted by other site admins.
+ $site_admin = self::factory()->user->create( array( 'role' => 'administrator' ) );
+ $this->set_current_user( $site_admin );
+ $this->assertTrue( bp_activity_user_can_delete( $activity_b ) );
+
+ // Group creator can delete activity.
+ $this->set_current_user( $u1 );
+ $this->assertTrue( bp_activity_user_can_delete( $activity ) );
+
+ // Logged-out user can't delete activity.
+ $this->set_current_user( 0 );
+ $this->assertFalse( bp_activity_user_can_delete( $activity ) );
+
+ // Misc user can't delete activity.
+ $misc_user = self::factory()->user->create( array( 'role' => 'subscriber' ) );
+ $this->set_current_user( $misc_user );
+ $this->assertFalse( bp_activity_user_can_delete( $activity ) );
+
+ // Misc group member can't delete activity.
+ $misc_user_2 = self::factory()->user->create( array( 'role' => 'subscriber' ) );
+ self::add_user_to_group( $misc_user_2, $g );
+ $this->set_current_user( $misc_user_2 );
+ $this->assertFalse( bp_activity_user_can_delete( $activity ) );
+
+ // Group mod can delete activity.
+ $misc_user_3 = self::factory()->user->create( array( 'role' => 'subscriber' ) );
+ self::add_user_to_group( $misc_user_3, $g, [ 'is_mod' => true ] );
+ $this->set_current_user( $misc_user_3 );
+ $this->assertTrue( bp_activity_user_can_delete( $activity ) );
+
+ // Group admin can delete activity.
+ $misc_user_4 = self::factory()->user->create( array( 'role' => 'subscriber' ) );
+ self::add_user_to_group( $misc_user_4, $g, [ 'is_admin' => true ] );
+ $this->set_current_user( $misc_user_4 );
+ $this->assertTrue( bp_activity_user_can_delete( $activity ) );
+
+ $this->set_current_user( $original_user );
+ }
+
+ /**
+ * @ticket BP8728
+ */
+ public function test_group_admins_cannot_delete_activity() {
+ $u1 = self::factory()->user->create();
+ $u2 = self::factory()->user->create();
+ $original_user = bp_loggedin_user_id();
+
+ $this->set_current_user( $u1 );
+
+ $g = self::factory()->group->create();
+ $g2 = self::factory()->group->create();
+ $a = self::factory()->activity->create(
+ array(
+ 'user_id' => $u1,
+ 'content' => 'Random Activity content',
+ )
+ );
+
+ // Activity for group creator.
+ $a2 = self::factory()->activity->create(
+ array(
+ 'user_id' => $u1,
+ 'component' => buddypress()->groups->id,
+ 'type' => 'activity_update',
+ 'item_id' => $g,
+ 'content' => 'Random first Group Activity content',
+ )
+ );
+
+ $a3 = self::factory()->activity->create(
+ array(
+ 'user_id' => $u1,
+ 'component' => buddypress()->groups->id,
+ 'type' => 'activity_update',
+ 'item_id' => $g2,
+ 'content' => 'Random second Group Activity content',
+ )
+ );
+
+ $activity = self::factory()->activity->get_object_by_id( $a );
+
+ // Add u2 as Admin of g2.
+ self::add_user_to_group( $u2, $g, [ 'is_admin' => true ] );
+
+ $this->set_current_user( $u2 );
+ $this->assertFalse( bp_activity_user_can_delete( $activity ), 'Group Admins or Mods shouldn not be able to delete activities that are not attached to a group' );
+
+ $activity = self::factory()->activity->get_object_by_id( $a2 );
+
+ add_filter( 'bp_disable_group_activity_deletions', '__return_true' );
+
+ $this->assertFalse( bp_activity_user_can_delete( $activity ), 'Group Admins or Mods should not be able to delete group activities when Site admin globally disallowed it.' );
+
+ remove_filter( 'bp_disable_group_activity_deletions', '__return_true' );
+
+ $activity = self::factory()->activity->get_object_by_id( $a3 );
+ $this->assertFalse( bp_activity_user_can_delete( $activity ), 'Group Admins or Mods should not be able to delete another group activities.' );
+
+ $this->set_current_user( $original_user );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>