StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:Dragory/ZeppelinBot

Browse source
This commit is contained in:
Dragory 2019-05-02 17:47:30 +03:00
commit fffb791a2e
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/plugins/Logs.ts
View file

@ -171,12 +171,21 @@ 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