From 2e5224124f0fe960f06476f4362bcd87f168233d Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Fri, 2 Apr 2021 19:50:37 +0300 Subject: [PATCH] Improve antiraid trigger automod logs --- .../plugins/Automod/events/runAutomodOnAntiraidLevel.ts | 8 +++++++- backend/src/plugins/Automod/functions/setAntiraidLevel.ts | 2 +- backend/src/plugins/Automod/triggers/antiraidLevel.ts | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/backend/src/plugins/Automod/events/runAutomodOnAntiraidLevel.ts b/backend/src/plugins/Automod/events/runAutomodOnAntiraidLevel.ts index 370d6f23..f36e1067 100644 --- a/backend/src/plugins/Automod/events/runAutomodOnAntiraidLevel.ts +++ b/backend/src/plugins/Automod/events/runAutomodOnAntiraidLevel.ts @@ -1,13 +1,19 @@ import { GuildPluginData } from "knub"; import { AutomodContext, AutomodPluginType } from "../types"; import { runAutomod } from "../functions/runAutomod"; +import { User } from "eris"; -export async function runAutomodOnAntiraidLevel(pluginData: GuildPluginData, level: string | null) { +export async function runAutomodOnAntiraidLevel( + pluginData: GuildPluginData, + level: string | null, + user?: User, +) { const context: AutomodContext = { timestamp: Date.now(), antiraid: { level, }, + user, }; pluginData.state.queue.add(async () => { diff --git a/backend/src/plugins/Automod/functions/setAntiraidLevel.ts b/backend/src/plugins/Automod/functions/setAntiraidLevel.ts index cac98286..eb72c3ec 100644 --- a/backend/src/plugins/Automod/functions/setAntiraidLevel.ts +++ b/backend/src/plugins/Automod/functions/setAntiraidLevel.ts @@ -14,7 +14,7 @@ export async function setAntiraidLevel( pluginData.state.cachedAntiraidLevel = newLevel; await pluginData.state.antiraidLevels.set(newLevel); - runAutomodOnAntiraidLevel(pluginData, newLevel); + runAutomodOnAntiraidLevel(pluginData, newLevel, user); const logs = pluginData.getPlugin(LogsPlugin); diff --git a/backend/src/plugins/Automod/triggers/antiraidLevel.ts b/backend/src/plugins/Automod/triggers/antiraidLevel.ts index 15a61dbd..98398811 100644 --- a/backend/src/plugins/Automod/triggers/antiraidLevel.ts +++ b/backend/src/plugins/Automod/triggers/antiraidLevel.ts @@ -27,6 +27,7 @@ export const AntiraidLevelTrigger = automodTrigger() }, renderMatchInformation({ matchResult, pluginData, contexts, triggerConfig }) { - return `Antiraid level was set to ...`; + const newLevel = contexts[0].antiraid!.level; + return newLevel ? `Antiraid level was set to ${newLevel}` : `Antiraid was turned off`; }, });