summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2020-02-21 00:28:45 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2020-02-21 00:28:45 +0900
commitc7c08b7511f8ee86ed3d35918356d54e3ad5e8f9 (patch)
tree08c55177eb9cfd0e8a8b3c5ac466d7861564bff3 /src/client
parentMerge branch 'develop' of https://github.com/syuilo/misskey into develop (diff)
downloadmisskey-c7c08b7511f8ee86ed3d35918356d54e3ad5e8f9.tar.gz
misskey-c7c08b7511f8ee86ed3d35918356d54e3ad5e8f9.tar.bz2
misskey-c7c08b7511f8ee86ed3d35918356d54e3ad5e8f9.zip
Resolve #6043
Diffstat (limited to 'src/client')
-rw-r--r--src/client/pages/my-antennas/index.antenna.vue12
-rw-r--r--src/client/pages/my-antennas/index.vue1
2 files changed, 11 insertions, 2 deletions
diff --git a/src/client/pages/my-antennas/index.antenna.vue b/src/client/pages/my-antennas/index.antenna.vue
index d0259a55c6..2a9aebbcbf 100644
--- a/src/client/pages/my-antennas/index.antenna.vue
+++ b/src/client/pages/my-antennas/index.antenna.vue
@@ -30,6 +30,10 @@
<span>{{ $t('antennaKeywords') }}</span>
<template #desc>{{ $t('antennaKeywordsDescription') }}</template>
</mk-textarea>
+ <mk-textarea v-model="excludeKeywords">
+ <span>{{ $t('antennaExcludeKeywords') }}</span>
+ <template #desc>{{ $t('antennaKeywordsDescription') }}</template>
+ </mk-textarea>
<mk-switch v-model="caseSensitive">{{ $t('caseSensitive') }}</mk-switch>
<mk-switch v-model="withFile">{{ $t('withFileAntenna') }}</mk-switch>
<mk-switch v-model="notify">{{ $t('notifyAntenna') }}</mk-switch>
@@ -75,6 +79,7 @@ export default Vue.extend({
userGroupId: null,
users: '',
keywords: '',
+ excludeKeywords: '',
caseSensitive: false,
withReplies: false,
withFile: false,
@@ -107,6 +112,7 @@ export default Vue.extend({
this.userGroupId = this.antenna.userGroupId;
this.users = this.antenna.users.join('\n');
this.keywords = this.antenna.keywords.map(x => x.join(' ')).join('\n');
+ this.excludeKeywords = this.antenna.excludeKeywords.map(x => x.join(' ')).join('\n');
this.caseSensitive = this.antenna.caseSensitive;
this.withReplies = this.antenna.withReplies;
this.withFile = this.antenna.withFile;
@@ -126,7 +132,8 @@ export default Vue.extend({
notify: this.notify,
caseSensitive: this.caseSensitive,
users: this.users.trim().split('\n').map(x => x.trim()),
- keywords: this.keywords.trim().split('\n').map(x => x.trim().split(' '))
+ keywords: this.keywords.trim().split('\n').map(x => x.trim().split(' ')),
+ excludeKeywords: this.excludeKeywords.trim().split('\n').map(x => x.trim().split(' ')),
});
this.$emit('created');
} else {
@@ -141,7 +148,8 @@ export default Vue.extend({
notify: this.notify,
caseSensitive: this.caseSensitive,
users: this.users.trim().split('\n').map(x => x.trim()),
- keywords: this.keywords.trim().split('\n').map(x => x.trim().split(' '))
+ keywords: this.keywords.trim().split('\n').map(x => x.trim().split(' ')),
+ excludeKeywords: this.excludeKeywords.trim().split('\n').map(x => x.trim().split(' ')),
});
}
diff --git a/src/client/pages/my-antennas/index.vue b/src/client/pages/my-antennas/index.vue
index 8ac70ac378..a5f6076ebf 100644
--- a/src/client/pages/my-antennas/index.vue
+++ b/src/client/pages/my-antennas/index.vue
@@ -53,6 +53,7 @@ export default Vue.extend({
userGroupId: null,
users: [],
keywords: [],
+ excludeKeywords: [],
withReplies: false,
caseSensitive: false,
withFile: false,