Ticket #3171: t3171_clear_muc_messages_v1.patch

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

@@ -153 +153 @@
  *
  * @return Array containing the player, presence, nickname, and rating listings.
  */
 function updatePlayerList()
 {
+
+    Engine.ClearMucMessages();
     var playersBox = Engine.GetGUIObjectByName("playersBox");
     var playerList = [];
     var presenceList = [];
     var nickList = [];
     var ratingList = [];

source/lobby/IXmppClient.h

@@ -52 +52 @@
     virtual void GUIGetGameList(ScriptInterface& scriptInterface, JS::MutableHandleValue ret) = 0;
     virtual void GUIGetBoardList(ScriptInterface& scriptInterface, JS::MutableHandleValue ret) = 0;
     virtual void GUIGetProfile(ScriptInterface& scriptInterface, JS::MutableHandleValue ret) = 0;
 
     virtual void GuiPollMessage(ScriptInterface& scriptInterface, JS::MutableHandleValue ret) = 0;
+    virtual void ClearMucMessages() = 0;
     virtual void SendMUCMessage(const std::string& message) = 0;
 };
 
 extern IXmppClient *g_XmppClient;
 extern bool g_rankedGame;

source/lobby/XmppClient.cpp

@@ -620 +620 @@
 
     m_GuiMessageQueue.pop_front();
 }
 
 /**
+ * Clear the GUI message queue.
+ */
+void XmppClient::ClearMucMessages()
+{
+    // TODO: use mutex lock here?
+    bool clean;
+    do
+    {
+        clean = true;
+        for (std::deque<GUIMessage>::iterator it = m_GuiMessageQueue.begin(); it!=m_GuiMessageQueue.end(); ++it)
+        {
+            GUIMessage message = *it;
+            if (message.type == L"muc")
+            {
+                debug_printf("Deleting muc message \n");
+                m_GuiMessageQueue.erase(it);
+                clean = false;
+                break;
+            }
+        }
+    } while (!clean);
+}
+
+/**
  * Send a standard MUC textual message.
  */
 void XmppClient::SendMUCMessage(const std::string& message)
 {
     m_mucRoom->send(message);

source/lobby/XmppClient.h

@@ -132 +132 @@
         std::wstring from;
         std::wstring message;
         std::string datetime;
     };
     void GuiPollMessage(ScriptInterface& scriptInterface, JS::MutableHandleValue ret);
+    void ClearMucMessages();
     void SendMUCMessage(const std::string& message);
     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 = "");
 

source/lobby/scripting/JSInterface_Lobby.cpp

@@ -49 +49 @@
     scriptInterface.RegisterFunction<JS::Value, &JSI_Lobby::GetPlayerList>("GetPlayerList");
     scriptInterface.RegisterFunction<JS::Value, &JSI_Lobby::GetGameList>("GetGameList");
     scriptInterface.RegisterFunction<JS::Value, &JSI_Lobby::GetBoardList>("GetBoardList");
     scriptInterface.RegisterFunction<JS::Value, &JSI_Lobby::GetProfile>("GetProfile");
     scriptInterface.RegisterFunction<JS::Value, &JSI_Lobby::LobbyGuiPollMessage>("LobbyGuiPollMessage");
+    scriptInterface.RegisterFunction<void, &JSI_Lobby::ClearMucMessages>("ClearMucMessages");
     scriptInterface.RegisterFunction<void, std::wstring, &JSI_Lobby::LobbySendMessage>("LobbySendMessage");
     scriptInterface.RegisterFunction<void, std::wstring, &JSI_Lobby::LobbySetPlayerPresence>("LobbySetPlayerPresence");
     scriptInterface.RegisterFunction<void, std::wstring, &JSI_Lobby::LobbySetNick>("LobbySetNick");
     scriptInterface.RegisterFunction<std::wstring, &JSI_Lobby::LobbyGetNick>("LobbyGetNick");
     scriptInterface.RegisterFunction<void, std::wstring, std::wstring, &JSI_Lobby::LobbyKick>("LobbyKick");
@@ -243 +244 @@
     g_XmppClient->GuiPollMessage(*(pCxPrivate->pScriptInterface), &poll);
 
     return poll;
 }
 
+void JSI_Lobby::ClearMucMessages(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
+{
+    if (g_XmppClient)
+        g_XmppClient->ClearMucMessages();
+}
+
 void JSI_Lobby::LobbySendMessage(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), std::wstring message)
 {
     if (!g_XmppClient)
         return;
         

source/lobby/scripting/JSInterface_Lobby.h

@@ -47 +47 @@
     JS::Value GetPlayerList(ScriptInterface::CxPrivate* pCxPrivate);
     JS::Value GetGameList(ScriptInterface::CxPrivate* pCxPrivate);
     JS::Value GetBoardList(ScriptInterface::CxPrivate* pCxPrivate);
     JS::Value GetProfile(ScriptInterface::CxPrivate* pCxPrivate);
     JS::Value LobbyGuiPollMessage(ScriptInterface::CxPrivate* pCxPrivate);
+    void ClearMucMessages(ScriptInterface::CxPrivate* pCxPrivate);
     void LobbySendMessage(ScriptInterface::CxPrivate* pCxPrivate, std::wstring message);
     void LobbySetPlayerPresence(ScriptInterface::CxPrivate* pCxPrivate, std::wstring presence);
     void LobbySetNick(ScriptInterface::CxPrivate* pCxPrivate, std::wstring nick);
     std::wstring LobbyGetNick(ScriptInterface::CxPrivate* pCxPrivate);
     void LobbyKick(ScriptInterface::CxPrivate* pCxPrivate, std::wstring nick, std::wstring reason);