Merge pull request #603 from nextcloud/backport/600/stable20

[stable20] Fix preference name when generating notifications

Author: nickvergessen

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));
@@ -63,7 +63,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());
 		}
 
@@ -117,11 +121,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());
 		}