fixup! feat(federation): Add TalkV1 federation proxy for mentions

nextcloud · Feb 15, 2024 · a1f3d25 · a1f3d25
1 parent 670019c
commit a1f3d25
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/Federation/CloudFederationProviderTalk.php b/lib/Federation/CloudFederationProviderTalk.php
@@ -122,7 +122,12 @@ public function shareReceived(ICloudFederationShare $share): string {
 		$remoteId = $share->getProviderId();
 		$roomToken = $share->getResourceName();
 		$roomName = $share->getProtocol()['roomName'];
-		$invitedCloudId = $share->getProtocol()['invitedCloudId'] ?? $this->cloudIdManager->getCloudId($shareWith, null);
+		if (isset($share->getProtocol()['invitedCloudId'])) {
+			$invitedCloudId = $share->getProtocol()['invitedCloudId'];
+		} else {
+			$this->logger->debug('Received a federation invite without invitedCloudId, falling back to shareWith');
+			$invitedCloudId = $this->cloudIdManager->getCloudId($shareWith, null);
+		}
 		$roomType = (int) $roomType;
 		$sharedByDisplayName = $share->getSharedByDisplayName();
 		$sharedByFederatedId = $share->getSharedBy();