chore: use VersionRestoredEvent instead of deprecated rollback hook

Author: AIlkiv

lib/AppInfo/Application.php

@@ -10,6 +10,7 @@
 
 use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCA\Files_Sharing\Event\BeforeTemplateRenderedEvent;
+use OCA\Files_Versions\Events\VersionRestoredEvent;
 use OCA\Text\Event\LoadEditor;
 use OCA\Text\Exception\DocumentHasUnsavedChangesException;
 use OCA\Text\Listeners\AddMissingIndicesListener;
@@ -24,6 +25,7 @@
 use OCA\Text\Listeners\NodeCopiedListener;
 use OCA\Text\Listeners\RegisterDirectEditorEventListener;
 use OCA\Text\Listeners\RegisterTemplateCreatorListener;
+use OCA\Text\Listeners\VersionRestoredListener;
 use OCA\Text\Middleware\SessionMiddleware;
 use OCA\Text\Notification\Notifier;
 use OCA\Text\Service\DocumentService;
@@ -67,30 +69,12 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(BeforeAssistantNotificationEvent::class, BeforeAssistantNotificationListener::class);
 		$context->registerEventListener(RegisterTemplateCreatorEvent::class, RegisterTemplateCreatorListener::class);
 
+		$context->registerEventListener(VersionRestoredEvent::class, VersionRestoredListener::class);
+
 		$context->registerNotifierService(Notifier::class);
 		$context->registerMiddleware(SessionMiddleware::class);
-
-		/** @psalm-suppress DeprecatedMethod */
-		Util::connectHook('\OCP\Versions', 'rollback', $this, 'resetSessionsAfterRestoreFile');
 	}
 
 	public function boot(IBootContext $context): void {
 	}
-
-	public function resetSessionsAfterRestoreFile(array $params): void {
-		$node = $params['node'];
-		if (!$node instanceof File) {
-			return;
-		}
-
-		$documentService = Server::get(DocumentService::class);
-		// Reset document session to avoid manual conflict resolution if there's no unsaved steps
-		try {
-			$documentService->resetDocument($node->getId());
-		} catch (DocumentHasUnsavedChangesException|NotFoundException $e) {
-			// Do not throw during event handling in this is expected to happen
-			// DocumentHasUnsavedChangesException: A document editing session is likely ongoing, someone can resolve the conflict
-			// NotFoundException: The event was called oin a file that was just created so a NonExistingFile object is used that has no id yet
-		}
-	}
 }

lib/Listeners/VersionRestoredListener.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Text\Listeners;
+
+use OCA\Files_Versions\Events\VersionRestoredEvent;
+use OCA\Text\Exception\DocumentHasUnsavedChangesException;
+use OCA\Text\Service\DocumentService;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Files\File;
+use OCP\Files\NotFoundException;
+
+class VersionRestoredListener implements IEventListener {
+	public function __construct(
+		private DocumentService $documentService,
+	) {
+	}
+
+	public function handle(Event $event): void {
+		if (!($event instanceof VersionRestoredEvent)) {
+			return;
+		}
+
+		$sourceFile = $event->getVersion()->getSourceFile();
+		if (!$sourceFile instanceof File) {
+			return;
+		}
+
+		// Reset document session to avoid manual conflict resolution if there's no unsaved steps
+		try {
+			$this->documentService->resetDocument($sourceFile->getId());
+		} catch (DocumentHasUnsavedChangesException|NotFoundException $e) {
+			// Do not throw during event handling in this is expected to happen
+			// DocumentHasUnsavedChangesException: A document editing session is likely ongoing, someone can resolve the conflict
+			// NotFoundException: The event was called on a file that was just created so a NonExistingFile object is used that has no id yet
+		}
+	}
+}