Merge remote-tracking branch 'origin/master'

feinwarusoftware · Jul 31, 2018 · ea9e940 · ea9e940
2 parents 23c660f + e308e50
commit ea9e940
Show file tree

Hide file tree

Showing 28 changed files with 48 additions and 32 deletions.
diff --git a/src/bot/commands/america.js b/src/bot/commands/america.js
@@ -7,7 +7,7 @@ const discord = require("discord.js");
 const america = new Command("america", "I thought this is America!", "js", 0, "america", "command", 0, false, null, function(client, message, guildDoc) {
     let randomnumber = Math.random();
         if (randomnumber < 0.95) {
-            message.channel.send(new discord.RichEmbed().setImage("http://i0.kym-cdn.com/photos/images/original/001/234/287/e06.gif"));
+            message.channel.send(new discord.RichEmbed().setColor(0xff594f).setImage("http://i0.kym-cdn.com/photos/images/original/001/234/287/e06.gif"));
         } else {
             message.reply("https://www.youtube.com/watch?v=VYOjWnS4cMY");
         }

diff --git a/src/bot/commands/artcomp.js b/src/bot/commands/artcomp.js
@@ -228,7 +228,7 @@ const artcomp = new Command("artcomp", "permissions lol", "js", 0, "artcomp", "c
         ]
         let randall = Math.floor(Math.random() * artall.length);
         let randomobject = artall[randall];
-        message.channel.send(new discord.RichEmbed().setColor(0Xce82ff).setAuthor(randomobject.name).setDescription(randomobject.desc).setImage(randomobject.file));
+        message.channel.send(new discord.RichEmbed().setColor(0xff594f).setAuthor(randomobject.name).setDescription(randomobject.desc).setImage(randomobject.file));
 });
 
 module.exports = artcomp;

diff --git a/src/bot/commands/assets/temp.png b/src/bot/commands/assets/temp.png
diff --git a/src/bot/commands/avatar.js b/src/bot/commands/avatar.js
@@ -25,7 +25,7 @@ const avatar = new Command("avatar", "get users avatars", "js", 0, "avatar", "co
 
         }
     }
-    if (subMessage === undefined) {
+    if (subMessage === "") {
         let currentSize = parseInt(message.author.avatarURL.substring(message.author.avatarURL.indexOf("size=") + 5), 10);
         if (currentSize === undefined) {
             message.reply("so... the bot shit itself, blame dragon");

diff --git a/src/bot/commands/butters.js b/src/bot/commands/butters.js
@@ -55,7 +55,7 @@ const butters = new Command("butters", "random photo of butters", "js", 0, "butt
                 "https://cdn.discordapp.com/attachments/394504208222650369/447785636376870943/Butters79.png"
             ];
 
-            message.channel.send(new discord.RichEmbed().setImage(buttersimg[Math.floor(Math.random() * buttersimg.length)]));
+            message.channel.send(new discord.RichEmbed().setColor(0xff594f).setImage(buttersimg[Math.floor(Math.random() * buttersimg.length)]));
 
 });
 

diff --git a/src/bot/commands/dick.js b/src/bot/commands/dick.js
@@ -6,7 +6,7 @@ const Command = require("../command");
 
 const dick = new Command("dick", "Stop being a dick Scott", "js", 0, "dick", "command", 0, false, null, function(client, message, guildDoc) {
 
-    message.channel.send(new discord.RichEmbed().setImage("https://actualconversationswithmyhusband.files.wordpress.com/2017/01/stop-being-a-dick-scott.gif"));
+    message.channel.send(new discord.RichEmbed().setColor(0xff594f).setImage("https://actualconversationswithmyhusband.files.wordpress.com/2017/01/stop-being-a-dick-scott.gif"));
 
 });
 

diff --git a/src/bot/commands/fm.js b/src/bot/commands/fm.js
@@ -96,8 +96,8 @@ const fm = new Command("fm", "lastfm lol", "js", 0, "fm", "command", 0, false, n
         }
 
         let embed = new discord.RichEmbed()
-            .setColor(0x8bc34a)
-            .setAuthor("AWESOM-O // Last.fm", "https://b.thumbs.redditmedia.com/9JuhorqoOt0_VAPO6vvvewcuy1Fp-oBL3ejJkQjjpiQ.png")
+            .setColor(0xff594f)
+            .setAuthor("AWESOM-O // Last.fm", "https://cdn.discordapp.com/attachments/437671103536824340/462653108636483585/a979694bf250f2293d929278328b707c.png")
             .setThumbnail(response.data[topFieldName][scopeName][0].image[response.data[topFieldName][scopeName][0].image.length - 1]["#text"])
             .setTitle(`last.fm ${args[2] === "recent" ? "" : "top"} ${args[3] === null ? "" : args[3]} ${args[2]}`)
             .setFooter("View full stats on last.fm")

diff --git a/src/bot/commands/fuckyou.js b/src/bot/commands/fuckyou.js
@@ -6,7 +6,7 @@ const Command = require("../command");
 
 const fuckyou = new Command("fuckyou", "Fuck you", "js", 0, "fuckyou", "command", 0, false, null, function(client, message, guildDoc) {
 
-    message.channel.send(new discord.RichEmbed().setImage("https://cdn.vox-cdn.com/thumbor/J0D6YqKKwCqNY2zaej_MEUlT-oo=/3x0:1265x710/1600x900/cdn.vox-cdn.com/uploads/chorus_image/image/39977666/fuckyou.0.0.jpg"));
+    message.channel.send(new discord.RichEmbed().setColor(0xff594f).setImage("https://cdn.vox-cdn.com/thumbor/J0D6YqKKwCqNY2zaej_MEUlT-oo=/3x0:1265x710/1600x900/cdn.vox-cdn.com/uploads/chorus_image/image/39977666/fuckyou.0.0.jpg"));
 
 });
 

diff --git a/src/bot/commands/fuckyourself.js b/src/bot/commands/fuckyourself.js
@@ -6,7 +6,7 @@ const Command = require("../command");
 
 const fuckyourself = new Command("fuckyourself", "Go fuck yourself", "js", 0, "fuckyourself", "command", 0, false, null, function(client, message, guildDoc) {
 
-    message.channel.send(new discord.RichEmbed().setImage("http://1.images.southparkstudios.com/blogs/southparkstudios.com/files/2014/09/1801_5a.gif"));
+    message.channel.send(new discord.RichEmbed().setColor(0xff594f).setImage("http://1.images.southparkstudios.com/blogs/southparkstudios.com/files/2014/09/1801_5a.gif"));
 
 });
 

diff --git a/src/bot/commands/gif.js b/src/bot/commands/gif.js
@@ -32,12 +32,12 @@ const gif = new Command("gif", "posts a random gif related to south park", "js",
             const args = message.content.split(" ")
 
             if (!args[1] || !gifs[args[1]]) {
-                let embed = new discord.RichEmbed().setImage(gifs[map[Math.floor(Math.random() * map.length)]]);
+                let embed = new discord.RichEmbed().setColor(0xff594f).setImage(gifs[map[Math.floor(Math.random() * map.length)]]);
                 message.channel.send(embed);
                 return;
             }
 
-            let embed = new discord.RichEmbed().setImage(gifs[args[1]]);
+            let embed = new discord.RichEmbed().setColor(0xff594f).setImage(gifs[args[1]]);
             message.channel.send(embed);
 
 });

diff --git a/src/bot/commands/harvest.js b/src/bot/commands/harvest.js
@@ -6,8 +6,8 @@ const Command = require("../command");
 
 const harvest = new Command("harvest", "which celeb is up for it this year?", "js", 0, "harvest", "command", 0, false, null, function (client, message, guildDoc) {
     message.channel.send(new discord.RichEmbed()
-        .setColor(0x8bc34a)
-        .setAuthor("AWESOM-O // Harvest", "https://b.thumbs.redditmedia.com/9JuhorqoOt0_VAPO6vvvewcuy1Fp-oBL3ejJkQjjpiQ.png")
+        .setColor(0xff594f)
+        .setAuthor("AWESOM-O // Harvest", "https://cdn.discordapp.com/attachments/437671103536824340/462653108636483585/a979694bf250f2293d929278328b707c.png")
         .setImage("https://www.billboard.com/files/styles/article_main_image/public/media/XXXTentacion-iheartradio-station-2017-billboard-1548.jpg")
         .setTitle("Jahseh Dwayne Ricardo Onfroy A.K.A XXXTentacion")
         .setDescription("Jaseh Dwayne Ricardo Onfroy *(A.K.A XXXTentacion)* was an American rapper, singer, songwriter and professional wife-beater.\n\nOnfroy was born in a Plantation in Florida on the 23rd of January 1998. From there, he made it big with his song “Look at Me”. This song was probably inspired by his treatment of his wife.\n\nOn June 18th 2018, Onfroy was shot in the neck and killed while leaving a motorcycle dealership in Deerfield Beach, Florida. He was pronounced dead at 5:30pm. May harvest be bountiful this year!")

diff --git a/src/bot/commands/help.js b/src/bot/commands/help.js
@@ -6,6 +6,7 @@ const discord = require("discord.js");
 
 const help = new Command("help", "filthy frank", "js", 0, "help", "command", 0, false, null, function(client, message, guildDoc) {
     message.channel.send(new discord.RichEmbed()
+                .setColor(0xff594f)
                 .setAuthor("AWESOM-O // Help", "https://cdn.discordapp.com/attachments/437671103536824340/462653108636483585/a979694bf250f2293d929278328b707c.png")
                 .setThumbnail("https://cdn.discordapp.com/attachments/437671103536824340/462652988222341131/matt-thinking-full.png")
                 .setDescription("**Welcome to the AWESOM-O Discord bot!**\n\nIf you want more info, go to this [website.](https://awesomo.feinwaru.com)")

diff --git a/src/bot/commands/infoc.js b/src/bot/commands/infoc.js
@@ -31,7 +31,7 @@ const infoc = new Command("infoc", "a command for getting info on channels", "js
 
             // channel found
             let embed = new discord.RichEmbed()
-                .setColor(0xF0433A)
+                .setColor(0xff594f)
                 .setAuthor(`AWESOM-O // Channel Info`);
 
             embed.addField("Id:", "```" + channels[i].id + "```");

diff --git a/src/bot/commands/infoe.js b/src/bot/commands/infoe.js
@@ -31,7 +31,7 @@ const infoe = new Command("infoe", "a command for getting info on emojis", "js",
 
             // emoji found
             let embed = new discord.RichEmbed()
-                .setColor(0xF0433A)
+                .setColor(0xff594f)
                 .setAuthor(`AWESOM-O // Emoji Info`);
 
             embed.addField("Id:", "```" + emojis[i].id + "```");

diff --git a/src/bot/commands/infom.js b/src/bot/commands/infom.js
@@ -23,7 +23,7 @@ const infom = new Command("infom", "a command for getting info on members", "js"
 
             // user found
             let embed = new discord.RichEmbed()
-                .setColor(0xF0433A)
+                .setColor(0xff594f)
                 .setAuthor(`AWESOM-O // Member Info`);
 
             embed.addField("Id:", "```" + members[i].user.id + "```");

diff --git a/src/bot/commands/infor.js b/src/bot/commands/infor.js
@@ -32,7 +32,7 @@ const infor = new Command("infor", "a command for getting info on roles", "js",
 
             // role found
             let embed = new discord.RichEmbed()
-                .setColor(0xF0433A)
+                .setColor(0xff594f)
                 .setAuthor(`AWESOM-O // Role Info`);
 
             embed.addField("Id:", "```" + roles[i].id + "```");

diff --git a/src/bot/commands/kickbaby.js b/src/bot/commands/kickbaby.js
@@ -2,7 +2,7 @@
 
 const Command = require("../command");
 
-const kickbaby = new Command("kickbaby", "kicks the baby", "js", 0, "kickbaby", "command", 0, false, null, function(client, message, guildDoc) {
+const kickbaby = new Command("kickbaby", "kicks the baby", "js", 0, "kick the baby", "startswith", 0, false, null, function(client, message, guildDoc) {
 
     message.reply("Don't kick the goddamn baby!");
 

diff --git a/src/bot/commands/love.js b/src/bot/commands/love.js
@@ -1,5 +1,7 @@
 "use strict"
 
+const discord = require("discord.js")
+
 const Command = require("../command");
 
 const love = new Command("love", "quotes chef", "js", 0, "love", "command", 0, false, null, function(client, message, guildDoc) {
@@ -28,9 +30,11 @@ const love = new Command("love", "quotes chef", "js", 0, "love", "command", 0, f
                 "I'm gonna make love to ya woman!",
                 "Suck on ma chocolate salty balls!",
                 "An anal probe is when they stick a big metal hoob-a-joo up your butt.",
+                "Sieg Heil!",
                 "https://www.youtube.com/watch?v=b3npXX9vQ20",
             ];
-    message.reply(chefquotes[Math.floor(Math.random() * chefquotes.length)]);
+
+    message.channel.send(new discord.RichEmbed().setColor(0xff594f).setAuthor("AWESOM-O // Love!", "https://cdn.discordapp.com/attachments/437671103536824340/462653108636483585/a979694bf250f2293d929278328b707c.png").setThumbnail("https://vignette.wikia.nocookie.net/southpark/images/3/38/JeromeChef.png/revision/latest?cb=20160402120214").setDescription(chefquotes[Math.floor(Math.random() * chefquotes.length)]).setFooter("Hello there, children!"));        
 });
 
 module.exports = love;
diff --git a/src/bot/commands/nathan.js b/src/bot/commands/nathan.js
@@ -20,7 +20,7 @@ const nathan = new Command("nathan", "possible downs kid", "js", 0, "nathan", "c
             "https://cdn.discordapp.com/attachments/452632364238110721/457886800070049792/nathan12.jpg",
         ];
         const random = Math.floor(Math.random() * quotes.length);
-        message.channel.send(new discord.RichEmbed().setAuthor("RG-400 Smart Towel // Nathan Moments!").setDescription("Various moments from Nathan... *and Mimsy...*").setImage(quotes[random]).setFooter("Don't forget to bring a towel!"));
+        message.channel.send(new discord.RichEmbed().setColor(0xff594f).setAuthor("AWESOM-O // Nathan Moments!, https://cdn.discordapp.com/attachments/437671103536824340/462653108636483585/a979694bf250f2293d929278328b707c.png").setDescription("Various moments from Nathan... *and Mimsy...*").setImage(quotes[random]));
 });
 
 module.exports = nathan;
diff --git a/src/bot/commands/nathanrate.js b/src/bot/commands/nathanrate.js
@@ -19,7 +19,7 @@ const nathanrate = new Command("nathanrate", "possible downs kid 2", "js", 0, "n
             "**10/10.** You're a Downs Syndrome destroyer!"
     ];
     const random = Math.floor(Math.random() * quotes.length);
-    message.channel.send(new discord.RichEmbed().setDescription(quotes[random]).setFooter("Don't forget to bring a towel!"));
+    message.channel.send(new discord.RichEmbed().setColor(0xff594f).setDescription(quotes[random]));
 });
 
 module.exports = nathanrate;
diff --git a/src/bot/commands/random.js b/src/bot/commands/random.js
@@ -25,8 +25,8 @@ const random = new Command("random", "random episodes", "js", 0, "random", "comm
 
     spnav.wikiaSearch(query).then(result => {
         const embed = new discord.RichEmbed()
-            .setColor(0x8bc34a)
-            .setAuthor("AWESOM-O // " + result.title, "https://vignette.wikia.nocookie.net/southpark/images/1/14/AwesomeO06.jpg/revision/latest/scale-to-width-down/250?cb=20100310004846")
+            .setColor(0xff594f)
+            .setAuthor("AWESOM-O // " + result.title, "https://cdn.discordapp.com/attachments/437671103536824340/462653108636483585/a979694bf250f2293d929278328b707c.png")
             .setURL(result.url)
             .setDescription(result.desc);
 

diff --git a/src/bot/commands/rr.js b/src/bot/commands/rr.js
@@ -8,7 +8,7 @@ const rr = new Command("rr", "the ultimate life and death test", "js", 0, "rr",
     let random = Math.random();
     console.log(random);
     if (random >= 0.83) {
-        message.channel.send((new discord.RichEmbed().setColor(0X7289DA).setDescription("*pulls trigger*\n\n**BANG!**\n\nUnlucky... You died...").setThumbnail("https://cdn.discordapp.com/attachments/452632364238110721/458361435639119893/skull_PNG72.png")));
+        message.channel.send((new discord.RichEmbed().setColor(0xff594f).setDescription("*pulls trigger*\n\n**BANG!**\n\nUnlucky... You died...").setThumbnail("https://cdn.discordapp.com/attachments/452632364238110721/458361435639119893/skull_PNG72.png")));
     } else {
         message.channel.send((new discord.RichEmbed().setColor(0X7289DA).setDescription("*pulls trigger*\n\n***click***\n\nYou lived! Congratulations!").setThumbnail("https://cdn.discordapp.com/attachments/452632364238110721/458361437832871947/Green-Tick-PNG-Picture.png")));
     }

diff --git a/src/bot/commands/someone.js b/src/bot/commands/someone.js
@@ -2,8 +2,20 @@
 
 const Command = require("../command");
 
-let someone = new Command("someone", "Fuck you, Discord.", "js", 0, "someone", "command", 0, false, null, function(client, message, guildDoc){
+let someone = new Command("someone", "Fuck you, Discord.", "js", 0, "@someone", "startswith", 0, false, null, function(client, message, guildDoc){
     const quotes = [
+            "ʢ⸌人⸍ʡ",
+            "\\(・╭╮・)/",
+            "\\(❍ᨓ❍)/",
+            "乁(ᵔ ͜ʖᵔ)ㄏ",
+            "└[ȍ‿ȍ]┘",
+            "ᖗTωTᖘ",
+            "ᕦ(♥ᨓ♥)ᕥ",
+            "ᕦ(ᵔ ͜つᵔ)ᕥ",
+            "⤜( ﾟ╭∩╮ ﾟ)⤏",
+            "\\(• ʖ̯•)/",
+            "(ง◥▶◞ ◀◤)ง",
+            "(╯⩾▾⩽）╯︵ ┻━┻",
             "(∩ ͡° ͜ʖ ͡°)⊃━☆ﾟ. o ･ ｡ﾟ",
             "ヽ༼ ಠ益ಠ ༽ﾉ",
             "¯\\_(ツ)_/¯",

diff --git a/src/bot/commands/times.js b/src/bot/commands/times.js
@@ -7,8 +7,8 @@ const Command = require("../command");
 
 const times = new Command("times", "mr worldwide", "js", 0, "times", "command", 0, false, null, function(client, message, guildDoc){
     message.channel.send(new discord.RichEmbed()
-                .setColor(0x8bc34a)
-                .setAuthor("AWESOM-O // Times")
+                .setColor(0xff594f)
+                .setAuthor("AWESOM-O // Times, https://cdn.discordapp.com/attachments/437671103536824340/462653108636483585/a979694bf250f2293d929278328b707c.png")
                 .addField("PDT", momentTz().tz("America/Los_Angeles").format("Do MMMM YYYY, h:mm:ss a"))
                 .addField("EDT", momentTz().tz("America/New_York").format("Do MMMM YYYY, h:mm:ss a"))
                 .addField("BST", momentTz().tz("Europe/Dublin").format("Do MMMM YYYY, h:mm:ss a"))

diff --git a/src/bot/commands/towelieinfo.js b/src/bot/commands/towelieinfo.js
diff --git a/src/bot/commands/towelrate.js b/src/bot/commands/towelrate.js
@@ -19,7 +19,7 @@ let towelrate = new Command("towelrate", "Towelie rates you!", "js", 0, "towelra
             "**10/10.** Tynacorp approved!",
         ];
         const random = Math.floor(Math.random() * quotes.length);
-        message.channel.send(new discord.RichEmbed().setDescription(quotes[random]).setFooter("Don't forget to bring a towel!"));
+        message.channel.send(new discord.RichEmbed().setColor(0xff594f).setDescription(quotes[random]).setFooter("Don't forget to bring a towel!"));
 });
 
 module.exports = towelrate;
diff --git a/src/bot/commands/wikia.js b/src/bot/commands/wikia.js
@@ -15,8 +15,8 @@ const wikia = new Command("wikia", "search the south park wikia", "js", 0, "wiki
 
     spnav.wikiaSearch(query).then(result => {
         const embed = new discord.RichEmbed()
-            .setColor(0x8bc34a)
-            .setAuthor("AWESOM-O // " + result.title, "https://vignette.wikia.nocookie.net/southpark/images/1/14/AwesomeO06.jpg/revision/latest/scale-to-width-down/250?cb=20100310004846")
+            .setColor(0xff594f)
+            .setAuthor("AWESOM-O // " + result.title, "https://cdn.discordapp.com/attachments/437671103536824340/462653108636483585/a979694bf250f2293d929278328b707c.png")
             .setURL(result.url)
             .setDescription(result.desc);
 

diff --git a/src/index.js b/src/index.js
@@ -3,7 +3,6 @@
 const mongoose = require("mongoose");
 
 const Logger = require("./logger");
-const schemas = require("./db");
 
 const genLogger = new Logger();