chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 4 Wiki Activity

Unescape HTML entities in rich web push notifications in web UI (#7569)

Browse source
This commit is contained in:
Eugen Rochko 2018-05-21 16:00:56 +02:00 committed by GitHub
parent 41b2cfe5b8
commit e583f110c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
import IntlMessageFormat from 'intl-messageformat'; import IntlMessageFormat from 'intl-messageformat';
import locales from './web_push_locales'; import locales from './web_push_locales';
import { unescape } from 'lodash';
const MAX_NOTIFICATIONS = 5; const MAX_NOTIFICATIONS = 5;
const GROUP_TAG = 'tag'; const GROUP_TAG = 'tag';
@ -60,7 +61,7 @@ const formatMessage = (messageId, locale, values = {}) =>
(new IntlMessageFormat(locales[locale][messageId], locale)).format(values); (new IntlMessageFormat(locales[locale][messageId], locale)).format(values);
const htmlToPlainText = html => const htmlToPlainText = html =>
html.replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n').replace(/<[^>]*>/g, ''); unescape(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();