From d8dd68aa16c1b0a537e6622bd6094a4dbeac0504 Mon Sep 17 00:00:00 2001 From: srqc <98553181+2srqc@users.noreply.github.com> Date: Fri, 13 Jan 2023 01:56:01 -0500 Subject: [PATCH] Update logMemberWarn.ts --- .../src/plugins/Logs/logFunctions/logMemberWarn.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts b/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts index f1a0c093..180582b1 100644 --- a/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts +++ b/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts @@ -1,16 +1,14 @@ 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 | null; - user?: User | UnknownUser | null; + member: GuildMember; caseNumber: number; reason: string; } @@ -21,14 +19,14 @@ export function logMemberWarn(pluginData: GuildPluginData, data: LogType.MEMBER_WARN, createTypedTemplateSafeValueContainer({ mod: memberToTemplateSafeMember(data.mod), - member: memberToTemplateSafeMember(data.member, data.user), + member: memberToTemplateSafeMember(data.member), caseNumber: data.caseNumber, reason: data.reason, }), { - 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, + userId: data.member.id, + roles: Array.from(data.member.roles.cache.keys()), + bot: data.member.user.bot, }, ); }