From 814dea463f6dcabe70168b7f56e061d306d64144 Mon Sep 17 00:00:00 2001 From: ElzorFox Date: Fri, 29 Mar 2024 12:49:07 +0500 Subject: VKontakte: fix #4310 - beauty is in the eye of the beholder --- protocols/VKontakte/src/vk_messages.cpp | 8 +++++--- protocols/VKontakte/src/vk_struct.cpp | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/protocols/VKontakte/src/vk_messages.cpp b/protocols/VKontakte/src/vk_messages.cpp index 89d6ec54cc..446925b81a 100644 --- a/protocols/VKontakte/src/vk_messages.cpp +++ b/protocols/VKontakte/src/vk_messages.cpp @@ -454,12 +454,14 @@ void CVkProto::OnReceiveMessages(MHttpResponse *reply, AsyncHttpRequest *pReq) dbei.timestamp = bEdited ? tDateTime : (m_vkOptions.bUseLocalTime ? time(0) : tDateTime); dbei.pBlob = pszBody; - if (!m_vkOptions.bShowReplyInMessage && szReplyId) + if (!m_vkOptions.bShowReplyInMessage && szReplyId) { dbei.szReplyId = szReplyId; + debugLogA("CVkProto::OnReceiveMessages szReplyId = %s", szReplyId); + } - debugLogA("CVkProto::OnReceiveMessages mid = %d, datetime = %d, isOut = %d, isRead = %d, iUserId = %d, Edited = %d", iMessageId, tDateTime, isOut, isRead, iUserId, (int)bEdited); + debugLogA("CVkProto::OnReceiveMessages mid = %d, datetime = %d, isOut = %d, isRead = %d, iUserId = %d, szReplyId = %s Edited = %d", iMessageId, tDateTime, isOut, isRead, iUserId, szReplyId, (int)bEdited); - if (!IsMessageExist(iMessageId, vkALL) || bEdited || (m_vkOptions.bShowReplyInMessage && szReplyId)) { + if (!IsMessageExist(iMessageId, vkALL) || bEdited || szReplyId) { debugLogA("CVkProto::OnReceiveMessages new or edited message"); dbei.szId = szMid; ProtoChainRecvMsg(hContact, dbei); diff --git a/protocols/VKontakte/src/vk_struct.cpp b/protocols/VKontakte/src/vk_struct.cpp index f7007dbe2d..d0901d6f56 100644 --- a/protocols/VKontakte/src/vk_struct.cpp +++ b/protocols/VKontakte/src/vk_struct.cpp @@ -194,7 +194,7 @@ CVKOptions::CVKOptions(PROTO_INTERFACE* proto) : bUseNonStandardNotifications(proto, "UseNonStandardNotifications", false), bShortenLinksForAudio(proto, "ShortenLinksForAudio", true), bAddMessageLinkToMesWAtt(proto, "AddMessageLinkToMesWAtt", true), - bShowReplyInMessage(proto, "ShowReplyInMessage", true), + bShowReplyInMessage(proto, "ShowReplyInMessage", false), bSplitFormatFwdMsg(proto, "SplitFormatFwdMsg", true), bSyncReadMessageStatusFromServer(proto, "SyncReadMessageStatusFromServer", false), bLoadFullCList(proto, "LoadFullCList", false), -- cgit v1.2.3