From 403a4dc294384b38df8f707a6668da4d9b5ae4c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 9 Feb 2023 10:03:38 +0100
Subject: [PATCH] perf: Register notifier and resource listener lazy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/AppInfo/Application.php                   | 22 +++----------
 .../ResourceAdditionalScriptsListener.php     | 31 +++++++++++++++++++
 2 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 lib/Listeners/ResourceAdditionalScriptsListener.php

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index b3695e1eb..0bccdd332 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -25,7 +25,6 @@ namespace OCA\Deck\AppInfo;
 
 use Closure;
 use Exception;
-use OC\EventDispatcher\SymfonyAdapter;
 use OCA\Circles\Events\CircleDestroyedEvent;
 use OCA\Deck\Activity\CommentEventHandler;
 use OCA\Deck\Capabilities;
@@ -45,6 +44,7 @@ use OCA\Deck\Event\SessionCreatedEvent;
 use OCA\Deck\Listeners\BeforeTemplateRenderedListener;
 use OCA\Deck\Listeners\ParticipantCleanupListener;
 use OCA\Deck\Listeners\FullTextSearchEventListener;
+use OCA\Deck\Listeners\ResourceAdditionalScriptsListener;
 use OCA\Deck\Listeners\ResourceListener;
 use OCA\Deck\Listeners\LiveUpdateListener;
 use OCA\Deck\Middleware\DefaultBoardMiddleware;
@@ -63,15 +63,13 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\Collaboration\Reference\RenderReferenceEvent;
 use OCP\Collaboration\Resources\IProviderManager;
+use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent;
 use OCP\Comments\CommentsEntityEvent;
 use OCP\Comments\ICommentsManager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Group\Events\GroupDeletedEvent;
 use OCP\IConfig;
 use OCP\IDBConnection;
-use OCP\IRequest;
-use OCP\Server;
-use OCP\Notification\IManager as NotificationManager;
 use OCP\Share\IManager;
 use OCP\User\Events\UserDeletedEvent;
 use OCP\Util;
@@ -97,7 +95,6 @@ class Application extends App implements IBootstrap {
 	public function boot(IBootContext $context): void {
 		$context->injectFn(Closure::fromCallable([$this, 'registerCommentsEntity']));
 		$context->injectFn(Closure::fromCallable([$this, 'registerCommentsEventHandler']));
-		$context->injectFn(Closure::fromCallable([$this, 'registerNotifications']));
 		$context->injectFn(Closure::fromCallable([$this, 'registerCollaborationResources']));
 
 		$context->injectFn(function (IManager $shareManager) {
@@ -154,10 +151,9 @@ class Application extends App implements IBootstrap {
 		// Event listening for realtime updates via notify_push
 		$context->registerEventListener(SessionCreatedEvent::class, LiveUpdateListener::class);
 		$context->registerEventListener(SessionClosedEvent::class, LiveUpdateListener::class);
-	}
 
-	public function registerNotifications(NotificationManager $notificationManager): void {
-		$notificationManager->registerNotifierService(Notifier::class);
+		$context->registerNotifierService(Notifier::class);
+		$context->registerEventListener(LoadAdditionalScriptsEvent::class, ResourceAdditionalScriptsListener::class);
 	}
 
 	public function registerCommentsEntity(IEventDispatcher $eventDispatcher): void {
@@ -183,16 +179,8 @@ class Application extends App implements IBootstrap {
 		});
 	}
 
-	protected function registerCollaborationResources(IProviderManager $resourceManager, SymfonyAdapter $symfonyAdapter): void {
+	protected function registerCollaborationResources(IProviderManager $resourceManager): void {
 		$resourceManager->registerResourceProvider(ResourceProvider::class);
 		$resourceManager->registerResourceProvider(ResourceProviderCard::class);
-
-		$symfonyAdapter->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', static function () {
-			if (strpos(Server::get(IRequest::class)->getPathInfo(), '/call/') === 0) {
-				// Talk integration has its own entrypoint which already includes collections handling
-				return;
-			}
-			Util::addScript('deck', 'deck-collections');
-		});
 	}
 }
diff --git a/lib/Listeners/ResourceAdditionalScriptsListener.php b/lib/Listeners/ResourceAdditionalScriptsListener.php
new file mode 100644
index 000000000..328d697aa
--- /dev/null
+++ b/lib/Listeners/ResourceAdditionalScriptsListener.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace OCA\Deck\Listeners;
+
+use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\IRequest;
+use OCP\Util;
+
+/** @template-implements IEventListener<Event|LoadAdditionalScriptsEvent> */
+class ResourceAdditionalScriptsListener implements IEventListener {
+	private IRequest $request;
+
+	public function __construct(IRequest $request) {
+		$this->request = $request;
+	}
+
+	public function handle(Event $event): void {
+		if (!$event instanceof LoadAdditionalScriptsEvent) {
+			return;
+		}
+
+		if (strpos($this->request->getPathInfo(), '/call/') === 0) {
+			// Talk integration has its own entrypoint which already includes collections handling
+			return;
+		}
+
+		Util::addScript('deck', 'deck-collections');
+	}
+}