fixes #4672 (Highlighting: При автооткрытии вкладки в табсах по обнаружению хайлайтнутых сообщений в групчате открывается не то)

2 files changed, 8 insertions, 4 deletions

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);