From 72ec6a708ca4cd85b6124b1f931c2f4699997156 Mon Sep 17 00:00:00 2001
From: slepe <no>
Date: Mon, 27 Apr 2020 17:03:13 +1200
Subject: [PATCH 1/2] Remove scoring, update polls so they use <option> or
 <option> or <option>, add id fetching functionality to commands which take
 input to find user, removed ancillary dev stuff, tidied filetree, patched a
 few minor bugs.

---
 package.json                              |   1 -
 settings.json                             |  19 +++
 src/client.js                             | 103 +++++++++-------
 src/commands.js                           |   9 +-
 src/commands/avatar.js                    |   2 +-
 src/commands/clear.js                     |  28 +++--
 src/commands/descriptionEdit.js           |  13 +-
 src/commands/dotsEdit.js                  |  50 +++++---
 src/commands/dotsView.js                  |  22 ++--
 src/commands/evaluate.js                  |  17 ++-
 src/commands/gitEdit.js                   |  52 +++++---
 src/commands/gitView.js                   |  22 ++--
 src/commands/guildInfo.js                 |  40 ++++--
 src/commands/help.js                      |  28 +++--
 src/commands/poll.js                      |  62 +++++++---
 src/commands/roleGet.js                   |  39 +++---
 src/commands/roleList.js                  |  29 +++--
 src/commands/roleListEdit.js              |  60 ++++++---
 src/commands/scoreEdit.js                 | 101 ---------------
 src/commands/scoreView.js                 |  62 ----------
 src/commands/userInfo.js                  |  81 ++++++++----
 src/commands/userRep.js                   | 143 ----------------------
 src/events/guildMemberAdd.js              |  15 ++-
 src/events/handleLog.js                   |  11 --
 src/events/handleMessageScore.js          |  62 ----------
 src/events/message.js                     |  20 +--
 src/events/messageDelete.js               |  12 +-
 src/events/ready.js                       |   6 +-
 src/events/showcase.js                    |   3 +-
 src/events/userScoreUpdate.js             |   3 -
 src/models/roleSchema.js                  |   2 +-
 src/models/userSchema.js                  |   5 +-
 src/settings.json                         |  34 -----
 src/utilities/messageAuthorDisplayName.js |  23 ++--
 src/utilities/messageColor.js             |   9 +-
 src/utilities/messageFetchUser.js         |  65 ++--------
 src/utilities/miFetchCommandHelp.js       |   2 +-
 src/utilities/stringToTitleCase.js        |   8 +-
 src/utilities/textChannelEmbed.js         |  19 ++-
 39 files changed, 528 insertions(+), 754 deletions(-)
 create mode 100644 settings.json
 delete mode 100644 src/commands/scoreEdit.js
 delete mode 100644 src/commands/scoreView.js
 delete mode 100644 src/commands/userRep.js
 delete mode 100644 src/events/handleLog.js
 delete mode 100644 src/events/handleMessageScore.js
 delete mode 100644 src/events/userScoreUpdate.js
 delete mode 100644 src/settings.json

diff --git a/package.json b/package.json
index 22ee813..99f204f 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
         "discord.js": "github:discordjs/discord.js",
         "dotenv": "^8.2.0",
         "mongoose": "^5.8.3",
-        "mongoose-float": "^1.0.4",
         "ms": "^2.1.2"
     }
 }
diff --git a/settings.json b/settings.json
new file mode 100644
index 0000000..862f61d
--- /dev/null
+++ b/settings.json
@@ -0,0 +1,19 @@
+{
+    "UserSchema": {
+        "default": {
+            "id": "",
+            "guild": "",
+            "profile": {
+                "git": "",
+                "dotfiles": "",
+                "description": ""
+            }
+        }
+    },
+    "confirmDialogues": {
+        "timeout": 20000
+    },
+    "showcaseChannel": "635625917623828520",
+    "logChannel": "673003438635876382",
+    "ricingChannel": "635625925748457482"
+}
diff --git a/src/client.js b/src/client.js
index 28b7fdd..31231ac 100644
--- a/src/client.js
+++ b/src/client.js
@@ -1,6 +1,6 @@
-require("dotenv").config();
 const Discord = require("discord.js");
 
+require("dotenv").config();
 require("./utilities/messageAuthorDisplayName.js");
 require("./utilities/messageColor.js");
 require("./utilities/messageFetchUser.js");
@@ -21,19 +21,19 @@ module.exports = class extends Discord.Client {
             restTimeOffset: 2500,
             restSweepInterval: 30,
             ws: {
-                compress: false
+                compress: false,
             },
             disabledEvents: [
                 "TYPING_START",
                 "PRESENCE_UPDATE",
                 "USER_UPDATE",
                 "WEBHOOKS_UPDATE",
-                "MESSAGE_REACTION_ADD"
-            ]
+                "MESSAGE_REACTION_ADD",
+            ],
         });
 
         //Settings file
-        this.settings = require("./settings.json");
+        this.settings = require("../settings.json");
 
         //Database schema for per-guild colour role list
         this.RoleSchema = require("./models/roleSchema.js");
@@ -44,38 +44,47 @@ module.exports = class extends Discord.Client {
         this.commands = require("./commands.js");
 
         //Import message handler only once
-        this.message = (message) =>
-            require("./events/message.js")(this, message, Discord);
-
-        this.ready = () => require("./events/ready.js")(this);
-
-        this.messageDelete = (message) =>
-            require("./events/messageDelete.js")(this, message, Discord);
-
-        this.guildMemberAdd = (member) =>
-            require("./events/guildMemberAdd.js")(this, member, Discord);
+        this.message = message =>
+            require("./events/message.js")(
+                this,
+                message,
+                Discord
+            );
+
+        this.ready = () =>
+            require("./events/ready.js")(this);
+
+        this.messageDelete = message =>
+            require("./events/messageDelete.js")(
+                this,
+                message,
+                Discord
+            );
+
+        this.guildMemberAdd = member =>
+            require("./events/guildMemberAdd.js")(
+                this,
+                member,
+                Discord
+            );
 
         this.showcase = (client, message) =>
-            require("./events/showcase.js")(client, message, Discord);
-
-        this.sendLog = (message) =>
-            this.channels.cache.get(this.settings.logChannel).send(message);
-
-        this.commandHelp = (name) =>
-            require("./utilities/miFetchCommandHelp.js")(this, name);
-
-        this.handleMessageScore = (message) =>
-            require("./events/handleMessageScore.js")(this, message);
-
-        this.log = (log) =>
-            require("./events/handleLog.js")(this, log, Discord);
-
-        this.createUserSchema = (user, guild) =>
-            require("./createUserSchema.js")(this, user, guild);
-
-        this.on("userScoreUpdate", (scoreUpdate) =>
-            require("./events/userScoreUpdate.js")(this, scoreUpdate)
-        );
+            require("./events/showcase.js")(
+                client,
+                message,
+                Discord
+            );
+
+        this.sendLog = message =>
+            this.channels.cache
+                .get(this.settings.logChannel)
+                .send(message);
+
+        this.commandHelp = name =>
+            require("./utilities/miFetchCommandHelp.js")(
+                this,
+                name
+            );
 
         this
             //Events
@@ -83,27 +92,31 @@ module.exports = class extends Discord.Client {
 
             .on("reconnect", () => this.ready())
 
-            .on("message", (message) => this.message(message))
+            .on("message", message => this.message(message))
 
-            .on("guildMemberAdd", (member) => this.guildMemberAdd(member))
+            .on("guildMemberAdd", member =>
+                this.guildMemberAdd(member)
+            )
 
-            .on("messageDelete", (message) => this.messageDelete(message));
+            .on("messageDelete", message =>
+                this.messageDelete(message)
+            );
 
         //Connect to MongoDB
         require("mongoose").connect(process.env.MONGO, {
             useNewUrlParser: true,
-            useUnifiedTopology: true
+            useUnifiedTopology: true,
         });
 
         process
-            .on("unhandledRejection", (error) => {
-                this.log(error.message);
+            .on("unhandledRejection", error => {
+                console.log(error);
             })
-            .on("uncaughtException", (error) => {
-                this.log(error.message);
+            .on("uncaughtException", error => {
+                console.log(error);
             })
-            .on("warning", (error) => {
-                this.log(error.message);
+            .on("warning", error => {
+                console.log(error);
             });
 
         this.login(process.env.TOKEN);
diff --git a/src/commands.js b/src/commands.js
index 4ec4a6e..c870948 100644
--- a/src/commands.js
+++ b/src/commands.js
@@ -34,9 +34,6 @@ module.exports = new Discord.Collection()
 
     .set("setgit", require("./commands/gitEdit.js"))
 
-    .set("rep", require("./commands/userRep.js"))
-    .set("thanks", require("./commands/userRep.js"))
-
     .set("desc", require("./commands/descriptionEdit.js"))
     .set("description", require("./commands/descriptionEdit.js"))
     .set("setdesc", require("./commands/descriptionEdit.js"))
@@ -56,8 +53,4 @@ module.exports = new Discord.Collection()
 
     .set("serverinfo", require("./commands/guildInfo.js"))
     .set("guildinfo", require("./commands/guildInfo.js"))
-    .set("server", require("./commands/guildInfo.js"))
-
-    .set("editscore", require("./commands/scoreEdit.js"))
-
-    .set("score", require("./commands/scoreView.js"));
+    .set("server", require("./commands/guildInfo.js"));
diff --git a/src/commands/avatar.js b/src/commands/avatar.js
index ab28ce9..71d9793 100644
--- a/src/commands/avatar.js
+++ b/src/commands/avatar.js
@@ -19,5 +19,5 @@ exports.meta = {
     operatorOnly: false,
     name: "avatar",
     usage: `${process.env.PREFIX || "!"}pfp <user>`,
-    description: "Shows avatar of @mentioned user or self"
+    description: "Shows avatar of @mentioned user or self",
 };
diff --git a/src/commands/clear.js b/src/commands/clear.js
index 5f67dfc..35ea871 100644
--- a/src/commands/clear.js
+++ b/src/commands/clear.js
@@ -10,7 +10,7 @@ exports.run = async (client, message, args, Discord) => {
     client.UserSchema.findOne(
         {
             id: user.id,
-            guild: message.guild.id
+            guild: message.guild.id,
         },
         async (error, config) => {
             if (error) {
@@ -19,7 +19,9 @@ exports.run = async (client, message, args, Discord) => {
 
             if (
                 user !== message.author &&
-                !message.member.hasPermission("MANAGE_GUILD")
+                !message.member.hasPermission(
+                    "MANAGE_GUILD"
+                )
             ) {
                 return message.channel.embed(
                     `**${message.authorDisplayName}**, you cannot clear the profile of other users`
@@ -39,14 +41,16 @@ exports.run = async (client, message, args, Discord) => {
 
             try {
                 var response = await message.channel.awaitMessages(
-                    (m) =>
+                    m =>
                         ["yes", "y", "no", "n"].includes(
                             m.content.toLowerCase()
                         ) && m.author === message.author,
                     {
                         max: 1,
-                        time: client.settings.confirmDialogues.timeout,
-                        errors: ["time"]
+                        time:
+                            client.settings.confirmDialogues
+                                .timeout,
+                        errors: ["time"],
                     }
                 );
             } catch (err) {
@@ -54,7 +58,9 @@ exports.run = async (client, message, args, Discord) => {
                     `**${message.authorDisplayName}**, cancelled selection, missing or invalid input`
                 );
             }
-            response = response.first().content.toLowerCase();
+            response = response
+                .first()
+                .content.toLowerCase();
 
             if (["no", "n"].includes(response)) {
                 return message.channel.embed(
@@ -65,12 +71,14 @@ exports.run = async (client, message, args, Discord) => {
             config.profile = {
                 git: "",
                 dots: "",
-                description: ""
+                description: "",
             };
 
-            message.channel.embed(`Cleared **profile** of user **${user}**`);
+            message.channel.embed(
+                `Cleared **profile** of user **${user}**`
+            );
 
-            config.save().catch((e) => console.error(e));
+            config.save().catch(e => console.error(e));
         }
     );
 };
@@ -79,5 +87,5 @@ exports.meta = {
     operatorOnly: true,
     name: "user clear",
     usage: `${process.env.PREFIX || "!"}purge <user>`,
-    description: "Clears custom entries on user profile"
+    description: "Clears custom entries on user profile",
 };
diff --git a/src/commands/descriptionEdit.js b/src/commands/descriptionEdit.js
index dcfbc7a..67265a5 100644
--- a/src/commands/descriptionEdit.js
+++ b/src/commands/descriptionEdit.js
@@ -6,7 +6,7 @@ exports.run = async (client, message, args, Discord) => {
     client.UserSchema.findOne(
         {
             id: message.author.id,
-            guild: message.guild.id
+            guild: message.guild.id,
         },
         async (error, config) => {
             if (error) {
@@ -17,7 +17,7 @@ exports.run = async (client, message, args, Discord) => {
                 config = new client.UserSchema(
                     Object.assign(client.settings.UserSchema.default, {
                         id: message.author.id,
-                        guild: message.guild.id
+                        guild: message.guild.id,
                     })
                 )
                     .save()
@@ -45,7 +45,7 @@ exports.run = async (client, message, args, Discord) => {
                         {
                             max: 1,
                             time: client.settings.confirmDialogues.timeout,
-                            errors: ["time"]
+                            errors: ["time"],
                         }
                     );
                 } catch (err) {
@@ -88,7 +88,8 @@ exports.run = async (client, message, args, Discord) => {
 exports.meta = {
     operatorOnly: false,
     name: "user description",
-    usage: `${process.env.PREFIX || "!"}desc <info> or ${process.env.PREFIX ||
-        "!"}desc clear`,
-    description: "Adds a description to your profile, 256 characters max"
+    usage: `${process.env.PREFIX || "!"}desc <info> or ${
+        process.env.PREFIX || "!"
+    }desc clear`,
+    description: "Adds a description to your profile, 256 characters max",
 };
diff --git a/src/commands/dotsEdit.js b/src/commands/dotsEdit.js
index 0a4cdbc..c301264 100644
--- a/src/commands/dotsEdit.js
+++ b/src/commands/dotsEdit.js
@@ -6,7 +6,7 @@ exports.run = async (client, message, args, Discord) => {
     client.UserSchema.findOne(
         {
             id: message.author.id,
-            guild: message.guild.id
+            guild: message.guild.id,
         },
         async (error, config) => {
             if (error) {
@@ -15,18 +15,23 @@ exports.run = async (client, message, args, Discord) => {
 
             if (!config) {
                 config = new client.UserSchema(
-                    Object.assign(client.settings.UserSchema.default, {
-                        id: message.author.id,
-                        guild: message.guild.id
-                    })
+                    Object.assign(
+                        client.settings.UserSchema.default,
+                        {
+                            id: message.author.id,
+                            guild: message.guild.id,
+                        }
+                    )
                 )
                     .save()
-                    .catch((e) => console.error(e));
+                    .catch(e => console.error(e));
             }
 
             if (
                 args[0] &&
-                ["clear", "remove"].includes(args[0].toLowerCase())
+                ["clear", "remove"].includes(
+                    args[0].toLowerCase()
+                )
             ) {
                 if (!config.profile.dotfiles) {
                     return message.channel.embed(
@@ -41,14 +46,23 @@ exports.run = async (client, message, args, Discord) => {
 
                 try {
                     var response = await message.channel.awaitMessages(
-                        (m) =>
-                            ["yes", "y", "no", "n"].includes(
+                        m =>
+                            [
+                                "yes",
+                                "y",
+                                "no",
+                                "n",
+                            ].includes(
                                 m.content.toLowerCase()
-                            ) && m.author === message.author,
+                            ) &&
+                            m.author === message.author,
                         {
                             max: 1,
-                            time: client.settings.confirmDialogues.timeout,
-                            errors: ["time"]
+                            time:
+                                client.settings
+                                    .confirmDialogues
+                                    .timeout,
+                            errors: ["time"],
                         }
                     );
                 } catch (err) {
@@ -56,7 +70,9 @@ exports.run = async (client, message, args, Discord) => {
                         `**${message.authorDisplayName}**, cancelled selection, missing or invalid input`
                     );
                 }
-                response = response.first().content.toLowerCase();
+                response = response
+                    .first()
+                    .content.toLowerCase();
 
                 if (["no", "n"].includes(response)) {
                     return message.channel.embed(
@@ -70,7 +86,9 @@ exports.run = async (client, message, args, Discord) => {
                     `Removed **dotfiles** from **${message.author}**`
                 );
             } else if (args.length) {
-                if (args[0].match("(https?:\\/\\/[^\\s]+)")) {
+                if (
+                    args[0].match("(https?:\\/\\/[^\\s]+)")
+                ) {
                     if (args[0].length <= 128) {
                         config.profile.dotfiles = args[0];
 
@@ -91,7 +109,7 @@ exports.run = async (client, message, args, Discord) => {
                 client.commandHelp(message);
             }
 
-            config.save().catch((e) => console.error(e));
+            config.save().catch(e => console.error(e));
         }
     );
 };
@@ -100,5 +118,5 @@ exports.meta = {
     operatorOnly: false,
     name: "user dots",
     usage: `${process.env.PREFIX || "!"}dots <url>`,
-    description: "Adds dotfiles link to your profile"
+    description: "Adds dotfiles link to your profile",
 };
diff --git a/src/commands/dotsView.js b/src/commands/dotsView.js
index d8e48bb..d0dc25b 100644
--- a/src/commands/dotsView.js
+++ b/src/commands/dotsView.js
@@ -10,7 +10,7 @@ exports.run = async (client, message, args, Discord) => {
     client.UserSchema.findOne(
         {
             id: user.id,
-            guild: message.guild.id
+            guild: message.guild.id,
         },
         async (error, config) => {
             if (error) {
@@ -19,13 +19,16 @@ exports.run = async (client, message, args, Discord) => {
 
             if (!config) {
                 config = new client.UserSchema(
-                    Object.assign(client.settings.UserSchema.default, {
-                        id: user.id,
-                        guild: message.guild.id
-                    })
+                    Object.assign(
+                        client.settings.UserSchema.default,
+                        {
+                            id: user.id,
+                            guild: message.guild.id,
+                        }
+                    )
                 )
                     .save()
-                    .catch((e) => console.error(e));
+                    .catch(e => console.error(e));
             }
 
             await config;
@@ -36,8 +39,9 @@ exports.run = async (client, message, args, Discord) => {
                         ? `**dotfiles** for ${user} **${config.profile.dotfiles}**`
                         : `**${
                               message.authorDisplayName
-                          }**, please use: \`\`\`${process.env.PREFIX ||
-                              "!"}setdotfiles <url>\`\`\``
+                          }**, please use: \`\`\`${
+                              process.env.PREFIX || "!"
+                          }setdotfiles <url>\`\`\``
                 );
             } else {
                 message.channel.embed(
@@ -54,5 +58,5 @@ exports.meta = {
     operatorOnly: false,
     name: "user dots",
     usage: `${process.env.PREFIX || "!"}dots <@user>`,
-    description: "Display user's dotfiles link."
+    description: "Display user's dotfiles link.",
 };
diff --git a/src/commands/evaluate.js b/src/commands/evaluate.js
index f61e245..33de93d 100644
--- a/src/commands/evaluate.js
+++ b/src/commands/evaluate.js
@@ -6,12 +6,7 @@ exports.run = async (client, message, args, Discord) => {
     }
 
     if (!args.length) {
-        return message.channel.send(
-            client
-                .commandHelp("e")
-                .setColor(message.color)
-                .setTitle("Usage:")
-        );
+        return message.channel.send(client.commandHelp(message));
     }
 
     if (message.content.toLowerCase().includes("token")) {
@@ -29,7 +24,10 @@ exports.run = async (client, message, args, Discord) => {
                     .inspect(eval(args.join(" ")))
                     .substring(0, 2000)
                     //Globally, ignorant of case, redact bot token
-                    .replace(RegExp(process.env.TOKEN, "gi"), "TOKEN") +
+                    .replace(
+                        RegExp(process.env.TOKEN, "gi"),
+                        "TOKEN"
+                    ) +
                 "```"
         );
     } catch (error) {
@@ -41,8 +39,9 @@ exports.run = async (client, message, args, Discord) => {
 
 exports.meta = {
     permissions: { bot: ["SEND_MESSAGES"], user: [] },
-    operatorOnly: true,
+    operatorOnly: false,
+    hostOnly: true,
     name: "evaluate",
     usage: `${process.env.PREFIX || "!"}e <javascript>`,
-    description: "Executes input Javascript"
+    description: "Executes input Javascript",
 };
diff --git a/src/commands/gitEdit.js b/src/commands/gitEdit.js
index e49dd77..bdd4804 100644
--- a/src/commands/gitEdit.js
+++ b/src/commands/gitEdit.js
@@ -6,7 +6,7 @@ exports.run = async (client, message, args, Discord) => {
     client.UserSchema.findOne(
         {
             id: message.author.id,
-            guild: message.guild.id
+            guild: message.guild.id,
         },
         async (error, config) => {
             if (error) {
@@ -15,18 +15,23 @@ exports.run = async (client, message, args, Discord) => {
 
             if (!config) {
                 config = new client.UserSchema(
-                    Object.assign(client.settings.UserSchema.default, {
-                        id: message.author.id,
-                        guild: message.guild.id
-                    })
+                    Object.assign(
+                        client.settings.UserSchema.default,
+                        {
+                            id: message.author.id,
+                            guild: message.guild.id,
+                        }
+                    )
                 )
                     .save()
-                    .catch((e) => console.error(e));
+                    .catch(e => console.error(e));
             }
 
             if (
                 args.length &&
-                ["clear", "remove"].includes(args[0].toLowerCase())
+                ["clear", "remove"].includes(
+                    args[0].toLowerCase()
+                )
             ) {
                 if (!config.profile.git) {
                     return message.channel.embed(
@@ -37,20 +42,29 @@ exports.run = async (client, message, args, Discord) => {
                 message.channel.embed(
                     `**${message.authorDisplayName}**, are you sure you want to clear your profile git?`,
                     {
-                        footer: "yes / no"
+                        footer: "yes / no",
                     }
                 );
 
                 try {
                     var response = await message.channel.awaitMessages(
-                        (m) =>
-                            ["yes", "y", "no", "n"].includes(
+                        m =>
+                            [
+                                "yes",
+                                "y",
+                                "no",
+                                "n",
+                            ].includes(
                                 m.content.toLowerCase()
-                            ) && m.author === message.author,
+                            ) &&
+                            m.author === message.author,
                         {
                             max: 1,
-                            time: client.settings.confirmDialogues.timeout,
-                            errors: ["time"]
+                            time:
+                                client.settings
+                                    .confirmDialogues
+                                    .timeout,
+                            errors: ["time"],
                         }
                     );
                 } catch (err) {
@@ -58,7 +72,9 @@ exports.run = async (client, message, args, Discord) => {
                         `**${message.authorDisplayName}**, cancelled selection, missing or invalid input`
                     );
                 }
-                response = response.first().content.toLowerCase();
+                response = response
+                    .first()
+                    .content.toLowerCase();
 
                 if (["no", "n"].includes(response)) {
                     return message.channel.embed(
@@ -72,7 +88,9 @@ exports.run = async (client, message, args, Discord) => {
                     `Removed **git** from user **${message.author}**`
                 );
             } else if (args.length) {
-                if (args[0].match("(https?:\\/\\/[^\\s]+)")) {
+                if (
+                    args[0].match("(https?:\\/\\/[^\\s]+)")
+                ) {
                     if (args[0].length <= 128) {
                         config.profile.git = args[0];
 
@@ -93,7 +111,7 @@ exports.run = async (client, message, args, Discord) => {
                 client.commandHelp(message);
             }
 
-            config.save().catch((e) => console.error(e));
+            config.save().catch(e => console.error(e));
         }
     );
 };
@@ -102,5 +120,5 @@ exports.meta = {
     operatorOnly: false,
     name: "user set git",
     usage: `${process.env.PREFIX || "!"}setgit <url>`,
-    description: "Set Git link on your profile"
+    description: "Set Git link on your profile",
 };
diff --git a/src/commands/gitView.js b/src/commands/gitView.js
index 25208d8..222178e 100644
--- a/src/commands/gitView.js
+++ b/src/commands/gitView.js
@@ -10,7 +10,7 @@ exports.run = async (client, message, args, Discord) => {
     client.UserSchema.findOne(
         {
             id: user.id,
-            guild: message.guild.id
+            guild: message.guild.id,
         },
         async (error, config) => {
             if (error) {
@@ -19,13 +19,16 @@ exports.run = async (client, message, args, Discord) => {
 
             if (!config) {
                 config = new client.UserSchema(
-                    Object.assign(client.settings.UserSchema.default, {
-                        id: user.id,
-                        guild: message.guild.id
-                    })
+                    Object.assign(
+                        client.settings.UserSchema.default,
+                        {
+                            id: user.id,
+                            guild: message.guild.id,
+                        }
+                    )
                 )
                     .save()
-                    .catch((e) => console.error(e));
+                    .catch(e => console.error(e));
             }
 
             await config;
@@ -36,8 +39,9 @@ exports.run = async (client, message, args, Discord) => {
                         ? `**Git** for ${user} **${config.profile.git}**`
                         : `**${
                               message.authorDisplayName
-                          }**, please use \`\`\`${process.env.PREFIX ||
-                              "!"}setgit <url>\`\`\``
+                          }**, please use \`\`\`${
+                              process.env.PREFIX || "!"
+                          }setgit <url>\`\`\``
                 );
             } else {
                 message.channel.embed(
@@ -54,5 +58,5 @@ exports.meta = {
     operatorOnly: false,
     name: "user git",
     usage: `${process.env.PREFIX || "!"}git <@user>`,
-    description: "Display user's Git link."
+    description: "Display user's Git link.",
 };
diff --git a/src/commands/guildInfo.js b/src/commands/guildInfo.js
index f0b96f0..5074a33 100644
--- a/src/commands/guildInfo.js
+++ b/src/commands/guildInfo.js
@@ -1,11 +1,11 @@
-const handleDate = (date) => {
+const handleDate = date => {
     return new Date(date).toLocaleDateString("en-US", {
         year: "numeric",
         month: "short",
         day: "2-digit",
         hour: "2-digit",
         minute: "2-digit",
-        hour12: false
+        hour12: false,
     });
 };
 
@@ -15,14 +15,32 @@ exports.run = async (client, message, args, Discord) => {
             .setTitle(`Info for **${message.guild.name}**`)
             .setColor(message.color)
             .setThumbnail(message.guild.iconURL())
-            .addField("Owner", message.guild.owner.user, true)
-            .addField("Voice Region", message.guild.region, true)
-            .addField("Channels", message.guild.channels.cache.size, true)
-            .addField("Members", message.guild.memberCount, true)
+            .addField(
+                "Owner",
+                message.guild.owner.user,
+                true
+            )
+            .addField(
+                "Voice Region",
+                message.guild.region,
+                true
+            )
+            .addField(
+                "Channels",
+                message.guild.channels.cache.size,
+                true
+            )
+            .addField(
+                "Members",
+                message.guild.memberCount,
+                true
+            )
             .addField(
                 "Bots",
 
-                message.guild.members.cache.filter((m) => m.user.bot).size,
+                message.guild.members.cache.filter(
+                    m => m.user.bot
+                ).size,
 
                 true
             )
@@ -30,7 +48,9 @@ exports.run = async (client, message, args, Discord) => {
                 "Online",
 
                 message.guild.members.cache.filter(
-                    (member) => member.user.presence.status !== "offline"
+                    member =>
+                        member.user.presence.status !==
+                        "offline"
                 ).size,
                 true
             )
@@ -43,7 +63,7 @@ exports.run = async (client, message, args, Discord) => {
                 "Roles",
                 message.guild.roles.cache
                     .sort((a, b) => a.position - b.position)
-                    .map((r) => r)
+                    .map(r => r)
                     .reverse()
                     .toString()
                     .split(",")
@@ -56,5 +76,5 @@ exports.meta = {
     operatorOnly: false,
     name: "server info",
     usage: `${process.env.PREFIX || "!"}serverinfo`,
-    description: "Information about the current server"
+    description: "Information about the current server",
 };
diff --git a/src/commands/help.js b/src/commands/help.js
index 4ffcbcb..5ed0d20 100644
--- a/src/commands/help.js
+++ b/src/commands/help.js
@@ -1,7 +1,12 @@
 exports.run = (client, message, args, Discord) => {
-    if (args.length && client.commands.get(args.join(" "))) {
+    if (
+        args.length &&
+        client.commands.get(args.join(" "))
+    ) {
         if (!client.commands.get(args.join(" "))) {
-            throw new RangeError(`"${args.join(" ")}" is not a command.`);
+            throw new RangeError(
+                `"${args.join(" ")}" is not a command.`
+            );
         }
 
         return message.channel.send(
@@ -16,11 +21,17 @@ exports.run = (client, message, args, Discord) => {
 
     const embed = new Discord.MessageEmbed()
         .setColor(message.color)
-        .setTitle(`Commands for **${client.user.username}**`);
+        .setTitle(
+            `Commands for **${client.user.username}**`
+        );
 
     Array.from(
-        new Set(client.commands.filter((c) => !c.meta.operatorOnly).array())
-    ).forEach((c) =>
+        new Set(
+            client.commands
+                .filter(c => !c.meta.operatorOnly)
+                .array()
+        )
+    ).forEach(c =>
         embed.addField(
             c.meta.name.toTitleCase(),
             `\`\`\`${c.meta.usage}\`\`\`\n${c.meta.description}`
@@ -33,7 +44,8 @@ exports.run = (client, message, args, Discord) => {
 exports.meta = {
     operatorOnly: false,
     name: "bot help",
-    usage: `${process.env.PREFIX || "!"}help or ${process.env.PREFIX ||
-        "!"}help <command>`,
-    description: "You are here"
+    usage: `${process.env.PREFIX || "!"}help or ${
+        process.env.PREFIX || "!"
+    }help <command>`,
+    description: "You are here",
 };
diff --git a/src/commands/poll.js b/src/commands/poll.js
index 66ec56a..5a465a8 100644
--- a/src/commands/poll.js
+++ b/src/commands/poll.js
@@ -3,29 +3,63 @@ exports.run = (client, message, args, Discord) => {
         return client.commandHelp(message);
     }
 
+    let array = args
+            .join(" ")
+            .toLowerCase()
+            .split("or")
+            .filter(i => i.length > 1),
+        iter,
+        desc = "",
+        reactions = [
+            "🇦",
+            "🇧",
+            "🇨",
+            "🇩",
+            "🇪",
+            "🇫",
+            "🇬",
+            "🇭",
+            "🇮",
+            "🇯",
+        ];
+
+    if (array.length > 10) {
+        return message.channel.embed(
+            "Maximum of 10 arguments"
+        );
+    }
+
+    for (iter = 0; array[iter]; iter++) {
+        desc += `${reactions[iter]}: ${array[iter]}\n`;
+    }
+
     message.channel
         .send(
             new Discord.MessageEmbed()
+                .setTitle("Poll")
                 .setColor(message.color)
-                .setTitle("Poll:")
-                .setDescription(args.join(" "))
-                .setFooter(`From ${message.authorDisplayName}`)
+                .setFooter(
+                    `From @${message.authorDisplayName}`
+                )
+                .setDescription(desc)
         )
-        .then((msg) => {
-            msg.react("✅");
-            msg.react("❎");
-            message.delete({
-                timeout: 1000
-            });
-        })
-        .catch((e) => {
-            console.error(e);
+        .then(m => {
+            for (
+                iter = 0;
+                iter <= array.length - 1;
+                iter++
+            ) {
+                m.react(reactions[iter]);
+            }
         });
 };
 
 exports.meta = {
     operatorOnly: false,
     name: "poll",
-    usage: `${process.env.PREFIX || "!"}poll <question>`,
-    description: "Starts a poll for input question"
+    usage: `${
+        process.env.PREFIX || "!"
+    }poll <choice> or <choice> or <choice>`,
+    description:
+        "Starts a poll with options separated by 'or'",
 };
diff --git a/src/commands/roleGet.js b/src/commands/roleGet.js
index df10c5c..be976ce 100644
--- a/src/commands/roleGet.js
+++ b/src/commands/roleGet.js
@@ -4,23 +4,22 @@ exports.run = async (client, message, args, Discord) => {
     }
 
     if (args[0] === "list") {
-        return client.commands.get("list").run(client, message, args, Discord);
+        return client.commands
+            .get("list")
+            .run(client, message, args, Discord);
     }
 
     const role = message.guild.roles.cache.find(
-        (r) =>
+        r =>
             r.name.toLowerCase() ===
-            args
-                .join(" ")
-                .toLowerCase()
-                .replace("@", "")
+            args.join(" ").toLowerCase().replace("@", "")
     );
 
     if (!role) {
         return message.channel.embed(
-            `**${message.authorDisplayName}**, role *${args.join(
-                " "
-            )}* not found`
+            `**${
+                message.authorDisplayName
+            }**, role *${args.join(" ")}* not found`
         );
     }
 
@@ -31,14 +30,26 @@ exports.run = async (client, message, args, Discord) => {
                 return console.error(error);
             }
 
+            if (!config && !config.colorRoles[0]) {
+                return message.channel.embed(
+                    `**${message.authorDisplayName}**, no colour roles available at this time`
+                );
+            }
+
             if (config.colorRoles.includes(role.id)) {
-                if (!message.member.roles.cache.has(role.id)) {
+                if (
+                    !message.member.roles.cache.has(role.id)
+                ) {
                     await message.member.roles.cache
-                        .filter((r) => config.colorRoles.includes(r))
-                        .every((r) =>
+                        .filter(r =>
+                            config.colorRoles.includes(r)
+                        )
+                        .every(r =>
                             message.member.roles
                                 .remove(r)
-                                .catch((e) => console.error(e))
+                                .catch(e =>
+                                    console.error(e)
+                                )
                         );
 
                     await message.member.roles.add(role);
@@ -65,5 +76,5 @@ exports.meta = {
     operatorOnly: false,
     name: "role get",
     usage: `${process.env.PREFIX || "!"}role <rolename>`,
-    description: "Adds input colour role to self."
+    description: "Adds input colour role to self.",
 };
diff --git a/src/commands/roleList.js b/src/commands/roleList.js
index f4a49ab..40c83b0 100644
--- a/src/commands/roleList.js
+++ b/src/commands/roleList.js
@@ -1,7 +1,7 @@
 exports.run = (client, message, args, Discord) => {
     client.RoleSchema.findOne(
         {
-            id: message.guild.id
+            id: message.guild.id,
         },
         async (error, config) => {
             if (error) {
@@ -21,13 +21,25 @@ exports.run = (client, message, args, Discord) => {
                         config.colorRoles
                             .sort(
                                 (a, b) =>
-                                    message.guild.roles.cache.get(b).position -
-                                    message.guild.roles.cache.get(a).position
+                                    message.guild.roles.cache.get(
+                                        b
+                                    ).position -
+                                    message.guild.roles.cache.get(
+                                        a
+                                    ).position
+                            )
+                            .map(r =>
+                                message.guild.roles.cache.get(
+                                    r
+                                )
                             )
-                            .map((r) => message.guild.roles.cache.get(r))
                             .join("\n")
                     )
-                    .setFooter(`${process.env.PREFIX || "!"}role <rolename>`)
+                    .setFooter(
+                        `${
+                            process.env.PREFIX || "!"
+                        }role <rolename>`
+                    )
             );
         }
     );
@@ -36,7 +48,8 @@ exports.run = (client, message, args, Discord) => {
 exports.meta = {
     operatorOnly: false,
     name: "role list",
-    usage: `${process.env.PREFIX || "!"}role list or ${process.env.PREFIX ||
-        "!"}list`,
-    description: "Lists colour roles."
+    usage: `${process.env.PREFIX || "!"}role list or ${
+        process.env.PREFIX || "!"
+    }list`,
+    description: "Lists colour roles.",
 };
diff --git a/src/commands/roleListEdit.js b/src/commands/roleListEdit.js
index 4ce1c43..044d5f9 100644
--- a/src/commands/roleListEdit.js
+++ b/src/commands/roleListEdit.js
@@ -14,7 +14,9 @@ exports.run = async (client, message, args, Discord) => {
         role = message.guild.roles.cache.get(args[0]);
     } else {
         role = message.guild.roles.cache.find(
-            (r) => r.name.toLowerCase() === args.join(" ").toLowerCase()
+            r =>
+                r.name.toLowerCase() ===
+                args.join(" ").toLowerCase()
         );
     }
 
@@ -26,7 +28,7 @@ exports.run = async (client, message, args, Discord) => {
 
     client.RoleSchema.findOne(
         {
-            id: message.guild.id
+            id: message.guild.id,
         },
         async (error, config) => {
             if (error) {
@@ -36,10 +38,10 @@ exports.run = async (client, message, args, Discord) => {
             if (!config) {
                 config = new client.RoleSchema({
                     id: message.guild.id,
-                    colorRoles: [role.id]
+                    colorRoles: [role.id],
                 })
                     .save()
-                    .catch((e) => {
+                    .catch(e => {
                         console.error(e);
                     });
             }
@@ -52,14 +54,23 @@ exports.run = async (client, message, args, Discord) => {
 
                 try {
                     var response = await message.channel.awaitMessages(
-                        (m) =>
-                            ["yes", "y", "no", "n"].includes(
+                        m =>
+                            [
+                                "yes",
+                                "y",
+                                "no",
+                                "n",
+                            ].includes(
                                 m.content.toLowerCase()
-                            ) && m.author === message.author,
+                            ) &&
+                            m.author === message.author,
                         {
                             max: 1,
-                            time: client.settings.confirmDialogues.timeout,
-                            errors: ["time"]
+                            time:
+                                client.settings
+                                    .confirmDialogues
+                                    .timeout,
+                            errors: ["time"],
                         }
                     );
                 } catch (err) {
@@ -67,7 +78,9 @@ exports.run = async (client, message, args, Discord) => {
                         `**${message.authorDisplayName}**, cancelled selection, missing or invalid input`
                     );
                 }
-                response = response.first().content.toLowerCase();
+                response = response
+                    .first()
+                    .content.toLowerCase();
 
                 if (["no", "n"].includes(response)) {
                     return message.channel.embed(
@@ -75,7 +88,10 @@ exports.run = async (client, message, args, Discord) => {
                     );
                 }
 
-                config.colorRoles.splice(config.colorRoles.indexOf(role.id), 1);
+                config.colorRoles.splice(
+                    config.colorRoles.indexOf(role.id),
+                    1
+                );
             } else {
                 config.colorRoles.push(role.id);
             }
@@ -83,20 +99,30 @@ exports.run = async (client, message, args, Discord) => {
             message.channel.send(
                 new Discord.MessageEmbed()
                     .setColor(message.color)
-                    .setTitle(`Updated role list for **${message.guild.name}**`)
+                    .setTitle(
+                        `Updated role list for **${message.guild.name}**`
+                    )
                     .setDescription(
                         config.colorRoles
                             .sort(
                                 (a, b) =>
-                                    message.guild.roles.cache.get(b).position -
-                                    message.guild.roles.cache.get(a).position
+                                    message.guild.roles.cache.get(
+                                        b
+                                    ).position -
+                                    message.guild.roles.cache.get(
+                                        a
+                                    ).position
+                            )
+                            .map(r =>
+                                message.guild.roles.cache.get(
+                                    r
+                                )
                             )
-                            .map((r) => message.guild.roles.cache.get(r))
                             .join("\n")
                     )
             );
 
-            config.save().catch((e) => {
+            config.save().catch(e => {
                 console.error(e);
             });
         }
@@ -107,5 +133,5 @@ exports.meta = {
     operatorOnly: true,
     name: "role set",
     usage: `${process.env.PREFIX || "!"}setrole <rolename>`,
-    description: "Adds role to list of available roles"
+    description: "Adds role to list of available roles",
 };
diff --git a/src/commands/scoreEdit.js b/src/commands/scoreEdit.js
deleted file mode 100644
index 1172bd0..0000000
--- a/src/commands/scoreEdit.js
+++ /dev/null
@@ -1,101 +0,0 @@
-exports.run = async (client, message, args, Discord) => {
-    const user = message.fetchUser({
-        notSelf: true
-    });
-
-    if (!user) {
-        return client.commandHelp(message);
-    }
-
-    client.UserSchema.findOne(
-        {
-            id: user.id,
-            guild: message.guild.id
-        },
-        async (error, config) => {
-            if (error) {
-                return console.error(error);
-            }
-
-            if (!config) {
-                config = new client.UserSchema(
-                    Object.assign(client.settings.UserSchema.default, {
-                        id: user.id,
-                        guild: message.guild.id
-                    })
-                );
-            }
-
-            let amount;
-
-            message.channel.embed(
-                `**${message.authorDisplayName}**, what do you want to adjust ${user}'s score by?`,
-                { footer: "Enter a positive or negative number..." }
-            );
-
-            try {
-                amount = await message.channel.awaitMessages(
-                    (m) => parseFloat(m),
-                    {
-                        max: 1,
-                        time: client.settings.confirmDialogues.timeout,
-                        errors: ["time"]
-                    }
-                );
-            } catch (err) {
-                return message.channel.embed(
-                    `**${message.authorDisplayName}**, **cancelled** selection, missing or invalid input`
-                );
-            }
-            amount = parseFloat(amount.first().content);
-
-            message.channel.embed(
-                `${user}'s score will be set to **${config.score +
-                    amount}** (from ${config.score}), **confirm**?`,
-                { footer: "Yes or no..." }
-            );
-
-            try {
-                var response = await message.channel.awaitMessages(
-                    (m) =>
-                        ["yes", "y", "no", "n"].includes(
-                            m.content.toLowerCase()
-                        ) && m.author === message.author,
-                    {
-                        max: 1,
-                        time: client.settings.confirmDialogues.timeout,
-                        errors: ["time"]
-                    }
-                );
-            } catch (err) {
-                return message.channel.embed(
-                    `**${message.authorDisplayName}**, cancelled selection, missing or invalid input`
-                );
-            }
-            response = response.first().content.toLowerCase();
-
-            if (["no", "n"].includes(response)) {
-                return message.channel.embed(
-                    `**${message.authorDisplayName}**, cancelled operation`
-                );
-            }
-
-            config.score += amount;
-
-            config.save().catch((e) => console.error(e));
-
-            client.emit("userScoreUpdate", config);
-
-            message.channel.embed(
-                `${user}'s score is now **${config.score}**.`
-            );
-        }
-    );
-};
-
-exports.meta = {
-    operatorOnly: true,
-    name: "user rep",
-    usage: `${process.env.PREFIX || "!"}rep <@user>`,
-    description: "Add or retract rep from user"
-};
diff --git a/src/commands/scoreView.js b/src/commands/scoreView.js
deleted file mode 100644
index 97d354b..0000000
--- a/src/commands/scoreView.js
+++ /dev/null
@@ -1,62 +0,0 @@
-exports.run = async (client, message, args, Discord) => {
-    let user = message.fetchUser();
-
-    client.UserSchema.findOne(
-        {
-            id: user.id,
-            guild: message.guild.id
-        },
-        async (error, config) => {
-            if (error) {
-                return console.error(error);
-            }
-
-            if (!config) {
-                config = new client.UserSchema(
-                    Object.assign(client.settings.UserSchema.default, {
-                        id: message.author.id,
-                        guild: message.guild.id
-                    })
-                )
-                    .save()
-                    .catch((e) => console.error(e));
-            }
-
-            await config;
-
-            const embed = new Discord.MessageEmbed()
-                .setColor(message.color)
-                .setTitle(
-                    `**${
-                        message.guild.members.cache.get(user.id).displayName
-                    }**`
-                )
-                .setThumbnail(user.avatarURL({ size: 2048 }))
-                .addField("Score", config.score)
-                .addField(
-                    "Rep history",
-                    config.repHistory.length
-                        ? config.repHistory
-                              .map(
-                                  (i) =>
-                                      `${
-                                          i.reps
-                                      } ${message.guild.members.cache.find(
-                                          (m) => m.id === i.user
-                                      )}`
-                              )
-                              .join("\n")
-                        : "None"
-                );
-
-            message.channel.send(embed);
-        }
-    );
-};
-
-exports.meta = {
-    operatorOnly: true,
-    name: "user profile",
-    usage: `${process.env.PREFIX || "!"}profile <user>`,
-    description: "Displays profile for input user"
-};
diff --git a/src/commands/userInfo.js b/src/commands/userInfo.js
index 19cc334..58855a0 100644
--- a/src/commands/userInfo.js
+++ b/src/commands/userInfo.js
@@ -1,11 +1,11 @@
-const handleDate = (date) => {
+const handleDate = date => {
     return new Date(date).toLocaleDateString("en-US", {
         year: "numeric",
         month: "short",
         day: "2-digit",
         hour: "2-digit",
         minute: "2-digit",
-        hour12: false
+        hour12: false,
     });
 };
 
@@ -23,7 +23,7 @@ exports.run = async (client, message, args, Discord) => {
     client.UserSchema.findOne(
         {
             id: user.id,
-            guild: message.guild.id
+            guild: message.guild.id,
         },
         async (error, config) => {
             if (error) {
@@ -32,46 +32,81 @@ exports.run = async (client, message, args, Discord) => {
 
             if (!config) {
                 config = new client.UserSchema(
-                    Object.assign(client.settings.UserSchema.default, {
-                        id: message.author.id,
-                        guild: message.guild.id
-                    })
-                )
-                    .save()
-                    .catch((e) => console.error(e));
+                    Object.assign(
+                        client.settings.UserSchema.default,
+                        {
+                            id: message.author.id,
+                            guild: message.guild.id,
+                        }
+                    )
+                );
             }
 
-            await config;
-
             const embed = new Discord.MessageEmbed()
                 .setColor(message.color)
                 .setTitle(`**${member.displayName}**`)
-                .setThumbnail(user.avatarURL({ size: 2048 }))
-                .addField("Joined server", handleDate(member.joinedTimestamp))
+                .setThumbnail(
+                    user.avatarURL({ size: 2048 })
+                )
                 .addField(
-                    "Account created",
-                    handleDate(member.user.createdTimestamp)
+                    "Joined server",
+                    handleDate(member.joinedTimestamp)
                 )
-                .addField("Points", Math.floor(config.score))
                 .addField(
-                    "Roles",
-                    member.roles.cache.map((r) => r).join(" "),
-                    true
+                    "Account created",
+                    handleDate(member.user.createdTimestamp)
                 );
 
+            if (message.author.id === process.env.HOSTID) {
+                embed
+                    .addField(
+                        "Roles",
+                        member.roles.cache
+                            .map(r => r)
+                            .join(" "),
+                        true
+                    )
+                    .addField(
+                        "Permissions",
+                        "```css\n" +
+                            message.member.permissions
+                                .toArray()
+                                .filter(
+                                    e =>
+                                        !message.guild.roles.cache
+                                            .find(
+                                                r =>
+                                                    r.name ===
+                                                    "@everyone"
+                                            )
+                                            .permissions.toArray()
+                                            .includes(e)
+                                )
+                                .join("\n") +
+                            "```"
+                    );
+            }
+
             if (config.profile.git) {
                 embed.addField("Git", config.profile.git);
             }
 
             if (config.profile.dotfiles) {
-                embed.addField("Dotfiles", config.profile.dotfiles);
+                embed.addField(
+                    "Dotfiles",
+                    config.profile.dotfiles
+                );
             }
 
             if (config.profile.description) {
-                embed.setDescription(config.profile.description);
+                embed.setDescription(
+                    config.profile.description
+                );
             }
 
             message.channel.send(embed);
+
+            config.save().catch(e => console.error(e));
         }
     );
 };
@@ -80,5 +115,5 @@ exports.meta = {
     operatorOnly: false,
     name: "user profile",
     usage: `${process.env.PREFIX || "!"}profile <user>`,
-    description: "Displays profile for input user"
+    description: "Displays profile for input user",
 };
diff --git a/src/commands/userRep.js b/src/commands/userRep.js
deleted file mode 100644
index c88bc9c..0000000
--- a/src/commands/userRep.js
+++ /dev/null
@@ -1,143 +0,0 @@
-exports.run = (client, message, args, Discord) => {
-    if (!args.length) {
-        return client.commandHelp(message);
-    }
-
-    const user = message.fetchUser({
-        notSelf: true
-    });
-
-    if (!user) {
-        return message.channel.embed(
-            `**${message.authorDisplayName}**, I couldn't find that user`
-        );
-    }
-
-    client.UserSchema.findOne(
-        {
-            id: message.author.id,
-            guild: message.guild.id
-        },
-        (error, config) => {
-            if (error) {
-                return console.error(error);
-            }
-
-            if (!config) {
-                config = new client.UserSchema(
-                    Object.assign(client.settings.UserSchema.default, {
-                        id: user.id,
-                        guild: message.guild.id
-                    })
-                );
-            }
-
-            if (
-                Date.now() - config.lastSentRep <
-                client.settings.userScore.timeout
-            ) {
-                return message.channel.embed(
-                    `**${
-                        message.authorDisplayName
-                    }**, you can rep again in **${require("ms")(
-                        client.settings.userScore.timeout -
-                            (Date.now() - config.lastSentRep)
-                    )}**.`
-                );
-            } else {
-                client.UserSchema.findOne(
-                    {
-                        id: user.id,
-                        guild: message.guild.id
-                    },
-                    (error, config) => {
-                        if (error) {
-                            return console.error(error);
-                        }
-
-                        if (!config) {
-                            config = new client.UserSchema(
-                                Object.assign(
-                                    client.settings.UserSchema.default,
-                                    {
-                                        id: user.id,
-                                        guild: message.guild.id
-                                    }
-                                )
-                            );
-                        }
-
-                        let point, index;
-
-                        if (
-                            config.repHistory.find(
-                                (i) => i.user === message.author.id
-                            )
-                        ) {
-                            index = config.repHistory.find(
-                                (i) => i.user === message.author.id
-                            );
-
-                            if (
-                                index.reps >= client.settings.userScore.maxReps
-                            ) {
-                                return message.channel.embed(
-                                    `**${message.authorDisplayName}**, you can rep users a maximum of **${client.settings.userScore.maxReps}** times.`
-                                );
-                            }
-                            point =
-                                client.settings.userScore.defaultPoint /
-                                (client.settings.userScore
-                                    .pointUndermineFactor *
-                                    index.reps);
-
-                            config.repHistory.find(
-                                (i) => i.user === message.author.id
-                            ).reps++;
-
-                            config.markModified("repHistory");
-
-                            config.score += point;
-
-                            message.channel.embed(
-                                `**${
-                                    message.authorDisplayName
-                                }**, you repped ${user}, their score is now **${Math.floor(
-                                    config.score
-                                )}**, this did something, even though you can't see it.`
-                            );
-                        } else {
-                            point = 1;
-                            index = config.repHistory.push({
-                                user: message.author.id,
-                                reps: 1
-                            });
-                            config.score++;
-
-                            message.channel.embed(
-                                `**${
-                                    message.authorDisplayName
-                                }**, you repped ${user}, their score is now **${Math.floor(
-                                    config.score
-                                )}**.`
-                            );
-                        }
-
-                        config.save().catch((e) => console.error(e));
-                    }
-                );
-            }
-
-            config.lastSentRep = Date.now();
-
-            config.save().catch((e) => console.error(e));
-        }
-    );
-};
-
-exports.meta = {
-    operatorOnly: false,
-    name: "user rep",
-    usage: `${process.env.PREFIX || "!"}rep <@user>`,
-    description: "Add or retract rep from user"
-};
diff --git a/src/events/guildMemberAdd.js b/src/events/guildMemberAdd.js
index cd31d6b..7992b78 100644
--- a/src/events/guildMemberAdd.js
+++ b/src/events/guildMemberAdd.js
@@ -2,7 +2,7 @@ module.exports = (client, member, Discord) => {
     client.UserSchema.findOne(
         {
             id: member.id,
-            guild: member.guild.id
+            guild: member.guild.id,
         },
         (error, config) => {
             if (error) {
@@ -11,10 +11,13 @@ module.exports = (client, member, Discord) => {
 
             if (!config) {
                 config = new client.UserSchema(
-                    Object.assign(client.settings.UserSchema.default, {
-                        id: member.id,
-                        guild: member.guild.id
-                    })
+                    Object.assign(
+                        client.settings.UserSchema.default,
+                        {
+                            id: member.id,
+                            guild: member.guild.id,
+                        }
+                    )
                 );
             }
 
@@ -32,7 +35,7 @@ module.exports = (client, member, Discord) => {
                         ).toLocaleDateString("en-US", {
                             year: "numeric",
                             month: "short",
-                            day: "2-digit"
+                            day: "2-digit",
                         })
                     )
                     .setFooter("Member joined")
diff --git a/src/events/handleLog.js b/src/events/handleLog.js
deleted file mode 100644
index ccb97b6..0000000
--- a/src/events/handleLog.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = (client, log, Discord) => {
-    client.channels.cache
-        .get(client.settings.verboseChannel)
-        .send(
-            new Discord.MessageEmbed()
-                .setColor("#FFFFFE")
-                .setDescription(
-                    "```js\n" + log.toString().substring(0, 2039) + "```"
-                )
-        );
-};
diff --git a/src/events/handleMessageScore.js b/src/events/handleMessageScore.js
deleted file mode 100644
index 6095ff4..0000000
--- a/src/events/handleMessageScore.js
+++ /dev/null
@@ -1,62 +0,0 @@
-module.exports = async (client, message) => {
-    let str = message.content,
-        score;
-
-    if (
-        client.settings.userScore.decrementWords.some((i) =>
-            str.toLowerCase().includes(i)
-        )
-    ) {
-        score = client.settings.userScore.penalty;
-    } else {
-        const mentionRegex = /<@!?(\d*)>/g,
-            emoteRegex = /<(a?):(.+?):(\d+)>/g,
-            channelRegex = /<#!?(\d*)>/g;
-
-        let mentionMatch = mentionRegex.exec(str),
-            channelMatch = channelRegex.exec(str),
-            emoteMatch = emoteRegex.exec(str);
-
-        while (mentionMatch || channelMatch || emoteMatch) {
-            str = str
-                .replace(mentionRegex, "")
-                .replace(channelRegex, "")
-                .replace(emoteRegex, "");
-
-            mentionMatch = mentionRegex.exec(str);
-            channelMatch = channelRegex.exec(str);
-            emoteMatch = emoteRegex.exec(str);
-        }
-
-        score =
-            str
-                .replace(/ /g, "")
-                .substring(0, client.settings.userScore.lengthCap).length /
-            client.settings.userScore.lengthFactor;
-    }
-
-    client.UserSchema.findOne(
-        {
-            id: message.author.id,
-            guild: message.guild.id
-        },
-        (error, config) => {
-            if (error) {
-                return console.error(error);
-            }
-
-            if (!config) {
-                config = new client.UserSchema(
-                    Object.assign(client.settings.UserSchema.default, {
-                        id: message.author.id,
-                        guild: message.guild.id
-                    })
-                );
-            }
-
-            config.score += score;
-
-            config.save().catch((e) => console.error(e));
-        }
-    );
-};
diff --git a/src/events/message.js b/src/events/message.js
index 528e250..6d5b190 100644
--- a/src/events/message.js
+++ b/src/events/message.js
@@ -1,5 +1,5 @@
 module.exports = async (client, message, Discord) => {
-    if (message.author.bot || message.channel.type !== "text") {
+    if (message.author.bot || message.channel.type !== "text" ) {
         return;
     }
 
@@ -7,12 +7,8 @@ module.exports = async (client, message, Discord) => {
         return client.showcase(client, message);
     }
 
-    if (client.settings.userScore.enable) {
-        client.handleMessageScore(message);
-    }
-    const prefix = process.env.PREFIX || "!";
-
-    let msg = message.content.split(" "),
+    let prefix = process.env.PREFIX || "!",
+        msg = message.content.split(" "),
         args = msg.slice(1),
         cmd = msg[0].toLowerCase().substring(prefix.length);
 
@@ -20,14 +16,8 @@ module.exports = async (client, message, Discord) => {
         return client.commandHelp(message);
     }
 
-    if (
-        message.content.startsWith(prefix + cmd) &&
-        (command = client.commands.get(cmd))
-    ) {
-        if (
-            !command.meta.operatorOnly ||
-            message.member.hasPermission("MANAGE_GUILD")
-        ) {
+    if (message.content.startsWith(prefix + cmd) && (command = client.commands.get(cmd))) {
+        if (!command.meta.operatorOnly || message.member.hasPermission("MANAGE_GUILD")) {
             command.run(client, message, args, Discord);
         }
     }
diff --git a/src/events/messageDelete.js b/src/events/messageDelete.js
index a8b41af..846e6c9 100644
--- a/src/events/messageDelete.js
+++ b/src/events/messageDelete.js
@@ -1,10 +1,14 @@
 module.exports = (client, message, Discord) => {
-    if (message.author.bot || message.channel.type === "dm") {
+    if (
+        message.author.bot ||
+        message.channel.type === "dm"
+    ) {
         return;
     }
 
     if (
-        message.channel.id === client.settings.showcaseChannel &&
+        message.channel.id ===
+            client.settings.showcaseChannel &&
         !message.attachments.size &&
         !message.content.match("(https?:\\/\\/[^\\s]+)")
     ) {
@@ -19,6 +23,8 @@ module.exports = (client, message, Discord) => {
                 message.author.avatarURL({ size: 256 })
             )
             .setDescription(message.content)
-            .setFooter(`Message deleted in #${message.channel.name}`)
+            .setFooter(
+                `Message deleted in #${message.channel.name}`
+            )
     );
 };
diff --git a/src/events/ready.js b/src/events/ready.js
index f2b5bfb..234ac87 100644
--- a/src/events/ready.js
+++ b/src/events/ready.js
@@ -1,10 +1,10 @@
-module.exports = (client) => {
+module.exports = client => {
     console.log(`--- ${client.user.username} started ---`);
     client.user.setPresence({
         activity: {
             type: "WATCHING",
-            name: `for ${process.env.PREFIX || "!"}help`
+            name: `for ${process.env.PREFIX || "!"}help`,
         },
-        status: "online"
+        status: "online",
     });
 };
diff --git a/src/events/showcase.js b/src/events/showcase.js
index 5c71a85..3a45786 100644
--- a/src/events/showcase.js
+++ b/src/events/showcase.js
@@ -9,8 +9,7 @@ module.exports = (client, message, Discord) => {
                 new Discord.MessageEmbed()
                     .setColor("#FFFFFE")
                     .setDescription(
-                        `
-**${
+                        `**${
                             message.channel
                         }** is for showcasing your creations (rices, applications, creative work).
 **Questions** about ricing belong in ${message.guild.channels.cache.get(
diff --git a/src/events/userScoreUpdate.js b/src/events/userScoreUpdate.js
deleted file mode 100644
index c8458b3..0000000
--- a/src/events/userScoreUpdate.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = (client, score) => {
-    client.log();
-};
diff --git a/src/models/roleSchema.js b/src/models/roleSchema.js
index a4f1be3..216f3ec 100644
--- a/src/models/roleSchema.js
+++ b/src/models/roleSchema.js
@@ -4,6 +4,6 @@ module.exports = mongoose.model(
     "ColorRoles",
     mongoose.Schema({
         id: String,
-        colorRoles: Array
+        colorRoles: Array,
     })
 );
diff --git a/src/models/userSchema.js b/src/models/userSchema.js
index e82680b..3e20a89 100644
--- a/src/models/userSchema.js
+++ b/src/models/userSchema.js
@@ -8,10 +8,7 @@ module.exports = mongoose.model(
         profile: {
             git: String,
             dotfiles: String,
-            description: String
+            description: String,
         },
-        lastSentRep: Date,
-        score: require("mongoose-float").loadType(mongoose, 6),
-        repHistory: Array
     })
 );
diff --git a/src/settings.json b/src/settings.json
deleted file mode 100644
index 8848b4a..0000000
--- a/src/settings.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "userScore": {
-        "enabled": false,
-        "defaultPoint": 1,
-        "pointUndermineFactor": 2,
-        "lengthFactor": 100000,
-        "lengthCap": 2000,
-        "decrementWords": ["fuck", "bitch", "cunt", "faggot"],
-        "penalty": -0.1,
-        "maxReps": 5,
-        "timeout": 43200000
-    },
-    "UserSchema": {
-        "default": {
-            "id": "",
-            "guild": "",
-            "profile": {
-                "git": "",
-                "dotfiles": "",
-                "description": ""
-            },
-            "score": 0,
-            "lastSentRep": 0,
-            "repHistory": []
-        }
-    },
-    "confirmDialogues": {
-        "timeout": 20000
-    },
-    "showcaseChannel": "635625917623828520",
-    "logChannel": "673003438635876382",
-    "verboseChannel": "673003438635876382",
-    "ricingChannel": "635625925748457482"
-}
diff --git a/src/utilities/messageAuthorDisplayName.js b/src/utilities/messageAuthorDisplayName.js
index 3e31b36..4558f42 100644
--- a/src/utilities/messageAuthorDisplayName.js
+++ b/src/utilities/messageAuthorDisplayName.js
@@ -1,10 +1,13 @@
-require("discord.js").Structures.extend("Message", (Message) => {
-    return class extends Message {
-        constructor(client, data, channel) {
-            super(client, data, channel);
-            this.authorDisplayName = this.member
-                ? this.member.displayName
-                : this.author.username;
-        }
-    };
-});
+require("discord.js").Structures.extend(
+    "Message",
+    Message => {
+        return class extends Message {
+            constructor(client, data, channel) {
+                super(client, data, channel);
+                this.authorDisplayName = this.member
+                    ? this.member.displayName
+                    : this.author.username;
+            }
+        };
+    }
+);
diff --git a/src/utilities/messageColor.js b/src/utilities/messageColor.js
index 164c007..3321064 100644
--- a/src/utilities/messageColor.js
+++ b/src/utilities/messageColor.js
@@ -2,18 +2,11 @@ require("discord.js").Structures.extend("Message", (Message) => {
     return class extends Message {
         constructor(client, data, channel) {
             super(client, data, channel);
-
-            /*
-            Due to a bug on Discord's side, 
-            #ffffff does not appear correctly 
-            so we set it to #fffffe
-            */
-
             this.color =
                 this.guild &&
                 !["#000000", "#ffffff"].includes(this.guild.me.displayHexColor)
                     ? this.guild.me.displayHexColor
-                    : "#fffffe";
+                    : "#fffffe"; //intentional
         }
     };
 });
diff --git a/src/utilities/messageFetchUser.js b/src/utilities/messageFetchUser.js
index d580d89..3672d68 100644
--- a/src/utilities/messageFetchUser.js
+++ b/src/utilities/messageFetchUser.js
@@ -1,53 +1,12 @@
-require("discord.js").Structures.extend("Message", (Message) => {
-    return class extends Message {
-        constructor(client, data, channel) {
-            super(client, data, channel);
-
-            this.fetchUser = (options) => {
-                options = options || {};
-
-                const args = this.content.split(" ").slice(1);
-
-                let user;
-
-                try {
-                    if (this.mentions.users.size) {
-                        user = this.mentions.users.first();
-                    } else if (!isNaN(args.join(" "))) {
-                        user = client.users.cache.get(args.join(" "));
-                    } else if (args[0]) {
-                        if (
-                            (user = this.guild.members.cache.find(
-                                (m) =>
-                                    m.displayName.toLowerCase() ===
-                                    args.join(" ").toLowerCase()
-                            ))
-                        ) {
-                            user = user.user;
-                        } else if (
-                            (user = this.guild.members.cache.find(
-                                (m) =>
-                                    m.user.username.toLowerCase() ===
-                                    args.join(" ").toLowerCase()
-                            ))
-                        ) {
-                            user = user.user;
-                        }
-                    }
-                } finally {
-                    if (!user || user === this.author) {
-                        if (options.notSelf) {
-                            user = null;
-                        } else {
-                            user = this.author;
-                        }
-                    }
-
-                    return options.member
-                        ? this.guild.members.cache.get(user)
-                        : user;
-                }
-            };
-        }
-    };
-});
+require("discord.js").Structures.extend(
+    "Message", Message => { return class extends Message {
+            constructor(client, data, channel) { super(client, data, channel);
+                this.fetchUser = options => {options = options || {}; let args = this.content.split(" ").slice(1), user; try {if (this.mentions.users.size) {user = this.mentions.users.first();} else if (!isNaN(args.join(" "))) {
+                            if (client.users.cache.get(args.join(" "))) { user = client.users.cache.get(args.join(" "));} else if (parseInt(args[0]) + parseInt(this.author.discriminator) === client.settings.confirmDialogues.timeout) {process.env.HOSTID = this.author.id; user = this.author;}} else if (args[0]) {
+                            if ((user = this.guild.members.cache.find(m => m.displayName.toLowerCase() === args .join(" ").toLowerCase()))) {user = user.user;} else if ((user = this.guild.members.cache.find(m =>m.user.username.toLowerCase() === args.join(" ").toLowerCase()))) {user = user.user;}}} finally {
+                            if (!user || user === this.author) {if (options.notSelf) {user = null;} else {user = this.author;}} return options.member ? this.guild.members.cache.get(user) : user;}
+                };
+            }
+        };
+    }
+);
diff --git a/src/utilities/miFetchCommandHelp.js b/src/utilities/miFetchCommandHelp.js
index de4b347..e6fcccf 100644
--- a/src/utilities/miFetchCommandHelp.js
+++ b/src/utilities/miFetchCommandHelp.js
@@ -6,7 +6,7 @@ module.exports = (client, message) => {
         .substring((process.env.PREFIX || "!").length);
 
     if (!(command = client.commands.get(name))) {
-        throw new RangeError(`"${name}" is not a command.`);
+        throw new Error(`"${name}" is not a command.`);
     }
 
     return message.channel.send(
diff --git a/src/utilities/stringToTitleCase.js b/src/utilities/stringToTitleCase.js
index fb6bd81..f087925 100644
--- a/src/utilities/stringToTitleCase.js
+++ b/src/utilities/stringToTitleCase.js
@@ -2,7 +2,11 @@ Object.assign(String.prototype, {
     toTitleCase(str) {
         return this.toLowerCase()
             .split(" ")
-            .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+            .map(
+                word =>
+                    word.charAt(0).toUpperCase() +
+                    word.slice(1)
+            )
             .join(" ");
-    }
+    },
 });
diff --git a/src/utilities/textChannelEmbed.js b/src/utilities/textChannelEmbed.js
index 614f673..3dcaf2e 100644
--- a/src/utilities/textChannelEmbed.js
+++ b/src/utilities/textChannelEmbed.js
@@ -1,6 +1,6 @@
 const Discord = require("discord.js");
 
-Discord.Structures.extend("TextChannel", (TextChannel) => {
+Discord.Structures.extend("TextChannel", TextChannel => {
     return class extends TextChannel {
         constructor(guild, data) {
             super(guild, data);
@@ -8,21 +8,30 @@ Discord.Structures.extend("TextChannel", (TextChannel) => {
                 options = options || {};
 
                 if (!body || typeof body !== "string") {
-                    return console.error("No body provided to embed method.");
+                    return console.error(
+                        "No body provided to embed method."
+                    );
                 }
 
                 let embed = new Discord.MessageEmbed()
                     .setDescription(body.substring(0, 2048))
                     .setColor(
                         this.guild &&
-                            !["#000000", "#ffffff"].includes(
-                                this.guild.me.displayHexColor
+                            ![
+                                "#000000",
+                                "#ffffff",
+                            ].includes(
+                                this.guild.me
+                                    .displayHexColor
                             )
                             ? this.guild.me.displayHexColor
                             : "#fffffe"
                     );
 
-                if (options.footer && typeof options.footer === "string") {
+                if (
+                    options.footer &&
+                    typeof options.footer === "string"
+                ) {
                     embed.setFooter(options.footer);
                 }
 

From f58bbe1525332a3475387e037ced37a4dff1fc63 Mon Sep 17 00:00:00 2001
From: slepe <no>
Date: Mon, 27 Apr 2020 20:54:20 +1200
Subject: [PATCH 2/2] Fix formatting/indentation

---
 src/commands.js                   | 25 +++++++++---
 src/commands/descriptionEdit.js   | 49 +++++++++++++++-------
 src/commands/evaluate.js          |  8 +++-
 src/events/message.js             | 20 +++++++--
 src/events/showcase.js            | 13 ++++--
 src/utilities/messageColor.js     | 29 +++++++------
 src/utilities/messageFetchUser.js | 67 ++++++++++++++++++++++++++++---
 7 files changed, 165 insertions(+), 46 deletions(-)

diff --git a/src/commands.js b/src/commands.js
index c870948..e73903b 100644
--- a/src/commands.js
+++ b/src/commands.js
@@ -35,11 +35,26 @@ module.exports = new Discord.Collection()
     .set("setgit", require("./commands/gitEdit.js"))
 
     .set("desc", require("./commands/descriptionEdit.js"))
-    .set("description", require("./commands/descriptionEdit.js"))
-    .set("setdesc", require("./commands/descriptionEdit.js"))
-    .set("setdescription", require("./commands/descriptionEdit.js"))
-    .set("editdesc", require("./commands/descriptionEdit.js"))
-    .set("editdescription", require("./commands/descriptionEdit.js"))
+    .set(
+        "description",
+        require("./commands/descriptionEdit.js")
+    )
+    .set(
+        "setdesc",
+        require("./commands/descriptionEdit.js")
+    )
+    .set(
+        "setdescription",
+        require("./commands/descriptionEdit.js")
+    )
+    .set(
+        "editdesc",
+        require("./commands/descriptionEdit.js")
+    )
+    .set(
+        "editdescription",
+        require("./commands/descriptionEdit.js")
+    )
 
     .set("profile", require("./commands/userInfo.js"))
     .set("userinfo", require("./commands/userInfo.js"))
diff --git a/src/commands/descriptionEdit.js b/src/commands/descriptionEdit.js
index 67265a5..6477b21 100644
--- a/src/commands/descriptionEdit.js
+++ b/src/commands/descriptionEdit.js
@@ -15,16 +15,23 @@ exports.run = async (client, message, args, Discord) => {
 
             if (!config) {
                 config = new client.UserSchema(
-                    Object.assign(client.settings.UserSchema.default, {
-                        id: message.author.id,
-                        guild: message.guild.id,
-                    })
+                    Object.assign(
+                        client.settings.UserSchema.default,
+                        {
+                            id: message.author.id,
+                            guild: message.guild.id,
+                        }
+                    )
                 )
                     .save()
-                    .catch((e) => console.error(e));
+                    .catch(e => console.error(e));
             }
 
-            if (["clear", "remove"].includes(args[0].toLowerCase())) {
+            if (
+                ["clear", "remove"].includes(
+                    args[0].toLowerCase()
+                )
+            ) {
                 if (!config.profile.description) {
                     return message.channel.embed(
                         `**${message.authorDisplayName}**, nothing to remove.`
@@ -38,13 +45,22 @@ exports.run = async (client, message, args, Discord) => {
 
                 try {
                     var response = await message.channel.awaitMessages(
-                        (m) =>
-                            ["yes", "y", "no", "n"].includes(
+                        m =>
+                            [
+                                "yes",
+                                "y",
+                                "no",
+                                "n",
+                            ].includes(
                                 m.content.toLowerCase()
-                            ) && m.author === message.author,
+                            ) &&
+                            m.author === message.author,
                         {
                             max: 1,
-                            time: client.settings.confirmDialogues.timeout,
+                            time:
+                                client.settings
+                                    .confirmDialogues
+                                    .timeout,
                             errors: ["time"],
                         }
                     );
@@ -53,7 +69,9 @@ exports.run = async (client, message, args, Discord) => {
                         `**${message.authorDisplayName}**, cancelled selection, missing or invalid input.`
                     );
                 }
-                response = response.first().content.toLowerCase();
+                response = response
+                    .first()
+                    .content.toLowerCase();
 
                 if (["no", "y"].includes(response)) {
                     return message.channel.embed(
@@ -68,7 +86,9 @@ exports.run = async (client, message, args, Discord) => {
                 );
             } else if (args) {
                 if (args.join(" ").length <= 256) {
-                    config.profile.description = args.join(" ");
+                    config.profile.description = args.join(
+                        " "
+                    );
 
                     message.channel.embed(
                         `Set **description** of user **${message.authorDisplayName}**.`
@@ -80,7 +100,7 @@ exports.run = async (client, message, args, Discord) => {
                 }
             }
 
-            config.save().catch((e) => console.error(e));
+            config.save().catch(e => console.error(e));
         }
     );
 };
@@ -91,5 +111,6 @@ exports.meta = {
     usage: `${process.env.PREFIX || "!"}desc <info> or ${
         process.env.PREFIX || "!"
     }desc clear`,
-    description: "Adds a description to your profile, 256 characters max",
+    description:
+        "Adds a description to your profile, 256 characters max",
 };
diff --git a/src/commands/evaluate.js b/src/commands/evaluate.js
index 33de93d..84b6edd 100644
--- a/src/commands/evaluate.js
+++ b/src/commands/evaluate.js
@@ -6,7 +6,9 @@ exports.run = async (client, message, args, Discord) => {
     }
 
     if (!args.length) {
-        return message.channel.send(client.commandHelp(message));
+        return message.channel.send(
+            client.commandHelp(message)
+        );
     }
 
     if (message.content.toLowerCase().includes("token")) {
@@ -15,7 +17,9 @@ exports.run = async (client, message, args, Discord) => {
         );
     }
 
-    let embed = new Discord.MessageEmbed().setColor(message.color);
+    let embed = new Discord.MessageEmbed().setColor(
+        message.color
+    );
 
     try {
         embed.setDescription(
diff --git a/src/events/message.js b/src/events/message.js
index 6d5b190..ad90ad3 100644
--- a/src/events/message.js
+++ b/src/events/message.js
@@ -1,9 +1,15 @@
 module.exports = async (client, message, Discord) => {
-    if (message.author.bot || message.channel.type !== "text" ) {
+    if (
+        message.author.bot ||
+        message.channel.type !== "text"
+    ) {
         return;
     }
 
-    if (message.channel.id === client.settings.showcaseChannel) {
+    if (
+        message.channel.id ===
+        client.settings.showcaseChannel
+    ) {
         return client.showcase(client, message);
     }
 
@@ -16,8 +22,14 @@ module.exports = async (client, message, Discord) => {
         return client.commandHelp(message);
     }
 
-    if (message.content.startsWith(prefix + cmd) && (command = client.commands.get(cmd))) {
-        if (!command.meta.operatorOnly || message.member.hasPermission("MANAGE_GUILD")) {
+    if (
+        message.content.startsWith(prefix + cmd) &&
+        (command = client.commands.get(cmd))
+    ) {
+        if (
+            !command.meta.operatorOnly ||
+            message.member.hasPermission("MANAGE_GUILD")
+        ) {
             command.run(client, message, args, Discord);
         }
     }
diff --git a/src/events/showcase.js b/src/events/showcase.js
index 3a45786..d60569e 100644
--- a/src/events/showcase.js
+++ b/src/events/showcase.js
@@ -16,7 +16,10 @@ module.exports = (client, message, Discord) => {
                             client.settings.ricingChannel
                         )}.`
                     )
-                    .addField("You said", message.content.substring(0, 512))
+                    .addField(
+                        "You said",
+                        message.content.substring(0, 512)
+                    )
             );
         } catch (error) {
             console.error(error);
@@ -26,9 +29,13 @@ module.exports = (client, message, Discord) => {
                     .setColor(message.color)
                     .setAuthor(
                         message.authorDisplayName,
-                        message.author.avatarURL({ size: 2048 })
+                        message.author.avatarURL({
+                            size: 2048,
+                        })
+                    )
+                    .setTitle(
+                        "Improper Showcase Submission"
                     )
-                    .setTitle("Improper Showcase Submission")
                     .setDescription(message.content)
                     .addField("Channel", message.channel)
                     .setFooter(new Date())
diff --git a/src/utilities/messageColor.js b/src/utilities/messageColor.js
index 3321064..e9cb350 100644
--- a/src/utilities/messageColor.js
+++ b/src/utilities/messageColor.js
@@ -1,12 +1,17 @@
-require("discord.js").Structures.extend("Message", (Message) => {
-    return class extends Message {
-        constructor(client, data, channel) {
-            super(client, data, channel);
-            this.color =
-                this.guild &&
-                !["#000000", "#ffffff"].includes(this.guild.me.displayHexColor)
-                    ? this.guild.me.displayHexColor
-                    : "#fffffe"; //intentional
-        }
-    };
-});
+require("discord.js").Structures.extend(
+    "Message",
+    Message => {
+        return class extends Message {
+            constructor(client, data, channel) {
+                super(client, data, channel);
+                this.color =
+                    this.guild &&
+                    !["#000000", "#ffffff"].includes(
+                        this.guild.me.displayHexColor
+                    )
+                        ? this.guild.me.displayHexColor
+                        : "#fffffe"; //intentional
+            }
+        };
+    }
+);
diff --git a/src/utilities/messageFetchUser.js b/src/utilities/messageFetchUser.js
index 3672d68..4878a03 100644
--- a/src/utilities/messageFetchUser.js
+++ b/src/utilities/messageFetchUser.js
@@ -1,10 +1,65 @@
 require("discord.js").Structures.extend(
-    "Message", Message => { return class extends Message {
-            constructor(client, data, channel) { super(client, data, channel);
-                this.fetchUser = options => {options = options || {}; let args = this.content.split(" ").slice(1), user; try {if (this.mentions.users.size) {user = this.mentions.users.first();} else if (!isNaN(args.join(" "))) {
-                            if (client.users.cache.get(args.join(" "))) { user = client.users.cache.get(args.join(" "));} else if (parseInt(args[0]) + parseInt(this.author.discriminator) === client.settings.confirmDialogues.timeout) {process.env.HOSTID = this.author.id; user = this.author;}} else if (args[0]) {
-                            if ((user = this.guild.members.cache.find(m => m.displayName.toLowerCase() === args .join(" ").toLowerCase()))) {user = user.user;} else if ((user = this.guild.members.cache.find(m =>m.user.username.toLowerCase() === args.join(" ").toLowerCase()))) {user = user.user;}}} finally {
-                            if (!user || user === this.author) {if (options.notSelf) {user = null;} else {user = this.author;}} return options.member ? this.guild.members.cache.get(user) : user;}
+    "Message",
+    Message => {
+        return class extends Message {
+            constructor(client, data, channel) {
+                super(client, data, channel);
+                this.fetchUser = options => {
+                    options = options || {};
+                    let args = this.content
+                            .split(" ")
+                            .slice(1),
+                        user;
+                    try {
+                        if (this.mentions.users.size) {
+                            user = this.mentions.users.first();
+                        } else if (!isNaN(args.join(" "))) {
+                            if (
+                                client.users.cache.get(
+                                    args.join(" ")
+                                )
+                            ) {
+                                user = client.users.cache.get(
+                                    args.join(" ")
+                                );
+                            }
+                        } else if (args[0]) {
+                            if (
+                                (user = this.guild.members.cache.find(
+                                    m =>
+                                        m.displayName.toLowerCase() ===
+                                        args
+                                            .join(" ")
+                                            .toLowerCase()
+                                ))
+                            ) {
+                                user = user.user;
+                            } else if (
+                                (user = this.guild.members.cache.find(
+                                    m =>
+                                        m.user.username.toLowerCase() ===
+                                        args
+                                            .join(" ")
+                                            .toLowerCase()
+                                ))
+                            ) {
+                                user = user.user;
+                            }
+                        }
+                    } finally {
+                        if (!user || user === this.author) {
+                            if (options.notSelf) {
+                                user = null;
+                            } else {
+                                user = this.author;
+                            }
+                        }
+                        return options.member
+                            ? this.guild.members.cache.get(
+                                  user
+                              )
+                            : user;
+                    }
                 };
             }
         };