From 78ff2641d491c90cf825bc50d3e67d523a1b4927 Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Sat, 13 Feb 2021 21:34:47 +0200 Subject: [PATCH] automod: add user/member to automod context for counters trigger --- .../plugins/Automod/events/runAutomodOnCounterTrigger.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/backend/src/plugins/Automod/events/runAutomodOnCounterTrigger.ts b/backend/src/plugins/Automod/events/runAutomodOnCounterTrigger.ts index a045f3de..50939d80 100644 --- a/backend/src/plugins/Automod/events/runAutomodOnCounterTrigger.ts +++ b/backend/src/plugins/Automod/events/runAutomodOnCounterTrigger.ts @@ -1,8 +1,9 @@ import { GuildPluginData } from "knub"; import { AutomodContext, AutomodPluginType } from "../types"; import { runAutomod } from "../functions/runAutomod"; +import { resolveMember, resolveUser, UnknownUser } from "../../../utils"; -export function runAutomodOnCounterTrigger( +export async function runAutomodOnCounterTrigger( pluginData: GuildPluginData, counterName: string, condition: string, @@ -10,6 +11,10 @@ export function runAutomodOnCounterTrigger( userId: string | null, reverse: boolean, ) { + const user = userId ? await resolveUser(pluginData.client, userId) : undefined; + + const member = (userId && (await resolveMember(pluginData.client, pluginData.guild, userId))) || undefined; + const context: AutomodContext = { timestamp: Date.now(), counterTrigger: { @@ -19,6 +24,8 @@ export function runAutomodOnCounterTrigger( userId, reverse, }, + user: user instanceof UnknownUser ? undefined : user, + member, }; pluginData.state.queue.add(async () => {