MeLlamoPablo
diff --git a/‎README.md
+13-2 b/‎README.md
+13-2
diff --git a/‎config.js
+42-6 b/‎config.js
+42-6
diff --git a/‎lib/commands/admin/force-lobby-start.js
+21-5 b/‎lib/commands/admin/force-lobby-start.js
+21-5
diff --git a/‎lib/commands/admin/get-lobby.js
+27-15 b/‎lib/commands/admin/get-lobby.js
+27-15
diff --git a/‎lib/commands/admin/kick.js
+3-2 b/‎lib/commands/admin/kick.js
+3-2
diff --git a/‎lib/commands/admin/remove-event.js
+18-20 b/‎lib/commands/admin/remove-event.js
+18-20
diff --git a/‎lib/commands/admin/shared/event.js
+8 b/‎lib/commands/admin/shared/event.js
+8
diff --git a/‎lib/commands/admin/status.js
+41 b/‎lib/commands/admin/status.js
+41
@@ -100,9 +100,20 @@ used `git` to clone the repository, this is easy:
 $ git pull --all
 ```
 
-If you forked this repo to deploy to Heroku, this will not work, because it's pulling from your repo, and not from this one. To solve that, first [configure this repo (MeLlamoPablo/schedulebot) as a remote for your fork (YOUR_GITHUB_USERNAME/schedulebot)](https://help.github.com/articles/configuring-a-remote-for-a-fork/). Then, [fetch this repo](https://help.github.com/articles/syncing-a-fork/) *(change `master` to `dota` or `heroku-dota`, depending on what branch you're working with)*.
+If you forked this repo to deploy to Heroku, this will not work, because it's pulling from your
+repo, and not from this one. To solve that, first [configure this repo (MeLlamoPablo/schedulebot)
+as a remote for your fork (YOUR_GITHUB_USERNAME/schedulebot)](https://help.github.com/articles/configuring-a-remote-for-a-fork/).
+Then, [fetch this repo](https://help.github.com/articles/syncing-a-fork/)
+*(change `master` to `dota` or `heroku-dota`, depending on what branch you're working with)*.
 
-However, after this your bot is not ready yet. A database update is also required:
+After that, perform another npm install to make sure that you get any new dependencies or update
+existing ones:
+
+```
+$ npm install
+```
+
+However, after all of this your bot is not ready yet. A database update is also required:
 
 ```sh
 $ npm run update
 
@@ -61,14 +61,18 @@ module.exports = {
 	// More info: https://discordapp.com/developers/docs/topics/permissions
 	delete_after_reply: {
 		enabled: true,
-		time: 60000, // In milliseconds
+		time: 60000 // In milliseconds
 	},
 
 	// If true, it will delete any message that is not a command from the master channel.
 	// Leave this on to keep your master channel tidy.
 	// This also requires the "manage messages" permission
 	disallow_talking: true,
 
+	// If false, all (non-blacklisted) users will be able to add inhouses to created events.
+	// If true, only admins will be able to do so.
+	add_inhouse_is_admin_command: false,
+
 	// quick-inhouse command
 	// This command creates an instant lobby and adds an inhouse with the default values.
 	// It is the equivalent of running "@ScheduleBot create (event_name) now" and
@@ -94,26 +98,58 @@ module.exports = {
 	},
 
 	steam: {
-		// The name that the Steam bot will take
+		// The name that the Steam bots will take. It will be appended with "#id" as in "#1".
 		name: "ScheduleBot",
 
-		// The bot's profile URL. It's needed to redirect users to it.
+		// The first bot's profile URL. It's needed to redirect users to it.
 		profile_url: "http://steamcommunity.com/profiles/YOUR_BOT_ID/"
 	},
 
 	dota: {
 		// The default inhouse server, which will be used if the user doesn't pass the
 		// --server flag to the add-inhouse command.
-		// Go to that command's file (Or type -schedulebot add-ihouse --help)
+		// Go to that command's file (Or type -schedulebot add-inhouse --help)
 		// to see possible values.
-		defaultServer: "Luxembourg",
+		default_server: "Luxembourg",
+
+		// If false, lobbies will be started automatically when ten people join it
+		// (spectators, casters and unassigned players not counted).
+		// If true, the games will only be able to be started with the admin command
+		// schedulebot-admin force-lobby-start (event)
+		disable_autostart: false,
 
 		// If enabled is true, the bot will ticket any lobbies using the provided league id.
 		// Make sure that the steam bot is an admin of that league.
 		ticketing: {
 			enabled: false,
 			league_id: 12345
-		}
+		},
+
+		// If enabled is true, the bot will fetch MMR from OpenDota for every user that links
+		// their Steam account, and display it in event summaries.
+		//
+		// The user must have the "Expose Public Match Data" option enabled, must be displaying
+		// their MMR on their Dota profile, and must have signed in OpenDota at least once, using
+		// Steam. If OpenDota doesn't know the user MMR, ScheduleBot won't either, and will display
+		// a "MMR Unknown message"
+		mmr: {
+			enabled: true,
+
+			// If enforce is true, the bot will only allow people who have their MMR publicly
+			// exposed in OpenDota to confirm any events. This is useful for competitive leagues
+			// who need to control MMR; it's recommended to leave it false otherwise.
+			enforce: false,
+
+			// ScheduleBot will update all users' MMR on each interval.
+			update_interval: 8 // In hours
+		},
+
+		// In a competitive league, you might want to change this with "match" or "game",
+		// since it's not technically an inhouse.
+		//
+		// CAREFUL! This will change the name of the command "add-inhouse"
+		// to "add-whatever_you_write"
+		game_generic_name: "inhouse"
 	}
 };
 
 
@@ -1,14 +1,30 @@
 "use strict";
 
-const Clapp = require('../../modules/clapp-discord/index');
+const Clapp            = require("../../modules/clapp-discord")
+	, ECloseLobbyError = require("../../structures/enums/ECloseLobbyError")
+	, db               = require("../../modules/dbhandler")
+;
 
 module.exports = new Clapp.Command({
 	name: "force-lobby-start",
-	desc: "Forces the current lobby to start, even if there aren't enough players.",
+	desc: "Forces the lobby for the specified event to start, even if there aren't enough players.",
 	fn: (argv, context) => {
 		return new Promise((fulfill, reject) => {
-			context.dotaHandler.forceStart().catch(reject);
-			fulfill("Forced current lobby start");
+			db.events.get(argv.args.event).then(event => {
+				if (event !== null) {
+					db.events.getLobbyBotId(event)
+						.then(botID => {
+							fulfill(`Forced lobby start for the event ${event.id}.`);
+							context.dotaHandler.forceLobbyStart(botID).catch(reject);
+						})
+						.catch(reject);
+				} else {
+					fulfill("Error: the specified event `" + argv.args.event + "` doesn't exist.");
+				}
+			}).catch(reject);
 		});
-	}
+	},
+	args: [
+		require("./shared/event")
+	]
 });
@@ -1,27 +1,39 @@
 "use strict";
 
-const Clapp = require('../../modules/clapp-discord/index');
+const Clapp = require("../../modules/clapp-discord")
+	, db    = require("../../modules/dbhandler").events
+;
 
 module.exports = new Clapp.Command({
 	name: "get-lobby",
 	desc: "Gets the current lobby name and password sent to you on a DM",
 	fn: (argv, context) => {
 		return new Promise((fulfill, reject) => {
-			let lobby = context.dotaHandler.currentLobbyName;
-			let pass = context.dotaHandler.currentLobbyPassword;
+			db.events.get(argv.args.event).then(event => {
+				if (event === null) {
+					fulfill("Error: the specified event `" + argv.args.event + "` doesn't exist.");
+				} else {
+					db.getLobbyBotId(event).then(botID => {
+						let details = context.dotaHandler.getLobbyDetails(botID);
 
-			if (lobby !== null) {
-				context.msg.author.sendMessage(
-					"Hello! Here's the information you requested:\n\n" +
+						if (details === null) {
+							fulfill("The Dota bot is not in a lobby.");
+						} else {
+							context.msg.author.sendMessage(
+								"Hello! Here's the information you requested:\n\n" +
 
-					"- **Current lobby name**: `" + lobby + "`\n" +
-					"- **Current lobby password**: `" + pass + "`"
-				).then(() => {
-					fulfill("The information you requested was sent to you in a DM.");
-				}).catch(reject);
-			} else {
-				fulfill("The Dota bot is not in a lobby.");
-			}
+								"- **Lobby name**: `" + details.name + "`\n" +
+								"- **Lobby password**: `" + details.password + "`"
+							).then(() => {
+								fulfill("The information you requested was sent to you in a DM.");
+							}).catch(reject);
+						}
+					}).catch(reject);
+				}
+			}).catch(reject);
 		});
-	}
+	},
+	args: [
+		require("./shared/event")
+	]
 });
@@ -20,8 +20,9 @@ module.exports = new Clapp.Command({
 									.then(() => {
 										fulfill(user + " has been successfully kicked from " +
 											"the event `" + argv.args.id + "`.\n" +
-											"Please note that they are able to rejoin it at any time. To " +
-											"prevent them from doing so, use the `blacklist-add` command.");
+											"Please note that they are able to rejoin it at any" +
+											"time. To prevent them from doing so, use the" +
+											" `blacklist-add` command.");
 									}).catch(reject);
 							} else {
 								fulfill("Error: the specified user isn't attending the specified " +
 
@@ -1,7 +1,6 @@
 "use strict";
 
 const Clapp  = require('../../modules/clapp-discord/index');
-const cfg    = require('../../../config');
 const db     = require('../../modules/dbhandler/index').events;
 
 module.exports = new Clapp.Command({
@@ -13,27 +12,26 @@ module.exports = new Clapp.Command({
 				if (event !== null) {
 					let eventName = event.name;
 					let deleteSummaryPromise = context.summaryHandler.deleteSummary(event);
-					let deleteEventPromise = event.deleteEvent();
-					let closeLobbyPromise = new Promise((fulfill, reject) => {
-						// If the event has an active lobby, close it
-						if (
-							context.dotaHandler.currentLobbyEvent &&
-							context.dotaHandler.currentLobbyEvent.id === event.id
-						) {
-							context.dotaHandler.closeLobby(true).then(fulfill).catch(reject);
-						} else {
-							fulfill();
-						}
+					let closeLobbyPromise = new Promise((fulfill2, reject2) => {
+						db.getLobbyBotId(event)
+							.then(botID => {
+								// If the bot exists and is in a lobby, close it. Otherwise fulfill.
+								if (botID && context.dotaHandler.isBotInLobby(botID)) {
+									context.dotaHandler.closeLobby(botID, true)
+										.then(fulfill2)
+										.catch(reject2);
+								} else {
+									fulfill2();
+								}
+							})
+							.catch(reject2);
 					});
 
-					Promise.all(
-						[deleteSummaryPromise, deleteEventPromise, closeLobbyPromise]
-					).then(() => {
-						fulfill("The event `" + eventName+ "` was successfully deleted.");
-					}).catch(err => {
-						console.error(err);
-						fulfill("Sorry, an internal error occurred. Please talk to my author.");
-					});
+					Promise.all([deleteSummaryPromise, closeLobbyPromise])
+						.then(() => event.deleteEvent())
+						.then(() => {
+							fulfill("The event `" + eventName + "` was successfully deleted.");
+						}).catch(reject);
 				} else {
 					fulfill("Error: the specified event `" + argv.args.id + "` doesn't exist.");
 				}
 
@@ -0,0 +1,8 @@
+const Clapp = require("../../../modules/clapp-discord/index");
+
+module.exports = new Clapp.Argument({
+	name: "event",
+	desc: "The ID of the event",
+	type: "number",
+	required: true
+});
@@ -0,0 +1,41 @@
+"use strict";
+
+const Clapp = require("../../modules/clapp-discord");
+
+module.exports = new Clapp.Command({
+	name: "status",
+	desc: "Gets information about the Discord bot and Steam bots sent to you on a DM",
+	fn: (argv, context) => {
+		return new Promise((fulfill, reject) => {
+			let bots = context.dotaHandler.bots;
+
+			let msg = "Hello! Here's the bot status information:\n\n";
+
+			let genValueString = (key, value, newline = true) => {
+				return `- **${key}**: \`${value}\`${newline ? "\n" : ""}`;
+			};
+
+			msg += genValueString(
+				"Uptime",
+				Math.floor((context.summaryHandler.bot.uptime / 1000) / 60) + " minutes"
+			);
+
+			for (let i = 0; i < bots.length; i++) {
+				let dotaClient = bots[i].dota.client;
+
+				msg += genValueString(
+					`Bot #${dotaClient.botId}`,
+					context.dotaHandler.isBotInLobby(dotaClient.botId)
+						? `In lobby: ${dotaClient.currentLobby.name} ` +
+						`(Event #${dotaClient.currentLobby.event.id})`
+						: `Not in lobby`,
+					i !== bots.length
+				);
+			}
+
+			context.msg.author.sendMessage(msg)
+				.then(() => fulfill("The information you requested was sent to you in a DM."))
+				.catch(reject);
+		});
+	}
+});