mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Allow WebDocument video thumbnails.

Browse Source
This commit is contained in:
John Preston
2020-05-22 19:23:19 +04:00
parent 0834920db8
commit 3f26fc9f55
5 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
View File

@@ -133,11 +133,12 @@ int Gif::resizeGetHeight(int width) {
void Gif::paint(Painter &p, const QRect &clip, const PaintContext *context) const {
const auto document = getShownDocument();
const auto displayLoading = document->displayLoading();
ensureDataMediaCreated(document);
const auto preview = Data::VideoPreviewState(_dataMedia.get());
preview.automaticLoad(fileOrigin());
const auto displayLoading = !preview.usingThumbnail()
&& document->displayLoading();
const auto loaded = preview.loaded();
const auto loading = preview.loading();
if (loaded

22
Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
View File

@@ -26,6 +26,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace InlineBots {
namespace {
const auto kVideoThumbMime = "video/mp4"_q;
QString GetContentUrl(const MTPWebDocument &document) {
switch (document.type()) {
case mtpc_webDocument:
@@ -84,8 +86,19 @@ std::unique_ptr<Result> Result::create(
result->_title = qs(r.vtitle().value_or_empty());
result->_description = qs(r.vdescription().value_or_empty());
result->_url = qs(r.vurl().value_or_empty());
if (const auto thumb = r.vthumb()) {
result->_thumb = Images::Create(*thumb, result->thumbBox());
const auto thumbMime = [&] {
if (const auto thumb = r.vthumb()) {
return thumb->match([&](const auto &data) {
return data.vmime_type().v;
});
}
return QByteArray();
}();
const auto imageThumb = !thumbMime.isEmpty()
&& (thumbMime != kVideoThumbMime);
const auto videoThumb = !thumbMime.isEmpty() && !imageThumb;
if (imageThumb) {
result->_thumb = Images::Create(*r.vthumb(), result->thumbBox());
}
if (const auto content = r.vcontent()) {
result->_content_url = GetContentUrl(*content);
@@ -97,7 +110,10 @@ std::unique_ptr<Result> Result::create(
} else {
result->_document = Auth().data().documentFromWeb(
result->adjustAttributes(*content),
(r.vthumb()
(imageThumb
? Images::FromWebDocument(*r.vthumb())
: ImageLocation()),
(videoThumb
? Images::FromWebDocument(*r.vthumb())
: ImageLocation()));
}