diff --git a/lib/Federation/CloudFederationProviderTalk.php b/lib/Federation/CloudFederationProviderTalk.php index cb161b1193b..a17cb402eba 100644 --- a/lib/Federation/CloudFederationProviderTalk.php +++ b/lib/Federation/CloudFederationProviderTalk.php @@ -270,7 +270,7 @@ private function shareUnshared(int $remoteAttendeeId, array $notification): arra } // Sanity check to make sure the room is a remote room - if (!$room->isFederatedRemoteRoom()) { + if (!$room->isFederatedConversation()) { throw new ShareNotFound(FederationManager::OCM_RESOURCE_NOT_FOUND); } @@ -303,7 +303,7 @@ private function roomModified(int $remoteAttendeeId, array $notification): array } // Sanity check to make sure the room is a remote room - if (!$room->isFederatedRemoteRoom()) { + if (!$room->isFederatedConversation()) { throw new ShareNotFound(FederationManager::OCM_RESOURCE_NOT_FOUND); } @@ -341,7 +341,7 @@ private function messagePosted(int $remoteAttendeeId, array $notification): arra } // Sanity check to make sure the room is a remote room - if (!$room->isFederatedRemoteRoom()) { + if (!$room->isFederatedConversation()) { throw new ShareNotFound(FederationManager::OCM_RESOURCE_NOT_FOUND); } diff --git a/lib/Room.php b/lib/Room.php index e00625fda14..4d2d2a3abae 100644 --- a/lib/Room.php +++ b/lib/Room.php @@ -415,13 +415,6 @@ public function getRemoteToken(): string { return $this->remoteToken; } - /** - * @deprecated - */ - public function isFederatedRemoteRoom(): bool { - return $this->remoteServer !== ''; - } - public function setParticipant(?string $userId, Participant $participant): void { // FIXME Also used with cloudId, need actorType checking? $this->currentUser = $userId;