diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2024-03-14 11:37:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-14 11:37:08 +0100 |
| commit | c9ef4b7b847aa6d1a096842a9fcfef118d6ff607 (patch) | |
| tree | 06faa0b54e4a31eecd739eb75ff68c81683191a5 /lib | |
| parent | 18f1e51cf55b34211fc07c9e4235933f7f2630a2 (diff) | |
| parent | 53bd7b6d9fe5cadca0b25085afee28b1442cde86 (diff) | |
Merge pull request #11795 from nextcloud/bugfix/noid/remove-duplicate-isFederatedRemoteRoom
fix(federation): Remove duplicate method isFederatedRemoteRoom() vs isFederatedConversation()
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Federation/CloudFederationProviderTalk.php | 6 | ||||
| -rw-r--r-- | lib/Room.php | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/lib/Federation/CloudFederationProviderTalk.php b/lib/Federation/CloudFederationProviderTalk.php index cb161b119..a17cb402e 100644 --- a/lib/Federation/CloudFederationProviderTalk.php +++ b/lib/Federation/CloudFederationProviderTalk.php @@ -270,7 +270,7 @@ class CloudFederationProviderTalk implements ICloudFederationProvider { } // 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 @@ class CloudFederationProviderTalk implements ICloudFederationProvider { } // 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 @@ class CloudFederationProviderTalk implements ICloudFederationProvider { } // 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 e00625fda..4d2d2a3ab 100644 --- a/lib/Room.php +++ b/lib/Room.php @@ -415,13 +415,6 @@ class Room { 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; |