specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

fix(web_push_notifications): Send message with welcome notifications (#4471)

Browse source 
* fix(web_push_notifications): Send grouping title in welcome notification

* fix(web_push_notifications): Read message from last notification
This commit is contained in:
Sorin Davidoi 2017-08-01 06:00:13 +02:00 committed by Eugen Rochko
parent e05606c8d0
commit d4c4820c03
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/service_worker/web_push_notifications.js
View file

@ -9,7 +9,7 @@ const notify = options =>
if (notifications.length === MAX_NOTIFICATIONS) { if (notifications.length === MAX_NOTIFICATIONS) {
// Reached the maximum number of notifications, proceed with grouping // Reached the maximum number of notifications, proceed with grouping
const group = { const group = {
title: formatGroupTitle(notifications[0].data.message, notifications.length + 1), title: formatGroupTitle(options.data.message, notifications.length + 1),
body: notifications body: notifications
.sort((n1, n2) => n1.timestamp < n2.timestamp) .sort((n1, n2) => n1.timestamp < n2.timestamp)
.map(notification => notification.title).join('\n'), .map(notification => notification.title).join('\n'),
@ -19,7 +19,7 @@ const notify = options =>
data: { data: {
url: (new URL('/web/notifications', self.location)).href, url: (new URL('/web/notifications', self.location)).href,
count: notifications.length + 1, count: notifications.length + 1,
message: notifications[0].data.message, message: options.data.message,
}, },
}; };

1
app/models/web/push_subscription.rb
View file

@ -161,6 +161,7 @@ class Web::PushSubscription < ApplicationRecord
content: translate('push_notifications.subscribed.body'), content: translate('push_notifications.subscribed.body'),
actions: [], actions: [],
url: web_url('notifications'), url: web_url('notifications'),
message: translate('push_notifications.group.title'), # Do not pass count, will be formatted in the ServiceWorker
} }
), ),
endpoint: endpoint, endpoint: endpoint,