diff options
| author | George Hazan <ghazan@miranda.im> | 2019-10-30 13:53:33 +0300 | 
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-10-30 13:53:33 +0300 | 
| commit | 2c474ad20324f19ad309d865f5aea7a51a1f2ef6 (patch) | |
| tree | 540840013705b34feb299ef1268f2e7a3b0eb61d /protocols | |
| parent | 056db6107760b969763de10dc1058c5558581a1f (diff) | |
fixes #2096 (SkypeWeb: Unknown event)
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_events.cpp | 5 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_history_sync.cpp | 3 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_messages.cpp | 5 | 
3 files changed, 10 insertions, 3 deletions
diff --git a/protocols/SkypeWeb/src/skype_events.cpp b/protocols/SkypeWeb/src/skype_events.cpp index 2b96c87208..1b4bcff040 100644 --- a/protocols/SkypeWeb/src/skype_events.cpp +++ b/protocols/SkypeWeb/src/skype_events.cpp @@ -100,9 +100,12 @@ INT_PTR CSkypeProto::GetEventText(WPARAM pEvent, LPARAM datatype)  				break;
  			szText.Empty();
 -			if (auto *pRoot = doc.FirstChildElement("URIObject"))
 +			if (auto *pRoot = doc.FirstChildElement("URIObject")) {
  				if (auto *xmlA = pRoot->FirstChildElement("a"))
  					szText += xmlA->Attribute("href");
 +				if (auto *xmlThumb = pRoot->Attribute("url_thumbnail"))
 +					szText.AppendFormat("\r\n%s: %s", TranslateU("Preview"), xmlThumb);
 +			}
  		}
  		break;
 diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp index d8d43e1bcc..a1f4fe24ec 100644 --- a/protocols/SkypeWeb/src/skype_history_sync.cpp +++ b/protocols/SkypeWeb/src/skype_history_sync.cpp @@ -88,6 +88,9 @@ void CSkypeProto::OnGetServerHistory(const NETLIBHTTPREQUEST *response)  			else if (messageType == "RichText/Contacts") {
  				ProcessContactRecv(hContact, timestamp, content.c_str(), szMessageId);
  			}
 +			else if (messageType == "RichText/Media_Album") {
 +				// do nothing
 +			}
  			else {
  				AddDbEvent(SKYPE_DB_EVENT_TYPE_UNKNOWN, hContact, timestamp, iFlags, content.c_str(), szMessageId);
  			}
 diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp index 565f4e1153..5a6a7cc5c4 100644 --- a/protocols/SkypeWeb/src/skype_messages.cpp +++ b/protocols/SkypeWeb/src/skype_messages.cpp @@ -169,8 +169,9 @@ void CSkypeProto::OnPrivateMessageEvent(const JSONNode &node)  	else if (strMessageType == "RichText/Media_GenericFile") {
  		AddDbEvent(SKYPE_DB_EVENT_TYPE_FILE, hContact, timestamp, DBEF_UTF, strContent.c_str(), szMessageId);
  	}
 -	//else if (messageType == "Event/SkypeVideoMessage") {}
 -	//else if (messageType.c_str() == "RichText/Location") {}
 +	else if (strMessageType == "RichText/Media_Album") {
 +		// do nothing
 +	}
  	else {
  		AddDbEvent(SKYPE_DB_EVENT_TYPE_UNKNOWN, hContact, timestamp, DBEF_UTF, strContent.c_str(), szMessageId);
  	}
  | 
