summaryrefslogtreecommitdiff
path: root/src/misc
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/misc
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/misc')
-rw-r--r--src/misc/check-hit-antenna.ts13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/misc/check-hit-antenna.ts b/src/misc/check-hit-antenna.ts
index c229a07ebe..0d72c3f340 100644
--- a/src/misc/check-hit-antenna.ts
+++ b/src/misc/check-hit-antenna.ts
@@ -52,6 +52,19 @@ export async function checkHitAntenna(antenna: Antenna, note: Note, noteUser: Us
if (!matched) return false;
}
+ if (antenna.excludeKeywords.length > 0) {
+ if (note.text == null) return false;
+
+ const matched = antenna.excludeKeywords.some(keywords =>
+ keywords.every(keyword =>
+ antenna.caseSensitive
+ ? note.text!.includes(keyword)
+ : note.text!.toLowerCase().includes(keyword.toLowerCase())
+ ));
+
+ if (matched) return false;
+ }
+
if (antenna.withFile) {
if (note.fileIds.length === 0) return false;
}