fix(federation): Fix check for duplicate invites

Signed-off-by: Joas Schilling <[email protected]>
nextcloud · Feb 5, 2024 · 903ecd3 · 903ecd3
1 parent 46f03a5
commit 903ecd3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
@@ -1051,7 +1051,7 @@ public function addParticipantToRoom(string $newParticipant, string $source = 'u
 		foreach ($participants as $participant) {
 			if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS) {
 				$participantsByUserId[$participant->getAttendee()->getActorId()] = $participant;
-			} elseif ($participant->getAttendee()->getAccessToken() === Attendee::ACTOR_FEDERATED_USERS) {
+			} elseif ($participant->getAttendee()->getActorType() === Attendee::ACTOR_FEDERATED_USERS) {
 				$remoteParticipantsByFederatedId[$participant->getAttendee()->getActorId()] = $participant;
 			}
 		}

diff --git a/tests/integration/features/federation/invite.feature b/tests/integration/features/federation/invite.feature
@@ -32,6 +32,15 @@ Feature: federation/invite
       | roomType | 3 |
       | roomName | room |
     And user "participant1" adds remote "participant2" to room "room" with 200 (v4)
+    When user "participant1" sees the following attendees in room "room" with 200 (v4)
+      | actorType       | actorId      | participantType |
+      | users           | participant1 | 1               |
+      | federated_users | participant2 | 3               |
+    Then user "participant1" sees the following system messages in room "room" with 200
+      | room | actorType     | actorId      | systemMessage        | message                      | messageParameters |
+      | room | users         | participant1 | federated_user_added | You invited {federated_user} | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname"},"federated_user":{"type":"user","id":"participant2","name":"participant2@localhost:8180","server":"http:\/\/localhost:8180"}} |
+      | room | users         | participant1 | conversation_created | You created the conversation | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname"}} |
+    And user "participant1" adds remote "participant2" to room "room" with 200 (v4)
     When user "participant1" sees the following attendees in room "room" with 200 (v4)
       | actorType       | actorId      | participantType |
       | users           | participant1 | 1               |