summaryrefslogtreecommitdiff
path: root/packages/backend/src/core/NoteCreateService.ts
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-03-05 16:52:05 +0000
committerdakkar <dakkar@thenautilus.net>2024-03-05 16:52:05 +0000
commitff0117a1a5dc29b97e11238f737d308b0aace7b6 (patch)
tree2ed8db3c1634ce0c61d642f8549355fefc894837 /packages/backend/src/core/NoteCreateService.ts
parentmerge: update list of project members (!452) (diff)
downloadsharkey-ff0117a1a5dc29b97e11238f737d308b0aace7b6.tar.gz
sharkey-ff0117a1a5dc29b97e11238f737d308b0aace7b6.tar.bz2
sharkey-ff0117a1a5dc29b97e11238f737d308b0aace7b6.zip
check prohibited words when creating notes
some small differences (between Misskey and us) inside the `create` method made `git` put all the changes inside the `import` method… I thought I had copied them all, but I had missed one, and it's a pretty important one: prohibited words were not being checked!
Diffstat (limited to 'packages/backend/src/core/NoteCreateService.ts')
-rw-r--r--packages/backend/src/core/NoteCreateService.ts14
1 files changed, 12 insertions, 2 deletions
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index b985846f1c..631d7074bd 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -266,6 +266,16 @@ export class NoteCreateService implements OnApplicationShutdown {
}
}
+ const hasProhibitedWords = await this.checkProhibitedWordsContain({
+ cw: data.cw,
+ text: data.text,
+ pollChoices: data.poll?.choices,
+ }, meta.prohibitedWords);
+
+ if (hasProhibitedWords) {
+ throw new IdentifiableError('689ee33f-f97c-479a-ac49-1b9f8140af99', 'Note contains prohibited words');
+ }
+
const inSilencedInstance = this.utilityService.isSilencedHost(meta.silencedHosts, user.host);
if (data.visibility === 'public' && inSilencedInstance && user.host !== null) {
@@ -299,7 +309,7 @@ export class NoteCreateService implements OnApplicationShutdown {
}
// Check blocking
- if (data.renote && data.text == null && data.poll == null && (data.files == null || data.files.length === 0)) {
+ if (data.renote && !this.isQuote(data)) {
if (data.renote.userHost === null) {
if (data.renote.userId !== user.id) {
const blocked = await this.userBlockingService.checkBlocked(data.renote.userId, user.id);
@@ -1018,7 +1028,7 @@ export class NoteCreateService implements OnApplicationShutdown {
removeOnComplete: true,
});
}
-
+
// Pack the note
const noteObj = await this.noteEntityService.pack(note, null, { skipHide: true, withReactionAndUserPairCache: true });