diff options
| author | Marie <marie@kaifa.ch> | 2024-02-23 13:42:52 +0100 |
|---|---|---|
| committer | Marie <marie@kaifa.ch> | 2024-02-23 13:42:52 +0100 |
| commit | 15d231901143018147432af4a8c0e26fd8f0cadf (patch) | |
| tree | 1e6d5c932d6750ba81e931bf759e559d1392ab4f /packages/backend/src/core/NoteCreateService.ts | |
| parent | merge: Reactions not working on child notes in detailed view (!438) (diff) | |
| parent | enhance?: DeleteAccountServiceでユーザーを削除する際にuserChangeD... (diff) | |
| download | sharkey-15d231901143018147432af4a8c0e26fd8f0cadf.tar.gz sharkey-15d231901143018147432af4a8c0e26fd8f0cadf.tar.bz2 sharkey-15d231901143018147432af4a8c0e26fd8f0cadf.zip | |
merge: upstream
Diffstat (limited to 'packages/backend/src/core/NoteCreateService.ts')
| -rw-r--r-- | packages/backend/src/core/NoteCreateService.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts index 5a5930a8f6..35a3305335 100644 --- a/packages/backend/src/core/NoteCreateService.ts +++ b/packages/backend/src/core/NoteCreateService.ts @@ -61,6 +61,8 @@ import { CacheService } from '@/core/CacheService.js'; import { isReply } from '@/misc/is-reply.js'; import { trackPromise } from '@/misc/promise-tracker.js'; import { isUserRelated } from '@/misc/is-user-related.js'; +import { isNotNull } from '@/misc/is-not-null.js'; +import { IdentifiableError } from '@/misc/identifiable-error.js'; type NotificationType = 'reply' | 'renote' | 'quote' | 'mention'; @@ -153,8 +155,6 @@ type Option = { export class NoteCreateService implements OnApplicationShutdown { #shutdownController = new AbortController(); - public static ContainsProhibitedWordsError = class extends Error {}; - constructor( @Inject(DI.config) private config: Config, @@ -439,7 +439,7 @@ export class NoteCreateService implements OnApplicationShutdown { } if (this.utilityService.isKeyWordIncluded(data.cw ?? data.text ?? '', meta.prohibitedWords)) { - throw new NoteCreateService.ContainsProhibitedWordsError(); + throw new IdentifiableError('689ee33f-f97c-479a-ac49-1b9f8140af99', 'Note contains prohibited words'); } const inSilencedInstance = this.utilityService.isSilencedHost(meta.silencedHosts, user.host); @@ -1141,7 +1141,7 @@ export class NoteCreateService implements OnApplicationShutdown { const mentions = extractMentions(tokens); let mentionedUsers = (await Promise.all(mentions.map(m => this.remoteUserResolveService.resolveUser(m.username, m.host ?? user.host).catch(() => null), - ))).filter(x => x != null) as MiUser[]; + ))).filter(isNotNull); // Drop duplicate users mentionedUsers = mentionedUsers.filter((u, i, self) => |