Changeset 7624 for trunk/bp-groups/bp-groups-functions.php

Timestamp:

11/30/2013 06:14:08 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Refactor Groups component's approach to Notifications and Activity integration:

• Introduce helper functions for handling the adding/marking/deleting of notifications and adding/deleting activity stream entries. Hook these new functions into their respective actions rather than have them hardcoded and interspersed amongst the first-class code.
• Inadvertently fixes a bug where banning or removing a member from a group within 5 minutes of their having joined would not delete the recent activity stream update.
• See #5266.

File:

• trunk/bp-groups/bp-groups-functions.php (modified) (9 diffs)

trunk/bp-groups/bp-groups-functions.php

@@ -201 +201 @@
  */
 function groups_delete_group( $group_id ) {
-        global $bp;
 
         do_action( 'groups_before_delete_group', $group_id );
@@ -207 +206 @@
         // Get the group object
         $group = groups_get_group( array( 'group_id' => $group_id ) );
-        if ( !$group->delete() )
-                return false;
-
-        // Delete all group activity from activity streams
-        if ( bp_is_active( 'activity' ) )
-                bp_activity_delete_by_item_id( array( 'item_id' => $group_id, 'component' => $bp->groups->id ) );
+
+        // Bail if group cannot be deleted
+        if ( ! $group->delete() ) {
+                return false;
+        }
 
         // Remove all outstanding invites for this group
         groups_delete_all_group_invites( $group_id );
 
-        // Remove all notifications for any user belonging to this group
-        bp_core_delete_all_notifications_by_type( $group_id, $bp->groups->id );
-
-        do_action( 'groups_delete_group', $group_id);
+        do_action( 'groups_delete_group', $group_id );
 
         return true;
@@ -289 +284 @@
         }
 
-        $membership = new BP_Groups_Member( $user_id, $group_id );
-
         // This is exactly the same as deleting an invite, just is_confirmed = 1 NOT 0.
-        if ( !groups_uninvite_user( $user_id, $group_id ) )
-                return false;
-
-        /**
-         * If the user joined this group less than five minutes ago, remove the
-         * joined_group activity so users cannot flood the activity stream by
-         * joining/leaving the group in quick succession.
-         */
-        if ( bp_is_active( 'activity' ) && time() <= strtotime( '+5 minutes', (int)strtotime( $membership->date_modified ) ) )
-                bp_activity_delete( array( 'component' => $bp->groups->id, 'type' => 'joined_group', 'user_id' => $user_id, 'item_id' => $group_id ) );
+        if ( !groups_uninvite_user( $user_id, $group_id ) ) {
+                return false;
+        }
 
         bp_core_add_message( __( 'You successfully left the group.', 'buddypress' ) );
@@ -697 +683 @@
         // slip through), delete all existing invitations/requests and return true
         if ( groups_is_user_member( $user_id, $group_id ) ) {
-                if ( groups_check_user_has_invite( $user_id, $group_id ) )
+                if ( groups_check_user_has_invite( $user_id, $group_id ) ) {
                         groups_delete_invite( $user_id, $group_id );
-
-                if ( groups_check_for_membership_request( $user_id, $group_id ) )
+                }
+
+                if ( groups_check_for_membership_request( $user_id, $group_id ) ) {
                         groups_delete_membership_request( $user_id, $group_id );
+                }
 
                 return true;
@@ -709 +697 @@
         $member->accept_invite();
 
-        if ( !$member->save() )
-                return false;
+        if ( !$member->save() ) {
+                return false;
+        }
 
         // Remove request to join
-        if ( $member->check_for_membership_request( $user_id, $group_id ) )
+        if ( $member->check_for_membership_request( $user_id, $group_id ) ) {
                 $member->delete_request( $user_id, $group_id );
+        }
 
         // Modify group meta
         groups_update_groupmeta( $group_id, 'last_activity', bp_core_current_time() );
 
-        bp_core_mark_notifications_by_item_id( $user_id, $group_id, buddypress()->groups->id, 'group_invite' );
-
         do_action( 'groups_accept_invite', $user_id, $group_id );
+
         return true;
 }
 
 function groups_reject_invite( $user_id, $group_id ) {
-        if ( !BP_Groups_Member::delete( $user_id, $group_id ) )
+        if ( ! BP_Groups_Member::delete( $user_id, $group_id ) )
                 return false;
 
@@ -735 +724 @@
 
 function groups_delete_invite( $user_id, $group_id ) {
-
-        $delete = BP_Groups_Member::delete_invite( $user_id, $group_id );
-
-        if ( !empty( $delete ) ) {
-                bp_core_mark_notifications_by_item_id( $user_id, $group_id, buddypress()->groups->id, 'group_invite' );
-        }
-
-        return $delete;
+        if ( ! BP_Groups_Member::delete_invite( $user_id, $group_id ) )
+                return false;
+
+        do_action( 'groups_delete_invite', $user_id, $group_id );
+
+        return true;
 }
 
@@ -906 +893 @@
 function groups_accept_membership_request( $membership_id, $user_id = 0, $group_id = 0 ) {
 
-        if ( !empty( $user_id ) && !empty( $group_id ) )
+        if ( !empty( $user_id ) && !empty( $group_id ) ) {
                 $membership = new BP_Groups_Member( $user_id, $group_id );
-        else
+        } else {
                 $membership = new BP_Groups_Member( false, false, $membership_id );
+        }
 
         $membership->accept_request();
 
-        if ( !$membership->save() )
-                return false;
+        if ( !$membership->save() ) {
+                return false;
+        }
 
         // Check if the user has an outstanding invite, if so delete it.
-        if ( groups_check_user_has_invite( $membership->user_id, $membership->group_id ) )
+        if ( groups_check_user_has_invite( $membership->user_id, $membership->group_id ) ) {
                 groups_delete_invite( $membership->user_id, $membership->group_id );
-
-        // Record this in activity streams
-        $group = groups_get_group( array( 'group_id' => $membership->group_id ) );
-
-        groups_record_activity( array(
-                'action'  => apply_filters_ref_array( 'groups_activity_membership_accepted_action', array( sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $membership->user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . esc_attr( $group->name ) . '</a>' ), $membership->user_id, &$group ) ),
-                'type'    => 'joined_group',
-                'item_id' => $membership->group_id,
-                'user_id' => $membership->user_id
-        ) );
-
-        // Send a notification to the user.
-        groups_notification_membership_request_completed( $membership->user_id, $membership->group_id, true );
-
-        do_action( 'groups_membership_accepted', $membership->user_id, $membership->group_id );
+        }
+
+        do_action( 'groups_membership_accepted', $membership->user_id, $membership->group_id, true );
 
         return true;
@@ -939 +916 @@
 
 function groups_reject_membership_request( $membership_id, $user_id = 0, $group_id = 0 ) {
-        if ( !$membership = groups_delete_membership_request( $membership_id, $user_id, $group_id ) )
-                return false;
-
-        // Send a notification to the user.
-        groups_notification_membership_request_completed( $membership->user_id, $membership->group_id, false );
-
-        do_action( 'groups_membership_rejected', $membership->user_id, $membership->group_id );
+        if ( !$membership = groups_delete_membership_request( $membership_id, $user_id, $group_id ) ) {
+                return false;
+        }
+
+        do_action( 'groups_membership_rejected', $membership->user_id, $membership->group_id, false );
 
         return true;
@@ -1075 +1050 @@
 
 function groups_remove_data_for_user( $user_id ) {
-        global $bp;
-
         BP_Groups_Member::delete_all_for_user( $user_id );
-
-        bp_core_delete_notifications_from_user( $user_id, $bp->groups->id, 'new_membership_request' );
 
         do_action( 'groups_remove_data_for_user', $user_id );