Don't error when a user is already a member

Signed-off-by: Joas Schilling <[email protected]>

lib/Listener/GroupMembershipListener.php

@@ -23,8 +23,10 @@
 
 namespace OCA\Talk\Listener;
 
+use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\Manager;
 use OCA\Talk\Model\Attendee;
+use OCA\Talk\Participant;
 use OCA\Talk\Room;
 use OCA\Talk\Service\ParticipantService;
 use OCP\EventDispatcher\Event;
@@ -65,10 +67,17 @@ protected function addNewMemberToRooms(IGroup $group, IUser $user): void {
 		$rooms = $this->manager->getRoomsForActor(Attendee::ACTOR_GROUPS, $group->getGID());
 
 		foreach ($rooms as $room) {
-			$this->participantService->addUsers($room, [[
-				'actorType' => Attendee::ACTOR_USERS,
-				'actorId' => $user->getUID(),
-			]]);
+			try {
+				$participant = $room->getParticipant($user->getUID());
+				if ($participant->getAttendee()->getParticipantType() === Participant::USER_SELF_JOINED) {
+					$this->participantService->updateParticipantType($room, $participant, Participant::USER);
+				}
+			} catch (ParticipantNotFoundException $e) {
+				$this->participantService->addUsers($room, [[
+					'actorType' => Attendee::ACTOR_USERS,
+					'actorId' => $user->getUID(),
+				]]);
+			}
 		}
 	}
 

lib/Service/ParticipantService.php

@@ -316,7 +316,7 @@ public function addGroup(Room $room, IGroup $group, array $existingParticipants
 		$usersInGroup = $group->getUsers();
 
 		if (empty($existingParticipants)) {
-			$participants = $this->getParticipantsForRoom($room);
+			$existingParticipants = $this->getParticipantsForRoom($room);
 		}
 
 		$participantsByUserId = [];