fix: Run ContextChat index in per-user bg jobs

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

Author: marcelklehr

lib/AppInfo/Application.php

@@ -111,13 +111,15 @@ public function register(IRegistrationContext $context): void {
 	 * @throws \Throwable
 	 */
 	public function boot(IBootContext $context): void {
+		// Register with ContextChat
 		if (class_exists(ContentProviderRegisterEvent::class)) {
 			$this->getContainer()->get(ContextChatProvider::class)->register();
 			$eventDispatcher = $this->getContainer()->get(IEventDispatcher::class);
 			$eventDispatcher->addServiceListener(InsertEvent::class, ContextChatProvider::class);
 			$eventDispatcher->addServiceListener(ManipulateEvent::class, ContextChatProvider::class);
 			$eventDispatcher->addServiceListener(BeforeDeleteEvent::class, ContextChatProvider::class);
 		}
+		// Register with Nextcloud Flow
 		$container = $context->getServerContainer();
 		CreateBookmark::register($container->get(IEventDispatcher::class));
 	}

lib/BackgroundJobs/ContextChatIndexJob.php

@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * Copyright (c) 2020-2025. The Nextcloud Bookmarks contributors.
+ *
+ * This file is licensed under the Affero General Public License version 3 or later. See the COPYING file.
+ */
+
+namespace OCA\Bookmarks\BackgroundJobs;
+
+use OCA\Bookmarks\AppInfo\Application;
+use OCA\Bookmarks\Service\BookmarkService;
+use OCA\ContextChat\Public\ContentItem;
+use OCA\ContextChat\Public\ContentManager;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\QueuedJob;
+use OCP\IUserManager;
+
+class ContextChatIndexJob extends QueuedJob {
+
+	public function __construct(
+		ITimeFactory $timeFactory,
+		private BookmarkService $bookmarkService,
+		private ?ContentManager $contentManager,
+		private IUserManager $userManager,
+	) {
+		parent::__construct($timeFactory);
+	}
+
+	protected function run($argument) {
+		if ($this->contentManager === null) {
+			return;
+		}
+		if (!isset($argument['user'])) {
+			return;
+		}
+		$user = $this->userManager->get($argument['user']);
+		if ($user === null) {
+			return;
+		}
+		$items = [];
+		foreach ($this->bookmarkService->getIterator($user->getUID()) as $bookmark) {
+			$items[] = new ContentItem(
+				(string)$bookmark->getId(),
+				$this->getId(),
+				$bookmark->getTitle(),
+				$bookmark->getTextContent(),
+				'Website',
+				new \DateTime('@' . $bookmark->getLastmodified()),
+				[$user->getUID()]
+			);
+			if (count($items) < 25) {
+				continue;
+			}
+			$this->contentManager->submitContent(Application::APP_ID, $items);
+		}
+	}
+}

lib/ContextChat/ContextChatProvider.php

@@ -9,6 +9,7 @@
 namespace OCA\Bookmarks\ContextChat;
 
 use OCA\Bookmarks\AppInfo\Application;
+use OCA\Bookmarks\BackgroundJobs\ContextChatIndexJob;
 use OCA\Bookmarks\Db\TreeMapper;
 use OCA\Bookmarks\Events\BeforeDeleteEvent;
 use OCA\Bookmarks\Events\InsertEvent;
@@ -18,8 +19,8 @@
 use OCA\ContextChat\Public\ContentItem;
 use OCA\ContextChat\Public\ContentManager;
 use OCA\ContextChat\Public\IContentProvider;
+use OCP\BackgroundJob\IJobList;
 use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\IEventDispatcher;
 use OCP\EventDispatcher\IEventListener;
 use OCP\IUser;
 use OCP\IUserManager;
@@ -32,12 +33,15 @@ class ContextChatProvider implements IContentProvider, IEventListener {
 	public function __construct(
 		private BookmarkService $bookmarkService,
 		private IUserManager $userManager,
-		private ContentManager $contentManager,
-		private IEventDispatcher $eventDispatcher,
+		private ?ContentManager $contentManager,
+		private IJobList $jobList,
 	) {
 	}
 
 	public function handle(Event $event): void {
+		if ($this->contentManager === null) {
+			return;
+		}
 		if ($event instanceof ContentProviderRegisterEvent) {
 			$this->register();
 			return;
@@ -47,6 +51,9 @@ public function handle(Event $event): void {
 				return;
 			}
 			$bookmark = $this->bookmarkService->findById($event->getId());
+			if ($bookmark === null) {
+				return;
+			}
 			$item = new ContentItem(
 				(string)$event->getId(),
 				$this->getId(),
@@ -76,17 +83,15 @@ public function register(): void {
 	 * The ID of the provider
 	 *
 	 * @return string
-	 * @since 1.1.0
 	 */
 	public function getId(): string {
 		return 'bookmarks';
 	}
 
 	/**
-	 * The ID of the app making the provider avaialble
+	 * The ID of the app making the provider available
 	 *
 	 * @return string
-	 * @since 1.1.0
 	 */
 	public function getAppId(): string {
 		return Application::APP_ID;
@@ -97,7 +102,6 @@ public function getAppId(): string {
 	 *
 	 * @param string $id
 	 * @return string
-	 * @since 1.1.0
 	 */
 	public function getItemUrl(string $id): string {
 		return $this->bookmarkService->findById(intval($id))?->getUrl() ?? '';
@@ -107,26 +111,10 @@ public function getItemUrl(string $id): string {
 	 * Starts the initial import of content items into content chat
 	 *
 	 * @return void
-	 * @since 1.1.0
 	 */
 	public function triggerInitialImport(): void {
 		$this->userManager->callForAllUsers(function (IUser $user) {
-			$items = [];
-			foreach ($this->bookmarkService->getIterator($user->getUID()) as $bookmark) {
-				$items[] = new ContentItem(
-					(string)$bookmark->getId(),
-					$this->getId(),
-					$bookmark->getTitle(),
-					$bookmark->getTextContent(),
-					'Website',
-					new \DateTime('@' . $bookmark->getLastmodified()),
-					[$user->getUID()]
-				);
-				if (count($items) < 25) {
-					continue;
-				}
-				$this->contentManager->submitContent($this->getAppId(), $items);
-			}
+			$this->jobList->add(ContextChatIndexJob::class, [$user->getUID()]);
 		});
 	}
 }