fix(federation): Don't break/throttle when the invite was not accepted

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Feb 29, 2024 · fcffe85 · fcffe85
1 parent c84be51
commit fcffe85
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/lib/Federation/CloudFederationProviderTalk.php b/lib/Federation/CloudFederationProviderTalk.php
@@ -265,8 +265,14 @@ private function shareUnshared(int $remoteAttendeeId, array $notification): arra
 		}
 
 		$this->invitationMapper->delete($invite);
-		$participant = $this->participantService->getParticipantByActor($room, Attendee::ACTOR_USERS, $invite->getUserId());
-		$this->participantService->removeAttendee($room, $participant, AAttendeeRemovedEvent::REASON_REMOVED);
+
+		try {
+			$participant = $this->participantService->getParticipantByActor($room, Attendee::ACTOR_USERS, $invite->getUserId());
+			$this->participantService->removeAttendee($room, $participant, AAttendeeRemovedEvent::REASON_REMOVED);
+		} catch (ParticipantNotFoundException) {
+			// Never accepted the invite
+		}
+
 		return [];
 	}
 
@@ -373,7 +379,8 @@ private function messagePosted(int $remoteAttendeeId, array $notification): arra
 		try {
 			$participant = $this->participantService->getParticipant($room, $invite->getUserId(), false);
 		} catch (ParticipantNotFoundException) {
-			throw new ShareNotFound();
+			// Not accepted the invite yet
+			return [];
 		}
 
 		$this->participantService->updateUnreadInfoForProxyParticipant(