Merge pull request #11795 from nextcloud/bugfix/noid/remove-duplicate-isFederatedRemoteRoom

fix(federation): Remove duplicate method isFederatedRemoteRoom() vs isFederatedConversation()

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);
 		}
 

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;