Ticket #5282: 5282.diff

bp-groups/bp-groups-notifications.php

@@ -59 +59 @@
 function groups_notification_new_membership_request( $requesting_user_id, $admin_id, $group_id, $membership_id ) {
 
         if ( bp_is_active( 'notifications' ) ) {
-                bp_notifications_add_notification( $requesting_user_id, $admin_id, 'groups', 'new_membership_request', $group_id );
+                bp_notifications_add_notification( array(
+                        'user_id'           => $admin_id,
+                        'item_id'           => $requesting_user_id,
+                        'secondary_item_id' => $group_id,
+                        'component_name'    => buddypress()->groups->id,
+                        'component_action'  => 'new_membership_request',
+                        'date_notified'     => bp_core_current_time(),
+                        'is_new'            => 1,
+                ) );
         }
 
         if ( 'no' == bp_get_user_meta( $admin_id, 'notification_groups_membership_request', true ) )
@@ -110 +118 @@
 
         // Post a screen notification first.
         if ( bp_is_active( 'notifications' ) ) {
-                if ( $accepted ) {
-                        bp_notifications_add_notification( $group_id, $requesting_user_id, 'groups', 'membership_request_accepted' );
-                } else {
-                        bp_notifications_add_notification( $group_id, $requesting_user_id, 'groups', 'membership_request_rejected' );
-                }
+
+                $type = ! empty( $accepted ) ? 'membership_request_accepted' : 'membership_request_rejected' ;
+
+                bp_notifications_add_notification( array(
+                        'user_id'           => $requesting_user_id,
+                        'item_id'           => $group_id,
+                        'component_name'    => buddypress()->groups->id,
+                        'component_action'  => $type,
+                        'date_notified'     => bp_core_current_time(),
+                        'is_new'            => 1,
+                ) );
         }
 
         if ( 'no' == bp_get_user_meta( $requesting_user_id, 'notification_membership_request_completed', true ) )
@@ -181 +195 @@
 
         // Post a screen notification first.
         if ( bp_is_active( 'notifications' ) ) {
-                bp_notifications_add_notification( $group_id, $user_id, 'groups', $type );
+                bp_notifications_add_notification( array(
+                        'user_id'           => $user_id,
+                        'item_id'           => $group_id,
+                        'component_name'    => buddypress()->groups->id,
+                        'component_action'  => $type,
+                        'date_notified'     => bp_core_current_time(),
+                        'is_new'            => 1,
+                ) );
         }
 
         if ( 'no' == bp_get_user_meta( $user_id, 'notification_groups_admin_promotion', true ) )
@@ -234 +255 @@
 
                 // Post a screen notification first.
                 if ( bp_is_active( 'notifications' ) ) {
-                        bp_notifications_add_notification( $group->id, $invited_user_id, 'groups', 'group_invite' );
+                        bp_notifications_add_notification( array(
+                                'user_id'           => $invited_user_id,
+                                'item_id'           => $group->id,
+                                'component_name'    => buddypress()->groups->id,
+                                'component_action'  => 'group_invite',
+                                'date_notified'     => bp_core_current_time(),
+                                'is_new'            => 1,
+                        ) );
                 }
 
                 if ( 'no' == bp_get_user_meta( $invited_user_id, 'notification_groups_invite', true ) )
@@ -568 +596 @@
                 bp_notifications_mark_notifications_by_type( $user_id, $group_id, 'member_promoted_to_admin'    );
         }
 }
-add_action( 'groups_screen_my_groups', 'bp_groups_screen_my_groups_mark_notifications', 10 );
-add_action( 'groups_screen_home',      'bp_groups_screen_my_groups_mark_notifications', 10 );
+add_action( 'groups_screen_my_groups',  'bp_groups_screen_my_groups_mark_notifications', 10 );
+add_action( 'groups_screen_group_home', 'bp_groups_screen_my_groups_mark_notifications', 10 );
 
 /**
  * Mark group invitation notifications read when a member views their invitations
@@ -581 +609 @@
                 bp_notifications_mark_notifications_by_type( bp_loggedin_user_id(), buddypress()->groups->id, 'group_invite' );
         }
 }
-add_action( 'groups_screen_invites', 'bp_groups_screen_invites_mark_notifications', 10 );
+add_action( 'groups_screen_group_invites', 'bp_groups_screen_invites_mark_notifications', 10 );
 
 /**
  * Mark group join requests read when an admin or moderator visits the group
@@ -592 +620 @@
  */
 function bp_groups_screen_group_admin_requests_mark_notifications( $group_id ) {
         if ( bp_is_active( 'notifications' ) ) {
-                bp_notifications_mark_notifications_by_type( bp_loggedin_user_id(), $group_id, 'new_membership_request' );
+                bp_notifications_mark_notifications_by_type( bp_loggedin_user_id(), buddypress()->groups->id, 'new_membership_request' );
         }
 }
 add_action( 'groups_screen_group_admin_requests', 'bp_groups_screen_group_admin_requests_mark_notifications', 10 );