From ec1655ecc7403b2639f4371846880ccb88058142 Mon Sep 17 00:00:00 2001 From: ElzorFox Date: Thu, 7 Mar 2024 14:25:19 +0500 Subject: VKontakte: fix empty sticker url version bump --- protocols/VKontakte/src/misc.cpp | 8 ++++++++ protocols/VKontakte/src/version.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'protocols/VKontakte/src') diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp index 9af11685b2..8795f4d6d1 100644 --- a/protocols/VKontakte/src/misc.cpp +++ b/protocols/VKontakte/src/misc.cpp @@ -21,6 +21,7 @@ static const char *szGiftTypes[] = { "thumb_256", "thumb_96", "thumb_48" }; static const char *szVKUrls[] = { "http://vk.com/", "https://vk.com/", "http://new.vk.com/", "https://new.vk.com/", "http://m.vk.com/", "https://m.vk.com/" }; static const char *szAttachmentMasks[] = { "wall%d_%d", "video%d_%d", "photo%d_%d", "audio%d_%d", "doc%d_%d", "market%d_%d", "story%d_%d" }; static const char *szVKLinkParam[] = { "?z=", "?w=", "&z=", "&w=" }; +static const wchar_t* wszVKStickerUrlMask = L"https://vk.com/sticker/1-%d-%d%s"; JSONNode nullNode(JSON_NULL); @@ -1441,6 +1442,12 @@ CMStringW CVkProto::GetAttachmentDescr(const JSONNode &jnAttachments, BBCSupport int iStickerId = jnSticker["sticker_id"].as_int(); + wszLink.AppendFormat(wszVKStickerUrlMask, + iStickerId, + (int)m_vkOptions.iStickerSize ? (int)m_vkOptions.iStickerSize : 128, + m_vkOptions.bStickerBackground ? L"b" : L"" + ); + for (auto& jnImage : jnImages) { if (jnImage["width"].as_int() == (int)m_vkOptions.iStickerSize) { wszLink = jnImage["url"].as_mstring(); @@ -1454,6 +1461,7 @@ CMStringW CVkProto::GetAttachmentDescr(const JSONNode &jnAttachments, BBCSupport } wszUrl = wszLink.IsEmpty() ? (wszLink128.IsEmpty() ? wszLinkLast : wszLink128) : wszLink; + if (!m_vkOptions.bStikersAsSmileys) res += SetBBCString(wszUrl, iBBC, vkbbcImg); diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h index 6c7978c45c..82f9b04cc0 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 15 -#define __BUILD_NUM 6 +#define __BUILD_NUM 7 #include -- cgit v1.2.3