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

…-isFederatedRemoteRoom fix(federation): Remove duplicate method isFederatedRemoteRoom() vs isFederatedConversation()
nextcloud · Mar 14, 2024 · c9ef4b7 · c9ef4b7
2 parents 18f1e51 + 53bd7b6
commit c9ef4b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git 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
@@ -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;