Update to master's features and fixes

changelog in releases

README.md

@@ -1,31 +1,13 @@
-# BrussellBot 1.3
+# BrussellBot 1.4 Public Edition
 
 A multipurpose bot for Discord using [Discord.js](https://github.com/hydrabolt/discord.js/)
 
-[Website](http://brussell98.github.io/BrussellBot)   
+[Website](http://brussell98.github.io/bot/main)   
 [Discord Server](https://discord.gg/0kvLlwb7slG3XCCQ)   
 [Get the latest version here](https://github.com/brussell98/BrussellBot/releases/latest)
 
-[Wiki](https://github.com/brussell98/BrussellBot/wiki)   
+[Wiki](http://brussell98.github.io/bot/commands)   
 [Commands](https://github.com/brussell98/BrussellBot/wiki/Commands)   
 [Setup Guide](https://github.com/brussell98/BrussellBot/wiki/Setup-Guide)   
 [Making new commands](https://github.com/brussell98/BrussellBot/wiki/New-Command-Guide)   
 [Discord.js Documentation](http://discordjs.readthedocs.org/en/latest/)
-
----
-
-### TO DO
-
-### Music Update?
-
-- [ ] Music commands
-	- [ ] Audio help
-	- [ ] Queue song from YouTube
-		- [ ] Or pass it a webm link
-	- [ ] Skip
-	- [ ] Have pre-made playlists available
-	- [ ] Queue a playlist
-	- [ ] Bind music messages to a channel and show what is playing. Plus delete old messages.
-	- [ ] List of queues songs
-	- [ ] Set playing to song name
-	- [ ] Bot owner gets priority

bot/cleverbot.js

@@ -21,5 +21,5 @@ exports.cleverbot = function(bot, msg) {
 			} catch (error) { bot.sendMessage(msg, '⚠ There was an error', function(erro, wMessage) { bot.deleteMessage(wMessage, {'wait': 8000}); }); }
 		});
 		bot.stopTyping(msg.channel);
-	} else { bot.sendMessage(msg, 'Yes?'); } //if no suffix
+	} else { bot.sendMessage(msg, 'Yes?'); }
 };

bot/config.json

@@ -1,20 +1,22 @@
 {
 	"email": "",
 	"password": "",
-	"command_prefix": "]",
-	"mod_command_prefix": "}",
+	"command_prefix": ")",
+	"mod_command_prefix": "&",
 	"non_essential_event_listeners": true,
 	"log_presence": false,
 	"debug": false,
 	"show_warn": false,
 	"admin_id": 95286900801146880,
 	"greet_new_members": false,
 	"username_changes": false,
+	"ban_alerts": true,
 	"send_mentions": true,
 	"mal_user": "",
 	"mal_pass": "",
-	"is_heroku_version": false,
+	"use_env": false,
 	"weather_api_key": "",
 	"osu_api_key": "",
+	"imgur_client_id": "",
 	"banned_server_ids": [""]
 }

bot/games.json

@@ -1,13 +1,13 @@
 {"games":[
-	"with brussell98",
+	"with Brussell",
 	"( ͡° ͜ʖ ͡°)",
 	"with JOHN CENA",
 	"kappa kappa kappa",
 	"no waifu no laifu",
-	"your waifu is __trash__",
+	"your waifu is trash",
 	"Kancolle",
-	"with __you__",
-	"node.js",
+	"with you",
+	"NodeJS",
 	"discord.js",
 	"osu!",
 	"Bad Rats",
@@ -19,8 +19,7 @@
 	"Sakura Swim Club",
 	"Sakura Spirit",
 	"Akiba's Trip",
-	"Animaayyy lmao",
-	"Ayyyy lmao",
+	"Ayy lmao",
 	"Jet fuel can't melt dank memes",
 	"with nekos",
 	"with fire",
@@ -33,10 +32,18 @@
 	"world domination",
 	"dank memes",
 	"Toshinou Kyouko",
-	"__]help [command]__",
+	"]help [command]",
 	"what's an anime?",
 	"@everyone",
-	"http://brussell98.github.io/BrussellBot/",
 	"Half Life 3",
-	"you like a fiddle"
+	"you like a fiddle",
+	"russian roulette",
+	"steal yo girl",
+	"hide and seek",
+	"tax evasion",
+	"peekaboo",
+	"executing order 66",
+	"wew lads",
+	"spying on humans",
+	"with lolis"
 ]}

bot/styles.js

@@ -1,87 +1,95 @@
 var chalk = require('chalk');
 var enabled = new chalk.constructor({enabled: true});
 
-exports.cWarn = function (text) { 
-	return chalk.styles.bgYellow.open + 
-	chalk.styles.black.open + 
-	text + 
-	chalk.styles.black.close + 
-	chalk.styles.bgYellow.close + 
-	chalk.styles.white.open + chalk.styles.bgBlack.open +" ";
+exports.cWarn = function(text) {
+	return chalk.styles.bgYellow.open +
+	chalk.styles.black.open +
+	text +
+	chalk.styles.black.close +
+	chalk.styles.bgYellow.close +
+	chalk.styles.white.open + chalk.styles.bgBlack.open + " ";
 };
 
-exports.cError = function (text) { 
-	return chalk.styles.bgRed.open + 
+exports.cError = function(text) {
+	return chalk.styles.bgRed.open +
 	chalk.styles.black.open +
-	text + 
-	chalk.styles.black.close + 
-	chalk.styles.bgRed.close + 
+	text +
+	chalk.styles.black.close +
+	chalk.styles.bgRed.close +
 	chalk.styles.white.open + chalk.styles.bgBlack.open + " ";
 };
 
-exports.cDebug = function (text) { 
-	return chalk.styles.bgWhite.open + 
-	chalk.styles.black.open + 
-	text + 
-	chalk.styles.black.close + 
-	chalk.styles.bgWhite.close + 
+exports.cDebug = function(text) {
+	return chalk.styles.bgWhite.open +
+	chalk.styles.black.open +
+	text +
+	chalk.styles.black.close +
+	chalk.styles.bgWhite.close +
 	chalk.styles.white.open + chalk.styles.bgBlack.open + " ";
 };
 
-exports.cGreen = function (text) { 
-	return chalk.styles.green.open + 
-	chalk.styles.bold.open + 
-	text + 
-	chalk.styles.bold.close + 
+exports.cGreen = function(text) {
+	return chalk.styles.green.open +
+	chalk.styles.bold.open +
+	text +
+	chalk.styles.bold.close +
 	chalk.styles.green.close + chalk.styles.white.open;
 };
 
-exports.cGrey = function (text) { 
-	return chalk.styles.grey.open + 
-	chalk.styles.bold.open + 
-	text + 
-	chalk.styles.grey.close + 
+exports.cGrey = function(text) {
+	return chalk.styles.grey.open +
+	chalk.styles.bold.open +
+	text +
+	chalk.styles.grey.close +
 	chalk.styles.bold.close + chalk.styles.white.open;
 };
 
-exports.cYellow = function (text) { 
-	return chalk.styles.yellow.open + 
-	chalk.styles.bold.open + 
-	text + 
-	chalk.styles.yellow.close + 
+exports.cYellow = function(text) {
+	return chalk.styles.yellow.open +
+	chalk.styles.bold.open +
+	text +
+	chalk.styles.yellow.close +
 	chalk.styles.bold.close + chalk.styles.white.open;
 };
-	
-exports.cRed = function (text) { 
-	return chalk.styles.red.open + 
-	chalk.styles.bold.open + 
-	text + 
-	chalk.styles.red.close + 
+
+exports.cBlue = function(text) {
+	return chalk.styles.blue.open +
+	chalk.styles.bold.open +
+	text +
+	chalk.styles.blue.close +
 	chalk.styles.bold.close + chalk.styles.white.open;
 };
 
-exports.cServer = function (text) { 
-	return chalk.styles.magenta.open + 
-	chalk.styles.bold.open + 
-	text + 
-	chalk.styles.magenta.close + 
+exports.cRed = function(text) {
+	return chalk.styles.red.open +
+	chalk.styles.bold.open +
+	text +
+	chalk.styles.red.close +
 	chalk.styles.bold.close + chalk.styles.white.open;
 };
 
-exports.cUYellow = function (text) { 
-	return chalk.styles.yellow.open + 
-	chalk.styles.underline.open + 
-	chalk.styles.bold.open + 
-	text + 
+exports.cServer = function(text) {
+	return chalk.styles.magenta.open +
+	chalk.styles.bold.open +
+	text +
+	chalk.styles.magenta.close +
+	chalk.styles.bold.close + chalk.styles.white.open;
+};
+
+exports.cUYellow = function(text) {
+	return chalk.styles.yellow.open +
+	chalk.styles.underline.open +
+	chalk.styles.bold.open +
+	text +
 	chalk.styles.yellow.close +
-	chalk.styles.underline.close + 
+	chalk.styles.underline.close +
 	chalk.styles.bold.close + chalk.styles.white.open;
 };
 
-exports.cBgGreen = function (text) { 
-	return chalk.styles.bgGreen.open + 
-	chalk.styles.black.open + 
-	text + 
-	chalk.styles.bgGreen.close + 
+exports.cBgGreen = function(text) {
+	return chalk.styles.bgGreen.open +
+	chalk.styles.black.open +
+	text +
+	chalk.styles.bgGreen.close +
 	chalk.styles.black.close + chalk.styles.white.open + chalk.styles.bgBlack.open;
 };

bot/versioncheck.js

@@ -3,7 +3,7 @@ var version = require("../package.json").version;
 var colors = require("./styles.js");
 
 exports.checkForUpdate = function(callback) {
-	request("https://raw.githubusercontent.com/brussell98/BrussellBot/master/package.json", function(err, response, body) {
+	request("https://raw.githubusercontent.com/brussell98/BrussellBot/public/package.json", function(err, response, body) {
 		if (err) {
 			console.log(colors.cWarn(" WARN ") + "Version check error: " + err);
 			return callback(null);

package.json

@@ -1,8 +1,8 @@
 {
-	"name": "brussellbot",
-	"version": "1.3.1",
-	"description": "A Discord all-in-one bot using discord.js",
-	"author": "brussell98",
+	"name": "BrussellBot",
+	"version": "1.4.0",
+	"description": "A Discord bot using discord.js",
+	"author": "Brussell",
 	"main": "BrussellBot.js",
 	"repository": {
 		"type": "git",