diff options
| author | Joas Schilling <coding@schilljs.com> | 2024-03-07 18:06:28 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2024-03-07 18:06:28 +0100 |
| commit | decbeebaf9fae285d60ead2a6f39f1693122d737 (patch) | |
| tree | 929f5ef1148950a14213eb321dbfd8a3010e19ee /lib | |
| parent | bbf2e6bc47c96beb194133ad75b064611e18fc4c (diff) | |
fix(federation): Don't request user status from remote instances
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Controller/RoomController.php | 2 | ||||
| -rw-r--r-- | lib/Federation/Proxy/TalkV1/Controller/RoomController.php | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php index 90e792285..78cb5b55f 100644 --- a/lib/Controller/RoomController.php +++ b/lib/Controller/RoomController.php @@ -845,7 +845,7 @@ class RoomController extends AEnvironmentAwareController { if ($this->room->getRemoteServer()) { /** @var \OCA\Talk\Federation\Proxy\TalkV1\Controller\RoomController $proxy */ $proxy = \OCP\Server::get(\OCA\Talk\Federation\Proxy\TalkV1\Controller\RoomController::class); - return $proxy->getParticipants($this->room, $this->participant, $includeStatus); + return $proxy->getParticipants($this->room, $this->participant); } if ($this->participant->getAttendee()->getParticipantType() === Participant::GUEST) { diff --git a/lib/Federation/Proxy/TalkV1/Controller/RoomController.php b/lib/Federation/Proxy/TalkV1/Controller/RoomController.php index 73ef617b7..b28efd8b4 100644 --- a/lib/Federation/Proxy/TalkV1/Controller/RoomController.php +++ b/lib/Federation/Proxy/TalkV1/Controller/RoomController.php @@ -56,20 +56,17 @@ class RoomController { * 200: Participants returned * 403: Missing permissions for getting participants */ - public function getParticipants(Room $room, Participant $participant, bool $includeStatus = false): DataResponse { + public function getParticipants(Room $room, Participant $participant): DataResponse { $proxy = $this->proxy->get( $participant->getAttendee()->getInvitedCloudId(), $participant->getAttendee()->getAccessToken(), $room->getRemoteServer() . '/ocs/v2.php/apps/spreed/api/v4/room/' . $room->getRemoteToken() . '/participants', - [ - 'includeStatus' => $includeStatus, - ], ); /** @var TalkParticipant[] $data */ $data = $this->proxy->getOCSData($proxy); - // FIXME post-load status information + // FIXME post-load status information of now local users /** @var TalkParticipant[] $data */ $data = $this->userConverter->convertAttendees($room, $data, 'actorType', 'actorId', 'displayName'); $headers = []; |