diff options
| -rw-r--r-- | protocols/VKontakte/src/misc.cpp | 7 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_messages.cpp | 2 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_struct.cpp | 2 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_struct.h | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp index 7ca85b9d3e..826dfa7362 100644 --- a/protocols/VKontakte/src/misc.cpp +++ b/protocols/VKontakte/src/misc.cpp @@ -1258,6 +1258,9 @@ CMStringW CVkProto::SetBBCString(LPCWSTR pwszString, BBCSupport iBBC, VKBBCType { vkbbcCode, bbcNo, L"%s" },
{ vkbbcCode, bbcBasic, L"%s" },
{ vkbbcCode, bbcAdvanced, L"[code]%s[/code]"},
+ { vkbbcQuote, bbcNo, L"\n%s" },
+ { vkbbcQuote, bbcBasic, L"\n%s" },
+ { vkbbcQuote, bbcAdvanced, L"[quote]%s[/quote]"},
{ vkbbcImg, bbcNo, L"%s" },
{ vkbbcImg, bbcBasic, L"[img]%s[/img]" },
{ vkbbcImg, bbcAdvanced, L"[img]%s[/img]" },
@@ -1743,13 +1746,13 @@ CMStringW CVkProto::GetFwdMessage(const JSONNode& jnMsg, const JSONNode& jnFUser wszBody.Replace(L"\n", L"\n\t");
wchar_t tcSplit = m_vkOptions.bSplitFormatFwdMsg ? '\n' : ' ';
- CMStringW wszMes(FORMAT, L"%s %s%c%s %s:\n\n%s\n",
+ CMStringW wszMes(FORMAT, L"%s %s%c%s %s:%s\n",
SetBBCString(TranslateT("Message from"), iBBC, vkbbcB).c_str(),
SetBBCString(wszNick, iBBC, vkbbcUrl, wszUrl).c_str(),
tcSplit,
SetBBCString(TranslateT("at"), iBBC, vkbbcB).c_str(),
ttime,
- wszBody.c_str());
+ SetBBCString(wszBody, m_vkOptions.bBBCNewStorySupport ? bbcAdvanced : bbcNo, vkbbcQuote).c_str());
return wszMes;
diff --git a/protocols/VKontakte/src/vk_messages.cpp b/protocols/VKontakte/src/vk_messages.cpp index 4a93a0859b..7d14a6305c 100644 --- a/protocols/VKontakte/src/vk_messages.cpp +++ b/protocols/VKontakte/src/vk_messages.cpp @@ -189,7 +189,7 @@ int CVkProto::SendMsg(MCONTACT hContact, MEVENT hReplyEvent, const char *szMsg) dbei.szId
);
- pReq << CHAR_PARAM("forward", szForward);
+ pReq << CHAR_PARAM("forward", szForward);
}
}
diff --git a/protocols/VKontakte/src/vk_struct.cpp b/protocols/VKontakte/src/vk_struct.cpp index eaee7a0ca5..a17eef2d4b 100644 --- a/protocols/VKontakte/src/vk_struct.cpp +++ b/protocols/VKontakte/src/vk_struct.cpp @@ -203,7 +203,7 @@ CVKOptions::CVKOptions(PROTO_INTERFACE* proto) : bShortenLinksForAudio(proto, "ShortenLinksForAudio", true),
bAddMessageLinkToMesWAtt(proto, "AddMessageLinkToMesWAtt", true),
bShowReplyInMessage(proto, "ShowReplyInMessage", false),
- bSplitFormatFwdMsg(proto, "SplitFormatFwdMsg", true),
+ bSplitFormatFwdMsg(proto, "SplitFormatFwdMsg", false),
bSyncReadMessageStatusFromServer(proto, "SyncReadMessageStatusFromServer", false),
bLoadFullCList(proto, "LoadFullCList", false),
bShowVkDeactivateEvents(proto, "ShowVkDeactivateEvents", true),
diff --git a/protocols/VKontakte/src/vk_struct.h b/protocols/VKontakte/src/vk_struct.h index 7a64e62996..8dce08e013 100644 --- a/protocols/VKontakte/src/vk_struct.h +++ b/protocols/VKontakte/src/vk_struct.h @@ -206,7 +206,7 @@ struct CVKNewsItem : public MZeroedObject { bool bIsRepost;
};
-enum VKBBCType : uint8_t { vkbbcB, vkbbcI, vkbbcS, vkbbcU, vkbbcCode, vkbbcImg, vkbbcUrl, vkbbcImgE, vkbbcSize, vkbbcColor };
+enum VKBBCType : uint8_t { vkbbcB, vkbbcI, vkbbcS, vkbbcU, vkbbcCode, vkbbcQuote, vkbbcImg, vkbbcUrl, vkbbcImgE, vkbbcSize, vkbbcColor };
enum BBCSupport : uint8_t { bbcNo, bbcBasic, bbcAdvanced };
struct CVKBBCItem {
|