Ticket #3388: t3388_fix_initial_playerlist_v2.diff

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

@@ -41 +41 @@
 
     var mapTypeFilter = Engine.GetGUIObjectByName("mapTypeFilter");
     mapTypeFilter.list = [translateWithContext("map", "Any")].concat(g_mapTypesText);
     mapTypeFilter.list_data = [""].concat(g_mapTypes);
 
+    // The initial list is loaded on "join-completed".
+    // This call is only needed to init the list when we return from a match.
+    updatePlayerList();
+
     Engine.LobbySetPlayerPresence("available");
     Engine.SendGetGameList();
     Engine.SendGetBoardList();
-    updatePlayerList();
     updateSubject(Engine.LobbyGetRoomSubject());
 
     resetFilters();
 }
 
@@ -762 +765 @@
                     updateLeaderboard();
                     updatePlayerList();
                     // Disable the 'host' button
                     Engine.GetGUIObjectByName("hostButton").enabled = false;
                 }
-                else if (message.text == "connected")
-                {
-                    Engine.GetGUIObjectByName("hostButton").enabled = true;
-                }
+                // else if (message.text == "connected") // currently we don't attempt to rejoin
                 break;
             case "error":
                 addChatMessage({ "from": "system", "text": text, "color": "150 0 0" });
                 break;
             case "internal":
                 switch (message.text)
                 {
+                case "join-completed":
+                    // We finished downloading the playerlist after connecting
+                    updatePlayerList();
+                    break;
                 case "gamelist updated":
                     updateGameList();
                     break;
                 case "boardlist updated":
                     updateLeaderboard();

source/lobby/XmppClient.cpp

@@ -801 +801 @@
         DbgXMPP(nick << " left the room");
         m_PlayerMap.erase(nick);
     }
     else
     {
-        /* During the initialization process, we recieve join messages for everyone
-         * currently in the room. We don't want to display these, so we filter them
-         * out. We will always be the last to join during initialization.
-         */
-        if (!m_initialLoadComplete)
+        // Send user join/leave events after we joined
+        if (m_initialLoadComplete)
         {
-            if (m_mucRoom->nick().to_string() == nick)
-                m_initialLoadComplete = true;
+            if (m_PlayerMap.find(nick) == m_PlayerMap.end())
+                CreateSimpleMessage("muc", nick, "join");
+            else
+                CreateSimpleMessage("muc", nick, "presence");
+        }
+        else if (m_mucRoom->nick().to_string() == nick)
+        {
+            m_initialLoadComplete = true;
+            CreateSimpleMessage("system", "join-completed", "internal");
         }
-        else if (m_PlayerMap.find(nick) == m_PlayerMap.end())
-            CreateSimpleMessage("muc", nick, "join");
-        else
-            CreateSimpleMessage("muc", nick, "presence");
 
         DbgXMPP(nick << " is in the room, presence : " << (int)presenceType);
         m_PlayerMap[nick].resize(3);
         m_PlayerMap[nick][0] = presenceString;
         m_PlayerMap[nick][2] = roleString;