Send bot avatar in embed if the user has no avatar. Fix for all commands

naseif · Oct 19, 2021 · adbd419 · adbd419
1 parent 2ad700e
commit adbd419
Show file tree

Hide file tree

Showing 17 changed files with 84 additions and 34 deletions.
diff --git a/commands/Admin/ban.js b/commands/Admin/ban.js
@@ -21,7 +21,9 @@ module.exports = {
     const embed = {
       author: {
         name: `${message.member.user.username}`,
-        icon_url: `${message.member.user.avatarURL()}`,
+        icon_url: `${
+          message.member.user.avatarURL() || client.user.avatarURL()
+        }`,
       },
       color: "#9dcc37",
       title: `A user has been Banned!`,
@@ -92,7 +94,7 @@ module.exports = {
     const embed = {
       author: {
         name: `${interaction.user.username}`,
-        icon_url: `${interaction.user.avatarURL()}`,
+        icon_url: `${interaction.user.avatarURL() || client.user.avatarURL()}`,
       },
       color: "#9dcc37",
       title: `A user has been Banned!`,

diff --git a/commands/Admin/kick.js b/commands/Admin/kick.js
@@ -24,7 +24,9 @@ module.exports = {
     const embed = {
       author: {
         name: `${message.member.user.username}`,
-        icon_url: `${message.member.user.avatarURL()}`,
+        icon_url: `${
+          message.member.user.avatarURL() || client.user.avatarURL()
+        }`,
       },
       color: "#9dcc37",
       title: `A user has been kicked! ✅`,
@@ -94,7 +96,7 @@ module.exports = {
     const embed = {
       author: {
         name: `${interaction.user.username}`,
-        icon_url: `${interaction.user.avatarURL()}`,
+        icon_url: `${interaction.user.avatarURL() || client.user.avatarURL()}`,
       },
       color: "#9dcc37",
       title: `A user has been kicked!`,

diff --git a/commands/Admin/unban.js b/commands/Admin/unban.js
@@ -26,7 +26,9 @@ module.exports = {
     const embed = {
       author: {
         name: `${message.member.user.username}`,
-        icon_url: `${message.member.user.avatarURL()}`,
+        icon_url: `${
+          message.member.user.avatarURL() || client.user.avatarURL()
+        }`,
       },
       color: "#9dcc37",
       title: `User unbanned successfully ✅`,
@@ -89,7 +91,7 @@ module.exports = {
     const embed = {
       author: {
         name: `${interaction.user.username}`,
-        icon_url: `${interaction.user.avatarURL()}`,
+        icon_url: `${interaction.user.avatarURL() || client.user.avatarURL()}`,
       },
       color: "#9dcc37",
       title: `User unbanned successfully`,

diff --git a/commands/Anime/highfive.js b/commands/Anime/highfive.js
@@ -20,7 +20,9 @@ module.exports = {
         timestamp: new Date(),
         footer: {
           text: `Requested by ${message.member.user.username}`,
-          icon_url: `${message.member.user.avatarURL()}`,
+          icon_url: `${
+            message.member.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
       };
       await message.channel.send({
@@ -47,7 +49,9 @@ module.exports = {
         timestamp: new Date(),
         footer: {
           text: `Requested by ${interaction.user.username}`,
-          icon_url: `${interaction.user.avatarURL()}`,
+          icon_url: `${
+            interaction.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
       };
       await interaction.followUp({

diff --git a/commands/Anime/hug.js b/commands/Anime/hug.js
@@ -17,7 +17,9 @@ module.exports = {
         timestamp: new Date(),
         footer: {
           text: `Requested by ${message.member.user.username}`,
-          icon_url: `${message.member.user.avatarURL()}`,
+          icon_url: `${
+            message.member.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
       };
       await message.channel.send({ embeds: [hugEmbed] });
@@ -41,7 +43,9 @@ module.exports = {
         timestamp: new Date(),
         footer: {
           text: `Requested by ${interaction.user.username}`,
-          icon_url: `${interaction.user.avatarURL()}`,
+          icon_url: `${
+            interaction.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
       };
       await interaction.followUp({ embeds: [hugEmbed] });

diff --git a/commands/Anime/searchAnime.js b/commands/Anime/searchAnime.js
@@ -23,7 +23,9 @@ module.exports = {
         url: `${`https://myanimelist.net/anime/${Anime.malid}`}`,
         author: {
           name: `${message.member.user.username}`,
-          icon_url: `${message.member.user.avatarURL()}`,
+          icon_url: `${
+            message.member.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
         description: `${Anime.synopsis}`,
         thumbnail: {
@@ -98,7 +100,9 @@ module.exports = {
         url: `${`https://myanimelist.net/anime/${Anime.malid}`}`,
         author: {
           name: `${interaction.user.username}`,
-          icon_url: `${interaction.user.avatarURL()}`,
+          icon_url: `${
+            interaction.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
         description: `${Anime.synopsis}`,
         thumbnail: {

diff --git a/commands/Anime/waifu.js b/commands/Anime/waifu.js
@@ -17,7 +17,9 @@ module.exports = {
         timestamp: new Date(),
         footer: {
           text: `Requested by ${message.member.user.username}`,
-          icon_url: `${message.member.user.avatarURL()}`,
+          icon_url: `${
+            message.member.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
       };
       await message.channel.send({ embeds: [waifuEmbed] });
@@ -41,7 +43,9 @@ module.exports = {
         timestamp: new Date(),
         footer: {
           text: `Requested by ${interaction.user.username}`,
-          icon_url: `${interaction.user.avatarURL()}`,
+          icon_url: `${
+            interaction.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
       };
       await interaction.followUp({ embeds: [waifuEmbed] });

diff --git a/commands/Anime/whatAnime.js b/commands/Anime/whatAnime.js
@@ -43,7 +43,9 @@ module.exports = {
         timestamp: new Date(),
         footer: {
           text: `Requested by ${message.member.user.username}`,
-          icon_url: `${message.member.user.avatarURL()}`,
+          icon_url: `${
+            message.member.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
       };
       await message.channel.send({ embeds: [infoEmbed] });
@@ -90,7 +92,9 @@ module.exports = {
         timestamp: new Date(),
         footer: {
           text: `Requested by ${interaction.user.username}`,
-          icon_url: `${interaction.user.avatarURL()}`,
+          icon_url: `${
+            interaction.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
       };
       await interaction.followUp({ embeds: [infoEmbed] });

diff --git a/commands/Fun/8ball.js b/commands/Fun/8ball.js
@@ -32,7 +32,9 @@ module.exports = {
       title: `${question}`,
       author: {
         name: `${message.member.user.username}`,
-        icon_url: `${message.member.user.avatarURL()}`,
+        icon_url: `${
+          message.member.user.avatarURL() || client.user.avatarURL()
+        }`,
       },
       description: `${answers[Math.floor(Math.random() * answers.length)]}`,
     };

diff --git a/commands/Misc/help.js b/commands/Misc/help.js
@@ -48,7 +48,9 @@ module.exports = {
         timestamp: new Date(),
         footer: {
           text: `Requested by ${message.member.user.username}`,
-          icon_url: `${message.member.user.avatarURL()}`,
+          icon_url: `${
+            message.member.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
       };
       return await message.channel.send({ embeds: [embed] });
@@ -77,7 +79,9 @@ module.exports = {
           timestamp: new Date(),
           footer: {
             text: `Requested by ${message.member.user.username}`,
-            icon_url: `${message.member.user.avatarURL()}`,
+            icon_url: `${
+              message.member.user.avatarURL() || client.user.avatarURL()
+            }`,
           },
         };
         return await message.channel.send({ embeds: [embed] });
@@ -129,7 +133,9 @@ module.exports = {
           timestamp: new Date(),
           footer: {
             text: `Requested by ${message.member.user.username}`,
-            icon_url: `${message.member.user.avatarURL()}`,
+            icon_url: `${
+              message.member.user.avatarURL() || client.user.avatarURL()
+            }`,
           },
         };
 
@@ -164,7 +170,7 @@ module.exports = {
       timestamp: new Date(),
       footer: {
         text: `Requested by ${interaction.user.username}`,
-        icon_url: `${interaction.user.avatarURL()}`,
+        icon_url: `${interaction.user.avatarURL() || client.user.avatarURL()}`,
       },
     };
 

diff --git a/commands/Misc/perms.js b/commands/Misc/perms.js
@@ -46,7 +46,9 @@ module.exports = {
       timestamp: new Date(),
       footer: {
         text: `Requested by ${message.member.user.username}`,
-        icon_url: `${message.member.user.avatarURL()}`,
+        icon_url: `${
+          message.member.user.avatarURL() || client.user.avatarURL()
+        }`,
       },
     };
 
@@ -98,7 +100,7 @@ module.exports = {
       timestamp: new Date(),
       footer: {
         text: `Requested by ${interaction.user.username}`,
-        icon_url: `${interaction.user.avatarURL()}`,
+        icon_url: `${interaction.user.avatarURL() || client.user.avatarURL()}`,
       },
     };
     try {

diff --git a/commands/Misc/searchMovie.js b/commands/Misc/searchMovie.js
@@ -58,7 +58,9 @@ module.exports = {
         url: `${`https://www.themoviedb.org/movie/${movie.id}`}`,
         author: {
           name: `${message.member.user.username}`,
-          icon_url: `${message.member.user.avatarURL()}`,
+          icon_url: `${
+            message.member.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
         description: `${movie.overview}`,
         thumbnail: {
@@ -148,7 +150,9 @@ module.exports = {
         url: `${`https://www.themoviedb.org/movie/${movie.id}`}`,
         author: {
           name: `${interaction.user.username}`,
-          icon_url: `${interaction.user.avatarURL()}`,
+          icon_url: `${
+            interaction.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
         description: `${movie.overview}`,
         thumbnail: {

diff --git a/commands/Misc/serverstats.js b/commands/Misc/serverstats.js
@@ -14,7 +14,9 @@ module.exports = {
       title: `${guild.name}'s Stats`,
       author: {
         name: `${message.member.user.username}`,
-        icon_url: `${message.member.user.avatarURL()}`,
+        icon_url: `${
+          message.member.user.avatarURL() || client.user.avatarURL()
+        }`,
       },
       thumbnail: {
         url: `${

diff --git a/commands/Music/lyrics.js b/commands/Music/lyrics.js
@@ -71,7 +71,9 @@ module.exports = {
         title: `${lyrics.title}`,
         author: {
           name: `${message.member.user.username}`,
-          icon_url: `${message.member.user.avatarURL()}`,
+          icon_url: `${
+            message.member.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
         description: `${lyrics.lyrics}`,
         thumbnail: {
@@ -150,7 +152,9 @@ module.exports = {
         title: `${lyrics.artist.name} - ${lyrics.title}`,
         author: {
           name: `${interaction.user.username}`,
-          icon_url: `${interaction.user.avatarURL()}`,
+          icon_url: `${
+            interaction.user.avatarURL() || client.user.avatarURL()
+          }`,
         },
         description: `${lyrics.lyrics}`,
         thumbnail: {

diff --git a/commands/Music/play.js b/commands/Music/play.js
@@ -104,7 +104,7 @@ module.exports = {
       author: {
         name: `${message.member.user.username}`,
         icon_url: `${
-          message.member.user.avatarURL() || message.client.user.avatarURL()
+          message.member.user.avatarURL() || client.user.avatarURL()
         }`,
       },
       description: `Song: **[${searchSong.tracks[0].title}](${searchSong.tracks[0].url})**`,
@@ -254,7 +254,7 @@ module.exports = {
       title: `${queue.playing ? "✅ Added to Queue" : "🎵  Playing"}`,
       author: {
         name: `${interaction.user.username}`,
-        icon_url: `${interaction.user.avatarURL()}`,
+        icon_url: `${interaction.user.avatarURL() || client.user.avatarURL()}`,
       },
       description: `Song: **[${searchSong.tracks[0].title}](${searchSong.tracks[0].url})**`,
       thumbnail: {

diff --git a/commands/Music/playskip.js b/commands/Music/playskip.js
@@ -70,7 +70,9 @@ module.exports = {
       title: `🎵  Playing`,
       author: {
         name: `${message.member.user.username}`,
-        icon_url: `${message.member.user.avatarURL()}`,
+        icon_url: `${
+          message.member.user.avatarURL() || client.user.avatarURL()
+        }`,
       },
       description: `Song: **[${searchSong.tracks[0].title}](${searchSong.tracks[0].url})**`,
       thumbnail: {
@@ -170,7 +172,7 @@ module.exports = {
       title: `🎵  Playing`,
       author: {
         name: `${interaction.user.username}`,
-        icon_url: `${interaction.user.avatarURL()}`,
+        icon_url: `${interaction.user.avatarURL() || client.user.avatarURL()}`,
       },
       description: `Song: **[${searchSong.tracks[0].title}](${searchSong.tracks[0].url})**`,
       thumbnail: {

diff --git a/commands/Music/queue.js b/commands/Music/queue.js
@@ -26,7 +26,9 @@ module.exports = {
       title: `Queue contains ${queue?.tracks.length} songs!`,
       author: {
         name: `${message.member.user.username}`,
-        icon_url: `${message.member.user.avatarURL()}`,
+        icon_url: `${
+          message.member.user.avatarURL() || client.user.avatarURL()
+        }`,
       },
       description: `${tracks.join("\n")}`,
       footer: {
@@ -62,7 +64,7 @@ module.exports = {
       title: `Queue contains ${queue?.tracks.length} songs!`,
       author: {
         name: `${interaction.user.username}`,
-        icon_url: `${interaction.user.avatarURL()}`,
+        icon_url: `${interaction.user.avatarURL() || client.user.avatarURL()}`,
       },
       description: `${tracks.join("\n")}`,
       footer: {