From 394ee282dbc46c15162c33d9012d2492ef17847d Mon Sep 17 00:00:00 2001 From: ElzorFox Date: Sun, 15 Oct 2017 14:01:40 +0500 Subject: =?UTF-8?q?VKontakte:=20ignore=20=E2=80=98friends=5Frecomm?= =?UTF-8?q?=E2=80=99=20news=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protocols/VKontakte/src/vk_feed.cpp | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'protocols/VKontakte') diff --git a/protocols/VKontakte/src/vk_feed.cpp b/protocols/VKontakte/src/vk_feed.cpp index 3228b8c829..2e47317451 100644 --- a/protocols/VKontakte/src/vk_feed.cpp +++ b/protocols/VKontakte/src/vk_feed.cpp @@ -160,10 +160,11 @@ void CVkProto::CreateVkUserInfoList(OBJLIST &vkUsers, const JSONNod CVKNewsItem* CVkProto::GetVkNewsItem(const JSONNode &jnItem, OBJLIST &vkUsers, bool isRepost) { + if (!jnItem || jnItem["type"].as_mstring() == L"friends_recomm") + return nullptr; + bool bPostLink = true; CVKNewsItem *vkNewsItem = new CVKNewsItem(); - if (!jnItem) - return vkNewsItem; LONG iSourceId = !jnItem["source_id"] ? jnItem["owner_id"].as_int() : jnItem["source_id"].as_int(); LONG iPostId = jnItem["post_id"].as_int(); @@ -221,16 +222,18 @@ CVKNewsItem* CVkProto::GetVkNewsItem(const JSONNode &jnItem, OBJLISTwszText.Replace(L"\n", L"\n\t"); - wszText += vkRepost->wszText; - wszText += L"\n"; - - wszPopupText += L"\t"; - wszPopupText += vkRepost->wszPopupTitle; - wszPopupText += L"\n\t"; - wszPopupText += vkRepost->wszPopupText; - vkNewsItem->bIsRepost = true; - delete vkRepost; + if (vkRepost) { + vkRepost->wszText.Replace(L"\n", L"\n\t"); + wszText += vkRepost->wszText; + wszText += L"\n"; + + wszPopupText += L"\t"; + wszPopupText += vkRepost->wszPopupTitle; + wszPopupText += L"\n\t"; + wszPopupText += vkRepost->wszPopupText; + vkNewsItem->bIsRepost = true; + delete vkRepost; + } } const JSONNode &jnAttachments = jnItem["attachments"]; -- cgit v1.2.3