feat(web_push_notifications): Group notifications (#4388)
This commit is contained in:
parent
3e01a7e677
commit
e67fc997dc
|
@ -1,3 +1,45 @@
|
||||||
|
const MAX_NOTIFICATIONS = 5;
|
||||||
|
const GROUP_TAG = 'tag';
|
||||||
|
|
||||||
|
// Avoid loading intl-messageformat and dealing with locales in the ServiceWorker
|
||||||
|
const formatGroupTitle = (message, count) => message.replace('%{count}', count);
|
||||||
|
|
||||||
|
const notify = options =>
|
||||||
|
self.registration.getNotifications().then(notifications => {
|
||||||
|
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),
|
||||||
|
body: notifications
|
||||||
|
.sort((n1, n2) => n1.timestamp < n2.timestamp)
|
||||||
|
.map(notification => notification.title).join('\n'),
|
||||||
|
badge: '/badge.png',
|
||||||
|
icon: '/android-chrome-192x192.png',
|
||||||
|
tag: GROUP_TAG,
|
||||||
|
data: {
|
||||||
|
url: (new URL('/web/notifications', self.location)).href,
|
||||||
|
count: notifications.length + 1,
|
||||||
|
message: notifications[0].data.message,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
notifications.forEach(notification => notification.close());
|
||||||
|
|
||||||
|
return self.registration.showNotification(group.title, group);
|
||||||
|
} else if (notifications.length === 1 && notifications[0].tag === GROUP_TAG) {
|
||||||
|
// Already grouped, proceed with appending the notification to the group
|
||||||
|
const group = cloneNotification(notifications[0]);
|
||||||
|
|
||||||
|
group.title = formatGroupTitle(group.data.message, group.data.count + 1);
|
||||||
|
group.body = `${options.title}\n${group.body}`;
|
||||||
|
group.data = { ...group.data, count: group.data.count + 1 };
|
||||||
|
|
||||||
|
return self.registration.showNotification(group.title, group);
|
||||||
|
}
|
||||||
|
|
||||||
|
return self.registration.showNotification(options.title, options);
|
||||||
|
});
|
||||||
|
|
||||||
const handlePush = (event) => {
|
const handlePush = (event) => {
|
||||||
const options = event.data.json();
|
const options = event.data.json();
|
||||||
|
|
||||||
|
@ -17,7 +59,7 @@ const handlePush = (event) => {
|
||||||
options.actions = options.data.actions;
|
options.actions = options.data.actions;
|
||||||
}
|
}
|
||||||
|
|
||||||
event.waitUntil(self.registration.showNotification(options.title, options));
|
event.waitUntil(notify(options));
|
||||||
};
|
};
|
||||||
|
|
||||||
const cloneNotification = (notification) => {
|
const cloneNotification = (notification) => {
|
||||||
|
|
|
@ -53,6 +53,7 @@ class Web::PushSubscription < ApplicationRecord
|
||||||
url: url,
|
url: url,
|
||||||
actions: actions,
|
actions: actions,
|
||||||
access_token: access_token,
|
access_token: access_token,
|
||||||
|
message: translate('push_notifications.group.title'), # Do not pass count, will be formatted in the ServiceWorker
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
endpoint: endpoint,
|
endpoint: endpoint,
|
||||||
|
|
|
@ -348,6 +348,8 @@ en:
|
||||||
title: "%{name} favourited your status"
|
title: "%{name} favourited your status"
|
||||||
follow:
|
follow:
|
||||||
title: "%{name} is now following you"
|
title: "%{name} is now following you"
|
||||||
|
group:
|
||||||
|
title: "%{count} notifications"
|
||||||
mention:
|
mention:
|
||||||
action_boost: Boost
|
action_boost: Boost
|
||||||
action_expand: Show more
|
action_expand: Show more
|
||||||
|
|
Reference in a new issue