From 83e5ee549472591b782c36d2321aceec0547cf18 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 26 May 2020 00:22:15 +0300 Subject: [PATCH] fix non-mention notifs --- src/modules/statuses.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/modules/statuses.js b/src/modules/statuses.js index f73fde25..c809cf1c 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -381,13 +381,18 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot notifObj.image = status.attachments[0].url } - if ( - !notification.seen && - !state.notifications.desktopNotificationSilence && - visibleNotificationTypes.includes(notification.type) && - !status.muted && - muteWordHits(status, rootGetters.mergedConfig.muteWords).length === 0 - ) { + const reasonsToMuteNotif = ( + notification.seen || + state.notifications.desktopNotificationSilence || + !visibleNotificationTypes.includes(notification.type) || + ( + status && ( + status.muted || + muteWordHits(status, rootGetters.mergedConfig.muteWords).length === 0 + ) + ) + ) + if (!reasonsToMuteNotif) { let desktopNotification = new window.Notification(title, notifObj) // Chrome is known for not closing notifications automatically // according to MDN, anyway.