diff --git a/cmds/fun/say.js b/cmds/fun/say.js index b4bfb1e..5ee7a78 100644 --- a/cmds/fun/say.js +++ b/cmds/fun/say.js @@ -21,7 +21,7 @@ module.exports = class say extends commando.Command { sendThis.disableMentions = "none"; } const sent = await trySend(this.client, msg, sendThis); - if (args != '​' && msg.channel.guild && msg.member.hasPermission("MANAGE_MESSAGES") && !(new RegExp("^<@\!?" + msg.client.user.id + ">\s")).test(msg.content)) { + if (args != '​' && msg.guild && !(new RegExp("^<@\!?" + msg.client.user.id + ">\s")).test(msg.content) && msg.member.hasPermission("MANAGE_MESSAGES") && msg.guild.member(this.client.user).hasPermission("MANAGE_MESSAGES")) { tryDelete(msg); } ranLog(msg, sent.content); diff --git a/resources/eventsLogger/guildMemberUpdate.js b/resources/eventsLogger/guildMemberUpdate.js index 4849246..fef5119 100644 --- a/resources/eventsLogger/guildMemberUpdate.js +++ b/resources/eventsLogger/guildMemberUpdate.js @@ -10,16 +10,18 @@ const getColor = require("../getColor"); * @returns */ module.exports = (memberold, membernew) => { + const NEWAV = membernew.user.displayAvatarURL({ format: "png", size: 4096, dynamic: true }); if (!membernew.guild.DB.eventChannels?.memberRole && !membernew.guild.DB.eventChannels?.member) { - if (membernew.user.DB.cachedAvatarURL != membernew.user.displayAvatarURL({ format: "png", size: 4096, dynamic: true })) { - membernew.user.DB.cachedAvatarURL = membernew.user.displayAvatarURL({ format: "png", size: 4096, dynamic: true }); + if (membernew.user.DB.cachedAvatarURL != NEWAV) { + membernew.user.DB.cachedAvatarURL = NEWAV; }; return membernew.user.setDb("cachedAvatarURL", membernew.user.DB.cachedAvatarURL); } let log, thumbMes = ""; const emb = defaultEventLogEmbed(membernew.guild), oldT = memberold.toJSON().displayAvatarURL; const oldAV = membernew.user.DB.cachedAvatarURL || oldT; - emb.setTitle("Profile `" + memberold.user.tag + "` updated") + emb.setAuthor(emb.author.name, NEWAV) + .setTitle("Profile `" + memberold.user.tag + "` updated") .setColor(getColor("blue")); if (oldAV) thumbMes += "This embed's thumbnail is the user's old avatar.\n"; if (membernew.guild.DB.eventChannels?.memberRole) { @@ -38,14 +40,14 @@ module.exports = (memberold, membernew) => { if (membernew.displayName !== memberold.displayName) { emb.addField("Nickname", "Changed from `" + memberold.displayName + "` to `" + membernew.displayName + "`"); } - if (membernew.user.DB.cachedAvatarURL !== membernew.user.displayAvatarURL({ format: "png", size: 4096, dynamic: true })) { + if (membernew.user.DB.cachedAvatarURL !== NEWAV) { emb - .setImage(membernew.user.displayAvatarURL({ format: "png", size: 4096, dynamic: true })) + .setImage(NEWAV) .addField("Avatar", thumbMes + "The image below is the user's new avatar."); if (oldAV) emb.setThumbnail(oldAV); } } - membernew.user.DB.cachedAvatarURL = membernew.user.displayAvatarURL({ format: "png", size: 4096, dynamic: true }); + membernew.user.DB.cachedAvatarURL = NEWAV; membernew.user.setDb("cachedAvatarURL", membernew.user.DB.cachedAvatarURL); if (!emb.fields || emb.fields.length === 0) return; return trySend(membernew.client, log, emb);