From 421815f2f273a73faf961d1610cf1b4487d7cdd2 Mon Sep 17 00:00:00 2001
From: Chen Asraf <casraf@pm.me>
Date: Wed, 8 Apr 2026 00:42:00 +0300
Subject: [PATCH] fix: recurring jobs registration

---
 appinfo/info.xml                    |  3 +++
 lib/AppInfo/Application.php         |  2 --
 lib/Service/NotificationService.php | 42 ++++++++++++++++++++++-------
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index b9f62a8..639a215 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -40,6 +40,9 @@ All data is scoped to a house; members only see the houses they belong to.
 		<admin>OCA\Pantry\Settings\Admin</admin>
 		<admin-section>OCA\Pantry\Sections\Admin</admin-section>
 	</settings>
+	<background-jobs>
+		<job>OCA\Pantry\BackgroundJob\ReopenRecurringItemsJob</job>
+	</background-jobs>
 	<navigations>
 		<navigation role="all">
 			<name>Pantry</name>
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index e6f88aa..183ec47 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -7,7 +7,6 @@ declare(strict_types=1);
 
 namespace OCA\Pantry\AppInfo;
 
-use OCA\Pantry\BackgroundJob\ReopenRecurringItemsJob;
 use OCA\Pantry\Notification\Notifier;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
@@ -26,7 +25,6 @@ class Application extends App implements IBootstrap {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		$context->registerTimedJob(ReopenRecurringItemsJob::class);
 		$context->registerNotifierService(Notifier::class);
 	}
 
diff --git a/lib/Service/NotificationService.php b/lib/Service/NotificationService.php
index 8df35d7..6198021 100644
--- a/lib/Service/NotificationService.php
+++ b/lib/Service/NotificationService.php
@@ -12,6 +12,7 @@ use OCA\Pantry\Db\HouseMemberMapper;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\Notification\IManager as INotificationManager;
+use Psr\Log\LoggerInterface;
 
 class NotificationService {
 	public const PREF_NOTIFY_PHOTO = 'notify_photo';
@@ -28,6 +29,7 @@ class NotificationService {
 		private PrefsService $prefs,
 		private IURLGenerator $urlGenerator,
 		private IUserManager $userManager,
+		private LoggerInterface $logger,
 	) {
 	}
 
@@ -150,6 +152,7 @@ class NotificationService {
 	 */
 	private function sendToHouseMembers(int $houseId, string $authorUid, string $subject, string $objectType, string $prefKey, callable $paramsFn): void {
 		$members = $this->memberMapper->findByHouse($houseId);
+
 		$recipients = [];
 		foreach ($members as $member) {
 			$uid = $member->getUserId();
@@ -172,17 +175,36 @@ class NotificationService {
 			$this->urlGenerator->imagePath(Application::APP_ID, 'app-dark.svg')
 		);
 
-		foreach ($recipients as $uid) {
-			$notification = $this->notificationManager->createNotification();
-			$notification->setApp(Application::APP_ID)
-				->setUser($uid)
-				->setDateTime(new \DateTime())
-				->setObject($objectType, (string)($params['noteId'] ?? $params['houseId']))
-				->setSubject($subject, $params)
-				->setLink($link)
-				->setIcon($iconUrl);
+		$objectId = (string)($params['noteId'] ?? $params['houseId']);
 
-			$this->notificationManager->notify($notification);
+		foreach ($recipients as $uid) {
+			try {
+				// Dismiss any previous notification for the same object so edits
+				// don't pile up — only the latest notification is shown.
+				$stale = $this->notificationManager->createNotification();
+				$stale->setApp(Application::APP_ID)
+					->setUser($uid)
+					->setObject($objectType, $objectId);
+				$this->notificationManager->markProcessed($stale);
+
+				$notification = $this->notificationManager->createNotification();
+				$notification->setApp(Application::APP_ID)
+					->setUser($uid)
+					->setDateTime(new \DateTime())
+					->setObject($objectType, $objectId)
+					->setSubject($subject, $params)
+					->setLink($link)
+					->setIcon($iconUrl);
+
+				$this->notificationManager->notify($notification);
+			} catch (\Throwable $e) {
+				$this->logger->error('Pantry notify: failed to send {subject} to {uid}: {msg}', [
+					'subject' => $subject,
+					'uid' => $uid,
+					'msg' => $e->getMessage(),
+					'exception' => $e,
+				]);
+			}
 		}
 	}