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

Timestamp:

11/30/2013 06:14:08 AM (11 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-screens.php (modified) (4 diffs)

trunk/bp-groups/bp-groups-screens.php

@@ -28 +28 @@
 function groups_screen_my_groups() {
 
-    $bp = buddypress();
-
-    // Delete group request notifications for the user
-    if ( isset( $_GET['n'] ) ) {
-        bp_core_mark_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'membership_request_accepted' );
-        bp_core_mark_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'membership_request_rejected' );
-        bp_core_mark_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'member_promoted_to_mod'      );
-        bp_core_mark_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'member_promoted_to_admin'    );
-    }
-
     do_action( 'groups_screen_my_groups' );
 
@@ -94 +84 @@
     }
 
-    // Remove notifications
-    bp_core_mark_notifications_by_type( bp_loggedin_user_id(), buddypress()->groups->id, 'group_invite' );
-
     do_action( 'groups_screen_group_invites', $group_id );
 
@@ -104 +91 @@
 function groups_screen_group_home() {
 
-    if ( ! bp_is_single_item() )
-        return false;
-
-    $bp = buddypress();
-
-    if ( isset( $_GET['n'] ) ) {
-        bp_core_mark_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'membership_request_accepted' );
-        bp_core_mark_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'membership_request_rejected' );
-        bp_core_mark_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'member_promoted_to_mod'      );
-        bp_core_mark_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'member_promoted_to_admin'    );
+    if ( ! bp_is_single_item() ) {
+        return false;
     }
 
@@ -805 +784 @@
 
 function groups_screen_group_admin_requests() {
-    global $bp;
-
-    if ( 'membership-requests' != bp_get_group_current_admin_tab() )
-        return false;
-
-    if ( ! bp_is_item_admin() || ( 'public' == $bp->groups->current_group->status ) )
-        return false;
-
-    // Remove any screen notifications
-    bp_core_mark_notifications_by_type( bp_loggedin_user_id(), $bp->groups->id, 'new_membership_request' );
-
-    $request_action = (string)bp_action_variable( 1 );
-    $membership_id  = (int)bp_action_variable( 2 );
+    $bp = buddypress();
+
+    if ( 'membership-requests' != bp_get_group_current_admin_tab() ) {
+        return false;
+    }
+
+    if ( ! bp_is_item_admin() || ( 'public' == $bp->groups->current_group->status ) ) {
+        return false;
+    }
+
+    $request_action = (string) bp_action_variable( 1 );
+    $membership_id  = (int) bp_action_variable( 2 );
 
     if ( !empty( $request_action ) && !empty( $membership_id ) ) {