From 8b698e0dc0e6f2da349d0330a9f8f5ec3ab75ddf Mon Sep 17 00:00:00 2001
From: ElzorFox <elzorfox@ya.ru>
Date: Wed, 14 Oct 2020 09:45:18 +0500
Subject: VKontakte: add wall_reply attachments support show text for unknow
 attachment types version bump

---
 protocols/VKontakte/src/misc.cpp  | 44 ++++++++++++++++++++++++++++++++++++++-
 protocols/VKontakte/src/version.h |  2 +-
 2 files changed, 44 insertions(+), 2 deletions(-)

(limited to 'protocols/VKontakte')

diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index 963916354c..7ee98d0c46 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -1227,6 +1227,43 @@ CMStringW CVkProto::GetAttachmentDescr(const JSONNode &jnAttachments, BBCSupport
 				res += L"\n\t" + wszAttachmentDescr;
 			}
 		}
+		else if (wszType == L"wall_reply") {
+			const JSONNode& jnWallReply = jnAttach["wall_reply"];
+			if (!jnWallReply)
+				continue;
+
+			CMStringW wszText(jnWallReply["text"].as_mstring());
+			int iWallReplyId = jnWallReply["id"].as_int();
+			int iFromId = jnWallReply["from_id"].as_int();
+			int iFromOwnerId = jnWallReply["owner_id"].as_int();
+			int iPostOwnerId = jnWallReply["post_id"].as_int();
+			int iThreadId = jnWallReply["reply_to_comment"].as_int();
+
+			CMStringW wszUrl(FORMAT, L"https://vk.com/wall%d_%d?reply=%d&thread=%d", iFromOwnerId, iPostOwnerId, iWallReplyId, iThreadId);
+
+			CMStringW wszFromNick, wszFromUrl;
+			MCONTACT hFromContact = FindUser(iFromId);
+			if (hFromContact || iFromId == m_msgId)
+				wszFromNick = ptrW(db_get_wsa(hFromContact, m_szModuleName, "Nick"));
+			else
+				wszFromNick = TranslateT("(Unknown contact)");
+			wszFromUrl = UserProfileUrl(iFromId);
+
+			res.AppendFormat(L"%s %s %s: %s",
+				SetBBCString(TranslateT("Wall reply"), iBBC, vkbbcUrl, wszUrl).c_str(),
+				TranslateT("from"),
+				SetBBCString(wszFromNick, iBBC, vkbbcUrl, wszFromUrl).c_str(),
+				wszText.IsEmpty() ? L" " : wszText.c_str());
+
+			const JSONNode& jnSubAttachments = jnWallReply["attachments"];
+			if (jnSubAttachments) {
+				debugLogA("CVkProto::GetAttachmentDescr SubAttachments");
+				CMStringW wszAttachmentDescr = GetAttachmentDescr(jnSubAttachments, iBBC);
+				wszAttachmentDescr.Replace(L"\n", L"\n\t");
+				wszAttachmentDescr.Replace(L"== FilterAudioMessages ==", L"");
+				res += L"\n\t" + wszAttachmentDescr;
+			}
+		}
 		else if (wszType == L"story") {
 			const JSONNode& jnStory = jnAttach["story"];
 			if (!jnStory)
@@ -1404,8 +1441,13 @@ CMStringW CVkProto::GetAttachmentDescr(const JSONNode &jnAttachments, BBCSupport
 			if (m_vkOptions.iIMGBBCSupport && iBBC != bbcNo)
 				res.AppendFormat(L"\n\t%s", SetBBCString(wszLink, iBBC, vkbbcImg).c_str());
 		}
-		else
+		else {
 			res.AppendFormat(TranslateT("Unsupported or unknown attachment type: %s"), SetBBCString(wszType, iBBC, vkbbcB).c_str());
+			const JSONNode& jnUnknown = jnAttach[jnAttach["type"].as_string().c_str()];
+			CMStringW wszText(jnUnknown["text"].as_mstring());
+			if (!wszText.IsEmpty())
+				res.AppendFormat(L"\n%s: %s", TranslateT("Text"), wszText);
+		}
 
 		res.AppendChar('\n');
 	}
diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h
index cfda84fc92..058f87b477 100644
--- a/protocols/VKontakte/src/version.h
+++ b/protocols/VKontakte/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION          0
 #define __MINOR_VERSION          1
 #define __RELEASE_NUM            11
-#define __BUILD_NUM              5
+#define __BUILD_NUM              6
 
 #include <stdver.h>
 
-- 
cgit v1.2.3