Skip to content

[stable21] Fix preference name when generating notifications #602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Jul 2, 2021
Merged

[stable21] Fix preference name when generating notifications #602

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d312f18
Fix preference name when generating notifications
nickvergessen Jul 1, 2021
547bee4
Correctly set the subject, message and icon
nickvergessen Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Correctly set the subject, message and icon 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot
nickvergessen authored and backportbot[bot] committed Jul 1, 2021
commit 547bee4ad5b8308ec774df851544b65e98addc1e
14 changes: 11 additions & 3 deletions lib/NotificationGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down Expand Up @@ -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());
}

Expand Down