Changeset 7530

Timestamp:

11/08/2013 05:20:46 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Introduce bp_core_mark_notifications_by_type() and bp_core_mark_notifications_by_item_id() and replace bp_core_delete_notifications_by_type() and bp_core_delete_notifications_by_item_id() usages.

Ensures notifications are toggled as acknowledged rather than deleted. See #5148.

Location:

trunk

Files:

• bp-friends/bp-friends-functions.php (modified) (2 diffs)
• bp-groups/bp-groups-functions.php (modified) (3 diffs)
• bp-members/bp-members-notifications.php (modified) (2 diffs)
• bp-messages/bp-messages-template.php (modified) (1 diff)

trunk/bp-friends/bp-friends-functions.php

@@ -90 +90 @@
 
         // Remove the friend request notice
-        bp_core_delete_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
+        bp_core_mark_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
 
         // Add a friend accepted notice for the initiating user
@@ -134 +134 @@
 
     if ( !$friendship->is_confirmed && BP_Friends_Friendship::reject( $friendship_id ) ) {
+
         // Remove the friend request notice
-        bp_core_delete_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
+        bp_core_mark_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
 
         do_action_ref_array( 'friends_friendship_rejected', array( $friendship_id, &$friendship ) );

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

@@ -697 +697 @@
  */
 function groups_accept_invite( $user_id, $group_id ) {
-    global $bp;
 
     // If the user is already a member (because BP at one point allowed two invitations to
@@ -724 +723 @@
     groups_update_groupmeta( $group_id, 'last_activity', bp_core_current_time() );
 
-    bp_core_delete_notifications_by_item_id( $user_id, $group_id, $bp->groups->id, 'group_invite' );
+    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 );
@@ -740 +739 @@
 
 function groups_delete_invite( $user_id, $group_id ) {
-    global $bp;
 
     $delete = BP_Groups_Member::delete_invite( $user_id, $group_id );
 
-    if ( $delete )
-        bp_core_delete_notifications_by_item_id( $user_id, $group_id, $bp->groups->id, 'group_invite' );
+    if ( !empty( $delete ) ) {
+        bp_core_mark_notifications_by_item_id( $user_id, $group_id, buddypress()->groups->id, 'group_invite' );
+    }
 
     return $delete;

trunk/bp-members/bp-members-notifications.php

@@ -100 +100 @@
 }
 
+/** Delete ********************************************************************/
+
 /**
  * Delete notifications for a user by type
@@ -163 +165 @@
 }
 
+/** Mark **********************************************************************/
+
+/**
+ * Delete notifications for a user by type
+ *
+ * Used when clearing out notifications for a specific component when the user
+ * has visited that component.
+ *
+ * @since BuddyPress (1.0)
+ * @param int $user_id
+ * @param string $component_name
+ * @param string $component_action
+ * @param int $is_new
+ * @return boolean True on success, false on fail
+ */
+function bp_core_mark_notifications_by_type( $user_id, $component_name, $component_action, $is_new = false ) {
+
+    // Bail if notifications is not active
+    if ( ! bp_is_active( 'notifications' ) ) {
+        return false;
+    }
+
+    return bp_notifications_mark_notifications_by_type( $user_id, $component_name, $component_action, $is_new );
+}
+
+/**
+ * Delete notifications for an item ID
+ *
+ * Used when clearing out notifications for a specific component when the user
+ * has visited that component.
+ *
+ * @since BuddyPress (1.0)
+ * @param int $user_id
+ * @param string $component_name
+ * @param string $component_action
+ * @param int $is_new
+ * @return boolean True on success, false on fail
+ */
+function bp_core_mark_notifications_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id = false, $is_new = false ) {
+
+    // Bail if notifications is not active
+    if ( ! bp_is_active( 'notifications' ) ) {
+        return false;
+    }
+
+    return bp_notifications_mark_notifications_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id, $is_new );
+}
+
 /**
  * Mark all notifications read/unread for by type

trunk/bp-messages/bp-messages-template.php

@@ -186 +186 @@
     } else {
         if ( bp_is_current_action( 'inbox' ) ) {
-            bp_core_delete_notifications_by_type( bp_loggedin_user_id(), $bp->messages->id, 'new_message' );
+            bp_core_mark_notifications_by_type( bp_loggedin_user_id(), $bp->messages->id, 'new_message' );
         }