diff options
| author | Joas Schilling <coding@schilljs.com> | 2024-03-01 09:36:45 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2024-03-01 09:48:37 +0100 |
| commit | 65d35aefccf91ab89e16ba668d7cfa1b1b3271cf (patch) | |
| tree | 224a6d5db49a620172834b38504ff48556a2817e | |
| parent | a6c53e4d5beee6e5db51814ab512e660f3133739 (diff) | |
fix(federation): Send the remote attendeeId so it can be found in the participant list
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -rw-r--r-- | lib/Federation/FederationManager.php | 2 | ||||
| -rw-r--r-- | lib/Service/RoomFormatter.php | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/Federation/FederationManager.php b/lib/Federation/FederationManager.php index 6b2b7ab88..d81d1e344 100644 --- a/lib/Federation/FederationManager.php +++ b/lib/Federation/FederationManager.php @@ -144,7 +144,7 @@ class FederationManager { '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 655ef3b46..251e63c75 100644 --- a/lib/Service/RoomFormatter.php +++ b/lib/Service/RoomFormatter.php @@ -400,6 +400,10 @@ class RoomFormatter { } } + if ($room->getRemoteServer() !== '') { + $roomData['attendeeId'] = (int) $attendee->getRemoteId(); + } + return $roomData; } |