Merge branch 'develop' into vue3

2020-09-19 13:57:38 +09:00
parent d6f9453c38 df71dbb024
commit f661cb765a
13 changed files with 46 additions and 21 deletions
--- a/src/client/default.vue
+++ b/src/client/default.vue
@@ -326,8 +326,7 @@ export default defineComponent({
 		},

 		async onNotification(notification) {
-			const t = this.$store.state.i.includingNotificationTypes;
-			if (!!t && !t.includes(notification.type)) {
+			if (this.$store.state.i.mutingNotificationTypes.includes(notification.type)) {
 				return;
 			}
 			if (document.visibilityState === 'visible') {