From 3c8355babf278f5d42962f9d28b6afa74c779d7f Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Sat, 21 Aug 2021 01:41:42 +0300 Subject: [PATCH] Fix logAutomodAction error if Automod context doesn't include a user --- backend/src/plugins/Logs/logFunctions/logAutomodAction.ts | 8 ++++---- backend/src/plugins/Logs/types.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/plugins/Logs/logFunctions/logAutomodAction.ts b/backend/src/plugins/Logs/logFunctions/logAutomodAction.ts index b76194a9..ffa68c03 100644 --- a/backend/src/plugins/Logs/logFunctions/logAutomodAction.ts +++ b/backend/src/plugins/Logs/logFunctions/logAutomodAction.ts @@ -8,7 +8,7 @@ import { userToTemplateSafeUser } from "../../../utils/templateSafeObjects"; interface LogAutomodActionData { rule: string; - user: User; + user?: User | null; users: User[]; actionsTaken: string; matchSummary: string; @@ -20,14 +20,14 @@ export function logAutomodAction(pluginData: GuildPluginData, da LogType.AUTOMOD_ACTION, createTypedTemplateSafeValueContainer({ rule: data.rule, - user: userToTemplateSafeUser(data.user), + user: data.user ? userToTemplateSafeUser(data.user) : null, users: data.users.map(user => userToTemplateSafeUser(user)), actionsTaken: data.actionsTaken, matchSummary: data.matchSummary ?? "", }), { - userId: data.user.id, - bot: data.user.bot, + userId: data.user ? data.user.id : null, + bot: data.user ? data.user.bot : false, }, ); } diff --git a/backend/src/plugins/Logs/types.ts b/backend/src/plugins/Logs/types.ts index 8dd547f2..c952349d 100644 --- a/backend/src/plugins/Logs/types.ts +++ b/backend/src/plugins/Logs/types.ts @@ -458,7 +458,7 @@ export const LogTypeData = z.object({ [LogType.AUTOMOD_ACTION]: z.object({ rule: z.string(), - user: z.instanceof(TemplateSafeUser), + user: z.instanceof(TemplateSafeUser).nullable(), users: z.array(z.instanceof(TemplateSafeUser)), actionsTaken: z.string(), matchSummary: z.string(),