From decbeebaf9fae285d60ead2a6f39f1693122d737 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 7 Mar 2024 18:06:28 +0100 Subject: fix(federation): Don't request user status from remote instances Signed-off-by: Joas Schilling --- lib/Controller/RoomController.php | 2 +- lib/Federation/Proxy/TalkV1/Controller/RoomController.php | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'lib') 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 = []; -- cgit v1.2.3