From abdf54e134cb6a07d05793170e4bd7c8c6d2a9e2 Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Thu, 29 Apr 2021 02:29:23 +0300 Subject: [PATCH] Add member to the Automod context for mod action triggers --- .../src/plugins/Automod/events/runAutomodOnModAction.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/src/plugins/Automod/events/runAutomodOnModAction.ts b/backend/src/plugins/Automod/events/runAutomodOnModAction.ts index 59b2b650..5f9437c1 100644 --- a/backend/src/plugins/Automod/events/runAutomodOnModAction.ts +++ b/backend/src/plugins/Automod/events/runAutomodOnModAction.ts @@ -1,7 +1,7 @@ import { GuildPluginData } from "knub"; import { AutomodContext, AutomodPluginType } from "../types"; import { runAutomod } from "../functions/runAutomod"; -import { resolveUser, UnknownUser } from "../../../utils"; +import { resolveMember, resolveUser, UnknownUser } from "../../../utils"; import { ModActionType } from "../../ModActions/types"; export async function runAutomodOnModAction( @@ -11,11 +11,15 @@ export async function runAutomodOnModAction( reason?: string, isAutomodAction: boolean = false, ) { - const user = await resolveUser(pluginData.client, userId); + const [user, member] = await Promise.all([ + resolveUser(pluginData.client, userId), + resolveMember(pluginData.client, pluginData.guild, userId), + ]); const context: AutomodContext = { timestamp: Date.now(), user: user instanceof UnknownUser ? undefined : user, + member: member ?? undefined, modAction: { type: modAction, reason,