summaryrefslogtreecommitdiff
path: root/packages/backend/src/core/NoteCreateService.ts
diff options
context:
space:
mode:
authorMarie <marie@kaifa.ch>2024-02-19 19:05:15 +0000
committerMarie <marie@kaifa.ch>2024-02-19 19:05:15 +0000
commit4246b6434dd1daf4e16a873bee211ce5d43fc4fd (patch)
treee5c680875320237716f8b77381fb14a06f3c9e98 /packages/backend/src/core/NoteCreateService.ts
parentmerge: Bridged error message for when you try search for a post and it fails ... (diff)
parentfix: icons and update urls (diff)
downloadsharkey-4246b6434dd1daf4e16a873bee211ce5d43fc4fd.tar.gz
sharkey-4246b6434dd1daf4e16a873bee211ce5d43fc4fd.tar.bz2
sharkey-4246b6434dd1daf4e16a873bee211ce5d43fc4fd.zip
merge: Merge upstream from 19th Feburary (!428)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/428 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Diffstat (limited to 'packages/backend/src/core/NoteCreateService.ts')
-rw-r--r--packages/backend/src/core/NoteCreateService.ts8
1 files changed, 3 insertions, 5 deletions
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 0d032011b6..5a5930a8f6 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -1,5 +1,5 @@
/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
+ * SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
@@ -438,10 +438,8 @@ export class NoteCreateService implements OnApplicationShutdown {
}
}
- if (!user.host) {
- if (this.utilityService.isKeyWordIncluded(data.cw ?? data.text ?? '', meta.prohibitedWords)) {
- throw new NoteCreateService.ContainsProhibitedWordsError();
- }
+ if (this.utilityService.isKeyWordIncluded(data.cw ?? data.text ?? '', meta.prohibitedWords)) {
+ throw new NoteCreateService.ContainsProhibitedWordsError();
}
const inSilencedInstance = this.utilityService.isSilencedHost(meta.silencedHosts, user.host);