From 908dd99d3d05b30588f40894640cd3175cc3b113 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Sat, 22 May 2021 15:14:43 +0900 Subject: [PATCH] refs #2429 Disable account context in filter settings when sns is pleroma --- src/renderer/components/Settings/Filters/Edit.vue | 5 ++++- src/renderer/components/Settings/Filters/New.vue | 5 ++++- src/renderer/components/Settings/Filters/form.vue | 9 ++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/renderer/components/Settings/Filters/Edit.vue b/src/renderer/components/Settings/Filters/Edit.vue index 06efccd2..36205e2f 100644 --- a/src/renderer/components/Settings/Filters/Edit.vue +++ b/src/renderer/components/Settings/Filters/Edit.vue @@ -1,7 +1,7 @@ @@ -17,6 +17,9 @@ export default { ...mapState('Settings/Filters/Edit', { loading: state => state.loading }), + ...mapState('TimelineSpace', { + sns: state => state.sns + }), filter: { get() { return this.$store.state.Settings.Filters.Edit.filter diff --git a/src/renderer/components/Settings/Filters/New.vue b/src/renderer/components/Settings/Filters/New.vue index 0cb481f1..cf614c77 100644 --- a/src/renderer/components/Settings/Filters/New.vue +++ b/src/renderer/components/Settings/Filters/New.vue @@ -1,7 +1,7 @@ @@ -16,6 +16,9 @@ export default { ...mapState('Settings/Filters/New', { loading: state => state.loading }), + ...mapState('TimelineSpace', { + sns: state => state.sns + }), filter: { get() { return this.$store.state.Settings.Filters.New.filter diff --git a/src/renderer/components/Settings/Filters/form.vue b/src/renderer/components/Settings/Filters/form.vue index 35ec0c11..b6fc58ac 100644 --- a/src/renderer/components/Settings/Filters/form.vue +++ b/src/renderer/components/Settings/Filters/form.vue @@ -15,7 +15,7 @@ - + @@ -42,6 +42,10 @@ export default { }, value: { type: Object + }, + sns: { + type: String, + default: 'mastodon' } }, data() { @@ -144,6 +148,9 @@ export default { }, onSubmit() { this.$emit('onSubmit') + }, + accountDisabled() { + return this.sns === 'pleroma' } } }