Rename CommandParser to Chat

We had a lot of discussion in Dev and a somewhat-close poll, but in
the end "Chat" was a better name than "Messages", and also has the
advantage of being shorter (which is nice for Chat.html and
Chat.plural which should be short).

Author: Zarel

.eslintrc

@@ -13,7 +13,7 @@
 	},
 	"globals": {
 		"Config": false, "Monitor": false, "toId": false, "Tools": false, "LoginServer": false,
-		"Users": false, "Punishments": false, "Rooms": false, "Verifier": false, "CommandParser": false, "Simulator": false,
+		"Users": false, "Punishments": false, "Rooms": false, "Verifier": false, "Chat": false, "Simulator": false,
 		"Tournaments": false, "Dnsbl": false, "Sockets": false, "TeamValidator": false, "Ladders": false
 	},
 	"extends": "eslint:recommended",

app.js

@@ -32,9 +32,9 @@
  *
  *   Used to access the simulator itself.
  *
- * CommandParser - from command-parser.js
+ * Chat - from chat.js
  *
- *   Parses text commands like /me
+ *   Handles chat and parses chat commands like /me and /ban
  *
  * Sockets - from sockets.js
  *
@@ -122,7 +122,7 @@ delete process.send; // in case we're a child process
 global.Verifier = require('./verifier');
 Verifier.PM.spawn();
 
-global.CommandParser = require('./command-parser');
+global.Chat = require('./chat');
 
 global.Simulator = require('./simulator');
 
@@ -136,7 +136,7 @@ if (Config.crashguard) {
 	process.on('uncaughtException', err => {
 		let crashMessage = require('./crashlogger')(err, 'The main process');
 		if (crashMessage !== 'lockdown') return;
-		let stack = CommandParser.escapeHTML(err.stack).split("\n").slice(0, 2).join("<br />");
+		let stack = Chat.escapeHTML(err.stack).split("\n").slice(0, 2).join("<br />");
 		if (!Rooms.global.lockdown) {
 			if (Rooms.lobby) {
 				Rooms.lobby.addRaw('<div class="broadcast-red"><b>THE SERVER HAS CRASHED:</b> ' + stack + '<br />Please restart the server.</div>');

chat-plugins/datasearch.js

@@ -96,7 +96,7 @@ exports.commands = {
 			} else if (response.reply) {
 				this.sendReplyBox(response.reply);
 			} else if (response.dt) {
-				CommandParser.commands.data.call(this, response.dt, room, user, connection, 'dt');
+				Chat.commands.data.call(this, response.dt, room, user, connection, 'dt');
 			}
 			this.update();
 		});
@@ -148,7 +148,7 @@ exports.commands = {
 			} else if (response.reply) {
 				this.sendReplyBox(response.reply);
 			} else if (response.dt) {
-				CommandParser.commands.data.call(this, response.dt, room, user, connection, 'dt');
+				Chat.commands.data.call(this, response.dt, room, user, connection, 'dt');
 			}
 			this.update();
 		});
@@ -176,7 +176,7 @@ exports.commands = {
 			} else if (response.reply) {
 				this.sendReplyBox(response.reply);
 			} else if (response.dt) {
-				CommandParser.commands.data.call(this, response.dt, room, user, connection, 'dt');
+				Chat.commands.data.call(this, response.dt, room, user, connection, 'dt');
 			}
 			this.update();
 		});
@@ -209,7 +209,7 @@ exports.commands = {
 			} else if (response.reply) {
 				this.sendReplyBox(response.reply);
 			} else if (response.dt) {
-				CommandParser.commands.data.call(this, response.dt, room, user, connection, 'dt');
+				Chat.commands.data.call(this, response.dt, room, user, connection, 'dt');
 			}
 			this.update();
 		});
@@ -484,7 +484,7 @@ function runDexsearch(target, cmd, canAll, message) {
 					case '=': direction = 'equal'; break;
 					}
 				} else {
-					return {reply: "No value given to compare with '" + CommandParser.escapeHTML(target) + "'."};
+					return {reply: "No value given to compare with '" + Chat.escapeHTML(target) + "'."};
 				}
 				switch (toId(stat)) {
 				case 'attack': stat = 'atk'; break;
@@ -495,13 +495,13 @@ function runDexsearch(target, cmd, canAll, message) {
 				case 'spdef': stat = 'spd'; break;
 				case 'speed': stat = 'spe'; break;
 				}
-				if (!(stat in allStats)) return {reply: "'" + CommandParser.escapeHTML(target) + "' did not contain a valid stat."};
+				if (!(stat in allStats)) return {reply: "'" + Chat.escapeHTML(target) + "' did not contain a valid stat."};
 				if (!orGroup.stats[stat]) orGroup.stats[stat] = {};
 				if (orGroup.stats[stat][direction]) return {reply: "Invalid stat range for " + stat + "."};
 				orGroup.stats[stat][direction] = num;
 				continue;
 			}
-			return {reply: "'" + CommandParser.escapeHTML(target) + "' could not be found in any of the search categories."};
+			return {reply: "'" + Chat.escapeHTML(target) + "' could not be found in any of the search categories."};
 		}
 		searches.push(orGroup);
 	}
@@ -661,7 +661,7 @@ function runDexsearch(target, cmd, canAll, message) {
 		results = Tools.shuffle(results).slice(0, randomOutput);
 	}
 
-	let resultsStr = (message === "" ? message : "<font color=#999999>" + CommandParser.escapeHTML(message) + ":</font><br>");
+	let resultsStr = (message === "" ? message : "<font color=#999999>" + Chat.escapeHTML(message) + ":</font><br>");
 	if (results.length > 1) {
 		if (showAll || results.length <= RESULTS_MAX_LENGTH + 5) {
 			results.sort();
@@ -702,7 +702,7 @@ function runMovesearch(target, cmd, canAll, message) {
 		let typeIndex = target.indexOf(' type');
 		if (typeIndex >= 0) {
 			target = target.charAt(0).toUpperCase() + target.substring(1, typeIndex);
-			if (!(target in Tools.data.TypeChart)) return {reply: "Type '" + CommandParser.escapeHTML(target) + "' not found."};
+			if (!(target in Tools.data.TypeChart)) return {reply: "Type '" + Chat.escapeHTML(target) + "' not found."};
 			if (!searches['type']) searches['type'] = {};
 			if ((searches['type'][target] && isNotSearch) || (searches['type'][target] === false && !isNotSearch)) return {reply: 'A search cannot both exclude and include a type.'};
 			searches['type'][target] = !isNotSearch;
@@ -786,15 +786,15 @@ function runMovesearch(target, cmd, canAll, message) {
 				case '=': direction = 'equal'; break;
 				}
 			} else {
-				return {reply: "No value given to compare with '" + CommandParser.escapeHTML(target) + "'."};
+				return {reply: "No value given to compare with '" + Chat.escapeHTML(target) + "'."};
 			}
 			let prop = targetParts[propSide];
 			switch (toId(targetParts[propSide])) {
 			case 'basepower': prop = 'basePower'; break;
 			case 'bp': prop = 'basePower'; break;
 			case 'acc': prop = 'accuracy'; break;
 			}
-			if (!(prop in allProperties)) return {reply: "'" + CommandParser.escapeHTML(target) + "' did not contain a valid property."};
+			if (!(prop in allProperties)) return {reply: "'" + Chat.escapeHTML(target) + "' did not contain a valid property."};
 			if (!searches['property']) searches['property'] = {};
 			if (direction === 'equal') {
 				if (searches['property'][prop]) return {reply: "Invalid property range for " + prop + "."};
@@ -845,7 +845,7 @@ function runMovesearch(target, cmd, canAll, message) {
 			case 'evasiveness': target = 'evasion'; break;
 			default: target = target.substr(7);
 			}
-			if (!(target in allBoosts)) return {reply: "'" + CommandParser.escapeHTML(target.substr(7)) + "' is not a recognized stat."};
+			if (!(target in allBoosts)) return {reply: "'" + Chat.escapeHTML(target.substr(7)) + "' is not a recognized stat."};
 			if (!searches['boost']) searches['boost'] = {};
 			if ((searches['boost'][target] && isNotSearch) || (searches['boost'][target] === false && !isNotSearch)) return {reply: 'A search cannot both exclude and include a stat boost.'};
 			searches['boost'][target] = !isNotSearch;
@@ -880,7 +880,7 @@ function runMovesearch(target, cmd, canAll, message) {
 			continue;
 		}
 
-		return {reply: "'" + CommandParser.escapeHTML(oldTarget) + "' could not be found in any of the search categories."};
+		return {reply: "'" + Chat.escapeHTML(oldTarget) + "' could not be found in any of the search categories."};
 	}
 
 	if (showAll && !Object.keys(searches).length && !targetMon) {
@@ -1017,7 +1017,7 @@ function runMovesearch(target, cmd, canAll, message) {
 	if (targetMon) {
 		resultsStr += "<font color=#999999>Matching moves found in learnset for</font> " + targetMon + ":<br>";
 	} else {
-		resultsStr += (message === "" ? message : "<font color=#999999>" + CommandParser.escapeHTML(message) + ":</font><br>");
+		resultsStr += (message === "" ? message : "<font color=#999999>" + Chat.escapeHTML(message) + ":</font><br>");
 	}
 	if (results.length > 0) {
 		if (showAll || results.length <= RESULTS_MAX_LENGTH + 5) {
@@ -1233,7 +1233,7 @@ function runItemsearch(target, cmd, canAll, message) {
 		}
 	}
 
-	let resultsStr = (message === "" ? message : "<font color=#999999>" + CommandParser.escapeHTML(message) + ":</font><br>");
+	let resultsStr = (message === "" ? message : "<font color=#999999>" + Chat.escapeHTML(message) + ":</font><br>");
 	if (foundItems.length > 0) {
 		if (showAll || foundItems.length <= RESULTS_MAX_LENGTH + 5) {
 			foundItems.sort();

chat-plugins/hangman.js

@@ -142,21 +142,21 @@ class Hangman extends Rooms.RoomGame {
 			);
 		}
 
-		if (this.hint) output += '<div>(Hint: ' + CommandParser.escapeHTML(this.hint) + ')</div>';
+		if (this.hint) output += '<div>(Hint: ' + Chat.escapeHTML(this.hint) + ')</div>';
 		output += '<p style="font-weight:bold;font-size:12pt;letter-spacing:3pt">' + wordString + '</p>';
 		if (this.guesses.length) {
 			if (this.letterGuesses.length) {
 				output += 'Letters: ' + this.letterGuesses.map(g =>
-					'<strong' + (g[1] === '1' ? '' : ' style="color: #DBA"') + '>' + CommandParser.escapeHTML(g[0]) + '</strong>'
+					'<strong' + (g[1] === '1' ? '' : ' style="color: #DBA"') + '>' + Chat.escapeHTML(g[0]) + '</strong>'
 				).join(', ');
 			}
 			if (result === 2) {
-				output += '<br />Winner: ' + CommandParser.escapeHTML(this.lastGuesser);
+				output += '<br />Winner: ' + Chat.escapeHTML(this.lastGuesser);
 			} else if (this.guesses[this.guesses.length - 1].length === 1) {
 				// last guess was a letter
-				output += ' <small>&ndash; ' + CommandParser.escapeHTML(this.lastGuesser) + '</small>';
+				output += ' <small>&ndash; ' + Chat.escapeHTML(this.lastGuesser) + '</small>';
 			} else {
-				output += '<br />Guessed: ' + this.guesses[this.guesses.length - 1] + ' <small>&ndash; ' + CommandParser.escapeHTML(this.lastGuesser) + '</small>';
+				output += '<br />Guessed: ' + this.guesses[this.guesses.length - 1] + ' <small>&ndash; ' + Chat.escapeHTML(this.lastGuesser) + '</small>';
 			}
 		}