diff --git a/backend/src/plugins/ModActions/functions/banUserId.ts b/backend/src/plugins/ModActions/functions/banUserId.ts index 913b8e7e..4c973af5 100644 --- a/backend/src/plugins/ModActions/functions/banUserId.ts +++ b/backend/src/plugins/ModActions/functions/banUserId.ts @@ -33,6 +33,7 @@ export async function banUserId( const banMessage = await renderTemplate(config.ban_message, { guildName: pluginData.guild.name, reason, + moderator: banOptions.caseArgs?.modId ? await resolveUser(pluginData.client, banOptions.caseArgs?.modId) : "", }); const contactMethods = banOptions?.contactMethods diff --git a/backend/src/plugins/ModActions/functions/kickMember.ts b/backend/src/plugins/ModActions/functions/kickMember.ts index 497b252f..247fdcae 100644 --- a/backend/src/plugins/ModActions/functions/kickMember.ts +++ b/backend/src/plugins/ModActions/functions/kickMember.ts @@ -26,6 +26,7 @@ export async function kickMember( const kickMessage = await renderTemplate(config.kick_message, { guildName: pluginData.guild.name, reason, + moderator: kickOptions.caseArgs?.modId ? await resolveUser(pluginData.client, kickOptions.caseArgs?.modId) : "", }); const contactMethods = kickOptions?.contactMethods diff --git a/backend/src/plugins/ModActions/functions/warnMember.ts b/backend/src/plugins/ModActions/functions/warnMember.ts index fdaf15c7..6c9c5351 100644 --- a/backend/src/plugins/ModActions/functions/warnMember.ts +++ b/backend/src/plugins/ModActions/functions/warnMember.ts @@ -7,6 +7,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, @@ -16,7 +17,11 @@ export async function warnMember( ): Promise { const config = pluginData.config.get(); - 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 ? 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 168bc198..d3207371 100644 --- a/backend/src/plugins/Mutes/functions/muteUser.ts +++ b/backend/src/plugins/Mutes/functions/muteUser.ts @@ -87,6 +87,7 @@ export async function muteUser( guildName: pluginData.guild.name, reason: reason || "None", time: timeUntilUnmute, + moderator: muteOptions.caseArgs?.modId ? await resolveUser(pluginData.client, muteOptions.caseArgs?.modId) : "", })); if (muteMessage && user instanceof User) {