From b8e0f26bf0b7bff50de2ac44d01b86971510a342 Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Fri, 3 May 2019 08:08:21 +0300 Subject: [PATCH] Fix missing pings/mentions in logs --- src/plugins/Logs.ts | 20 ++++++++++---------- src/plugins/ModActions.ts | 4 ++-- src/plugins/Mutes.ts | 4 ++-- src/plugins/Persist.ts | 2 +- src/plugins/Spam.ts | 4 ++-- src/plugins/Utility.ts | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/plugins/Logs.ts b/src/plugins/Logs.ts index 0404127b..00dad00b 100644 --- a/src/plugins/Logs.ts +++ b/src/plugins/Logs.ts @@ -173,10 +173,10 @@ export class LogsPlugin extends ZeppelinPlugin { ...data, userMention: async userOrMember => { if (!userOrMember) return ""; - + let user; let member; - + if (userOrMember.user) { member = userOrMember; user = member.user; @@ -185,7 +185,7 @@ export class LogsPlugin extends ZeppelinPlugin { member = this.guild.members.get(user.id) || { id: user.id, user }; } - const memberConfig = member.guild && this.getMatchingConfig({ member, userId: user.id }) || ({} as any); + const memberConfig = this.getMatchingConfig({ member, userId: user.id }) || ({} as any); if (memberConfig.ping_user) { // Ping/mention the user @@ -247,7 +247,7 @@ export class LogsPlugin extends ZeppelinPlugin { }); this.guildLogs.log(LogType.MEMBER_JOIN, { - member: stripObjectToScalars(member, ["user"]), + member: stripObjectToScalars(member, ["user", "roles"]), new: member.createdAt >= newThreshold ? " :new:" : "", account_age: accountAge, }); @@ -273,7 +273,7 @@ export class LogsPlugin extends ZeppelinPlugin { } this.guildLogs.log(LogType.MEMBER_JOIN_WITH_PRIOR_RECORDS, { - member: stripObjectToScalars(member, ["user"]), + member: stripObjectToScalars(member, ["user", "roles"]), recentCaseSummary, }); } @@ -282,7 +282,7 @@ export class LogsPlugin extends ZeppelinPlugin { @d.event("guildMemberRemove") onMemberLeave(_, member) { this.guildLogs.log(LogType.MEMBER_LEAVE, { - member: stripObjectToScalars(member, ["user"]), + member: stripObjectToScalars(member, ["user", "roles"]), }); } @@ -404,7 +404,7 @@ export class LogsPlugin extends ZeppelinPlugin { if (user.username !== oldUser.username || user.discriminator !== oldUser.discriminator) { const member = (await this.getMember(user.id)) || { id: user.id, user }; this.guildLogs.log(LogType.MEMBER_USERNAME_CHANGE, { - member: stripObjectToScalars(member, ["user"]), + member: stripObjectToScalars(member, ["user", "roles"]), oldName: `${oldUser.username}#${oldUser.discriminator}`, newName: `${user.username}#${user.discriminator}`, }); @@ -542,7 +542,7 @@ export class LogsPlugin extends ZeppelinPlugin { @d.event("voiceChannelJoin") onVoiceChannelJoin(member: Member, channel: Channel) { this.guildLogs.log(LogType.VOICE_CHANNEL_JOIN, { - member: stripObjectToScalars(member, ["user"]), + member: stripObjectToScalars(member, ["user", "roles"]), channel: stripObjectToScalars(channel), }); } @@ -550,7 +550,7 @@ export class LogsPlugin extends ZeppelinPlugin { @d.event("voiceChannelLeave") onVoiceChannelLeave(member: Member, channel: Channel) { this.guildLogs.log(LogType.VOICE_CHANNEL_LEAVE, { - member: stripObjectToScalars(member, ["user"]), + member: stripObjectToScalars(member, ["user", "roles"]), channel: stripObjectToScalars(channel), }); } @@ -558,7 +558,7 @@ export class LogsPlugin extends ZeppelinPlugin { @d.event("voiceChannelSwitch") onVoiceChannelSwitch(member: Member, newChannel: Channel, oldChannel: Channel) { this.guildLogs.log(LogType.VOICE_CHANNEL_MOVE, { - member: stripObjectToScalars(member, ["user"]), + member: stripObjectToScalars(member, ["user", "roles"]), oldChannel: stripObjectToScalars(oldChannel), newChannel: stripObjectToScalars(newChannel), }); diff --git a/src/plugins/ModActions.ts b/src/plugins/ModActions.ts index 9d9f2b98..5d421b5b 100644 --- a/src/plugins/ModActions.ts +++ b/src/plugins/ModActions.ts @@ -446,7 +446,7 @@ export class ModActionsPlugin extends ZeppelinPlugin { this.serverLogs.log(LogType.MEMBER_WARN, { mod: stripObjectToScalars(mod.user), - member: stripObjectToScalars(memberToWarn, ["user"]), + member: stripObjectToScalars(memberToWarn, ["user", "roles"]), }); } @@ -945,7 +945,7 @@ export class ModActionsPlugin extends ZeppelinPlugin { // Log the action this.serverLogs.log(LogType.MEMBER_SOFTBAN, { mod: stripObjectToScalars(mod.user), - member: stripObjectToScalars(memberToSoftban, ["user"]), + member: stripObjectToScalars(memberToSoftban, ["user", "roles"]), }); } diff --git a/src/plugins/Mutes.ts b/src/plugins/Mutes.ts index e37ca51d..ea4593fc 100644 --- a/src/plugins/Mutes.ts +++ b/src/plugins/Mutes.ts @@ -463,7 +463,7 @@ export class MutesPlugin extends ZeppelinPlugin { await member.addRole(muteRole); this.serverLogs.log(LogType.MEMBER_MUTE_REJOIN, { - member: stripObjectToScalars(member, ["user"]), + member: stripObjectToScalars(member, ["user", "roles"]), }); } } @@ -578,7 +578,7 @@ export class MutesPlugin extends ZeppelinPlugin { this.serverLogs.log(LogType.MEMBER_MUTE_EXPIRED, { member: member - ? stripObjectToScalars(member, ["user"]) + ? stripObjectToScalars(member, ["user", "roles"]) : { id: mute.user_id, user: new UnknownUser({ id: mute.user_id }) }, }); } diff --git a/src/plugins/Persist.ts b/src/plugins/Persist.ts index f7bb6d37..ba9563ea 100644 --- a/src/plugins/Persist.ts +++ b/src/plugins/Persist.ts @@ -97,7 +97,7 @@ export class PersistPlugin extends ZeppelinPlugin { await this.persistedData.clear(member.id); this.logs.log(LogType.MEMBER_RESTORE, { - member: stripObjectToScalars(member, ["user"]), + member: stripObjectToScalars(member, ["user", "roles"]), restoredData: restoredData.join(", "), }); } diff --git a/src/plugins/Spam.ts b/src/plugins/Spam.ts index 451b9804..cf72913e 100644 --- a/src/plugins/Spam.ts +++ b/src/plugins/Spam.ts @@ -324,7 +324,7 @@ export class SpamPlugin extends ZeppelinPlugin { // Create a log entry this.logs.log(LogType.MESSAGE_SPAM_DETECTED, { - member: stripObjectToScalars(member, ["user"]), + member: stripObjectToScalars(member, ["user", "roles"]), channel: stripObjectToScalars(channel), description, limit: spamConfig.count, @@ -383,7 +383,7 @@ export class SpamPlugin extends ZeppelinPlugin { this.clearRecentUserActions(RecentActionType.VoiceChannelMove, userId, actionGroupId); this.logs.log(LogType.OTHER_SPAM_DETECTED, { - member: stripObjectToScalars(member, ["user"]), + member: stripObjectToScalars(member, ["user", "roles"]), description, limit: spamConfig.count, interval: spamConfig.interval, diff --git a/src/plugins/Utility.ts b/src/plugins/Utility.ts index 244e65c5..f8040712 100644 --- a/src/plugins/Utility.ts +++ b/src/plugins/Utility.ts @@ -802,7 +802,7 @@ export class UtilityPlugin extends ZeppelinPlugin { this.logs.log(LogType.VOICE_CHANNEL_FORCE_MOVE, { mod: stripObjectToScalars(msg.author), - member: stripObjectToScalars(args.member, ["user"]), + member: stripObjectToScalars(args.member, ["user", "roles"]), oldChannel: stripObjectToScalars(oldVoiceChannel), newChannel: stripObjectToScalars(channel), });