mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-05 08:43:09 +02:00
merge: check prohibited words when creating notes (!461)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/461 Approved-by: Amelia Yukii <amelia.yukii@shourai.de> Approved-by: Luna <her@mint.lgbt>
This commit is contained in:
commit
5ba9a3f200
2 changed files with 14 additions and 2 deletions
|
@ -462,6 +462,8 @@ fix conflicts and *commit*!
|
|||
*after that commit*, do all the extra work, on the same branch:
|
||||
|
||||
* copy all changes:
|
||||
* from `NoteCreateService.create` to `NoteCreateService.import` (and
|
||||
vice versa if `git` got confused!)
|
||||
* from `NoteCreateService` to `NoteEditService`
|
||||
* from `ApNoteService.createNote` to `ApNoteService.updateNote`
|
||||
* from `endoints/notes/create.ts` to `endoints/notes/edit.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 });
|
||||
|
||||
|
|
Loading…
Reference in a new issue