From 2bdb710cd949cc04b294f5de54d17af5d7fd05a7 Mon Sep 17 00:00:00 2001
From: ElzorFox <elzorfox@ya.ru>
Date: Tue, 22 Oct 2024 15:05:57 +0500
Subject: VKontakte: fix send forward and  reply messages version bump

---
 protocols/VKontakte/src/version.h       |  2 +-
 protocols/VKontakte/src/vk_messages.cpp | 36 ++++++++++++++++++++++++++-------
 2 files changed, 30 insertions(+), 8 deletions(-)

(limited to 'protocols')

diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h
index 9c0696c2d6..20c56b9a6a 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            17
-#define __BUILD_NUM              0
+#define __BUILD_NUM              1
 
 #include <stdver.h>
 
diff --git a/protocols/VKontakte/src/vk_messages.cpp b/protocols/VKontakte/src/vk_messages.cpp
index 6190be65a4..4a93a0859b 100644
--- a/protocols/VKontakte/src/vk_messages.cpp
+++ b/protocols/VKontakte/src/vk_messages.cpp
@@ -47,6 +47,8 @@ int CVkProto::ForwardMsg(MCONTACT hContact, std::vector<MEVENT>& vForvardEvents,
 	CMStringW wszForwardMessagesTxt;
 
 	int iForwardVKMessageCount = 0;
+	MCONTACT hFromContact = INVALID_CONTACT_ID;
+
 	for (auto &mEvnt : vForvardEvents) {
 		if (iForwardVKMessageCount == VK_MAX_FORWARD_MESSAGES)
 			break;
@@ -80,6 +82,7 @@ int CVkProto::ForwardMsg(MCONTACT hContact, std::vector<MEVENT>& vForvardEvents,
 			if (!szIds.IsEmpty())
 				szIds.AppendChar(',');
 			szIds += dbei.szId;
+			hFromContact = dbei.hContact;
 		}
 	}
 
@@ -92,11 +95,21 @@ int CVkProto::ForwardMsg(MCONTACT hContact, std::vector<MEVENT>& vForvardEvents,
 		&CVkProto::OnSendMessage, 
 		AsyncHttpRequest::rpHigh
 	);
-	
-	pReq 
-		<< INT_PARAM(bIsChat ? "chat_id" : "peer_id", iUserId) 
-		<< INT_PARAM("random_id", ((long)time(0)) * 100 + uMsgId % 100)
-		<< CHAR_PARAM("forward_messages", szIds);
+
+	CMStringA szForward;
+	if (hFromContact != INVALID_CONTACT_ID) {
+		szForward.AppendFormat(
+			"{\"peer_id\":%d, \"message_ids\":[%s]}",
+			isChatRoom(hFromContact) ? (ReadVKUserID(hFromContact) + VK_CHAT_MIN) : ReadVKUserID(hFromContact) ,
+			szIds.c_str()
+		);
+
+		pReq << CHAR_PARAM("forward", szForward);
+	}
+
+	pReq
+		<< INT_PARAM(bIsChat ? "chat_id" : "peer_id", iUserId)
+		<< INT_PARAM("random_id", ((long)time(0)) * 100 + uMsgId % 100);
 	
 	pReq->AddHeader("Content-Type", "application/x-www-form-urlencoded");
 
@@ -167,8 +180,17 @@ int CVkProto::SendMsg(MCONTACT hContact, MEVENT hReplyEvent, const char *szMsg)
 	
 	if (hReplyEvent) {
 		DB::EventInfo dbei(hReplyEvent, false);
-		if (dbei && mir_strlen(dbei.szId) > 0)
-			pReq << CHAR_PARAM("reply_to", dbei.szId);
+		if (dbei && mir_strlen(dbei.szId) > 0) {
+			MCONTACT hFromContact = dbei.hContact;
+			CMStringA szForward(
+					FORMAT,
+					"{\"peer_id\":%d, \"message_ids\":[%s], \"is_reply\":1}",
+					isChatRoom(hFromContact) ?  (ReadVKUserID(hFromContact) + VK_CHAT_MIN) : ReadVKUserID(hFromContact),
+					dbei.szId
+				);
+
+				pReq << CHAR_PARAM("forward", szForward);
+		}
 	}
 	
 	if (StickerId)
-- 
cgit v1.2.3