From dae931693390bd21d354e65a0508be8c4ce0e622 Mon Sep 17 00:00:00 2001 From: Neko-Life Date: Fri, 6 Aug 2021 23:02:27 +0700 Subject: [PATCH] Use user icon --- resources/eventsLogger/guildBanAdd.js | 2 ++ resources/eventsLogger/guildBanRemove.js | 2 ++ resources/eventsLogger/guildMemberUpdate.js | 16 +++++++++++----- resources/eventsLogger/messageDelete.js | 6 ++++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/resources/eventsLogger/guildBanAdd.js b/resources/eventsLogger/guildBanAdd.js index 9d9144c..37ed22b 100644 --- a/resources/eventsLogger/guildBanAdd.js +++ b/resources/eventsLogger/guildBanAdd.js @@ -27,6 +27,8 @@ module.exports = async (GUILD, USER) => { .setColor(getColor("red")) .setThumbnail(USER.displayAvatarURL({ size: 4096, format: "png", dynamic: true })) .addField("User", `<@${USER.id}>\n(${USER.id})`); + if (audit.executor) + emb.setAuthor(emb.author.name, audit.executor.displayAvatarURL({ size: 128, format: "png", dynamic: true })); return trySend(GUILD.client, log, emb); } } \ No newline at end of file diff --git a/resources/eventsLogger/guildBanRemove.js b/resources/eventsLogger/guildBanRemove.js index 315c736..f88aaa8 100644 --- a/resources/eventsLogger/guildBanRemove.js +++ b/resources/eventsLogger/guildBanRemove.js @@ -27,6 +27,8 @@ module.exports = async (GUILD, USER) => { .setColor(getColor("red")) .setThumbnail(USER.displayAvatarURL({ size: 4096, format: "png", dynamic: true })) .addField("User", `<@${USER.id}>\n(${USER.id})`); + if (audit.executor) + emb.setAuthor(emb.author.name, audit.executor.displayAvatarURL({ size: 128, format: "png", dynamic: true })); return trySend(GUILD.client, log, emb); } } \ No newline at end of file diff --git a/resources/eventsLogger/guildMemberUpdate.js b/resources/eventsLogger/guildMemberUpdate.js index c0a8102..d835e13 100644 --- a/resources/eventsLogger/guildMemberUpdate.js +++ b/resources/eventsLogger/guildMemberUpdate.js @@ -17,7 +17,7 @@ module.exports = async (memberold, membernew) => { }; return membernew.user.setDb("cachedAvatarURL", membernew.user.DB.cachedAvatarURL); } - let log, thumbMes = "", audit, auditPerm, nullReason = false; + let log, thumbMes = "", audit = {}, auditPerm, nullReason = false; const emb = defaultEventLogEmbed(membernew.guild), oldT = memberold.toJSON().displayAvatarURL; const oldAV = membernew.user.DB.cachedAvatarURL || oldT; if (oldAV) thumbMes += "This embed's thumbnail is the user's old avatar.\n"; @@ -49,6 +49,8 @@ module.exports = async (memberold, membernew) => { .setDescription(`**Current role${use2.length > 2 ? "s" : ""}**\n` + (membernew.roles.cache.size > 1 ? "<@&" + use2.slice(0, 80).join(">, <@&") + ">" + (use2.length > 80 ? ` and ${use2.slice(80).length} more...` : "") : "`[NONE]`")); } + if (audit.executor) + emb.setAuthor(emb.author.name, audit.executor.displayAvatarURL({ size: 128, format: "png", dynamic: true })); } if (membernew.guild.DB.eventChannels?.member && membernew.roles.cache.size === memberold.roles.cache.size) { log = getChannel(membernew, membernew.guild.DB.eventChannels.member); @@ -61,20 +63,24 @@ module.exports = async (memberold, membernew) => { auditPerm = true; } emb.addField("Current Nickname", "`" + membernew.displayName + "`") - .addField("Original Nickname", "`" + memberold.displayName + "`") + .addField("Original Nickname", "`" + memberold.displayName + "`"); + if (audit.executor) + emb.setAuthor(emb.author.name, audit.executor.displayAvatarURL({ size: 128, format: "png", dynamic: true })); } if (membernew.user.DB.cachedAvatarURL !== NEWAV) { nullReason = true; emb.setImage(NEWAV) + .setAuthor(emb.author.name, NEWAV) .addField("Avatar", thumbMes + "The image below is the user's new avatar."); if (oldAV) emb.setThumbnail(oldAV); } } // console.log(audit); - emb.setAuthor(emb.author.name, NEWAV) - .setTitle("Profile `" + memberold.user.tag + "` updated" + - (audit?.executor ? ` by \`${audit.executor.tag}\`` : "")) + emb.setTitle("Profile `" + memberold.user.tag + "` updated" + + (audit?.executor ? ` by \`${audit.executor.tag}\`` : "")) .setColor(getColor("blue")); + if (emb.fields?.[0].name !== "Avatar") + emb.setFooter(emb.footer.text, NEWAV); if (!nullReason) { if (auditPerm) { emb.setDescription((audit?.reason || "No reason provided") + (emb.description ? "\n\n" + emb.description : "")); diff --git a/resources/eventsLogger/messageDelete.js b/resources/eventsLogger/messageDelete.js index 7e5d454..cf28828 100644 --- a/resources/eventsLogger/messageDelete.js +++ b/resources/eventsLogger/messageDelete.js @@ -26,10 +26,12 @@ module.exports = async (msg) => { emb.setColor(getColor("yellow")) .setTitle((!msg.webhookID ? "Message " + msg.id : "Webhook " + msg.webhookID) + " deleted" + (audit?.executor ? ` by \`${audit.executor.tag}\`` : "")) .setDescription(msg.content.length > 0 ? msg.content : "`[EMPTY]`") - .setAuthor(emb.author.name, msg.author?.displayAvatarURL({ format: "png", size: 128, dynamic: true })) .addField("Author", `<@!${msg.author?.id}>\n\`${msg.author?.tag}\`\n(${msg.author?.id})`, true) .addField("Channel", `<#${msg.channel?.id}>\n\`${msg.channel?.name}\`\n(${msg.channel?.id})`, true) - .setURL(msg.url); + .setURL(msg.url) + .setFooter(emb.footer.text, msg.author.displayAvatarURL({ size: 128, format: "png", dynamic: true })); + if (audit.executor) + emb.setAuthor(emb.author.name, audit.executor.displayAvatarURL({ size: 128, format: "png", dynamic: true })); if (msg.attachments?.size > 0) { let arr = msg.attachments.map(r => r.proxyURL); const toField = splitOnLength(arr, 1024);