aboutsummaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2020-05-25 23:38:31 +0300
committerHenry Jameson <me@hjkos.com>2020-05-25 23:38:31 +0300
commitb5c1d074f83d08473a19a3885f6ff5eeb95274e5 (patch)
treef505bbf5e1c57fcccaba7efbdaf3b2ed85f516a7 /src/modules
parentcf3fbdd61096d3e51c09179474f383f8351a33cb (diff)
fix reprööted posts not being muted properly. fix muted posts making
desktop notifications
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/statuses.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index cd8c1dba..f73fde25 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -15,7 +15,7 @@ import {
import { set } from 'vue'
import { isStatusNotification } from '../services/notification_utils/notification_utils.js'
import apiService from '../services/api/api.service.js'
-// import parse from '../services/status_parser/status_parser.js'
+import { muteWordHits } from '../services/status_parser/status_parser.js'
const emptyTl = (userId = 0) => ({
statuses: [],
@@ -381,7 +381,13 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
notifObj.image = status.attachments[0].url
}
- if (!notification.seen && !state.notifications.desktopNotificationSilence && visibleNotificationTypes.includes(notification.type)) {
+ if (
+ !notification.seen &&
+ !state.notifications.desktopNotificationSilence &&
+ visibleNotificationTypes.includes(notification.type) &&
+ !status.muted &&
+ muteWordHits(status, rootGetters.mergedConfig.muteWords).length === 0
+ ) {
let desktopNotification = new window.Notification(title, notifObj)
// Chrome is known for not closing notifications automatically
// according to MDN, anyway.