cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Convert rich push notifications to plaintext in webapp (#7563) 

* Convert rich push notifications to plaintext in webapp

* Fix code style issues
This commit is contained in:
Eugen Rochko 2018-05-21 03:35:37 +02:00 committed by GitHub
parent 6eb2bc4348
commit 9ada532809
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/mastodon/service_worker/web_push_notifications.js
View File

@ -59,6 +59,9 @@ const fetchFromApi = (path, method, accessToken) => {
const formatMessage = (messageId, locale, values = {}) => const formatMessage = (messageId, locale, values = {}) =>
(new IntlMessageFormat(locales[locale][messageId], locale)).format(values); (new IntlMessageFormat(locales[locale][messageId], locale)).format(values);
const htmlToPlainText = html =>
html.replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n').replace(/<[^>]*>/g, '');
const handlePush = (event) => { const handlePush = (event) => {
const { access_token, notification_id, preferred_locale, title, body, icon } = event.data.json(); const { access_token, notification_id, preferred_locale, title, body, icon } = event.data.json();
@ -76,7 +79,7 @@ const handlePush = (event) => {
const options = {}; const options = {};
options.title = formatMessage(`notification.${notification.type}`, preferred_locale, { name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username }); options.title = formatMessage(`notification.${notification.type}`, preferred_locale, { name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username });
options.body = notification.status && notification.status.content; options.body = notification.status && htmlToPlainText(notification.status.content);
options.icon = notification.account.avatar_static; options.icon = notification.account.avatar_static;
options.timestamp = notification.created_at && new Date(notification.created_at); options.timestamp = notification.created_at && new Date(notification.created_at);
options.tag = notification.id; options.tag = notification.id;
@ -85,10 +88,10 @@ const handlePush = (event) => {
options.data = { access_token, preferred_locale, id: notification.status ? notification.status.id : notification.account.id, url: notification.status ? `/web/statuses/${notification.status.id}` : `/web/accounts/${notification.account.id}` }; options.data = { access_token, preferred_locale, id: notification.status ? notification.status.id : notification.account.id, url: notification.status ? `/web/statuses/${notification.status.id}` : `/web/accounts/${notification.account.id}` };
if (notification.status && notification.status.sensitive) { if (notification.status && notification.status.sensitive) {
options.data.hiddenBody = notification.status.content; options.data.hiddenBody = htmlToPlainText(notification.status.content);
options.data.hiddenImage = notification.status.media_attachments.length > 0 && notification.status.media_attachments[0].preview_url; options.data.hiddenImage = notification.status.media_attachments.length > 0 && notification.status.media_attachments[0].preview_url;
options.body = undefined; options.body = notification.status.spoiler_text;
options.image = undefined; options.image = undefined;
options.actions = [actionExpand(preferred_locale)]; options.actions = [actionExpand(preferred_locale)];
} else if (notification.status) { } else if (notification.status) {