Ticket #7375: 7375.diff

src/bp-groups/bp-groups-notifications.php

@@ -967 +967 @@
 add_action( 'groups_delete_invite', 'bp_groups_accept_invite_mark_notifications', 10, 2 );
 
 /**
+ * Mark notifications read when a member's group membership request is granted.
+ *
+ * @since 2.8.0
+ *
+ * @param int $user_id  ID of the user.
+ * @param int $group_id ID of the group.
+ */
+function bp_groups_accept_request_mark_notifications( $user_id, $group_id ) {
+        if ( bp_is_active( 'notifications' ) ) {
+                // First null parameter marks read for all admins.
+                bp_notifications_mark_notifications_by_item_id( null, $group_id, buddypress()->groups->id, 'new_membership_request', $user_id );
+        }
+}
+add_action( 'groups_membership_accepted', 'bp_groups_accept_request_mark_notifications', 10, 2 );
+add_action( 'groups_membership_rejected', 'bp_groups_accept_request_mark_notifications', 10, 2 );
+
+/**
  * Mark notifications read when a member views their group memberships.
  *
  * @since 1.9.0

tests/phpunit/testcases/groups/notifications.php

@@ -218 +218 @@
                 $this->filter_fired = current_filter();
                 return $value;
         }
+
+        /**
+         * @group BP7375
+         */
+        public function test_membership_request_notifications_should_be_cleared_when_request_is_accepted() {
+                $users = $this->factory->user->create_many( 3 );
+
+                $this->add_user_to_group( $users[0], $this->group, array(
+                        'is_admin' => 1,
+                ) );
+                $this->add_user_to_group( $users[1], $this->group, array(
+                        'is_admin' => 1,
+                ) );
+
+                groups_send_membership_request( $users[2], $this->group );
+
+                // Both admins should get a notification.
+                $get_args = array(
+                        'user_id' => $users[0],
+                        'item_id' => $this->group,
+                        'secondary_item_id' => $users[2],
+                        'component_action' => 'new_membership_request',
+                        'is_new' => true,
+                );
+                $u0_notifications = BP_Notifications_Notification::get( $get_args );
+                $u1_notifications = BP_Notifications_Notification::get( $get_args );
+                $this->assertNotEmpty( $u0_notifications );
+                $this->assertNotEmpty( $u1_notifications );
+
+                $this->assertTrue( groups_invite_user( array(
+                        'user_id' => $users[2],
+                        'group_id' => $this->group,
+                ) ) );
+
+                $u0_notifications = BP_Notifications_Notification::get( $get_args );
+                $u1_notifications = BP_Notifications_Notification::get( $get_args );
+                $this->assertEmpty( $u0_notifications );
+                $this->assertEmpty( $u1_notifications );
+        }
+
 }