Ticket #3383: lobby_coding_convention_v2.patch

binaries/data/mods/public/gui/lobby/lobby.js

@@ +1 @@
+var g_MapSizes = {};
+const g_MapTypesText = [translateWithContext("map", "Skirmish"), translateWithContext("map", "Random"), translate("Scenario")];
+const g_MapTypes = ["skirmish", "random", "scenario"];
+
 var g_ChatMessages = [];
-var g_Name = "unknown";
+const g_ShowTimestamp = Engine.ConfigDB_GetValue("user", "lobby.chattimestamp") == "true";
+
+/** This object looks like { "name": [numMessagesSinceReset, lastReset, timeBlocked] } when in use. */
+var g_SpamMonitor = {};
+const g_SpamBlockLength = 30;
+
+/**
+ * A key that is used to distinguish between system and user chat messages.
+ * TODO: This should not be used, just use a boolean argument.
+ */
+const g_SpecialKey = Math.random();
+
+const g_ModPrefix = "@";
+var g_Username = "unknown";
+var g_UserRating = "";
+
+const g_FixedColors = {
+    "system": repeatString(7, "255.0.0."),
+    "@WFGbot": repeatString(7, "255.24.24.")
+};
+
 var g_GameList = {}
+/** Name of the column to be used for sorting. */
 var g_GameListSortBy = "name";
+/** Sorting order: +1 ascending, -1 descending. */
+var g_GameListOrder = 1;
+
 var g_PlayerListSortBy = "name";
-var g_GameListOrder = 1; // 1 for ascending sort, and -1 for descending
 var g_PlayerListOrder = 1;
-var g_specialKey = Math.random();
-// This object looks like {"name":[numMessagesSinceReset, lastReset, timeBlocked]} when in use.
-var g_spamMonitor = {};
-var g_timestamp = Engine.ConfigDB_GetValue("user", "lobby.chattimestamp") == "true";
-var g_mapSizes = {};
-const g_mapTypesText = [translateWithContext("map", "Skirmish"), translateWithContext("map", "Random"), translate("Scenario")];
-const g_mapTypes = ["skirmish", "random", "scenario"];
-var g_userRating = ""; // Rating of user, defaults to Unrated
-var g_modPrefix = "@";
-// Block spammers for 30 seconds.
-var SPAM_BLOCK_LENGTH = 30;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 function init(attribs)
 {
     // Play menu music
     initMusic();
     global.music.setState(global.music.states.MENU);
 
-    g_Name = Engine.LobbyGetNick();
+    g_Username = Engine.LobbyGetNick();
 
-    g_mapSizes = initMapSizes();
-    g_mapSizes.shortNames.splice(0, 0, translateWithContext("map size", "Any"));
-    g_mapSizes.tiles.splice(0, 0, "");
+    g_MapSizes = initMapSizes();
+    g_MapSizes.shortNames.splice(0, 0, translateWithContext("map size", "Any"));
+    g_MapSizes.tiles.splice(0, 0, "");
 
     var mapSizeFilter = Engine.GetGUIObjectByName("mapSizeFilter");
-    mapSizeFilter.list = g_mapSizes.shortNames;
-    mapSizeFilter.list_data = g_mapSizes.tiles;
+    mapSizeFilter.list = g_MapSizes.shortNames;
+    mapSizeFilter.list_data = g_MapSizes.tiles;
 
     var playersNumberFilter = Engine.GetGUIObjectByName("playersNumberFilter");
     playersNumberFilter.list = [translateWithContext("player number", "Any"),2,3,4,5,6,7,8];
     playersNumberFilter.list_data = ["",2,3,4,5,6,7,8];
 
     var mapTypeFilter = Engine.GetGUIObjectByName("mapTypeFilter");
-    mapTypeFilter.list = [translateWithContext("map", "Any")].concat(g_mapTypesText);
-    mapTypeFilter.list_data = [""].concat(g_mapTypes);
+    mapTypeFilter.list = [translateWithContext("map", "Any")].concat(g_MapTypesText);
+    mapTypeFilter.list_data = [""].concat(g_MapTypes);
 
     Engine.LobbySetPlayerPresence("available");
     Engine.SendGetGameList();
     Engine.SendGetBoardList();
     updatePlayerList();
@@ -103 +119 @@
     applyFilters();
 }
 
 function applyFilters()
 {
-    // Update the list of games
     updateGameList();
-
-    // Update info box about the game currently selected
     updateGameSelection();
 }
 
 /**
  * Filter a game based on the status of the filter dropdowns.
@@ -174 +187 @@
     var presenceList = [];
     var nickList = [];
     var ratingList = [];
     var cleanPlayerList = Engine.GetPlayerList();
     // Sort the player list, ignoring case.
-    cleanPlayerList.sort(function(a,b)
+    cleanPlayerList.sort((a,b) =>
     {
         switch (g_PlayerListSortBy)
         {
         case 'rating':
             if (a.rating < b.rating)
@@ -204 +217 @@
             else if (aName > bName)
                 return g_PlayerListOrder;
             return 0;
         }
     });
-    for (var i = 0; i < cleanPlayerList.length; i++)
+    for (let i = 0; i < cleanPlayerList.length; ++i)
     {
         // Identify current user's rating.
-        if (cleanPlayerList[i].name == g_Name && cleanPlayerList[i].rating)
-            g_userRating = cleanPlayerList[i].rating;
+        if (cleanPlayerList[i].name == g_Username && cleanPlayerList[i].rating)
+            g_UserRating = cleanPlayerList[i].rating;
         // Add a "-" for unrated players.
         if (!cleanPlayerList[i].rating)
             cleanPlayerList[i].rating = "-";
         // Colorize.
         var [name, status, rating] = formatPlayerListEntry(cleanPlayerList[i].name, cleanPlayerList[i].presence, cleanPlayerList[i].rating, cleanPlayerList[i].role);
         // Push to lists.
         playerList.push(name);
         presenceList.push(status);
         nickList.push(cleanPlayerList[i].name);
         var ratingSpaces = "  ";
-        for (var index = 0; index < 4 - Math.ceil(Math.log(cleanPlayerList[i].rating) / Math.LN10); index++)
+        for (let index = 0; index < 4 - Math.ceil(Math.log(cleanPlayerList[i].rating) / Math.LN10); ++index)
             ratingSpaces += "  ";
         ratingList.push(String(ratingSpaces + rating));
     }
     playersBox.list_name = playerList;
     playersBox.list_status = presenceList;
@@ -236 +249 @@
 
 /**
  * Display the profile of the selected player.
  * Displays N/A for all stats until updateProfile is called when the stats
  *  are actually received from the bot.
- * 
+ *
  * @param caller From which screen is the user requesting data from?
  */
 function displayProfile(caller)
 {
     var playerList, rating;
@@ -261 +274 @@
         Engine.GetGUIObjectByName("profileArea").hidden = true;
         return;
     }
     Engine.GetGUIObjectByName("profileArea").hidden = false;
 
-    Engine.SendGetProfile(playerList.list[playerList.selected]);    
+    Engine.SendGetProfile(playerList.list[playerList.selected]);
 
     var user = playerList.list_name[playerList.selected];
     var role = Engine.LobbyGetPlayerRole(playerList.list[playerList.selected]);
     var userList = Engine.GetGUIObjectByName("playersBox");
     if (role && caller == "lobbylist")
@@ -288 +301 @@
     Engine.GetGUIObjectByName("ratioText").caption = translate("N/A");
 }
 
 /**
  * Update the profile of the selected player with data from the bot.
- *
  */
 function updateProfile()
 {
     var playerList, user;
     var attributes = Engine.GetProfile();
@@ -306 +318 @@
             Engine.GetGUIObjectByName("profileErrorText").hidden = false;
             return;
         }
         Engine.GetGUIObjectByName("profileWindowArea").hidden = false;
         Engine.GetGUIObjectByName("profileErrorText").hidden = true;
-        
+
         if (attributes[0].rating != "")
-            user = sprintf(translate("%(nick)s (%(rating)s)"), { nick: user, rating: attributes[0].rating });
+            user = sprintf(translate("%(nick)s (%(rating)s)"), { "nick": user, "rating": attributes[0].rating });
 
         Engine.GetGUIObjectByName("profileUsernameText").caption = user;
         Engine.GetGUIObjectByName("profileRankText").caption = attributes[0].rank;
         Engine.GetGUIObjectByName("profileHighestRatingText").caption = attributes[0].highestRating;
         Engine.GetGUIObjectByName("profileTotalGamesText").caption = attributes[0].totalGamesPlayed;
         Engine.GetGUIObjectByName("profileWinsText").caption = attributes[0].wins;
         Engine.GetGUIObjectByName("profileLossesText").caption = attributes[0].losses;
 
         var winRate = (attributes[0].wins / attributes[0].totalGamesPlayed * 100).toFixed(2);
         if (attributes[0].totalGamesPlayed != 0)
-            Engine.GetGUIObjectByName("profileRatioText").caption = sprintf(translate("%(percentage)s%%"), { percentage: winRate });
+            Engine.GetGUIObjectByName("profileRatioText").caption = sprintf(translate("%(percentage)s%%"), { "percentage": winRate });
         else
             Engine.GetGUIObjectByName("profileRatioText").caption = translateWithContext("Used for an undefined winning rate", "-");
         return;
     }
     else if (!Engine.GetGUIObjectByName("leaderboard").hidden)
         playerList = Engine.GetGUIObjectByName("leaderboardBox");
     else
         playerList = Engine.GetGUIObjectByName("playersBox");
-    
+
     if (attributes[0].rating == "-2")
         return;
     // Make sure the stats we have received coincide with the selected player.
     if (attributes[0].player != playerList.list[playerList.selected])
         return;
     user = playerList.list_name[playerList.selected];
     if (attributes[0].rating != "")
-        user = sprintf(translate("%(nick)s (%(rating)s)"), { nick: user, rating: attributes[0].rating });
+        user = sprintf(translate("%(nick)s (%(rating)s)"), { "nick": user, "rating": attributes[0].rating });
 
     Engine.GetGUIObjectByName("usernameText").caption = user;
     Engine.GetGUIObjectByName("rankText").caption = attributes[0].rank;
     Engine.GetGUIObjectByName("highestRatingText").caption = attributes[0].highestRating;
     Engine.GetGUIObjectByName("totalGamesText").caption = attributes[0].totalGamesPlayed;
     Engine.GetGUIObjectByName("winsText").caption = attributes[0].wins;
     Engine.GetGUIObjectByName("lossesText").caption = attributes[0].losses;
 
     var winRate = (attributes[0].wins / attributes[0].totalGamesPlayed * 100).toFixed(2);
     if (attributes[0].totalGamesPlayed != 0)
-        Engine.GetGUIObjectByName("ratioText").caption = sprintf(translate("%(percentage)s%%"), { percentage: winRate });
+        Engine.GetGUIObjectByName("ratioText").caption = sprintf(translate("%(percentage)s%%"), { "percentage": winRate });
     else
         Engine.GetGUIObjectByName("ratioText").caption = translateWithContext("Used for an undefined winning rate", "-");
 }
 
 /**
  * Update the leaderboard from data cached in C++.
  */
 function updateLeaderboard()
 {
-    // Get list from C++
-    var boardList = Engine.GetBoardList();
-    // Get GUI leaderboard object
     var leaderboard = Engine.GetGUIObjectByName("leaderboardBox");
-    // Sort list in acending order by rating
-    boardList.sort(function(a, b) b.rating - a.rating);
+    var boardList = Engine.GetBoardList();
+    boardList.sort((a, b) => b.rating - a.rating);
 
     var list = [];
     var list_name = [];
     var list_rank = [];
     var list_rating = [];
 
     // Push changes
-    for (var i = 0; i < boardList.length; i++)
+    for (let i = 0; i < boardList.length; ++i)
     {
         list_name.push(boardList[i].name);
         list_rating.push(boardList[i].rating);
         list_rank.push(i+1);
         list.push(boardList[i].name);
@@ -400 +409 @@
     // to update the game info panel.
     g_GameList = gameList;
 
     // Sort the list of games to that games 'waiting' are displayed at the top, followed by 'init', followed by 'running'.
     var gameStatuses = ['waiting', 'init', 'running'];
-    g_GameList.sort(function (a,b) {
+    g_GameList.sort((a,b) => {
         switch (g_GameListSortBy)
         {
         case 'name':
         case 'mapSize':
             // mapSize contains the number of tiles for random maps
@@ -467 +476 @@
                 name = '[color="255 0 0"]' + name + '[/color]';
             list_name.push(name);
             list_ip.push(g.ip);
             list_mapName.push(translate(g.niceMapName));
             list_mapSize.push(translatedMapSize(g.mapSize));
-            let idx = g_mapTypes.indexOf(g.mapType);
-            list_mapType.push(idx != -1 ? g_mapTypesText[idx] : "");
+            let idx = g_MapTypes.indexOf(g.mapType);
+            list_mapType.push(idx != -1 ? g_MapTypesText[idx] : "");
             list_nPlayers.push(g.nbp + "/" +g.tnbp);
             list.push(name);
             list_data.push(c);
         }
         c++;
@@ -524 +533 @@
     case "offline":
         color = "0 0 0";
         status = translate("Offline");
         break;
     default:
-        warn(sprintf("Unknown presence '%(presence)s'", { presence: presence }));
+        warn("Unknown presence '" + presence + "'");
         color = "178 178 178";
         status = translateWithContext("lobby presence", "Unknown");
         break;
     }
     // Center the unrated symbol.
@@ -536 +545 @@
         rating = "    -";
     var formattedStatus = '[color="' + color + '"]' + status + "[/color]";
     var formattedRating = '[color="' + color + '"]' + rating + "[/color]";
     var role = Engine.LobbyGetPlayerRole(nickname);
     if (role == "moderator")
-        nickname = g_modPrefix + nickname;
+        nickname = g_ModPrefix + nickname;
     var formattedName = colorPlayerName(nickname);
 
     // Push this player's name and status onto the list
     return [formattedName, formattedStatus, formattedRating];
 }
@@ -552 +561 @@
 function translatedMapSize(mapSize)
 {
     if (+mapSize !== +mapSize) // NaN
         return translate(mapSize);
     else
-        return g_mapSizes.shortNames[g_mapSizes.tiles.indexOf(+mapSize)];
+        return g_MapSizes.shortNames[g_MapSizes.tiles.indexOf(+mapSize)];
 }
 
 /**
  * Populate the game info area with information on the current game selection.
  */
@@ -575 +584 @@
     var mapData;
     var g = Engine.GetGUIObjectByName("gamesBox").list_data[selected];
 
     // Load map data
     if (g_GameList[g].mapType == "random" && g_GameList[g].mapName == "random")
-        mapData = {"settings": {"Description": translate("A randomly selected map.")}};
+        mapData = { "settings": { "Description": translate("A randomly selected map.") } };
     else if (g_GameList[g].mapType == "random" && Engine.FileExists(g_GameList[g].mapName + ".json"))
         mapData = Engine.ReadJSONFile(g_GameList[g].mapName + ".json");
     else if (Engine.FileExists(g_GameList[g].mapName + ".xml"))
         mapData = Engine.LoadMapSettings(g_GameList[g].mapName + ".xml");
     else
-        // Warn the player if we can't find the map. 
-        warn(sprintf("Map '%(mapName)s' not found locally.", { mapName: g_GameList[g].mapName }));
+        warn("Map '" + g_GameList[g].mapName + "' not found locally.");
 
     // Show the game info panel and join button.
     Engine.GetGUIObjectByName("gameInfo").hidden = false;
     Engine.GetGUIObjectByName("joinGameButton").hidden = false;
     Engine.GetGUIObjectByName("gameInfoEmpty").hidden = true;
@@ -594 +602 @@
     // Display the map name, number of players, the names of the players, the map size and the map type.
     Engine.GetGUIObjectByName("sgMapName").caption = translate(g_GameList[g].niceMapName);
     Engine.GetGUIObjectByName("sgNbPlayers").caption = g_GameList[g].nbp + "/" + g_GameList[g].tnbp;
     Engine.GetGUIObjectByName("sgPlayersNames").caption = g_GameList[g].players;
     Engine.GetGUIObjectByName("sgMapSize").caption = translatedMapSize(g_GameList[g].mapSize);
-    let idx = g_mapTypes.indexOf(g_GameList[g].mapType);
-    Engine.GetGUIObjectByName("sgMapType").caption = idx != -1 ? g_mapTypesText[idx] : "";
+    let idx = g_MapTypes.indexOf(g_GameList[g].mapType);
+    Engine.GetGUIObjectByName("sgMapType").caption = idx != -1 ? g_MapTypesText[idx] : "";
 
     // Display map description if it exists, otherwise display a placeholder.
     if (mapData && mapData.settings.Description)
         var mapDescription = translate(mapData.settings.Description);
     else
@@ -622 +630 @@
 {
     var gamesBox = Engine.GetGUIObjectByName("gamesBox");
     if (gamesBox.selected >= 0)
     {
         var g = gamesBox.list_data[gamesBox.selected];
-        var sname = g_Name;
+        var sname = g_Username;
         var sip = g_GameList[g].ip;
 
         // TODO: What about valid host names?
         // Check if it looks like an ip address
         if (sip.split('.').length != 4)
         {
-            addChatMessage({ "from": "system", "text": sprintf(translate("This game's address '%(ip)s' does not appear to be valid."), { ip: sip }) });
+            addChatMessage({ "from": "system", "text": sprintf(translate("This game's address '%(ip)s' does not appear to be valid."), { "ip": sip }) });
             return;
         }
 
         // Open Multiplayer connection window with join option.
-        Engine.PushGuiPage("page_gamesetup_mp.xml", { multiplayerGameType: "join", name: sname, ip: sip, rating: g_userRating });
+        Engine.PushGuiPage("page_gamesetup_mp.xml", { "multiplayerGameType": "join", "name": sname, "ip": sip, "rating": g_UserRating });
     }
 }
 
 /**
  * Start the hosting process.
  */
 function hostGame()
 {
     // Open Multiplayer connection window with host option.
-    Engine.PushGuiPage("page_gamesetup_mp.xml", { multiplayerGameType: "host", name: g_Name, rating: g_userRating });
+    Engine.PushGuiPage("page_gamesetup_mp.xml", { "multiplayerGameType": "host", "name": g_Username, "rating": g_UserRating });
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 // Utils
 ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -700 +708 @@
                 var [name, status, rating] = formatPlayerListEntry(nick, presence, "-");
                 playerList.push(name);
                 presenceList.push(status);
                 nickList.push(nick);
                 ratingList.push(String(rating));
-                addChatMessage({ "text": "/special " + sprintf(translate("%(nick)s has joined."), { nick: nick }), "key": g_specialKey });
+                addChatMessage({ "text": "/special " + sprintf(translate("%(nick)s has joined."), { "nick": nick }), "key": g_SpecialKey });
                 break;
             case "leave":
                 if (nickIndex == -1) // Left, but not present (TODO: warn about this?)
                     break;
                 playerList.splice(nickIndex, 1);
                 presenceList.splice(nickIndex, 1);
                 nickList.splice(nickIndex, 1);
                 ratingList.splice(nickIndex, 1);
-                addChatMessage({ "text": "/special " + sprintf(translate("%(nick)s has left."), { nick: nick }), "key": g_specialKey });
+                addChatMessage({ "text": "/special " + sprintf(translate("%(nick)s has left."), { "nick": nick }), "key": g_SpecialKey });
                 break;
             case "nick":
                 if (nickIndex == -1) // Changed nick, but not present (shouldn't ever happen)
                     break;
                 if (!isValidNick(message.data))
                 {
-                    addChatMessage({ "from": "system", "text": sprintf(translate("Invalid nickname: %(nick)s"), { nick: message.data })});
+                    addChatMessage({ "from": "system", "text": sprintf(translate("Invalid nickname: %(nick)s"), { "nick": message.data }) });
                     break;
                 }
                 var [name, status, rating] = formatPlayerListEntry(message.data, presence, stripColorCodes(ratingList[nickIndex])); // TODO: actually we don't want to change the presence here, so use what was used before
                 playerList[nickIndex] = name;
                 // presence stays the same
                 nickList[nickIndex] = message.data;
-                addChatMessage({ "text": "/special " + sprintf(translate("%(oldnick)s is now known as %(newnick)s."), { oldnick: nick, newnick: message.data }), "key": g_specialKey });
+                addChatMessage({ "text": "/special " + sprintf(translate("%(oldnick)s is now known as %(newnick)s."), { "oldnick": nick, "newnick": message.data }), "key": g_SpecialKey });
                 break;
             case "presence":
                 if (nickIndex == -1) // Changed presence, but not online (shouldn't ever happen)
                     break;
                 var [name, status, rating] = formatPlayerListEntry(nick, presence, stripColorCodes(ratingList[nickIndex]));
@@ -737 +745 @@
                 break;
             case "subject":
                 updateSubject(message.text);
                 break;
             default:
-                warn(sprintf("Unknown message.level '%(msglvl)s'", { msglvl: message.level }));
+                warn("Unknown message.level '" + message.level + "'");
                 break;
             }
             // Push new data to GUI
             playersBox.list_name = playerList;
             playersBox.list_status = presenceList;
             playersBox.list_rating = ratingList;
-            playersBox.list = nickList;     
+            playersBox.list = nickList;
             if (playersBox.selected >= playersBox.list.length)
                 playersBox.selected = -1;
             break;
         case "system":
             switch (message.level)
@@ -763 +771 @@
                     updatePlayerList();
                     // Disable the 'host' button
                     Engine.GetGUIObjectByName("hostButton").enabled = false;
                 }
                 else if (message.text == "connected")
-                {
                     Engine.GetGUIObjectByName("hostButton").enabled = true;
-                }
+
                 break;
             case "error":
                 addChatMessage({ "from": "system", "text": text, "color": "150 0 0" });
                 break;
             case "internal":
@@ -790 +797 @@
                 }
                 break;
             }
             break;
         default:
-            error(sprintf("Unrecognised message type %(msgtype)s", { msgtype: message.type }));
+            error("Unrecognised message type '" + message.type + "'");
         }
     }
 }
 
-/* Messages */
+function returnToMainMenu()
+{
+    lobbyStop();
+    Engine.SwitchGuiPage("page_pregame.xml");
+}
+
 function submitChatInput()
 {
     var input = Engine.GetGUIObjectByName("chatInput");
     var text = input.caption;
     if (text.length)
     {
-        if (!handleSpecialCommand(text) && !isSpam(text, g_Name))
+        if (!handleSpecialCommand(text) && !isSpam(text, g_Username))
             Engine.LobbySendMessage(text);
         input.caption = "";
     }
 }
 
@@ -843 +855 @@
         break;
     case "ban": // TODO: Split reason from nick and pass it too, for now just support "/ban nick"
         Engine.LobbyBan(nick, "");
         break;
     case "quit":
-        lobbyStop();
-        Engine.SwitchGuiPage("page_pregame.xml");
+        returnToMainMenu();
         break;
     case "say":
     case "me":
         return false;
     default:
-        addChatMessage({ "from":"system", "text": sprintf(translate("We're sorry, the '%(cmd)s' command is not supported."), { cmd: cmd})});
+        addChatMessage({ "from":"system", "text": sprintf(translate("We're sorry, the '%(cmd)s' command is not supported."), { "cmd": cmd }) });
     }
     return true;
 }
 
 /**
@@ -868 +879 @@
     if (msg.from)
     {
         // Display the moderator symbol in the chatbox.
         var playerRole = Engine.LobbyGetPlayerRole(msg.from);
         if (playerRole == "moderator")
-            msg.from = g_modPrefix + msg.from;
+            msg.from = g_ModPrefix + msg.from;
     }
     else
         msg.from = null;
     if (!msg.color)
         msg.color = null;
@@ -880 +891 @@
         msg.key = null;
     if (!msg.datetime)
         msg.datetime = null;
 
     // Highlight local user's nick
-    if (msg.text.indexOf(g_Name) != -1 && g_Name != msg.from)
-        msg.text = msg.text.replace(new RegExp('\\b' + '\\' + g_Name + '\\b', "g"), colorPlayerName(g_Name));
+    if (msg.text.indexOf(g_Username) != -1 && g_Username != msg.from)
+        msg.text = msg.text.replace(new RegExp('\\b' + '\\' + g_Username + '\\b', "g"), colorPlayerName(g_Username));
 
     // Run spam test if it's not a historical message
     if (!msg.datetime)
         updateSpamMonitor(msg.from);
     if (isSpam(msg.text, msg.from))
@@ -934 +945 @@
         var [command, message] = ircSplit(text);
         switch (command)
         {
             case "me":
                 // Translation: IRC message prefix when the sender uses the /me command.
-                var senderString = '[font="sans-bold-13"]' + sprintf(translate("* %(sender)s"), { sender: coloredFrom }) + '[/font]';
+                var senderString = '[font="sans-bold-13"]' + sprintf(translate("* %(sender)s"), { "sender": coloredFrom }) + '[/font]';
                 // Translation: IRC message issued using the ‘/me’ command.
-                var formattedMessage = sprintf(translate("%(sender)s %(action)s"), { sender: senderString, action: message });
+                var formattedMessage = sprintf(translate("%(sender)s %(action)s"), { "sender": senderString, "action": message });
                 break;
             case "say":
                 // Translation: IRC message prefix.
-                var senderString = '[font="sans-bold-13"]' + sprintf(translate("<%(sender)s>"), { sender: coloredFrom }) + '[/font]';
+                var senderString = '[font="sans-bold-13"]' + sprintf(translate("<%(sender)s>"), { "sender": coloredFrom }) + '[/font]';
                 // Translation: IRC message.
-                var formattedMessage = sprintf(translate("%(sender)s %(message)s"), { sender: senderString, message: message });
+                var formattedMessage = sprintf(translate("%(sender)s %(message)s"), { "sender": senderString, "message": message });
                 break
             case "special":
-                if (key === g_specialKey)
+                if (key === g_SpecialKey)
                     // Translation: IRC system message.
-                    var formattedMessage = '[font="sans-bold-13"]' + sprintf(translate("== %(message)s"), { message: message }) + '[/font]';
+                    var formattedMessage = '[font="sans-bold-13"]' + sprintf(translate("== %(message)s"), { "message": message }) + '[/font]';
                 else
                 {
                     // Translation: IRC message prefix.
-                    var senderString = '[font="sans-bold-13"]' + sprintf(translate("<%(sender)s>"), { sender: coloredFrom }) + '[/font]';
+                    var senderString = '[font="sans-bold-13"]' + sprintf(translate("<%(sender)s>"), { "sender": coloredFrom }) + '[/font]';
                     // Translation: IRC message.
-                    var formattedMessage = sprintf(translate("%(sender)s %(message)s"), { sender: senderString, message: message });
+                    var formattedMessage = sprintf(translate("%(sender)s %(message)s"), { "sender": senderString, "message": message });
                 }
                 break;
             default:
                 // This should never happen.
                 var formattedMessage = "";
         }
     }
     else
     {
         // Translation: IRC message prefix.
-        var senderString = '[font="sans-bold-13"]' + sprintf(translate("<%(sender)s>"), { sender: coloredFrom }) + '[/font]';
+        var senderString = '[font="sans-bold-13"]' + sprintf(translate("<%(sender)s>"), { "sender": coloredFrom }) + '[/font]';
         // Translation: IRC message.
-        var formattedMessage = sprintf(translate("%(sender)s %(message)s"), { sender: senderString, message: text });
+        var formattedMessage = sprintf(translate("%(sender)s %(message)s"), { "sender": senderString, "message": text });
     }
 
     // Build time header if enabled
-    if (g_timestamp)
+    if (g_ShowTimestamp)
     {
 
         var time;
         if (datetime)
         {
@@ -991 +1002 @@
         // For a list of symbols that you can use, see:
         // https://sites.google.com/site/icuprojectuserguide/formatparse/datetime?pli=1#TOC-Date-Field-Symbol-Table
         var timeString = Engine.FormatMillisecondsIntoDateString(time.getTime(), translate("HH:mm"));
 
         // Translation: Time prefix as shown in the multiplayer lobby (when you enable it in the options page).
-        var timePrefixString = '[font="sans-bold-13"]' + sprintf(translate("\\[%(time)s]"), { time: timeString }) + '[/font]';
+        var timePrefixString = '[font="sans-bold-13"]' + sprintf(translate("\\[%(time)s]"), { "time": timeString }) + '[/font]';
 
         // Translation: IRC message format when there is a time prefix.
-        return sprintf(translate("%(time)s %(message)s"), { time: timePrefixString, message: formattedMessage });
+        return sprintf(translate("%(time)s %(message)s"), { "time": timePrefixString, "message": formattedMessage });
     }
     else
         return formattedMessage;
 }
 
@@ -1011 +1022 @@
 {
     // Integer time in seconds.
     var time = Math.floor(Date.now() / 1000);
 
     // Update or initialize the user in the spam monitor.
-    if (g_spamMonitor[from])
-        g_spamMonitor[from][0]++;
+    if (g_SpamMonitor[from])
+        ++g_SpamMonitor[from][0];
     else
-        g_spamMonitor[from] = [1, time, 0];
+        g_SpamMonitor[from] = [1, time, 0];
 }
 
 /**
  * Check if a message is spam.
  *
@@ -1030 +1041 @@
 {
     // Integer time in seconds.
     var time = Math.floor(Date.now() / 1000);
 
     // Initialize if not already in the database.
-    if (!g_spamMonitor[from])
-        g_spamMonitor[from] = [1, time, 0];
+    if (!g_SpamMonitor[from])
+        g_SpamMonitor[from] = [1, time, 0];
 
     // Block blank lines.
     if (text == " ")
         return true;
     // Block users who are still within their spam block period.
-    else if (g_spamMonitor[from][2] + SPAM_BLOCK_LENGTH >= time)
+    else if (g_SpamMonitor[from][2] + g_SpamBlockLength >= time)
         return true;
     // Block users who exceed the rate of 1 message per second for five seconds and are not already blocked. TODO: Make this smarter and block profanity.
-    else if (g_spamMonitor[from][0] == 6)
+    else if (g_SpamMonitor[from][0] == 6)
     {
-        g_spamMonitor[from][2] = time;
-        if (from == g_Name)
+        g_SpamMonitor[from][2] = time;
+        if (from == g_Username)
             addChatMessage({ "from": "system", "text": translate("Please do not spam. You have been blocked for thirty seconds.") });
         return true;
     }
     // Return false if everything is clear.
     else
@@ -1061 +1072 @@
 {
     // Integer time in seconds.
     var time = Math.floor(Date.now() / 1000);
 
     // Clear message count every 5 seconds.
-    for each (var stats in g_spamMonitor)
+    for (let i in g_SpamMonitor)
     {
-        if (stats[1] + 5 <= time)
+        if (g_SpamMonitor[i][1] + 5 <= time)
         {
-            stats[1] = time;
-            stats[0] = 0;
+            g_SpamMonitor[i][1] = time;
+            g_SpamMonitor[i][0] = 0;
         }
     }
-
 }
 
 /* Utilities */
-// Generate a (mostly) unique color for this player based on their name.
-// See http://stackoverflow.com/questions/3426404/create-a-hexadecimal-colour-based-on-a-string-with-jquery-javascript
+/**
+ * Generate a (mostly) unique color for this player based on their name.
+ * See http://stackoverflow.com/questions/3426404/create-a-hexadecimal-colour-based-on-a-string-with-jquery-javascript
+ */
 function getPlayerColor(playername)
 {
     // Generate a probably-unique hash for the player name and use that to create a color.
     var hash = 0;
-    for (var i = 0; i < playername.length; i++)
+    for (let i = 0; i < playername.length; ++i)
         hash = playername.charCodeAt(i) + ((hash << 5) - hash);
 
     // First create the color in RGB then HSL, clamp the lightness so it's not too dark to read, and then convert back to RGB to display.
     // The reason for this roundabout method is this algorithm can generate values from 0 to 255 for RGB but only 0 to 100 for HSL; this gives
     // us much more variety if we generate in RGB. Unfortunately, enforcing that RGB values are a certain lightness is very difficult, so
@@ -1094 +1106 @@
 
 function repeatString(times, string) {
     return Array(times + 1).join(string);
 }
 
-// Some names are special and should always appear in certain colors.
-var fixedColors = { "system": repeatString(7, "255.0.0."), "@WFGbot": repeatString(7, "255.24.24."),
-                    "pyrogenesis": repeatString(2, "97.0.0.") + repeatString(2, "124.0.0.") + "138.0.0." +
-                        repeatString(2, "174.0.0.") + repeatString(2, "229.40.0.") + repeatString(2, "243.125.15.") };
 function colorPlayerName(playername)
 {
-    var color = fixedColors[playername];
-    if (color) {
-    color = color.split(".");
-    return ('[color="' + playername.split("").map(function (c, i) color.slice(i * 3, i * 3 + 3).join(" ") + '"]' + c + '[/color][color="')
-                .join("") + '"]').slice(0, -10);
+    var color = g_FixedColors[playername];
+    if (color)
+    {
+        color = color.split(".");
+        return ('[color="' + playername.split("").map((c, i) => color.slice(i * 3, i * 3 + 3).join(" ") + '"]' + c + '[/color][color="')
+            .join("") + '"]').slice(0, -10);
     }
-    return '[color="' + getPlayerColor(playername.replace(g_modPrefix, "")) + '"]' + playername + '[/color]';
+    return '[color="' + getPlayerColor(playername.replace(g_ModPrefix, "")) + '"]' + playername + '[/color]';
 }
 
-// Ensure `value` is between 0 and 1.
+/**
+ * Ensure `value` is between 0 and 1.
+ */
 function clampColorValue(value)
 {
     return Math.abs(1 - Math.abs(value - 1));
 }
 
-// See http://stackoverflow.com/questions/2353211/hsl-to-rgb-color-conversion
+/**
+ * See http://stackoverflow.com/questions/2353211/hsl-to-rgb-color-conversion
+ */
 function rgbToHsl(r, g, b)
 {
     r /= 255;
     g /= 255;
     b /= 255;
@@ -1167 +1180 @@
         r = hue2rgb(p, q, h + 1/3);
         g = hue2rgb(p, q, h);
         b = hue2rgb(p, q, h - 1/3);
     }
 
-    return [r, g, b].map(function (n) Math.round(n * 255));
+    return [r, g, b].map(n => Math.round(n * 255));
 }
-
-(function () {
-function hexToRgb(hex) {
-    return parseInt(hex.slice(0, 2), 16) + "." + parseInt(hex.slice(2, 4), 16) + "." + parseInt(hex.slice(4, 6), 16) + ".";
-}
-function r(times, hex) {
-    return repeatString(times, hexToRgb(hex));
-}
-
-fixedColors["Twilight_Sparkle"] = r(2, "d19fe3") + r(2, "b689c8") + r(2, "a76bc2") +
-    r(4, "263773") + r(2, "131f46") + r(2, "662d8a") + r(2, "ed438a");
-fixedColors["Applejack"] = r(3, "ffc261") + r(3, "efb05d") + r(3, "f26f31");
-fixedColors["Rarity"] = r(1, "ebeff1") + r(1, "dee3e4") + r(1, "bec2c3") +
-    r(1, "83509f") + r(1, "4b2568") + r(1, "4917d6");
-fixedColors["Rainbow_Dash"] = r(2, "ee4144") + r(1, "f37033") + r(1, "fdf6af") +
-    r(1, "62bc4d") + r(1, "1e98d3") + r(2, "672f89") + r(1, "9edbf9") +
-    r(1, "88c4eb") + r(1, "77b0e0") + r(1, "1e98d3");
-fixedColors["Pinkie_Pie"] = r(2, "f3b6cf") + r(2, "ec9dc4") + r(4, "eb81b4") +
-    r(1, "ed458b") + r(1, "be1d77");
-fixedColors["Fluttershy"] = r(2, "fdf6af") + r(2, "fee78f") + r(2, "ead463") +
-    r(2, "f3b6cf") + r(2, "eb81b4");
-fixedColors["Sweetie_Belle"] = r(2, "efedee") + r(3, "e2dee3") + r(3, "cfc8d1") +
-    r(2, "b28dc0") + r(2, "f6b8d2") + r(1, "795b8a");
-fixedColors["Apple_Bloom"] = r(2, "f4f49b") + r(2, "e7e793") + r(2, "dac582") +
-    r(2, "f46091") + r(2, "f8415f") + r(1, "c52451");
-fixedColors["Scootaloo"] = r(2, "fbba64") + r(2, "f2ab56") + r(2, "f37003") +
-    r(2, "bf5d95") + r(1, "bf1f79");
-fixedColors["Luna"] = r(1, "7ca7fa") + r(1, "5d6fc1") + r(1, "656cb9") + r(1, "393993");
-fixedColors["Celestia"] = r(1, "fdfafc") + r(1, "f7eaf2") + r(1, "d99ec5") +
-    r(1, "00aec5") + r(1, "f7c6dc") + r(1, "98d9ef") + r(1, "ced7ed") + r(1, "fed17b");
-})();

binaries/data/mods/public/gui/lobby/lobby.xml

@@ -161 +161 @@
                 </action>
             </object>
 
             <object type="button" style="ModernButtonRed" size="0 100%-25 100% 100%">
                 <translatableAttribute id="caption">Main Menu</translatableAttribute>
-                <action on="Press">
-                    lobbyStop();
-                    Engine.SwitchGuiPage("page_pregame.xml");
-                </action>
+                <action on="Press">returnToMainMenu();</action>
             </object>
         </object>
 
         <!-- Middle panel: Filters, game list, chat box. -->
         <object name="middlePanel" size="20%+5 5% 100%-255 97.2%">

binaries/data/mods/public/gui/session/messages.js

@@ -366 +366 @@
         return;
 
     if (Engine.GetGUIObjectByName("toggleTeamChat").checked)
         text = "/team " + text;
 
-    if (g_IsNetworked)
-        Engine.SendNetworkChat(text);
-    else
-        addChatMessage({ "type": "message", "guid": "local", "text": text });
+    submitChatDirectly(text);
 }
 
 function addChatMessage(msg)
 {
     var playerColor, username;