Changeset 13870 for trunk/src/bp-groups/bp-groups-activity.php

Timestamp:

05/24/2024 05:43:34 AM (22 months ago)

Author:

imath

Message:

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 💪.

Props: emaralive, vapvarun, dcavins, espellcaste, needle

Fixes #8728
Closes ​https://github.com/buddypress/buddypress/pull/278

File:

• trunk/src/bp-groups/bp-groups-activity.php (modified) (1 diff)

trunk/src/bp-groups/bp-groups-activity.php

@@ -651 +651 @@
  */
 function bp_groups_filter_activity_user_can_delete( $retval, $activity ) {
-    // Bail if no current user.
-    if ( ! is_user_logged_in() ) {
+    // Bail if no current user or group activity deletions are disabled.
+    if ( ! is_user_logged_in() || bp_disable_group_activity_deletions() ) {
         return $retval;
     }
 
-    if ( isset( $activity->component ) || 'groups' !== $activity->component ) {
+    if ( ! isset( $activity->component ) || 'groups' !== $activity->component ) {
         return $retval;
     }
 
-    // Trust the passed value for administrators.
-    if ( bp_current_user_can( 'bp_moderate' ) ) {
+    // 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' ) ) {
         return $retval;
     }
 
-    // Group administrators or moderators can delete content in that group that doesn't belong to them.
     $group_id = $activity->item_id;
+
+    // Group administrators or moderators can delete content in which deletions are allowed for that group.
     if ( groups_is_user_admin( bp_loggedin_user_id(), $group_id ) || groups_is_user_mod( bp_loggedin_user_id(), $group_id ) ) {
         $retval = true;