Skip to content

[stable22] Fix preference name when generating notifications #601

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

[stable22] Fix preference name when generating notifications #601

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fbe92f
Fix preference name when generating notifications
nickvergessen Jul 1, 2021
7fc0288
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
Next Next commit
Fix preference name when generating notifications 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot
nickvergessen authored and backportbot[bot] committed Jul 1, 2021
commit 3fbe92f5c44add7475db598a04ed06ae275f75e2
2 changes: 1 addition & 1 deletion lib/NotificationGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down