Ticket #3865: PM.patch

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

@@ -64 +64 @@
 const g_SystemColor = "150 0 0";
 
 /**
+ * Color for private messages in the chat.
+ */
+const g_PrivateMessageColor = "0 150 0";
+
+/**
  * Used for highlighting the sender of chat messages.
  */
 const g_SenderFont = "sans-bold-13";
@@ -160 +165 @@
         "private-message": msg => {
             if (Engine.LobbyGetPlayerRole(msg.from) == "moderator")
                 addChatMessage({
-                    "from": "(Private) " + escapeText(msg.from), // TODO: placeholder
+                    "from": escapeText(msg.from),
                     "text": escapeText(msg.text.trim()), // some XMPP clients send trailing whitespace
-                    "datetime": msg.datetime
+                    "datetime": msg.datetime,
+                    "private" : true
                 });
         }
     },
@@ -875 +881 @@
     else
     {
         // Translation: IRC message prefix.
-        senderString = '[font="' + g_SenderFont + '"]' + sprintf(translate("<%(sender)s>"), { "sender": coloredFrom }) + '[/font]';
+        if (msg.private)
+            senderString = sprintf(translateWithContext("lobby private message", "(%(whisper)s) <%(sender)s>"), {
+                "whisper": '[color="' + g_PrivateMessageColor + '"]' + translate("Received Whisper")  + '[/color]',
+                "sender": coloredFrom
+            });
+        else
+            senderString = sprintf(translate("<%(sender)s>"), { "sender": coloredFrom });
+        senderString = '[font="' + g_SenderFont + '"]' + senderString + '[/font]';
         // Translation: IRC message.
         formattedMessage = sprintf(translate("%(sender)s %(message)s"), { "sender": senderString, "message": msg.text });
     }

source/lobby/XmppClient.cpp

@@ -646 +646 @@
 /**
  * Handle a room message.
  */
-void XmppClient::handleMUCMessage(glooxwrapper::MUCRoom*, const glooxwrapper::Message& msg, bool)
+void XmppClient::handleMUCMessage(glooxwrapper::MUCRoom*, const glooxwrapper::Message& msg, bool priv)
 {
     DbgXMPP(msg.from().resource() << " said " << msg.body());
 
     GUIMessage message;
     message.type = L"chat";
-    message.level = L"room-message";
+    message.level = priv ? L"private-message" : L"room-message";
     message.from = wstring_from_utf8(msg.from().resource().to_string());
     message.text = wstring_from_utf8(msg.body().to_string());
     if (msg.when())