diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-01-13 14:41:06 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-13 14:41:06 +0100 |
commit | eff1c94744609b432c8dba8a35cd97e9a20ce652 (patch) | |
tree | e173621ead4c940b201d419971c291530d575103 /app/javascript/mastodon | |
parent | 2cfa55185a5fc7d93a160a4e9a4730aae6725b0f (diff) | |
parent | 4fb94c758e3bf2e1c0525e9075c2d5dedc14c666 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon')
-rw-r--r-- | app/javascript/mastodon/service_worker/web_push_notifications.js | 7 |
1 files changed, 5 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 80a4fb329..1ab0dc0fa 100644 --- a/app/javascript/mastodon/service_worker/web_push_notifications.js +++ b/app/javascript/mastodon/service_worker/web_push_notifications.js @@ -92,11 +92,14 @@ const handlePush = (event) => { options.image = notification.status && notification.status.media_attachments.length > 0 && notification.status.media_attachments[0].preview_url || undefined; 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.spoiler_text || notification.status.sensitive) { options.data.hiddenBody = htmlToPlainText(notification.status.content); options.data.hiddenImage = notification.status.media_attachments.length > 0 && notification.status.media_attachments[0].preview_url; - options.body = notification.status.spoiler_text; + if (notification.status.spoiler_text) { + options.body = notification.status.spoiler_text; + } + options.image = undefined; options.actions = [actionExpand(preferred_locale)]; } else if (notification.type === 'mention') { |