From 041c92245189c3cb1f5de250c2e3433430688b49 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 11 Oct 2021 21:47:36 +0400 Subject: [PATCH] Add non-MTP ParseWebPageType. --- Telegram/SourceFiles/data/data_web_page.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/data/data_web_page.cpp b/Telegram/SourceFiles/data/data_web_page.cpp index 31dddecae9..1d4e7f7cc2 100644 --- a/Telegram/SourceFiles/data/data_web_page.cpp +++ b/Telegram/SourceFiles/data/data_web_page.cpp @@ -134,9 +134,11 @@ WebPageCollage ExtractCollage( } // namespace -WebPageType ParseWebPageType(const MTPDwebPage &page) { - const auto type = qs(page.vtype().value_or_empty()); - if (type == qstr("video") || page.vembed_url()) { +WebPageType ParseWebPageType( + const QString &type, + const QString &embedUrl, + bool hasIV) { + if (type == qstr("video") || !embedUrl.isEmpty()) { return WebPageType::Video; } else if (type == qstr("photo")) { return WebPageType::Photo; @@ -160,13 +162,20 @@ WebPageType ParseWebPageType(const MTPDwebPage &page) { return WebPageType::Livestream; } else if (type == qstr("telegram_user")) { return WebPageType::User; - } else if (page.vcached_page()) { + } else if (hasIV) { return WebPageType::ArticleWithIV; } else { return WebPageType::Article; } } +WebPageType ParseWebPageType(const MTPDwebPage &page) { + return ParseWebPageType( + qs(page.vtype().value_or_empty()), + page.vembed_url().value_or_empty(), + !!page.vcached_page()); +} + WebPageCollage::WebPageCollage( not_null owner, const MTPDwebPage &data)