diff options
| -rw-r--r-- | app/javascript/mastodon/service_worker/web_push_notifications.js | 4 | ||||
| -rw-r--r-- | app/models/web/push_subscription.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/mastodon/service_worker/web_push_notifications.js b/app/javascript/mastodon/service_worker/web_push_notifications.js index 64c457889..acb85f626 100644 --- a/app/javascript/mastodon/service_worker/web_push_notifications.js +++ b/app/javascript/mastodon/service_worker/web_push_notifications.js @@ -9,7 +9,7 @@ const notify = options => if (notifications.length === MAX_NOTIFICATIONS) { // Reached the maximum number of notifications, proceed with grouping const group = { - title: formatGroupTitle(notifications[0].data.message, notifications.length + 1), + title: formatGroupTitle(options.data.message, notifications.length + 1), body: notifications .sort((n1, n2) => n1.timestamp < n2.timestamp) .map(notification => notification.title).join('\n'), @@ -19,7 +19,7 @@ const notify = options => data: { url: (new URL('/web/notifications', self.location)).href, count: notifications.length + 1, - message: notifications[0].data.message, + message: options.data.message, }, }; diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb index 45ce3298a..e76f61278 100644 --- a/app/models/web/push_subscription.rb +++ b/app/models/web/push_subscription.rb @@ -161,6 +161,7 @@ class Web::PushSubscription < ApplicationRecord content: translate('push_notifications.subscribed.body'), actions: [], url: web_url('notifications'), + message: translate('push_notifications.group.title'), # Do not pass count, will be formatted in the ServiceWorker } ), endpoint: endpoint, |