Merge branch 'master' into 'dev-steam'

Conflicts:
	lib/modules/summaryhandler/index.js
	package.json

config.js

@@ -7,8 +7,17 @@ module.exports = {
 	// The bot's command prefix. The bot will recognize as command any message that begins with it.
 	// i.e: "-schedulebot foo" will trigger the command "foo",
 	//      whereas "ScheduleBot foo" will do nothing at all.
-	prefix:  "-schedulebot", // Tip: If you use "<@YOUR_BOT_USER_ID>", you can have the prefix
-	                         // be a mention to your bot.
+	prefix:  "<@YOUR_BOT_USER_ID>",
+
+	// This is a readable version of the prefix. Generally, this is the same as prefix, but if
+	// you set prefix to be in the form of "<@YOUR_BOT_USER_ID>", you'd need to set readable_prefix
+	// to be "@ScheduleBot" (or however your bot user is named).
+	//
+	// This is because when you use the characters `` in Discord (to highlight a command, in
+	// ScheduleBot's case), the string "<@YOUR_BOT_USER_ID>" doesn't get parsed as a mention.
+	// So in order not to mislead the user, we have a separate option for a readable version of
+	// our prefix.
+	readable_prefix: "@YOUR_BOT_USER_NAME",
 
 	// Admin app settings
 	admin_app: {

lib/commands/general/create.js

@@ -7,7 +7,8 @@ const cfg    = require('../../../config');
 
 module.exports = new Clapp.Command({
 	name: "create",
-	desc: "Creates a new event. Example: @ScheduleBot create \"My Event\" \"09/11/2001 09:00\"",
+	desc: "Creates a new event. Example: `" + cfg.readable_prefix
+		+ " create \"My Event\" \"09/11/2001 09:00\"`",
 	fn: (argv, context) => {
 		return new Promise((fulfill, reject) => {
 			let date;

lib/modules/summaryhandler/index.js

@@ -1,3 +1,5 @@
+const cfg = require("../../../config");
+
 "use strict";
 
 class SummaryHandler {
@@ -133,9 +135,9 @@ class SummaryHandler {
 					}
 				}
 
-				summary += "\nTo confirm your attendance, type `@ScheduleBot confirm " + event.id
-					+ "`. To deny your attendance, type `@ScheduleBot confirm " +
-					event.id  + " no`\n";
+				summary += "\nTo confirm your attendance, type `" + cfg.readable_prefix
+					+ " confirm " + event.id + "`. To deny your attendance, type `"
+					+ cfg.readable_prefix + " confirm " + event.id  + " no`\n";
 
 				fulfill(summary);
 			}).catch(reject);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "schedulebot",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A Discord bot that makes scheduling easy",
   "homepage": "https://github.com/mellamopablo/schedulebot#readme",
   "author": "Pablo Rodríguez <pabloviolin8@gmail.com> (https://github.com/MeLlamoPablo)",