Ticket #3171: t3171_clear_muc_messages_v6_16795.patch

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

@@ -12 +12 @@
 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 = "@";
-var g_joined = false;
 // Block spammers for 30 seconds.
 var SPAM_BLOCK_LENGTH = 30;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -697 +696 @@
             var ratingList = playersBox.list_rating;
             var nickIndex = nickList.indexOf(nick);
             switch(message.level)
             {
             case "join":
-                if (nick == g_Name)
-                {
-                    // We just joined, we need to get the full player list
-                    [playerList, presenceList, nickList, ratingList] = updatePlayerList();
-                    // Don't display any joins until our join request bounces back
-                    // Our join message should be the last one as we just got added to the stack
-                    g_joined = true;
-                    break;
-                }
-                else if (g_joined)
-                {
-                    var [name, status, rating] = formatPlayerListEntry(nick, presence, "-");
-                    playerList.push(name);
-                    presenceList.push(status);
-                    nickList.push(nick);
-                    ratingList.push(String(rating));
-                    Engine.SendGetRatingList();
-                    addChatMessage({ "text": "/special " + sprintf(translate("%(nick)s has joined."), { nick: nick }), "key": g_specialKey });
-                }
+                var [name, status, rating] = formatPlayerListEntry(nick, presence, "-");
+                playerList.push(name);
+                presenceList.push(status);
+                nickList.push(nick);
+                ratingList.push(String(rating));
+                Engine.SendGetRatingList();
+                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);

source/lobby/XmppClient.cpp

@@ -77 +77 @@
 
     m_xpartamuppId = sXpartamupp + "@" + sServer + "/CC";
     glooxwrapper::JID clientJid(sUsername + "@" + sServer + "/0ad");
     glooxwrapper::JID roomJid(sRoom + "@conference." + sServer + "/" + sNick);
 
+    m_bouncedBack = false;
+
     // If we are connecting, use the full jid and a password
     // If we are registering, only use the server name
     if(!regOpt)
         m_client = new glooxwrapper::Client(clientJid, sPassword);
     else
@@ -492 +494 @@
  *
  * @return A JS array containing all known players and their presences
  */
 void XmppClient::GUIGetPlayerList(ScriptInterface& scriptInterface, JS::MutableHandleValue ret)
 {
+    // Clear outdated presence updates
+    std::remove_if(m_GuiMessageQueue.begin(), m_GuiMessageQueue.end(),
+        [](XmppClient::GUIMessage& message)
+        {
+            return message.type == L"muc";
+        }
+    );
+
     JSContext* cx = scriptInterface.GetContext();
     JSAutoRequest rq(cx);
     
     scriptInterface.Eval("([])", ret);
 
@@ -800 +810 @@
         m_PlayerMap.erase(nick);
     }
     else
     {
         if (m_PlayerMap.find(nick) == m_PlayerMap.end())
-            CreateSimpleMessage("muc", nick, "join");
+        {
+            if (nick == m_mucRoom->nick().to_string())
+                m_bouncedBack = true;
+
+            // Don't display any joins until our join request bounces back
+            if (m_bouncedBack)
+                CreateSimpleMessage("muc", nick, "join");
+        }
         else
             CreateSimpleMessage("muc", nick, "presence");
 
         DbgXMPP(nick << " is in the room, presence : " << (int)presenceType);
         m_PlayerMap[nick].resize(3);

source/lobby/XmppClient.h

@@ -138 +138 @@
     protected:
     void PushGuiMessage(XmppClient::GUIMessage message);
     void CreateSimpleMessage(const std::string& type, const std::string& text, const std::string& level = "standard", const std::string& data = "");
 
 private:
+    // Whether or not we have successfully joined the lobby
+    bool m_bouncedBack;
     /// Map of players
     std::map<std::string, std::vector<std::string> > m_PlayerMap;
     /// List of games
     std::vector<const glooxwrapper::Tag*> m_GameList;
     /// List of rankings