diff --git a/backend/src/plugins/ModActions/functions/banUserId.ts b/backend/src/plugins/ModActions/functions/banUserId.ts index 65d6a1ec..369443c7 100644 --- a/backend/src/plugins/ModActions/functions/banUserId.ts +++ b/backend/src/plugins/ModActions/functions/banUserId.ts @@ -46,6 +46,9 @@ export async function banUserId( const banMessage = await renderTemplate(config.ban_message, { guildName: pluginData.guild.name, reason, + moderator: banOptions.caseArgs?.modId + ? stripObjectToScalars(await resolveUser(pluginData.client, banOptions.caseArgs.modId)) + : {}, }); notifyResult = await notifyUser(user, banMessage, contactMethods); diff --git a/backend/src/plugins/ModActions/functions/kickMember.ts b/backend/src/plugins/ModActions/functions/kickMember.ts index 04ae4969..16ac2ecc 100644 --- a/backend/src/plugins/ModActions/functions/kickMember.ts +++ b/backend/src/plugins/ModActions/functions/kickMember.ts @@ -39,6 +39,9 @@ export async function kickMember( const kickMessage = await renderTemplate(config.kick_message, { guildName: pluginData.guild.name, reason, + moderator: kickOptions.caseArgs?.modId + ? stripObjectToScalars(await resolveUser(pluginData.client, kickOptions.caseArgs.modId)) + : {}, }); notifyResult = await notifyUser(member.user, kickMessage, contactMethods); diff --git a/backend/src/plugins/ModActions/functions/warnMember.ts b/backend/src/plugins/ModActions/functions/warnMember.ts index e3e8e3cf..0c07c838 100644 --- a/backend/src/plugins/ModActions/functions/warnMember.ts +++ b/backend/src/plugins/ModActions/functions/warnMember.ts @@ -14,6 +14,7 @@ import { waitForReaction } from "knub/dist/helpers"; import { CasesPlugin } from "../../Cases/CasesPlugin"; import { CaseTypes } from "../../../data/CaseTypes"; import { LogType } from "../../../data/LogType"; +import { renderTemplate } from "../../../templateFormatter"; export async function warnMember( pluginData: GuildPluginData, @@ -25,7 +26,13 @@ export async function warnMember( let notifyResult: UserNotificationResult; if (config.warn_message) { - const warnMessage = config.warn_message.replace("{guildName}", pluginData.guild.name).replace("{reason}", reason); + const warnMessage = await renderTemplate(config.warn_message, { + guildName: pluginData.guild.name, + reason, + moderator: warnOptions.caseArgs?.modId + ? stripObjectToScalars(await resolveUser(pluginData.client, warnOptions.caseArgs.modId)) + : {}, + }); const contactMethods = warnOptions?.contactMethods ? warnOptions.contactMethods : getDefaultContactMethods(pluginData, "warn"); diff --git a/backend/src/plugins/Mutes/functions/muteUser.ts b/backend/src/plugins/Mutes/functions/muteUser.ts index 6daf275d..0dc425d4 100644 --- a/backend/src/plugins/Mutes/functions/muteUser.ts +++ b/backend/src/plugins/Mutes/functions/muteUser.ts @@ -88,6 +88,9 @@ export async function muteUser( guildName: pluginData.guild.name, reason: reason || "None", time: timeUntilUnmute, + moderator: muteOptions.caseArgs?.modId + ? stripObjectToScalars(await resolveUser(pluginData.client, muteOptions.caseArgs.modId)) + : "", })); if (muteMessage && user instanceof User) {