From 92e32454d5e48111707bb4f3477cb5726ccce574 Mon Sep 17 00:00:00 2001 From: WubzyGD Date: Sun, 6 Feb 2022 15:24:18 -0700 Subject: [PATCH] switch to displayAvatarURL() for all --- commands/anime/anime.js | 14 +++++++------- commands/anime/animeimage.js | 4 ++-- commands/anime/animenick.js | 2 +- commands/anime/char.js | 20 ++++++++++---------- commands/anime/charimage.js | 4 ++-- commands/anime/charlb.js | 2 +- commands/anime/charnick.js | 2 +- commands/anime/listanime.js | 2 +- commands/anime/loveani.js | 2 +- commands/anime/lovechar.js | 2 +- commands/anime/watchedlb.js | 2 +- commands/dev/admin.js | 4 ++-- commands/dev/developer.js | 4 ++-- commands/dev/eval.js | 2 +- commands/dev/execute.js | 4 ++-- commands/dev/restart.js | 2 +- commands/dev/staff.js | 4 ++-- commands/dev/support.js | 4 ++-- commands/dev/vip.js | 2 +- commands/fun/8ball.js | 2 +- commands/fun/bite.js | 2 +- commands/fun/deathnote.js | 6 +++--- commands/fun/nowplaying.js | 2 +- commands/fun/secretsanta.js | 6 +++--- commands/fun/slap.js | 2 +- commands/leveling/chests.js | 2 +- commands/leveling/levelrole.js | 2 +- commands/leveling/setupleveling.js | 2 +- commands/leveling/stats.js | 2 +- commands/leveling/streak.js | 2 +- commands/misc/ar.js | 2 +- commands/misc/avatar.js | 2 +- commands/misc/commands.js | 2 +- commands/misc/emoji.js | 8 ++++---- commands/misc/help.js | 10 +++++----- commands/misc/info.js | 4 ++-- commands/misc/invite.js | 2 +- commands/misc/ping.js | 2 +- commands/misc/prefix.js | 4 ++-- commands/misc/serverinfo.js | 2 +- commands/misc/supportserver.js | 2 +- commands/misc/userinfo.js | 3 +-- commands/moderation/autorole.js | 4 ++-- commands/moderation/checkwarnings.js | 4 ++-- commands/moderation/leave.js | 4 ++-- commands/moderation/response.js | 2 +- commands/moderation/staffrole.js | 4 ++-- commands/moderation/warn.js | 4 ++-- commands/moderation/welcome.js | 4 ++-- commands/social/bio.js | 8 ++++---- commands/social/bonk.js | 6 +++--- commands/social/creampie.js | 6 +++--- commands/social/feed.js | 6 +++--- commands/social/fuck.js | 6 +++--- commands/social/handhold.js | 6 +++--- commands/social/heal.js | 6 +++--- commands/social/hug.js | 6 +++--- commands/social/kill.js | 6 +++--- commands/social/kiss.js | 6 +++--- commands/social/pat.js | 6 +++--- commands/social/simp.js | 6 +++--- commands/social/snuggle.js | 6 +++--- commands/social/spank.js | 2 +- commands/social/wink.js | 6 +++--- commands/utility/coinflip.js | 2 +- commands/utility/monitor.js | 2 +- commands/utility/randnum.js | 2 +- commands/utility/robemote.js | 4 ++-- commands/utility/todo.js | 16 ++++++++-------- events/channelCreate.js | 2 +- events/channelDelete.js | 2 +- events/guildCreate.js | 2 +- events/guildDelete.js | 2 +- events/messageDelete.js | 4 ++-- events/messageReactionAdd.js | 4 ++-- events/messageUpdate.js | 4 ++-- events/voiceStateUpdate.js | 8 ++++---- slash/8ball.js | 2 +- slash/userinfo.js.dev | 4 ++-- util/anime/anisearch.js | 4 ++-- util/anime/charsearch.js | 4 ++-- util/mention.js | 2 +- util/oncommand.js | 2 +- util/pagination.js | 4 ++-- util/ts/pagination.ts | 4 ++-- 85 files changed, 174 insertions(+), 175 deletions(-) diff --git a/commands/anime/anime.js b/commands/anime/anime.js index 653b9a1..110a504 100644 --- a/commands/anime/anime.js +++ b/commands/anime/anime.js @@ -156,7 +156,7 @@ module.exports = { .addField('Other', `**Genre(s):** ${foptions.genres}\n**Characters:** ${foptions.characters}\n**Stream this at:** ${foptions.streamAt}`) .setColor("c375f0") .setImage(options.thumbnail) - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp(); try { am = await dmch.send({embeds: [amEmbed]}); @@ -175,7 +175,7 @@ module.exports = { client.misc.cache.animeID.set(options.id, options.name); } else {amEmbed.addField("ID", options.id);} - amEmbed.setAuthor({name: !queue ? "Anime Added" : "Anime Submitted", iconURL: message.author.avatarURL()}); + amEmbed.setAuthor({name: !queue ? "Anime Added" : "Anime Submitted", iconURL: message.author.displayAvatarURL()}); client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177823630762014').send({embeds: [amEmbed]})); if (!queue) {options.queued = false;} await new AniData(options).save(); @@ -322,7 +322,7 @@ module.exports = { client.misc.cache.animeNum++; client.guilds.cache.get('762707532417335296').channels.cache.get('932177823630762014').send({embeds: [new Discord.MessageEmbed() .setTitle(`Anime Accepted -> ${tr.name}`) - .setAuthor({name: 'Anime Approved', iconURL: message.author.avatarURL()}) + .setAuthor({name: 'Anime Approved', iconURL: message.author.displayAvatarURL()}) .setThumbnail(tr.thumbnail) .setDescription(`${tr.name} has been approved, and is now available to all Natsuki users.`) .setColor('c375f0') @@ -469,7 +469,7 @@ module.exports = { client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177814638186516').send({ embeds: [ new Discord.MessageEmbed() - .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`New Anime Alt Name ${queue ? "Submitted" : "Added"}`) .setDescription(`For **${ch.name}** | \`${ch.id}\``) .addField("Name", nn) @@ -560,7 +560,7 @@ module.exports = { client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({ embeds: [ new Discord.MessageEmbed() - .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`New Anime Image ${queue ? "Submitted" : "Added"}`) .setDescription(`For **${ch.name}**`) .setThumbnail(ch.thumbnail) @@ -580,7 +580,7 @@ module.exports = { client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({ embeds: [ new Discord.MessageEmbed() - .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`New Anime Images ${queue ? "Submitted" : "Added"}`) .setDescription(`For **${ch.name}**`) .addField("Images", images.map(img => `${img}\n`).join("")) @@ -649,7 +649,7 @@ module.exports = { let n = mention ? message.guild ? message.mentions.members.first().displayName : message.mentions.users.first().username : message.guild ? message.member.displayName : message.author.username; return message.channel.send({embeds: [ new Discord.MessageEmbed() - .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Anime`, iconURL: mention ? mention.avatarURL() : message.author.avatarURL()}) + .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Anime`, iconURL: mention ? mention.displayAvatarURL() : message.author.displayAvatarURL()}) .setDescription(`**${chars.length} anime favorited**\n\n${chars.join(", ")}`) .setColor('c375f0') .setFooter({text: "Natsuki"}) diff --git a/commands/anime/animeimage.js b/commands/anime/animeimage.js index ecca16f..146cbe5 100644 --- a/commands/anime/animeimage.js +++ b/commands/anime/animeimage.js @@ -98,7 +98,7 @@ module.exports = { client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({ embeds: [ new Discord.MessageEmbed() - .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`New Anime Image ${queue ? "Submitted" : "Added"}`) .setDescription(`For **${ch.name}**`) .setThumbnail(ch.thumbnail) @@ -118,7 +118,7 @@ module.exports = { client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({ embeds: [ new Discord.MessageEmbed() - .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`New Anime Images ${queue ? "Submitted" : "Added"}`) .setDescription(`For **${ch.name}**`) .addField("Images", images.map(img => `${img}\n`).join("")) diff --git a/commands/anime/animenick.js b/commands/anime/animenick.js index bb7e3d0..b7261a3 100644 --- a/commands/anime/animenick.js +++ b/commands/anime/animenick.js @@ -65,7 +65,7 @@ module.exports = { client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177814638186516').send({ embeds: [ new Discord.MessageEmbed() - .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`New Anime Alt Name ${queue ? "Submitted" : "Added"}`) .setDescription(`For **${ch.name}** | \`${ch.id}\``) .addField("Name", nn) diff --git a/commands/anime/char.js b/commands/anime/char.js index 1d196fd..d01219b 100644 --- a/commands/anime/char.js +++ b/commands/anime/char.js @@ -189,7 +189,7 @@ module.exports = { .addField('Other', `**Anime**: ${forceAni ? options.anime : `${aniData.name} | ${aniData.japname} | \`${aniData.id}\``}\n\n**Gender**: ${options.gender}\n`) .setColor("c375f0") .setImage(options.thumbnail) - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp(); const addChar = async () => { while (true) {options.id = require('../../util/makeid')(4); if (!await Char.findOne({id: options.id})) {break;}} @@ -199,7 +199,7 @@ module.exports = { client.misc.cache.charsID.set(options.id, options.name); } else {amEmbed.addField("ID", options.id);} - amEmbed.setAuthor({name: !queue ? "Character Added" : "Character Submitted", iconURL: message.author.avatarURL()}); + amEmbed.setAuthor({name: !queue ? "Character Added" : "Character Submitted", iconURL: message.author.displayAvatarURL()}); if (!queue) {options.queued = false;} await new Char(options).save(); if (aniData) { @@ -210,7 +210,7 @@ module.exports = { client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177797705781308').send({embeds: [amEmbed]}).catch(() => {})).catch(() => {}); if (options.images && options.images.length) { let imagesEmbed = new Discord.MessageEmbed() - .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`New Image${client.utils.s(options.images.length)} ${queue ? "Submitted" : "Added"}`) .setDescription(`For **${options.name}** | \`${options.id}\` from ${client.misc.cache.animeID.get(options.anime)}`) .setThumbnail(options.thumbnail) @@ -391,7 +391,7 @@ module.exports = { client.misc.cache.charsLove.set(char.id, char.loved); client.guilds.cache.get('762707532417335296').channels.cache.get('932177797705781308').send({embeds: [new Discord.MessageEmbed() .setTitle(`Character Accepted -> ${tr.name}`) - .setAuthor({name: 'Character Approved', iconURL: message.author.avatarURL()}) + .setAuthor({name: 'Character Approved', iconURL: message.author.displayAvatarURL()}) .setThumbnail(tr.thumbnail) .setDescription(`${tr.name} has been approved, and is now available to all Natsuki users.`) .setColor('c375f0') @@ -472,7 +472,7 @@ module.exports = { let n = mention ? message.guild ? message.mentions.members.first().displayName : message.mentions.users.first().username : message.guild ? message.member.displayName : message.author.username; return message.channel.send({embeds: [ new Discord.MessageEmbed() - .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Characters`, iconURL: mention ? mention.avatarURL() : message.author.avatarURL()}) + .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Characters`, iconURL: mention ? mention.displayAvatarURL() : message.author.displayAvatarURL()}) .setDescription(`**${chars.length} character${chars.length === 1 ? '': 's'} favorited**\n\n${chars.join(", ")}`) .setColor('c375f0') .setFooter({text: "Natsuki"}) @@ -559,7 +559,7 @@ module.exports = { client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({ embeds: [ new Discord.MessageEmbed() - .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`New Image ${queue ? "Submitted" : "Added"}`) .setDescription(`For **${ch.name}** | \`${ch.id}\` from ${client.misc.cache.animeID.get(ch.anime)}`) .setThumbnail(ch.thumbnail) @@ -579,7 +579,7 @@ module.exports = { client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({ embeds: [ new Discord.MessageEmbed() - .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`New Images ${queue ? "Submitted" : "Added"}`) .setDescription(`For **${ch.name}** | \`${ch.id}\` from ${client.misc.cache.animeID.get(ch.anime)}`) .addField("Images", images.map(img => `${img}\n`).join("")) @@ -635,7 +635,7 @@ module.exports = { .addField("Loved by", `**${ch.loved}** Natsuki user${ch.loved === 1 ? '' : 's'}!\n\`${prefix}char love ${ch.name}\``) .setColor("c375f0") .setImage(ch.thumbnail) - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() )); let pag = new Pagination(message.channel, pages, message, client, true); @@ -646,7 +646,7 @@ module.exports = { .setTitle(`${anime.name}: Characters`) .setThumbnail(anime.thumbnail) .setDescription(`**${anime.characters.length} Characters**\n` + anime.characters.map(ch => client.misc.cache.charsID.get(ch)).join(", ")) - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() .setColor('c375f0') ]}); @@ -697,7 +697,7 @@ module.exports = { client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177814638186516').send({ embeds: [ new Discord.MessageEmbed() - .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`New Character Nickname ${queue ? "Submitted" : "Added"}`) .setDescription(`For **${ch.name}** | \`${ch.id}\` from ${client.misc.cache.animeID.get(ch.anime)}`) .addField("Name", nn) diff --git a/commands/anime/charimage.js b/commands/anime/charimage.js index d2bb5ba..d8916bc 100644 --- a/commands/anime/charimage.js +++ b/commands/anime/charimage.js @@ -99,7 +99,7 @@ module.exports = { client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({ embeds: [ new Discord.MessageEmbed() - .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`New Image ${queue ? "Submitted" : "Added"}`) .setDescription(`For **${ch.name}** | \`${ch.id}\` from ${client.misc.cache.animeID.get(ch.anime)}`) .setThumbnail(ch.thumbnail) @@ -119,7 +119,7 @@ module.exports = { client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177850239422494').send({ embeds: [ new Discord.MessageEmbed() - .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`New Images ${queue ? "Submitted" : "Added"}`) .setDescription(`For **${ch.name}** | \`${ch.id}\` from ${client.misc.cache.animeID.get(ch.anime)}`) .addField("Images", images.map(img => `${img}\n`).join("")) diff --git a/commands/anime/charlb.js b/commands/anime/charlb.js index b47af35..bd65e9e 100644 --- a/commands/anime/charlb.js +++ b/commands/anime/charlb.js @@ -22,7 +22,7 @@ module.exports = { .map((c, i) => `${i+1}. **${client.misc.cache.charsLove.get(c)} vote${client.misc.cache.charsLove.get(c) === 1 ? '' : 's'}** -> ${client.misc.cache.charsID.get(c)}`) .join('\n') ).setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } diff --git a/commands/anime/charnick.js b/commands/anime/charnick.js index 3e9b42d..69b94a7 100644 --- a/commands/anime/charnick.js +++ b/commands/anime/charnick.js @@ -64,7 +64,7 @@ module.exports = { client.guilds.fetch('762707532417335296').then(g => g.channels.cache.get('932177814638186516').send({ embeds: [ new Discord.MessageEmbed() - .setAuthor({name: message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`New Character Nickname ${queue ? "Submitted" : "Added"}`) .setDescription(`For **${ch.name}** | \`${ch.id}\` from ${client.misc.cache.animeID.get(ch.anime)}`) .addField("Name", nn) diff --git a/commands/anime/listanime.js b/commands/anime/listanime.js index 4c48260..36327f0 100644 --- a/commands/anime/listanime.js +++ b/commands/anime/listanime.js @@ -39,7 +39,7 @@ module.exports = { s = `${s}${ps.join('\n')}`; pages.push(new Discord.MessageEmbed() .setTitle("Anime Database") - .setThumbnail(client.user.avatarURL({size: 1024, dynamic: true, format: 'png'})) + .setThumbnail(client.user.displayAvatarURL({size: 1024, dynamic: true, format: 'png'})) .setDescription(s) .setColor('c375f0') .setTimestamp() diff --git a/commands/anime/loveani.js b/commands/anime/loveani.js index 5cc0d4c..d88d41c 100644 --- a/commands/anime/loveani.js +++ b/commands/anime/loveani.js @@ -29,7 +29,7 @@ module.exports = { let n = mention ? message.guild ? message.mentions.members.first().displayName : message.mentions.users.first().username : message.guild ? message.member.displayName : message.author.username; return message.channel.send({embeds: [ new Discord.MessageEmbed() - .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Anime`, iconURL: mention ? mention.avatarURL() : message.author.avatarURL()}) + .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Anime`, iconURL: mention ? mention.displayAvatarURL() : message.author.displayAvatarURL()}) .setDescription(`**${chars.length} anime favorited**\n\n${chars.join(", ")}`) .setColor('c375f0') .setFooter({text: "Natsuki"}) diff --git a/commands/anime/lovechar.js b/commands/anime/lovechar.js index 69a9a4f..fde97f5 100644 --- a/commands/anime/lovechar.js +++ b/commands/anime/lovechar.js @@ -29,7 +29,7 @@ module.exports = { let n = mention ? message.guild ? message.mentions.members.first().displayName : message.mentions.users.first().username : message.guild ? message.member.displayName : message.author.username; return message.channel.send({embeds: [ new Discord.MessageEmbed() - .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Characters`, iconURL: mention ? mention.avatarURL() : message.author.avatarURL()}) + .setAuthor({name: `${n}${n.endsWith('s') ? '' : "'s"} Favorited Characters`, iconURL: mention ? mention.displayAvatarURL() : message.author.displayAvatarURL()}) .setDescription(`**${chars.length} character${chars.length === 1 ? '': 's'} favorited**\n\n${chars.join(", ")}`) .setColor('c375f0') .setFooter({text: "Natsuki"}) diff --git a/commands/anime/watchedlb.js b/commands/anime/watchedlb.js index 4f483f2..e68166a 100644 --- a/commands/anime/watchedlb.js +++ b/commands/anime/watchedlb.js @@ -22,7 +22,7 @@ module.exports = { .map((c, i) => `${i+1}. **${client.misc.cache.animeLove.get(c)} watcher${client.misc.cache.animeLove.get(c) === 1 ? '' : 's'}** -> ${client.misc.cache.animeID.get(c)}`) .join('\n') ).setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } diff --git a/commands/dev/admin.js b/commands/dev/admin.js index 957d74e..3ff4147 100644 --- a/commands/dev/admin.js +++ b/commands/dev/admin.js @@ -28,9 +28,9 @@ module.exports = { else {tu.admin = false; tu.developer = false;} tu.save(); const logemb = (act) => new Discord.MessageEmbed() - .setAuthor({name: `Admin ${act}`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `Admin ${act}`, iconURL: message.author.displayAvatarURL()}) .setDescription("A user's Admin status was updated.") - .setThumbnail(person.avatarURL({size: 1024})) + .setThumbnail(person.displayAvatarURL({size: 1024})) .addField("Name", person.username, true) .addField("Developer", message.author.username, true) .setColor("e8da3a") diff --git a/commands/dev/developer.js b/commands/dev/developer.js index 4d287d1..a2a1a00 100644 --- a/commands/dev/developer.js +++ b/commands/dev/developer.js @@ -30,9 +30,9 @@ module.exports = { else {tu.developer = false;} tu.save(); const logemb = (act) => new Discord.MessageEmbed() - .setAuthor({name: `Developer ${act}`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `Developer ${act}`, iconURL: message.author.displayAvatarURL()}) .setDescription("A user's Developer status was updated.") - .setThumbnail(person.avatarURL({size: 1024})) + .setThumbnail(person.displayAvatarURL({size: 1024})) .addField("Name", person.username, true) .addField("Developer", message.author.username, true) .setColor("e8da3a") diff --git a/commands/dev/eval.js b/commands/dev/eval.js index c0b5a81..5ade095 100644 --- a/commands/dev/eval.js +++ b/commands/dev/eval.js @@ -40,7 +40,7 @@ module.exports = { .setTitle('Client Evaluation') .setDescription(`\`\`\`js\n${output}\n\`\`\``) .setColor('c375f0') - .setFooter({text: `Natsuki | Evaluated in ${new Date().getTime() - timer}ms`, iconURL: client.user.avatarURL()}) + .setFooter({text: `Natsuki | Evaluated in ${new Date().getTime() - timer}ms`, iconURL: client.user.displayAvatarURL()}) .setTimestamp()]}); }).catch(error => {return message.channel.send(`Error: \`${error}\`.`);}); } catch (error) { diff --git a/commands/dev/execute.js b/commands/dev/execute.js index 94897ab..7f2811c 100644 --- a/commands/dev/execute.js +++ b/commands/dev/execute.js @@ -22,7 +22,7 @@ module.exports = { .setTitle("Error") .setDescription(`\`\`\`${error}\`\`\``) .setColor("ff446a") - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} ); } @@ -31,7 +31,7 @@ module.exports = { .setTitle("Execution Successful") .setDescription(`\`\`\`${stdout}\`\`\``) .setColor("c375f0") - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} ); }); diff --git a/commands/dev/restart.js b/commands/dev/restart.js index 8d3c4d3..14ac839 100644 --- a/commands/dev/restart.js +++ b/commands/dev/restart.js @@ -24,7 +24,7 @@ module.exports = { .setTitle("Error") .setDescription(`\`\`\`${error}\`\`\``) .setColor("ff446a") - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} ); } diff --git a/commands/dev/staff.js b/commands/dev/staff.js index 088d63e..5038c52 100644 --- a/commands/dev/staff.js +++ b/commands/dev/staff.js @@ -28,9 +28,9 @@ module.exports = { else {tu.staff = false; tu.admin = false; tu.developer = false;} tu.save(); const logemb = (act) => new Discord.MessageEmbed() - .setAuthor({name: `Staff ${act}`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `Staff ${act}`, iconURL: message.author.displayAvatarURL()}) .setDescription("A user's Staff status was updated.") - .setThumbnail(person.avatarURL({size: 1024})) + .setThumbnail(person.displayAvatarURL({size: 1024})) .addField("Name", person.username, true) .addField("Developer", message.author.username, true) .setColor("e8da3a") diff --git a/commands/dev/support.js b/commands/dev/support.js index fd423b4..4bf5f33 100644 --- a/commands/dev/support.js +++ b/commands/dev/support.js @@ -28,9 +28,9 @@ module.exports = { else {tu.support = false; tu.staff = false; tu.admin = false; tu.developer = false;} tu.save(); const logemb = (act) => new Discord.MessageEmbed() - .setAuthor({name: `Support ${act}`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `Support ${act}`, iconURL: message.author.displayAvatarURL()}) .setDescription("A user's Support status was updated.") - .setThumbnail(person.avatarURL({size: 1024})) + .setThumbnail(person.displayAvatarURL({size: 1024})) .addField("Name", person.username, true) .addField("Developer", message.author.username, true) .setColor("e8da3a") diff --git a/commands/dev/vip.js b/commands/dev/vip.js index 356186b..652c11e 100644 --- a/commands/dev/vip.js +++ b/commands/dev/vip.js @@ -20,7 +20,7 @@ module.exports = { if (!client.developers.includes(message.author.id) && !['check', 'c', 'view', 'v'].includes(args[0])) {return message.reply("Unfortunately, this is a **developer-only command**!");} const GuildSettings = require('../../models/guild'); const logemb = (act) => new Discord.MessageEmbed() - .setAuthor({name: `VIP Server ${act}`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `VIP Server ${act}`, iconURL: message.author.displayAvatarURL()}) .setDescription("A Server's VIP status was updated.") .setThumbnail(message.guild.iconURL({size: 1024})) .addField("Name", message.guild.name, true) diff --git a/commands/fun/8ball.js b/commands/fun/8ball.js index a39d78f..b327c3e 100644 --- a/commands/fun/8ball.js +++ b/commands/fun/8ball.js @@ -26,7 +26,7 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; return message.reply({embeds: [new Discord.MessageEmbed() - .setAuthor({name: "8ball Question", iconURL: message.author.avatarURL()}) + .setAuthor({name: "8ball Question", iconURL: message.author.displayAvatarURL()}) .setDescription("**Question:** " + question + "\n**Answer:** " + responses[Math.floor(Math.random() * responses.length)]) .setColor("c375f0") .setFooter({text: `Asked by ${name} | Natsuki`}) diff --git a/commands/fun/bite.js b/commands/fun/bite.js index 511b747..ab8ed31 100644 --- a/commands/fun/bite.js +++ b/commands/fun/bite.js @@ -25,7 +25,7 @@ module.exports = { if (!message.guild.members.cache.has(mention.id)) {return message.reply("That user is not in this server!");} if (message.author.id === mention.id) {return message.reply("Ew quit tryna bite yourself, that's weird.");} return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} bites ${message.guild.members.cache.get(mention.id).displayName}`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} bites ${message.guild.members.cache.get(mention.id).displayName}`, iconURL: message.author.displayAvatarURL()}) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('d93846') ]}); diff --git a/commands/fun/deathnote.js b/commands/fun/deathnote.js index 4a834ac..f08c883 100644 --- a/commands/fun/deathnote.js +++ b/commands/fun/deathnote.js @@ -110,7 +110,7 @@ module.exports = { let note = await message.channel.send({embeds: [new Discord.MessageEmbed() .setDescription(pretext) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); @@ -134,13 +134,13 @@ module.exports = { } let finalEmbed = new Discord.MessageEmbed() - .setAuthor({name: title, iconURL: message.author.avatarURL()}) + .setAuthor({name: title, iconURL: message.author.displayAvatarURL()}) .setDescription(`${text}${dns ? `\n\n_Their name is in your deathnote **${dns.against[mention.id] === 1 ? 'once' : `${dns.against[mention.id]} times`}.**_` : ''}`) .setColor('c375f0') .setFooter({text: `Natsuki${dns ? ` | ${dns.total} name${dns.total === 1 ? ' has been' : 's'} written in your deathnote!` : ''}`}) .setTimestamp(); - if (mention) {finalEmbed.setThumbnail(mention.avatarURL({size: 1024}));} + if (mention) {finalEmbed.setThumbnail(mention.displayAvatarURL({size: 1024}));} return note.edit({embeds: [finalEmbed]}); } diff --git a/commands/fun/nowplaying.js b/commands/fun/nowplaying.js index 845aae3..b90d481 100644 --- a/commands/fun/nowplaying.js +++ b/commands/fun/nowplaying.js @@ -29,7 +29,7 @@ module.exports = { stream.on('nowPlaying', t => { clearTimeout(timeout); message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: message.guild ? message.guild.members.cache.get(user.id) ? message.guild.members.cache.get(user.id).displayName : user.username : user.username, iconURL: user.avatarURL()}) + .setAuthor({name: message.guild ? message.guild.members.cache.get(user.id) ? message.guild.members.cache.get(user.id).displayName : user.username : user.username, iconURL: user.displayAvatarURL()}) .setTitle(`${saves.get(user.id)} | Now Playing`) .setDescription(`<@${user.id}> is currently listening to **${t.name}** by **${t.artist['#text']}**.\nView the song [here](${t.url}).`) .setColor("c375f0") diff --git a/commands/fun/secretsanta.js b/commands/fun/secretsanta.js index 7fcd721..67e152a 100644 --- a/commands/fun/secretsanta.js +++ b/commands/fun/secretsanta.js @@ -78,11 +78,11 @@ module.exports = { return dmch.send({embeds: [new Discord.MessageEmbed() .setTitle("Secret Santa Created!") .setDescription("Your Secret Santa has been completed! Have your members join by using `n?secretsanta join ` where the ID is the ID displayed below. You can start your secret santa when you have at least 3 members with `n?secretsanta start `. If someone joins that you don't want in your secret santa, use `n?secretsanta kick <@member|userID>`. If you want to also participate, just join the same way as everyone else.") - .setThumbnail(message.author.avatarURL({size: 1024})) + .setThumbnail(message.author.displayAvatarURL({size: 1024})) .addField("ID", `\`${id}\``, true) .addField("Owner", message.author.username, true) .setColor("01bd2f") - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } @@ -117,7 +117,7 @@ module.exports = { .addField("Owner", o.username, true) .addField("Members", `${tss.members ? tss.members.length : 0}`, true) .setColor("01bd2f") - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); diff --git a/commands/fun/slap.js b/commands/fun/slap.js index b70d054..0057e16 100644 --- a/commands/fun/slap.js +++ b/commands/fun/slap.js @@ -31,7 +31,7 @@ module.exports = { slaps.markModified(`against.${mention.id}`); slaps.save(); return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} slaps ${message.guild.members.cache.get(mention.id).displayName}`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} slaps ${message.guild.members.cache.get(mention.id).displayName}`, iconURL: message.author.displayAvatarURL()}) .setDescription(`That makes slap **#${slaps.against[mention.id]}** from you to them!`) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('d93846') diff --git a/commands/leveling/chests.js b/commands/leveling/chests.js index b290ac6..116a720 100644 --- a/commands/leveling/chests.js +++ b/commands/leveling/chests.js @@ -49,7 +49,7 @@ module.exports = { .setThumbnail(message.guild.iconURL({size: 2048})) .setDescription(`Your server now has its chest spawning enabled! Chests will spawn in ${chestCh.length ? `<#${chestCh}>` : 'any channel'}.`) .setColor("c375f0") - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); }); diff --git a/commands/leveling/levelrole.js b/commands/leveling/levelrole.js index 2f6cc34..cbcb0d4 100644 --- a/commands/leveling/levelrole.js +++ b/commands/leveling/levelrole.js @@ -64,7 +64,7 @@ module.exports = { .setThumbnail(message.guild.iconURL({size: 2048})) .setDescription(s) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } diff --git a/commands/leveling/setupleveling.js b/commands/leveling/setupleveling.js index 0532a31..7ddf572 100644 --- a/commands/leveling/setupleveling.js +++ b/commands/leveling/setupleveling.js @@ -38,7 +38,7 @@ module.exports = { .setThumbnail(message.guild.iconURL({size: 2048})) .setDescription(`Your server now has its leveling system enabled! If you enabled level up messages, you can set the channel for that using \`${prefix}levelchannel\`.\n\nAll members of your server will now gain XP as they talk. I'm a smart cookie, so don't try spamming. It won't work. Every member can gain more XP once per minute, no matter how many messages they send in that one minute.\n\nIf you want to see your level and how much more XP you need to level up, run \`${prefix}stats\`.`) .setColor("c375f0") - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); }); diff --git a/commands/leveling/stats.js b/commands/leveling/stats.js index aaa8890..b53fbe1 100644 --- a/commands/leveling/stats.js +++ b/commands/leveling/stats.js @@ -72,7 +72,7 @@ module.exports = { .addField("Level", `${xp.level}`, true) .addField("XP", `**${xp.xp}** of **${Math.ceil(100 + (((xp.level / 3) ** 2) * 2))}** needed to level up`, true) .addField(`${message.misc.mn}`, `<:monners:926736756047495218> ${tcur}`) - .setThumbnail(client.users.cache.get(u.id).avatarURL({size: 2048})) + .setThumbnail(client.users.cache.get(u.id).displayAvatarURL({size: 2048})) .setColor("c375f0") .setFooter({text: "Natsuki"}) .setTimestamp() diff --git a/commands/leveling/streak.js b/commands/leveling/streak.js index 6af74f6..0b62601 100644 --- a/commands/leveling/streak.js +++ b/commands/leveling/streak.js @@ -16,7 +16,7 @@ module.exports = { const tm = await Monners.findOne({uid: mention ? mention.id : message.author.id}); return message.channel.send(tm ? {embeds: [ new Discord.MessageEmbed() - .setAuthor({name: "Daily Streak", iconURL: mention ? mention.avatarURL() : message.author.avatarURL()}) + .setAuthor({name: "Daily Streak", iconURL: mention ? mention.displayAvatarURL() : message.author.displayAvatarURL()}) .setDescription(`${mention ? "That user's" : "Your"} streak is **${tm.daily.streak}**.`) .setFooter({text: "Natsuki"}) .setColor("c375f0") diff --git a/commands/misc/ar.js b/commands/misc/ar.js index beabbfb..e69cc13 100644 --- a/commands/misc/ar.js +++ b/commands/misc/ar.js @@ -72,7 +72,7 @@ module.exports = { .setTitle("Auto-Responses in this Server") .setDescription(string) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp(); if (mode) {embed.addField(mode === 'edit' ? "Editing" : 'Deletion', `Please say the **number** of the AR you wish to ${mode}.`);} let r = await message.channel.send({embeds: [embed]}); diff --git a/commands/misc/avatar.js b/commands/misc/avatar.js index e76b9cb..6618699 100644 --- a/commands/misc/avatar.js +++ b/commands/misc/avatar.js @@ -25,7 +25,7 @@ module.exports = { .setTitle(`${name.endsWith('s') ? `${name}'` : `${name}'s`} Avatar`) .setImage(message.guild ? message.guild.members.cache.get(member.id).displayAvatarURL({size: options.vsmall ? 128 : options.small ? 256 : 2048, dynamic: true, format: "png"}) : member.displayAvatarURL({size: options.vsmall ? 128 : options.small ? 256 : 2048, dynamic: true, format: "png"})) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) if (!options.vsmall) {avem.setTimestamp();} return message.channel.send({embeds: [avem]}); } catch (e) {console.error(e); return message.reply("Hmm, there seems to have been an error while I tried to show you that user's avatar.");} diff --git a/commands/misc/commands.js b/commands/misc/commands.js index 930de10..c7ecaf5 100644 --- a/commands/misc/commands.js +++ b/commands/misc/commands.js @@ -17,7 +17,7 @@ module.exports = { .setTitle("Commands") .setDescription(`You can use \`${prefix}help\` on any command to get more help on it.`) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp(); categories.forEach(category => ce.addField(category, Array.from(client.commands.values()).filter(command => command.meta ? command.meta.category === category : category === "Uncategorized").map(cmd => `\`${cmd.name}\``).join(', '))); return message.channel.send({embeds: [ce]}); diff --git a/commands/misc/emoji.js b/commands/misc/emoji.js index 675317c..9b8877e 100644 --- a/commands/misc/emoji.js +++ b/commands/misc/emoji.js @@ -34,7 +34,7 @@ module.exports = { .setDescription(`Name: ${spl[1] ? `\`:${spl[1]}:\`` : "Not Found"}\nID: ${spl[2].slice(0, spl[2].length - 1)}\nURL: [Here](${`https://cdn.discordapp.com/emojis/${spl[2].slice(0, spl[2].length - 1)}${spl[0].includes('a') ? '.gif' : ""}`})\nAnimated: ${spl[0].includes('a') === true}\n\nI have access: ${client.emojis.cache.has(spl[2].slice(0, spl[2].length - 1))}`) .setColor('c375f0') .setImage(`https://cdn.discordapp.com/emojis/${spl[2].slice(0, spl[2].length - 1)}${spl[0].includes('a') ? '.gif' : ""}`) - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp(); if (client.emojis.cache.has(spl[2].slice(0, spl[2].length - 1))) {finEm.setThumbnail(client.emojis.cache.get(spl[2].slice(0, spl[2].length - 1)).guild.iconURL({size: 1024}));} if (client.emojis.cache.has(spl[2].slice(0, spl[2].length - 1)) && client.emojis.cache.get(spl[2].slice(0, spl[2].length - 1)).guild.members.cache.has(message.author.id) && client.emojis.cache.get(spl[2].slice(0, spl[2].length - 1)).guild.id !== (message.guild ? message.guild.id : 1)) {finEm.addField("Server", `You're in the server this emoji is from: **${client.emojis.cache.get(spl[2].slice(0, spl[2].length - 1)).guild.name}**`);} @@ -63,7 +63,7 @@ module.exports = { .setTitle(`Emoji Lookup Results [${(x * 20) + 1}-${(x * 20) + 20} of ${lookup.size}]`) .setDescription(page) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ); if (cond) {break;} @@ -78,7 +78,7 @@ module.exports = { .setTitle(`Emoji Lookup Results - ${lookup.size}`) .setDescription(page) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } @@ -110,7 +110,7 @@ module.exports = { .setDescription(`Name: ${name ? `\`:${name}:\`` : "Not Found"}\nID: ${id}\nURL: [Here](${url})\nAnimated: ${animated === true}\n\nI have access: ${access}`) .setColor('c375f0') .setImage(url) - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp(); if (access) {finEm.setThumbnail(client.emojis.cache.get(id).guild.iconURL({size: 1024}));} if (access && client.emojis.cache.get(id).guild.members.cache.has(message.author.id) && client.emojis.cache.get(id).guild.id !== (message.guild ? message.guild.id : 1)) {finEm.addField("Server", `You're in the server this emoji is from: **${client.emojis.cache.get(id).guild.name}**`);} diff --git a/commands/misc/help.js b/commands/misc/help.js index 1755e15..d2a614b 100644 --- a/commands/misc/help.js +++ b/commands/misc/help.js @@ -18,7 +18,7 @@ module.exports = { let category; for (category of Object.keys(sorted)) { let categorySorted = []; let current = 1; - let currentEmbed = new Discord.MessageEmbed().setAuthor({name: "Help Menu", iconURL: message.author.avatarURL()}).setTitle(category).setDescription("React to control the menu! You can also specify a command name when doing the help command to get more info about it.").setColor("c375f0"); + let currentEmbed = new Discord.MessageEmbed().setAuthor({name: "Help Menu", iconURL: message.author.displayAvatarURL()}).setTitle(category).setDescription("React to control the menu! You can also specify a command name when doing the help command to get more info about it.").setColor("c375f0"); let commands = Object.keys(sorted[category]); let command; for (command of commands) { let aliases = ''; @@ -29,7 +29,7 @@ module.exports = { if (current === 5) { categorySorted.push(currentEmbed); current = 1; - currentEmbed = new Discord.MessageEmbed().setAuthor({name: "Help Menu", iconURL: message.author.avatarURL()}).setTitle(category).setDescription("React to control the menu! You can also specify a command name when doing the help command to get more info about it.").setColor("c375f0"); + currentEmbed = new Discord.MessageEmbed().setAuthor({name: "Help Menu", iconURL: message.author.displayAvatarURL()}).setTitle(category).setDescription("React to control the menu! You can also specify a command name when doing the help command to get more info about it.").setColor("c375f0"); } } if (current > 1) {categorySorted.push(currentEmbed);} @@ -43,7 +43,7 @@ module.exports = { .addField("Category", "What category would you like to view?\n:one: - Fun\n:two: - Utility\n:three: - Misc\n:four: - Developer\n:five: - Moderation\n:six: - Social\n:seven: - Leveling\n:eight: - Anime\n:nine: - **All**") .setColor('c375f0') .setFooter({text: "Natsuki | Will time out in 60 seconds."}) - .setThumbnail(client.user.avatarURL({size: 2048})) + .setThumbnail(client.user.displayAvatarURL({size: 2048})) .setTimestamp() ]}); @@ -100,7 +100,7 @@ module.exports = { if (pages.length > 1) { let help = new Pagination(message.channel, pages, message, client, true); return await help.start({endTime: 60000, user: message.author.id}).catch(() => {}); - } else {return message.channel.send({embeds: [pages[0].setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}).setTimestamp()]}).catch(() => {});} + } else {return message.channel.send({embeds: [pages[0].setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}).setTimestamp()]}).catch(() => {});} } else { let command; if (client.commands.has(args[0])) {command = client.commands.get(args[0]);} @@ -109,7 +109,7 @@ module.exports = { return message.reply(command.help ? command.help instanceof Discord.MessageEmbed - ? {embeds: [command.help.setFooter({text: "Natsuki | [optional]", iconURL: client.user.avatarURL()}).setColor("c375f0").setTimestamp()]} + ? {embeds: [command.help.setFooter({text: "Natsuki | [optional]", iconURL: client.user.displayAvatarURL()}).setColor("c375f0").setTimestamp()]} : command.help.replace(/{{p}}/g, prefix) : "I don't seem to have any help info available for that command." ); diff --git a/commands/misc/info.js b/commands/misc/info.js index 5200ee8..0bf57e4 100644 --- a/commands/misc/info.js +++ b/commands/misc/info.js @@ -19,8 +19,8 @@ module.exports = { let user = await UserData.findOne({uid: message.author.id}); return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: "About Me!", iconURL: client.users.cache.get(client.developers[Math.floor(Math.random() * client.developers.length)]).avatarURL()}) - .setThumbnail(client.user.avatarURL({size: 1024})) + .setAuthor({name: "About Me!", iconURL: client.users.cache.get(client.developers[Math.floor(Math.random() * client.developers.length)]).displayAvatarURL()}) + .setThumbnail(client.user.displayAvatarURL({size: 1024})) .setDescription(`I am created by WubzyGD#8766 and Slushie#1234 - a pair conveniently known as NatsukiDev - in JavaScript/Discord.js!\n\nI'm a powerful all-purpose bot with everything you could want or need, and I have my own set of unique skills that you won't find anywhere else ^^`) .addField("Presence", `I'm currently in **${client.guilds.cache.size}** servers, and I'm watching over approximately **${client.users.cache.size}** people!`) .addField("Restarts", `${botData.restarts}`, true) diff --git a/commands/misc/invite.js b/commands/misc/invite.js index f39e2b0..17bb54f 100644 --- a/commands/misc/invite.js +++ b/commands/misc/invite.js @@ -13,7 +13,7 @@ module.exports = { async execute(message, msg, args, cmd, prefix, mention, client) { return message.channel.send({embeds: [new Discord.MessageEmbed() .setTitle("My links!") - .setThumbnail(client.user.avatarURL({size: 2048})) + .setThumbnail(client.user.displayAvatarURL({size: 2048})) .setDescription("[Bot Invite](https://discord.com/oauth2/authorize?client_id=762701327431237644&scope=bot&permissions=1581116647)\n`->` Use this link to invite Natsuki to your server! This has all the required permissions in it that the I need to work, and it is not recommended that you change them. Doing so will make it so that some commands don't function properly or won't complete (I'll usually tell you when I'm missing a permission).\n\n[Support Server Invite](https://discord.gg/u9c2uD24wB)\n`->` Use this to join my support server! Here you can talk to the devs, suggest features, hang out with the community, get update alerts, report bugs/issues and get help, or just stop and say hi!") .setColor("c375f0") .setFooter({text: "Natsuki"}) diff --git a/commands/misc/ping.js b/commands/misc/ping.js index 5a7d87b..6bf497a 100644 --- a/commands/misc/ping.js +++ b/commands/misc/ping.js @@ -14,7 +14,7 @@ module.exports = { return message.channel.send({embeds: [new Discord.MessageEmbed() .setTitle("Client Latency") .setDescription(`Response Latency: \`${new Date().getTime() - message.createdTimestamp}ms\`\nAPI Latency: \`${client.ws.ping}ms\``) - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() .setColor('c375f0') ]}); diff --git a/commands/misc/prefix.js b/commands/misc/prefix.js index 38d0c9d..d9fa137 100644 --- a/commands/misc/prefix.js +++ b/commands/misc/prefix.js @@ -36,12 +36,12 @@ module.exports = { let upm = await message.reply("sure thing!"); await require('../../util/wait')(1750); return upm.edit({embeds: [new Discord.MessageEmbed() - .setAuthor({name: 'Prefix updated!', iconURL: message.author.avatarURL()}) + .setAuthor({name: 'Prefix updated!', iconURL: message.author.displayAvatarURL()}) .setDescription(`New prefix: \`${np}\``) .addField('Auditing Admin', `<@${message.member.id}>`, true) .addField("Notice", "Prefixes are cached, and may take up to a minute to update.") .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } diff --git a/commands/misc/serverinfo.js b/commands/misc/serverinfo.js index c1b7ef2..a180f4e 100644 --- a/commands/misc/serverinfo.js +++ b/commands/misc/serverinfo.js @@ -19,7 +19,7 @@ module.exports = { let text = ["GUILD_MESSAGE", "DM", "GUILD_NEWS_THREAD", "GUILD_PRIVATE_THREAD", "GUILD_PUBLIC_THREAD", "GUILD_NEWS", "GROUP_DM", "GUILD_STORE", "GUILD_TEXT"]; let voice = ["GUILD_VOICE", "GUILD_STAGE_VOICE"]; let siembed = new Discord.MessageEmbed() - .setAuthor({name: "Server info", iconURL: message.author.avatarURL({dynamic: true})}) + .setAuthor({name: "Server info", iconURL: message.author.displayAvatarURL({dynamic: true})}) .setTitle(tg.name) .setThumbnail(tg.iconURL({size: 2048, dynamic: true, format: 'png'})) .setDescription(`Name: \`${tg.name}\`\n\nOwner: <@${tg.ownerId}>\nBoost Level: **${tg.premiumTier === 'NONE' ? 'None' : tg.premiumTier.slice(tg.premiumTier.length - 1, tg.premiumTier.length)}**\nIcon: [URL](${tg.iconURL({size: 2048})})${tg.banner ? ` | Banner: [URL](${tg.bannerURL({size: 4096, format: 'png'})})` : ''}${tg.splash ? ` | Splash: [URL](${tg.splashURL({size: 4096, format: 'png'})})` : ''}\nID: ${tg.id}`) diff --git a/commands/misc/supportserver.js b/commands/misc/supportserver.js index 6710d2f..2a6125a 100644 --- a/commands/misc/supportserver.js +++ b/commands/misc/supportserver.js @@ -13,7 +13,7 @@ module.exports = { async execute(message, msg, args, cmd, prefix, mention, client) { return message.channel.send({embeds: [new Discord.MessageEmbed() .setTitle("Sure thing!") - .setThumbnail(client.user.avatarURL({size: 2048})) + .setThumbnail(client.user.displayAvatarURL({size: 2048})) .setDescription("Join the server with [this link](https://discord.gg/u9c2uD24wB)!\n\n`->` Here you can talk to the devs, suggest features, hang out with the community, get update alerts, report bugs/issues and get help, or just stop and say hi!") .setColor("c375f0") .setFooter({text: "Natsuki"}) diff --git a/commands/misc/userinfo.js b/commands/misc/userinfo.js index 66d790b..e5133ad 100644 --- a/commands/misc/userinfo.js +++ b/commands/misc/userinfo.js @@ -32,7 +32,7 @@ module.exports = { .addField("Account Created", `${moment.preciseDiff(Date.now(), u.createdAt)} ago`, true) .addField("Bot User?", u.bot ? "Is a bot" : "Is not a bot", true) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp(); if (message.guild) { @@ -48,7 +48,6 @@ module.exports = { if (tu.staff) {infoembed.addField('Natsuki Staff Level', tu.developer ? 'Developer' : tu.admin ? 'Admin; Audit access to the bot' : tu.staff ? 'Staff; Support but with maintenance permissions' : tu.support ? 'Support; Answers tickets and help queries' : 'Member; Does not have a staff rank.', true);} } - console.log() if (u.banner) {infoembed.setImage(u.bannerURL({size: 4096, dynamic: true, format: 'png'}));} return message.channel.send({embeds: [infoembed]}); diff --git a/commands/moderation/autorole.js b/commands/moderation/autorole.js index 4ee54b4..c312d54 100644 --- a/commands/moderation/autorole.js +++ b/commands/moderation/autorole.js @@ -28,10 +28,10 @@ module.exports = { tg.save(); return message.channel.send(new Discord.MessageEmbed() .setTitle("Join Role Updated") - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Role: ${tg.joinrole.length ? `<@&${tg.joinrole}>` : "None"}`) .setColor("c375f0") - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ); } diff --git a/commands/moderation/checkwarnings.js b/commands/moderation/checkwarnings.js index 77bb4bf..97daa22 100644 --- a/commands/moderation/checkwarnings.js +++ b/commands/moderation/checkwarnings.js @@ -39,11 +39,11 @@ module.exports = { if (cwc === mh.warnings[user.id].length) {return message.reply("That user has no uncleared warnings.");} return message.channel.send({embeds: [new Discord.MessageEmbed() .setTitle("User Warnings") - .setThumbnail(client.users.cache.get(user.id).avatarURL({size: 1024})) + .setThumbnail(client.users.cache.get(user.id).displayAvatarURL({size: 1024})) .setDescription(`For ${user.displayName}`) .addField("Warnings", ws) .setColor("c375f0") - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } diff --git a/commands/moderation/leave.js b/commands/moderation/leave.js index 90fe85b..4737408 100644 --- a/commands/moderation/leave.js +++ b/commands/moderation/leave.js @@ -41,7 +41,7 @@ module.exports = { .setTitle("Leave Channel/Message Updated") .setDescription(`This server's leave-notifying settings have been altered by ${message.author.tag}.\n\n**Channel**: <#${ch}>\n**Response Name**: \`${args[2].toLowerCase()}\``) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}) } @@ -64,7 +64,7 @@ module.exports = { .setTitle("Leave Channel/Message Updated") .setDescription(`This server's leave-notifying settings have been altered by ${message.author.tag}.\n\n**Channel**: None`) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } diff --git a/commands/moderation/response.js b/commands/moderation/response.js index e8638e0..7df88b0 100644 --- a/commands/moderation/response.js +++ b/commands/moderation/response.js @@ -68,7 +68,7 @@ module.exports = { .addField("Name/ID", args[1].toLowerCase(), true) .addField("Type", tr.responses.get(args[1].toLowerCase()).embed ? "Embed" : "Message", true) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp(); if (hasBinding) {infoEmbed.addField("Server Bindings", bm);} return message.channel.send({embeds: [infoEmbed]}); diff --git a/commands/moderation/staffrole.js b/commands/moderation/staffrole.js index 2a20aaa..0c91921 100644 --- a/commands/moderation/staffrole.js +++ b/commands/moderation/staffrole.js @@ -42,12 +42,12 @@ module.exports = { let upm = await message.reply("sure thing!"); await require('../../util/wait')(1750); return upm.edit({embeds: [new Discord.MessageEmbed() - .setAuthor({name: 'Staff role updated!', iconURL: message.author.avatarURL()}) + .setAuthor({name: 'Staff role updated!', iconURL: message.author.displayAvatarURL()}) .setDescription(`<@&${tguild.staffrole}> can now edit my settings in this server.`) .addField('Auditing Admin', `<@${message.member.id}>`, true) .addField('Role-Holders', `${message.guild.members.cache.filter(m => m.roles.cache.has(tguild.staffrole) && !client.users.cache.get(m.id).bot).size}+ members have this role`, true) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } diff --git a/commands/moderation/warn.js b/commands/moderation/warn.js index 8fb3390..a481b1e 100644 --- a/commands/moderation/warn.js +++ b/commands/moderation/warn.js @@ -47,11 +47,11 @@ module.exports = { if (cwc === mh.warnings[user.id].length) {return message.reply("That user has no uncleared warnings.");} return message.channel.send({embeds: [new Discord.MessageEmbed() .setTitle("User Warnings") - .setThumbnail(client.users.cache.get(user.id).avatarURL({size: 1024})) + .setThumbnail(client.users.cache.get(user.id).displayAvatarURL({size: 1024})) .setDescription(`For ${user.displayName}`) .addField("Warnings", ws) .setColor("c375f0") - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } diff --git a/commands/moderation/welcome.js b/commands/moderation/welcome.js index ae2969b..d687c31 100644 --- a/commands/moderation/welcome.js +++ b/commands/moderation/welcome.js @@ -41,7 +41,7 @@ module.exports = { .setTitle("Welcome Channel/Message Updated") .setDescription(`This server's member-welcoming settings have been altered by ${message.author.tag}.\n\n**Channel**: <#${ch}>\n**Response Name**: \`${args[2].toLowerCase()}\``) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}) } @@ -64,7 +64,7 @@ module.exports = { .setTitle("Welcome Channel/Message Updated") .setDescription(`This server's member-welcoming settings have been altered by ${message.author.tag}.\n\n**Channel**: None`) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } diff --git a/commands/social/bio.js b/commands/social/bio.js index 758f254..6a064dc 100644 --- a/commands/social/bio.js +++ b/commands/social/bio.js @@ -23,10 +23,10 @@ module.exports = { if (!pud || !pud.bio || !pud.bio.length) {return message.reply(person === message.author.id ? "You don't have a bio set!" : "That user has no bio for me to show you!");} return message.channel.send({embeds: [new Discord.MessageEmbed() .setTitle(`Bio for ${message.guild ? message.guild.members.cache.get(person).displayName : message.author.username}`) - .setThumbnail(client.users.cache.get(person).avatarURL({size: 2048})) + .setThumbnail(client.users.cache.get(person).displayAvatarURL({size: 2048})) .setDescription(pud.bio) .setColor(pud.color && pud.color.length ? pud.color : 'c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } @@ -45,10 +45,10 @@ module.exports = { tu.save(); return message.channel.send({embeds: [new Discord.MessageEmbed() .setTitle(`Bio Set!`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(tu.bio) .setColor(tu.color && tu.color.length ? tu.color : 'c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } diff --git a/commands/social/bonk.js b/commands/social/bonk.js index d78c068..d8c55ab 100644 --- a/commands/social/bonk.js +++ b/commands/social/bonk.js @@ -21,10 +21,10 @@ module.exports = { if (!args.length) { return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${message.guild ? message.member.displayName : message.author.username} needs a good bonk!`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Give them one with \`${prefix}bonk @${message.member.displayName}\`!`) .setColor('dda0dd') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} : "I fucking dare you to hit me." );} @@ -38,7 +38,7 @@ module.exports = { bonk.markModified(`against.${mention.id}`); bonk.save(); return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} bonks ${message.guild.members.cache.get(mention.id).displayName}!...ouch! `, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} bonks ${message.guild.members.cache.get(mention.id).displayName}!...ouch! `, iconURL: message.author.displayAvatarURL()}) .setDescription(`You've bonked them **${bonk.against[mention.id] === 1 ? 'once' : `${bonk.against[mention.id]} times!`}**`) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('dda0dd') diff --git a/commands/social/creampie.js b/commands/social/creampie.js index 21e5475..ba95e0c 100644 --- a/commands/social/creampie.js +++ b/commands/social/creampie.js @@ -20,10 +20,10 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${name} needs a creampie!`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Help with their..ahem..problem..with \`${prefix}creampie @${name}\`!`) .setColor('fffdd0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} : "Do. Not. Touch. Me." );} @@ -34,7 +34,7 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; let uname = message.guild.members.cache.get(mention.id).displayName; return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives a massive creampie to ${message.guild.members.cache.get(mention.id).displayName}..Tasty!`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives a massive creampie to ${message.guild.members.cache.get(mention.id).displayName}..Tasty!`, iconURL: message.author.displayAvatarURL()}) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('fffdd0') ]}); diff --git a/commands/social/feed.js b/commands/social/feed.js index caf3946..d9004b0 100644 --- a/commands/social/feed.js +++ b/commands/social/feed.js @@ -20,10 +20,10 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${name} is hungry, why not feed them?`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Bless someone with some food with \`${prefix}feed @${name}\`!`) .setColor('bb0a1e') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} : "Sorry..I'm kinda full right now." );} @@ -34,7 +34,7 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; let uname = message.guild.members.cache.get(mention.id).displayName; return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} feeds ${message.guild.members.cache.get(mention.id).displayName} a delicous treat!`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} feeds ${message.guild.members.cache.get(mention.id).displayName} a delicous treat!`, iconURL: message.author.displayAvatarURL()}) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('fed8b1') ]}); diff --git a/commands/social/fuck.js b/commands/social/fuck.js index 9cd53e5..969e87f 100644 --- a/commands/social/fuck.js +++ b/commands/social/fuck.js @@ -21,10 +21,10 @@ module.exports = { if (!args.length) { return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${message.guild ? message.member.displayName : message.author.username} is horny!`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Show them some love with \`${prefix}fuck @${message.member.displayName}\`!`) .setColor('dda0dd') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} : "You can't bang me.......only Wubzy can." );} @@ -48,7 +48,7 @@ module.exports = { fuck.markModified(`against.${mention.id}`); fuck.save(); return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} bangs ${message.guild.members.cache.get(mention.id).displayName}!...Kinky! `, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} bangs ${message.guild.members.cache.get(mention.id).displayName}!...Kinky! `, iconURL: message.author.displayAvatarURL()}) .setDescription(`You've banged them **${fuck.against[mention.id] === 1 ? 'once' : `${fuck.against[mention.id]} times!`}**`) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('dda0dd') diff --git a/commands/social/handhold.js b/commands/social/handhold.js index 28a96c7..c276eb8 100644 --- a/commands/social/handhold.js +++ b/commands/social/handhold.js @@ -20,10 +20,10 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${name} is feeling a little lonely. If only someone would hold their hand...`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Let them know you love them with \`${prefix}handhold @${name}\`!`) .setColor('328ba8') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} : "Yikes... I'm kinda germaphobic you know. Maybe try asking in a server?" );} @@ -34,7 +34,7 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; let uname = message.guild.members.cache.get(mention.id).displayName; return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} holds ${uname.endsWith('s') ? `${uname}'` : `${uname}'s`} hand!`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} holds ${uname.endsWith('s') ? `${uname}'` : `${uname}'s`} hand!`, iconURL: message.author.displayAvatarURL()}) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('d428a0') ]}); diff --git a/commands/social/heal.js b/commands/social/heal.js index f27e846..e41b1d1 100644 --- a/commands/social/heal.js +++ b/commands/social/heal.js @@ -20,10 +20,10 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${name} needs healing!`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Lend them some help with \`${prefix}heal @${name}\`!`) .setColor('ffc0cb') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} : "I am immortal, I don't need healing." );} @@ -34,7 +34,7 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; let uname = message.guild.members.cache.get(mention.id).displayName; return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} heals ${message.guild.members.cache.get(mention.id).displayName}!`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} heals ${message.guild.members.cache.get(mention.id).displayName}!`, iconURL: message.author.displayAvatarURL()}) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('ffc0cb') ]}); diff --git a/commands/social/hug.js b/commands/social/hug.js index 6472fad..4b9a4ab 100644 --- a/commands/social/hug.js +++ b/commands/social/hug.js @@ -21,10 +21,10 @@ module.exports = { if (!args.length) { return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${message.guild ? message.member.displayName : message.author.username} needs a hug!`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Show them some love with \`${prefix}hug @${message.member.displayName}\`!`) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} : "Sorry, but I'm a bot, and I can't hug you. Go into a server and ask for some hugs!" );} @@ -38,7 +38,7 @@ module.exports = { hugs.markModified(`against.${mention.id}`); hugs.save(); return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives ${message.guild.members.cache.get(mention.id).displayName} a hug!`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives ${message.guild.members.cache.get(mention.id).displayName} a hug!`, iconURL: message.author.displayAvatarURL()}) .setDescription(`You've hugged them **${hugs.against[mention.id] === 1 ? 'once' : `${hugs.against[mention.id]} times!`}**`) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('52c7bb') diff --git a/commands/social/kill.js b/commands/social/kill.js index 2d06868..eaaa5f0 100644 --- a/commands/social/kill.js +++ b/commands/social/kill.js @@ -20,10 +20,10 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${name} is feeling homicidal..watch out!`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Brutally murder someone with \`${prefix}kill @${name}\`!`) .setColor('bb0a1e') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} : "You can't kill me..don't even try." );} @@ -34,7 +34,7 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; let uname = message.guild.members.cache.get(mention.id).displayName; return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} brutally murders ${message.guild.members.cache.get(mention.id).displayName}..Rest in Peace.`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} brutally murders ${message.guild.members.cache.get(mention.id).displayName}..Rest in Peace.`, iconURL: message.author.displayAvatarURL()}) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('bb0a1e') ]}); diff --git a/commands/social/kiss.js b/commands/social/kiss.js index e089be9..438cbbe 100644 --- a/commands/social/kiss.js +++ b/commands/social/kiss.js @@ -18,10 +18,10 @@ module.exports = { if (!args.length) { return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${message.guild ? message.member.displayName : message.author.username} wants a kiss!`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Give them a little kiss with \`${prefix}kiss @${message.member.displayName}\`!`) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} : "I'm not really into that kind of thing. Maybe try asking in a server?" );} @@ -30,7 +30,7 @@ module.exports = { if (!message.guild.members.cache.has(mention.id)) {return message.reply("That user is not in this server!");} if (message.author.id === mention.id) {return message.reply("A self-kiss ought to be a little hard, don't you think?");} return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} kisses ${message.guild.members.cache.get(mention.id).displayName}`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} kisses ${message.guild.members.cache.get(mention.id).displayName}`, iconURL: message.author.displayAvatarURL()}) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('d428a0') ]}); diff --git a/commands/social/pat.js b/commands/social/pat.js index 8a9068f..e85df17 100644 --- a/commands/social/pat.js +++ b/commands/social/pat.js @@ -22,10 +22,10 @@ module.exports = { if (!args.length) { return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${message.guild ? message.member.displayName : message.author.username} wants some pats!`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Give them some with \`${prefix}pat @${message.member.displayName}\`!`) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} : "Sorry, but I'm only able to pat one person, and it's not you ^^" );} @@ -39,7 +39,7 @@ module.exports = { pats.markModified(`against.${mention.id}`); pats.save(); return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} pats ${message.guild.members.cache.get(mention.id).displayName}!`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} pats ${message.guild.members.cache.get(mention.id).displayName}!`, iconURL: message.author.displayAvatarURL()}) .setDescription(`You've given them **${pats.against[mention.id]}** pat${pats.against[mention.id] === 1 ? '' : 's'}!`) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('52c7bb') diff --git a/commands/social/simp.js b/commands/social/simp.js index bd4530f..0dc4423 100644 --- a/commands/social/simp.js +++ b/commands/social/simp.js @@ -20,10 +20,10 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${name} is feeling lonely..maybe you should simp for them!`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Fall madly in love with someone with \`${prefix}simp @${name}\`!`) .setColor('ffb6c1') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} : "Nobody simps for me. That's just weird. Be weird to someone else." );} @@ -34,7 +34,7 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; let uname = message.guild.members.cache.get(mention.id).displayName; return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} falls madly in love with ${message.guild.members.cache.get(mention.id).displayName}..what a simp.`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} falls madly in love with ${message.guild.members.cache.get(mention.id).displayName}..what a simp.`, iconURL: message.author.displayAvatarURL()}) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('ffb6c1') ]}); diff --git a/commands/social/snuggle.js b/commands/social/snuggle.js index 663026a..fca6829 100644 --- a/commands/social/snuggle.js +++ b/commands/social/snuggle.js @@ -22,10 +22,10 @@ module.exports = { if (!args.length) { return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${message.guild ? message.member.displayName : message.author.username} needs a snuggle!`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Show them some love with \`${prefix}snuggle @${message.member.displayName}\`!`) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} : "Sorry, but I'm a bot, and I can't snuggle you. Go into a server and ask for some snuggles!" );} @@ -39,7 +39,7 @@ module.exports = { snuggles.markModified(`against.${mention.id}`); snuggles.save(); return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives ${message.guild.members.cache.get(mention.id).displayName} a snuggle!`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives ${message.guild.members.cache.get(mention.id).displayName} a snuggle!`, iconURL: message.author.displayAvatarURL()}) .setDescription(`You've snuggled them **${snuggles.against[mention.id] === 1 ? 'once' : `${snuggles.against[mention.id]} times!`}**`) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('52c7bb') diff --git a/commands/social/spank.js b/commands/social/spank.js index 17c62ab..8eac3c1 100644 --- a/commands/social/spank.js +++ b/commands/social/spank.js @@ -29,7 +29,7 @@ module.exports = { spanks.markModified(`against.${mention.id}`); spanks.save(); return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives ${message.guild.members.cache.get(mention.id).displayName} a spank!`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} gives ${message.guild.members.cache.get(mention.id).displayName} a spank!`, iconURL: message.author.displayAvatarURL()}) .setDescription(`You've spanked them **${spanks.against[mention.id] === 1 ? 'once' : `${spanks.against[mention.id]} times!`}**`) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('52c7bb') diff --git a/commands/social/wink.js b/commands/social/wink.js index 9234b7e..bf8c29b 100644 --- a/commands/social/wink.js +++ b/commands/social/wink.js @@ -20,10 +20,10 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; return message.channel.send(message.guild ? {embeds: [new Discord.MessageEmbed() .setTitle(`${name} is feeling flirty, maybe you should give them a wink!`) - .setThumbnail(message.author.avatarURL({size: 2048})) + .setThumbnail(message.author.displayAvatarURL({size: 2048})) .setDescription(`Give them a little wink with \`${prefix}wink @${name}\`!`) .setColor('8a2be2') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp()]} : "W-why are you winking at me privately..do it in a server! " );} @@ -34,7 +34,7 @@ module.exports = { let name = message.guild ? message.member.displayName : message.author.username; let uname = message.guild.members.cache.get(mention.id).displayName; return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} winks at ${message.guild.members.cache.get(mention.id).displayName}!`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `${message.guild ? message.member.displayName : message.author.username} winks at ${message.guild.members.cache.get(mention.id).displayName}!`, iconURL: message.author.displayAvatarURL()}) .setImage(String(Array.from(saves.values())[Math.floor(Math.random() * saves.size)])) .setColor('8a2be2') ]}); diff --git a/commands/utility/coinflip.js b/commands/utility/coinflip.js index cf4fd04..d00bca0 100644 --- a/commands/utility/coinflip.js +++ b/commands/utility/coinflip.js @@ -40,7 +40,7 @@ module.exports = { let flip = [1,2][Math.floor(Math.random() * 2)]; let coinEmbed = new Discord.MessageEmbed() - .setAuthor({name: "Coin Flip", iconURL: message.author.avatarURL()}) + .setAuthor({name: "Coin Flip", iconURL: message.author.displayAvatarURL()}) .setThumbnail(flip === 1 ? "https://cdn.discordapp.com/attachments/563198656241598484/655514893033799700/SmartSelect_20191214-140108_Samsung_Internet.jpg" : "https://cdn.discordapp.com/attachments/563198656241598484/655514881293811753/SmartSelect_20191214-140131_Samsung_Internet.jpg") .setDescription(`Flipped by ${message.guild ? message.member.displayName : message.author.username}.\nThe result is **${flip === 1 ? "Heads" : "Tails"}**`) .setFooter({text: "Natsuki"}) diff --git a/commands/utility/monitor.js b/commands/utility/monitor.js index 0690e9c..e8c7671 100644 --- a/commands/utility/monitor.js +++ b/commands/utility/monitor.js @@ -58,7 +58,7 @@ module.exports = { .setThumbnail(message.guild.iconURL({size: 1024})) .setDescription("*These statistics have an accuracy of about 10 minutes.*") .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp(); if (thm) {emb.addField("Top Channels", chs).addField("Top Members", us);} diff --git a/commands/utility/randnum.js b/commands/utility/randnum.js index 6d7431f..fb155cb 100644 --- a/commands/utility/randnum.js +++ b/commands/utility/randnum.js @@ -44,7 +44,7 @@ module.exports = { .setTitle(`Random Number${num.length === 1 ? '' : 's'}`) .setDescription(res) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); } diff --git a/commands/utility/robemote.js b/commands/utility/robemote.js index 2468b07..d4898e4 100644 --- a/commands/utility/robemote.js +++ b/commands/utility/robemote.js @@ -29,7 +29,7 @@ module.exports = { rc.stop(); return message.guild.emojis.create(`https://cdn.discordapp.com/emojis/${r.emoji.id}`, r.emoji.name) .then(e => message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: message.member.displayName, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.member.displayName, iconURL: message.author.displayAvatarURL()}) .setTitle("Emoji Created!") .setThumbnail(`https://cdn.discordapp.com/emojis/${e.id}${e.animated ? '.gif': ''}`) .setDescription(`Name: \`:${e.name}:\`\nID: ${e.id}\nURL: [Click Me](https://cdn.discordapp.com/emojis/${e.id})`) @@ -61,7 +61,7 @@ module.exports = { : args[0], args[1] || args[0].split(':')[1] ).then(e => message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: message.member.displayName, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.member.displayName, iconURL: message.author.displayAvatarURL()}) .setTitle("Emoji Created!") .setThumbnail(`https://cdn.discordapp.com/emojis/${e.id}${e.animated ? '.gif': ''}`) .setDescription(`Name: \`:${e.name}:\`\nID: ${e.id}\nURL: [Click Me](https://cdn.discordapp.com/emojis/${e.id}${e.animated ? '.gif': ''})`) diff --git a/commands/utility/todo.js b/commands/utility/todo.js index b8c774b..3a8342b 100644 --- a/commands/utility/todo.js +++ b/commands/utility/todo.js @@ -49,7 +49,7 @@ module.exports = { let totalItems = 0; Object.keys(td.lists).forEach(l => totalItems += td.lists[l].length); return message.channel.send({content: `Your list was successfully created!`, embeds: [new Discord.MessageEmbed() - .setAuthor({name: message.guild ? message.member.displayName : message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.guild ? message.member.displayName : message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`List Created: ${ln}`) .setDescription(`You now have **${Object.keys(td.lists).length}** lists (including your personal list) with a total of **${totalItems} items**.`) .addField("Managing", `-To add to your new list, use \`${prefix}todo list ${ln} add\`.\n-To view its items, use \`${prefix}todo list ${ln} view\`.\n-To delete this list, use \`${prefix}todo list delete ${ln}\`.`) @@ -64,7 +64,7 @@ module.exports = { let s = ``; let lists = Object.keys(td.lists); let i; for (i = 0; i < lists.length; i++) {if (lists[i] === 'quick') {continue;} s += `**${i}**. \`${lists[i]}\` - ${td.lists[lists[i]].length} ${td.lists[lists[i]].length === 1 ? 'item' : 'items'}\n`;} message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: message.guild ? message.member.displayName : message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.guild ? message.member.displayName : message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`Your ToDo lists`) .setDescription(s) .addField("Deletion", "To delete a list, please reply with the **name** of the list you'd like to delete.") @@ -92,7 +92,7 @@ module.exports = { let i; for (i = 0; i < lists.length; i++) {if (lists[i] === 'quick') {continue;} s += `**${i}**. \`${lists[i]}\` - ${td.lists[lists[i]].length} ${td.lists[lists[i]].length === 1 ? 'item' : 'items'}\n`;} s += `\nPlus ${td.lists.quick.length} items in your quick list.`; return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: message.guild ? message.member.displayName : message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.guild ? message.member.displayName : message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(`Your ToDo lists`) .setDescription(s) .setColor("c375f0") @@ -118,7 +118,7 @@ module.exports = { td.markModified(`lists.${list}`); td.save(); return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: "To-Do Added!", iconURL: message.author.avatarURL()}) + .setAuthor({name: "To-Do Added!", iconURL: message.author.displayAvatarURL()}) .setDescription(`${item}\n\`->\` In ${list === 'quick' ? "your personal quick list" : `list \`${list}\``}`) .setColor('c375f0') ]}); @@ -157,7 +157,7 @@ module.exports = { td.markModified(`lists.${list}`); td.save(); let resembed = new Discord.MessageEmbed() - .setAuthor({name: `To-Do Item${items.length > 1 ? 's' : ''} Added!`, iconURL: message.author.avatarURL()}) + .setAuthor({name: `To-Do Item${items.length > 1 ? 's' : ''} Added!`, iconURL: message.author.displayAvatarURL()}) .setDescription(`In ${list === 'quick' ? "your personal quick list" : `list \`${list}\``}\n- ${items.join('\n- ')}`) .setColor('c375f0'); if (reachedMax) {resembed.addField("Notice", "The list addition process was automatically stopped because your list reached the maximum limit of 25 items.");} @@ -174,7 +174,7 @@ module.exports = { let n = 0; let i; for (i of td.lists[list]) {n++; s += `**${n}.** ${i}\n`;} return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: message.guild ? message.member.displayName : message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.guild ? message.member.displayName : message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(list === "quick" ? "Personal Quick List" : `List: "${list}"`) .setDescription(s) .setColor("c375f0") @@ -189,7 +189,7 @@ module.exports = { let id = ['last', 'l'].includes(args[1].toLowerCase().trim()) ? td.lists[list].length : Number(args[1]); if (id < 1 || id > td.lists[list].length) {return message.channel.send("Your number was either below 1 or doesn't have a list item to match it.");} return message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: message.guild ? message.member.displayName : message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.guild ? message.member.displayName : message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(list === "quick" ? "Personal Quick List" : `List "${list}"`) .setDescription(`List item **#${id}**\n\`->\` ${td.lists[list][id-1]}`) .setColor("c375f0") @@ -209,7 +209,7 @@ module.exports = { let s = ''; let n = 0; let i; for (i of td.lists[list]) {n++; s += `**${n}.** ${i}\n`;} await message.channel.send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: message.guild ? message.member.displayName : message.author.username, iconURL: message.author.avatarURL()}) + .setAuthor({name: message.guild ? message.member.displayName : message.author.username, iconURL: message.author.displayAvatarURL()}) .setTitle(list === "quick" ? "Personal Quick List" : `List "${list}"`) .setDescription(s) .addField("Deletion", "To remove an item from your list, please reply with the number of the item you no longer want on your list.") diff --git a/events/channelCreate.js b/events/channelCreate.js index 70a57d6..07b095d 100644 --- a/events/channelCreate.js +++ b/events/channelCreate.js @@ -8,7 +8,7 @@ module.exports = (client, channel) => { .setTitle("New Channel") .setDescription(`<#${channel.id}> || **#${channel.name}**${channel.parent && channel.parent.name ? `\nCategory: **${channel.parent.name}**` : ''}`) .setColor('936b30') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); }} diff --git a/events/channelDelete.js b/events/channelDelete.js index bdf482e..474096d 100644 --- a/events/channelDelete.js +++ b/events/channelDelete.js @@ -7,7 +7,7 @@ module.exports = (client, channel) => { .setTitle("Channel Deleted") .setDescription(`Name: **#${channel.name}**${channel.parent && channel.parent.name ? `\nCategory: **${channel.parent.name}**` : ''}`) .setColor('936b30') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() ]}); }} diff --git a/events/guildCreate.js b/events/guildCreate.js index 77dda7e..a4eff58 100644 --- a/events/guildCreate.js +++ b/events/guildCreate.js @@ -15,7 +15,7 @@ module.exports = async (client, guild) => { botData.save(); client.guilds.cache.get('762707532417335296').channels.cache.get('766031709866557471').send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: 'New Guild Added', iconURL: client.users.cache.get(guild.ownerId).avatarURL()}) + .setAuthor({name: 'New Guild Added', iconURL: client.users.cache.get(guild.ownerId).displayAvatarURL()}) .setTitle(guild.name) .setThumbnail(guild.iconURL({size: 2048})) .addField('Owner', `${client.users.cache.get(guild.ownerId).tag}`, true) diff --git a/events/guildDelete.js b/events/guildDelete.js index 00e761c..353659f 100644 --- a/events/guildDelete.js +++ b/events/guildDelete.js @@ -14,7 +14,7 @@ module.exports = async (client, guild) => { botData.save(); client.guilds.cache.get('762707532417335296').channels.cache.get('766031709866557471').send({embeds: [new Discord.MessageEmbed() - .setAuthor({name: 'Server Lost', iconURL: client.users.cache.get(guild.ownerId).avatarURL()}) + .setAuthor({name: 'Server Lost', iconURL: client.users.cache.get(guild.ownerId).displayAvatarURL()}) .setTitle(guild.name) .setThumbnail(guild.iconURL({size: 2048})) .addField('Owner', `${client.users.cache.get(guild.ownerId).tag}`, true) diff --git a/events/messageDelete.js b/events/messageDelete.js index 0ed4866..1e0eb63 100644 --- a/events/messageDelete.js +++ b/events/messageDelete.js @@ -17,8 +17,8 @@ module.exports = async (client, message) => { let mde = new Discord.MessageEmbed() .setTitle('Message Deleted') .setDescription(`Sent by <@${message.author.id}> | In <#${message.channel.id}>`) - .setThumbnail(message.author.avatarURL({size: 1024})) - .setColor('ecff8f').setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}).setTimestamp(); + .setThumbnail(message.author.displayAvatarURL({size: 1024})) + .setColor('ecff8f').setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}).setTimestamp(); if (message.content && message.content.length) {mde.addField("Message", "`-> `" + message.content.toString());} if (message.attachments.size) { if (message.attachments.first().url.includes(".png") || message.attachments.first().url.includes(".jpg") || message.attachments.first().url.includes(".gif")) {/*console.log('e');*/ try {mde.setImage(message.attachments.first().url);} catch {}} diff --git a/events/messageReactionAdd.js b/events/messageReactionAdd.js index 2872309..2fe3bac 100644 --- a/events/messageReactionAdd.js +++ b/events/messageReactionAdd.js @@ -16,9 +16,9 @@ module.exports = async (client, reaction, user) => { let starEmbed = new Discord.MessageEmbed() .setTitle('Starred Message!') .setDescription(`Sent by ${reaction.message.member.displayName} (<@${reaction.message.author.id}>) || Channel: ${reaction.message.channel.name} (<#${reaction.message.channel.id}>)\n[Jump to Message](${reaction.message.url})`) - .setThumbnail(reaction.message.author.avatarURL({size: 2048})) + .setThumbnail(reaction.message.author.displayAvatarURL({size: 2048})) .setColor('ebb931') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp(); if (reaction.message.content.length) {starEmbed.addField("Message", reaction.message.content);} starEmbed diff --git a/events/messageUpdate.js b/events/messageUpdate.js index f0fcdad..6406f39 100644 --- a/events/messageUpdate.js +++ b/events/messageUpdate.js @@ -20,10 +20,10 @@ module.exports = async (client, oldM, newM) => { let embed = new Discord.MessageEmbed() .setTitle('Message Edited') .setDescription(`Sent by <@${oldM.author.id}> | In <#${oldM.channel.id}> | [See Message](${oldM.url})`) - .setThumbnail(oldM.author.avatarURL({size: 1024})) + .setThumbnail(oldM.author.displayAvatarURL({size: 1024})) .addField("Old Message", "`-> `" + oldM.content.toString()) .addField("New Message", "`-> `" + newM.content.toString()) - .setColor('8034eb').setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}).setTimestamp(); + .setColor('8034eb').setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}).setTimestamp(); if (newM.attachments.size && ['.png', '.jpg', '.gif'].includes(newM.attachments.first().url.slice(newM.attachments.first().url.length - 4, newM.attachments.first().url.length))) {embed.setImage(newM.attachments.first().url);} oldM.guild.channels.cache.get(ts).send({embeds: [embed]}).catch(() => {}); }} diff --git a/events/voiceStateUpdate.js b/events/voiceStateUpdate.js index fdf525d..6092153 100644 --- a/events/voiceStateUpdate.js +++ b/events/voiceStateUpdate.js @@ -8,16 +8,16 @@ module.exports = async (client, oldState, voice) => { if (oldState.channelId && voice.channelId) { voice.guild.channels.cache.get(ts).send({embeds: [new Discord.MessageEmbed() .setTitle(`Member Switched VCs`) - .setThumbnail(client.users.cache.get(oldState.member.id).avatarURL({size: 2048, dynamic: true})) + .setThumbnail(client.users.cache.get(oldState.member.id).displayAvatarURL({size: 2048, dynamic: true})) .setDescription(`Old Channel: **${oldState.channel.name}**\nNew Channel: **${voice.channel.name}**`) - .setColor('e86b8f').setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}).setTimestamp() + .setColor('e86b8f').setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}).setTimestamp() ]}).catch(() => {}); } else { voice.guild.channels.cache.get(ts).send({embeds: [new Discord.MessageEmbed() .setTitle(`Member ${voice.channelId ? 'Joined' : 'Left'} VC`) - .setThumbnail(client.users.cache.get(oldState.member.id).avatarURL({size: 2048, dynamic: true})) + .setThumbnail(client.users.cache.get(oldState.member.id).displayAvatarURL({size: 2048, dynamic: true})) .setDescription(`Channel: **${voice.channelId ? voice.channel.name : oldState.channel.name}**`) - .setColor('e86b8f').setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}).setTimestamp() + .setColor('e86b8f').setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}).setTimestamp() ]}).catch(() => {}); } }} diff --git a/slash/8ball.js b/slash/8ball.js index b164b8a..3c03a55 100644 --- a/slash/8ball.js +++ b/slash/8ball.js @@ -24,7 +24,7 @@ module.exports = (client) => { /*Neutral Responses */ ,"Maybe", "I'm not sure", "I'll think about it", "Uhh Natsuki isn't here right now. I can take a message?", "I'm sure if you look deep within your heart, which is currently all over that tree, you'll find the answer", "I mean, if you think so...", "I don't have an opinion on that.", "I'll choose to remain silent." ]; return await interaction.reply({embeds: [new Discord.MessageEmbed() - .setAuthor({name: "8ball Question", iconURL: interaction.user.avatarURL()}) + .setAuthor({name: "8ball Question", iconURL: interaction.user.displayAvatarURL()}) .setDescription("**Question:** " + interaction.options.getString('question') + "\n**Answer:** " + responses[Math.floor(Math.random() * responses.length)]) .setColor("c375f0") .setFooter({text: `Asked by ${interaction.guild ? interaction.member.displayName : interaction.user.username} | Natsuki`}) diff --git a/slash/userinfo.js.dev b/slash/userinfo.js.dev index d87bd27..b1cdb7d 100644 --- a/slash/userinfo.js.dev +++ b/slash/userinfo.js.dev @@ -31,11 +31,11 @@ module.exports = (client) => { let infoembed = new Discord.MessageEmbed() .setTitle(`User Info for ${name}`) .setDescription(`Requested by ${interaction.guild ? interaction.member.displayName : interaction.user.username}`) - .setThumbnail(client.users.cache.get(person.id).avatarURL({size: 2048})) + .setThumbnail(client.users.cache.get(person.id).displayAvatarURL({size: 2048})) .addField("Account Created", moment(client.users.cache.get(person.id).createdAt).fromNow(), true) .addField("Bot User?", client.users.cache.get(person.id).bot ? "Is a bot" : "Is not a bot", true) .setColor('c375f0') - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp(); if (interaction.guild) { diff --git a/util/anime/anisearch.js b/util/anime/anisearch.js index 7b41e43..ef8c2ce 100644 --- a/util/anime/anisearch.js +++ b/util/anime/anisearch.js @@ -12,11 +12,11 @@ module.exports = async (message, client, search, threshold=-10000, type='full') let an = ani.plot ? ani : await Ani.findOne({id: client.misc.cache.anime.get(ani)}); let rte = new Discord.MessageEmbed() .setTitle(an.name) - .setAuthor({name: 'Anime Search', iconURL: message.author.avatarURL()}) + .setAuthor({name: 'Anime Search', iconURL: message.author.displayAvatarURL()}) .setDescription(`**Name:** ${an.name}\n**Japanese Name:** ${an.japname}\n\n**Publishers:** ${an.publishers.join(", ")}\n**Studios:** ${an.studios.join(", ")}`) .setColor("c375f0") .setImage(an.thumbnail) - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp() if (type === 'full') { rte diff --git a/util/anime/charsearch.js b/util/anime/charsearch.js index 582addf..f3aa07f 100644 --- a/util/anime/charsearch.js +++ b/util/anime/charsearch.js @@ -17,12 +17,12 @@ module.exports = async (message, client, search, threshold=-10000, type='full') cch.images.push(cch.thumbnail); let rte = new Discord.MessageEmbed() .setTitle(cch.name) - .setAuthor({name: 'Character Search', iconURL: message.author.avatarURL()}) + .setAuthor({name: 'Character Search', iconURL: message.author.displayAvatarURL()}) .setDescription(`**Name:** ${cch.name}`) .addField('Other', `**Anime**: ${forceAni ? cch.anime : `${ani.name} | ${ani.japname} | \`${ani.id}\``}\n\n**Gender**: ${cch.gender}\n`) .setColor("c375f0") .setImage(cch.images[Math.floor(Math.random() * cch.images.length)]) - .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()}) + .setFooter({text: "Natsuki", iconURL: client.user.displayAvatarURL()}) .setTimestamp(); if (type === 'full') { rte.addField("Loved by", `**${cch.loved}** Natsuki user${cch.loved === 1 ? '' : 's'}!\n\`char love ${cch.name}\``); diff --git a/util/mention.js b/util/mention.js index d0e098e..434ff48 100644 --- a/util/mention.js +++ b/util/mention.js @@ -14,7 +14,7 @@ module.exports = async(message, msg, args, cmd, prefix, mention, client) => { client.misc.statusPings.get(message.guild.id).set(mention.id, new Date()); let m = await message.channel.send({embeds: [ new Discord.MessageEmbed() - .setAuthor({name: mention.tag, iconURL: mention.avatarURL()}) + .setAuthor({name: mention.tag, iconURL: mention.displayAvatarURL()}) .setDescription(`That user ${tu.statustype === 'dnd' ? 'wishes not to be disturbed' : 'is AFK'}. Reason: ${tu.statusmsg}.${tu.statussetat ? `\n\n(This status was set ${moment(tu.statussetat.getTime()).fromNow()})` : ''}`) .setColor('c375f0') ] diff --git a/util/oncommand.js b/util/oncommand.js index d65e1a5..b5218bb 100644 --- a/util/oncommand.js +++ b/util/oncommand.js @@ -10,7 +10,7 @@ module.exports = async (message, msg, args, cmd, prefix, mention, client) => { if (tu.commands > 50 && !tu.msg) { await message.author.send({embeds: [new Discord.MessageEmbed() - .setThumbnail(client.user.avatarURL({size: 2048})) + .setThumbnail(client.user.displayAvatarURL({size: 2048})) .setDescription(`Hey there **${message.author.username}**! Looks like you've used my commands over **50 times**${tu.commands > 51 ? ` (${tu.commands} to be exact)` : ''}!\nI hope you're enjoying the wonderful things I have to offer, because I've enjoyed offering them to you.`) .addField("What next?", "If you're enjoying what I do, you can [join my support server](https://discord.gg/u9c2uD24wB) to leave feedback and say hi to my developers. You can also consider [giving the repository a star](https://github.com/NatsukiDev/Natsuki) to show your support! I look forward to my time with you in the future <:hearty:812130944319750144>") .setFooter({text: "Natsuki"}) diff --git a/util/pagination.js b/util/pagination.js index 83322c9..9afb725 100644 --- a/util/pagination.js +++ b/util/pagination.js @@ -32,7 +32,7 @@ class Pagination { } } await this.message.edit({ embeds: [this.pages[page] - .setFooter({ text: `Natsuki | Page ${page + 1} of ${this.pages.length}`, iconURL: this.client.user.avatarURL() }) + .setFooter({ text: `Natsuki | Page ${page + 1} of ${this.pages.length}`, iconURL: this.client.user.displayAvatarURL() }) .setTimestamp()] }); this.currentPage = page; @@ -118,7 +118,7 @@ class Pagination { this.controllers.collector.stop(); let fe = this.getCurrentPage(); fe.setDescription(`${fe.description}\n\n*This menu has ended, start a new one to interact with it!*`); - fe.setFooter({ text: `Menu Ended${fe.footer && fe.footer.text && fe.footer.text.length ? ` | ${fe.footer.text}` : ''}`, iconURL: this.client.user.avatarURL() }); + fe.setFooter({ text: `Menu Ended${fe.footer && fe.footer.text && fe.footer.text.length ? ` | ${fe.footer.text}` : ''}`, iconURL: this.client.user.displayAvatarURL() }); await this.message.edit({ embeds: [fe] }); clearInterval(this.timeoutInterval); return this; diff --git a/util/ts/pagination.ts b/util/ts/pagination.ts index d22968d..efbeb5a 100644 --- a/util/ts/pagination.ts +++ b/util/ts/pagination.ts @@ -37,7 +37,7 @@ export class Pagination { } await this.message.edit({embeds: [this.pages[page] - .setFooter({text: `Natsuki | Page ${page + 1} of ${this.pages.length}`, iconURL: this.client.user.avatarURL()}) + .setFooter({text: `Natsuki | Page ${page + 1} of ${this.pages.length}`, iconURL: this.client.user.displayAvatarURL()}) .setTimestamp()] }); this.currentPage = page; @@ -126,7 +126,7 @@ export class Pagination { let fe = this.getCurrentPage(); fe.setDescription(`${fe.description}\n\n*This menu has ended, start a new one to interact with it!*`); - fe.setFooter({text: `Menu Ended${fe.footer && fe.footer.text && fe.footer.text.length ? ` | ${fe.footer.text}` : ''}`, iconURL: this.client.user.avatarURL()}); + fe.setFooter({text: `Menu Ended${fe.footer && fe.footer.text && fe.footer.text.length ? ` | ${fe.footer.text}` : ''}`, iconURL: this.client.user.displayAvatarURL()}); await this.message.edit({embeds: [fe]}); clearInterval(this.timeoutInterval);