From 2464ddb2703fa2eb9e7e5d976d005361d86cfe5f Mon Sep 17 00:00:00 2001 From: srqc <98553181+2srqc@users.noreply.github.com> Date: Thu, 12 Jan 2023 18:42:18 -0500 Subject: [PATCH] Update logMemberWarn.ts --- .../src/plugins/Logs/logFunctions/logMemberWarn.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts b/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts index 180582b1..f1a0c093 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts @@ -1,14 +1,16 @@ import { GuildPluginData } from "knub"; +import { GuildMember, User } from "discord.js"; import { LogsPluginType } from "../types"; import { LogType } from "../../../data/LogType"; import { log } from "../util/log"; import { createTypedTemplateSafeValueContainer } from "../../../templateFormatter"; -import { GuildMember } from "discord.js"; import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects"; +import { UnknownUser } from "../../../utils"; interface LogMemberWarnData { mod: GuildMember; - member: GuildMember; + member?: GuildMember | null; + user?: User | UnknownUser | null; caseNumber: number; reason: string; } @@ -19,14 +21,14 @@ export function logMemberWarn(pluginData: GuildPluginData, data: LogType.MEMBER_WARN, createTypedTemplateSafeValueContainer({ mod: memberToTemplateSafeMember(data.mod), - member: memberToTemplateSafeMember(data.member), + member: memberToTemplateSafeMember(data.member, data.user), caseNumber: data.caseNumber, reason: data.reason, }), { - userId: data.member.id, - roles: Array.from(data.member.roles.cache.keys()), - bot: data.member.user.bot, + userId: data.member?.id ?? data.user?.id, + roles: data.member ? Array.from(data.member.roles.cache.keys()) : [], + bot: data.member?.user.bot ?? (data.user as User)?.bot, }, ); }