diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2020-09-18 22:18:21 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-18 22:18:21 +0900 |
| commit | df71dbb0242d763695ea8a33d0b2262c74b050d0 (patch) | |
| tree | 804eddb878fbe86f181b76cb3ed814f00ef3433f /src/client/components | |
| parent | chore: better error text (diff) | |
| download | sharkey-df71dbb0242d763695ea8a33d0b2262c74b050d0.tar.gz sharkey-df71dbb0242d763695ea8a33d0b2262c74b050d0.tar.bz2 sharkey-df71dbb0242d763695ea8a33d0b2262c74b050d0.zip | |
Resolve #6692 (#6703)
Diffstat (limited to 'src/client/components')
| -rw-r--r-- | src/client/components/notifications.vue | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/client/components/notifications.vue b/src/client/components/notifications.vue index 07dee6354b..0e512e1967 100644 --- a/src/client/components/notifications.vue +++ b/src/client/components/notifications.vue @@ -58,7 +58,7 @@ export default Vue.extend({ computed: { allIncludeTypes() { - return this.includeTypes ?? this.$store.state.i.includingNotificationTypes; + return this.includeTypes ?? notificationTypes.filter(x => !this.$store.state.i.mutingNotificationTypes.includes(x)); } }, @@ -66,7 +66,7 @@ export default Vue.extend({ includeTypes() { this.reload(); }, - '$store.state.i.includingNotificationTypes'() { + '$store.state.i.mutingNotificationTypes'() { if (this.includeTypes === null) { this.reload(); } @@ -84,8 +84,7 @@ export default Vue.extend({ methods: { onNotification(notification) { - // - const isMuted = !!this.allIncludeTypes && !this.allIncludeTypes.includes(notification.type); + const isMuted = !this.allIncludeTypes.includes(notification.type); if (isMuted || document.visibilityState === 'visible') { this.$root.stream.send('readNotification', { id: notification.id |