From 56c7bc9d6a52dd7095405d2bcf9fca5473a464c3 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Tue, 7 Mar 2017 12:08:07 +0100
Subject: Do not highlight in own room join system messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test-Information:

Tested by joining a MUC room and verified that the
‘You have entered room foo as bar.’ message does not contain
any highlights.

Tested on macOS 10.12.3 with Qt 5.5.1.

Change-Id: Ib830d081e74c4289be4bb1469bf005a2e4c4e298

diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index 545eab5..b673bfd 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -386,7 +386,7 @@ void MUCController::handleJoinComplete(const std::string& nick) {
         joinMessage = str(format(QT_TRANSLATE_NOOP("", "You have entered room %1% as %2%.")) % toJID_.toString() % nick);
     }
     setNick(nick);
-    chatWindow_->replaceSystemMessage(chatMessageParser_->parseMessageBody(joinMessage), lastJoinMessageUID_, ChatWindow::UpdateTimestamp);
+    chatWindow_->replaceSystemMessage(chatMessageParser_->parseMessageBody(joinMessage, "", true), lastJoinMessageUID_, ChatWindow::UpdateTimestamp);
     lastJoinMessageUID_ = "";
 
 #ifdef SWIFT_EXPERIMENTAL_HISTORY
-- 
cgit v0.10.2-6-g49f6