parent
e12369ac13
commit
32c5c43b6d
|
@ -263,10 +263,8 @@ export class NoteCreateService implements OnApplicationShutdown {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!user.host) {
|
if (this.utilityService.isKeyWordIncluded(data.cw ?? data.text ?? '', meta.prohibitedWords)) {
|
||||||
if (this.utilityService.isKeyWordIncluded(data.cw ?? data.text ?? '', meta.prohibitedWords)) {
|
throw new NoteCreateService.ContainsProhibitedWordsError();
|
||||||
throw new NoteCreateService.ContainsProhibitedWordsError();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const inSilencedInstance = this.utilityService.isSilencedHost(meta.silencedHosts, user.host);
|
const inSilencedInstance = this.utilityService.isSilencedHost(meta.silencedHosts, user.host);
|
||||||
|
|
|
@ -663,7 +663,7 @@ describe('Note', () => {
|
||||||
assert.strictEqual(note2.body.error.code, 'CONTAINS_PROHIBITED_WORDS');
|
assert.strictEqual(note2.body.error.code, 'CONTAINS_PROHIBITED_WORDS');
|
||||||
});
|
});
|
||||||
|
|
||||||
test('禁止ワードを含んでいてもリモートノートはエラーにならない', async () => {
|
test('禁止ワードを含んでるリモートノートもエラーになる', async () => {
|
||||||
const prohibited = await api('admin/update-meta', {
|
const prohibited = await api('admin/update-meta', {
|
||||||
prohibitedWords: [
|
prohibitedWords: [
|
||||||
'test',
|
'test',
|
||||||
|
@ -678,7 +678,7 @@ describe('Note', () => {
|
||||||
text: 'hogetesthuge',
|
text: 'hogetesthuge',
|
||||||
}, tom);
|
}, tom);
|
||||||
|
|
||||||
assert.strictEqual(note1.status, 200);
|
assert.strictEqual(note1.status, 400);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -100,6 +100,7 @@ describe('ActivityPub', () => {
|
||||||
perRemoteUserUserTimelineCacheMax: 100,
|
perRemoteUserUserTimelineCacheMax: 100,
|
||||||
blockedHosts: [] as string[],
|
blockedHosts: [] as string[],
|
||||||
sensitiveWords: [] as string[],
|
sensitiveWords: [] as string[],
|
||||||
|
prohibitedWords: [] as string[],
|
||||||
} as MiMeta;
|
} as MiMeta;
|
||||||
let meta = metaInitial;
|
let meta = metaInitial;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue