From a8935178a2d6a157f92c5a234f6fb52257f515ee Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 20 Dec 2019 15:56:39 +0300
Subject: [PATCH] Remove autodownload for GIFs and video messages.

---
 Telegram/SourceFiles/boxes/auto_download_box.cpp       | 10 +++-------
 Telegram/SourceFiles/data/data_auto_download.cpp       |  4 +---
 Telegram/SourceFiles/data/data_auto_download.h         |  8 ++++++++
 .../history/view/media/history_view_gif.cpp            |  4 ----
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/auto_download_box.cpp b/Telegram/SourceFiles/boxes/auto_download_box.cpp
index 21d44e0c2..ebe927de3 100644
--- a/Telegram/SourceFiles/boxes/auto_download_box.cpp
+++ b/Telegram/SourceFiles/boxes/auto_download_box.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "data/data_session.h"
+#include "data/data_auto_download.h"
 #include "ui/widgets/continuous_sliders.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/vertical_layout.h"
@@ -59,15 +60,9 @@ void AutoDownloadBox::setupContent() {
 		this,
 		std::move(wrap)));
 
-	static const auto kHidden = {
-		Type::Video,
-		Type::Music,
-		Type::VoiceMessage
-	};
-
 	const auto values = Ui::CreateChild<base::flat_map<Type, int>>(content);
 	const auto add = [&](Type type, rpl::producer<QString> label) {
-		if (ranges::find(kHidden, type) != end(kHidden)) {
+		if (ranges::find(kStreamedTypes, type) != end(kStreamedTypes)) {
 			return;
 		}
 		const auto value = settings->bytesLimit(_source, type);
@@ -146,6 +141,7 @@ void AutoDownloadBox::setupContent() {
 			return settings->bytesLimit(_source, type) != value;
 		}) != end(*values);
 
+		const auto &kHidden = kStreamedTypes;
 		const auto hiddenChanged = ranges::find_if(kHidden, [&](Type type) {
 			const auto now = settings->bytesLimit(_source, type);
 			return (now > 0) && (now != *limit);
diff --git a/Telegram/SourceFiles/data/data_auto_download.cpp b/Telegram/SourceFiles/data/data_auto_download.cpp
index 45d32a0b0..9beb2610b 100644
--- a/Telegram/SourceFiles/data/data_auto_download.cpp
+++ b/Telegram/SourceFiles/data/data_auto_download.cpp
@@ -183,9 +183,7 @@ void Full::setBytesLimit(Source source, Type type, int bytesLimit) {
 }
 
 bool Full::shouldDownload(Source source, Type type, int fileSize) const {
-	if (type == Type::Video
-		|| type == Type::Music
-		|| type == Type::VoiceMessage) {
+	if (ranges::find(kStreamedTypes, type) != end(kStreamedTypes)) {
 		// With streaming we disable autodownload and hide them in Settings.
 		return false;
 	}
diff --git a/Telegram/SourceFiles/data/data_auto_download.h b/Telegram/SourceFiles/data/data_auto_download.h
index 4143cf82e..41df67431 100644
--- a/Telegram/SourceFiles/data/data_auto_download.h
+++ b/Telegram/SourceFiles/data/data_auto_download.h
@@ -36,6 +36,14 @@ enum class Type {
 	File         = 0x06,
 };
 
+inline constexpr auto kStreamedTypes = {
+	Type::Video,
+	Type::Music,
+	Type::VoiceMessage,
+	Type::VideoMessage,
+	Type::GIF,
+};
+
 constexpr auto kTypesCount = 7;
 
 class Single {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 554621b7c..a77226b6f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -247,8 +247,6 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return;
 
 	const auto item = _parent->data();
-	//_data->automaticLoad(_realParent->fullId(), item);
-	//auto loaded = _data->loaded();
 	auto displayLoading = (item->id < 0) || _data->displayLoading();
 	auto selected = (selection == FullSelection);
 	const auto autoPaused = App::wnd()->sessionController()->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
@@ -833,8 +831,6 @@ void Gif::drawGrouped(
 		RectParts corners,
 		not_null<uint64*> cacheKey,
 		not_null<QPixmap*> cache) const {
-	_data->automaticLoad(_realParent->fullId(), _parent->data());
-
 	validateGroupedCache(geometry, corners, cacheKey, cache);
 
 	const auto selected = (selection == FullSelection);