fix(notification): Make sure pending invite notifications are removed…

… correctly Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Jan 29, 2024 · 386c67f · 386c67f
1 parent b3bdf65
commit 386c67f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
@@ -405,6 +405,9 @@ protected function parseRemoteInvitationMessage(INotification $notification, IL1
 				throw new AlreadyProcessedException();
 			}
 			$room = $this->manager->getRoomById($invite->getLocalRoomId());
+		} catch (DoesNotExistException) {
+			// Invitation does not exist
+			throw new AlreadyProcessedException();
 		} catch (RoomNotFoundException) {
 			// Room does not exist
 			throw new AlreadyProcessedException();

diff --git a/tests/integration/features/federation/invite.feature b/tests/integration/features/federation/invite.feature
@@ -133,6 +133,7 @@ Feature: federation/invite
     When user "participant1" removes remote "participant2" from room "room" with 200 (v4)
     And user "participant2" has the following invitations (v1)
     Then user "participant2" is participant of the following rooms (v4)
+    Then user "participant2" has the following notifications
     When user "participant1" sees the following attendees in room "room" with 200 (v4)
       | actorType       | actorId      | participantType |
       | users           | participant1 | 1               |