StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-16 22:21:51 +00:00
Code Releases Activity

Fix lots of undefined user mentions in logs

Browse source
This commit is contained in:
Miikka 2019-05-02 10:33:49 +03:00 • committed by GitHub
parent baaaded545
commit 6a3d5a6ed0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/plugins/Logs.ts
View file

@ -171,19 +171,27 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
try { try {
formatted = await renderTemplate(format, { formatted = await renderTemplate(format, {
...data, ...data,
userMention: async user => { userMention: async userOrMember => {
if (!user) return ""; if (!userOrMember) return "";
let user;
let member;
if (userOrMember.user) {
member = userOrMember;
user = member.user;
} else {
user = userOrMember;
member = this.guild.members.get(user.id) || { id: user.id, user };
}
const member: Member = user.user ? user : this.guild.members.get(user.id) || { id: user.id, user }; const memberConfig = member.guild && this.getMatchingConfig({ member, userId: user.id }) || ({} as any);
const memberConfig = (member.guild && this.getMatchingConfig({ member, userId: user.id })) || ({} as any);
if (memberConfig.ping_user) { if (memberConfig.ping_user) {
// Ping/mention the user // Ping/mention the user
return `<@!${user.id}> (**${user.username}#${user.discriminator}**, \`${user.id}\`)`; return `<@!${user.id}> (**${user.username}#${user.discriminator}**, \`${user.id}\`)`;
} else { } else {
// No ping/mention // No ping/mention
if (user.username == null) console.log('?', user);
return `**${user.username}#${user.discriminator}** (\`${user.id}\`)`; return `**${user.username}#${user.discriminator}** (\`${user.id}\`)`;
} }
}, },