Ticket #4315: 4315-lobby-kick-v1.patch

binaries/data/mods/public/gui/credits/texts/programming.json

@@ -176 +176 @@
             {"nick": "Sandarac"},
             {"nick": "sanderd17", "name": "Sander Deryckere"},
             {"nick": "sathyam", "name": "Sathyam Vellal"},
+            {"nick": "sbirmi", "name": "Sharad Birmiwal"},
             {"nick": "sbte", "name": "Sven Baars"},
             {"nick": "scroogie", "name": "André Gemünd"},
             {"nick": "scythetwirler", "name": "Casey X."},

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

@@ -156 +156 @@
                 }),
                 "isSpecial": true
             });
+            // I am getting kicked
+            if (msg.text == g_Username) {
+                warn("Got disconnected from the lobby");
+                returnToMainMenu();
+            }
+            return {'kicked': true};
         },
         "presence": msg => {
         },
@@ -728 +734 @@
 }
 
 /**
+ * Parse the result of g_NetMessageTypes's response (if any).
+ *
+ * @param {Object} result - the response from netMessageResultAttr
+ * @param {string} attr - the attribute in the response
+ * @param {any} defaultValue - default value to return if attribute
+ *                           is not found in the response
+ */
+function netMessageResultAttr(result, attr, defaultValue)
+{
+    if (result === undefined)
+        return defaultValue;
+    if (result.hasOwnProperty(attr))
+        return result[attr];
+    return defaultValue;
+}
+
+/**
  * Processes GUI messages sent by the XmppClient.
  */
 function onTick()
@@ -751 +774 @@
             warn("Unrecognised message level: " + msg.level);
             continue;
         }
-        g_NetMessageTypes[msg.type][msg.level](msg);
+        let result = g_NetMessageTypes[msg.type][msg.level](msg);
 
         // To improve performance, only update the playerlist GUI when
         // the last update in the current stack is processed
-        if (msg.type == "chat" && Engine.LobbyGetMucMessageCount() == 0)
+        if (msg.type == "chat" && Engine.LobbyGetMucMessageCount() == 0 &&
+            netMessageResultAttr(result, "kicked", false) == false)
             updatePlayerList();
     }
 }