mirror of
https://github.com/ZeppelinBot/Zeppelin.git
synced 2025-03-16 22:21:51 +00:00
Fix missing pings/mentions in logs
This commit is contained in:
parent
2aacf6fe65
commit
b8e0f26bf0
6 changed files with 18 additions and 18 deletions
|
@ -173,10 +173,10 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
|
||||||
...data,
|
...data,
|
||||||
userMention: async userOrMember => {
|
userMention: async userOrMember => {
|
||||||
if (!userOrMember) return "";
|
if (!userOrMember) return "";
|
||||||
|
|
||||||
let user;
|
let user;
|
||||||
let member;
|
let member;
|
||||||
|
|
||||||
if (userOrMember.user) {
|
if (userOrMember.user) {
|
||||||
member = userOrMember;
|
member = userOrMember;
|
||||||
user = member.user;
|
user = member.user;
|
||||||
|
@ -185,7 +185,7 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
|
||||||
member = this.guild.members.get(user.id) || { id: user.id, user };
|
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) {
|
if (memberConfig.ping_user) {
|
||||||
// Ping/mention the user
|
// Ping/mention the user
|
||||||
|
@ -247,7 +247,7 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
|
||||||
});
|
});
|
||||||
|
|
||||||
this.guildLogs.log(LogType.MEMBER_JOIN, {
|
this.guildLogs.log(LogType.MEMBER_JOIN, {
|
||||||
member: stripObjectToScalars(member, ["user"]),
|
member: stripObjectToScalars(member, ["user", "roles"]),
|
||||||
new: member.createdAt >= newThreshold ? " :new:" : "",
|
new: member.createdAt >= newThreshold ? " :new:" : "",
|
||||||
account_age: accountAge,
|
account_age: accountAge,
|
||||||
});
|
});
|
||||||
|
@ -273,7 +273,7 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.guildLogs.log(LogType.MEMBER_JOIN_WITH_PRIOR_RECORDS, {
|
this.guildLogs.log(LogType.MEMBER_JOIN_WITH_PRIOR_RECORDS, {
|
||||||
member: stripObjectToScalars(member, ["user"]),
|
member: stripObjectToScalars(member, ["user", "roles"]),
|
||||||
recentCaseSummary,
|
recentCaseSummary,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -282,7 +282,7 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
|
||||||
@d.event("guildMemberRemove")
|
@d.event("guildMemberRemove")
|
||||||
onMemberLeave(_, member) {
|
onMemberLeave(_, member) {
|
||||||
this.guildLogs.log(LogType.MEMBER_LEAVE, {
|
this.guildLogs.log(LogType.MEMBER_LEAVE, {
|
||||||
member: stripObjectToScalars(member, ["user"]),
|
member: stripObjectToScalars(member, ["user", "roles"]),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -404,7 +404,7 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
|
||||||
if (user.username !== oldUser.username || user.discriminator !== oldUser.discriminator) {
|
if (user.username !== oldUser.username || user.discriminator !== oldUser.discriminator) {
|
||||||
const member = (await this.getMember(user.id)) || { id: user.id, user };
|
const member = (await this.getMember(user.id)) || { id: user.id, user };
|
||||||
this.guildLogs.log(LogType.MEMBER_USERNAME_CHANGE, {
|
this.guildLogs.log(LogType.MEMBER_USERNAME_CHANGE, {
|
||||||
member: stripObjectToScalars(member, ["user"]),
|
member: stripObjectToScalars(member, ["user", "roles"]),
|
||||||
oldName: `${oldUser.username}#${oldUser.discriminator}`,
|
oldName: `${oldUser.username}#${oldUser.discriminator}`,
|
||||||
newName: `${user.username}#${user.discriminator}`,
|
newName: `${user.username}#${user.discriminator}`,
|
||||||
});
|
});
|
||||||
|
@ -542,7 +542,7 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
|
||||||
@d.event("voiceChannelJoin")
|
@d.event("voiceChannelJoin")
|
||||||
onVoiceChannelJoin(member: Member, channel: Channel) {
|
onVoiceChannelJoin(member: Member, channel: Channel) {
|
||||||
this.guildLogs.log(LogType.VOICE_CHANNEL_JOIN, {
|
this.guildLogs.log(LogType.VOICE_CHANNEL_JOIN, {
|
||||||
member: stripObjectToScalars(member, ["user"]),
|
member: stripObjectToScalars(member, ["user", "roles"]),
|
||||||
channel: stripObjectToScalars(channel),
|
channel: stripObjectToScalars(channel),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -550,7 +550,7 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
|
||||||
@d.event("voiceChannelLeave")
|
@d.event("voiceChannelLeave")
|
||||||
onVoiceChannelLeave(member: Member, channel: Channel) {
|
onVoiceChannelLeave(member: Member, channel: Channel) {
|
||||||
this.guildLogs.log(LogType.VOICE_CHANNEL_LEAVE, {
|
this.guildLogs.log(LogType.VOICE_CHANNEL_LEAVE, {
|
||||||
member: stripObjectToScalars(member, ["user"]),
|
member: stripObjectToScalars(member, ["user", "roles"]),
|
||||||
channel: stripObjectToScalars(channel),
|
channel: stripObjectToScalars(channel),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -558,7 +558,7 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
|
||||||
@d.event("voiceChannelSwitch")
|
@d.event("voiceChannelSwitch")
|
||||||
onVoiceChannelSwitch(member: Member, newChannel: Channel, oldChannel: Channel) {
|
onVoiceChannelSwitch(member: Member, newChannel: Channel, oldChannel: Channel) {
|
||||||
this.guildLogs.log(LogType.VOICE_CHANNEL_MOVE, {
|
this.guildLogs.log(LogType.VOICE_CHANNEL_MOVE, {
|
||||||
member: stripObjectToScalars(member, ["user"]),
|
member: stripObjectToScalars(member, ["user", "roles"]),
|
||||||
oldChannel: stripObjectToScalars(oldChannel),
|
oldChannel: stripObjectToScalars(oldChannel),
|
||||||
newChannel: stripObjectToScalars(newChannel),
|
newChannel: stripObjectToScalars(newChannel),
|
||||||
});
|
});
|
||||||
|
|
|
@ -446,7 +446,7 @@ export class ModActionsPlugin extends ZeppelinPlugin<IModActionsPluginConfig> {
|
||||||
|
|
||||||
this.serverLogs.log(LogType.MEMBER_WARN, {
|
this.serverLogs.log(LogType.MEMBER_WARN, {
|
||||||
mod: stripObjectToScalars(mod.user),
|
mod: stripObjectToScalars(mod.user),
|
||||||
member: stripObjectToScalars(memberToWarn, ["user"]),
|
member: stripObjectToScalars(memberToWarn, ["user", "roles"]),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -945,7 +945,7 @@ export class ModActionsPlugin extends ZeppelinPlugin<IModActionsPluginConfig> {
|
||||||
// Log the action
|
// Log the action
|
||||||
this.serverLogs.log(LogType.MEMBER_SOFTBAN, {
|
this.serverLogs.log(LogType.MEMBER_SOFTBAN, {
|
||||||
mod: stripObjectToScalars(mod.user),
|
mod: stripObjectToScalars(mod.user),
|
||||||
member: stripObjectToScalars(memberToSoftban, ["user"]),
|
member: stripObjectToScalars(memberToSoftban, ["user", "roles"]),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -463,7 +463,7 @@ export class MutesPlugin extends ZeppelinPlugin<IMutesPluginConfig> {
|
||||||
await member.addRole(muteRole);
|
await member.addRole(muteRole);
|
||||||
|
|
||||||
this.serverLogs.log(LogType.MEMBER_MUTE_REJOIN, {
|
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<IMutesPluginConfig> {
|
||||||
|
|
||||||
this.serverLogs.log(LogType.MEMBER_MUTE_EXPIRED, {
|
this.serverLogs.log(LogType.MEMBER_MUTE_EXPIRED, {
|
||||||
member: member
|
member: member
|
||||||
? stripObjectToScalars(member, ["user"])
|
? stripObjectToScalars(member, ["user", "roles"])
|
||||||
: { id: mute.user_id, user: new UnknownUser({ id: mute.user_id }) },
|
: { id: mute.user_id, user: new UnknownUser({ id: mute.user_id }) },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,7 +97,7 @@ export class PersistPlugin extends ZeppelinPlugin<IPersistPluginConfig> {
|
||||||
await this.persistedData.clear(member.id);
|
await this.persistedData.clear(member.id);
|
||||||
|
|
||||||
this.logs.log(LogType.MEMBER_RESTORE, {
|
this.logs.log(LogType.MEMBER_RESTORE, {
|
||||||
member: stripObjectToScalars(member, ["user"]),
|
member: stripObjectToScalars(member, ["user", "roles"]),
|
||||||
restoredData: restoredData.join(", "),
|
restoredData: restoredData.join(", "),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -324,7 +324,7 @@ export class SpamPlugin extends ZeppelinPlugin<ISpamPluginConfig> {
|
||||||
|
|
||||||
// Create a log entry
|
// Create a log entry
|
||||||
this.logs.log(LogType.MESSAGE_SPAM_DETECTED, {
|
this.logs.log(LogType.MESSAGE_SPAM_DETECTED, {
|
||||||
member: stripObjectToScalars(member, ["user"]),
|
member: stripObjectToScalars(member, ["user", "roles"]),
|
||||||
channel: stripObjectToScalars(channel),
|
channel: stripObjectToScalars(channel),
|
||||||
description,
|
description,
|
||||||
limit: spamConfig.count,
|
limit: spamConfig.count,
|
||||||
|
@ -383,7 +383,7 @@ export class SpamPlugin extends ZeppelinPlugin<ISpamPluginConfig> {
|
||||||
this.clearRecentUserActions(RecentActionType.VoiceChannelMove, userId, actionGroupId);
|
this.clearRecentUserActions(RecentActionType.VoiceChannelMove, userId, actionGroupId);
|
||||||
|
|
||||||
this.logs.log(LogType.OTHER_SPAM_DETECTED, {
|
this.logs.log(LogType.OTHER_SPAM_DETECTED, {
|
||||||
member: stripObjectToScalars(member, ["user"]),
|
member: stripObjectToScalars(member, ["user", "roles"]),
|
||||||
description,
|
description,
|
||||||
limit: spamConfig.count,
|
limit: spamConfig.count,
|
||||||
interval: spamConfig.interval,
|
interval: spamConfig.interval,
|
||||||
|
|
|
@ -802,7 +802,7 @@ export class UtilityPlugin extends ZeppelinPlugin<IUtilityPluginConfig> {
|
||||||
|
|
||||||
this.logs.log(LogType.VOICE_CHANNEL_FORCE_MOVE, {
|
this.logs.log(LogType.VOICE_CHANNEL_FORCE_MOVE, {
|
||||||
mod: stripObjectToScalars(msg.author),
|
mod: stripObjectToScalars(msg.author),
|
||||||
member: stripObjectToScalars(args.member, ["user"]),
|
member: stripObjectToScalars(args.member, ["user", "roles"]),
|
||||||
oldChannel: stripObjectToScalars(oldVoiceChannel),
|
oldChannel: stripObjectToScalars(oldVoiceChannel),
|
||||||
newChannel: stripObjectToScalars(channel),
|
newChannel: stripObjectToScalars(channel),
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Reference in a new issue