From 239ea74ddedb7d3483d08cd599647edcbe4ab9c4 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 6 Sep 2024 15:05:26 +0300
Subject: =?UTF-8?q?fixes=20#4621=20(SkypeWeb:=20=D0=95=D1=81=D0=BB=D0=B8?=
 =?UTF-8?q?=20=D1=8F=20=D0=BF=D0=B8=D1=88=D1=83=20=D1=87=D1=82=D0=BE-?=
 =?UTF-8?q?=D1=82=D0=BE=20=D1=81=20=D0=B4=D1=80=D1=83=D0=B3=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D1=83=D1=81=D1=82=D1=80=D0=BE=D0=B9=D1=81=D1=82=D0=B2?=
 =?UTF-8?q?=D0=B0,=20=D0=B8=20=D0=BF=D0=BE=D1=82=D0=BE=D0=BC=20=D1=83?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D1=8F=D1=8E,=20=D0=B2=20=D0=BC=D0=B8=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B4=D0=B5=20=D0=BE=D1=81=D1=82=D0=B0=D1=8E=D1=82?=
 =?UTF-8?q?=D1=81=D1=8F=20=D0=BD=D0=B5=D0=BA=D0=B8=D0=B5=20=D0=BE=D1=81?=
 =?UTF-8?q?=D0=BA=D1=80=D0=BE=D0=BF=D0=BE=D1=82=D0=BA=D0=B8=20=D0=BE=D1=82?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=BE=D1=88=D0=B5=D0=B4=D1=88?=
 =?UTF-8?q?=D0=B5=D0=B3=D0=BE)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protocols/SkypeWeb/src/skype_messages.cpp | 10 +++++++++-
 protocols/SkypeWeb/src/skype_polling.cpp  | 21 +++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp
index 297439305d..db01c0308e 100644
--- a/protocols/SkypeWeb/src/skype_messages.cpp
+++ b/protocols/SkypeWeb/src/skype_messages.cpp
@@ -90,7 +90,15 @@ int CSkypeProto::OnPreCreateMessage(WPARAM, LPARAM lParam)
 bool CSkypeProto::ParseMessage(const JSONNode &node, DB::EventInfo &dbei)
 {
 	int nEmoteOffset = node["skypeemoteoffset"].as_int();
-	CMStringW wszContent = node["content"].as_mstring();
+
+	auto &pContent = node["content"];
+	if (!pContent) {
+		if (dbei)
+			db_event_delete(dbei.getEvent());
+		return false;
+	}
+	
+	CMStringW wszContent = pContent.as_mstring();
 
 	std::string strMessageType = node["messagetype"].as_string();
 	if (strMessageType == "RichText/Media_GenericFile" || strMessageType == "RichText/Media_Video" || strMessageType == "RichText/UriObject" ) {
diff --git a/protocols/SkypeWeb/src/skype_polling.cpp b/protocols/SkypeWeb/src/skype_polling.cpp
index 20b65abd60..5303c5d190 100644
--- a/protocols/SkypeWeb/src/skype_polling.cpp
+++ b/protocols/SkypeWeb/src/skype_polling.cpp
@@ -70,25 +70,19 @@ void CSkypeProto::ParsePollData(const char *szData)
 		if (eventId > m_iPollingId)
 			m_iPollingId = eventId;
 
-		const JSONNode &resType = message["resourceType"];
 		const JSONNode &resource = message["resource"];
 
-		std::string resourceType = resType.as_string();
-		if (resourceType == "NewMessage") {
+		std::string resourceType = message["resourceType"].as_string();
+		if (resourceType == "NewMessage")
 			ProcessNewMessage(resource);
-		}
-		else if (resourceType == "UserPresence") {
+		else if (resourceType == "UserPresence")
 			ProcessUserPresence(resource);
-		}
-		else if (resourceType == "EndpointPresence") {
+		else if (resourceType == "EndpointPresence")
 			ProcessEndpointPresence(resource);
-		}
-		else if (resourceType == "ConversationUpdate") {
+		else if (resourceType == "ConversationUpdate")
 			ProcessConversationUpdate(resource);
-		}
-		else if (resourceType == "ThreadUpdate") {
+		else if (resourceType == "ThreadUpdate")
 			ProcessThreadUpdate(resource);
-		}
 	}
 }
 
@@ -149,9 +143,8 @@ void CSkypeProto::ProcessEndpointPresence(const JSONNode &node)
 	
 	if (privateInfo != NULL) {
 		std::string epname = privateInfo["epname"].as_string();
-		if (!epname.empty()) {
+		if (!epname.empty())
 			MirVer.AppendFormat(" [%s]", epname.c_str());
-		}
 	}
 	
 	setString(hContact, "MirVer", MirVer);
-- 
cgit v1.2.3