Merge branch 'dev' into master

changes.txt

@@ -0,0 +1,2 @@
+Links to avatars now lead to the original file size
+Bots now get a bot badge in the userinfo command

configTemplate.js

@@ -1,68 +1,69 @@
 const config = {
-    // ID's
-    "owners": ["433790467830972417", "324937993972350976"],
+  // ID's
+  "owners": [], // Adding your ID here will give you access to dangerous commands like eval. Please be careful with who you add here! Eval can be used to modify the host machine.
 
-    // Tokens
-    "token": "",
-    "devtoken": "",
-    "ytkey": "",
-    "dblkey": "",
+  // Tokens
+  "token": "", // Your bot's token.
+  "devtoken": "", // (optional) another token, meant for a bot used for development
+  "ytkey": "", // Youtube API key, needed for music searching to work
+  "dblkey": "", // top.gg key, sends bot statistics to top.gg. You do not need this.
 
-    // Default per-server settings 
-    "defaultSettings" : {
-      "prefix": "~",
-      "devprefix": "!",
-      "modRole": "None set",
-      "adminRole": "None set",
-      "mutedRole": "None set",
-      "autorole": "off",
-      "welcomeChannel": "off",
-      "welcomeMessage": "off",
-      "leaveMessage": "off",
-      "chatlogsChannel": "off",
-      "modlogsChannel": "off",
-      "raidMode": "off",
-      "raidModeStrict": "off",
-      "blacklisted": "ARRAY",
-      "botChannels": "ARRAY",
-      "AFK": "ARRAY",
-      "SAR": "ARRAY"
+  // Default per-server settings 
+  "defaultSettings" : {
+    "prefix": "~",
+    "devprefix": "!",
+    "modRole": "None set",
+    "adminRole": "None set",
+    "mutedRole": "None set",
+    "autorole": "off",
+    "welcomeChannel": "off",
+    "welcomeMessage": "off",
+    "leaveMessage": "off",
+    "chatlogsChannel": "off",
+    "modlogsChannel": "off",
+    "raidMode": "off",
+    "raidModeStrict": "off",
+    "blacklisted": "ARRAY",
+    "botChannels": "ARRAY",
+    "AFK": "ARRAY",
+    "SAR": "ARRAY",
+    "customCommands": "ARRAY",    
+  },
+
+  // Perm levels
+  permLevels: [
+    { level: 0,
+      name: "User", 
+      check: () => true
     },
 
-    // Perm levels
-    permLevels: [
-      { level: 0,
-        name: "User", 
-        check: () => true
-      },
-  
-      { level: 1,
-        name: "Moderator",
-        check: (message) => {
-          try {
-            if (message.member.roles.has(message.settings.modRole)) return true;
-          } catch (e) {
-            return false;
-          }
+    { level: 1,
+      name: "Moderator",
+      check: (message) => {
+        try {
+          if (message.member.roles.cache.has(message.settings.modRole)) return true;
+        } catch (e) {
+          return false;
         }
-      },
+      }
+    },
 
-      { level: 2,
-        name: "Administrator", 
-        check: (message) => {
-          try {
-            if (message.member.roles.has(message.settings.adminRole)) return true;
-          } catch (e) {
-            return false;
-          }
+    { level: 2,
+      name: "Administrator", 
+      check: (message) => {
+        try {
+          if (message.member.roles.cache.has(message.settings.adminRole) || message.member.permissions.has("ADMINISTRATOR")) return true;
+        } catch (e) {
+          return false;
         }
-      },
+      }
+    },
 
-      { level: 3,
-        name: "Server Owner", 
-        check: (message) => message.channel.type === "text" ? (message.guild.ownerID === message.author.id ? true : false) : false
-      },
-    ]
-  };
+    { level: 3,
+      name: "Server Owner", 
+      check: (message) => message.channel.type === "text" ? (message.guild.ownerID === message.author.id ? true : false) : false
+    },
+  ]
+};
 
-  module.exports = config;
+module.exports = config;

src/commands/about.js

@@ -28,7 +28,7 @@ exports.run = (client, message) => {
   embed = new Discord.MessageEmbed();
     embed.setTitle(`Woomy`);
     embed.setColor(client.embedColour(message));
-    embed.setThumbnail(client.user.avatarURL({format: "png", dynamic: true}))
+    embed.setThumbnail(client.user.avatarURL({format: "png", dynamic: true, size: 2048}))
     embed.addField(
       "General:", `• users: \`${client.users.cache.size}\`\n• channels: \`${client.channels.cache.size}\`\n• servers: \`${client.guilds.cache.size}\`\n• commands: \`${client.commands.size}\`\n• uptime: \`${duration}\``,true
       );

src/commands/avatar.js

@@ -19,7 +19,7 @@ exports.run = (client, message, args) => {
     user = users[0];
     user = user.user;
   }
-  message.channel.send(`**${user.tag}'s** avatar is: ${user.avatarURL({format: "png", dynamic: true})}`);
+  message.channel.send(`**${user.tag}'s** avatar is: ${user.avatarURL({format: "png", dynamic: true, size: 2048})}`);
 };
 
 exports.conf = {

src/commands/ban.js

@@ -58,7 +58,7 @@ exports.run = async (client, message, args) => {
     if (channel) {
     let embed = new Discord.MessageEmbed();
       embed.setColor("#BC0057");
-      embed.setAuthor("User banned!", user.user.avatarURL({format: "png", dynamic: true}));
+      embed.setAuthor("User banned!", user.user.avatarURL({format: "png", dynamic: true, size: 2048}));
       embed.setDescription(
         `• User: ${user.user.tag} (${user.user.id})\n• Mod: ${message.author} (${message.author.id})\n• Reason: ${reason}`
       );

src/commands/catfact.js

@@ -3,7 +3,7 @@ const request = require("request");
 exports.run = async (bot, message, args) => {
   request({ uri: "https://catfact.ninja/facts", json: true }, (error, response, body) => {
     if (error) throw new Error(error);
-    message.channel.send(`**Did you know?**\n ${body.data[0].facts}`);
+    message.channel.send(`**Did you know?**\n ${body.data[0].fact}`);
   });
 };
 

src/commands/giverole.js

@@ -59,7 +59,7 @@ exports.run = async (client, message, [member, ...role2add], query) => {
     if (channel) {
     let embed = new Discord.MessageEmbed();
       embed.setColor("#00c09a");
-      embed.setAuthor("Role given:", user.user.avatarURL({format: "png", dynamic: true}));
+      embed.setAuthor("Role given:", user.user.avatarURL({format: "png", dynamic: true, size: 2048}));
       embed.setDescription(`‏‏‎• User: ${user} (${user.user.id})\n‏‏‎• Mod: ${message.author} (${message.author.id})\n‏‏‎• Role: ${gRole}`)
       try {
         channel.send({ embed });

src/commands/hackban.js

@@ -31,7 +31,7 @@ exports.run = async (client, message, args) => {
     if (channel) {
     let embed = new Discord.MessageEmbed();
       embed.setColor("#BC0057");
-      embed.setAuthor("User banned!", user.avatarURL({format: "png", dynamic: true}));
+      embed.setAuthor("User banned!", user.avatarURL({format: "png", dynamic: true, size: 2048}));
       embed.setDescription(
         `• User: ${user.tag} (${user.id})\n• Mod: ${message.author} (${message.author.id})\n• Reason: ${reason}`
         );

src/commands/kick.js

@@ -58,7 +58,7 @@ if (settings.modlogsChannel !== "off") {
     if (channel) {
     let embed = new Discord.MessageEmbed();
     embed.setColor("#fd0061");
-    embed.setAuthor("User kicked!", user.user.avatarURL({format: "png", dynamic: true}));
+    embed.setAuthor("User kicked!", user.user.avatarURL({format: "png", dynamic: true, size: 2048}));
     embed.setDescription(
       `• User: ${user.user.tag} (${user.user.id})\n• Mod: ${message.author} (${message.author.id})\n• Reason: ${reason}`
       );

src/commands/nowplaying.js

@@ -23,7 +23,7 @@ exports.run = async (client, message) => {
 	embed.setDescription(`**[${song.title}](https://www.youtube.com/watch?v=${song.id})**`)
 	embed.addField("Channel:", song.author, true)
   embed.addField("Time:", timestamp, true)
-  embed.setFooter("Requested by " + song.requestedBy.tag, song.requestedBy.avatarURL({format: "png", dynamic: true}))
+  embed.setFooter("Requested by " + song.requestedBy.tag, song.requestedBy.avatarURL({format: "png", dynamic: true, size: 2048}))
 
 	message.channel.send(embed)
 };

src/commands/purge.js

@@ -34,7 +34,7 @@ exports.run = async (client, message, args, level) => {
     if (channel) {
       let embed = new Discord.MessageEmbed();
       embed.setColor("#a62019");
-      embed.setAuthor(`${amount} messages purged!`, message.author.avatarURL({format: "png", dynamic: true}));
+      embed.setAuthor(`${amount} messages purged!`, message.author.avatarURL({format: "png", dynamic: true, size: 2048}));
       embed.setDescription(`• Channel: ${message.channel.name} (${message.channel.id})\n• Mod: ${message.author} (${message.author.id})\n• Amount: \`${amount}\``)
       try {
         channel.send({ embed });

src/commands/servericon.js

@@ -1,5 +1,5 @@
 exports.run = (client, message) => {
-  message.channel.send(`**${message.guild}'s** icon is:\n${message.guild.iconURL({format: "png", dynamic: true})}`)
+  message.channel.send(`**${message.guild}'s** icon is:\n${message.guild.iconURL({format: "png", dynamic: true, size: 2048})}`)
 };
 
 exports.conf = {

src/commands/serverinfo.js

@@ -78,7 +78,7 @@ exports.run = (client, message) => {
   .setColor(message.guild.member(client.user).displayHexColor)
   .setTitle(guild.name)
   .setDescription(`${badges}• **ID:** ${guild.id}\n• **Owner:** ${guild.owner}\n• **Region:** ${guild.region.toProperCase()}\n• **Boosts:** ${boosts}\n• **Members:** ${members}\n• **Channels:** ${channelString}\n• **Roles:** ${roles}\n• **Emojis:** ${emojiString}\n• **Creation date:** ${guild.createdAt}`)
-  .setThumbnail(message.guild.iconURL({format: "png", dynamic: true}));
+  .setThumbnail(message.guild.iconURL({format: "png", dynamic: true, size: 2048}));
 
   message.channel.send(embed);
 };

src/commands/softban.js

@@ -71,7 +71,7 @@ exports.run = async (client, message, args) => {
       if (channel) {
       let embed = new Discord.MessageEmbed();
         embed.setColor("#F38159");
-        embed.setAuthor("User softbanned!", user.user.avatarURL({format: "png", dynamic: true}));
+        embed.setAuthor("User softbanned!", user.user.avatarURL({format: "png", dynamic: true, size: 2048}));
         embed.setDescription(
           `• User: ${user.user.tag} (${user.user.id})\n• Mod: ${message.author} (${message.author.id})\n• Days cleared: ${days}`
         );

src/commands/takerole.js

@@ -59,7 +59,7 @@ exports.run = async (client, message, [member, ...role2add], query) => {
     if (channel) {
     let embed = new Discord.MessageEmbed();
       embed.setColor("#008369");
-      embed.setAuthor("Role taken:", user.user.avatarURL({format: "png", dynamic: true}));
+      embed.setAuthor("Role taken:", user.user.avatarURL({format: "png", dynamic: true, size: 2048}));
       embed.setDescription(`‏‏‎• User: ${user} (${user.user.id})\n‏‏‎• Mod: ${message.author} (${message.author.id})\n‏‏‎• Role: ${gRole}`)
       try {
         channel.send({ embed });

src/commands/userinfo.js

@@ -40,7 +40,15 @@ exports.run = (client, message, args) => {
     };
 
     if(user.user.id == message.guild.ownerID) {
-      badges = "<:owner:685703193694306331>\n"
+      badges += "<:owner:685703193694306331>"
+    }
+
+    if(user.user.bot) {
+      badges += "<:bot:686489601678114859>"
+    }
+
+    if(badges.length > 0) {
+      badges += "\n"
     }
     
     createdTimestamp = user.user.createdTimestamp;
@@ -61,13 +69,13 @@ exports.run = (client, message, args) => {
     id = user.user.id;
     tag = user.user.tag;
     colour = user.displayHexColor;
-    avurl = user.user.avatarURL({format: "png", dynamic: true});
+    avurl = user.user.avatarURL({format: "png", dynamic: true, size: 2048});
     createdAt = user.user.createdAt;
   } else {
     id = user.id;
     tag = user.tag;
     colour = ["#ff9d68", "#ff97cb", "#d789ff", "#74FFFF"].random();
-    avurl = user.avatarURL({format: "png", dynamic: true});
+    avurl = user.avatarURL({format: "png", dynamic: true, size: 2048});
     createdAt = user.createdAt;
   };