enh: pass params in subject

Signed-off-by: Christopher Ng <chrng8@gmail.com>
nextcloud · Aug 9, 2023 · 86db2d7 · 86db2d7
1 parent 38e4ba2
commit 86db2d7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/apps/files_reminders/lib/Notification/Notifier.php b/apps/files_reminders/lib/Notification/Notifier.php
@@ -28,10 +28,8 @@
 
 use InvalidArgumentException;
 use OCA\FilesReminders\AppInfo\Application;
-use OCA\FilesReminders\Exception\NodeNotFoundException;
-use OCA\FilesReminders\Service\ReminderService;
-use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\Files\FileInfo;
+use OCP\Files\IRootFolder;
 use OCP\IURLGenerator;
 use OCP\L10N\IFactory;
 use OCP\Notification\AlreadyProcessedException;
@@ -43,7 +41,7 @@ class Notifier implements INotifier {
 	public function __construct(
 		protected IFactory $l10nFactory,
 		protected IURLGenerator $urlGenerator,
-		protected ReminderService $reminderService,
+		protected IRootFolder $root,
 	) {}
 
 	public function getID(): string {
@@ -67,18 +65,15 @@ public function prepare(INotification $notification, string $languageCode): INot
 
 		switch ($notification->getSubject()) {
 			case 'reminder-due':
-				$reminderId = (int)$notification->getObjectId();
-				try {
-					$reminder = $this->reminderService->get($reminderId);
-				} catch (DoesNotExistException $e) {
-					throw new AlreadyProcessedException();
-				}
+				$params = $notification->getSubjectParameters();
+				$fileId = $params['fileId'];
 
-				try {
-					$node = $reminder->getNode();
-				} catch (NodeNotFoundException $e) {
+				$nodes = $this->root->getUserFolder($notification->getUser())->getById($fileId);
+				if (empty($nodes)) {
 					throw new InvalidArgumentException();
 				}
+				$node = reset($nodes);
+
 				$path = rtrim($node->getPath(), '/');
 				if (strpos($path, '/' . $notification->getUser() . '/files/') === 0) {
 					// Remove /user/files/...

diff --git a/apps/files_reminders/lib/Service/ReminderService.php b/apps/files_reminders/lib/Service/ReminderService.php
@@ -155,7 +155,9 @@ public function send(Reminder $reminder): void {
 			->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('files', 'folder.svg')))
 			->setUser($user->getUID())
 			->setObject('reminder', (string)$reminder->getId())
-			->setSubject('reminder-due')
+			->setSubject('reminder-due', [
+				'fileId' => $reminder->getFileId(),
+			])
 			->setDateTime($reminder->getDueDate());
 
 		try {