sim1222/nca10.net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve #6692 (#6703)

Browse Source
This commit is contained in:
syuilo
2020-09-18 22:18:21 +09:00
committed by GitHub
parent f104e9b6cc
commit df71dbb024
9 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/components/notifications.vue
View File

@ -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