Skip to content

Commit

Permalink
updated to prefer .tag in some instances
Browse files Browse the repository at this point in the history
  • Loading branch information
sabattle committed Sep 6, 2020
1 parent c9df941 commit 070982c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 26 deletions.
2 changes: 1 addition & 1 deletion src/Client.js
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ class Client extends Discord.Client {
) return;

const embed = new Discord.MessageEmbed()
.setAuthor(`${guild.me.displayName}#${this.user.discriminator}`, this.user.displayAvatarURL({ dynamic: true }))
.setAuthor(`${this.user.tag}`, this.user.displayAvatarURL({ dynamic: true }))
.setTitle(`${fail} System Error: \`${error}\``)
.setDescription(`\`\`\`diff\n- System Failure\n+ ${errorMessage}\`\`\``)
.setTimestamp()
Expand Down
15 changes: 3 additions & 12 deletions src/commands/Command.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,7 @@ class Command {
message.channel.permissionsFor(message.author).missing(this.userPermissions).map(p => permissions[p]);
if (missingPermissions.length !== 0) {
const embed = new MessageEmbed()
.setAuthor(
`${message.member.displayName}#${message.author.discriminator}`,
message.author.displayAvatarURL({ dynamic: true })
)
.setAuthor(`${message.author.tag}`, message.author.displayAvatarURL({ dynamic: true }))
.setTitle(`${fail} Missing User Permissions: \`${this.name}\``)
.setDescription(`\`\`\`diff\n${missingPermissions.map(p => `- ${p}`).join('\n')}\`\`\``)
.setTimestamp()
Expand All @@ -196,10 +193,7 @@ class Command {
message.channel.permissionsFor(message.guild.me).missing(this.clientPermissions).map(p => permissions[p]);
if (missingPermissions.length !== 0) {
const embed = new MessageEmbed()
.setAuthor(
`${message.guild.me.displayName}#${message.client.user.discriminator}`,
message.client.user.displayAvatarURL({ dynamic: true })
)
.setAuthor(`${this.client.user.tag}`, message.client.user.displayAvatarURL({ dynamic: true }))
.setTitle(`${fail} Missing Bot Permissions: \`${this.name}\``)
.setDescription(`\`\`\`diff\n${missingPermissions.map(p => `- ${p}`).join('\n')}\`\`\``)
.setTimestamp()
Expand All @@ -221,10 +215,7 @@ class Command {
errorType = this.errorTypes[errorType];
const prefix = message.client.db.settings.selectPrefix.pluck().get(message.guild.id);
const embed = new MessageEmbed()
.setAuthor(
`${message.member.displayName}#${message.author.discriminator}`,
message.author.displayAvatarURL({ dynamic: true })
)
.setAuthor(`${message.author.tag}`, message.author.displayAvatarURL({ dynamic: true }))
.setTitle(`${fail} Error: \`${this.name}\``)
.setDescription(`\`\`\`diff\n- ${errorType}\n+ ${reason}\`\`\``)
.addField('Usage', `\`${prefix}${this.usage}\``)
Expand Down
5 changes: 1 addition & 4 deletions src/events/guildMemberUpdate.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ const { MessageEmbed } = require('discord.js');
module.exports = (client, oldMember, newMember) => {

const embed = new MessageEmbed()
.setAuthor(
`${newMember.displayName}#${newMember.user.discriminator}`,
newMember.user.displayAvatarURL({ dynamic: true })
)
.setAuthor(`${newMember.user.tag}`, newMember.user.displayAvatarURL({ dynamic: true }))
.setTimestamp()
.setColor(oldMember.guild.me.displayHexColor);

Expand Down
5 changes: 1 addition & 4 deletions src/events/messageDelete.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ module.exports = (client, message) => {

const embed = new MessageEmbed()
.setTitle('Message Update: `Delete`')
.setAuthor(
`${message.member.displayName}#${message.author.discriminator}`,
message.author.displayAvatarURL({ dynamic: true })
)
.setAuthor(`${message.author.tag}`, message.author.displayAvatarURL({ dynamic: true }))
.setTimestamp()
.setColor(message.guild.me.displayHexColor);

Expand Down
7 changes: 2 additions & 5 deletions src/events/messageUpdate.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ module.exports = (client, oldMessage, newMessage) => {
}

const embed = new MessageEmbed()
.setAuthor(
`${newMessage.member.displayName}#${newMessage.author.discriminator}`,
newMessage.author.displayAvatarURL({ dynamic: true })
)
.setAuthor(`${newMessage.user.tag}`, newMessage.author.displayAvatarURL({ dynamic: true }))
.setTimestamp()
.setColor(newMessage.guild.me.displayHexColor);

Expand All @@ -28,7 +25,7 @@ module.exports = (client, oldMessage, newMessage) => {
const starboardChannelId = client.db.settings.selectStarboardChannelId.pluck().get(newMessage.guild.id);
const starboardChannel = newMessage.guild.channels.cache.get(starboardChannelId);
if (newMessage.channel == starboardChannel) return;

// Get message edit log
const messageEditLogId = client.db.settings.selectMessageEditLogId.pluck().get(newMessage.guild.id);
const messageEditLog = newMessage.guild.channels.cache.get(messageEditLogId);
Expand Down

0 comments on commit 070982c

Please sign in to comment.