Don't error hard when adding users to room

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 14 insertions, 6 deletions

diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index 03d7f927a..c158e45fb 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -51,6 +51,7 @@ use OCA\Talk\Webinary;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Comments\IComment;
+use OCP\DB\Exception;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
@@ -339,15 +340,22 @@ class ParticipantService {
 			$attendee->setParticipantType($participant['participantType'] ?? Participant::USER);
 			$attendee->setLastReadMessage($lastMessage);
 			$attendee->setReadPrivacy($readPrivacy);
-			$this->attendeeMapper->insert($attendee);
-
-			$attendees[] = $attendee;
+			try {
+				$this->attendeeMapper->insert($attendee);
+				$attendees[] = $attendee;
+			} catch (Exception $e) {
+				if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+					throw $e;
+				}
+			}
 		}
 
-		$attendeeEvent = new AttendeesAddedEvent($room, $attendees);
-		$this->dispatcher->dispatchTyped($attendeeEvent);
+		if (!empty($attendees)) {
+			$attendeeEvent = new AttendeesAddedEvent($room, $attendees);
+			$this->dispatcher->dispatchTyped($attendeeEvent);
 
-		$this->dispatcher->dispatch(Room::EVENT_AFTER_USERS_ADD, $event);
+			$this->dispatcher->dispatch(Room::EVENT_AFTER_USERS_ADD, $event);
+		}
 	}
 
 	/**