From 9c67d7a6b71fe8b844a9aab04faa6f2119b4ae2b Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 3 Apr 2021 13:10:25 +0200 Subject: [PATCH] Fix disable_minithumbnails --- td/telegram/Photo.cpp | 18 +++++++++++++++--- td/telegram/VideoNotesManager.cpp | 7 ++++++- td/telegram/VideosManager.cpp | 6 +++++- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/td/telegram/Photo.cpp b/td/telegram/Photo.cpp index 5a39f9408..4001e2330 100644 --- a/td/telegram/Photo.cpp +++ b/td/telegram/Photo.cpp @@ -401,9 +401,17 @@ Variant get_photo_size(FileManager *file_manager, PhotoSizeSo } else { LOG(ERROR) << "Receive unexpected JPEG minithumbnail in photo of format " << format; } - return std::move(res); + if (G()->shared_config().get_option_boolean("disable_minithumbnails")) { + return ""; + } else { + return std::move(res); + } + } + if (G()->shared_config().get_option_boolean("disable_minithumbnails")) { + return ""; + } else { + return size->bytes_.as_slice().str(); } - return size->bytes_.as_slice().str(); } case telegram_api::photoSizeProgressive::ID: { auto size = move_tl_object_as(size_ptr); @@ -734,7 +742,11 @@ Photo get_photo(FileManager *file_manager, tl_object_ptr && } res.photos.push_back(std::move(size)); } else { - res.minithumbnail = std::move(photo_size.get<1>()); + if (G()->shared_config().get_option_boolean("disable_minithumbnails")) { + res.minithumbnail = ""; + } else { + res.minithumbnail = std::move(photo_size.get<1>()); + } } } diff --git a/td/telegram/VideoNotesManager.cpp b/td/telegram/VideoNotesManager.cpp index 5829192cd..b8fa68972 100644 --- a/td/telegram/VideoNotesManager.cpp +++ b/td/telegram/VideoNotesManager.cpp @@ -12,6 +12,7 @@ #include "td/telegram/files/FileManager.h" #include "td/telegram/SecretChatActor.h" +#include "td/telegram/ConfigShared.h" #include "td/telegram/Td.h" #include "td/utils/logging.h" @@ -170,7 +171,11 @@ void VideoNotesManager::create_video_note(FileId file_id, string minithumbnail, } else { LOG(INFO) << "Receive wrong video note dimensions " << dimensions; } - v->minithumbnail = std::move(minithumbnail); + if (G()->shared_config().get_option_boolean("disable_minithumbnails")) { + v->minithumbnail = ""; + } else { + v->minithumbnail = std::move(minithumbnail); + } v->thumbnail = std::move(thumbnail); on_get_video_note(std::move(v), replace); } diff --git a/td/telegram/VideosManager.cpp b/td/telegram/VideosManager.cpp index 0417fe423..c78049c85 100644 --- a/td/telegram/VideosManager.cpp +++ b/td/telegram/VideosManager.cpp @@ -215,7 +215,11 @@ void VideosManager::create_video(FileId file_id, string minithumbnail, PhotoSize v->mime_type = std::move(mime_type); v->duration = max(duration, 0); v->dimensions = dimensions; - v->minithumbnail = std::move(minithumbnail); + if (G()->shared_config().get_option_boolean("disable_minithumbnails")) { + v->minithumbnail = ""; + } else { + v->minithumbnail = std::move(minithumbnail); + } v->thumbnail = std::move(thumbnail); v->animated_thumbnail = std::move(animated_thumbnail); v->supports_streaming = supports_streaming;