Ported more commands; Made embed colour a const; Cleanup

1 files changed, 16 insertions, 5 deletions

diff --git a/bot/src/commands/avatar.js b/bot/src/commands/avatar.js
index 2c3cdeb..3d98608 100644
--- a/bot/src/commands/avatar.js
+++ b/bot/src/commands/avatar.js
@@ -7,16 +7,27 @@ export default {
         .addUserOption(option =>
             option
                 .setName('username')
-                .setDescription('The user to get the avatar of.')
-                .setRequired(false)),
+                .setDescription('The user to get the avatar of.'))
+        .addBooleanOption(option =>
+            option
+                .setName('server')
+                .setDescription('Gets the member\'s server profile picture.')),
 
     async execute(interaction) {
         const username = interaction.options.getUser('username');
+        const server = interaction.options.getBoolean('server');
+
+        if (username && server) {
+            const member = interaction.guild.members.cache.get(username.id);
+            return await interaction.reply(member.avatarURL({ dynamic: true, format: 'png', size: 1024 }));
+        } else if (server) {
+            return await interaction.reply(interaction.member.avatarURL({ dynamic: true, format: 'png', size: 1024 }));
+        }
 
-        if(!username) {
-            await interaction.reply(interaction.user.avatarURL({ dynamic: true, format: 'png', size: 1024 }));
+        if (!username) {
+            return await interaction.reply(interaction.user.avatarURL({ dynamic: true, format: 'png', size: 1024 }));
         } else {
-            await interaction.reply(username.avatarURL({ dynamic: true, format: 'png', size: 1024 }));
+            return await interaction.reply(username.avatarURL({ dynamic: true, format: 'png', size: 1024 }));
         }
     }
 };