1 files changed, 31 insertions, 10 deletions

diff --git a/apps/files_versions/lib/Versions/VersionManager.php b/apps/files_versions/lib/Versions/VersionManager.php
index b7dcd7d3a02..9acea8c6513 100644
--- a/apps/files_versions/lib/Versions/VersionManager.php
+++ b/apps/files_versions/lib/Versions/VersionManager.php
@@ -8,6 +8,10 @@ declare(strict_types=1);
  */
 namespace OCA\Files_Versions\Versions;
 
+use OCA\Files_Versions\Db\VersionEntity;
+use OCA\Files_Versions\Events\VersionCreatedEvent;
+use OCA\Files_Versions\Events\VersionRestoredEvent;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\File;
 use OCP\Files\FileInfo;
 use OCP\Files\IRootFolder;
@@ -18,11 +22,18 @@ use OCP\Files\Node;
 use OCP\Files\Storage\IStorage;
 use OCP\IUser;
 use OCP\Lock\ManuallyLockedException;
+use OCP\Server;
 
 class VersionManager implements IVersionManager, IDeletableVersionBackend, INeedSyncVersionBackend, IMetadataVersionBackend {
+
 	/** @var (IVersionBackend[])[] */
 	private $backends = [];
 
+	public function __construct(
+		private IEventDispatcher $dispatcher,
+	) {
+	}
+
 	public function registerBackend(string $storageType, IVersionBackend $backend) {
 		if (!isset($this->backends[$storageType])) {
 			$this->backends[$storageType] = [];
@@ -51,8 +62,8 @@ class VersionManager implements IVersionManager, IDeletableVersionBackend, INeed
 
 		foreach ($backends as $type => $backendsForType) {
 			if (
-				$storage->instanceOfStorage($type) &&
-				($foundType === '' || is_subclass_of($type, $foundType))
+				$storage->instanceOfStorage($type)
+				&& ($foundType === '' || is_subclass_of($type, $foundType))
 			) {
 				foreach ($backendsForType as $backend) {
 					/** @var IVersionBackend $backend */
@@ -86,11 +97,7 @@ class VersionManager implements IVersionManager, IDeletableVersionBackend, INeed
 		$result = self::handleAppLocks(fn (): ?bool => $backend->rollback($version));
 		// rollback doesn't have a return type yet and some implementations don't return anything
 		if ($result === null || $result === true) {
-			\OC_Hook::emit('\OCP\Versions', 'rollback', [
-				'path' => $version->getVersionPath(),
-				'revision' => $version->getRevisionId(),
-				'node' => $version->getSourceFile(),
-			]);
+			$this->dispatcher->dispatchTyped(new VersionRestoredEvent($version));
 		}
 		return $result;
 	}
@@ -105,6 +112,11 @@ class VersionManager implements IVersionManager, IDeletableVersionBackend, INeed
 		return $backend->getVersionFile($user, $sourceFile, $revision);
 	}
 
+	public function getRevision(Node $node): int {
+		$backend = $this->getBackendForStorage($node->getStorage());
+		return $backend->getRevision($node);
+	}
+
 	public function useBackendForStorage(IStorage $storage): bool {
 		return false;
 	}
@@ -119,7 +131,16 @@ class VersionManager implements IVersionManager, IDeletableVersionBackend, INeed
 	public function createVersionEntity(File $file): void {
 		$backend = $this->getBackendForStorage($file->getStorage());
 		if ($backend instanceof INeedSyncVersionBackend) {
-			$backend->createVersionEntity($file);
+			$versionEntity = $backend->createVersionEntity($file);
+
+			if ($versionEntity instanceof VersionEntity) {
+				foreach ($backend->getVersionsForFile($file->getOwner(), $file) as $version) {
+					if ($version->getRevisionId() === $versionEntity->getTimestamp()) {
+						$this->dispatcher->dispatchTyped(new VersionCreatedEvent($file, $version));
+						break;
+					}
+				}
+			}
 		}
 	}
 
@@ -176,9 +197,9 @@ class VersionManager implements IVersionManager, IDeletableVersionBackend, INeed
 			// when checking the lock against the current scope.
 			// So we do not need to get the actual node here
 			// and use the root node instead.
-			$root = \OC::$server->get(IRootFolder::class);
+			$root = Server::get(IRootFolder::class);
 			$lockContext = new LockContext($root, ILock::TYPE_APP, $owner);
-			$lockManager = \OC::$server->get(ILockManager::class);
+			$lockManager = Server::get(ILockManager::class);
 			$result = null;
 			$lockManager->runInScope($lockContext, function () use ($callback, &$result): void {
 				$result = $callback();