From 69a6bf808fbbc2f04a319cf97a041f8ac8a4f831 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 1 Jul 2021 13:59:44 +0200 Subject: [PATCH 1/2] Fix preference name when generating notifications Signed-off-by: Joas Schilling --- lib/NotificationGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/NotificationGenerator.php b/lib/NotificationGenerator.php index 5c5fd941c..10e7fe438 100644 --- a/lib/NotificationGenerator.php +++ b/lib/NotificationGenerator.php @@ -47,7 +47,7 @@ public function __construct(Data $data, ActivityManager $activityManager, Notifi public function sendNotificationForEvent(IEvent $event, int $activityId) { $selfAction = $event->getAffectedUser() === $event->getAuthor(); - $notifySetting = $this->userSettings->getUserSetting($event->getAffectedUser(), 'notify', $event->getType()); + $notifySetting = $this->userSettings->getUserSetting($event->getAffectedUser(), 'notification', $event->getType()); if ($notifySetting && !$selfAction && $event->getGenerateNotification()) { $this->notificationManager->notify($this->getNotificationForEvent($event, $activityId)); From bac0fba154f11464c7cd8cb195799c3dad8bba62 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 1 Jul 2021 14:00:04 +0200 Subject: [PATCH 2/2] Correctly set the subject, message and icon Signed-off-by: Joas Schilling --- lib/NotificationGenerator.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/NotificationGenerator.php b/lib/NotificationGenerator.php index 10e7fe438..dc1f971d7 100644 --- a/lib/NotificationGenerator.php +++ b/lib/NotificationGenerator.php @@ -62,7 +62,11 @@ private function getNotificationForEvent(IEvent $event, int $activityId): INotif $notification->setObject('activity_notification', (string)$activityId); $notification->setSubject($event->getSubject()); - if ($notification->getRichMessage()) { + if ($event->getRichSubject()) { + $notification->setRichSubject($event->getRichSubject(), $event->getRichSubjectParameters()); + } + + if ($event->getRichMessage()) { $notification->setRichMessage($event->getRichMessage(), $event->getRichMessageParameters()); } @@ -116,11 +120,15 @@ private function getDisplayNotificationForEvent(IEvent $event, int $activityId): $notification->setRichSubject($event->getRichSubject(), $event->getRichSubjectParameters()); $notification->setParsedSubject($event->getParsedSubject()); - if ($notification->getRichMessage()) { + if ($event->getIcon()) { + $notification->setIcon($event->getIcon()); + } + + if ($event->getRichMessage()) { $notification->setRichMessage($event->getRichMessage(), $event->getRichMessageParameters()); } - if ($notification->getParsedMessage()) { + if ($event->getParsedMessage()) { $notification->setParsedSubject($event->getParsedSubject()); }