From b059dd52f5aa48b108eb33874194ab96e40785dc Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 15 Sep 2024 19:51:38 +0300
Subject: =?UTF-8?q?fixes=20#4672=20(Highlighting:=20=D0=9F=D1=80=D0=B8=20?=
 =?UTF-8?q?=D0=B0=D0=B2=D1=82=D0=BE=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=B2=20=D1=82=D0=B0=D0=B1=D1=81=D0=B0=D1=85=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=B0=D1=80=D1=83=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8E=20=D1=85=D0=B0=D0=B9=D0=BB=D0=B0=D0=B9=D1=82=D0=BD=D1=83?=
 =?UTF-8?q?=D1=82=D1=8B=D1=85=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B9=20=D0=B2=20=D0=B3=D1=80=D1=83=D0=BF=D1=87=D0=B0?=
 =?UTF-8?q?=D1=82=D0=B5=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D0=B2=D0=B0=D0=B5?=
 =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D0=BD=D0=B5=20=D1=82=D0=BE)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protocols/SkypeWeb/src/skype_chatrooms.cpp | 4 ++++
 protocols/SkypeWeb/src/skype_messages.cpp  | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'protocols')

diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp
index 0a64587ece..d9e94c9f11 100644
--- a/protocols/SkypeWeb/src/skype_chatrooms.cpp
+++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp
@@ -320,6 +320,10 @@ bool CSkypeProto::OnChatEvent(const JSONNode &node)
 		return true;
 	}
 
+	// some slack, let's drop it
+	if (messageType == "ThreadActivity/HistoryDisclosedUpdate" || messageType == "ThreadActivity/JoiningEnabledUpdate")
+		return true;
+
 	return false;
 }
 
diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp
index 76b2e772d7..ab57bf7b93 100644
--- a/protocols/SkypeWeb/src/skype_messages.cpp
+++ b/protocols/SkypeWeb/src/skype_messages.cpp
@@ -160,6 +160,10 @@ void CSkypeProto::ProcessNewMessage(const JSONNode &node)
 	CMStringA szConversationName(UrlToSkypeId(node["conversationLink"].as_string().c_str()));
 	CMStringA szFromSkypename(UrlToSkypeId(node["from"].as_mstring()));
 
+	if (iUserType == 19)
+		if (OnChatEvent(node))
+			return;
+
 	MCONTACT hContact = AddContact(szConversationName, nullptr, true);
 
 	if (m_bHistorySynced) {
@@ -168,10 +172,6 @@ void CSkypeProto::ProcessNewMessage(const JSONNode &node)
 			setLastTime(hContact, lastMsgId);
 	}
 
-	if (iUserType == 19)
-		if (OnChatEvent(node))
-			return;
-
 	std::string strMessageType = node["messagetype"].as_string();
 	if (strMessageType == "Control/Typing") {
 		CallService(MS_PROTO_CONTACTISTYPING, hContact, 30);
-- 
cgit v1.2.3