通知のフィルタ (#5224)

* ✌️

* Deck
This commit is contained in:
syuilo
2019-07-28 04:44:09 +09:00
committed by GitHub
parent 6516bd2ade
commit 4277e53433
6 changed files with 101 additions and 8 deletions

View File

@@ -98,7 +98,7 @@ export default Vue.extend({
return {
inputValue: this.input && this.input.default ? this.input.default : null,
userInputValue: null,
selectedValue: this.select ? this.select.items ? this.select.items[0].value : this.select.groupedItems[0].items[0].value : null,
selectedValue: this.select ? this.select.default ? this.select.default : this.select.items ? this.select.items[0].value : this.select.groupedItems[0].items[0].value : null,
canOk: true,
faTimesCircle, faQuestionCircle
};

View File

@@ -1,8 +1,8 @@
<template>
<x-column :name="name" :column="column" :is-stacked="isStacked">
<x-column :name="name" :column="column" :is-stacked="isStacked" :menu="menu">
<template #header><fa :icon="['far', 'bell']"/>{{ name }}</template>
<x-notifications/>
<x-notifications :type="column.notificationType === 'all' ? null : column.notificationType"/>
</x-column>
</template>
@@ -30,11 +30,46 @@ export default Vue.extend({
}
},
data() {
return {
menu: null,
}
},
computed: {
name(): string {
if (this.column.name) return this.column.name;
return this.$t('@deck.notifications');
}
},
created() {
if (this.column.notificationType == null) {
this.column.notificationType = 'all';
this.$store.commit('updateDeckColumn', this.column);
}
this.menu = [{
icon: 'cog',
text: this.$t('@.notification-type'),
action: () => {
this.$root.dialog({
title: this.$t('@.notification-type'),
type: null,
select: {
items: ['all', 'follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest'].map(x => ({
value: x, text: this.$t('@.notification-types.' + x)
}))
default: this.column.notificationType,
},
showCancelButton: true
}).then(({ canceled, result: type }) => {
if (canceled) return;
this.column.notificationType = type;
this.$store.commit('updateDeckColumn', this.column);
});
}
}];
},
});
</script>

View File

@@ -47,12 +47,22 @@ export default Vue.extend({
}),
],
props: {
type: {
type: String,
required: false
}
},
data() {
return {
connection: null,
pagination: {
endpoint: 'i/notifications',
limit: 20,
params: () => ({
includeTypes: this.type ? [this.type] : undefined
})
}
};
},
@@ -69,6 +79,12 @@ export default Vue.extend({
}
},
watch: {
type() {
this.reload();
}
},
mounted() {
this.connection = this.$root.stream.useSharedConnection('main');
this.connection.on('notification', this.onNotification);