From df71dbb0242d763695ea8a33d0b2262c74b050d0 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 18 Sep 2020 22:18:21 +0900
Subject: Resolve #6692 (#6703)

---
 src/client/components/notifications.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/client/components')

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
-- 
cgit v1.2.3-freya