From: Julius Härtl <jus@bitgrid.net>
Date: Thu, 30 Nov 2023 19:31:52 +0000 (+0100)
Subject: fix: Properly fetch version from shared files by accessing the owner storage version
X-Git-Tag: v29.0.0beta1~694^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F41944%2Fhead;p=nextcloud-server.git

fix: Properly fetch version from shared files by accessing the owner storage version

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---

diff --git a/apps/files_versions/lib/Versions/LegacyVersionsBackend.php b/apps/files_versions/lib/Versions/LegacyVersionsBackend.php
index 36faf893d66..784bc0e5449 100644
--- a/apps/files_versions/lib/Versions/LegacyVersionsBackend.php
+++ b/apps/files_versions/lib/Versions/LegacyVersionsBackend.php
@@ -27,6 +27,7 @@ declare(strict_types=1);
 namespace OCA\Files_Versions\Versions;
 
 use OC\Files\View;
+use OCA\Files_Sharing\ISharedStorage;
 use OCA\Files_Sharing\SharedStorage;
 use OCA\Files_Versions\Db\VersionEntity;
 use OCA\Files_Versions\Db\VersionsMapper;
@@ -196,6 +197,21 @@ class LegacyVersionsBackend implements IVersionBackend, INameableVersionBackend,
 
 	public function getVersionFile(IUser $user, FileInfo $sourceFile, $revision): File {
 		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
+		$owner = $sourceFile->getOwner();
+		$storage = $sourceFile->getStorage();
+
+		// Shared files have their versions in the owners root folder so we need to obtain them from there
+		if ($storage->instanceOfStorage(ISharedStorage::class) && $owner) {
+			/** @var SharedStorage $storage */
+			$userFolder = $this->rootFolder->getUserFolder($owner->getUID());
+			$user = $owner;
+			$ownerPathInStorage = $sourceFile->getInternalPath();
+			$sourceFile = $storage->getShare()->getNode();
+			if ($sourceFile instanceof Folder) {
+				$sourceFile = $sourceFile->get($ownerPathInStorage);
+			}
+		}
+
 		$versionFolder = $this->getVersionFolder($user);
 		/** @var File $file */
 		$file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision);