Merge pull request #4662 from nextcloud/backport/4627/stable27

nextcloud · Aug 10, 2023 · 46cc398 · 46cc398
2 parents a465d28 + 810c563
commit 46cc398
Show file tree

Hide file tree

Showing 27 changed files with 571 additions and 60 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/composer/composer/autoload_classmap.php b/composer/composer/autoload_classmap.php
@@ -32,6 +32,7 @@
     'OCA\\Text\\Exception\\UploadException' => $baseDir . '/../lib/Exception/UploadException.php',
     'OCA\\Text\\Exception\\VersionMismatchException' => $baseDir . '/../lib/Exception/VersionMismatchException.php',
     'OCA\\Text\\Listeners\\AddMissingIndicesListener' => $baseDir . '/../lib/Listeners/AddMissingIndicesListener.php',
+    'OCA\\Text\\Listeners\\BeforeAssistantNotificationListener' => $baseDir . '/../lib/Listeners/BeforeAssistantNotificationListener.php',
     'OCA\\Text\\Listeners\\BeforeNodeDeletedListener' => $baseDir . '/../lib/Listeners/BeforeNodeDeletedListener.php',
     'OCA\\Text\\Listeners\\BeforeNodeRenamedListener' => $baseDir . '/../lib/Listeners/BeforeNodeRenamedListener.php',
     'OCA\\Text\\Listeners\\FilesLoadAdditionalScriptsListener' => $baseDir . '/../lib/Listeners/FilesLoadAdditionalScriptsListener.php',

diff --git a/composer/composer/autoload_static.php b/composer/composer/autoload_static.php
@@ -47,6 +47,7 @@ class ComposerStaticInitText
         'OCA\\Text\\Exception\\UploadException' => __DIR__ . '/..' . '/../lib/Exception/UploadException.php',
         'OCA\\Text\\Exception\\VersionMismatchException' => __DIR__ . '/..' . '/../lib/Exception/VersionMismatchException.php',
         'OCA\\Text\\Listeners\\AddMissingIndicesListener' => __DIR__ . '/..' . '/../lib/Listeners/AddMissingIndicesListener.php',
+        'OCA\\Text\\Listeners\\BeforeAssistantNotificationListener' => __DIR__ . '/..' . '/../lib/Listeners/BeforeAssistantNotificationListener.php',
         'OCA\\Text\\Listeners\\BeforeNodeDeletedListener' => __DIR__ . '/..' . '/../lib/Listeners/BeforeNodeDeletedListener.php',
         'OCA\\Text\\Listeners\\BeforeNodeRenamedListener' => __DIR__ . '/..' . '/../lib/Listeners/BeforeNodeRenamedListener.php',
         'OCA\\Text\\Listeners\\FilesLoadAdditionalScriptsListener' => __DIR__ . '/..' . '/../lib/Listeners/FilesLoadAdditionalScriptsListener.php',

diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/files-modal.js b/js/files-modal.js
diff --git a/js/files-modal.js.map b/js/files-modal.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/js/vendors.js b/js/vendors.js
diff --git a/js/vendors.js.map b/js/vendors.js.map
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -29,6 +29,7 @@
 use OCA\Files_Sharing\Event\BeforeTemplateRenderedEvent;
 use OCA\Text\Event\LoadEditor;
 use OCA\Text\Listeners\AddMissingIndicesListener;
+use OCA\Text\Listeners\BeforeAssistantNotificationListener;
 use OCA\Text\Listeners\BeforeNodeDeletedListener;
 use OCA\Text\Listeners\BeforeNodeRenamedListener;
 use OCA\Text\Listeners\FilesLoadAdditionalScriptsListener;
@@ -39,6 +40,7 @@
 use OCA\Text\Listeners\RegisterDirectEditorEventListener;
 use OCA\Text\Notification\Notifier;
 use OCA\Text\Service\ConfigService;
+use OCA\TPAssistant\Event\BeforeAssistantNotificationEvent;
 use OCA\Viewer\Event\LoadViewer;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
@@ -71,6 +73,8 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(BeforeNodeRenamedEvent::class, BeforeNodeRenamedListener::class);
 		$context->registerEventListener(BeforeNodeDeletedEvent::class, BeforeNodeDeletedListener::class);
 		$context->registerEventListener(AddMissingIndicesEvent::class, AddMissingIndicesListener::class);
+		$context->registerEventListener(BeforeAssistantNotificationEvent::class, BeforeAssistantNotificationListener::class);
+
 		$context->registerNotifierService(Notifier::class);
 	}
 

diff --git a/lib/Listeners/BeforeAssistantNotificationListener.php b/lib/Listeners/BeforeAssistantNotificationListener.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace OCA\Text\Listeners;
+
+use OCA\Text\AppInfo\Application;
+use OCA\TPAssistant\Event\BeforeAssistantNotificationEvent;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\IURLGenerator;
+
+/** @template-implements IEventListener<BeforeAssistantNotificationEvent|Event> */
+class BeforeAssistantNotificationListener implements \OCP\EventDispatcher\IEventListener {
+
+	public function __construct(
+		private IURLGenerator $urlGenerator,
+	) {
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function handle(Event $event): void {
+		if (!$event instanceof BeforeAssistantNotificationEvent) {
+			return;
+		}
+
+		$task = $event->getTask();
+		if ($task->getAppId() !== Application::APP_NAME || $task->getUserId() === null) {
+			return;
+		}
+		$fileId = (int)str_replace('text-file:', '', $task->getIdentifier());
+		$fileLink = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $fileId]);
+		$event->setWantsNotification(true);
+		$event->setNotificationTarget($fileLink);
+	}
+}
diff --git a/lib/Service/InitialStateProvider.php b/lib/Service/InitialStateProvider.php
@@ -3,13 +3,16 @@
 namespace OCA\Text\Service;
 
 use OCP\AppFramework\Services\IInitialState;
+use OCP\TextProcessing\IManager;
+use OCP\TextProcessing\ITaskType;
 use OCP\Translation\ITranslationManager;
 
 class InitialStateProvider {
 	public function __construct(
 		private IInitialState $initialState,
 		private ConfigService $configService,
 		private ITranslationManager $translationManager,
+		private IManager $textProcessingManager,
 		private ?string $userId
 	) {
 	}
@@ -44,6 +47,18 @@ public function provideState(): void {
 			'translation_languages',
 			$this->translationManager->getLanguages()
 		);
+
+		$this->initialState->provideInitialState(
+			'textprocessing',
+			array_map(function (string $className) {
+				/** @var class-string<ITaskType> $className */
+				$type = \OCP\Server::get($className);
+				return [
+					'task' => $className,
+					'name' => $type->getName(),
+				];
+			}, $this->textProcessingManager->getAvailableTaskTypes()),
+		);
 	}
 
 	public function provideFileId(int $fileId): void {

diff --git a/psalm.xml b/psalm.xml
@@ -7,7 +7,7 @@
     errorBaseline="tests/psalm-baseline.xml"
 >
 	<stubs>
-		<file name="tests/stub.phpstub" preloadClasses="true"/>
+		<file name="tests/stub.php" preloadClasses="true"/>
 	</stubs>
     <projectFiles>
         <directory name="lib" />