Changeset 12437

Timestamp:

08/12/2019 08:45:04 PM (6 years ago)

Author:

dcavins

Message:

Invitations: Clean up notifications on acceptance.

Clean up stray notifications when an invitation is revoked.

Props imath.

See #6210.

Location:

trunk

Files:

• src/bp-groups/bp-groups-notifications.php (modified) (1 diff)
• tests/phpunit/testcases/groups/notifications.php (modified) (3 diffs)

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

@@ -962 +962 @@
 }
 add_action( 'groups_delete_group', 'bp_groups_delete_group_delete_all_notifications', 10 );
+
+/**
+ * Remove Group invite notification when a user is uninvited.
+ *
+ * @since 5.0.0
+ *
+ * @param int $group_id ID of the group being uninvited from.
+ * @param int $user_id  ID of the user being uninvited.
+ */
+function bp_groups_uninvite_user_delete_group_invite_notification( $group_id = 0, $user_id = 0 ) {
+    if ( ! bp_is_active( 'notifications' ) || ! $group_id || ! $user_id ) {
+        return;
+    }
+
+    bp_notifications_delete_notifications_by_item_id( $user_id, $group_id, buddypress()->groups->id, 'group_invite' );
+}
+add_action( 'groups_uninvite_user', 'bp_groups_uninvite_user_delete_group_invite_notification', 10, 2 );
 
 /**

trunk/tests/phpunit/testcases/groups/notifications.php

@@ -17 +17 @@
 
         $this->requesting_user_id = self::factory()->user->create();
-        $this->group = self::factory()->group->create();
+        $this->group = self::factory()->group->create( array( 'status' =>  'private' ) );
         $this->filter_fired = '';
     }
@@ -251 +251 @@
         $this->assertNotEmpty( $u1_notifications );
 
-        $this->assertTrue( groups_invite_user( array(
-            'user_id' => $users[2],
-            'group_id' => $this->group,
-        ) ) );
+        groups_accept_membership_request( false, $users[2], $this->group );
 
         $u0_notifications = BP_Notifications_Notification::get( $get_args );
@@ -262 +259 @@
     }
 
+    public function test_membership_request_notifications_should_be_cleared_when_request_is_accepted_via_invite() {
+        $users = self::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( array(
+            'user_id' => $users[2],
+            'group_id' => $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 );
+
+        // 'Accept' the request by sending an invite.
+        groups_invite_user( array(
+            'user_id' => $users[2],
+            'group_id' => $this->group,
+            'send_invite' => true
+        ) );
+
+        $u0_notifications = BP_Notifications_Notification::get( $get_args );
+        $u1_notifications = BP_Notifications_Notification::get( $get_args );
+        $this->assertEmpty( $u0_notifications );
+        $this->assertEmpty( $u1_notifications );
+    }
+
 }