diff --git a/src/data/DefaultLogMessages.json b/src/data/DefaultLogMessages.json index 18ef4021..70ae4407 100644 --- a/src/data/DefaultLogMessages.json +++ b/src/data/DefaultLogMessages.json @@ -5,8 +5,8 @@ "MEMBER_UNMUTE": "🔊 {userMention(member)} was unmuted by {userMention(mod)}", "MEMBER_TIMED_UNMUTE": "🔊 {userMention(member)} was scheduled to be unmuted in **{time}** by {userMention(mod)}", "MEMBER_MUTE_EXPIRED": "🔊 {userMention(member)}'s mute expired", - "MEMBER_KICK": "👢 {userMention(member)} was kicked by {userMention(mod)}", - "MEMBER_BAN": "🔨 {userMention(member)} was banned by {userMention(mod)}", + "MEMBER_KICK": "👢 {userMention(user)} was kicked by {userMention(mod)}", + "MEMBER_BAN": "🔨 {userMention(user)} was banned by {userMention(mod)}", "MEMBER_UNBAN": "🔓 User (`{userId}`) was unbanned by {userMention(mod)}", "MEMBER_FORCEBAN": "🔨 User (`{userId}`) was forcebanned by {userMention(mod)}", "MEMBER_SOFTBAN": "🔨 {userMention(member)} was softbanned by {userMention(mod)}", diff --git a/src/plugins/Logs.ts b/src/plugins/Logs.ts index 6f9dab7a..edb0d913 100644 --- a/src/plugins/Logs.ts +++ b/src/plugins/Logs.ts @@ -263,14 +263,10 @@ export class LogsPlugin extends ZeppelinPlugin { ); const mod = relevantAuditLogEntry ? relevantAuditLogEntry.user : unknownUser; - this.guildLogs.log( - LogType.MEMBER_BAN, - { - user: stripObjectToScalars(user), - mod: stripObjectToScalars(mod), - }, - user.id, - ); + this.guildLogs.log(LogType.MEMBER_BAN, { + mod: stripObjectToScalars(mod), + user: stripObjectToScalars(user), + }, user.id); } @d.event("guildBanRemove") diff --git a/src/plugins/ModActions.ts b/src/plugins/ModActions.ts index a87e0313..0b2987d6 100644 --- a/src/plugins/ModActions.ts +++ b/src/plugins/ModActions.ts @@ -610,7 +610,7 @@ export class ModActionsPlugin extends ZeppelinPlugin { // Log the action this.serverLogs.log(LogType.MEMBER_KICK, { mod: stripObjectToScalars(mod.user), - member: stripObjectToScalars(args.member, ["user"]), + user: stripObjectToScalars(args.member.user), }); } @@ -679,7 +679,7 @@ export class ModActionsPlugin extends ZeppelinPlugin { // Log the action this.serverLogs.log(LogType.MEMBER_BAN, { mod: stripObjectToScalars(mod.user), - member: stripObjectToScalars(args.member, ["user"]), + user: stripObjectToScalars(args.member.user), }); }