fix: Also cleanup version metadata if expiring

Signed-off-by: Julius Härtl <[email protected]>

apps/files_versions/lib/Storage.php

@@ -914,7 +914,21 @@ public static function expire($filename, $uid) {
 
 			foreach ($toDelete as $key => $path) {
 				\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
+
+				// Make sure to cleanup version table relations as expire does not pass deleteVersion
+				try {
+					/** @var VersionsMapper $versionsMapper */
+					$versionsMapper = \OC::$server->get(VersionsMapper::class);
+					$file = \OC::$server->get(IRootFolder::class)->getUserFolder($uid)->get($filename);
+					$pathparts = pathinfo($path);
+					$timestamp = substr($pathparts['extension'] ?? '', 1);
+					$version = $versionsMapper->findVersionForFileId($file->getId(), $timestamp);
+					$versionsMapper->delete($version);
+				} catch (DoesNotExistException $e) {
+				}
+
 				self::deleteVersion($versionsFileview, $path);
+
 				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
 				unset($allVersions[$key]); // update array with the versions we keep
 				$logger->info('Expire: ' . $path, ['app' => 'files_versions']);