From 65d35aefccf91ab89e16ba668d7cfa1b1b3271cf Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 1 Mar 2024 09:36:45 +0100 Subject: [PATCH] fix(federation): Send the remote attendeeId so it can be found in the participant list Signed-off-by: Joas Schilling --- lib/Federation/FederationManager.php | 2 +- lib/Service/RoomFormatter.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/Federation/FederationManager.php b/lib/Federation/FederationManager.php index 6b2b7ab8846..d81d1e34476 100644 --- a/lib/Federation/FederationManager.php +++ b/lib/Federation/FederationManager.php @@ -144,7 +144,7 @@ public function acceptRemoteRoomShare(IUser $user, int $shareId): Participant { 'actorId' => $user->getUID(), 'displayName' => $user->getDisplayName(), 'accessToken' => $invitation->getAccessToken(), - 'remoteId' => $invitation->getRemoteAttendeeId(), // FIXME this seems unnecessary + 'remoteId' => $invitation->getRemoteAttendeeId(), 'invitedCloudId' => $invitation->getLocalCloudId(), ] ]; diff --git a/lib/Service/RoomFormatter.php b/lib/Service/RoomFormatter.php index 655ef3b46b9..251e63c7578 100644 --- a/lib/Service/RoomFormatter.php +++ b/lib/Service/RoomFormatter.php @@ -400,6 +400,10 @@ public function formatRoomV4( } } + if ($room->getRemoteServer() !== '') { + $roomData['attendeeId'] = (int) $attendee->getRemoteId(); + } + return $roomData; }