VKontakte: add hidden option ‘ShowReplyInMessage’ (default true)

1 files changed, 13 insertions, 7 deletions

diff --git a/protocols/VKontakte/src/vk_history.cpp b/protocols/VKontakte/src/vk_history.cpp
index 25275f915d..4604a99231 100644
--- a/protocols/VKontakte/src/vk_history.cpp
+++ b/protocols/VKontakte/src/vk_history.cpp
@@ -225,7 +225,7 @@ void CVkProto::OnReceiveHistoryMessages(NETLIBHTTPREQUEST *reply, AsyncHttpReque
 		if (iLastMsgId < iMessageId)

 			iLastMsgId = iMessageId;

 

-		char szMid[40];

+		char szMid[40], szReplyId[40] = "";;

 		_ltoa(iMessageId, szMid, 10);

 

 		CMStringW wszBody(jnMsg["text"].as_mstring());

@@ -245,12 +245,14 @@ void CVkProto::OnReceiveHistoryMessages(NETLIBHTTPREQUEST *reply, AsyncHttpReque
 		}

 

 		const JSONNode& jnReplyMessages = jnMsg["reply_message"];

-		if (jnReplyMessages && !jnReplyMessages.empty()) {

-			CMStringW wszReplyMessages = GetFwdMessages(jnReplyMessages, jnFUsers, m_vkOptions.BBCForAttachments());

-			if (!wszBody.IsEmpty())

-				wszReplyMessages = L"\n" + wszReplyMessages;

-			wszBody += wszReplyMessages;

-		}

+		if (jnReplyMessages && !jnReplyMessages.empty())

+			if (m_vkOptions.bShowReplyInMessage) {

+				CMStringW wszReplyMessages = GetFwdMessages(jnReplyMessages, jnFUsers, m_vkOptions.BBCForAttachments());

+				if (!wszBody.IsEmpty())

+					wszReplyMessages = L"\n" + wszReplyMessages;

+				wszBody += wszReplyMessages;

+			} else if (jnReplyMessages["id"])

+				_ltoa(jnReplyMessages["id"].as_int(), szReplyId, 10);

 

 		const JSONNode &jnAttachments = jnMsg["attachments"];

 		if (jnAttachments && !jnAttachments.empty()) {

@@ -298,6 +300,10 @@ void CVkProto::OnReceiveHistoryMessages(NETLIBHTTPREQUEST *reply, AsyncHttpReque
 		recv.timestamp = tDateTime;

 		recv.szMessage = pszBody;

 		recv.szMsgId = szMid;

+

+		if (!m_vkOptions.bShowReplyInMessage &&	szReplyId)

+			recv.szReplyId = szReplyId;

+

 		ProtoChainRecvMsg(hContact, &recv);

 

 		MEVENT hDbEvent = db_event_getById(m_szModuleName, strcat(szMid, "_"));