From 654784ce9feef4dab412eb9357f06c728ec73ff5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 4 Oct 2020 07:52:48 +0400
Subject: [PATCH 001/190] Use external_xcb and external_glib

---
 Telegram/CMakeLists.txt | 33 ++++-----------------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index f828f262e..7d896a91b 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -106,6 +106,9 @@ if (LINUX)
         desktop-app::external_materialdecoration
         desktop-app::external_nimf_qt5
         desktop-app::external_qt5ct_support
+        desktop-app::external_xcb_screensaver
+        desktop-app::external_xcb
+        desktop-app::external_glib
     )
 
     if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
@@ -137,35 +140,6 @@ if (LINUX)
         )
     endif()
 
-    if (DESKTOP_APP_USE_PACKAGED)
-        find_package(PkgConfig REQUIRED)
-        pkg_check_modules(XCB_SCREENSAVER REQUIRED IMPORTED_TARGET xcb-screensaver)
-        pkg_check_modules(XCB REQUIRED IMPORTED_TARGET xcb)
-
-        target_link_libraries(Telegram
-        PRIVATE
-            PkgConfig::XCB_SCREENSAVER
-            PkgConfig::XCB
-        )
-    else()
-        target_link_static_libraries(Telegram PRIVATE xcb-screensaver)
-        target_link_libraries(Telegram PRIVATE xcb)
-    endif()
-
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
-    pkg_check_modules(GOBJECT REQUIRED IMPORTED_TARGET gobject-2.0)
-    pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
-
-    target_link_libraries(Telegram
-    PRIVATE
-        PkgConfig::GLIB2
-        PkgConfig::GOBJECT
-        PkgConfig::GIO
-    )
-
-    target_compile_definitions(Telegram PRIVATE G_LOG_DOMAIN="Telegram")
-
     if (NOT TDESKTOP_DISABLE_GTK_INTEGRATION)
         find_package(PkgConfig REQUIRED)
 
@@ -1290,6 +1264,7 @@ target_compile_definitions(Telegram
 PRIVATE
     TDESKTOP_API_ID=${TDESKTOP_API_ID}
     TDESKTOP_API_HASH=${TDESKTOP_API_HASH}
+    G_LOG_DOMAIN="Telegram"
 )
 
 if (APPLE OR NOT CMAKE_EXECUTABLE_SUFFIX STREQUAL "" OR NOT "${output_name}" STREQUAL "Telegram")

From 2aa0b674cde819d4b84ccf1e7778de440ab573e9 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 4 Oct 2020 08:07:49 +0400
Subject: [PATCH 002/190] Use new XCB methods from lib_base

---
 .../platform/linux/specific_linux.cpp         | 185 +++---------------
 1 file changed, 29 insertions(+), 156 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 7f28ad56a..179785e54 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "platform/linux/linux_libs.h"
 #include "base/platform/base_platform_info.h"
+#include "base/platform/linux/base_xcb_utilities_linux.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
@@ -25,7 +26,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtCore/QProcess>
 #include <QtCore/QVersionNumber>
 #include <QtGui/QWindow>
-#include <qpa/qplatformnativeinterface.h>
 
 #include <private/qwaylanddisplay_p.h>
 #include <private/qwaylandwindow_p.h>
@@ -301,128 +301,26 @@ bool GetImageFromClipboardSupported() {
 }
 #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
 
-std::optional<xcb_atom_t> GetXCBAtom(
-		xcb_connection_t *connection,
-		const QString &name) {
-	const auto cookie = xcb_intern_atom(
-		connection,
-		0,
-		name.size(),
-		name.toUtf8());
-
-	auto reply = xcb_intern_atom_reply(
-		connection,
-		cookie,
-		nullptr);
-
-	if (!reply) {
-		return std::nullopt;
-	}
-
-	const auto atom = reply->atom;
-	free(reply);
-
-	return atom;
-}
-
-bool IsXCBExtensionPresent(
-		xcb_connection_t *connection,
-		xcb_extension_t *ext) {
-	const auto reply = xcb_get_extension_data(
-		connection,
-		ext);
-
-	if (!reply) {
-		return false;
-	}
-
-	return reply->present;
-}
-
-std::vector<xcb_atom_t> GetXCBWMSupported(xcb_connection_t *connection) {
-	auto netWmAtoms = std::vector<xcb_atom_t>{};
-
-	const auto native = QGuiApplication::platformNativeInterface();
-	if (!native) {
-		return netWmAtoms;
-	}
-
-	const auto root = static_cast<xcb_window_t>(reinterpret_cast<quintptr>(
-		native->nativeResourceForIntegration(QByteArray("rootwindow"))));
-
-	const auto supportedAtom = GetXCBAtom(connection, "_NET_SUPPORTED");
-	if (!supportedAtom.has_value()) {
-		return netWmAtoms;
-	}
-
-	auto offset = 0;
-	auto remaining = 0;
-
-	do {
-		const auto cookie = xcb_get_property(
-			connection,
-			false,
-			root,
-			*supportedAtom,
-			XCB_ATOM_ATOM,
-			offset,
-			1024);
-
-		auto reply = xcb_get_property_reply(
-			connection,
-			cookie,
-			nullptr);
-
-		if (!reply) {
-			break;
-		}
-
-		remaining = 0;
-
-		if (reply->type == XCB_ATOM_ATOM && reply->format == 32) {
-			const auto len = xcb_get_property_value_length(reply)
-				/ sizeof(xcb_atom_t);
-
-			const auto atoms = reinterpret_cast<xcb_atom_t*>(
-				xcb_get_property_value(reply));
-
-			const auto s = netWmAtoms.size();
-			netWmAtoms.resize(s + len);
-			memcpy(netWmAtoms.data() + s, atoms, len * sizeof(xcb_atom_t));
-
-			remaining = reply->bytes_after;
-			offset += len;
-		}
-
-		free(reply);
-	} while (remaining > 0);
-
-	return netWmAtoms;
-}
-
 std::optional<crl::time> XCBLastUserInputTime() {
-	const auto native = QGuiApplication::platformNativeInterface();
-	if (!native) {
-		return std::nullopt;
-	}
-
-	const auto connection = reinterpret_cast<xcb_connection_t*>(
-		native->nativeResourceForIntegration(QByteArray("connection")));
-
+	const auto connection = base::Platform::XCB::GetConnectionFromQt();
 	if (!connection) {
 		return std::nullopt;
 	}
 
-	if (!IsXCBExtensionPresent(connection, &xcb_screensaver_id)) {
+	if (!base::Platform::XCB::IsExtensionPresent(
+			connection,
+			&xcb_screensaver_id)) {
 		return std::nullopt;
 	}
 
-	const auto root = static_cast<xcb_window_t>(reinterpret_cast<quintptr>(
-		native->nativeResourceForIntegration(QByteArray("rootwindow"))));
+	const auto root = base::Platform::XCB::GetRootWindowFromQt();
+	if (!root.has_value()) {
+		return std::nullopt;
+	}
 
 	const auto cookie = xcb_screensaver_query_info(
 		connection,
-		root);
+		*root);
 
 	auto reply = xcb_screensaver_query_info_reply(
 		connection,
@@ -573,27 +471,21 @@ enum wl_shell_surface_resize WlResizeFromEdges(Qt::Edges edges) {
 #endif // Qt < 5.13 && !DESKTOP_APP_QT_PATCHED
 
 bool StartXCBMoveResize(QWindow *window, int edges) {
-	const auto native = QGuiApplication::platformNativeInterface();
-	if (!native) {
-		return false;
-	}
-
-	const auto connection = reinterpret_cast<xcb_connection_t*>(
-		native->nativeResourceForIntegration(QByteArray("connection")));
-
+	const auto connection = base::Platform::XCB::GetConnectionFromQt();
 	if (!connection) {
 		return false;
 	}
 
-	const auto screen = xcb_setup_roots_iterator(
-		xcb_get_setup(connection)).data;
-
-	if (!screen) {
+	const auto root = base::Platform::XCB::GetRootWindowFromQt();
+	if (!root.has_value()) {
 		return false;
 	}
 
-	const auto moveResize = GetXCBAtom(connection, "_NET_WM_MOVERESIZE");
-	if (!moveResize.has_value()) {
+	const auto moveResizeAtom = base::Platform::XCB::GetAtom(
+		connection,
+		"_NET_WM_MOVERESIZE");
+
+	if (!moveResizeAtom.has_value()) {
 		return false;
 	}
 
@@ -601,7 +493,7 @@ bool StartXCBMoveResize(QWindow *window, int edges) {
 
 	xcb_client_message_event_t xev;
 	xev.response_type = XCB_CLIENT_MESSAGE;
-	xev.type = *moveResize;
+	xev.type = *moveResizeAtom;
 	xev.sequence = 0;
 	xev.window = window->winId();
 	xev.format = 32;
@@ -617,7 +509,7 @@ bool StartXCBMoveResize(QWindow *window, int edges) {
 	xcb_send_event(
 		connection,
 		false,
-		screen->root,
+		*root,
 		XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT
 			| XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY,
 		reinterpret_cast<const char*>(&xev));
@@ -679,19 +571,12 @@ bool ShowWaylandWindowMenu(QWindow *window) {
 }
 
 bool XCBFrameExtentsSupported() {
-	const auto native = QGuiApplication::platformNativeInterface();
-	if (!native) {
-		return false;
-	}
-
-	const auto connection = reinterpret_cast<xcb_connection_t*>(
-		native->nativeResourceForIntegration(QByteArray("connection")));
-
+	const auto connection = base::Platform::XCB::GetConnectionFromQt();
 	if (!connection) {
 		return false;
 	}
 
-	const auto frameExtentsAtom = GetXCBAtom(
+	const auto frameExtentsAtom = base::Platform::XCB::GetAtom(
 		connection,
 		kXCBFrameExtentsAtomName.utf16());
 
@@ -699,23 +584,18 @@ bool XCBFrameExtentsSupported() {
 		return false;
 	}
 
-	return ranges::contains(GetXCBWMSupported(connection), *frameExtentsAtom);
+	return ranges::contains(
+		base::Platform::XCB::GetWMSupported(connection),
+		*frameExtentsAtom);
 }
 
 bool SetXCBFrameExtents(QWindow *window, const QMargins &extents) {
-	const auto native = QGuiApplication::platformNativeInterface();
-	if (!native) {
-		return false;
-	}
-
-	const auto connection = reinterpret_cast<xcb_connection_t*>(
-		native->nativeResourceForIntegration(QByteArray("connection")));
-
+	const auto connection = base::Platform::XCB::GetConnectionFromQt();
 	if (!connection) {
 		return false;
 	}
 
-	const auto frameExtentsAtom = GetXCBAtom(
+	const auto frameExtentsAtom = base::Platform::XCB::GetAtom(
 		connection,
 		kXCBFrameExtentsAtomName.utf16());
 
@@ -744,19 +624,12 @@ bool SetXCBFrameExtents(QWindow *window, const QMargins &extents) {
 }
 
 bool UnsetXCBFrameExtents(QWindow *window) {
-	const auto native = QGuiApplication::platformNativeInterface();
-	if (!native) {
-		return false;
-	}
-
-	const auto connection = reinterpret_cast<xcb_connection_t*>(
-		native->nativeResourceForIntegration(QByteArray("connection")));
-
+	const auto connection = base::Platform::XCB::GetConnectionFromQt();
 	if (!connection) {
 		return false;
 	}
 
-	const auto frameExtentsAtom = GetXCBAtom(
+	const auto frameExtentsAtom = base::Platform::XCB::GetAtom(
 		connection,
 		kXCBFrameExtentsAtomName.utf16());
 

From 245d644cd7dd3c00e4bf9e380c6d60342d5c7141 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 19 Oct 2020 01:55:52 +0400
Subject: [PATCH 003/190] Add always on top hint for media view window

To avoid overlapping by panels in KDE
---
 .../media/view/media_view_overlay_widget.cpp  | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 692386237..fd2088e9b 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -345,11 +345,13 @@ OverlayWidget::OverlayWidget()
 
 	connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(onScreenResized(int)));
 
-#if defined Q_OS_UNIX && !defined Q_OS_MAC
-	setWindowFlags(Qt::FramelessWindowHint | Qt::MaximizeUsingFullscreenGeometryHint);
-#else // Q_OS_UNIX && !Q_OS_MAC
-	setWindowFlags(Qt::FramelessWindowHint);
-#endif // Q_OS_UNIX && !Q_OS_MAC
+	if (Platform::IsLinux()) {
+		setWindowFlags(Qt::FramelessWindowHint
+			| Qt::WindowStaysOnTopHint
+			| Qt::MaximizeUsingFullscreenGeometryHint);
+	} else {
+		setWindowFlags(Qt::FramelessWindowHint);
+	}
 	moveToScreen();
 	setAttribute(Qt::WA_NoSystemBackground, true);
 	setAttribute(Qt::WA_TranslucentBackground, true);
@@ -2280,11 +2282,11 @@ void OverlayWidget::displayFinished() {
 	updateControls();
 	if (isHidden()) {
 		Ui::Platform::UpdateOverlayed(this);
-#if defined Q_OS_UNIX && !defined Q_OS_MAC
-		showFullScreen();
-#else // Q_OS_UNIX && !Q_OS_MAC
-		show();
-#endif // Q_OS_UNIX && !Q_OS_MAC
+		if (Platform::IsLinux()) {
+			showFullScreen();
+		} else {
+			show();
+		}
 		Ui::Platform::ShowOverAll(this);
 		activateWindow();
 		QApplication::setActiveWindow(this);

From b6fc418d32374bfd456030becc915b04a2d1f76d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 20 Oct 2020 09:26:17 +0400
Subject: [PATCH 004/190] 01org/libva -> intel/libva

---
 .github/workflows/linux.yml | 2 +-
 docs/building-cmake.md      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 91f47b087..aac77a1b7 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -182,7 +182,7 @@ jobs:
         run: |
           cd $LibrariesPath
 
-          git clone $GIT/01org/libva.git
+          git clone $GIT/intel/libva.git
           cd libva
           ./autogen.sh --enable-static
           make -j$(nproc)
diff --git a/docs/building-cmake.md b/docs/building-cmake.md
index 4921e1173..cc0c55cde 100644
--- a/docs/building-cmake.md
+++ b/docs/building-cmake.md
@@ -67,7 +67,7 @@ Go to ***BuildPath*** and run
     sudo make install
     cd ..
 
-    git clone https://github.com/01org/libva.git
+    git clone https://github.com/intel/libva.git
     cd libva
     CFLAGS=-fPIC CPPFLAGS=-fPIC LDFLAGS=-fPIC ./autogen.sh --enable-static
     make $MAKE_THREADS_CNT

From 3f6399f13da0ac46fe8ed800e1c644f539be1649 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 20 Oct 2020 23:01:27 +0400
Subject: [PATCH 005/190] Log getting GTK settings

---
 Telegram/SourceFiles/platform/linux/linux_libs.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h
index 822841d57..a1f383534 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.h
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
@@ -277,6 +277,7 @@ inline QString GtkSetting(const gchar *propertyName) {
 	gchararray value = GtkSetting<gchararray>(propertyName);
 	QString str = QString::fromUtf8(value);
 	g_free(value);
+	DEBUG_LOG(("Getting GTK setting, %1: '%2'").arg(propertyName).arg(str));
 	return str;
 }
 #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION

From b788ae0ae49bfcd08b96cbd01728cef66e1fb277 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 23 Oct 2020 12:04:44 +0400
Subject: [PATCH 006/190] Add stale bot configuration

---
 .github/stale.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000..6e25c83d1
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,21 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels: []
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: |
+  Hey there!
+
+  This issue will be automatically closed in 7 days if there would be no activity. We therefore assume that the user has lost interest or resolved the problem on their own.
+
+  Don't worry though; if this is an error, let us know with a comment and we'll be happy to reopen the issue.
+
+  Thanks!
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
+# Process only issues
+only: issues

From 1cabfaa6a4769a93e71cc66118682f5068a2319c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 22 Oct 2020 16:08:01 +0300
Subject: [PATCH 007/190] Fix cancel / crash in sending album to scheduled
 messages.

Fixes #8788
---
 Telegram/SourceFiles/history/history.cpp                     | 5 +++--
 .../SourceFiles/history/view/history_view_context_menu.cpp   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 7b71c0662..f640822d9 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -416,11 +416,12 @@ void History::destroyMessage(not_null<HistoryItem*> item) {
 					types,
 					item->id));
 			}
-		} else {
-			session().api().cancelLocalItem(item);
 		}
 		itemRemoved(item);
 	}
+	if (item->isSending()) {
+		session().api().cancelLocalItem(item);
+	}
 
 	owner().unregisterMessage(item);
 	Core::App().notifications().clearFromItem(item);
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 1dcfc1f88..849d79ebd 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -69,7 +69,7 @@ constexpr auto kExportLocalTimeout = crl::time(1000);
 //}
 
 MsgId ItemIdAcrossData(not_null<HistoryItem*> item) {
-	if (!item->isScheduled()) {
+	if (!item->isScheduled() || item->isSending() || item->hasFailed()) {
 		return item->id;
 	}
 	const auto session = &item->history()->session();

From 00c962e55784776fcec2c07c16f116cecdd1ccd5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 11:24:02 +0300
Subject: [PATCH 008/190] Bump cmake_helpers submodule.

---
 cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake b/cmake
index 5d6f8ebee..18bf821e5 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 5d6f8ebee32e334543b3f1fa43907a700bf8bde7
+Subproject commit 18bf821e506749afdd9826836adb38ffae0ea454

From 143b9682a43575a4a9ec2bc1bbe893cb23250496 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 12 Oct 2020 16:04:54 +0400
Subject: [PATCH 009/190] Get rid of lxqt-qtplugin

It is stil impossible to build it statically and it seems that reading icon theme from gtk is pretty enough
---
 .gitmodules                                | 6 ------
 Telegram/CMakeLists.txt                    | 8 --------
 Telegram/SourceFiles/qt_static_plugins.cpp | 7 -------
 Telegram/ThirdParty/libqtxdg               | 1 -
 Telegram/ThirdParty/lxqt-qtplugin          | 1 -
 5 files changed, 23 deletions(-)
 delete mode 160000 Telegram/ThirdParty/libqtxdg
 delete mode 160000 Telegram/ThirdParty/lxqt-qtplugin

diff --git a/.gitmodules b/.gitmodules
index 1ce899afc..d4624361b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -82,12 +82,6 @@
 [submodule "Telegram/ThirdParty/qt5ct"]
 	path = Telegram/ThirdParty/qt5ct
 	url = https://github.com/desktop-app/qt5ct.git
-[submodule "Telegram/ThirdParty/lxqt-qtplugin"]
-	path = Telegram/ThirdParty/lxqt-qtplugin
-	url = https://github.com/lxqt/lxqt-qtplugin.git
-[submodule "Telegram/ThirdParty/libqtxdg"]
-	path = Telegram/ThirdParty/libqtxdg
-	url = https://github.com/lxqt/libqtxdg.git
 [submodule "Telegram/ThirdParty/fcitx5-qt"]
 	path = Telegram/ThirdParty/fcitx5-qt
 	url = https://github.com/fcitx/fcitx5-qt.git
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 7d896a91b..19e767410 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -112,14 +112,6 @@ if (LINUX)
     )
 
     if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
-        # conflicts with Qt static link
-        if (DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES)
-            target_link_libraries(Telegram
-            PRIVATE
-                desktop-app::external_lxqt_qtplugin
-            )
-        endif()
-
         target_link_libraries(Telegram
         PRIVATE
             desktop-app::external_statusnotifieritem
diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp
index c5f7473ce..5dffd6a7a 100644
--- a/Telegram/SourceFiles/qt_static_plugins.cpp
+++ b/Telegram/SourceFiles/qt_static_plugins.cpp
@@ -62,11 +62,4 @@ Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
 Q_IMPORT_PLUGIN(Qt5CTPlatformThemePlugin)
 Q_IMPORT_PLUGIN(Qt5CTStylePlugin)
 #endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES
-
-// conflicts with Qt static link
-#ifdef DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-Q_IMPORT_PLUGIN(LXQtPlatformThemePlugin)
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-#endif // DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES
 #endif // Q_OS_UNIX && !Q_OS_MAC
diff --git a/Telegram/ThirdParty/libqtxdg b/Telegram/ThirdParty/libqtxdg
deleted file mode 160000
index ae412d30c..000000000
--- a/Telegram/ThirdParty/libqtxdg
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ae412d30c695f3d4ce9b79feabc937eefde5537b
diff --git a/Telegram/ThirdParty/lxqt-qtplugin b/Telegram/ThirdParty/lxqt-qtplugin
deleted file mode 160000
index 418162b36..000000000
--- a/Telegram/ThirdParty/lxqt-qtplugin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 418162b36eff24fe70fd9195c60fae7276afa286

From f58874572da95eb6aadb25623c6b86648f8c94bf Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 12 Oct 2020 17:17:57 +0400
Subject: [PATCH 010/190] Check actual socket path length rather than
 InSnap/InFlatpak

---
 Telegram/SourceFiles/platform/linux/specific_linux.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 179785e54..753b61e2f 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -799,10 +799,15 @@ QString AppRuntimeDirectory() {
 }
 
 QString SingleInstanceLocalServerName(const QString &hash) {
-	if (InFlatpak() || InSnap()) {
+	const auto idealSocketPath = AppRuntimeDirectory()
+		+ hash
+		+ '-'
+		+ cGUIDStr();
+
+	if (idealSocketPath.size() > 108) {
 		return AppRuntimeDirectory() + hash;
 	} else {
-		return AppRuntimeDirectory() + hash + '-' + cGUIDStr();
+		return idealSocketPath;
 	}
 }
 

From 0179a2ca104c6d09fbaad1558f6f6d5399b63ebb Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 13 Oct 2020 12:47:46 +0400
Subject: [PATCH 011/190] Rename InstallMainDesktopFile to InstallLauncher

---
 Telegram/SourceFiles/platform/linux/specific_linux.cpp | 4 ++--
 Telegram/SourceFiles/platform/linux/specific_linux.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 753b61e2f..799e0f3fa 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -1253,7 +1253,7 @@ void start() {
 void finish() {
 }
 
-void InstallMainDesktopFile() {
+void InstallLauncher() {
 	static const auto DisabledByEnv = qEnvironmentVariableIsSet(
 		"TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION");
 
@@ -1421,7 +1421,7 @@ void finish() {
 } // namespace Platform
 
 void psNewVersion() {
-	Platform::InstallMainDesktopFile();
+	Platform::InstallLauncher();
 	Platform::RegisterCustomScheme();
 }
 
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.h b/Telegram/SourceFiles/platform/linux/specific_linux.h
index 1b4cdc0d5..1772a3c87 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.h
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.h
@@ -42,7 +42,7 @@ QString GetIconName();
 inline void IgnoreApplicationActivationRightNow() {
 }
 
-void InstallMainDesktopFile();
+void InstallLauncher();
 
 } // namespace Platform
 

From 4033a091b55d347ff21472b6b450363a131eb061 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 12 Oct 2020 12:05:43 +0400
Subject: [PATCH 012/190] Hide mark as read button in notifications when app is
 pass-code locked

---
 .../platform/linux/notifications_manager_linux.cpp          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index b6343df49..0695810d0 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -307,8 +307,10 @@ NotificationData::NotificationData(
 		_actions.push_back(qsl("default"));
 		_actions.push_back(QString());
 
-		_actions.push_back(qsl("mail-mark-read"));
-		_actions.push_back(tr::lng_context_mark_read(tr::now));
+		if (!hideReplyButton) {
+			_actions.push_back(qsl("mail-mark-read"));
+			_actions.push_back(tr::lng_context_mark_read(tr::now));
+		}
 
 		if (capabilities.contains(qsl("inline-reply")) && !hideReplyButton) {
 			_actions.push_back(qsl("inline-reply"));

From ca67ac913fbb51d431dacd5fc06c56109bb176b8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 15 Oct 2020 20:31:40 +0400
Subject: [PATCH 013/190] Check for KDE portal backend when using portals on
 KDE

---
 .../platform/linux/specific_linux.cpp         | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 799e0f3fa..d88e91c80 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -123,6 +123,14 @@ void PortalAutostart(bool autostart, bool silent = false) {
 	}
 }
 
+bool IsXDGDesktopPortalKDEPresent() {
+	static const auto Result = QDBusInterface(
+		qsl("org.freedesktop.impl.portal.desktop.kde"),
+		kXDGDesktopPortalObjectPath.utf16()).isValid();
+
+	return Result;
+}
+
 uint FileChooserPortalVersion() {
 	static const auto Result = [&]() -> uint {
 		auto message = QDBusMessage::createMethodCall(
@@ -731,17 +739,20 @@ bool IsXDGDesktopPortalPresent() {
 }
 
 bool UseXDGDesktopPortal() {
+#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	static const auto Result = [&] {
 		const auto envVar = qEnvironmentVariableIsSet("TDESKTOP_USE_PORTAL");
 		const auto portalPresent = IsXDGDesktopPortalPresent();
+		const auto neededForKde = DesktopEnvironment::IsKDE()
+			&& IsXDGDesktopPortalKDEPresent();
 
-		return (
-			DesktopEnvironment::IsKDE()
-				|| envVar
-			) && portalPresent;
+		return (neededForKde || envVar) && portalPresent;
 	}();
 
 	return Result;
+#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+
+	return false;
 }
 
 bool CanOpenDirectoryWithPortal() {

From 4f2b0531f8a98a561569858b0a7155b74acaefec Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 8 Oct 2020 20:40:32 +0400
Subject: [PATCH 014/190] Replace GDBusProxy with GDBusConnection in
 NotificationData

---
 .../linux/notifications_manager_linux.cpp     | 124 ++++++++++++++----
 1 file changed, 99 insertions(+), 25 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 0695810d0..1a0b1bc18 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -244,7 +244,7 @@ public:
 	void notificationReplied(uint id, const QString &text);
 
 private:
-	GDBusProxy *_dbusProxy;
+	GDBusConnection *_dbusConnection = nullptr;
 	base::weak_ptr<Manager> _manager;
 
 	QString _title;
@@ -255,14 +255,19 @@ private:
 	QImage _image;
 
 	uint _notificationId = 0;
+	guint _actionInvokedSignalId = 0;
+	guint _notificationRepliedSignalId = 0;
+	guint _notificationClosedSignalId = 0;
 	NotificationId _id;
 
 	static void signalEmitted(
-		GDBusProxy *proxy,
-		gchar *sender_name,
-		gchar *signal_name,
+		GDBusConnection *connection,
+		const gchar *sender_name,
+		const gchar *object_path,
+		const gchar *interface_name,
+		const gchar *signal_name,
 		GVariant *parameters,
-		NotificationData *notificationData);
+		gpointer user_data);
 
 };
 
@@ -275,20 +280,24 @@ NotificationData::NotificationData(
 	const QString &msg,
 	NotificationId id,
 	bool hideReplyButton)
-: _dbusProxy(g_dbus_proxy_new_for_bus_sync(
-	G_BUS_TYPE_SESSION,
-	G_DBUS_PROXY_FLAGS_NONE,
-	nullptr,
-	kService.utf8(),
-	kObjectPath.utf8(),
-	kInterface.utf8(),
-	nullptr,
-	nullptr))
-, _manager(manager)
+: _manager(manager)
 , _title(title)
 , _imageKey(GetImageKey(ParseSpecificationVersion(
 	GetServerInformation())))
 , _id(id) {
+	GError *error = nullptr;
+
+	_dbusConnection = g_bus_get_sync(
+		G_BUS_TYPE_SESSION,
+		nullptr,
+		&error);
+
+	if (error) {
+		LOG(("Native notification error: %1").arg(error->message));
+		g_error_free(error);
+		return;
+	}
+
 	const auto capabilities = GetCapabilities();
 
 	if (capabilities.contains(qsl("body-markup"))) {
@@ -315,11 +324,35 @@ NotificationData::NotificationData(
 		if (capabilities.contains(qsl("inline-reply")) && !hideReplyButton) {
 			_actions.push_back(qsl("inline-reply"));
 			_actions.push_back(tr::lng_notification_reply(tr::now));
+
+			_notificationRepliedSignalId = g_dbus_connection_signal_subscribe(
+				_dbusConnection,
+				kService.utf8(),
+				kInterface.utf8(),
+				"NotificationReplied",
+				kObjectPath.utf8(),
+				nullptr,
+				G_DBUS_SIGNAL_FLAGS_NONE,
+				signalEmitted,
+				this,
+				nullptr);
 		} else {
 			// icon name according to https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
 			_actions.push_back(qsl("mail-reply-sender"));
 			_actions.push_back(tr::lng_notification_reply(tr::now));
 		}
+
+		_actionInvokedSignalId = g_dbus_connection_signal_subscribe(
+			_dbusConnection,
+			kService.utf8(),
+			kInterface.utf8(),
+			"ActionInvoked",
+			kObjectPath.utf8(),
+			nullptr,
+			G_DBUS_SIGNAL_FLAGS_NONE,
+			signalEmitted,
+			this,
+			nullptr);
 	}
 
 	if (capabilities.contains(qsl("action-icons"))) {
@@ -353,11 +386,35 @@ NotificationData::NotificationData(
 		qsl("desktop-entry"),
 		g_variant_new_string(GetLauncherBasename().toUtf8()));
 
-	g_signal_connect(_dbusProxy, "g-signal", G_CALLBACK(signalEmitted), this);
+	_notificationClosedSignalId = g_dbus_connection_signal_subscribe(
+		_dbusConnection,
+		kService.utf8(),
+		kInterface.utf8(),
+		"NotificationClosed",
+		kObjectPath.utf8(),
+		nullptr,
+		G_DBUS_SIGNAL_FLAGS_NONE,
+		signalEmitted,
+		this,
+		nullptr);
 }
 
 NotificationData::~NotificationData() {
-	g_object_unref(_dbusProxy);
+	if (_dbusConnection) {
+		if (_actionInvokedSignalId != 0) {
+			g_dbus_connection_signal_unsubscribe(_dbusConnection, _actionInvokedSignalId);
+		}
+
+		if (_notificationRepliedSignalId != 0) {
+			g_dbus_connection_signal_unsubscribe(_dbusConnection, _notificationRepliedSignalId);
+		}
+
+		if (_notificationClosedSignalId != 0) {
+			g_dbus_connection_signal_unsubscribe(_dbusConnection, _notificationClosedSignalId);
+		}
+
+		g_object_unref(_dbusConnection);
+	}
 
 	for (const auto &[key, value] : _hints) {
 		if (value) {
@@ -393,8 +450,11 @@ bool NotificationData::show() {
 		? GetIconName()
 		: QString();
 
-	auto reply = g_dbus_proxy_call_sync(
-		_dbusProxy,
+	auto reply = g_dbus_connection_call_sync(
+		_dbusConnection,
+		kService.utf8(),
+		kObjectPath.utf8(),
+		kInterface.utf8(),
 		"Notify",
 		g_variant_new(
 			kNotifyArgsType.utf8(),
@@ -406,6 +466,7 @@ bool NotificationData::show() {
 			&actionsBuilder,
 			&hintsBuilder,
 			-1),
+		nullptr,
 		G_DBUS_CALL_FLAGS_NONE,
 		kDBusTimeout,
 		nullptr,
@@ -425,10 +486,14 @@ bool NotificationData::show() {
 }
 
 void NotificationData::close() {
-	g_dbus_proxy_call(
-		_dbusProxy,
+	g_dbus_connection_call(
+		_dbusConnection,
+		kService.utf8(),
+		kObjectPath.utf8(),
+		kInterface.utf8(),
 		"CloseNotification",
 		g_variant_new("(u)", _notificationId),
+		nullptr,
 		G_DBUS_CALL_FLAGS_NONE,
 		-1,
 		nullptr,
@@ -465,11 +530,20 @@ void NotificationData::setImage(const QString &imagePath) {
 }
 
 void NotificationData::signalEmitted(
-		GDBusProxy *proxy,
-		gchar *sender_name,
-		gchar *signal_name,
+		GDBusConnection *connection,
+		const gchar *sender_name,
+		const gchar *object_path,
+		const gchar *interface_name,
+		const gchar *signal_name,
 		GVariant *parameters,
-		NotificationData *notificationData) {
+		gpointer user_data) {
+	const auto notificationData = reinterpret_cast<NotificationData*>(
+		user_data);
+
+	if (!notificationData) {
+		return;
+	}
+
 	if(signal_name == qstr("ActionInvoked")) {
 		guint32 id;
 		gchar *actionName;

From 1373bd0af1fcad188c5e7b1a057590aa42a60788 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 12:47:41 +0300
Subject: [PATCH 015/190] Use OpenAL 1.20.1 with bugfix backport on Windows.

---
 Telegram/lib_base     | 2 +-
 Telegram/lib_ui       | 2 +-
 docs/building-msvc.md | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 4f03dbd9a..98224799e 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 4f03dbd9a0c3dce0268fa208bf1e3ffff4c95c72
+Subproject commit 98224799e420dfcca33af816b11e261080cb1fed
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index ae340a0b7..914df12eb 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit ae340a0b76421fedf73421b0d42f688341658b45
+Subproject commit 914df12ebe3231dbdd5150d5b33cfab2e7dabe17
diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index c0a2b3123..1d6ee5de7 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -102,14 +102,13 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
 
     git clone https://github.com/telegramdesktop/openal-soft.git
     cd openal-soft
-    git checkout fix_capture
+    git checkout fix_mono
     cd build
     cmake .. ^
     -G "Visual Studio 16 2019" ^
     -A Win32 ^
     -D LIBTYPE:STRING=STATIC ^
-    -D FORCE_STATIC_VCRT=ON ^
-    -D ALSOFT_BACKEND_WASAPI=OFF
+    -D FORCE_STATIC_VCRT=ON
     msbuild OpenAL.vcxproj /property:Configuration=Debug
     msbuild OpenAL.vcxproj /property:Configuration=Release
     cd ..\..

From 1fdfa94497d3d820a4a9c7ef6adefd531e9f3af7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 23 Oct 2020 13:49:31 +0400
Subject: [PATCH 016/190] Remove explicit Opus clone step from macos action

Since no longer needed
---
 .github/workflows/mac.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 3555d3334..2d1ff6613 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -169,17 +169,14 @@ jobs:
         with:
           path: ${{ env.LibrariesPath }}/opus-cache
           key: ${{ runner.OS }}-opus-${{ env.CACHE_KEY }}
-      - name: Opus clone.
-        run: |
-          cd $LibrariesPath
-
-          git clone -b v1.3 --depth=1 $GIT/xiph/opus
-      - name: Opus build.
+      - name: Opus.
         if: steps.cache-opus.outputs.cache-hit != 'true'
         run: |
           cd $LibrariesPath
 
+          git clone $GIT/xiph/opus
           cd opus
+          git checkout v1.3
           ./autogen.sh
           CFLAGS="$MIN_MAC $UNGUARDED" CPPFLAGS="$MIN_MAC $UNGUARDED" LDFLAGS="$MIN_MAC" ./configure --prefix=$PREFIX
           make -j$(nproc)

From 9697567b8d2c3edb7ea742baf901ab1c6f40828d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 13:10:30 +0300
Subject: [PATCH 017/190] Add some more open file warnings.

---
 Telegram/Resources/langs/lang.strings       |  1 +
 Telegram/SourceFiles/core/core_settings.cpp |  9 ++-
 Telegram/SourceFiles/core/core_settings.h   |  7 +++
 Telegram/SourceFiles/data/data_document.cpp | 67 +++++++++++++--------
 Telegram/SourceFiles/data/data_document.h   |  7 ++-
 5 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d045626dd..78d54b851 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2271,6 +2271,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_language_not_ready_link" = "translations platform";
 
 "lng_launch_exe_warning" = "This file has a {extension} extension.\nAre you sure you want to run it?";
+"lng_launch_svg_warning" = "Opening this file can potentially expose your IP address to its sender. Continue?";
 "lng_launch_exe_sure" = "Run";
 "lng_launch_exe_dont_ask" = "Don't ask me again";
 
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 43fdefe2d..a7b0b124d 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -109,7 +109,8 @@ QByteArray Settings::serialize() const {
 			<< qint32(_notifyFromAll ? 1 : 0)
 			<< qint32(_nativeWindowFrame.current() ? 1 : 0)
 			<< qint32(_systemDarkModeEnabled.current() ? 1 : 0)
-			<< _callVideoInputDeviceId;
+			<< _callVideoInputDeviceId
+			<< qint32(_ipRevealWarning ? 1 : 0);
 	}
 	return result;
 }
@@ -176,6 +177,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 notifyFromAll = _notifyFromAll ? 1 : 0;
 	qint32 nativeWindowFrame = _nativeWindowFrame.current() ? 1 : 0;
 	qint32 systemDarkModeEnabled = _systemDarkModeEnabled.current() ? 1 : 0;
+	qint32 ipRevealWarning = _ipRevealWarning ? 1 : 0;
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -259,6 +261,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> callVideoInputDeviceId;
 	}
+	if (!stream.atEnd()) {
+		stream >> ipRevealWarning;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -318,6 +323,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_includeMutedCounter = (includeMutedCounter == 1);
 	_countUnreadMessages = (countUnreadMessages == 1);
 	_exeLaunchWarning = (exeLaunchWarning == 1);
+	_ipRevealWarning = (ipRevealWarning == 1);
 	_notifyAboutPinned = (notifyAboutPinned == 1);
 	_loopAnimatedStickers = (loopAnimatedStickers == 1);
 	_largeEmoji = (largeEmoji == 1);
@@ -468,6 +474,7 @@ void Settings::resetOnLastLogout() {
 	_soundOverrides = {};
 
 	_exeLaunchWarning = true;
+	_ipRevealWarning = true;
 	_loopAnimatedStickers = true;
 	_largeEmoji = true;
 	_replaceEmoji = true;
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index a774db095..d9c0bfaa8 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -255,6 +255,12 @@ public:
 	void setExeLaunchWarning(bool warning) {
 		_exeLaunchWarning = warning;
 	}
+	[[nodiscard]] bool ipRevealWarning() const {
+		return _ipRevealWarning;
+	}
+	void setIpRevealWarning(bool warning) {
+		_ipRevealWarning = warning;
+	}
 	[[nodiscard]] bool loopAnimatedStickers() const {
 		return _loopAnimatedStickers;
 	}
@@ -513,6 +519,7 @@ private:
 	Ui::InputSubmitSettings _sendSubmitWay;
 	base::flat_map<QString, QString> _soundOverrides;
 	bool _exeLaunchWarning = true;
+	bool _ipRevealWarning = true;
 	bool _loopAnimatedStickers = true;
 	rpl::variable<bool> _largeEmoji = true;
 	rpl::variable<bool> _replaceEmoji = true;
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index b30b7eb48..f9fcac1e9 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -74,15 +74,15 @@ void LaunchWithWarning(
 		not_null<Main::Session*> session,
 		const QString &name,
 		HistoryItem *item) {
+	const auto isExecutable = Data::IsExecutableName(name);
+	const auto isIpReveal = Data::IsIpRevealingName(name);
+	auto &app = Core::App();
 	const auto warn = [&] {
-		if (!Data::IsExecutableName(name)) {
-			return false;
-		} else if (!Core::App().settings().exeLaunchWarning()) {
-			return false;
-		} else if (item && item->history()->peer->isVerified()) {
+		if (item && item->history()->peer->isVerified()) {
 			return false;
 		}
-		return true;
+		return (isExecutable && app.settings().exeLaunchWarning())
+			|| (isIpReveal && app.settings().ipRevealWarning());
 	}();
 	const auto extension = '.' + Data::FileExtension(name);
 	if (Platform::IsWindows() && extension == u"."_q) {
@@ -99,20 +99,27 @@ void LaunchWithWarning(
 		File::Launch(name);
 		return;
 	}
-	const auto callback = [=](bool checked) {
+	const auto callback = [=, &app](bool checked) {
 		if (checked) {
-			Core::App().settings().setExeLaunchWarning(false);
-			Core::App().saveSettingsDelayed();
+			if (isExecutable) {
+				app.settings().setExeLaunchWarning(false);
+			} else if (isIpReveal) {
+				app.settings().setIpRevealWarning(false);
+			}
+			app.saveSettingsDelayed();
 		}
 		File::Launch(name);
 	};
-	Ui::show(Box<ConfirmDontWarnBox>(
-		tr::lng_launch_exe_warning(
+	auto text = isExecutable
+		? tr::lng_launch_exe_warning(
 			lt_extension,
 			rpl::single(Ui::Text::Bold(extension)),
-			Ui::Text::WithEntities),
+			Ui::Text::WithEntities)
+		: tr::lng_launch_svg_warning(Ui::Text::WithEntities);
+	Ui::show(Box<ConfirmDontWarnBox>(
+		std::move(text),
 		tr::lng_launch_exe_dont_ask(tr::now),
-		tr::lng_launch_exe_sure(),
+		(isExecutable ? tr::lng_launch_exe_sure : tr::lng_continue)(),
 		callback));
 }
 
@@ -1668,17 +1675,17 @@ mpkg pkg scpt scptd xhtm webarchive");
 slp zsh");
 #else // Q_OS_MAC || Q_OS_UNIX
 			qsl("\
-ad ade adp app application appref-ms asp asx bas bat bin cdxml cer cfg chi \
-chm cmd cnt com cpl crt csh der diagcab dll drv eml exe fon fxp gadget grp \
-hlp hpj hta htt inf ini ins inx isp isu its jar jnlp job js jse ksh lnk \
-local lua mad maf mag mam manifest maq mar mas mat mau mav maw mcf mda mdb \
-mde mdt mdw mdz mht mhtml mjs mmc mof msc msg msh msh1 msh2 msh1xml msh2xml \
-mshxml msi msp mst ops osd paf pcd phar php php3 php4 php5 php7 phps php-s \
-pht phtml pif pl plg pm pod prf prg ps1 ps2 ps1xml ps2xml psc1 psc2 psd1 \
-psm1 pssc pst py py3 pyc pyd pyi pyo pyw pywz pyz rb reg rgs scf scr sct \
-search-ms settingcontent-ms sh shb shs slk sys t tmp u3p url vb vbe vbp vbs \
-vbscript vdx vsmacros vsd vsdm vsdx vss vssm vssx vst vstm vstx vsw vsx vtx \
-website ws wsc wsf wsh xbap xll xnk xs");
+ad ade adp app application appref-ms asp asx bas bat bin cab cdxml cer cfg \
+chi chm cmd cnt com cpl crt csh der diagcab dll drv eml exe fon fxp gadget \
+grp hlp hpj hta htt inf ini ins inx isp isu its jar jnlp job js jse key ksh \
+lnk local lua mad maf mag mam manifest maq mar mas mat mau mav maw mcf mda \
+mdb mde mdt mdw mdz mht mhtml mjs mmc mof msc msg msh msh1 msh2 msh1xml \
+msh2xml mshxml msi msp mst ops osd paf pcd phar php php3 php4 php5 php7 phps \
+php-s pht phtml pif pl plg pm pod prf prg ps1 ps2 ps1xml ps2xml psc1 psc2 \
+psd1 psm1 pssc pst py py3 pyc pyd pyi pyo pyw pywz pyz rb reg rgs scf scr \
+sct search-ms settingcontent-ms sh shb shs slk sys t tmp u3p url vb vbe vbp \
+vbs vbscript vdx vsmacros vsd vsdm vsdx vss vssm vssx vst vstm vstx vsw vsx \
+vtx website ws wsc wsf wsh xbap xll xnk xs");
 #endif // !Q_OS_MAC && !Q_OS_UNIX
 		const auto list = joined.split(' ');
 		return base::flat_set<QString>(list.begin(), list.end());
@@ -1689,6 +1696,18 @@ website ws wsc wsf wsh xbap xll xnk xs");
 		FileExtension(filepath).toLower());
 }
 
+bool IsIpRevealingName(const QString &filepath) {
+	static const auto kExtensions = [] {
+		const auto joined = u"htm html svg"_q;
+		const auto list = joined.split(' ');
+		return base::flat_set<QString>(list.begin(), list.end());
+	}();
+
+	return ranges::binary_search(
+		kExtensions,
+		FileExtension(filepath).toLower());
+}
+
 base::binary_guard ReadImageAsync(
 		not_null<Data::DocumentMedia*> media,
 		FnMut<QImage(QImage)> postprocess,
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index ea6a8528c..efd777f5e 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -443,9 +443,10 @@ QString DocumentFileNameForSave(
 
 namespace Data {
 
-QString FileExtension(const QString &filepath);
-bool IsValidMediaFile(const QString &filepath);
-bool IsExecutableName(const QString &filepath);
+[[nodiscard]] QString FileExtension(const QString &filepath);
+[[nodiscard]] bool IsValidMediaFile(const QString &filepath);
+[[nodiscard]] bool IsExecutableName(const QString &filepath);
+[[nodiscard]] bool IsIpRevealingName(const QString &filepath);
 base::binary_guard ReadImageAsync(
 	not_null<Data::DocumentMedia*> media,
 	FnMut<QImage(QImage)> postprocess,

From 8b27aa533131a27158e89de323b2ac8f1ca3ca27 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 13:11:42 +0300
Subject: [PATCH 018/190] Update cmake_helpers submodule.

---
 cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake b/cmake
index 18bf821e5..b485d43a4 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 18bf821e506749afdd9826836adb38ffae0ea454
+Subproject commit b485d43a45eec75b8cbc0ab966ab3c06b5e8bac8

From 367b028094ee161aba362670bbfa21613fbac159 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 7 Oct 2020 20:08:50 +0300
Subject: [PATCH 019/190] Moved contacts box preparing to single place.

---
 .../SourceFiles/boxes/peer_list_controllers.cpp   | 15 +++++++++++++++
 .../SourceFiles/boxes/peer_list_controllers.h     |  4 ++++
 .../platform/linux/main_window_linux.cpp          | 13 +------------
 .../SourceFiles/platform/mac/main_window_mac.mm   |  5 +----
 Telegram/SourceFiles/window/window_main_menu.cpp  |  5 +----
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index fb9cd3ad9..4b8041fab 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_histories.h"
 #include "apiwrap.h"
 #include "mainwidget.h"
+#include "mainwindow.h"
 #include "lang/lang_keys.h"
 #include "history/history.h"
 #include "dialogs/dialogs_main_list.h"
@@ -104,6 +105,20 @@ void AddBotToGroup(not_null<UserData*> bot, not_null<PeerData*> chat) {
 //	return mapFromGlobal(QCursor::pos()) - _st.rippleAreaPosition;
 //}
 
+object_ptr<Ui::BoxContent> PrepareContactsBox(
+		not_null<Window::SessionController*> sessionController) {
+	const auto controller = sessionController;
+	auto delegate = [=](not_null<PeerListBox*> box) {
+		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
+		box->addLeftButton(
+			tr::lng_profile_add_contact(),
+			[=] { controller->widget()->onShowAddContact(); });
+	};
+	return Box<PeerListBox>(
+		std::make_unique<ContactsBoxController>(controller),
+		std::move(delegate));
+}
+
 void PeerListRowWithLink::setActionLink(const QString &action) {
 	_action = action;
 	refreshActionLink();
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.h b/Telegram/SourceFiles/boxes/peer_list_controllers.h
index 02eb810b4..17d495241 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.h
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.h
@@ -31,9 +31,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 class History;
 
 namespace Window {
+class SessionController;
 class SessionNavigation;
 } // namespace Window
 
+[[nodiscard]] object_ptr<Ui::BoxContent> PrepareContactsBox(
+	not_null<Window::SessionController*> sessionController);
+
 class PeerListRowWithLink : public PeerListRow {
 public:
 	using PeerListRow::PeerListRow;
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 1c3171c57..1c8a1cbb5 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -950,18 +950,7 @@ void MainWindow::createGlobalMenu() {
 				return;
 			}
 
-			Ui::show(
-				Box<PeerListBox>(std::make_unique<ContactsBoxController>(
-					sessionController()),
-				[](not_null<PeerListBox*> box) {
-					box->addButton(tr::lng_close(), [box] {
-						box->closeBox();
-					});
-
-					box->addLeftButton(tr::lng_profile_add_contact(), [] {
-						App::wnd()->onShowAddContact();
-					});
-				}));
+			Ui::show(PrepareContactsBox(sessionController()));
 		}));
 
 	psAddContact = tools->addAction(
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index e008f9ba1..6fbd9ec11 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -721,10 +721,7 @@ void MainWindow::createGlobalMenu() {
 		if (!sessionController()) {
 			return;
 		}
-		Ui::show(Box<PeerListBox>(std::make_unique<ContactsBoxController>(sessionController()), [](not_null<PeerListBox*> box) {
-			box->addButton(tr::lng_close(), [box] { box->closeBox(); });
-			box->addLeftButton(tr::lng_profile_add_contact(), [] { App::wnd()->onShowAddContact(); });
-		}));
+		Ui::show(PrepareContactsBox(sessionController()));
 	}));
 	psAddContact = window->addAction(tr::lng_mac_menu_add_contact(tr::now), App::wnd(), SLOT(onShowAddContact()));
 	window->addSeparator();
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index d56d252e2..c4cfe2a0b 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -861,10 +861,7 @@ void MainMenu::refreshMenu() {
 			App::wnd()->onShowNewChannel();
 		}, &st::mainMenuNewChannel, &st::mainMenuNewChannelOver);
 		_menu->addAction(tr::lng_menu_contacts(tr::now), [=] {
-			Ui::show(Box<PeerListBox>(std::make_unique<ContactsBoxController>(controller), [](not_null<PeerListBox*> box) {
-				box->addButton(tr::lng_close(), [box] { box->closeBox(); });
-				box->addLeftButton(tr::lng_profile_add_contact(), [] { App::wnd()->onShowAddContact(); });
-			}));
+			Ui::show(PrepareContactsBox(controller));
 		}, &st::mainMenuContacts, &st::mainMenuContactsOver);
 		if (_controller->session().serverConfig().phoneCallsEnabled.current()) {
 			_menu->addAction(tr::lng_menu_calls(tr::now), [=] {

From 7de9bcad03959faa6eaa48aa0dc1df9907252f22 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 7 Oct 2020 21:06:22 +0300
Subject: [PATCH 020/190] Added ability to open contacts with shortcut.

Fixed #8775.
---
 Telegram/SourceFiles/core/shortcuts.cpp               | 3 +++
 Telegram/SourceFiles/core/shortcuts.h                 | 1 +
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index 3e39a37cb..ef50008ef 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -88,6 +88,7 @@ const auto CommandByName = base::flat_map<QString, Command>{
 	{ qsl("last_folder")       , Command::ShowFolderLast },
 
 	{ qsl("show_archive")      , Command::ShowArchive },
+	{ qsl("show_contacts")     , Command::ShowContacts },
 
 	{ qsl("read_chat")         , Command::ReadChat },
 
@@ -132,6 +133,7 @@ const auto CommandNames = base::flat_map<Command, QString>{
 	{ Command::ShowFolderLast , qsl("last_folder") },
 
 	{ Command::ShowArchive    , qsl("show_archive") },
+	{ Command::ShowContacts   , qsl("show_contacts") },
 
 	{ Command::ReadChat       , qsl("read_chat") },
 };
@@ -383,6 +385,7 @@ void Manager::fillDefaults() {
 	set(qsl("ctrl+0"), Command::ChatSelf);
 
 	set(qsl("ctrl+9"), Command::ShowArchive);
+	set(qsl("ctrl+shift+n"), Command::ShowContacts);
 
 	set(qsl("ctrl+r"), Command::ReadChat);
 }
diff --git a/Telegram/SourceFiles/core/shortcuts.h b/Telegram/SourceFiles/core/shortcuts.h
index c64877dca..c6a8b596a 100644
--- a/Telegram/SourceFiles/core/shortcuts.h
+++ b/Telegram/SourceFiles/core/shortcuts.h
@@ -48,6 +48,7 @@ enum class Command {
 	FolderPrevious,
 
 	ShowArchive,
+	ShowContacts,
 
 	JustSendMessage,
 	SendSilentMessage,
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index f978ecbe5..5f4e32335 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -3178,6 +3178,11 @@ void InnerWidget::setupShortcuts() {
 			return (history != nullptr);
 		});
 
+		request->check(Command::ShowContacts) && request->handle([=] {
+			Ui::show(PrepareContactsBox(_controller));
+			return true;
+		});
+
 		if (session().supportMode() && row.key.history()) {
 			request->check(
 				Command::SupportScrollToCurrent

From 5540b0bb8bac677123ff3ff030258eeae2ab7b59 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 7 Oct 2020 21:38:45 +0300
Subject: [PATCH 021/190] Fixed glitch for scheduled messages with elapsed date
 in channels.

---
 Telegram/SourceFiles/api/api_updates.cpp      | 32 ++++++++++++-------
 .../data/data_scheduled_messages.cpp          | 10 +++---
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 4322cf935..28673ceac 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -63,6 +63,22 @@ enum class DataIsLoadedResult {
 	Ok = 3,
 };
 
+void ProcessScheduledMessageWithElapsedTime(
+		not_null<Main::Session*> session,
+		bool needToAdd,
+		const MTPDmessage &data) {
+	if (needToAdd && !data.is_from_scheduled()) {
+		// If we still need to add a new message,
+		// we should first check if this message is in
+		// the list of scheduled messages.
+		// This is necessary to correctly update the file reference.
+		// Note that when a message is scheduled until online
+		// while the recipient is already online, the server sends
+		// an ordinary new message with skipped "from_scheduled" flag.
+		session->data().scheduledMessages().checkEntitiesAndUpdate(data);
+	}
+}
+
 bool IsForceLogoutNotification(const MTPDupdateServiceNotification &data) {
 	return qs(data.vtype()).startsWith(qstr("AUTH_KEY_DROP_"));
 }
@@ -958,17 +974,7 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 				LOG(("Skipping message, because it is already in blocks!"));
 				needToAdd = false;
 			}
-			if (needToAdd && !data.is_from_scheduled()) {
-				// If we still need to add a new message,
-				// we should first check if this message is in
-				// the list of scheduled messages.
-				// This is necessary to correctly update the file reference.
-				// Note that when a message is scheduled until online
-				// while the recipient is already online, the server sends
-				// an ordinary new message with skipped "from_scheduled" flag.
-				_session->data().scheduledMessages().checkEntitiesAndUpdate(
-					data);
-			}
+			ProcessScheduledMessageWithElapsedTime(_session, needToAdd, data);
 		}
 		if (needToAdd) {
 			_session->data().addNewMessage(
@@ -1057,10 +1063,12 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 		auto &d = update.c_updateNewChannelMessage();
 		auto needToAdd = true;
 		if (d.vmessage().type() == mtpc_message) { // index forwarded messages to links _overview
-			if (_session->data().checkEntitiesAndViewsUpdate(d.vmessage().c_message())) { // already in blocks
+			const auto &data = d.vmessage().c_message();
+			if (_session->data().checkEntitiesAndViewsUpdate(data)) { // already in blocks
 				LOG(("Skipping message, because it is already in blocks!"));
 				needToAdd = false;
 			}
+			ProcessScheduledMessageWithElapsedTime(_session, needToAdd, data);
 		}
 		if (needToAdd) {
 			_session->data().addNewMessage(
diff --git a/Telegram/SourceFiles/data/data_scheduled_messages.cpp b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
index 9970c811a..c77f95ca3 100644
--- a/Telegram/SourceFiles/data/data_scheduled_messages.cpp
+++ b/Telegram/SourceFiles/data/data_scheduled_messages.cpp
@@ -228,14 +228,12 @@ void ScheduledMessages::apply(const MTPDupdateNewScheduledMessage &update) {
 
 void ScheduledMessages::checkEntitiesAndUpdate(const MTPDmessage &data) {
 	// When the user sends a message with a media scheduled until online
-	// while the recipient is already online, the server sends
-	// updateNewMessage to the client and the client calls this method.
+	// while the recipient is already online, or scheduled message
+	// is already due and is sent immediately, the server sends
+	// updateNewMessage or updateNewChannelMessage to the client
+	// and the client calls this method.
 
 	const auto peer = peerFromMTP(data.vpeer_id());
-	if (!peerIsUser(peer)) {
-		return;
-	}
-
 	const auto history = _session->data().historyLoaded(peer);
 	if (!history) {
 		return;

From 52cca981444bf5c8bc0ea0e98a14e0387acc1092 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 7 Oct 2020 21:59:33 +0300
Subject: [PATCH 022/190] Fixed replies button display in section of scheduled
 messages.

---
 Telegram/SourceFiles/history/history_message.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp
index 9baaf1a61..e6cb8970f 100644
--- a/Telegram/SourceFiles/history/history_message.cpp
+++ b/Telegram/SourceFiles/history/history_message.cpp
@@ -487,7 +487,7 @@ HistoryMessage::HistoryMessage(
 	}
 	config.viaBotId = data.vvia_bot_id().value_or_empty();
 	config.viewsCount = data.vviews().value_or(-1);
-	config.mtpReplies = data.vreplies();
+	config.mtpReplies = isScheduled() ? nullptr : data.vreplies();
 	config.mtpMarkup = data.vreply_markup();
 	config.editDate = data.vedit_date().value_or_empty();
 	config.author = qs(data.vpost_author().value_or_empty());

From bc7975ece776349520ee6ba5e1ea209478714e93 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 20 Oct 2020 23:21:51 +0300
Subject: [PATCH 023/190] Fixed crash when user reschedules already sent
 message.

Fixed #8867.
---
 .../history/view/history_view_context_menu.cpp   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 849d79ebd..68f46aab8 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -420,23 +420,23 @@ bool AddSendNowMessageAction(
 bool AddRescheduleMessageAction(
 		not_null<Ui::PopupMenu*> menu,
 		const ContextMenuRequest &request) {
-	if (!HasEditMessageAction(request)
-		|| !request.item->isScheduled()) {
+	if (!HasEditMessageAction(request) || !request.item->isScheduled()) {
 		return false;
 	}
-	const auto item = request.item;
-	const auto owner = &item->history()->owner();
-	const auto itemId = item->fullId();
+	const auto owner = &request.item->history()->owner();
+	const auto itemId = request.item->fullId();
 	menu->addAction(tr::lng_context_reschedule(tr::now), [=] {
 		const auto item = owner->message(itemId);
 		if (!item) {
 			return;
 		}
 		const auto callback = [=](Api::SendOptions options) {
-			if (!item->media() || !item->media()->webpage()) {
-				options.removeWebPageId = true;
+			if (const auto item = owner->message(itemId)) {
+				if (!item->media() || !item->media()->webpage()) {
+					options.removeWebPageId = true;
+				}
+				Api::RescheduleMessage(item, options);
 			}
-			Api::RescheduleMessage(item, options);
 		};
 
 		const auto peer = item->history()->peer;

From bc8f8bc68cc64d1141140980597fdc39ebe128e9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 20 Oct 2020 23:25:42 +0300
Subject: [PATCH 024/190] Added auto-closing to some boxes which depend on
 certain message.

---
 Telegram/SourceFiles/boxes/edit_caption_box.cpp           | 6 ++++++
 Telegram/SourceFiles/data/data_session.cpp                | 8 ++++++++
 Telegram/SourceFiles/data/data_session.h                  | 2 ++
 .../history/view/history_view_context_menu.cpp            | 8 +++++++-
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index ef5c75254..1f24fc049 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -363,6 +363,12 @@ EditCaptionBox::EditCaptionBox(
 	) | rpl::start_with_next([&](bool checked) {
 		_asFile = checked;
 	}, _wayWrap->lifetime());
+
+	_controller->session().data().itemRemoved(
+		_msgId
+	) | rpl::start_with_next([=] {
+		closeBox();
+	}, lifetime());
 }
 
 EditCaptionBox::~EditCaptionBox() = default;
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index d789e2cf6..b748359af 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -1428,6 +1428,14 @@ rpl::producer<not_null<const HistoryItem*>> Session::itemRemoved() const {
 	return _itemRemoved.events();
 }
 
+rpl::producer<not_null<const HistoryItem*>> Session::itemRemoved(
+		FullMsgId itemId) const {
+	return itemRemoved(
+	) | rpl::filter([=](not_null<const HistoryItem*> item) {
+		return (itemId == item->fullId());
+	});
+}
+
 void Session::notifyViewRemoved(not_null<const ViewElement*> view) {
 	_viewRemoved.fire_copy(view);
 }
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 4ac51efcd..d0337ca86 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -231,6 +231,8 @@ public:
 	[[nodiscard]] rpl::producer<not_null<const History*>> historyUnloaded() const;
 
 	[[nodiscard]] rpl::producer<not_null<const HistoryItem*>> itemRemoved() const;
+	[[nodiscard]] rpl::producer<not_null<const HistoryItem*>> itemRemoved(
+		FullMsgId itemId) const;
 	void notifyViewRemoved(not_null<const ViewElement*> view);
 	[[nodiscard]] rpl::producer<not_null<const ViewElement*>> viewRemoved() const;
 	void notifyHistoryCleared(not_null<const History*> history);
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 68f46aab8..323476590 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -453,13 +453,19 @@ bool AddRescheduleMessageAction(
 			? HistoryView::DefaultScheduleTime()
 			: item->date() + 600;
 
-		Ui::show(
+		const auto box = Ui::show(
 			HistoryView::PrepareScheduleBox(
 				&request.navigation->session(),
 				sendMenuType,
 				callback,
 				date),
 			Ui::LayerOption::KeepOther);
+
+		owner->itemRemoved(
+			itemId
+		) | rpl::start_with_next([=] {
+			box->closeBox();
+		}, box->lifetime());
 	});
 	return true;
 }

From 3a2b772a5d65ea5ca295a785721ef8f3b2641132 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 22 Oct 2020 19:30:23 +0300
Subject: [PATCH 025/190] Added spellchecker to Replies / Scheduled messages
 sections.

Fixed #8793.
---
 .../SourceFiles/history/view/history_view_compose_controls.cpp   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
index 1529cb366..73974f3f9 100644
--- a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
@@ -1005,6 +1005,7 @@ void ComposeControls::initField() {
 		_field,
 		&_window->session());
 	_raiseEmojiSuggestions = [=] { suggestions->raise(); };
+	InitSpellchecker(_window, _field);
 }
 
 void ComposeControls::fieldChanged() {

From 47bb8ec687d44bbff730538fc7361e7e64ac48b7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 5 Sep 2020 02:49:59 +0300
Subject: [PATCH 026/190] Added Github Action that updates user-agent for DNS.

---
 .github/workflows/user_agent_updater.yml | 90 ++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 .github/workflows/user_agent_updater.yml

diff --git a/.github/workflows/user_agent_updater.yml b/.github/workflows/user_agent_updater.yml
new file mode 100644
index 000000000..44c2515af
--- /dev/null
+++ b/.github/workflows/user_agent_updater.yml
@@ -0,0 +1,90 @@
+name: User-agent updater.
+
+on:
+  repository_dispatch:
+    types: ["Restart user_agent_updater workflow."]
+  schedule:
+    # At 00:00 on day-of-month 1.
+    - cron: '0 0 1 * *'
+
+jobs:
+  User-agent:
+    runs-on: ubuntu-latest
+
+    env:
+      code_file: "Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp"
+      skip: "0"
+
+    steps:
+      - name: Clone.
+        if: env.skip == '0'
+        uses: actions/checkout@v2
+
+      - name: Write a new version of Google Chrome to the user-agent for DNS.
+        if: env.skip == '0'
+        shell: python
+        run: |
+          import subprocess, os, re;
+
+          regExpVersion = "[0-9]+.[0-9]+.[0-9]+.[0-9]+";
+          chrome = "Chrome/";
+
+          def newVersion():
+            output = subprocess.check_output(["google-chrome", "--version"]);
+            version = re.search(regExpVersion, output);
+            if not version:
+              print("Can't find a Chrome version.");
+              exit();
+            return version.group(0);
+
+          newChromeVersion = newVersion();
+          print(newChromeVersion);
+
+          def writeUserAgent():
+            p = os.environ['code_file'];
+            w = open(p, "r");
+            content = w.read();
+            w.close();
+
+            regExpChrome = chrome + regExpVersion;
+
+            version = re.search(regExpChrome, content);
+            if not version:
+              print("Can't find an user-agent in the code.");
+              exit();
+            content = re.sub(regExpChrome, chrome + newChromeVersion, content);
+
+            w = open(p, "w");
+            w.write(content);
+
+            print("::set-env name=ChromeVersion::" + newChromeVersion);
+
+          writeUserAgent();
+
+      - name: Push to the current branch.
+        if: env.skip == '0' && env.ChromeVersion != ''
+        run: |
+          token=${{ secrets.TOKEN_FOR_MASTER_UPDATER }}
+          if [ -z "${token}" ]; then
+              echo "Token is unset. Nothing to do."
+              exit 0
+          fi
+
+          url=https://x-access-token:$token@github.com/$GITHUB_REPOSITORY
+
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+
+          git diff > git_diff.txt
+          if [[ ! -s git_diff.txt ]]; then
+            echo "Nothing to commit."
+            exit 0
+          fi
+
+          git add $code_file
+          git commit -m "Update User-Agent for DNS to Chrome $ChromeVersion."
+
+          git remote set-url origin $url
+
+          git push origin HEAD:$GITHUB_REF
+          echo "Done!"

From 3d54a263b8e31a4628d543a1b9d8da9a62bae63f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 15:22:38 +0300
Subject: [PATCH 027/190] Stop playing documents when items are deleted.

---
 Telegram/SourceFiles/data/data_session.cpp       | 10 ++++++++++
 Telegram/SourceFiles/data/data_session.h         |  2 ++
 Telegram/SourceFiles/history/history.cpp         | 10 ++++++++++
 Telegram/SourceFiles/mainwidget.cpp              |  5 +++++
 .../media/player/media_player_instance.cpp       | 16 +++++++++++++---
 .../media/player/media_player_instance.h         |  1 +
 .../media/view/media_view_overlay_widget.cpp     |  7 +++++++
 Telegram/lib_spellcheck                          |  2 +-
 8 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index b748359af..3a186cc30 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -31,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/storage_account.h"
 #include "storage/storage_encrypted_file.h"
 #include "media/player/media_player_instance.h" // instance()->play()
+#include "media/audio/media_audio.h"
 #include "boxes/abstract_box.h"
 #include "passport/passport_form_controller.h"
 #include "window/themes/window_theme.h"
@@ -3333,6 +3334,15 @@ void Session::unregisterContactItem(
 	}
 }
 
+void Session::documentMessageRemoved(not_null<DocumentData*> document) {
+	if (_documentItems.find(document) != _documentItems.end()) {
+		return;
+	}
+	if (document->loading()) {
+		document->cancel();
+	}
+}
+
 void Session::checkPlayingAnimations() {
 	auto check = base::flat_set<not_null<ViewElement*>>();
 	for (const auto view : _heavyViewParts) {
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index d0337ca86..52807a6e8 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -547,6 +547,8 @@ public:
 		UserId contactId,
 		not_null<HistoryItem*> item);
 
+	void documentMessageRemoved(not_null<DocumentData*> document);
+
 	void checkPlayingAnimations();
 
 	HistoryItem *findWebPageItem(not_null<WebPageData*> page) const;
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index f640822d9..7c625f9e7 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel.h"
 #include "data/data_chat.h"
 #include "data/data_user.h"
+#include "data/data_document.h"
 #include "data/data_histories.h"
 #include "lang/lang_keys.h"
 #include "apiwrap.h"
@@ -423,6 +424,11 @@ void History::destroyMessage(not_null<HistoryItem*> item) {
 		session().api().cancelLocalItem(item);
 	}
 
+	const auto document = [&] {
+		const auto media = item->media();
+		return media ? media->document() : nullptr;
+	}();
+
 	owner().unregisterMessage(item);
 	Core::App().notifications().clearFromItem(item);
 
@@ -432,6 +438,10 @@ void History::destroyMessage(not_null<HistoryItem*> item) {
 
 	Assert(i != end(_messages));
 	_messages.erase(i);
+
+	if (document) {
+		session().data().documentMessageRemoved(document);
+	}
 }
 
 not_null<HistoryItem*> History::addNewItem(
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index c0855a983..2c3b51af3 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -349,6 +349,11 @@ MainWidget::MainWidget(
 			if (!songState.id || IsStoppedOrStopping(songState.state)) {
 				closeBothPlayers();
 			}
+		} else if (type == AudioMsgId::Type::Song) {
+			const auto songState = Media::Player::instance()->getState(AudioMsgId::Type::Song);
+			if (!songState.id) {
+				closeBothPlayers();
+			}
 		}
 	});
 
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp
index c96d8940f..673f81490 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp
@@ -203,10 +203,14 @@ void Instance::setSession(not_null<Data*> data, Main::Session *session) {
 		) | rpl::start_with_next([=] {
 			setSession(data, nullptr);
 		}, data->sessionLifetime);
+		session->data().itemRemoved(
+		) | rpl::filter([=](not_null<const HistoryItem*> item) {
+			return (data->current.contextId() == item->fullId());
+		}) | rpl::start_with_next([=] {
+			stopAndClear(data);
+		}, data->sessionLifetime);
 	} else {
-		stop(data->type);
-		_tracksFinishedNotifier.notify(data->type);
-		*data = Data(data->type, data->overview);
+		stopAndClear(data);
 	}
 }
 
@@ -527,6 +531,12 @@ void Instance::stop(AudioMsgId::Type type) {
 	}
 }
 
+void Instance::stopAndClear(not_null<Data*> data) {
+	stop(data->type);
+	_tracksFinishedNotifier.notify(data->type);
+	*data = Data(data->type, data->overview);
+}
+
 void Instance::playPause(AudioMsgId::Type type) {
 	if (const auto data = getData(type)) {
 		if (!data->streamed) {
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.h b/Telegram/SourceFiles/media/player/media_player_instance.h
index 2f2997e8e..07cba2a5b 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.h
+++ b/Telegram/SourceFiles/media/player/media_player_instance.h
@@ -217,6 +217,7 @@ private:
 	void playlistUpdated(not_null<Data*> data);
 	bool moveInPlaylist(not_null<Data*> data, int delta, bool autonext);
 	HistoryItem *itemByIndex(not_null<Data*> data, int index);
+	void stopAndClear(not_null<Data*> data);
 
 	void handleStreamingUpdate(
 		not_null<Data*> data,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index fd2088e9b..a4ed8e449 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3674,6 +3674,13 @@ void OverlayWidget::setSession(not_null<Main::Session*> session) {
 		changingMsgId(change.item, change.oldId);
 	}, _sessionLifetime);
 
+	session->data().itemRemoved(
+	) | rpl::filter([=](not_null<const HistoryItem*> item) {
+		return (_document != nullptr) && (item->fullId() == _msgid);
+	}) | rpl::start_with_next([=] {
+		close();
+	}, _sessionLifetime);
+
 	session->account().sessionChanges(
 	) | rpl::start_with_next([=] {
 		clearSession();
diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck
index 58263c071..053e44a10 160000
--- a/Telegram/lib_spellcheck
+++ b/Telegram/lib_spellcheck
@@ -1 +1 @@
-Subproject commit 58263c0715ebfbf586c71e856a2ad962301bdc05
+Subproject commit 053e44a10107de4a0b7e9ad8826150c577db2a2b

From f064692e5765007f3110a19a4ecf6fd24193167f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 15:28:20 +0300
Subject: [PATCH 028/190] Close media viewer when photo message is deleted.

---
 Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index a4ed8e449..10f12c9ee 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3676,7 +3676,8 @@ void OverlayWidget::setSession(not_null<Main::Session*> session) {
 
 	session->data().itemRemoved(
 	) | rpl::filter([=](not_null<const HistoryItem*> item) {
-		return (_document != nullptr) && (item->fullId() == _msgid);
+		return (_document != nullptr || _photo != nullptr)
+			&& (item->fullId() == _msgid);
 	}) | rpl::start_with_next([=] {
 		close();
 	}, _sessionLifetime);

From 53ac4c00ad347eb53bb58faf8e87549b0a5c51f6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 16:35:43 +0300
Subject: [PATCH 029/190] Track deleted messages carefully.

Fixes #8855.
---
 .../SourceFiles/data/data_replies_list.cpp    | 87 ++++++++++++-------
 Telegram/SourceFiles/data/data_replies_list.h |  4 +-
 .../history/view/history_view_list_widget.cpp |  7 +-
 .../view/history_view_replies_section.cpp     |  3 +-
 4 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_replies_list.cpp b/Telegram/SourceFiles/data/data_replies_list.cpp
index ce90f4ddd..b2004fa79 100644
--- a/Telegram/SourceFiles/data/data_replies_list.cpp
+++ b/Telegram/SourceFiles/data/data_replies_list.cpp
@@ -42,7 +42,10 @@ struct RepliesList::Viewer {
 	MsgId around = 0;
 	int limitBefore = 0;
 	int limitAfter = 0;
+	int injectedForRoot = 0;
 	base::has_weak_ptr guard;
+	bool stale = true;
+	bool scheduled = false;
 };
 
 RepliesList::RepliesList(not_null<History*> history, MsgId rootId)
@@ -67,7 +70,9 @@ rpl::producer<MessagesSlice> RepliesList::source(
 		_history->session().changes().historyFlagsValue(
 			_history,
 			Data::HistoryUpdate::Flag::LocalMessages)
-	) | rpl::map([=](MessagesSlice &&server, const auto &) {
+	) | rpl::filter([=](const MessagesSlice &data, const auto &) {
+		return (data.fullCount.value_or(0) >= 0);
+	}) | rpl::map([=](MessagesSlice &&server, const auto &) {
 		appendLocalMessages(server);
 		return std::move(server);
 	});
@@ -82,10 +87,22 @@ rpl::producer<MessagesSlice> RepliesList::sourceFromServer(
 		auto lifetime = rpl::lifetime();
 		const auto viewer = lifetime.make_state<Viewer>();
 		const auto push = [=] {
+			viewer->scheduled = false;
 			if (buildFromData(viewer)) {
+				viewer->stale = false;
 				consumer.put_next_copy(viewer->slice);
 			}
 		};
+		const auto pushDelayed = [=] {
+			if (!viewer->stale) {
+				viewer->stale = true;
+				consumer.put_next_copy(MessagesSlice{ .fullCount = -1 });
+			}
+			if (!viewer->scheduled) {
+				viewer->scheduled = true;
+				crl::on_main(&viewer->guard, push);
+			}
+		};
 		viewer->around = around;
 		viewer->limitBefore = limitBefore;
 		viewer->limitAfter = limitAfter;
@@ -96,14 +113,10 @@ rpl::producer<MessagesSlice> RepliesList::sourceFromServer(
 			| MessageUpdate::Flag::Destroyed
 		) | rpl::filter([=](const MessageUpdate &update) {
 			return applyUpdate(viewer, update);
-		}) | rpl::start_with_next([=] {
-			crl::on_main(&viewer->guard, push);
-		}, lifetime);
+		}) | rpl::start_with_next(pushDelayed, lifetime);
 
 		_partLoaded.events(
-		) | rpl::start_with_next([=] {
-			crl::on_main(&viewer->guard, push);
-		}, lifetime);
+		) | rpl::start_with_next(pushDelayed, lifetime);
 
 		push();
 		return lifetime;
@@ -173,32 +186,37 @@ rpl::producer<int> RepliesList::fullCount() const {
 	return _fullCount.value() | rpl::filter_optional();
 }
 
-void RepliesList::injectRootMessageAndReverse(
-		not_null<MessagesSlice*> slice) {
-	injectRootMessage(slice);
-	ranges::reverse(slice->ids);
+void RepliesList::injectRootMessageAndReverse(not_null<Viewer*> viewer) {
+	injectRootMessage(viewer);
+	ranges::reverse(viewer->slice.ids);
 }
 
-void RepliesList::injectRootMessage(not_null<MessagesSlice*> slice) {
+void RepliesList::injectRootMessage(not_null<Viewer*> viewer) {
+	const auto slice = &viewer->slice;
+	viewer->injectedForRoot = 0;
 	if (slice->skippedBefore != 0) {
 		return;
 	}
-	if (const auto root = lookupRoot()) {
-		injectRootDivider(root, slice);
+	const auto root = lookupRoot();
+	if (!root) {
+		return;
+	}
+	injectRootDivider(root, slice);
 
-		if (const auto group = _history->owner().groups().find(root)) {
-			for (const auto item : ranges::view::reverse(group->items)) {
-				slice->ids.push_back(item->fullId());
-			}
-			if (slice->fullCount) {
-				*slice->fullCount += group->items.size();
-			}
-		} else {
-			slice->ids.push_back(root->fullId());
-			if (slice->fullCount) {
-				++*slice->fullCount;
-			}
+	if (const auto group = _history->owner().groups().find(root)) {
+		for (const auto item : ranges::view::reverse(group->items)) {
+			slice->ids.push_back(item->fullId());
 		}
+		viewer->injectedForRoot = group->items.size();
+		if (slice->fullCount) {
+			*slice->fullCount += group->items.size();
+		}
+	} else {
+		slice->ids.push_back(root->fullId());
+		viewer->injectedForRoot = 1;
+	}
+	if (slice->fullCount) {
+		*slice->fullCount += viewer->injectedForRoot;
 	}
 }
 
@@ -232,7 +250,8 @@ bool RepliesList::buildFromData(not_null<Viewer*> viewer) {
 			= viewer->slice.skippedBefore
 			= viewer->slice.skippedAfter
 			= 0;
-		injectRootMessageAndReverse(&viewer->slice);
+		viewer->injectedForRoot = 0;
+		injectRootMessageAndReverse(viewer);
 		return true;
 	}
 	const auto around = [&] {
@@ -285,7 +304,7 @@ bool RepliesList::buildFromData(not_null<Viewer*> viewer) {
 			slice->ids.empty() ? 0 : slice->ids.back().msg));
 	slice->fullCount = _fullCount.current();
 
-	injectRootMessageAndReverse(slice);
+	injectRootMessageAndReverse(viewer);
 
 	if (_skippedBefore != 0 && useBefore < viewer->limitBefore + 1) {
 		loadBefore();
@@ -301,10 +320,20 @@ bool RepliesList::applyUpdate(
 		not_null<Viewer*> viewer,
 		const MessageUpdate &update) {
 	if (update.item->history() != _history
-		|| update.item->replyToTop() != _rootId
 		|| !IsServerMsgId(update.item->id)) {
 		return false;
 	}
+	if (update.flags & MessageUpdate::Flag::Destroyed) {
+		const auto id = update.item->fullId();
+		for (auto i = 0; i != viewer->injectedForRoot; ++i) {
+			if (viewer->slice.ids[i] == id) {
+				return true;
+			}
+		}
+	}
+	if (update.item->replyToTop() != _rootId) {
+		return false;
+	}
 	const auto id = update.item->id;
 	const auto i = ranges::lower_bound(_list, id, std::greater<>());
 	if (update.flags & MessageUpdate::Flag::Destroyed) {
diff --git a/Telegram/SourceFiles/data/data_replies_list.h b/Telegram/SourceFiles/data/data_replies_list.h
index 2de7e2b7f..36932b82b 100644
--- a/Telegram/SourceFiles/data/data_replies_list.h
+++ b/Telegram/SourceFiles/data/data_replies_list.h
@@ -47,8 +47,8 @@ private:
 	[[nodiscard]] bool applyUpdate(
 		not_null<Viewer*> viewer,
 		const MessageUpdate &update);
-	void injectRootMessageAndReverse(not_null<MessagesSlice*> slice);
-	void injectRootMessage(not_null<MessagesSlice*> slice);
+	void injectRootMessageAndReverse(not_null<Viewer*> viewer);
+	void injectRootMessage(not_null<Viewer*> viewer);
 	void injectRootDivider(
 		not_null<HistoryItem*> root,
 		not_null<MessagesSlice*> slice);
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index b841a248d..15aeb735e 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -292,9 +292,10 @@ ListWidget::ListWidget(
 	}, lifetime());
 
 	session().data().itemRemoved(
-	) | rpl::start_with_next(
-		[this](auto item) { itemRemoved(item); },
-		lifetime());
+	) | rpl::start_with_next([=](not_null<const HistoryItem*> item) {
+		itemRemoved(item);
+	}, lifetime());
+
 	subscribe(session().data().queryItemVisibility(), [this](const Data::Session::ItemVisibilityQuery &query) {
 		if (const auto view = viewForItem(query.item)) {
 			const auto top = itemTop(view);
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index af0a9acae..26d9b0c4f 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -216,6 +216,7 @@ RepliesWidget::RepliesWidget(
 		if (update.item == _root) {
 			_root = nullptr;
 			updatePinnedVisibility();
+			controller->showBackFromStack();
 		}
 		while (update.item == _replyReturn) {
 			calculateNextReplyReturn();
@@ -1758,7 +1759,7 @@ MessagesBarData RepliesWidget::listMessagesBar(
 	for (auto i = 0, count = int(elements.size()); i != count; ++i) {
 		const auto item = elements[i]->data();
 		if (IsServerMsgId(item->id) && item->id > till) {
-			if (item->out()) {
+			if (item->out() || !item->replyToId()) {
 				readTill(item);
 			} else {
 				return MessagesBarData{

From 0690d14f1b631ca89ff7d693714d41aeca4068e0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 17:28:11 +0300
Subject: [PATCH 030/190] Don't send typings to bots and offline users.

---
 Telegram/SourceFiles/api/api_send_progress.cpp | 18 ++++++++++++++++++
 Telegram/SourceFiles/api/api_send_progress.h   |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/Telegram/SourceFiles/api/api_send_progress.cpp b/Telegram/SourceFiles/api/api_send_progress.cpp
index e96b11da0..1335b6fb1 100644
--- a/Telegram/SourceFiles/api/api_send_progress.cpp
+++ b/Telegram/SourceFiles/api/api_send_progress.cpp
@@ -10,6 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "history/history.h"
 #include "data/data_peer.h"
+#include "data/data_user.h"
+#include "base/unixtime.h"
+#include "data/data_peer_values.h"
 #include "apiwrap.h"
 
 namespace Api {
@@ -98,6 +101,9 @@ bool SendProgressManager::updated(const Key &key, bool doing) {
 }
 
 void SendProgressManager::send(const Key &key, int progress) {
+	if (skipRequest(key)) {
+		return;
+	}
 	using Type = SendProgressType;
 	const auto action = [&]() -> MTPsendMessageAction {
 		const auto p = MTP_int(progress);
@@ -135,6 +141,18 @@ void SendProgressManager::send(const Key &key, int progress) {
 	}
 }
 
+bool SendProgressManager::skipRequest(const Key &key) const {
+	const auto user = key.history->peer->asUser();
+	if (!user) {
+		return false;
+	} else if (user->isSelf()) {
+		return true;
+	} else if (user->isBot() && !user->isSupport()) {
+		return true;
+	}
+	return !Data::OnlineTextActive(user->onlineTill, base::unixtime::now());
+}
+
 void SendProgressManager::done(
 		const MTPBool &result,
 		mtpRequestId requestId) {
diff --git a/Telegram/SourceFiles/api/api_send_progress.h b/Telegram/SourceFiles/api/api_send_progress.h
index dc5dc7802..22bed6ac1 100644
--- a/Telegram/SourceFiles/api/api_send_progress.h
+++ b/Telegram/SourceFiles/api/api_send_progress.h
@@ -90,6 +90,8 @@ private:
 	void send(const Key &key, int progress);
 	void done(const MTPBool &result, mtpRequestId requestId);
 
+	[[nodiscard]] bool skipRequest(const Key &key) const;
+
 	const not_null<Main::Session*> _session;
 	base::flat_map<Key, mtpRequestId> _requests;
 	base::flat_map<Key, crl::time> _updated;

From 1de144a48d9022b1261229a614db8a0d8f8d2972 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 17:37:27 +0300
Subject: [PATCH 031/190] Show transfer ownership button for non-anonymous
 admins.

---
 Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp   | 2 +-
 .../SourceFiles/boxes/peers/edit_peer_permissions_box.cpp   | 6 ++++--
 .../SourceFiles/boxes/peers/edit_peer_permissions_box.h     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
index d23abb04c..7f82a7f3b 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
@@ -308,7 +308,7 @@ void EditAdminBox::prepare() {
 	}, lifetime());
 
 	if (canTransferOwnership()) {
-		const auto allFlags = FullAdminRights(isGroup);
+		const auto allFlags = AdminRightsForOwnershipTransfer(isGroup);
 		setupTransferButton(
 			isGroup
 		)->toggleOn(rpl::duplicate(
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
index 29ac53e51..91e0a0dfe 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
@@ -298,10 +298,12 @@ ChatRestrictions FixDependentRestrictions(ChatRestrictions restrictions) {
 	return restrictions;
 }
 
-ChatAdminRights FullAdminRights(bool isGroup) {
+ChatAdminRights AdminRightsForOwnershipTransfer(bool isGroup) {
 	auto result = ChatAdminRights();
 	for (const auto &[flag, label] : AdminRightLabels(isGroup, true)) {
-		result |= flag;
+		if (!(flag & ChatAdminRight::f_anonymous)) {
+			result |= flag;
+		}
 	}
 	return result;
 }
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.h b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.h
index 53f16ea38..b7dfd4ed0 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.h
@@ -71,4 +71,4 @@ EditFlagsControl<MTPDchatAdminRights::Flags> CreateEditAdminRights(
 
 ChatAdminRights DisabledByDefaultRestrictions(not_null<PeerData*> peer);
 ChatRestrictions FixDependentRestrictions(ChatRestrictions restrictions);
-ChatAdminRights FullAdminRights(bool isGroup);
+ChatAdminRights AdminRightsForOwnershipTransfer(bool isGroup);

From 9de4c425556ce8647f4610d77ff327bc96ea0a62 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 18:25:55 +0300
Subject: [PATCH 032/190] Keep sending typings up to 30s after offline.

---
 Telegram/SourceFiles/api/api_send_progress.cpp | 4 +++-
 cmake                                          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_send_progress.cpp b/Telegram/SourceFiles/api/api_send_progress.cpp
index 1335b6fb1..d4cfcba39 100644
--- a/Telegram/SourceFiles/api/api_send_progress.cpp
+++ b/Telegram/SourceFiles/api/api_send_progress.cpp
@@ -20,6 +20,7 @@ namespace {
 
 constexpr auto kCancelTypingActionTimeout = crl::time(5000);
 constexpr auto kSetMyActionForMs = 10 * crl::time(1000);
+constexpr auto kSendTypingsToOfflineFor = TimeId(30);
 
 } // namespace
 
@@ -150,7 +151,8 @@ bool SendProgressManager::skipRequest(const Key &key) const {
 	} else if (user->isBot() && !user->isSupport()) {
 		return true;
 	}
-	return !Data::OnlineTextActive(user->onlineTill, base::unixtime::now());
+	const auto recently = base::unixtime::now() - kSendTypingsToOfflineFor;
+	return !Data::OnlineTextActive(user->onlineTill, recently);
 }
 
 void SendProgressManager::done(
diff --git a/cmake b/cmake
index b485d43a4..cfc6051fb 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit b485d43a45eec75b8cbc0ab966ab3c06b5e8bac8
+Subproject commit cfc6051fb65da4c67ccbc2a1d9e753758f995fe3

From aff4f69b64f6887c8983930c4fa87d51e4091d4a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 19:37:58 +0300
Subject: [PATCH 033/190] Don't quit on call end with window hidden in tray.

Fixes #8585.
---
 Telegram/SourceFiles/core/sandbox.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index f2989b99f..3f6f47cb5 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -90,6 +90,7 @@ Sandbox::Sandbox(
 	}
 })
 , _launcher(launcher) {
+	setQuitOnLastWindowClosed(false);
 }
 
 int Sandbox::start() {

From 9717a8b5fa67e6e3afcc8a741a5a9e050d7b3966 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 19:40:48 +0300
Subject: [PATCH 034/190] Version 2.4.4.

- Fix application quit on call end with main window hidden in tray.
- Update OpenAL library on Windows.
- Several crash fixes.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 6 ++++++
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index e170c4e21..08ce1f0c2 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="2.4.3.0" />
+    Version="2.4.4.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram FZ-LLC</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index b9b3048db..febd156ef 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,3,0
- PRODUCTVERSION 2,4,3,0
+ FILEVERSION 2,4,4,0
+ PRODUCTVERSION 2,4,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "2.4.3.0"
+            VALUE "FileVersion", "2.4.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.3.0"
+            VALUE "ProductVersion", "2.4.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 0636b1189..d7427a781 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,3,0
- PRODUCTVERSION 2,4,3,0
+ FILEVERSION 2,4,4,0
+ PRODUCTVERSION 2,4,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "2.4.3.0"
+            VALUE "FileVersion", "2.4.4.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.3.0"
+            VALUE "ProductVersion", "2.4.4.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 2d2c541e6..15003e6d0 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 2004003;
-constexpr auto AppVersionStr = "2.4.3";
+constexpr auto AppVersion = 2004004;
+constexpr auto AppVersionStr = "2.4.4";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 7c371f936..d76bc6152 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2004003
+AppVersion         2004004
 AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.3
-AppVersionStr      2.4.3
+AppVersionStrSmall 2.4.4
+AppVersionStr      2.4.4
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 2.4.3
+AppVersionOriginal 2.4.4
diff --git a/changelog.txt b/changelog.txt
index 6e0fc2ebd..47c2c7748 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+2.4.4 (23.10.20)
+
+- Fix application quit on call end with main window hidden in tray.
+- Update OpenAL library on Windows.
+- Several crash fixes.
+
 2.4.3 (07.10.20)
 
 - Fix sending voice messages in scheduled messages section.

From 77e1b9f156511adc8d7fb873c5efdfb4003fd292 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 24 Oct 2020 08:47:16 +0400
Subject: [PATCH 035/190] Change socket path length condition to >=

Looks like 108 is the length including \0, therefore actual limit is 107
---
 Telegram/SourceFiles/platform/linux/specific_linux.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index d88e91c80..92fc41d78 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -815,7 +815,7 @@ QString SingleInstanceLocalServerName(const QString &hash) {
 		+ '-'
 		+ cGUIDStr();
 
-	if (idealSocketPath.size() > 108) {
+	if (idealSocketPath.size() >= 108) {
 		return AppRuntimeDirectory() + hash;
 	} else {
 		return idealSocketPath;

From f7496475674792360f1f81f72026b127b5d19616 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 26 Oct 2020 07:27:17 +0400
Subject: [PATCH 036/190] Check Qt version in runtime in
 CanOpenDirectoryWithPortal

It is not guaranteed that app is running with the same Qt version that was compiled
---
 .../platform/linux/specific_linux.cpp          | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 92fc41d78..6b1f01189 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtCore/QStandardPaths>
 #include <QtCore/QProcess>
 #include <QtCore/QVersionNumber>
+#include <QtCore/QLibraryInfo>
 #include <QtGui/QWindow>
 
 #include <private/qwaylanddisplay_p.h>
@@ -756,11 +757,20 @@ bool UseXDGDesktopPortal() {
 }
 
 bool CanOpenDirectoryWithPortal() {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) || defined DESKTOP_APP_QT_PATCHED) && !defined DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-	return FileChooserPortalVersion() >= 3;
-#else // (Qt >= 5.15 || DESKTOP_APP_QT_PATCHED) && !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+	static const auto Result = [&] {
+#ifdef DESKTOP_APP_QT_PATCHED
+		return FileChooserPortalVersion() >= 3;
+#else // DESKTOP_APP_QT_PATCHED
+		return QLibraryInfo::version() >= QVersionNumber(5, 15, 0)
+			&& FileChooserPortalVersion() >= 3;
+#endif // !DESKTOP_APP_QT_PATCHED
+	}();
+
+	return Result;
+#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+
 	return false;
-#endif // (Qt < 5.15 && !DESKTOP_APP_QT_PATCHED) || DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 }
 
 QString CurrentExecutablePath(int argc, char *argv[]) {

From b0ce88395ffe2abc1d7fbef7d258a9b60bf738aa Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 26 Oct 2020 12:02:02 +0400
Subject: [PATCH 037/190] Don't stream videos when external player is used

External player feature doesn't work otherwise
---
 Telegram/SourceFiles/data/data_document.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index f9fcac1e9..b80953ba5 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -1320,8 +1320,11 @@ bool DocumentData::useStreamingLoader() const {
 }
 
 bool DocumentData::canBeStreamed() const {
-	// For now video messages are not streamed.
-	return hasRemoteLocation() && supportsStreaming();
+	// Streaming couldn't be used with external player
+	// Maybe someone brave will implement this once upon a time...
+	return hasRemoteLocation()
+		&& supportsStreaming()
+		&& (!cUseExternalVideoPlayer() || !isVideoFile());
 }
 
 void DocumentData::setInappPlaybackFailed() {

From 7ff99cdbf702936c701e13e0e52aeb6003c9f0da Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 25 Oct 2020 04:59:14 +0400
Subject: [PATCH 038/190] Use LONG_PTR with SetWindowLongPtr

---
 Telegram/SourceFiles/platform/win/main_window_win.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp
index 8c05a1df2..10d625363 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.cpp
+++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp
@@ -252,7 +252,7 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
 		psSetupTrayIcon();
 		HWND psOwner = (HWND)GetWindowLongPtr(ps_hWnd, GWLP_HWNDPARENT);
 		if (!psOwner) {
-			SetWindowLongPtr(ps_hWnd, GWLP_HWNDPARENT, (LONG)ps_tbHider_hWnd);
+			SetWindowLongPtr(ps_hWnd, GWLP_HWNDPARENT, (LONG_PTR)ps_tbHider_hWnd);
 		}
 	} break;
 

From 022fc9a779b2eeba2fb55611333289bbff98cfca Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 25 Oct 2020 06:34:11 +0400
Subject: [PATCH 039/190] Fix gtk dialog condition + make it more readable

---
 .../platform/linux/file_utilities_linux.cpp   | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index a4ca9421b..a1b7db22b 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -125,19 +125,26 @@ constexpr auto kPreviewHeight = 512;
 using Type = ::FileDialog::internal::Type;
 
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
-bool NativeSupported(Type type = Type::ReadFile) {
+bool UseNative(Type type = Type::ReadFile) {
 	// use gtk file dialog on gtk-based desktop environments
 	// or if QT_QPA_PLATFORMTHEME=(gtk2|gtk3)
-	// or if portals is used and operation is to open folder
+	// or if portals are used and operation is to open folder
 	// and portal doesn't support folder choosing
-	return (Platform::DesktopEnvironment::IsGtkBased()
-			|| Platform::IsGtkIntegrationForced()
-			|| Platform::UseXDGDesktopPortal())
-		&& ((!Platform::UseXDGDesktopPortal() &&
-			((!Platform::InFlatpak() && !Platform::InSnap())
-				|| Platform::IsGtkIntegrationForced()))
-			|| (type == Type::ReadFolder && !Platform::CanOpenDirectoryWithPortal()))
-		&& Platform::internal::GdkHelperLoaded()
+	const auto neededForPortal = UseXDGDesktopPortal()
+		&& type == Type::ReadFolder
+		&& !CanOpenDirectoryWithPortal();
+
+	const auto neededNonForced = DesktopEnvironment::IsGtkBased()
+		|| neededForPortal;
+
+	const auto excludeNonForced = InFlatpak() || InSnap();
+
+	return IsGtkIntegrationForced()
+		|| (neededNonForced && !excludeNonForced);
+}
+
+bool NativeSupported() {
+	return Platform::internal::GdkHelperLoaded()
 		&& (Libs::gtk_widget_hide_on_delete != nullptr)
 		&& (Libs::gtk_clipboard_store != nullptr)
 		&& (Libs::gtk_clipboard_get != nullptr)
@@ -241,7 +248,7 @@ bool Get(
 		parent = parent->window();
 	}
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
-	if (NativeSupported(type)) {
+	if (UseNative(type) && NativeSupported()) {
 		return GetNative(
 			parent,
 			files,

From 9ab221d4c9d6d024fe292331befc23293fe70865 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 26 Oct 2020 07:43:45 +0400
Subject: [PATCH 040/190] Remove Platform:: where is not needed in linux
 platform files

Fix lines length in notifications_manager_linux.cpp
---
 .../SourceFiles/platform/linux/linux_libs.cpp   |  8 ++++----
 .../linux/notifications_manager_linux.cpp       | 17 +++++++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
index a57cf7a0f..50f53f37a 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
@@ -115,7 +115,7 @@ bool setupGtkBase(QLibrary &lib_gtk) {
 		// Otherwise we get segfault in Ubuntu 17.04 in gtk_init_check() call.
 		// See https://github.com/telegramdesktop/tdesktop/issues/3176
 		// See https://github.com/telegramdesktop/tdesktop/issues/3162
-		if(Platform::IsWayland()) {
+		if(IsWayland()) {
 			DEBUG_LOG(("Limit allowed GDK backends to wayland,x11"));
 			gdk_set_allowed_backends("wayland,x11");
 		} else {
@@ -176,7 +176,7 @@ void SetIconTheme() {
 			DEBUG_LOG(("New icon theme: %1").arg(QIcon::themeName()));
 			DEBUG_LOG(("New fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
 
-			Platform::SetApplicationIcon(Window::CreateIcon());
+			SetApplicationIcon(Window::CreateIcon());
 			if (App::wnd()) {
 				App::wnd()->setWindowIcon(Window::CreateIcon());
 			}
@@ -188,13 +188,13 @@ void SetIconTheme() {
 
 void DarkModeChanged() {
 	Core::Sandbox::Instance().customEnterFromEventLoop([] {
-		Core::App().settings().setSystemDarkMode(Platform::IsDarkMode());
+		Core::App().settings().setSystemDarkMode(IsDarkMode());
 	});
 }
 
 void DecorationLayoutChanged() {
 	Core::Sandbox::Instance().customEnterFromEventLoop([] {
-		Core::App().settings().setWindowControlsLayout(Platform::WindowControlsLayout());
+		Core::App().settings().setWindowControlsLayout(WindowControlsLayout());
 	});
 }
 #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 1a0b1bc18..b4a0d8f83 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -87,8 +87,7 @@ void GetSupported() {
 	}
 	Checked = true;
 
-	if (Core::App().settings().nativeNotifications()
-		&& !Platform::IsWayland()) {
+	if (Core::App().settings().nativeNotifications() && !IsWayland()) {
 		ComputeSupported(true);
 	} else {
 		ComputeSupported();
@@ -402,15 +401,21 @@ NotificationData::NotificationData(
 NotificationData::~NotificationData() {
 	if (_dbusConnection) {
 		if (_actionInvokedSignalId != 0) {
-			g_dbus_connection_signal_unsubscribe(_dbusConnection, _actionInvokedSignalId);
+			g_dbus_connection_signal_unsubscribe(
+				_dbusConnection,
+				_actionInvokedSignalId);
 		}
 
 		if (_notificationRepliedSignalId != 0) {
-			g_dbus_connection_signal_unsubscribe(_dbusConnection, _notificationRepliedSignalId);
+			g_dbus_connection_signal_unsubscribe(
+				_dbusConnection,
+				_notificationRepliedSignalId);
 		}
 
 		if (_notificationClosedSignalId != 0) {
-			g_dbus_connection_signal_unsubscribe(_dbusConnection, _notificationClosedSignalId);
+			g_dbus_connection_signal_unsubscribe(
+				_dbusConnection,
+				_notificationClosedSignalId);
 		}
 
 		g_object_unref(_dbusConnection);
@@ -647,7 +652,7 @@ std::unique_ptr<Window::Notifications::Manager> Create(
 #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 	if ((Core::App().settings().nativeNotifications() && Supported())
-		|| Platform::IsWayland()) {
+		|| IsWayland()) {
 		return std::make_unique<Manager>(system);
 	}
 

From 41e0e4fba703eddfe599ab8935cf0b64549a933f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 27 Oct 2020 09:03:50 +0400
Subject: [PATCH 041/190] Use glib to open files & urls

---
 .../platform/linux/file_utilities_linux.cpp   | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index a1b7db22b..dfecc5b79 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -18,6 +18,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtCore/QProcess>
 #include <QtGui/QDesktopServices>
 
+extern "C" {
+#undef signals
+#include <gio/gio.h>
+#define signals public
+} // extern "C"
+
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
 #include <private/qguiapplication_p.h>
 
@@ -63,38 +69,30 @@ QByteArray EscapeShell(const QByteArray &content) {
 
 void UnsafeOpenUrl(const QString &url) {
 	if (InSnap()) {
-		const QStringList arguments{
-			url
-		};
 		QProcess process;
-		process.startDetached(qsl("xdg-open"), arguments);
-	} else {
+		process.startDetached(qsl("xdg-open"), {url});
+	} else if (!g_app_info_launch_default_for_uri(
+		url.toUtf8(),
+		nullptr,
+		nullptr)) {
 		QDesktopServices::openUrl(url);
 	}
 }
 
 void UnsafeOpenEmailLink(const QString &email) {
-	const auto url = qstr("mailto:") + email;
-
-	if (InSnap()) {
-		const QStringList arguments{
-			url
-		};
-		QProcess process;
-		process.startDetached(qsl("xdg-open"), arguments);
-	} else {
-		QDesktopServices::openUrl(QUrl(url));
-	}
+	UnsafeOpenUrl(qstr("mailto:") + email);
 }
 
 void UnsafeLaunch(const QString &filepath) {
+	const auto absolutePath = QFileInfo(filepath).absoluteFilePath();
+
 	if (InSnap()) {
-		const QStringList arguments{
-			QFileInfo(filepath).absoluteFilePath()
-		};
 		QProcess process;
-		process.startDetached(qsl("xdg-open"), arguments);
-	} else {
+		process.startDetached(qsl("xdg-open"), {absolutePath});
+	} else if (!g_app_info_launch_default_for_uri(
+		("file://" + absolutePath).toUtf8(),
+		nullptr,
+		nullptr)) {
 		QDesktopServices::openUrl(QUrl::fromLocalFile(filepath));
 	}
 }

From 08b513dd7e3af1f37780374e1509421f746d7474 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Oct 2020 17:45:39 +0300
Subject: [PATCH 042/190] Update lib_base submodule.

---
 Telegram/lib_base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 98224799e..55c28456e 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 98224799e420dfcca33af816b11e261080cb1fed
+Subproject commit 55c28456e812b6f69a08220d9b3da01ad290489e

From b814f320c610668f4b3199751d6593813ba80252 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Oct 2020 18:31:00 +0300
Subject: [PATCH 043/190] Update lib_base submodule.

---
 Telegram/lib_base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 55c28456e..df430bc4a 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 55c28456e812b6f69a08220d9b3da01ad290489e
+Subproject commit df430bc4a27ec62b736d2f43c4b5feacc79605f4

From bcc11d78503d68a9af5597dbd490c413902afc73 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 24 Oct 2020 23:48:19 +0300
Subject: [PATCH 044/190] Changed shortcut to open contacts to avoid conflict
 with formatting.

Fixed #8896.
---
 Telegram/SourceFiles/core/shortcuts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index ef50008ef..4e988bd13 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -385,7 +385,7 @@ void Manager::fillDefaults() {
 	set(qsl("ctrl+0"), Command::ChatSelf);
 
 	set(qsl("ctrl+9"), Command::ShowArchive);
-	set(qsl("ctrl+shift+n"), Command::ShowContacts);
+	set(qsl("ctrl+j"), Command::ShowContacts);
 
 	set(qsl("ctrl+r"), Command::ReadChat);
 }

From 1a2afda09ca38606fff897a89c03cfd296f72300 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 25 Oct 2020 02:58:59 +0300
Subject: [PATCH 045/190] Changed behavior of user-agent updater to open pull
 requests.

---
 .github/workflows/user_agent_updater.yml | 110 ++++++++++++++++++-----
 1 file changed, 87 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/user_agent_updater.yml b/.github/workflows/user_agent_updater.yml
index 44c2515af..eee5c8b2c 100644
--- a/.github/workflows/user_agent_updater.yml
+++ b/.github/workflows/user_agent_updater.yml
@@ -6,22 +6,53 @@ on:
   schedule:
     # At 00:00 on day-of-month 1.
     - cron: '0 0 1 * *'
+  pull_request_target:
+    types: [closed]
 
 jobs:
   User-agent:
     runs-on: ubuntu-latest
 
     env:
-      code_file: "Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp"
-      skip: "0"
+      codeFile: "Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp"
+      headBranchPrefix: "chrome_"
+      baseBranch: "dev"
+      isPull: "0"
 
     steps:
+      - name: Set env.
+        if: startsWith(github.event_name, 'pull_request')
+        run: |
+          echo "isPull=1" >> $GITHUB_ENV
+
       - name: Clone.
-        if: env.skip == '0'
         uses: actions/checkout@v2
 
+      - name: Set up git.
+        run: |
+          token=${{ secrets.TOKEN_FOR_MASTER_UPDATER }}
+          if [ -z "${token}" ]; then
+              echo "Token is unset. Nothing to do."
+              exit 1
+          fi
+
+          url=https://x-access-token:$token@github.com/$GITHUB_REPOSITORY
+
+          git config --global user.email "action@github.com"
+          git config --global user.name "GitHub Action"
+
+          git remote set-url origin $url
+
+      - name: Delete branch.
+        if: |
+          env.isPull == '1'
+            && github.event.action == 'closed'
+            && startsWith(github.head_ref, env.headBranchPrefix)
+        run: |
+          git push origin --delete ${{ github.head_ref }}
+
       - name: Write a new version of Google Chrome to the user-agent for DNS.
-        if: env.skip == '0'
+        if: env.isPull == '0'
         shell: python
         run: |
           import subprocess, os, re;
@@ -40,8 +71,11 @@ jobs:
           newChromeVersion = newVersion();
           print(newChromeVersion);
 
+          def setEnv(value):
+            open(os.environ['GITHUB_ENV'], "a").write(value);
+
           def writeUserAgent():
-            p = os.environ['code_file'];
+            p = os.environ['codeFile'];
             w = open(p, "r");
             content = w.read();
             w.close();
@@ -57,34 +91,64 @@ jobs:
             w = open(p, "w");
             w.write(content);
 
-            print("::set-env name=ChromeVersion::" + newChromeVersion);
+            setEnv("ChromeVersion=" + newChromeVersion);
 
           writeUserAgent();
 
-      - name: Push to the current branch.
-        if: env.skip == '0' && env.ChromeVersion != ''
+      - name: Push to a new branch.
+        if: env.isPull == '0' && env.ChromeVersion != ''
         run: |
-          token=${{ secrets.TOKEN_FOR_MASTER_UPDATER }}
-          if [ -z "${token}" ]; then
-              echo "Token is unset. Nothing to do."
-              exit 0
-          fi
-
-          url=https://x-access-token:$token@github.com/$GITHUB_REPOSITORY
-
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-
           git diff > git_diff.txt
           if [[ ! -s git_diff.txt ]]; then
             echo "Nothing to commit."
             exit 0
           fi
 
-          git add $code_file
+          git checkout -b $headBranchPrefix$ChromeVersion
+          git add $codeFile
           git commit -m "Update User-Agent for DNS to Chrome $ChromeVersion."
 
-          git remote set-url origin $url
-
-          git push origin HEAD:$GITHUB_REF
+          git push origin $headBranchPrefix$ChromeVersion
           echo "Done!"
+
+      - name: Close previous pull requests.
+        if: env.isPull == '0' && env.ChromeVersion != ''
+        uses: actions/github-script@0.4.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const common = {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            };
+
+            github.pulls.list(common).then(response => {
+              response.data.forEach((item, _) => {
+                if (item.head.ref.startsWith(process.env.headBranchPrefix)) {
+                  console.log(`Close ${item.title} #${item.number}.`);
+                  github.pulls.update({
+                    pull_number: item.number,
+                    state: "closed",
+                    ...common
+                  });
+                }
+              });
+            });
+
+      - name: Create a new pull request.
+        if: env.isPull == '0' && env.ChromeVersion != ''
+        uses: actions/github-script@0.4.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const version = process.env.ChromeVersion;
+            const title = `Update User-Agent for DNS to Chrome ${version}.`;
+
+            github.pulls.create({
+              title: title,
+              body: "",
+              head: `${process.env.headBranchPrefix}${version}`,
+              base: process.env.baseBranch,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            });

From 3883a268c742cf743e0259275bb02db5a325b56a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 25 Oct 2020 04:46:27 +0300
Subject: [PATCH 046/190] Fixed warnings from Github CI.

---
 .github/workflows/issue_closer.yml |  4 +-
 .github/workflows/linux.yml        | 10 ++--
 .github/workflows/mac.yml          | 12 ++---
 .github/workflows/snap.yml         |  2 +-
 .github/workflows/win.yml          | 85 +++++++++++++-----------------
 5 files changed, 50 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/issue_closer.yml b/.github/workflows/issue_closer.yml
index db58d86bd..44782fa45 100644
--- a/.github/workflows/issue_closer.yml
+++ b/.github/workflows/issue_closer.yml
@@ -12,7 +12,7 @@ jobs:
         run: |
           tag=$(git ls-remote --tags git://github.com/$GITHUB_REPOSITORY | cut -f 2 | tail -n1)
           echo $tag
-          echo ::set-env name=LATEST_TAG::$tag
+          echo "LATEST_TAG=$tag" >> $GITHUB_ENV
 
       - name: Get the latest macOS version.
         shell: python
@@ -28,7 +28,7 @@ jobs:
           ver = itemlist[0].attributes['sparkle:shortVersionString'].value;
           print(ver);
 
-          subprocess.check_call("echo ::set-env name=%s::%s" % ("LATEST_MACOS", ver), shell=True);
+          open(os.environ['GITHUB_ENV'], "a").write("LATEST_MACOS=" + ver);
 
       - name: Check a version from an issue.
         uses: actions/github-script@0.4.0
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index aac77a1b7..7b4f32953 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -71,7 +71,7 @@ jobs:
 
     steps:
       - name: Get repository name.
-        run: echo ::set-env name=REPO_NAME::${GITHUB_REPOSITORY##*/}
+        run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Disable man for further package installs.
         run: |
@@ -129,11 +129,11 @@ jobs:
             echo `md5sum $thisFile | cut -c -32` >> CACHE_KEY.txt
           fi
           md5cache=$(md5sum CACHE_KEY.txt | cut -c -32)
-          echo ::set-env name=CACHE_KEY::$md5cache
+          echo "CACHE_KEY=$md5cache" >> $GITHUB_ENV
 
           mkdir -p Libraries
           cd Libraries
-          echo ::set-env name=LibrariesPath::`pwd`
+          echo "LibrariesPath=`pwd`" >> $GITHUB_ENV
 
       - name: Patches.
         run: |
@@ -556,9 +556,9 @@ jobs:
           if [ -n "${{ matrix.defines }}" ]; then
             DEFINE="-D ${{ matrix.defines }}=ON"
             echo Define from matrix: $DEFINE
-            echo ::set-env name=ARTIFACT_NAME::Telegram_${{ matrix.defines }}
+            echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
           else
-            echo ::set-env name=ARTIFACT_NAME::Telegram
+            echo "ARTIFACT_NAME=Telegram" >> $GITHUB_ENV
           fi
 
           ./configure.sh \
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 2d1ff6613..11ace8da8 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -69,7 +69,7 @@ jobs:
 
     steps:
       - name: Get repository name.
-        run: echo ::set-env name=REPO_NAME::${GITHUB_REPOSITORY##*/}
+        run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
         uses: actions/checkout@v2
@@ -94,13 +94,13 @@ jobs:
             thisFile=$REPO_NAME/.github/workflows/mac.yml
             echo `md5 -q $thisFile` >> CACHE_KEY.txt
           fi
-          echo ::set-env name=CACHE_KEY::`md5 -q CACHE_KEY.txt`
+          echo "CACHE_KEY=`md5 -q CACHE_KEY.txt`" >> $GITHUB_ENV
 
-          echo ::add-path::$PWD/Libraries/depot_tools
+          echo "$PWD/Libraries/depot_tools" >> $GITHUB_PATH
 
           mkdir -p Libraries/macos
           cd Libraries/macos
-          echo ::set-env name=LibrariesPath::`pwd`
+          echo "LibrariesPath=`pwd`" >> $GITHUB_ENV
 
       - name: Patches.
         run: |
@@ -490,9 +490,9 @@ jobs:
           if [ -n "${{ matrix.defines }}" ]; then
             DEFINE="-D ${{ matrix.defines }}=ON"
             echo Define from matrix: $DEFINE
-            echo ::set-env name=ARTIFACT_NAME::Telegram_${{ matrix.defines }}
+            echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
           else
-            echo ::set-env name=ARTIFACT_NAME::Telegram
+            echo "ARTIFACT_NAME=Telegram" >> $GITHUB_ENV
           fi
 
           ./configure.sh \
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index b6a778d8e..21332ab2d 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -76,7 +76,7 @@ jobs:
         if: env.UPLOAD_ARTIFACT == 'true'
         run: |
           artifact_name=$(echo telegram-desktop_*.snap)
-          echo ::set-env name=ARTIFACT_NAME::$artifact_name
+          echo "ARTIFACT_NAME=$artifact_name" >> $GITHUB_ENV
 
           mkdir artifact
           mv $artifact_name artifact
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 032d66342..02140b397 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -68,10 +68,31 @@ jobs:
       DOC_PATH: "docs/building-msvc.md"
       AUTO_CACHING: "1"
 
+    defaults:
+      run:
+        shell: cmd
+
     steps:
       - name: Get repository name.
         shell: bash
-        run: echo ::set-env name=REPO_NAME::${GITHUB_REPOSITORY##*/}
+        run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
+
+      - name: Set up environment paths.
+        shell: bash
+        run: |
+          echo "C:\\Strawberry\\perl\\bin\\" >> $GITHUB_PATH
+          echo "C:\\Program Files\\NASM\\" >> $GITHUB_PATH
+          echo "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\" >> $GITHUB_PATH
+
+          mkdir Libraries && cd Libraries
+          echo "Convert unix path to win path."
+          p=`pwd | sed 's#^/[d]#d:#g' |sed 's#/#\\\\#g'`
+          echo "LibrariesPath=$p" >> $GITHUB_ENV
+
+      - name: Save msbuild version.
+        run: |
+          call vcvars32.bat
+          msbuild -version > CACHE_KEY.txt
 
       - name: Clone.
         uses: actions/checkout@v2
@@ -79,38 +100,18 @@ jobs:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
 
-      - name: Set up environment variables.
-        shell: cmd
-        run: |
-          echo ::add-path::C:\Strawberry\perl\bin\
-          echo ::add-path::"%programfiles%\NASM"
-
-          C:
-          cd "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\"
-          echo ::add-path::%cd%
-
-          call vcvars32.bat
-          D:
-          cd %GITHUB_WORKSPACE%
-          msbuild -version > CACHE_KEY.txt
-          echo %MANUAL_CACHING% >> CACHE_KEY.txt
-
-          mkdir Libraries
-          cd Libraries
-          echo ::set-env name=LibrariesPath::%cd%
-
       - name: Generate cache key.
         shell: bash
         run: |
+          echo $MANUAL_CACHING >> CACHE_KEY.txt
           if [ "$AUTO_CACHING" == "1" ]; then
             thisFile=$REPO_NAME/.github/workflows/win.yml
             echo `md5sum $thisFile | awk '{ print $1 }'` >> CACHE_KEY.txt
           fi
-          echo ::set-env name=CACHE_KEY::`md5sum CACHE_KEY.txt | awk '{ print $1 }'`
+          echo "CACHE_KEY=`md5sum CACHE_KEY.txt | awk '{ print $1 }'`" >> $GITHUB_ENV
 
       - name: Choco installs.
-        run: |
-          choco install --no-progress -y nasm yasm jom ninja
+        run: choco install --no-progress -y nasm yasm jom ninja
 
       - name: Patches.
         shell: bash
@@ -123,21 +124,18 @@ jobs:
           eval $checkoutCommit
 
       - name: Find any version of Python 2.
-        shell: cmd
+        shell: bash
         run: |
-          echo Find any version of Python 2.
-          for /D %%a in (C:\hostedtoolcache\windows\Python\2.*) do (
-            SET PY2=%%a\x64
-          )
-          if [%PY2%] == [] (
-            echo Python 2 is not found.
+          echo "Find any version of Python 2."
+          p=`ls /c/hostedtoolcache/windows/python | grep 2 | tail -1`
+          if [ -z "$p" ]; then
+            echo "Python 2 is not found."
             exit 1
-          )
-          echo Found %PY2%.
-          echo ::set-env name=PY2::%PY2%
+          fi
+          echo "PY2=C:\\hostedtoolcache\\windows\\Python\\$p\\x64" >> $GITHUB_ENV
+          echo "Found $p."
 
       - name: LZMA.
-        shell: cmd
         run: |
           %VC%
 
@@ -154,7 +152,6 @@ jobs:
           key: ${{ runner.OS }}-${{ env.CACHE_KEY }}-${{ env.OPENSSL_VER }}
       - name: OpenSSL.
         if: steps.cache-openssl.outputs.cache-hit != 'true'
-        shell: cmd
         run: |
           %VC%
 
@@ -180,7 +177,6 @@ jobs:
           rmdir /S /Q .git
 
       - name: Zlib.
-        shell: cmd
         run: |
           %VC%
 
@@ -197,7 +193,6 @@ jobs:
           path: ${{ env.LibrariesPath }}/openal-soft
           key: ${{ runner.OS }}-openal-soft-${{ env.CACHE_KEY }}
       - name: OpenAL Soft.
-        shell: cmd
         if: steps.cache-openal.outputs.cache-hit != 'true'
         run: |
           %VC%
@@ -225,7 +220,6 @@ jobs:
         env:
           GYP_MSVS_OVERRIDE_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\'
           GYP_MSVS_VERSION: 2019
-        shell: cmd
         if: steps.cache-breakpad.outputs.cache-hit != 'true'
         run: |
           cd %LibrariesPath%
@@ -262,7 +256,6 @@ jobs:
           key: ${{ runner.OS }}-opus-${{ env.CACHE_KEY }}
       - name: Opus.
         if: steps.cache-opus.outputs.cache-hit != 'true'
-        shell: cmd
         run: |
           %VC%
 
@@ -281,7 +274,6 @@ jobs:
           key: ${{ runner.OS }}-ffmpeg-${{ env.CACHE_KEY }}-2-${{ hashFiles('**/build_ffmpeg_win.sh') }}
       - name: FFmpeg.
         if: steps.cache-ffmpeg.outputs.cache-hit != 'true'
-        shell: cmd
         run: |
           %VC%
           choco install --no-progress -y msys2
@@ -303,7 +295,6 @@ jobs:
           key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8/*') }}
       - name: Configure Qt 5.12.8.
         if: steps.cache-qt.outputs.cache-hit != 'true'
-        shell: cmd
         run: |
           %VC%
 
@@ -338,7 +329,6 @@ jobs:
           -platform win32-msvc
       - name: Qt 5.12.8 build.
         if: steps.cache-qt.outputs.cache-hit != 'true'
-        shell: cmd
         run: |
           %VC%
           cd qt_%QT%
@@ -357,7 +347,6 @@ jobs:
           key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}
       - name: WebRTC.
         if: steps.cache-webrtc.outputs.cache-hit != 'true'
-        shell: cmd
         run: |
           %VC%
 
@@ -407,15 +396,14 @@ jobs:
           if [ -n "${{ matrix.defines }}" ]; then
             DEFINE="-D ${{ matrix.defines }}=ON"
             echo Define from matrix: $DEFINE
-            echo ::set-env name=ARTIFACT_NAME::Telegram_${{ matrix.defines }}
+            echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
           else
-            echo ::set-env name=ARTIFACT_NAME::Telegram
+            echo "ARTIFACT_NAME=Telegram" >> $GITHUB_ENV
           fi
-          echo "::set-env name=TDESKTOP_BUILD_DEFINE::$DEFINE"
+          echo "TDESKTOP_BUILD_DEFINE=$DEFINE" >> $GITHUB_ENV
 
       - name: Telegram Desktop build.
         if: env.ONLY_CACHE == 'false'
-        shell: cmd
         run: |
           cd %REPO_NAME%\Telegram
 
@@ -432,7 +420,6 @@ jobs:
 
       - name: Move artifact.
         if: env.UPLOAD_ARTIFACT == 'true'
-        shell: cmd
         run: |
           cd %REPO_NAME%\out\Debug
           mkdir artifact

From fbacb6c0a4d73d845b655afaa349ff12848fc169 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Tue, 27 Oct 2020 17:24:51 +0000
Subject: [PATCH 047/190] Update User-Agent for DNS to Chrome 86.0.4240.75.

---
 .../SourceFiles/mtproto/details/mtproto_domain_resolver.cpp     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp b/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
index 8cca31f3c..91cbf1e01 100644
--- a/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
+++ b/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
@@ -65,7 +65,7 @@ QByteArray DnsUserAgent() {
 	static const auto kResult = QByteArray(
 		"Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
 		"AppleWebKit/537.36 (KHTML, like Gecko) "
-		"Chrome/85.0.4183.102 Safari/537.36");
+		"Chrome/86.0.4240.75 Safari/537.36");
 	return kResult;
 }
 

From 152f1ef17f904058fce8313b53538ea12a022ab8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 27 Oct 2020 23:30:49 +0400
Subject: [PATCH 048/190] Use Core::UpdaterDisabled where a check is for
 installed or not

---
 .../SourceFiles/platform/linux/specific_linux.cpp  | 14 ++++++--------
 .../SourceFiles/platform/linux/specific_linux.h    |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 6b1f01189..ae7122f5c 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -252,7 +252,7 @@ bool GenerateDesktopFile(
 
 	QFile target(targetFile);
 	if (target.open(QIODevice::WriteOnly)) {
-		if (IsStaticBinary() || InAppImage()) {
+		if (!Core::UpdaterDisabled()) {
 			fileText = fileText.replace(
 				QRegularExpression(
 					qsl("^TryExec=.*$"),
@@ -719,7 +719,7 @@ bool IsGtkIntegrationForced() {
 	return false;
 }
 
-bool IsQtPluginsBundled() {
+bool AreQtPluginsBundled() {
 #ifdef DESKTOP_APP_USE_PACKAGED_LAZY
 	return true;
 #else // DESKTOP_APP_USE_PACKAGED_LAZY
@@ -834,7 +834,7 @@ QString SingleInstanceLocalServerName(const QString &hash) {
 
 QString GetLauncherBasename() {
 	static const auto Result = [&] {
-		if ((IsStaticBinary() || InAppImage()) && !cExeName().isEmpty()) {
+		if (!Core::UpdaterDisabled() && !cExeName().isEmpty()) {
 			const auto appimagePath = qsl("file://%1%2")
 				.arg(cExeDir())
 				.arg(cExeName())
@@ -1244,13 +1244,11 @@ void start() {
 		"this may lead to font issues.");
 #endif // DESKTOP_APP_USE_PACKAGED_FONTS
 
-	if (IsQtPluginsBundled()) {
+	if (AreQtPluginsBundled()) {
 		qputenv("QT_WAYLAND_DECORATION", "material");
 	}
 
-	if ((IsStaticBinary()
-		|| InAppImage()
-		|| IsQtPluginsBundled())
+	if (AreQtPluginsBundled()
 		// it is handled by Qt for flatpak and snap
 		&& !InFlatpak()
 		&& !InSnap()) {
@@ -1319,7 +1317,7 @@ void RegisterCustomScheme(bool force) {
 	GError *error = nullptr;
 
 	const auto neededCommandlineBuilder = qsl("%1 --")
-		.arg((IsStaticBinary() || InAppImage())
+		.arg(!Core::UpdaterDisabled()
 			? cExeDir() + cExeName()
 			: cExeName());
 
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.h b/Telegram/SourceFiles/platform/linux/specific_linux.h
index 1772a3c87..f5cae2472 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.h
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.h
@@ -26,7 +26,7 @@ bool InAppImage();
 bool IsStaticBinary();
 bool UseGtkIntegration();
 bool IsGtkIntegrationForced();
-bool IsQtPluginsBundled();
+bool AreQtPluginsBundled();
 
 bool IsXDGDesktopPortalPresent();
 bool UseXDGDesktopPortal();

From 3742db2b91dbb25f6f2e8730142be88d79ee84dc Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 27 Oct 2020 22:56:24 +0400
Subject: [PATCH 049/190] Use portals via glib to open urls & files in snap

---
 .../platform/linux/file_utilities_linux.cpp            | 10 ++--------
 snap/snapcraft.yaml                                    |  1 +
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index dfecc5b79..5f14f4f97 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -68,10 +68,7 @@ QByteArray EscapeShell(const QByteArray &content) {
 } // namespace internal
 
 void UnsafeOpenUrl(const QString &url) {
-	if (InSnap()) {
-		QProcess process;
-		process.startDetached(qsl("xdg-open"), {url});
-	} else if (!g_app_info_launch_default_for_uri(
+	if (!g_app_info_launch_default_for_uri(
 		url.toUtf8(),
 		nullptr,
 		nullptr)) {
@@ -86,10 +83,7 @@ void UnsafeOpenEmailLink(const QString &email) {
 void UnsafeLaunch(const QString &filepath) {
 	const auto absolutePath = QFileInfo(filepath).absoluteFilePath();
 
-	if (InSnap()) {
-		QProcess process;
-		process.startDetached(qsl("xdg-open"), {absolutePath});
-	} else if (!g_app_info_launch_default_for_uri(
+	if (!g_app_info_launch_default_for_uri(
 		("file://" + absolutePath).toUtf8(),
 		nullptr,
 		nullptr)) {
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 09ca41b13..09dc34469 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -20,6 +20,7 @@ apps:
     environment:
       # Use GTK3 cursor theme, icon theme and open/save file dialogs.
       QT_QPA_PLATFORMTHEME: gtk3
+      GTK_USE_PORTAL: 1
     plugs:
       - alsa
       - audio-playback

From 92695f3ab01e7c439adbaff88b952953ed1c3623 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 28 Oct 2020 10:20:20 +0400
Subject: [PATCH 050/190] Make stale bot more patient & change its message

---
 .github/stale.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/stale.yml b/.github/stale.yml
index 6e25c83d1..afc525a07 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 180
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
+daysUntilClose: 30
 # Issues with these labels will never be considered stale
 exemptLabels: []
 # Label to use when marking an issue as stale
@@ -10,7 +10,7 @@ staleLabel: stale
 markComment: |
   Hey there!
 
-  This issue will be automatically closed in 7 days if there would be no activity. We therefore assume that the user has lost interest or resolved the problem on their own.
+  This issue was inactive for a long time and will be automatically closed in 30 days if there isn't any further activity. We therefore assume that the user has lost interest or resolved the problem on their own.
 
   Don't worry though; if this is an error, let us know with a comment and we'll be happy to reopen the issue.
 

From 35c639e4b0c27ac7de559b82c58394ecfe017415 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 28 Oct 2020 10:07:00 +0300
Subject: [PATCH 051/190] Revert 245d644cd7.

See https://github.com/telegramdesktop/tdesktop/issues/8914.
---
 Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 10f12c9ee..38e7062e0 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -347,7 +347,6 @@ OverlayWidget::OverlayWidget()
 
 	if (Platform::IsLinux()) {
 		setWindowFlags(Qt::FramelessWindowHint
-			| Qt::WindowStaysOnTopHint
 			| Qt::MaximizeUsingFullscreenGeometryHint);
 	} else {
 		setWindowFlags(Qt::FramelessWindowHint);

From 9818724382e4ce9bcf4d65e834814e362ed16ad1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 29 Oct 2020 13:31:58 +0400
Subject: [PATCH 052/190] CentOS-based Docker build

---
 Telegram/build/docker/centos_env/Dockerfile | 466 ++++++++++++++++++++
 Telegram/build/docker/centos_env/build.sh   |  10 +
 2 files changed, 476 insertions(+)
 create mode 100644 Telegram/build/docker/centos_env/Dockerfile
 create mode 100644 Telegram/build/docker/centos_env/build.sh

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
new file mode 100644
index 000000000..c02e0d331
--- /dev/null
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -0,0 +1,466 @@
+FROM centos:7 AS builder
+
+ENV GIT https://github.com
+ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig
+ENV QT 5_12_8
+ENV QT_PREFIX /usr/local/desktop-app/Qt-5.12.8
+ENV OPENSSL_VER 1_1_1
+ENV OPENSSL_PREFIX /usr/local/desktop-app/openssl-1.1.1
+
+RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+RUN yum -y install centos-release-scl
+
+RUN yum -y install git cmake3 zlib-devel gtk2-devel libICE-devel \
+	libSM-devel libdrm-devel autoconf automake libtool fontconfig-devel \
+	freetype-devel libX11-devel at-spi2-core-devel alsa-lib-devel \
+	pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel \
+	pkgconfig bison yasm file which xorg-x11-util-macros \
+	devtoolset-8-make devtoolset-8-gcc devtoolset-8-gcc-c++ \
+	devtoolset-8-binutils
+
+RUN ln -s cmake3 /usr/bin/cmake
+
+ENV LibrariesPath /usr/src/Libraries
+WORKDIR $LibrariesPath
+
+FROM builder AS patches
+RUN git clone $GIT/desktop-app/patches.git
+RUN cd patches && git checkout b00f25d
+
+FROM builder AS libffi
+RUN git clone -b v3.3 --depth=1 $GIT/libffi/libffi.git
+
+WORKDIR libffi
+RUN scl enable devtoolset-8 -- ./autogen.sh
+RUN scl enable devtoolset-8 -- ./configure --enable-static --disable-docs
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libffi-cache" install
+
+WORKDIR ..
+RUN rm -rf libffi
+
+FROM builder AS xz
+RUN git clone -b v5.2.5 https://git.tukaani.org/xz.git
+
+WORKDIR xz
+RUN scl enable devtoolset-8 -- cmake3 -B build . -DCMAKE_BUILD_TYPE=Release
+RUN scl enable devtoolset-8 -- cmake3 --build build -j$(nproc)
+RUN DESTDIR="$LibrariesPath/xz-cache" scl enable devtoolset-8 -- cmake3 --install build
+
+FROM builder AS opus
+RUN git clone -b v1.3 --depth=1 $GIT/xiph/opus.git
+
+WORKDIR opus
+RUN scl enable devtoolset-8 -- ./autogen.sh
+RUN scl enable devtoolset-8 -- ./configure
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/opus-cache" install
+
+WORKDIR ..
+RUN rm -rf opus
+
+FROM builder AS xcb-proto
+RUN git clone -b xcb-proto-1.14 --depth=1 https://gitlab.freedesktop.org/xorg/proto/xcbproto.git
+
+WORKDIR xcbproto
+RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/xcb-proto-cache" install
+
+WORKDIR ..
+RUN rm -rf xcbproto
+
+FROM builder AS xcb
+COPY --from=xcb-proto ${LibrariesPath}/xcb-proto-cache /
+
+RUN git clone -b libxcb-1.14 --depth=1 https://gitlab.freedesktop.org/xorg/lib/libxcb.git
+
+WORKDIR libxcb
+RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/xcb-cache" install
+
+WORKDIR ..
+RUN rm -rf libxcb
+
+FROM builder AS libXext
+RUN git clone -b libXext-1.3.4 --depth=1 https://gitlab.freedesktop.org/xorg/lib/libxext.git
+
+WORKDIR libxext
+RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libXext-cache" install
+
+WORKDIR ..
+RUN rm -rf libxext
+
+FROM builder AS libXfixes
+RUN git clone -b libXfixes-5.0.3 --depth=1 https://gitlab.freedesktop.org/xorg/lib/libxfixes.git
+
+WORKDIR libxfixes
+RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libXfixes-cache" install
+
+WORKDIR ..
+RUN rm -rf libxfixes
+
+FROM builder AS libXi
+RUN git clone -b libXi-1.7.10 --depth=1 https://gitlab.freedesktop.org/xorg/lib/libxi.git
+
+WORKDIR libxi
+RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libXi-cache" install
+
+WORKDIR ..
+RUN rm -rf libxi
+
+FROM builder AS libXrender
+RUN git clone -b libXrender-0.9.10 --depth=1 https://gitlab.freedesktop.org/xorg/lib/libxrender.git
+
+WORKDIR libxrender
+RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libXrender-cache" install
+
+WORKDIR ..
+RUN rm -rf libxrender
+
+FROM builder AS wayland
+COPY --from=libffi ${LibrariesPath}/libffi-cache /
+
+RUN git clone -b 1.18.0 --depth=1 https://gitlab.freedesktop.org/wayland/wayland.git
+
+WORKDIR wayland
+RUN scl enable devtoolset-8 -- ./autogen.sh \
+	--enable-static \
+	--disable-documentation \
+	--disable-dtd-validation
+
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/wayland-cache" install
+
+WORKDIR ..
+RUN rm -rf wayland
+
+FROM builder AS libva
+
+COPY --from=libffi ${LibrariesPath}/libffi-cache /
+COPY --from=libXext ${LibrariesPath}/libXext-cache /
+COPY --from=libXfixes ${LibrariesPath}/libXfixes-cache /
+COPY --from=wayland ${LibrariesPath}/wayland-cache /
+
+RUN git clone -b 2.9.0 --depth=1 $GIT/intel/libva.git
+
+WORKDIR libva
+RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libva-cache" install
+
+WORKDIR ..
+RUN rm -rf libva
+
+FROM builder AS libvdpau
+RUN git clone -b libvdpau-1.2 --depth=1 https://gitlab.freedesktop.org/vdpau/libvdpau.git
+
+WORKDIR libvdpau
+RUN scl enable devtoolset-8 -- ./autogen.sh --enable-static
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/libvdpau-cache" install
+
+WORKDIR ..
+RUN rm -rf libvdpau
+
+FROM builder AS ffmpeg
+
+COPY --from=opus ${LibrariesPath}/opus-cache /
+COPY --from=libva ${LibrariesPath}/libva-cache /
+COPY --from=libvdpau ${LibrariesPath}/libvdpau-cache /
+
+RUN git clone -b release/3.4 --depth=1 $GIT/FFmpeg/FFmpeg.git ffmpeg
+
+WORKDIR ffmpeg
+RUN scl enable devtoolset-8 -- ./configure \
+	--disable-debug \
+	--disable-programs \
+	--disable-doc \
+	--disable-network \
+	--disable-autodetect \
+	--disable-everything \
+	--disable-alsa \
+	--disable-iconv \
+	--enable-libopus \
+	--enable-vaapi \
+	--enable-vdpau \
+	--enable-protocol=file \
+	--enable-hwaccel=h264_vaapi \
+	--enable-hwaccel=h264_vdpau \
+	--enable-hwaccel=mpeg4_vaapi \
+	--enable-hwaccel=mpeg4_vdpau \
+	--enable-decoder=aac \
+	--enable-decoder=aac_fixed \
+	--enable-decoder=aac_latm \
+	--enable-decoder=aasc \
+	--enable-decoder=alac \
+	--enable-decoder=flac \
+	--enable-decoder=gif \
+	--enable-decoder=h264 \
+	--enable-decoder=h264_vdpau \
+	--enable-decoder=hevc \
+	--enable-decoder=mp1 \
+	--enable-decoder=mp1float \
+	--enable-decoder=mp2 \
+	--enable-decoder=mp2float \
+	--enable-decoder=mp3 \
+	--enable-decoder=mp3adu \
+	--enable-decoder=mp3adufloat \
+	--enable-decoder=mp3float \
+	--enable-decoder=mp3on4 \
+	--enable-decoder=mp3on4float \
+	--enable-decoder=mpeg4 \
+	--enable-decoder=mpeg4_vdpau \
+	--enable-decoder=msmpeg4v2 \
+	--enable-decoder=msmpeg4v3 \
+	--enable-decoder=opus \
+	--enable-decoder=pcm_alaw \
+	--enable-decoder=pcm_f32be \
+	--enable-decoder=pcm_f32le \
+	--enable-decoder=pcm_f64be \
+	--enable-decoder=pcm_f64le \
+	--enable-decoder=pcm_lxf \
+	--enable-decoder=pcm_mulaw \
+	--enable-decoder=pcm_s16be \
+	--enable-decoder=pcm_s16be_planar \
+	--enable-decoder=pcm_s16le \
+	--enable-decoder=pcm_s16le_planar \
+	--enable-decoder=pcm_s24be \
+	--enable-decoder=pcm_s24daud \
+	--enable-decoder=pcm_s24le \
+	--enable-decoder=pcm_s24le_planar \
+	--enable-decoder=pcm_s32be \
+	--enable-decoder=pcm_s32le \
+	--enable-decoder=pcm_s32le_planar \
+	--enable-decoder=pcm_s64be \
+	--enable-decoder=pcm_s64le \
+	--enable-decoder=pcm_s8 \
+	--enable-decoder=pcm_s8_planar \
+	--enable-decoder=pcm_u16be \
+	--enable-decoder=pcm_u16le \
+	--enable-decoder=pcm_u24be \
+	--enable-decoder=pcm_u24le \
+	--enable-decoder=pcm_u32be \
+	--enable-decoder=pcm_u32le \
+	--enable-decoder=pcm_u8 \
+	--enable-decoder=pcm_zork \
+	--enable-decoder=vorbis \
+	--enable-decoder=wavpack \
+	--enable-decoder=wmalossless \
+	--enable-decoder=wmapro \
+	--enable-decoder=wmav1 \
+	--enable-decoder=wmav2 \
+	--enable-decoder=wmavoice \
+	--enable-encoder=libopus \
+	--enable-parser=aac \
+	--enable-parser=aac_latm \
+	--enable-parser=flac \
+	--enable-parser=h264 \
+	--enable-parser=hevc \
+	--enable-parser=mpeg4video \
+	--enable-parser=mpegaudio \
+	--enable-parser=opus \
+	--enable-parser=vorbis \
+	--enable-demuxer=aac \
+	--enable-demuxer=flac \
+	--enable-demuxer=gif \
+	--enable-demuxer=h264 \
+	--enable-demuxer=hevc \
+	--enable-demuxer=m4v \
+	--enable-demuxer=mov \
+	--enable-demuxer=mp3 \
+	--enable-demuxer=ogg \
+	--enable-demuxer=wav \
+	--enable-muxer=ogg \
+	--enable-muxer=opus
+
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/ffmpeg-cache" install
+
+FROM builder AS openal
+RUN git clone -b openal-soft-1.20.1 --depth=1 $GIT/kcat/openal-soft.git
+
+WORKDIR openal-soft
+RUN scl enable devtoolset-8 -- cmake3 -B build . \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DLIBTYPE:STRING=STATIC \
+	-DALSOFT_EXAMPLES=OFF \
+	-DALSOFT_TESTS=OFF \
+	-DALSOFT_UTILS=OFF \
+	-DALSOFT_CONFIG=OFF
+
+RUN scl enable devtoolset-8 -- cmake3 --build build -j$(nproc)
+RUN DESTDIR="$LibrariesPath/openal-cache" scl enable devtoolset-8 -- cmake3 --install build
+
+WORKDIR ..
+RUN rm -rf openal
+
+FROM builder AS openssl
+ENV opensslDir openssl_${OPENSSL_VER}
+RUN git clone -b OpenSSL_${OPENSSL_VER}-stable --depth=1 \
+	$GIT/openssl/openssl.git $opensslDir
+
+WORKDIR ${opensslDir}
+RUN scl enable devtoolset-8 -- ./config --prefix="$OPENSSL_PREFIX" no-tests
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/openssl-cache" install_sw
+
+WORKDIR ..
+RUN rm -rf $opensslDir
+
+FROM builder AS xkbcommon
+RUN git clone -b xkbcommon-0.8.4 --depth=1 $GIT/xkbcommon/libxkbcommon.git
+
+WORKDIR libxkbcommon
+RUN scl enable devtoolset-8 -- ./autogen.sh \
+	--disable-docs \
+	--disable-wayland \
+	--with-xkb-config-root=/usr/share/X11/xkb \
+	--with-x-locale-root=/usr/share/X11/locale
+
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$LibrariesPath/xkbcommon-cache" install
+
+WORKDIR ..
+RUN rm -rf libxkbcommon
+
+FROM patches AS qt
+
+COPY --from=libffi ${LibrariesPath}/libffi-cache /
+COPY --from=xcb ${LibrariesPath}/xcb-cache /
+COPY --from=libXext ${LibrariesPath}/libXext-cache /
+COPY --from=libXfixes ${LibrariesPath}/libXfixes-cache /
+COPY --from=libXi ${LibrariesPath}/libXi-cache /
+COPY --from=libXrender ${LibrariesPath}/libXrender-cache /
+COPY --from=wayland ${LibrariesPath}/wayland-cache /
+COPY --from=openssl ${LibrariesPath}/openssl-cache /
+COPY --from=xkbcommon ${LibrariesPath}/xkbcommon-cache /
+
+RUN git clone -b v5.12.8 --depth=1 git://code.qt.io/qt/qt5.git qt_${QT}
+WORKDIR qt_${QT}
+RUN perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg
+RUN git submodule update qtbase qtwayland qtimageformats qtsvg
+
+WORKDIR qtbase
+RUN find ../../patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git apply
+WORKDIR ../qtwayland
+RUN find ../../patches/qtwayland_${QT} -type f -print0 | sort -z | xargs -r0 git apply
+WORKDIR ..
+
+RUN scl enable devtoolset-8 -- ./configure -prefix "$QT_PREFIX" \
+	-release \
+	-opensource \
+	-confirm-license \
+	-qt-libpng \
+	-qt-libjpeg \
+	-qt-harfbuzz \
+	-qt-pcre \
+	-qt-xcb \
+	-no-icu \
+	-no-gtk \
+	-static \
+	-dbus-runtime \
+	-openssl-linked \
+	-I "$OPENSSL_PREFIX/include" OPENSSL_LIBS="$OPENSSL_PREFIX/lib/libssl.a $OPENSSL_PREFIX/lib/libcrypto.a -lz -ldl -lpthread" \
+	-nomake examples \
+	-nomake tests
+
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make INSTALL_ROOT="$LibrariesPath/qt-cache" install
+
+FROM patches AS breakpad
+RUN git clone https://chromium.googlesource.com/breakpad/breakpad.git
+
+WORKDIR breakpad
+RUN git checkout bc8fb886
+RUN git clone https://chromium.googlesource.com/linux-syscall-support.git src/third_party/lss
+
+WORKDIR src/third_party/lss
+RUN git checkout a91633d1
+WORKDIR ${LibrariesPath}
+
+ENV BreakpadCache ${LibrariesPath}/breakpad-cache
+RUN git clone https://chromium.googlesource.com/external/gyp.git
+
+WORKDIR gyp
+RUN git checkout 9f2a7bb1
+RUN git apply ../patches/gyp.diff
+
+WORKDIR ../breakpad
+RUN scl enable devtoolset-8 -- ./configure
+RUN scl enable devtoolset-8 -- make -j$(nproc)
+RUN scl enable devtoolset-8 -- make DESTDIR="$BreakpadCache" install
+
+WORKDIR src
+RUN rm -rf testing
+RUN git clone $GIT/google/googletest.git testing
+
+WORKDIR tools
+RUN sed -i 's/minidump_upload.m/minidump_upload.cc/' linux/tools_linux.gypi
+RUN ../../../gyp/gyp  --depth=. --generator-output=.. -Goutput_dir=../out tools.gyp --format=cmake
+
+WORKDIR ../../out/Default
+RUN scl enable devtoolset-8 -- cmake3 .
+RUN scl enable devtoolset-8 -- cmake3 --build . --target dump_syms -j$(nproc)
+RUN mv dump_syms $BreakpadCache
+
+WORKDIR ..
+RUN rm -rf gyp
+
+FROM builder AS webrtc
+
+COPY --from=opus ${LibrariesPath}/opus-cache /
+COPY --from=ffmpeg ${LibrariesPath}/ffmpeg-cache /
+COPY --from=openssl ${LibrariesPath}/openssl-cache /
+COPY --from=qt ${LibrariesPath}/qt_${QT} qt_${QT}
+
+RUN git clone $GIT/desktop-app/tg_owt.git
+
+WORKDIR tg_owt
+RUN git checkout c73a471
+
+RUN scl enable devtoolset-8 -- cmake3 -B out/Release . \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DTG_OWT_SPECIAL_TARGET=linux \
+	-DTG_OWT_LIBJPEG_INCLUDE_PATH=$(pwd)/../qt_$QT/qtbase/src/3rdparty/libjpeg \
+	-DTG_OWT_OPENSSL_INCLUDE_PATH=$OPENSSL_PREFIX/include \
+	-DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
+	-DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include
+
+RUN scl enable devtoolset-8 -- cmake3 --build out/Release
+
+FROM builder
+
+COPY --from=libffi ${LibrariesPath}/libffi-cache /
+COPY --from=xz ${LibrariesPath}/xz-cache /
+COPY --from=opus ${LibrariesPath}/opus-cache /
+COPY --from=xcb ${LibrariesPath}/xcb-cache /
+COPY --from=libXext ${LibrariesPath}/libXext-cache /
+COPY --from=libXfixes ${LibrariesPath}/libXfixes-cache /
+COPY --from=libXi ${LibrariesPath}/libXi-cache /
+COPY --from=libXrender ${LibrariesPath}/libXrender-cache /
+COPY --from=wayland ${LibrariesPath}/wayland-cache /
+COPY --from=libva ${LibrariesPath}/libva-cache /
+COPY --from=libvdpau ${LibrariesPath}/libvdpau-cache /
+COPY --from=ffmpeg ${LibrariesPath}/ffmpeg ffmpeg
+COPY --from=ffmpeg ${LibrariesPath}/ffmpeg-cache /
+COPY --from=openal ${LibrariesPath}/openal-cache /
+COPY --from=openssl ${LibrariesPath}/openssl-cache /
+COPY --from=xkbcommon ${LibrariesPath}/xkbcommon-cache /
+COPY --from=qt ${LibrariesPath}/qt-cache /
+COPY --from=breakpad ${LibrariesPath}/breakpad breakpad
+COPY --from=breakpad ${LibrariesPath}/breakpad-cache /
+COPY --from=webrtc ${LibrariesPath}/tg_owt tg_owt
+
+WORKDIR ../tdesktop
+VOLUME [ "/usr/src/tdesktop" ]
+CMD [ "/usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh" ]
diff --git a/Telegram/build/docker/centos_env/build.sh b/Telegram/build/docker/centos_env/build.sh
new file mode 100644
index 000000000..9bac991f4
--- /dev/null
+++ b/Telegram/build/docker/centos_env/build.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+cd Telegram
+scl enable devtoolset-8 -- ./configure.sh "$@"
+
+if [ -n "$DEBUG" ]; then
+	scl enable devtoolset-8 -- cmake3 --build ../out/Debug -j$(nproc)
+else
+	scl enable devtoolset-8 -- cmake3 --build ../out/Release -j$(nproc)
+fi

From 6e42d546328050d10a3efbdf53553579228be3ea Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 29 Oct 2020 18:34:31 +0400
Subject: [PATCH 053/190] Remove forgotten sws_scale check

It should been removed in 7d29f9ce17c837a0ae2944f5b2c75dc16c9f61f6, but was forgotten
---
 Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
index 263ff877e..2053da32d 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
+++ b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
@@ -258,11 +258,7 @@ bool FFMpegReaderImplementation::renderFrame(QImage &to, bool &hasAlpha, const Q
 		// AV_NUM_DATA_POINTERS defined in AVFrame struct
 		uint8_t *toData[AV_NUM_DATA_POINTERS] = { to.bits(), nullptr };
 		int toLinesize[AV_NUM_DATA_POINTERS] = { to.bytesPerLine(), 0 };
-		int res;
-		if ((res = sws_scale(_swsContext, _frame->data, _frame->linesize, 0, _frame->height, toData, toLinesize)) != _swsSize.height()) {
-			LOG(("Gif Error: Unable to sws_scale to good size %1, height %2, should be %3").arg(logData()).arg(res).arg(_swsSize.height()));
-			return false;
-		}
+		sws_scale(_swsContext, _frame->data, _frame->linesize, 0, _frame->height, toData, toLinesize);
 	}
 	if (hasAlpha) {
 		FFmpeg::PremultiplyInplace(to);

From df9c7f07a19154edd5a3d4212047c6e7d48c352a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 29 Oct 2020 23:43:28 +0300
Subject: [PATCH 054/190] Fixed crashpad build on macOS.

---
 docs/building-xcode.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index f11db2063..f286cf047 100644
--- a/docs/building-xcode.md
+++ b/docs/building-xcode.md
@@ -29,7 +29,7 @@ Go to ***BuildPath*** and run
 
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout ddd4084
+    git checkout a77e4d5
     cd ../
     git clone https://chromium.googlesource.com/external/gyp
     git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@@ -46,7 +46,7 @@ Go to ***BuildPath*** and run
 
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout ddd4084
+    git checkout a77e4d5
     cd ..
 
     git clone https://git.tukaani.org/xz.git

From a38b4f039affa1f32c599df496d6bce934c1ca32 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 29 Oct 2020 23:56:13 +0400
Subject: [PATCH 055/190] Use some methods from lib_base

---
 Telegram/SourceFiles/core/application.cpp     |   3 +-
 Telegram/SourceFiles/core/file_utilities.cpp  |   3 +-
 Telegram/SourceFiles/core/launcher.cpp        |   5 +-
 Telegram/SourceFiles/core/update_checker.cpp  |   9 +-
 .../platform/linux/file_utilities_linux.cpp   |   9 -
 .../platform/linux/specific_linux.cpp         | 238 ------------------
 .../platform/linux/specific_linux.h           |   3 -
 .../platform/mac/file_utilities_mac.mm        |   5 -
 .../SourceFiles/platform/mac/launcher_mac.mm  |   4 +-
 .../SourceFiles/platform/mac/specific_mac.h   |   6 -
 .../SourceFiles/platform/mac/specific_mac.mm  |  70 ------
 .../SourceFiles/platform/mac/specific_mac_p.h |   1 -
 .../platform/mac/specific_mac_p.mm            |   8 -
 .../platform/platform_file_utilities.h        |   1 -
 .../SourceFiles/platform/platform_specific.h  |  17 +-
 .../platform/win/file_utilities_win.cpp       |   5 -
 .../platform/win/file_utilities_win.h         |   2 +-
 .../SourceFiles/platform/win/specific_win.cpp | 124 ++-------
 .../SourceFiles/platform/win/specific_win.h   |   2 -
 .../settings/settings_privacy_security.cpp    |   4 +-
 .../window/notifications_manager_default.cpp  |   4 +-
 .../window/notifications_utilities.cpp        |   4 +-
 22 files changed, 42 insertions(+), 485 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 58fe355b1..001a3ad23 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/emoji_keywords.h"
 #include "chat_helpers/stickers_emoji_image_loader.h"
 #include "base/platform/base_platform_info.h"
+#include "base/platform/base_platform_last_input.h"
 #include "platform/platform_specific.h"
 #include "mainwindow.h"
 #include "dialogs/dialogs_entry.h"
@@ -807,7 +808,7 @@ void Application::updateNonIdle() {
 
 crl::time Application::lastNonIdleTime() const {
 	return std::max(
-		Platform::LastUserInputTime().value_or(0),
+		base::Platform::LastUserInputTime().value_or(0),
 		_lastNonIdleTime);
 }
 
diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp
index 580be2082..5b3858ee6 100644
--- a/Telegram/SourceFiles/core/file_utilities.cpp
+++ b/Telegram/SourceFiles/core/file_utilities.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/file_utilities.h"
 
 #include "storage/localstorage.h"
+#include "base/platform/base_platform_file_utilities.h"
 #include "platform/platform_file_utilities.h"
 #include "core/application.h"
 #include "base/unixtime.h"
@@ -154,7 +155,7 @@ void Launch(const QString &filepath) {
 void ShowInFolder(const QString &filepath) {
 	crl::on_main([=] {
 		Ui::PreventDelayedActivation();
-		Platform::File::UnsafeShowInFolder(filepath);
+		base::Platform::ShowInFolder(filepath);
 	});
 }
 
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index ee01d01e0..28271acd9 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/platform_launcher.h"
 #include "platform/platform_specific.h"
 #include "base/platform/base_platform_info.h"
+#include "base/platform/base_platform_file_utilities.h"
 #include "ui/main_queue_processor.h"
 #include "ui/ui_utility.h"
 #include "core/crash_reports.h"
@@ -342,7 +343,7 @@ int Launcher::exec() {
 	if (!UpdaterDisabled() && cRestartingUpdate()) {
 		DEBUG_LOG(("Sandbox Info: executing updater to install update."));
 		if (!launchUpdater(UpdaterLaunch::PerformUpdate)) {
-			psDeleteDir(cWorkingDir() + qsl("tupdates/temp"));
+			base::Platform::DeleteDirectory(cWorkingDir() + qsl("tupdates/temp"));
 		}
 	} else if (cRestarting()) {
 		DEBUG_LOG(("Sandbox Info: executing Telegram because of restart."));
@@ -402,7 +403,7 @@ bool Launcher::customWorkingDir() const {
 }
 
 void Launcher::prepareSettings() {
-	auto path = Platform::CurrentExecutablePath(_argc, _argv);
+	auto path = base::Platform::CurrentExecutablePath(_argc, _argv);
 	LOG(("Executable path before check: %1").arg(path));
 	if (!path.isEmpty()) {
 		auto info = QFileInfo(path);
diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
index 2c4fb4794..69ba0f74b 100644
--- a/Telegram/SourceFiles/core/update_checker.cpp
+++ b/Telegram/SourceFiles/core/update_checker.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/update_checker.h"
 
 #include "base/platform/base_platform_info.h"
+#include "base/platform/base_platform_file_utilities.h"
 #include "base/timer.h"
 #include "base/bytes.h"
 #include "base/unixtime.h"
@@ -211,7 +212,7 @@ QString UpdatesFolder() {
 }
 
 void ClearAll() {
-	psDeleteDir(UpdatesFolder());
+	base::Platform::DeleteDirectory(UpdatesFolder());
 }
 
 QString FindUpdateFile() {
@@ -270,7 +271,7 @@ bool UnpackUpdate(const QString &filepath) {
 	input.close();
 
 	QString tempDirPath = cWorkingDir() + qsl("tupdates/temp"), readyFilePath = cWorkingDir() + qsl("tupdates/temp/ready");
-	psDeleteDir(tempDirPath);
+	base::Platform::DeleteDirectory(tempDirPath);
 
 	QDir tempDir(tempDirPath);
 	if (tempDir.exists() || QFile(readyFilePath).exists()) {
@@ -1560,8 +1561,8 @@ bool checkReadyUpdate() {
 #endif // Q_OS_UNIX
 
 #ifdef Q_OS_MAC
-	Platform::RemoveQuarantine(QFileInfo(curUpdater).absolutePath());
-	Platform::RemoveQuarantine(updater.absolutePath());
+	base::Platform::RemoveQuarantine(QFileInfo(curUpdater).absolutePath());
+	base::Platform::RemoveQuarantine(updater.absolutePath());
 #endif // Q_OS_MAC
 
 	return true;
diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index 5f14f4f97..0531a5b45 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -11,11 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/linux_gdk_helper.h"
 #include "platform/linux/linux_desktop_environment.h"
 #include "platform/linux/specific_linux.h"
-#include "boxes/abstract_box.h"
 #include "storage/localstorage.h"
-#include "base/platform/base_platform_file_utilities.h"
 
-#include <QtCore/QProcess>
 #include <QtGui/QDesktopServices>
 
 extern "C" {
@@ -91,12 +88,6 @@ void UnsafeLaunch(const QString &filepath) {
 	}
 }
 
-void UnsafeShowInFolder(const QString &filepath) {
-	// Hide mediaview to make other apps visible.
-	Ui::hideLayer(anim::type::instant);
-	base::Platform::ShowInFolder(filepath);
-}
-
 } // namespace File
 
 namespace FileDialog {
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index ae7122f5c..f07b61349 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -174,33 +174,6 @@ QString FlatpakID() {
 	return Result;
 }
 
-QString ProcessNameByPID(const QString &pid) {
-	constexpr auto kMaxPath = 1024;
-	char result[kMaxPath] = { 0 };
-	auto count = readlink("/proc/" + pid.toLatin1() + "/exe", result, kMaxPath);
-	if (count > 0) {
-		auto filename = QFile::decodeName(result);
-		auto deletedPostfix = qstr(" (deleted)");
-		if (filename.endsWith(deletedPostfix) && !QFileInfo(filename).exists()) {
-			filename.chop(deletedPostfix.size());
-		}
-		return filename;
-	}
-
-	return QString();
-}
-
-QString RealExecutablePath(int argc, char *argv[]) {
-	const auto processName = ProcessNameByPID(qsl("self"));
-
-	// Fallback to the first command line argument.
-	return !processName.isEmpty()
-		? processName
-		: argc
-			? QFile::decodeName(argv[0])
-			: QString();
-}
-
 bool RunShellCommand(const QString &program, const QStringList &arguments) {
 	const auto result = QProcess::execute(program, arguments);
 
@@ -310,131 +283,6 @@ bool GetImageFromClipboardSupported() {
 }
 #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
 
-std::optional<crl::time> XCBLastUserInputTime() {
-	const auto connection = base::Platform::XCB::GetConnectionFromQt();
-	if (!connection) {
-		return std::nullopt;
-	}
-
-	if (!base::Platform::XCB::IsExtensionPresent(
-			connection,
-			&xcb_screensaver_id)) {
-		return std::nullopt;
-	}
-
-	const auto root = base::Platform::XCB::GetRootWindowFromQt();
-	if (!root.has_value()) {
-		return std::nullopt;
-	}
-
-	const auto cookie = xcb_screensaver_query_info(
-		connection,
-		*root);
-
-	auto reply = xcb_screensaver_query_info_reply(
-		connection,
-		cookie,
-		nullptr);
-
-	if (!reply) {
-		return std::nullopt;
-	}
-
-	const auto idle = reply->ms_since_user_input;
-	free(reply);
-
-	return (crl::now() - static_cast<crl::time>(idle));
-}
-
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-std::optional<crl::time> FreedesktopDBusLastUserInputTime() {
-	static auto NotSupported = false;
-
-	if (NotSupported) {
-		return std::nullopt;
-	}
-
-	static const auto Message = QDBusMessage::createMethodCall(
-		qsl("org.freedesktop.ScreenSaver"),
-		qsl("/org/freedesktop/ScreenSaver"),
-		qsl("org.freedesktop.ScreenSaver"),
-		qsl("GetSessionIdleTime"));
-
-	const QDBusReply<uint> reply = QDBusConnection::sessionBus().call(
-		Message);
-
-	static const auto NotSupportedErrors = {
-		QDBusError::ServiceUnknown,
-		QDBusError::NotSupported,
-	};
-
-	static const auto NotSupportedErrorsToLog = {
-		QDBusError::Disconnected,
-		QDBusError::AccessDenied,
-	};
-
-	if (reply.isValid()) {
-		return (crl::now() - static_cast<crl::time>(reply.value()));
-	} else if (ranges::contains(NotSupportedErrors, reply.error().type())) {
-		NotSupported = true;
-	} else {
-		if (ranges::contains(NotSupportedErrorsToLog, reply.error().type())) {
-			NotSupported = true;
-		}
-
-		LOG(("App Error: Unable to get last user input time "
-			"from org.freedesktop.ScreenSaver: %1: %2")
-			.arg(reply.error().name())
-			.arg(reply.error().message()));
-	}
-
-	return std::nullopt;
-}
-
-std::optional<crl::time> MutterDBusLastUserInputTime() {
-	static auto NotSupported = false;
-
-	if (NotSupported) {
-		return std::nullopt;
-	}
-
-	static const auto Message = QDBusMessage::createMethodCall(
-		qsl("org.gnome.Mutter.IdleMonitor"),
-		qsl("/org/gnome/Mutter/IdleMonitor/Core"),
-		qsl("org.gnome.Mutter.IdleMonitor"),
-		qsl("GetIdletime"));
-
-	const QDBusReply<qulonglong> reply = QDBusConnection::sessionBus().call(
-		Message);
-
-	static const auto NotSupportedErrors = {
-		QDBusError::ServiceUnknown,
-	};
-
-	static const auto NotSupportedErrorsToLog = {
-		QDBusError::Disconnected,
-		QDBusError::AccessDenied,
-	};
-
-	if (reply.isValid()) {
-		return (crl::now() - static_cast<crl::time>(reply.value()));
-	} else if (ranges::contains(NotSupportedErrors, reply.error().type())) {
-		NotSupported = true;
-	} else {
-		if (ranges::contains(NotSupportedErrorsToLog, reply.error().type())) {
-			NotSupported = true;
-		}
-
-		LOG(("App Error: Unable to get last user input time "
-			"from org.gnome.Mutter.IdleMonitor: %1: %2")
-			.arg(reply.error().name())
-			.arg(reply.error().message()));
-	}
-
-	return std::nullopt;
-}
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-
 uint XCBMoveResizeFromEdges(Qt::Edges edges) {
 	if (edges == (Qt::TopEdge | Qt::LeftEdge))
 		return 0;
@@ -682,11 +530,6 @@ bool InSnap() {
 	return Result;
 }
 
-bool InAppImage() {
-	static const auto Result = qEnvironmentVariableIsSet("APPIMAGE");
-	return Result;
-}
-
 bool IsStaticBinary() {
 #ifdef DESKTOP_APP_USE_PACKAGED
 		return false;
@@ -773,25 +616,6 @@ bool CanOpenDirectoryWithPortal() {
 	return false;
 }
 
-QString CurrentExecutablePath(int argc, char *argv[]) {
-	if (InAppImage()) {
-		const auto appimagePath = QString::fromUtf8(qgetenv("APPIMAGE"));
-		const auto appimagePathList = appimagePath.split('/');
-
-		if (qEnvironmentVariableIsSet("ARGV0")
-			&& appimagePathList.size() >= 5
-			&& appimagePathList[1] == qstr("run")
-			&& appimagePathList[2] == qstr("user")
-			&& appimagePathList[4] == qstr("appimagelauncherfs")) {
-			return QString::fromUtf8(qgetenv("ARGV0"));
-		}
-
-		return appimagePath;
-	}
-
-	return RealExecutablePath(argc, argv);
-}
-
 QString AppRuntimeDirectory() {
 	static const auto Result = [&] {
 		auto runtimeDir = QStandardPaths::writableLocation(
@@ -908,29 +732,6 @@ QImage GetImageFromClipboard() {
 	return data;
 }
 
-std::optional<crl::time> LastUserInputTime() {
-	if (!IsWayland()) {
-		const auto xcbResult = XCBLastUserInputTime();
-		if (xcbResult.has_value()) {
-			return xcbResult;
-		}
-	}
-
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-	const auto freedesktopResult = FreedesktopDBusLastUserInputTime();
-	if (freedesktopResult.has_value()) {
-		return freedesktopResult;
-	}
-
-	const auto mutterResult = MutterDBusLastUserInputTime();
-	if (mutterResult.has_value()) {
-		return mutterResult;
-	}
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-
-	return std::nullopt;
-}
-
 std::optional<bool> IsDarkMode() {
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
 	if (Libs::GtkSettingSupported() && Libs::GtkLoaded()) {
@@ -1089,41 +890,6 @@ QRect psDesktopRect() {
 void psWriteDump() {
 }
 
-bool _removeDirectory(const QString &path) { // from http://stackoverflow.com/questions/2256945/removing-a-non-empty-directory-programmatically-in-c-or-c
-	QByteArray pathRaw = QFile::encodeName(path);
-	DIR *d = opendir(pathRaw.constData());
-	if (!d) return false;
-
-	while (struct dirent *p = readdir(d)) {
-		/* Skip the names "." and ".." as we don't want to recurse on them. */
-		if (!strcmp(p->d_name, ".") || !strcmp(p->d_name, "..")) continue;
-
-		QString fname = path + '/' + p->d_name;
-		QByteArray fnameRaw = QFile::encodeName(fname);
-		struct stat statbuf;
-		if (!stat(fnameRaw.constData(), &statbuf)) {
-			if (S_ISDIR(statbuf.st_mode)) {
-				if (!_removeDirectory(fname)) {
-					closedir(d);
-					return false;
-				}
-			} else {
-				if (unlink(fnameRaw.constData())) {
-					closedir(d);
-					return false;
-				}
-			}
-		}
-	}
-	closedir(d);
-
-	return !rmdir(pathRaw.constData());
-}
-
-void psDeleteDir(const QString &dir) {
-	_removeDirectory(dir);
-}
-
 void psActivateProcess(uint64 pid) {
 //	objc_activateProgram();
 }
@@ -1444,10 +1210,6 @@ void psNewVersion() {
 	Platform::RegisterCustomScheme();
 }
 
-bool psShowOpenWithMenu(int x, int y, const QString &file) {
-	return false;
-}
-
 void psAutoStart(bool start, bool silent) {
 	if (InFlatpak()) {
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.h b/Telegram/SourceFiles/platform/linux/specific_linux.h
index f5cae2472..bc71760f8 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.h
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.h
@@ -22,7 +22,6 @@ inline void SetWatchingMediaKeys(bool watching) {
 
 bool InFlatpak();
 bool InSnap();
-bool InAppImage();
 bool IsStaticBinary();
 bool UseGtkIntegration();
 bool IsGtkIntegrationForced();
@@ -55,8 +54,6 @@ inline void psCheckLocalSocket(const QString &serverName) {
 
 void psWriteDump();
 
-void psDeleteDir(const QString &dir);
-
 QStringList psInitLogs();
 void psClearInitLogs();
 
diff --git a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
index 81f924734..59f7f7329 100644
--- a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
@@ -8,7 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/mac/file_utilities_mac.h"
 
 #include "base/platform/mac/base_utilities_mac.h"
-#include "base/platform/base_platform_file_utilities.h"
 #include "lang/lang_keys.h"
 #include "styles/style_window.h"
 
@@ -573,9 +572,5 @@ void UnsafeLaunch(const QString &filepath) {
 	}
 }
 
-void UnsafeShowInFolder(const QString &filepath) {
-	base::Platform::ShowInFolder(filepath);
-}
-
 } // namespace File
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/launcher_mac.mm b/Telegram/SourceFiles/platform/mac/launcher_mac.mm
index a8d0cb26b..94fa4d5e5 100644
--- a/Telegram/SourceFiles/platform/mac/launcher_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/launcher_mac.mm
@@ -10,8 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/crash_reports.h"
 #include "core/update_checker.h"
 #include "base/platform/base_platform_info.h"
+#include "base/platform/base_platform_file_utilities.h"
 #include "base/platform/mac/base_utilities_mac.h"
-#include "platform/platform_specific.h"
 
 #include <Cocoa/Cocoa.h>
 #include <CoreFoundation/CFURL.h>
@@ -54,7 +54,7 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
 			return false;
 		}
 		path = [path stringByAppendingString:@"/Contents/Frameworks/Updater"];
-		RemoveQuarantine(QFile::decodeName([path fileSystemRepresentation]));
+		base::Platform::RemoveQuarantine(QFile::decodeName([path fileSystemRepresentation]));
 
 		NSMutableArray *args = [[NSMutableArray alloc] initWithObjects:@"-workpath", Q2NSString(cWorkingDir()), @"-procid", nil];
 		[args addObject:[NSString stringWithFormat:@"%d", [[NSProcessInfo processInfo] processIdentifier]]];
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h
index d217b83f6..419ea4241 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.h
@@ -16,8 +16,6 @@ class LocationPoint;
 
 namespace Platform {
 
-void RemoveQuarantine(const QString &path);
-
 [[nodiscard]] bool IsDarkMenuBar();
 
 inline QImage GetImageFromClipboard() {
@@ -76,8 +74,6 @@ inline void psCheckLocalSocket(const QString &serverName) {
 
 void psWriteDump();
 
-void psDeleteDir(const QString &dir);
-
 QStringList psInitLogs();
 void psClearInitLogs();
 
@@ -92,8 +88,6 @@ QRect psDesktopRect();
 int psCleanup();
 int psFixPrevious();
 
-bool psShowOpenWithMenu(int x, int y, const QString &file);
-
 void psNewVersion();
 
 void psDownloadPathEnableAccess();
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm
index 1d7bfefc5..63d320087 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm
@@ -65,10 +65,6 @@ void psWriteDump() {
 #endif // DESKTOP_APP_DISABLE_CRASH_REPORTS
 }
 
-void psDeleteDir(const QString &dir) {
-	objc_deleteDir(dir);
-}
-
 QStringList psInitLogs() {
 	return _initLogs;
 }
@@ -118,10 +114,6 @@ void finish() {
 	objc_finish();
 }
 
-QString CurrentExecutablePath(int argc, char *argv[]) {
-	return NS2QString([[NSBundle mainBundle] bundlePath]);
-}
-
 QString SingleInstanceLocalServerName(const QString &hash) {
 #ifndef OS_MAC_STORE
 	return qsl("/tmp/") + hash + '-' + cGUIDStr();
@@ -130,14 +122,6 @@ QString SingleInstanceLocalServerName(const QString &hash) {
 #endif // OS_MAC_STORE
 }
 
-void RemoveQuarantine(const QString &path) {
-	const auto kQuarantineAttribute = "com.apple.quarantine";
-
-	DEBUG_LOG(("Removing quarantine attribute: %1").arg(path));
-	const auto local = QFile::encodeName(path);
-	removexattr(local.data(), kQuarantineAttribute, 0);
-}
-
 bool IsDarkMenuBar() {
 	bool result = false;
 	@autoreleasepool {
@@ -234,60 +218,6 @@ bool OpenSystemSettings(SystemSettingsType type) {
 	return true;
 }
 
-// Taken from https://github.com/trueinteractions/tint/issues/53.
-std::optional<crl::time> LastUserInputTime() {
-	CFMutableDictionaryRef properties = 0;
-	CFTypeRef obj;
-	mach_port_t masterPort;
-	io_iterator_t iter;
-	io_registry_entry_t curObj;
-
-	IOMasterPort(MACH_PORT_NULL, &masterPort);
-
-	/* Get IOHIDSystem */
-	IOServiceGetMatchingServices(masterPort, IOServiceMatching("IOHIDSystem"), &iter);
-	if (iter == 0) {
-		return std::nullopt;
-	} else {
-		curObj = IOIteratorNext(iter);
-	}
-	if (IORegistryEntryCreateCFProperties(curObj, &properties, kCFAllocatorDefault, 0) == KERN_SUCCESS && properties != NULL) {
-		obj = CFDictionaryGetValue(properties, CFSTR("HIDIdleTime"));
-		CFRetain(obj);
-	} else {
-		return std::nullopt;
-	}
-
-	uint64 err = ~0L, idleTime = err;
-	if (obj) {
-		CFTypeID type = CFGetTypeID(obj);
-
-		if (type == CFDataGetTypeID()) {
-			CFDataGetBytes((CFDataRef) obj, CFRangeMake(0, sizeof(idleTime)), (UInt8*)&idleTime);
-		} else if (type == CFNumberGetTypeID()) {
-			CFNumberGetValue((CFNumberRef)obj, kCFNumberSInt64Type, &idleTime);
-		} else {
-			// error
-		}
-
-		CFRelease(obj);
-
-		if (idleTime != err) {
-			idleTime /= 1000000; // return as ms
-		}
-	} else {
-		// error
-	}
-
-	CFRelease((CFTypeRef)properties);
-	IOObjectRelease(curObj);
-	IOObjectRelease(iter);
-	if (idleTime == err) {
-		return std::nullopt;
-	}
-	return (crl::now() - static_cast<crl::time>(idleTime));
-}
-
 void IgnoreApplicationActivationRightNow() {
 	objc_ignoreApplicationActivationRightNow();
 }
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.h b/Telegram/SourceFiles/platform/mac/specific_mac_p.h
index 866e666f3..0a01209d3 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.h
@@ -19,7 +19,6 @@ void objc_finish();
 
 void objc_activateProgram(WId winId);
 bool objc_moveFile(const QString &from, const QString &to);
-void objc_deleteDir(const QString &dir);
 
 double objc_appkitVersion();
 
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
index 6d494395f..59b9539ee 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
@@ -340,14 +340,6 @@ bool objc_moveFile(const QString &from, const QString &to) {
 	return false;
 }
 
-void objc_deleteDir(const QString &dir) {
-	@autoreleasepool {
-
-	[[NSFileManager defaultManager] removeItemAtPath:Q2NSString(dir) error:nil];
-
-	}
-}
-
 double objc_appkitVersion() {
 	return NSAppKitVersionNumber;
 }
diff --git a/Telegram/SourceFiles/platform/platform_file_utilities.h b/Telegram/SourceFiles/platform/platform_file_utilities.h
index cd70b78a6..ad229d244 100644
--- a/Telegram/SourceFiles/platform/platform_file_utilities.h
+++ b/Telegram/SourceFiles/platform/platform_file_utilities.h
@@ -20,7 +20,6 @@ void UnsafeOpenEmailLink(const QString &email);
 bool UnsafeShowOpenWithDropdown(const QString &filepath, QPoint menuPosition);
 bool UnsafeShowOpenWith(const QString &filepath);
 void UnsafeLaunch(const QString &filepath);
-void UnsafeShowInFolder(const QString &filepath);
 
 void PostprocessDownloaded(const QString &filepath);
 
diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h
index cbdbb2ec3..0227a3174 100644
--- a/Telegram/SourceFiles/platform/platform_specific.h
+++ b/Telegram/SourceFiles/platform/platform_specific.h
@@ -31,24 +31,12 @@ enum class SystemSettingsType {
 
 void SetWatchingMediaKeys(bool watching);
 void SetApplicationIcon(const QIcon &icon);
-QString CurrentExecutablePath(int argc, char *argv[]);
 QString SingleInstanceLocalServerName(const QString &hash);
 void RegisterCustomScheme(bool force = false);
 PermissionStatus GetPermissionStatus(PermissionType type);
 void RequestPermission(PermissionType type, Fn<void(PermissionStatus)> resultCallback);
 void OpenSystemSettingsForPermission(PermissionType type);
 bool OpenSystemSettings(SystemSettingsType type);
-
-[[nodiscard]] std::optional<crl::time> LastUserInputTime();
-[[nodiscard]] inline bool LastUserInputTimeSupported() {
-	return LastUserInputTime().has_value();
-}
-
-[[nodiscard]] std::optional<bool> IsDarkMode();
-[[nodiscard]] inline bool IsDarkModeSupported() {
-	return IsDarkMode().has_value();
-}
-
 void IgnoreApplicationActivationRightNow();
 bool AutostartSupported();
 bool TrayIconSupported();
@@ -61,6 +49,11 @@ bool SetWindowExtents(QWindow *window, const QMargins &extents);
 bool UnsetWindowExtents(QWindow *window);
 Window::ControlsLayout WindowControlsLayout();
 
+[[nodiscard]] std::optional<bool> IsDarkMode();
+[[nodiscard]] inline bool IsDarkModeSupported() {
+	return IsDarkMode().has_value();
+}
+
 namespace ThirdParty {
 
 void start();
diff --git a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
index fe1dde530..b515f8e65 100644
--- a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
+++ b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
@@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwindow.h"
 #include "storage/localstorage.h"
 #include "platform/win/windows_dlls.h"
-#include "base/platform/base_platform_file_utilities.h"
 #include "lang/lang_keys.h"
 #include "core/application.h"
 #include "core/crash_reports.h"
@@ -266,10 +265,6 @@ void UnsafeLaunch(const QString &filepath) {
 	ShellExecute(0, L"open", wstringPath.c_str(), 0, 0, SW_SHOWNORMAL);
 }
 
-void UnsafeShowInFolder(const QString &filepath) {
-	base::Platform::ShowInFolder(filepath);
-}
-
 void PostprocessDownloaded(const QString &filepath) {
 	auto wstringZoneFile = QDir::toNativeSeparators(filepath).toStdWString() + L":Zone.Identifier";
 	auto f = CreateFile(wstringZoneFile.c_str(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
diff --git a/Telegram/SourceFiles/platform/win/file_utilities_win.h b/Telegram/SourceFiles/platform/win/file_utilities_win.h
index 3647b1ca5..4a5b07f66 100644
--- a/Telegram/SourceFiles/platform/win/file_utilities_win.h
+++ b/Telegram/SourceFiles/platform/win/file_utilities_win.h
@@ -13,7 +13,7 @@ namespace Platform {
 namespace File {
 
 inline QString UrlToLocal(const QUrl &url) {
-	return url.toLocalFile();
+	return ::File::internal::UrlToLocalDefault(url);
 }
 
 inline void UnsafeOpenUrl(const QString &url) {
diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp
index 38cc936db..ae492a312 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.cpp
+++ b/Telegram/SourceFiles/platform/win/specific_win.cpp
@@ -70,8 +70,6 @@ using namespace Platform;
 
 namespace {
 
-constexpr auto kRefreshBadLastUserInputTimeout = 10 * crl::time(1000);
-
 QStringList _initLogs;
 
 bool themeInited = false;
@@ -87,49 +85,27 @@ public:
 };
 _PsInitializer _psInitializer;
 
-} // namespace
+BOOL CALLBACK _ActivateProcess(HWND hWnd, LPARAM lParam) {
+	uint64 &processId(*(uint64*)lParam);
 
-void psDeleteDir(const QString &dir) {
-	std::wstring wDir = QDir::toNativeSeparators(dir).toStdWString();
-	WCHAR path[4096];
-	memcpy(path, wDir.c_str(), (wDir.size() + 1) * sizeof(WCHAR));
-	path[wDir.size() + 1] = 0;
-	SHFILEOPSTRUCT file_op = {
-		NULL,
-		FO_DELETE,
-		path,
-		L"",
-		FOF_NOCONFIRMATION |
-		FOF_NOERRORUI |
-		FOF_SILENT,
-		false,
-		0,
-		L""
-	};
-	int res = SHFileOperation(&file_op);
-}
+	DWORD dwProcessId;
+	::GetWindowThreadProcessId(hWnd, &dwProcessId);
 
-namespace {
-	BOOL CALLBACK _ActivateProcess(HWND hWnd, LPARAM lParam) {
-		uint64 &processId(*(uint64*)lParam);
-
-		DWORD dwProcessId;
-		::GetWindowThreadProcessId(hWnd, &dwProcessId);
-
-		if ((uint64)dwProcessId == processId) { // found top-level window
-			static const int32 nameBufSize = 1024;
-			WCHAR nameBuf[nameBufSize];
-			int32 len = GetWindowText(hWnd, nameBuf, nameBufSize);
-			if (len && len < nameBufSize) {
-				if (QRegularExpression(qsl("^Telegram(\\s*\\(\\d+\\))?$")).match(QString::fromStdWString(nameBuf)).hasMatch()) {
-					BOOL res = ::SetForegroundWindow(hWnd);
-					::SetFocus(hWnd);
-					return FALSE;
-				}
+	if ((uint64)dwProcessId == processId) { // found top-level window
+		static const int32 nameBufSize = 1024;
+		WCHAR nameBuf[nameBufSize];
+		int32 len = GetWindowText(hWnd, nameBuf, nameBufSize);
+		if (len && len < nameBufSize) {
+			if (QRegularExpression(qsl("^Telegram(\\s*\\(\\d+\\))?$")).match(QString::fromStdWString(nameBuf)).hasMatch()) {
+				BOOL res = ::SetForegroundWindow(hWnd);
+				::SetFocus(hWnd);
+				return FALSE;
 			}
 		}
-		return TRUE;
 	}
+	return TRUE;
+}
+
 }
 
 QStringList psInitLogs() {
@@ -312,78 +288,10 @@ void SetApplicationIcon(const QIcon &icon) {
 	QApplication::setWindowIcon(icon);
 }
 
-QString CurrentExecutablePath(int argc, char *argv[]) {
-	WCHAR result[MAX_PATH + 1] = { 0 };
-	auto count = GetModuleFileName(nullptr, result, MAX_PATH + 1);
-	if (count < MAX_PATH + 1) {
-		auto info = QFileInfo(QDir::fromNativeSeparators(QString::fromWCharArray(result)));
-		return info.absoluteFilePath();
-	}
-
-	// Fallback to the first command line argument.
-	auto argsCount = 0;
-	if (auto args = CommandLineToArgvW(GetCommandLine(), &argsCount)) {
-		auto info = QFileInfo(QDir::fromNativeSeparators(QString::fromWCharArray(args[0])));
-		LocalFree(args);
-		return info.absoluteFilePath();
-	}
-	return QString();
-}
-
 QString SingleInstanceLocalServerName(const QString &hash) {
 	return qsl("Global\\") + hash + '-' + cGUIDStr();
 }
 
-std::optional<crl::time> LastUserInputTime() {
-	auto lii = LASTINPUTINFO{ 0 };
-	lii.cbSize = sizeof(LASTINPUTINFO);
-	if (!GetLastInputInfo(&lii)) {
-		return std::nullopt;
-	}
-	const auto now = crl::now();
-	const auto input = crl::time(lii.dwTime);
-	static auto LastTrackedInput = input;
-	static auto LastTrackedWhen = now;
-
-	const auto ticks32 = crl::time(GetTickCount());
-	const auto ticks64 = crl::time(GetTickCount64());
-	const auto elapsed = std::max(ticks32, ticks64) - input;
-	const auto good = (std::abs(ticks32 - ticks64) <= crl::time(1000))
-		&& (elapsed >= 0);
-	if (good) {
-		LastTrackedInput = input;
-		LastTrackedWhen = now;
-		return (now > elapsed) ? (now - elapsed) : crl::time(0);
-	}
-
-	static auto WaitingDelayed = false;
-	if (!WaitingDelayed) {
-		WaitingDelayed = true;
-		base::call_delayed(kRefreshBadLastUserInputTimeout, [=] {
-			WaitingDelayed = false;
-			[[maybe_unused]] const auto cheked = LastUserInputTime();
-		});
-	}
-	constexpr auto OverrunLimit = std::numeric_limits<DWORD>::max();
-	constexpr auto OverrunThreshold = OverrunLimit / 4;
-	if (LastTrackedInput == input) {
-		return LastTrackedWhen;
-	}
-	const auto guard = gsl::finally([&] {
-		LastTrackedInput = input;
-		LastTrackedWhen = now;
-	});
-	if (input > LastTrackedInput) {
-		const auto add = input - LastTrackedInput;
-		return std::min(LastTrackedWhen + add, now);
-	} else if (crl::time(OverrunLimit) + input - LastTrackedInput
-		< crl::time(OverrunThreshold)) {
-		const auto add = crl::time(OverrunLimit) + input - LastTrackedInput;
-		return std::min(LastTrackedWhen + add, now);
-	}
-	return LastTrackedWhen;
-}
-
 std::optional<bool> IsDarkMode() {
 	static const auto kSystemVersion = QOperatingSystemVersion::current();
 	static const auto kDarkModeAddedVersion = QOperatingSystemVersion(
diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h
index 1ef5471c1..92114eda5 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.h
+++ b/Telegram/SourceFiles/platform/win/specific_win.h
@@ -65,8 +65,6 @@ inline void psCheckLocalSocket(const QString &) {
 
 void psWriteDump();
 
-void psDeleteDir(const QString &dir);
-
 QStringList psInitLogs();
 void psClearInitLogs();
 
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index adac9798f..338009173 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -32,7 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_instance.h"
 #include "core/core_cloud_password.h"
 #include "core/update_checker.h"
-#include "platform/platform_specific.h"
+#include "base/platform/base_platform_last_input.h"
 #include "lang/lang_keys.h"
 #include "data/data_session.h"
 #include "data/data_chat.h"
@@ -288,7 +288,7 @@ void SetupLocalPasscode(
 		Ui::show(Box<PasscodeBox>(&controller->session(), true));
 	});
 
-	const auto label = Platform::LastUserInputTimeSupported()
+	const auto label = base::Platform::LastUserInputTimeSupported()
 		? tr::lng_passcode_autolock_away
 		: tr::lng_passcode_autolock_inactive;
 	auto value = PasscodeChanges(
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index ad4ddfa57..3162481b6 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_account.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "platform/platform_specific.h"
+#include "base/platform/base_platform_last_input.h"
 #include "base/call_delayed.h"
 #include "facades.h"
 #include "app.h"
@@ -663,7 +663,7 @@ void Notification::prepareActionsCache() {
 bool Notification::checkLastInput(bool hasReplyingNotifications) {
 	if (!_waitingForInput) return true;
 
-	const auto waitForUserInput = Platform::LastUserInputTimeSupported()
+	const auto waitForUserInput = base::Platform::LastUserInputTimeSupported()
 		? (Core::App().lastNonIdleTime() <= _started)
 		: false;
 	if (!waitForUserInput) {
diff --git a/Telegram/SourceFiles/window/notifications_utilities.cpp b/Telegram/SourceFiles/window/notifications_utilities.cpp
index 86dc2a905..34b0c9cb0 100644
--- a/Telegram/SourceFiles/window/notifications_utilities.cpp
+++ b/Telegram/SourceFiles/window/notifications_utilities.cpp
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "window/notifications_utilities.h"
 
-#include "platform/platform_specific.h"
+#include "base/platform/base_platform_file_utilities.h"
 #include "core/application.h"
 #include "data/data_peer.h"
 #include "ui/empty_userpic.h"
@@ -36,7 +36,7 @@ CachedUserpics::~CachedUserpics() {
 		}
 
 		// This works about 1200ms on Windows for a folder with one image O_o
-		//		psDeleteDir(cWorkingDir() + qsl("tdata/temp"));
+		//		base::Platform::DeleteDirectory(cWorkingDir() + qsl("tdata/temp"));
 	}
 }
 

From 49e96d857a252c61ad3272d39b3ec842d598336f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 13 Oct 2020 00:37:55 +0400
Subject: [PATCH 056/190] Add drag distance for move-by-titlebar to process
 double click right

---
 .../SourceFiles/window/window_title_qt.cpp    | 38 +++++++++++++++----
 Telegram/SourceFiles/window/window_title_qt.h |  5 ++-
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_title_qt.cpp b/Telegram/SourceFiles/window/window_title_qt.cpp
index 01aaca62b..71cb2118a 100644
--- a/Telegram/SourceFiles/window/window_title_qt.cpp
+++ b/Telegram/SourceFiles/window/window_title_qt.cpp
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
+#include <QtWidgets/QApplication>
 
 namespace Window {
 namespace {
@@ -231,17 +232,26 @@ void TitleWidgetQt::resizeEvent(QResizeEvent *e) {
 
 void TitleWidgetQt::mousePressEvent(QMouseEvent *e) {
 	if (e->button() == Qt::LeftButton) {
-		startMove();
+		if ((crl::now() - _pressedForMoveTime)
+			< QApplication::doubleClickInterval()) {
+			if (_maximizedState) {
+				window()->setWindowState(Qt::WindowNoState);
+			} else {
+				window()->setWindowState(Qt::WindowMaximized);
+			}
+		} else {
+			_pressedForMove = true;
+			_pressedForMoveTime = crl::now();
+			_pressedForMovePoint = e->windowPos().toPoint();
+		}
 	} else if (e->button() == Qt::RightButton) {
 		Platform::ShowWindowMenu(window()->windowHandle());
 	}
 }
 
-void TitleWidgetQt::mouseDoubleClickEvent(QMouseEvent *e) {
-	if (_maximizedState) {
-		window()->setWindowState(Qt::WindowNoState);
-	} else {
-		window()->setWindowState(Qt::WindowMaximized);
+void TitleWidgetQt::mouseReleaseEvent(QMouseEvent *e) {
+	if (e->button() == Qt::LeftButton) {
+		_pressedForMove = false;
 	}
 }
 
@@ -250,14 +260,26 @@ bool TitleWidgetQt::eventFilter(QObject *obj, QEvent *e) {
 		|| e->type() == QEvent::MouseButtonPress) {
 		if (window()->isAncestorOf(static_cast<QWidget*>(obj))) {
 			const auto mouseEvent = static_cast<QMouseEvent*>(e);
-			const auto edges = edgesFromPos(
-				mouseEvent->windowPos().toPoint());
+			const auto currentPoint = mouseEvent->windowPos().toPoint();
+			const auto edges = edgesFromPos(currentPoint);
+			const auto dragDistance = QApplication::startDragDistance();
 
 			if (e->type() == QEvent::MouseMove
 				&& mouseEvent->buttons() == Qt::NoButton) {
+				if (_pressedForMove) {
+					_pressedForMove = false;
+				}
+
 				updateCursor(edges);
 			}
 
+			if (e->type() == QEvent::MouseMove
+				&& _pressedForMove
+				&& ((currentPoint - _pressedForMovePoint).manhattanLength()
+					>= dragDistance)) {
+				return startMove();
+			}
+
 			if (e->type() == QEvent::MouseButtonPress
 				&& mouseEvent->button() == Qt::LeftButton
 				&& !_maximizedState) {
diff --git a/Telegram/SourceFiles/window/window_title_qt.h b/Telegram/SourceFiles/window/window_title_qt.h
index 40f823b0b..126711e95 100644
--- a/Telegram/SourceFiles/window/window_title_qt.h
+++ b/Telegram/SourceFiles/window/window_title_qt.h
@@ -39,7 +39,7 @@ protected:
 	void paintEvent(QPaintEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
-	void mouseDoubleClickEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
 
 	bool eventFilter(QObject *obj, QEvent *e) override;
 
@@ -73,6 +73,9 @@ private:
 	bool _windowWasFrameless = false;
 	bool _cursorOverriden = false;
 	bool _extentsSet = false;
+	bool _pressedForMove = false;
+	crl::time _pressedForMoveTime = 0;
+	QPoint _pressedForMovePoint;
 
 };
 

From 8f5b13600302ebfec616bbe13d6b995017456479 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 16 Oct 2020 07:02:05 +0400
Subject: [PATCH 057/190] Implement possibility to hide taskbar icon on Linux

---
 .../platform/linux/main_window_linux.cpp      | 91 ++++++++++++++++++-
 .../platform/linux/specific_linux.cpp         | 23 +++++
 .../SourceFiles/platform/mac/specific_mac.h   |  4 +
 .../SourceFiles/platform/platform_specific.h  |  1 +
 .../SourceFiles/platform/win/specific_win.h   |  4 +
 .../settings/settings_advanced.cpp            |  2 +-
 6 files changed, 119 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 1c8a1cbb5..eaad0ce2e 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -23,6 +23,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/localstorage.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
+#include "base/platform/base_platform_info.h"
+#include "base/platform/linux/base_xcb_utilities_linux.h"
+#include "base/call_delayed.h"
 #include "ui/widgets/input_fields.h"
 #include "facades.h"
 #include "app.h"
@@ -40,6 +43,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtDBus/QDBusError>
 #include <QtDBus/QDBusMetaType>
 
+#include <xcb/xcb.h>
+
 extern "C" {
 #undef signals
 #include <gio/gio.h>
@@ -74,6 +79,64 @@ base::flat_map<int, QImage> TrayIconImageBack;
 QIcon TrayIcon;
 QString TrayIconThemeName, TrayIconName;
 
+bool XCBSkipTaskbar(QWindow *window, bool set) {
+	const auto connection = base::Platform::XCB::GetConnectionFromQt();
+	if (!connection) {
+		return false;
+	}
+
+	const auto root = base::Platform::XCB::GetRootWindowFromQt();
+	if (!root.has_value()) {
+		return false;
+	}
+
+	const auto stateAtom = base::Platform::XCB::GetAtom(
+		connection,
+		"_NET_WM_STATE");
+
+	if (!stateAtom.has_value()) {
+		return false;
+	}
+
+	const auto skipTaskbarAtom = base::Platform::XCB::GetAtom(
+		connection,
+		"_NET_WM_STATE_SKIP_TASKBAR");
+
+	if (!skipTaskbarAtom.has_value()) {
+		return false;
+	}
+
+	xcb_client_message_event_t xev;
+	xev.response_type = XCB_CLIENT_MESSAGE;
+	xev.type = *stateAtom;
+	xev.sequence = 0;
+	xev.window = window->winId();
+	xev.format = 32;
+	xev.data.data32[0] = set ? 1 : 0;
+	xev.data.data32[1] = *skipTaskbarAtom;
+	xev.data.data32[2] = 0;
+	xev.data.data32[3] = 0;
+	xev.data.data32[4] = 0;
+
+	xcb_send_event(
+		connection,
+		false,
+		*root,
+		XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT
+			| XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY,
+		reinterpret_cast<const char*>(&xev));
+
+	return true;
+}
+
+bool SkipTaskbar(QWindow *window, bool set) {
+	if (!IsWayland()) {
+		return XCBSkipTaskbar(window, set);
+	}
+
+	return false;
+}
+
 QString GetPanelIconName(int counter, bool muted) {
 	return (counter > 0)
 		? (muted
@@ -618,6 +681,10 @@ void MainWindow::handleSNIHostRegistered() {
 	trayIcon = nullptr;
 
 	psSetupTrayIcon();
+
+	SkipTaskbar(
+		windowHandle(),
+		Global::WorkMode().value() == dbiwmTrayOnly);
 }
 
 void MainWindow::handleSNIOwnerChanged(
@@ -649,6 +716,10 @@ void MainWindow::handleSNIOwnerChanged(
 	} else {
 		LOG(("System tray is not available."));
 	}
+
+	SkipTaskbar(
+		windowHandle(),
+		(Global::WorkMode().value() == dbiwmTrayOnly) && trayAvailable());
 }
 
 void MainWindow::handleAppMenuOwnerChanged(
@@ -724,6 +795,8 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
 	} else {
 		psSetupTrayIcon();
 	}
+
+	SkipTaskbar(windowHandle(), mode == dbiwmTrayOnly);
 }
 
 void MainWindow::unreadCounterChangedHook() {
@@ -820,9 +893,6 @@ void MainWindow::createGlobalMenu() {
 void MainWindow::updateGlobalMenuHook() {
 }
 
-void MainWindow::handleVisibleChangedHook(bool visible) {
-}
-
 #else // DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 void MainWindow::createGlobalMenu() {
@@ -1113,7 +1183,19 @@ void MainWindow::updateGlobalMenuHook() {
 	ForceDisabled(psClearFormat, !markdownEnabled);
 }
 
+#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+
 void MainWindow::handleVisibleChangedHook(bool visible) {
+	if (visible) {
+		base::call_delayed(1, this, [=] {
+			SkipTaskbar(
+				windowHandle(),
+				(Global::WorkMode().value() == dbiwmTrayOnly)
+					&& trayAvailable());
+		});
+	}
+
+#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	if (_appMenuSupported && !_mainMenuPath.path().isEmpty()) {
 		if (visible) {
 			RegisterAppMenu(winId(), _mainMenuPath);
@@ -1121,9 +1203,8 @@ void MainWindow::handleVisibleChangedHook(bool visible) {
 			UnregisterAppMenu(winId());
 		}
 	}
-}
-
 #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+}
 
 MainWindow::~MainWindow() {
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index f07b61349..554f7fd1a 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -502,6 +502,25 @@ bool UnsetXCBFrameExtents(QWindow *window) {
 	return true;
 }
 
+bool XCBSkipTaskbarSupported() {
+	const auto connection = base::Platform::XCB::GetConnectionFromQt();
+	if (!connection) {
+		return false;
+	}
+
+	const auto skipTaskbarAtom = base::Platform::XCB::GetAtom(
+		connection,
+		"_NET_WM_STATE_SKIP_TASKBAR");
+
+	if (!skipTaskbarAtom.has_value()) {
+		return false;
+	}
+
+	return ranges::contains(
+		base::Platform::XCB::GetWMSupported(connection),
+		*skipTaskbarAtom);
+}
+
 Window::Control GtkKeywordToWindowControl(const QString &keyword) {
 	if (keyword == qstr("minimize")) {
 		return Window::Control::Minimize;
@@ -769,6 +788,10 @@ bool TrayIconSupported() {
 		: false;
 }
 
+bool SkipTaskbarSupported() {
+	return !IsWayland() && XCBSkipTaskbarSupported();
+}
+
 bool StartSystemMove(QWindow *window) {
 	if (IsWayland()) {
 		return StartWaylandMove(window);
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h
index 419ea4241..af04f1320 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.h
@@ -42,6 +42,10 @@ inline bool TrayIconSupported() {
 	return true;
 }
 
+inline bool SkipTaskbarSupported() {
+	return false;
+}
+
 inline bool SetWindowExtents(QWindow *window, const QMargins &extents) {
 	return false;
 }
diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h
index 0227a3174..45fafaefa 100644
--- a/Telegram/SourceFiles/platform/platform_specific.h
+++ b/Telegram/SourceFiles/platform/platform_specific.h
@@ -40,6 +40,7 @@ bool OpenSystemSettings(SystemSettingsType type);
 void IgnoreApplicationActivationRightNow();
 bool AutostartSupported();
 bool TrayIconSupported();
+bool SkipTaskbarSupported();
 QImage GetImageFromClipboard();
 bool StartSystemMove(QWindow *window);
 bool StartSystemResize(QWindow *window, Qt::Edges edges);
diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h
index 92114eda5..6e4ae4b54 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.h
+++ b/Telegram/SourceFiles/platform/win/specific_win.h
@@ -38,6 +38,10 @@ inline bool TrayIconSupported() {
 	return true;
 }
 
+inline bool SkipTaskbarSupported() {
+	return true;
+}
+
 inline bool SetWindowExtents(QWindow *window, const QMargins &extents) {
 	return false;
 }
diff --git a/Telegram/SourceFiles/settings/settings_advanced.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp
index 3471c0d34..b9c1f7105 100644
--- a/Telegram/SourceFiles/settings/settings_advanced.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced.cpp
@@ -352,7 +352,7 @@ void SetupSystemIntegrationContent(not_null<Ui::VerticalLayout*> container) {
 			return (workMode == dbiwmWindowOnly)
 				|| (workMode == dbiwmWindowAndTray);
 		};
-		const auto taskbar = Platform::IsWindows()
+		const auto taskbar = Platform::SkipTaskbarSupported()
 			? addCheckbox(
 				tr::lng_settings_workmode_window(),
 				taskbarEnabled())

From d73d3cd43d66a61961835847e67d9c122c3633fd Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 16 Oct 2020 08:46:20 +0400
Subject: [PATCH 058/190] Implement ShowWindowMenu for XCB

---
 .../platform/linux/specific_linux.cpp         | 49 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 554f7fd1a..6d37f1f15 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -374,6 +374,51 @@ bool StartXCBMoveResize(QWindow *window, int edges) {
 	return true;
 }
 
+bool ShowXCBWindowMenu(QWindow *window) {
+	const auto connection = base::Platform::XCB::GetConnectionFromQt();
+	if (!connection) {
+		return false;
+	}
+
+	const auto root = base::Platform::XCB::GetRootWindowFromQt();
+	if (!root.has_value()) {
+		return false;
+	}
+
+	const auto showWindowMenuAtom = base::Platform::XCB::GetAtom(
+		connection,
+		"_GTK_SHOW_WINDOW_MENU");
+
+	if (!showWindowMenuAtom.has_value()) {
+		return false;
+	}
+
+	const auto globalPos = QCursor::pos();
+
+	xcb_client_message_event_t xev;
+	xev.response_type = XCB_CLIENT_MESSAGE;
+	xev.type = *showWindowMenuAtom;
+	xev.sequence = 0;
+	xev.window = window->winId();
+	xev.format = 32;
+	xev.data.data32[0] = 0;
+	xev.data.data32[1] = globalPos.x();
+	xev.data.data32[2] = globalPos.y();
+	xev.data.data32[3] = 0;
+	xev.data.data32[4] = 0;
+
+	xcb_ungrab_pointer(connection, XCB_CURRENT_TIME);
+	xcb_send_event(
+		connection,
+		false,
+		*root,
+		XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT
+			| XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY,
+		reinterpret_cast<const char*>(&xev));
+
+	return true;
+}
+
 bool StartWaylandMove(QWindow *window) {
 	// There are startSystemMove on Qt 5.15
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) && !defined DESKTOP_APP_QT_PATCHED
@@ -811,9 +856,9 @@ bool StartSystemResize(QWindow *window, Qt::Edges edges) {
 bool ShowWindowMenu(QWindow *window) {
 	if (IsWayland()) {
 		return ShowWaylandWindowMenu(window);
+	} else {
+		return ShowXCBWindowMenu(window);
 	}
-
-	return false;
 }
 
 bool SetWindowExtents(QWindow *window, const QMargins &extents) {

From af6b07b780120d690e95616c6c84f6ff45e60d5d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 27 Oct 2020 13:29:50 +0400
Subject: [PATCH 059/190] Use crl::on_main in MainWindow::sniSignalEmitted

---
 .../SourceFiles/platform/linux/main_window_linux.cpp   | 10 +++++++---
 .../SourceFiles/platform/linux/main_window_linux.h     |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index eaad0ce2e..ccedc4e52 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -509,7 +509,7 @@ void MainWindow::initHook() {
 		_sniDBusProxy,
 		"g-signal",
 		G_CALLBACK(sniSignalEmitted),
-		this);
+		nullptr);
 
 	auto sniWatcher = new QDBusServiceWatcher(
 		kSNIWatcherService.utf16(),
@@ -655,9 +655,13 @@ void MainWindow::sniSignalEmitted(
 		gchar *sender_name,
 		gchar *signal_name,
 		GVariant *parameters,
-		MainWindow *window) {
+		gpointer user_data) {
 	if(signal_name == qstr("StatusNotifierHostRegistered")) {
-		window->handleSNIHostRegistered();
+		crl::on_main([] {
+			if (const auto window = App::wnd()) {
+				window->handleSNIHostRegistered();
+			}
+		});
 	}
 }
 
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.h b/Telegram/SourceFiles/platform/linux/main_window_linux.h
index a39089326..5dfb5eb8a 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.h
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.h
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtDBus/QDBusObjectPath>
 #include <dbusmenuexporter.h>
 
+typedef void* gpointer;
 typedef char gchar;
 typedef struct _GVariant GVariant;
 typedef struct _GDBusProxy GDBusProxy;
@@ -145,7 +146,7 @@ private:
 		gchar *sender_name,
 		gchar *signal_name,
 		GVariant *parameters,
-		MainWindow *window);
+		gpointer user_data);
 #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 };

From 9b99bb172abffc435fc6815b4c80283de06737ac Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 27 Oct 2020 14:13:28 +0400
Subject: [PATCH 060/190] Make methods called from static methods private

---
 Telegram/SourceFiles/platform/linux/main_window_linux.h   | 5 +----
 .../platform/linux/notifications_manager_linux.cpp        | 8 ++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.h b/Telegram/SourceFiles/platform/linux/main_window_linux.h
index 5dfb5eb8a..73934b4dc 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.h
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.h
@@ -42,10 +42,6 @@ public:
 		return _sniAvailable || QSystemTrayIcon::isSystemTrayAvailable();
 	}
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-	void handleSNIHostRegistered();
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-
 	static void LibsLoaded();
 
 	~MainWindow();
@@ -115,6 +111,7 @@ private:
 
 	void setSNITrayIcon(int counter, bool muted);
 	void attachToSNITrayIcon();
+	void handleSNIHostRegistered();
 
 	void handleSNIOwnerChanged(
 		const QString &service,
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index b4a0d8f83..bacb22379 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -238,10 +238,6 @@ public:
 	void close();
 	void setImage(const QString &imagePath);
 
-	void notificationClosed(uint id, uint reason);
-	void actionInvoked(uint id, const QString &actionName);
-	void notificationReplied(uint id, const QString &text);
-
 private:
 	GDBusConnection *_dbusConnection = nullptr;
 	base::weak_ptr<Manager> _manager;
@@ -259,6 +255,10 @@ private:
 	guint _notificationClosedSignalId = 0;
 	NotificationId _id;
 
+	void notificationClosed(uint id, uint reason);
+	void actionInvoked(uint id, const QString &actionName);
+	void notificationReplied(uint id, const QString &text);
+
 	static void signalEmitted(
 		GDBusConnection *connection,
 		const gchar *sender_name,

From bbc59c1a999dd753a11c4c8fd4f42f853c77aadc Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 28 Oct 2020 18:15:43 +0400
Subject: [PATCH 061/190] Use Launcher::initHook on Linux

---
 Telegram/SourceFiles/core/launcher.cpp                 | 4 ----
 Telegram/SourceFiles/platform/linux/launcher_linux.cpp | 7 +++++++
 Telegram/SourceFiles/platform/linux/launcher_linux.h   | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index 28271acd9..aa50e19a2 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -301,10 +301,6 @@ void Launcher::init() {
 
 	QApplication::setApplicationName(qsl("TelegramDesktop"));
 
-#if defined Q_OS_UNIX && !defined Q_OS_MAC && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-	QApplication::setDesktopFileName(Platform::GetLauncherFilename());
-#endif
-
 #ifndef OS_MAC_OLD
 	QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true);
 #endif // OS_MAC_OLD
diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
index 1d948fd19..0a21a1841 100644
--- a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
@@ -8,9 +8,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/launcher_linux.h"
 
 #include "base/platform/base_platform_info.h"
+#include "platform/linux/specific_linux.h"
 #include "core/crash_reports.h"
 #include "core/update_checker.h"
 
+#include <QtWidgets/QApplication>
+
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <cstdlib>
@@ -46,6 +49,10 @@ Launcher::Launcher(int argc, char *argv[])
 : Core::Launcher(argc, argv, DeviceModelPretty(), SystemVersionPretty()) {
 }
 
+void Launcher::initHook() {
+	QApplication::setDesktopFileName(GetLauncherFilename());
+}
+
 bool Launcher::launchUpdater(UpdaterLaunch action) {
 	if (cExeName().isEmpty()) {
 		return false;
diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.h b/Telegram/SourceFiles/platform/linux/launcher_linux.h
index 0b7dea131..188b1b6e6 100644
--- a/Telegram/SourceFiles/platform/linux/launcher_linux.h
+++ b/Telegram/SourceFiles/platform/linux/launcher_linux.h
@@ -16,6 +16,7 @@ public:
 	Launcher(int argc, char *argv[]);
 
 private:
+	void initHook() override;
 	bool launchUpdater(UpdaterLaunch action) override;
 
 };

From bb94507af12d475673da7ddbb9b29920765fad0f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 29 Oct 2020 01:29:48 +0400
Subject: [PATCH 062/190] Use UrlClickHandler::Open instead of File::OpenUrl

---
 Telegram/SourceFiles/boxes/about_box.cpp                  | 3 +--
 Telegram/SourceFiles/core/application.cpp                 | 1 -
 Telegram/SourceFiles/history/history_location_manager.cpp | 4 ++--
 Telegram/SourceFiles/settings/settings_main.cpp           | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp
index 90d2e82cc..cb4895c89 100644
--- a/Telegram/SourceFiles/boxes/about_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_box.cpp
@@ -14,7 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/text/text_utilities.h"
-#include "core/file_utilities.h"
 #include "base/platform/base_platform_info.h"
 #include "core/click_handler_types.h"
 #include "core/update_checker.h"
@@ -108,7 +107,7 @@ void AboutBox::showVersionHistory() {
 
 		Ui::show(Box<InformBox>("The link to the current private alpha version of Telegram Desktop was copied to the clipboard."));
 	} else {
-		File::OpenUrl(qsl("https://desktop.telegram.org/changelog"));
+		UrlClickHandler::Open(qsl("https://desktop.telegram.org/changelog"));
 	}
 }
 
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 001a3ad23..d0f45f9b9 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -79,7 +79,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtWidgets/QDesktopWidget>
 #include <QtCore/QMimeDatabase>
 #include <QtGui/QGuiApplication>
-#include <QtGui/QDesktopServices>
 
 namespace Core {
 namespace {
diff --git a/Telegram/SourceFiles/history/history_location_manager.cpp b/Telegram/SourceFiles/history/history_location_manager.cpp
index 08f33f94f..13142c1da 100644
--- a/Telegram/SourceFiles/history/history_location_manager.cpp
+++ b/Telegram/SourceFiles/history/history_location_manager.cpp
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_location_manager.h"
 
 #include "mainwidget.h"
-#include "core/file_utilities.h"
+#include "core/click_handler_types.h"
 #include "lang/lang_keys.h"
 #include "ui/image/image.h"
 #include "data/data_file_origin.h"
@@ -24,7 +24,7 @@ QString LocationClickHandler::copyToClipboardContextItemText() const {
 
 void LocationClickHandler::onClick(ClickContext context) const {
 	if (!psLaunchMaps(_point)) {
-		File::OpenUrl(_text);
+		UrlClickHandler::Open(_text);
 	}
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index c7d9579d5..36911968c 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -34,7 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_sensitive_content.h"
 #include "api/api_global_privacy.h"
 #include "window/window_session_controller.h"
-#include "core/file_utilities.h"
+#include "core/click_handler_types.h"
 #include "base/call_delayed.h"
 #include "facades.h"
 #include "app.h"
@@ -274,7 +274,7 @@ void SetupInterfaceScale(
 }
 
 void OpenFaq() {
-	File::OpenUrl(telegramFaqLink());
+	UrlClickHandler::Open(telegramFaqLink());
 }
 
 void SetupFaq(not_null<Ui::VerticalLayout*> container, bool icon) {

From e31ffb699aa0a4640b0809355f341450fae1a033 Mon Sep 17 00:00:00 2001
From: andry-dev <peketribal2@gmail.com>
Date: Thu, 29 Oct 2020 19:12:30 +0100
Subject: [PATCH 063/190] Ignore additional video streams inside an audio file.

Fixes #5840, #5357 and #4327.
---
 .../SourceFiles/media/audio/media_audio.cpp     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp
index 6e4ad2d17..5e79687ad 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio.cpp
@@ -1531,15 +1531,12 @@ public:
 		int res = 0;
 		char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
 
-		int videoStreamId = av_find_best_stream(fmtContext, AVMEDIA_TYPE_VIDEO, -1, -1, &codec, 0);
-		if (videoStreamId >= 0) {
-			DEBUG_LOG(("Audio Read Error: Found video stream in file '%1', data size '%2', error %3, %4").arg(_file.name()).arg(_data.size()).arg(videoStreamId).arg(av_make_error_string(err, sizeof(err), streamId)));
-			return false;
-		}
-
 		for (int32 i = 0, l = fmtContext->nb_streams; i < l; ++i) {
 			const auto stream = fmtContext->streams[i];
 			if (stream->disposition & AV_DISPOSITION_ATTACHED_PIC) {
+				if (!_cover.isNull()) {
+					continue;
+				}
 				const auto &packet = stream->attached_pic;
 				if (packet.size) {
 					const auto coverBytes = QByteArray(
@@ -1555,9 +1552,15 @@ public:
 					if (!_cover.isNull()) {
 						_coverBytes = coverBytes;
 						_coverFormat = format;
-						break;
 					}
 				}
+			} else if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
+				DEBUG_LOG(("Audio Read Error: Found video stream in file '%1', data size '%2', error %3, %4")
+					.arg(_file.name())
+					.arg(_data.size())
+					.arg(i)
+					.arg(av_make_error_string(err, sizeof(err), streamId)));
+				return false;
 			}
 		}
 

From 822d1718a97cbd5b6b68595615d4e3c1711c06d3 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 7 Oct 2020 06:21:20 +0400
Subject: [PATCH 064/190] Use MozJPEG

---
 .github/workflows/linux.yml | 19 ++++++++++++++--
 .github/workflows/mac.yml   | 21 +++++++++++++++--
 .github/workflows/win.yml   | 39 ++++++++++++++++----------------
 docs/building-cmake.md      | 16 ++++++++++---
 docs/building-msvc.md       | 16 ++++++++++---
 docs/building-osx.md        | 17 +++++++++++---
 docs/building-xcode.md      | 20 ++++++++++++++---
 snap/snapcraft.yaml         | 45 ++++++++++++++++++++++++++++++++++---
 8 files changed, 154 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 7b4f32953..6d69c0b1a 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -157,6 +157,22 @@ jobs:
 
           cmake --version
 
+      - name: MozJPEG.
+        run: |
+          cd $LibrariesPath
+
+          git clone -b v4.0.1-rc2 $GIT/mozilla/mozjpeg.git
+          cd mozjpeg
+          cmake -B build . \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_INSTALL_PREFIX=/usr/local \
+          -DWITH_JPEG8=ON \
+          -DPNG_SUPPORTED=OFF
+          cmake --build build -j$(nproc)
+          sudo cmake --install build
+          cd ..
+          rm -rf mozjpeg
+
       - name: Opus cache.
         id: cache-opus
         uses: actions/cache@v2
@@ -439,7 +455,6 @@ jobs:
           -confirm-license \
           -qt-zlib \
           -qt-libpng \
-          -qt-libjpeg \
           -qt-harfbuzz \
           -qt-pcre \
           -qt-xcb \
@@ -531,7 +546,7 @@ jobs:
           cmake -G Ninja \
           -DCMAKE_BUILD_TYPE=Debug \
           -DTG_OWT_SPECIAL_TARGET=linux \
-          -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_$QT/qtbase/src/3rdparty/libjpeg \
+          -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
           -DTG_OWT_OPENSSL_INCLUDE_PATH=$OPENSSL_PREFIX/include \
           -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
           -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include \
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 11ace8da8..48ad4d4da 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -132,6 +132,20 @@ jobs:
           make -j$(nproc)
           sudo make install
 
+      - name: MozJPEG.
+        run: |
+          cd $LibrariesPath
+
+          git clone -b v4.0.1-rc2 $GIT/mozilla/mozjpeg.git
+          cd mozjpeg
+          cmake -B build . \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_INSTALL_PREFIX=/usr/local/macos \
+          -DWITH_JPEG8=ON \
+          -DPNG_SUPPORTED=OFF
+          cmake --build build -j$(nproc)
+          sudo cmake --install build
+
       - name: OpenSSL cache.
         id: cache-openssl
         uses: actions/cache@v2
@@ -443,7 +457,10 @@ jobs:
           -securetransport \
           -nomake examples \
           -nomake tests \
-          -platform macx-clang
+          -platform macx-clang \
+          -I "/usr/local/macos/include" \
+          LIBJPEG_LIBS="/usr/local/macos/lib/libjpeg.a" \
+          ZLIB_LIBS="/usr/local/macos/lib/libz.a"
 
           make -j$(nproc)
           sudo make install
@@ -467,7 +484,7 @@ jobs:
           cd tg_owt/out/Debug
           cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug \
           -DTG_OWT_SPECIAL_TARGET=mac \
-          -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_$QT/qtbase/src/3rdparty/libjpeg \
+          -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \
           -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_$OPENSSL_VER/include \
           -DTG_OWT_OPUS_INCLUDE_PATH=$PREFIX/include/opus \
           -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include \
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 02140b397..83ffcc001 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -186,6 +186,20 @@ jobs:
           cd contrib\vstudio\vc14
           msbuild -m zlibstat.vcxproj /property:Configuration=Debug
 
+      - name: MozJPEG.
+        shell: cmd
+        run: |
+          %VC%
+
+          git clone -b v4.0.1-rc2 %GIT%/mozilla/mozjpeg.git
+          cd mozjpeg
+          cmake . ^
+          -G "Visual Studio 16 2019" ^
+          -A Win32 ^
+          -DWITH_JPEG8=ON ^
+          -DPNG_SUPPORTED=OFF
+          cmake --build . --config Debug
+
       - name: OpenAL Soft cache.
         id: cache-openal
         uses: actions/cache@v2
@@ -326,7 +340,10 @@ jobs:
           -mp ^
           -nomake examples ^
           -nomake tests ^
-          -platform win32-msvc
+          -platform win32-msvc ^
+          -I "%LibrariesPath%\mozjpeg" ^
+          LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
+          LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib"
       - name: Qt 5.12.8 build.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |
@@ -350,28 +367,13 @@ jobs:
         run: |
           %VC%
 
-          :: Qt libjpeg.
-          mkdir qt_%QT%
-          cd qt_%QT%
-          git clone -b %QT_VER% https://github.com/qt/qtbase
-
-          move qtbase\src\3rdparty\libjpeg ..
-          cd ..
-          dir
-          rmdir /S /Q qt_%QT%
-          mkdir qt_%QT%\qtbase\src\3rdparty\
-          move libjpeg qt_%QT%\qtbase\src\3rdparty\
-
-          :: WebRTC.
-          cd %LibrariesPath%
-
           git clone %GIT%/desktop-app/tg_owt.git
           mkdir tg_owt\out\Debug
           cd tg_owt\out\Debug
           cmake -G Ninja ^
           -DCMAKE_BUILD_TYPE=Debug ^
           -DTG_OWT_SPECIAL_TARGET=win ^
-          -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../qt_%QT%/qtbase/src/3rdparty/libjpeg ^
+          -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^
           -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_%OPENSSL_VER%/include ^
           -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
           -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ^
@@ -386,9 +388,6 @@ jobs:
           mkdir out\Debug
           move tg_owt.lib out\Debug\tg_owt.lib
 
-          cd %LibrariesPath%
-          rmdir /S /Q qt_%QT%
-
       - name: Read defines.
         shell: bash
         run: |
diff --git a/docs/building-cmake.md b/docs/building-cmake.md
index cc0c55cde..11e722095 100644
--- a/docs/building-cmake.md
+++ b/docs/building-cmake.md
@@ -58,6 +58,17 @@ Go to ***BuildPath*** and run
     git checkout ddd4084
     cd ../
 
+    git clone -b v4.0.1-rc2 https://github.com/mozilla/mozjpeg.git
+    cd mozjpeg
+    cmake -B build . \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/local \
+    -DWITH_JPEG8=ON \
+    -DPNG_SUPPORTED=OFF
+    cmake --build build $MAKE_THREADS_CNT
+    sudo cmake --install build
+    cd ..
+
     git clone https://github.com/xiph/opus
     cd opus
     git checkout v1.3
@@ -221,7 +232,7 @@ Go to ***BuildPath*** and run
     --enable-static \
     --disable-documentation \
     --disable-dtd-validation
-    make -j$(nproc)
+    make $MAKE_THREADS_CNT
     sudo make install
     cd ..
 
@@ -257,7 +268,6 @@ Go to ***BuildPath*** and run
     -confirm-license \
     -qt-zlib \
     -qt-libpng \
-    -qt-libjpeg \
     -qt-harfbuzz \
     -qt-pcre \
     -qt-xcb \
@@ -283,7 +293,7 @@ Go to ***BuildPath*** and run
     cmake -G Ninja \
     -DCMAKE_BUILD_TYPE=Debug \
     -DTG_OWT_SPECIAL_TARGET=linux \
-    -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg \
+    -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
     -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/desktop-app/openssl-1.1.1/include \
     -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
     -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../..
diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index 1d6ee5de7..1bc58046c 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -100,6 +100,16 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     msbuild zlibstat.vcxproj /property:Configuration=ReleaseWithoutAsm
     cd ..\..\..\..
 
+    git clone -b v4.0.1-rc2 https://github.com/mozilla/mozjpeg.git
+    cd mozjpeg
+    cmake . ^
+    -G "Visual Studio 16 2019" ^
+    -A Win32 ^
+    -DWITH_JPEG8=ON ^
+    -DPNG_SUPPORTED=OFF
+    cmake --build .
+    cd ..
+
     git clone https://github.com/telegramdesktop/openal-soft.git
     cd openal-soft
     git checkout fix_mono
@@ -161,7 +171,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     for /r %i in (..\..\patches\qtbase_5_12_8\*) do git apply %i
     cd ..
 
-    configure -prefix "%LibrariesPath%\Qt-5.12.8" -debug-and-release -force-debug-info -opensource -confirm-license -static -static-runtime -I "%LibrariesPath%\openssl_1_1_1\include" -no-opengl -openssl-linked OPENSSL_LIBS_DEBUG="%LibrariesPath%\openssl_1_1_1\out32.dbg\libssl.lib %LibrariesPath%\openssl_1_1_1\out32.dbg\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" OPENSSL_LIBS_RELEASE="%LibrariesPath%\openssl_1_1_1\out32\libssl.lib %LibrariesPath%\openssl_1_1_1\out32\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" -mp -nomake examples -nomake tests -platform win32-msvc
+    configure -prefix "%LibrariesPath%\Qt-5.12.8" -debug-and-release -force-debug-info -opensource -confirm-license -static -static-runtime -I "%LibrariesPath%\openssl_1_1_1\include" -no-opengl -openssl-linked OPENSSL_LIBS_DEBUG="%LibrariesPath%\openssl_1_1_1\out32.dbg\libssl.lib %LibrariesPath%\openssl_1_1_1\out32.dbg\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" OPENSSL_LIBS_RELEASE="%LibrariesPath%\openssl_1_1_1\out32\libssl.lib %LibrariesPath%\openssl_1_1_1\out32\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" -mp -nomake examples -nomake tests -platform win32-msvc -I "%LibrariesPath%\mozjpeg" LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib"
 
     jom -j4
     jom -j4 install
@@ -176,7 +186,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     cmake -G Ninja ^
     -DCMAKE_BUILD_TYPE=Debug ^
     -DTG_OWT_SPECIAL_TARGET=win ^
-    -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg ^
+    -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^
     -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^
     -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
     -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../..
@@ -187,7 +197,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     cmake -G Ninja ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DTG_OWT_SPECIAL_TARGET=win ^
-    -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg ^
+    -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^
     -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^
     -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
     -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../..
diff --git a/docs/building-osx.md b/docs/building-osx.md
index 25300b451..e2b263dfc 100644
--- a/docs/building-osx.md
+++ b/docs/building-osx.md
@@ -68,6 +68,17 @@ Go to ***BuildPath*** and run
     sudo make install
     cd ..
 
+    git clone -b v4.0.1-rc2 https://github.com/mozilla/mozjpeg.git
+    cd mozjpeg
+    cmake -B build . \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/local \
+    -DWITH_JPEG8=ON \
+    -DPNG_SUPPORTED=OFF
+    cmake --build build $MAKE_THREADS_CNT
+    sudo cmake --install build
+    cd ..
+
     git clone https://github.com/openssl/openssl openssl_1_1_1
     cd openssl_1_1_1
     git checkout OpenSSL_1_1_1-stable
@@ -240,7 +251,7 @@ Go to ***BuildPath*** and run
     git apply ../../patches/qtbase_5_6_2.diff
     cd ..
 
-    ./configure -prefix "/usr/local/desktop-app/Qt-5.6.2" -debug-and-release -force-debug-info -opensource -confirm-license -static -opengl desktop -no-openssl -securetransport -nomake examples -nomake tests -platform macx-clang
+    ./configure -prefix "/usr/local/desktop-app/Qt-5.6.2" -debug-and-release -force-debug-info -opensource -confirm-license -static -opengl desktop -no-openssl -securetransport -nomake examples -nomake tests -platform macx-clang -I "/usr/local/include" LIBJPEG_LIBS="/usr/local/lib/libjpeg.a" ZLIB_LIBS="/usr/local/lib/libz.a"
     make $MAKE_THREADS_CNT
     sudo make install
     cd ..
@@ -254,7 +265,7 @@ Go to ***BuildPath*** and run
     cmake -G Ninja \
     -DCMAKE_BUILD_TYPE=Debug \
     -DTG_OWT_SPECIAL_TARGET=osx \
-    -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt5_6_2/qtbase/src/3rdparty/libjpeg \
+    -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
     -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \
     -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
     -DTG_OWT_FFMPEG_INCLUDE_PATH=`pwd`/../../../ffmpeg ../..
@@ -265,7 +276,7 @@ Go to ***BuildPath*** and run
     cmake -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DTG_OWT_SPECIAL_TARGET=osx \
-    -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt5_6_2/qtbase/src/3rdparty/libjpeg \
+    -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
     -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \
     -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
     -DTG_OWT_FFMPEG_INCLUDE_PATH=`pwd`/../../../ffmpeg ../..
diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index f286cf047..1f47962af 100644
--- a/docs/building-xcode.md
+++ b/docs/building-xcode.md
@@ -75,6 +75,17 @@ Go to ***BuildPath*** and run
     sudo make install
     cd ..
 
+    git clone -b v4.0.1-rc2 https://github.com/mozilla/mozjpeg.git
+    cd mozjpeg
+    cmake -B build . \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/local/macos \
+    -DWITH_JPEG8=ON \
+    -DPNG_SUPPORTED=OFF
+    cmake --build build $MAKE_THREADS_CNT
+    sudo cmake --install build
+    cd ..
+
     git clone https://github.com/openssl/openssl openssl_1_1_1
     cd openssl_1_1_1
     git checkout OpenSSL_1_1_1-stable
@@ -262,7 +273,10 @@ Go to ***BuildPath*** and run
     -securetransport \
     -nomake examples \
     -nomake tests \
-    -platform macx-clang
+    -platform macx-clang \
+    -I "/usr/local/macos/include" \
+    LIBJPEG_LIBS="/usr/local/macos/lib/libjpeg.a" \
+    ZLIB_LIBS="/usr/local/macos/lib/libz.a"
 
     make $MAKE_THREADS_CNT
     sudo make install
@@ -277,7 +291,7 @@ Go to ***BuildPath*** and run
     cmake -G Ninja \
     -DCMAKE_BUILD_TYPE=Debug \
     -DTG_OWT_SPECIAL_TARGET=mac \
-    -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg \
+    -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \
     -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \
     -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \
     -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../..
@@ -288,7 +302,7 @@ Go to ***BuildPath*** and run
     cmake -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DTG_OWT_SPECIAL_TARGET=mac \
-    -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg \
+    -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \
     -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \
     -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \
     -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../..
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 09dc34469..63ffae026 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -123,9 +123,12 @@ parts:
       snapcraftctl set-version "$version"
 
       sed -i 's|^Icon=.*|Icon=/usr/share/icons/hicolor/512x512/apps/telegram.png|g' lib/xdg/telegramdesktop.desktop
+    stage:
+      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so.8.2.2
     after:
       - desktop-qt5
       - ffmpeg
+      - mozjpeg
       - openal
       - qtwayland
       - webrtc
@@ -154,17 +157,29 @@ parts:
       - locales-all
       - xdg-user-dirs
       - fcitx-frontend-qt5
+    stage:
+      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so.8.2.2
+    after:
+      - mozjpeg
 
   qt5-xdgdesktopportal-platform:
     plugin: nil
     stage-packages:
       - qt5-xdgdesktopportal-platformtheme
+    stage:
+      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so.8.2.2
+    after:
+      - mozjpeg
 
   # Qt checks that ibus-daemon binary is present, otherwise doesn't work
   ibus:
     plugin: nil
     stage-packages:
       - ibus
+    stage:
+      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so.8.2.2
+    after:
+      - mozjpeg
 
   ffmpeg:
     plugin: nil
@@ -180,6 +195,27 @@ parts:
       - libavutil56
       - libswresample3
       - libswscale5
+    stage:
+      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so.8.2.2
+    after:
+      - mozjpeg
+
+  mozjpeg:
+    source: https://github.com/mozilla/mozjpeg.git
+    source-depth: 1
+    source-tag: v4.0.1-rc2
+    plugin: cmake
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DENABLE_STATIC=OFF
+      - -DWITH_JPEG8=ON
+      - -DPNG_SUPPORTED=OFF
+    prime:
+      - -./usr/bin
+      - -./usr/include
+      - -./usr/lib/pkgconfig
+      - -./usr/share
 
   openal:
     source: https://github.com/kcat/openal-soft.git
@@ -228,15 +264,17 @@ parts:
     plugin: cmake
     build-packages:
       - yasm
-      - libjpeg8-dev
       - libopus-dev
       - libssl-dev
     stage-packages:
-      - libjpeg8
       - libopus0
       - libssl1.1
     override-build: |
-      cmake "$SNAPCRAFT_PART_SRC" -DCMAKE_BUILD_TYPE=Release
+      cmake "$SNAPCRAFT_PART_SRC" \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DJPEG_LIBRARY_RELEASE="$SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so" \
+        -DJPEG_INCLUDE_DIR="$SNAPCRAFT_STAGE/usr/include"
+
       cmake --build . -- -j$(nproc)
       cp -a . "$SNAPCRAFT_PART_INSTALL"
     organize:
@@ -244,3 +282,4 @@ parts:
     prime: [-./*]
     after:
       - ffmpeg
+      - mozjpeg

From 94d37509c136006f067e99bbd72204cb6d217f6e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 9 Oct 2020 10:10:20 +0400
Subject: [PATCH 065/190] Add $SNAPCRAFT_ARCH_TRIPLET to paths

---
 snap/snapcraft.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 63ffae026..c1c4ff59f 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -68,7 +68,6 @@ parts:
     source-type: git
     parse-info: [usr/share/metainfo/telegram-desktop_telegram-desktop.appdata.xml]
     build-environment:
-      - LD_LIBRARY_PATH: $SNAPCRAFT_STAGE/usr/lib
       - tg_owt_DIR: $SNAPCRAFT_STAGE/tg_owt
     build-packages:
       - python
@@ -214,7 +213,7 @@ parts:
     prime:
       - -./usr/bin
       - -./usr/include
-      - -./usr/lib/pkgconfig
+      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pkgconfig
       - -./usr/share
 
   openal:
@@ -241,8 +240,8 @@ parts:
       - -DALSOFT_CONFIG=OFF
     prime:
       - -./usr/include
-      - -./usr/lib/cmake
-      - -./usr/lib/pkgconfig
+      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/cmake
+      - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pkgconfig
 
   qtwayland:
     source: https://github.com/qt/qtwayland.git

From 98afc99a8feba09d9d6c3fd4a15d89a8c0a8644e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Oct 2020 13:17:02 +0300
Subject: [PATCH 066/190] Update submodules and instructions.

---
 Telegram/ThirdParty/range-v3 |  2 +-
 Telegram/ThirdParty/rlottie  |  2 +-
 Telegram/lib_ui              |  2 +-
 cmake                        |  2 +-
 docs/building-cmake.md       | 59 ++++++++++++++++++-----------------
 docs/building-msvc.md        | 49 ++++++++++++++++++++---------
 docs/building-osx.md         |  2 +-
 docs/building-xcode.md       | 60 ++++++++++++++++++------------------
 8 files changed, 99 insertions(+), 79 deletions(-)

diff --git a/Telegram/ThirdParty/range-v3 b/Telegram/ThirdParty/range-v3
index 2d606af5c..413c8f9aa 160000
--- a/Telegram/ThirdParty/range-v3
+++ b/Telegram/ThirdParty/range-v3
@@ -1 +1 @@
-Subproject commit 2d606af5c71a47e91e095db20d8ba2d84a1ca113
+Subproject commit 413c8f9aacb269f6440fe180b587fd70c7ba16df
diff --git a/Telegram/ThirdParty/rlottie b/Telegram/ThirdParty/rlottie
index 839dcab7f..3426bf778 160000
--- a/Telegram/ThirdParty/rlottie
+++ b/Telegram/ThirdParty/rlottie
@@ -1 +1 @@
-Subproject commit 839dcab7f083a51b8130061ea5ec245195af6c58
+Subproject commit 3426bf778d306d41b1d1052fa06fa07ba24b2608
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 914df12eb..109375453 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 914df12ebe3231dbdd5150d5b33cfab2e7dabe17
+Subproject commit 109375453e1465daff0970a920ba65e9fe8c78f0
diff --git a/cmake b/cmake
index cfc6051fb..a7e73ebc0 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit cfc6051fb65da4c67ccbc2a1d9e753758f995fe3
+Subproject commit a7e73ebc036fdf32cdca56b62405bf9dcd8f8f09
diff --git a/docs/building-cmake.md b/docs/building-cmake.md
index 11e722095..27022d9a9 100644
--- a/docs/building-cmake.md
+++ b/docs/building-cmake.md
@@ -262,23 +262,24 @@ Go to ***BuildPath*** and run
 
     OPENSSL_DIR=/usr/local/desktop-app/openssl-1.1.1
     ./configure -prefix "/usr/local/desktop-app/Qt-5.12.8" \
-    -release \
-    -force-debug-info \
-    -opensource \
-    -confirm-license \
-    -qt-zlib \
-    -qt-libpng \
-    -qt-harfbuzz \
-    -qt-pcre \
-    -qt-xcb \
-    -no-gtk \
-    -no-icu \
-    -static \
-    -dbus-runtime \
-    -openssl-linked \
-    -I "$OPENSSL_DIR/include" OPENSSL_LIBS="$OPENSSL_DIR/lib/libssl.a $OPENSSL_DIR/lib/libcrypto.a -ldl -lpthread" \
-    -nomake examples \
-    -nomake tests
+        -release \
+        -force-debug-info \
+        -opensource \
+        -confirm-license \
+        -qt-zlib \
+        -qt-libpng \
+        -qt-harfbuzz \
+        -qt-pcre \
+        -qt-xcb \
+        -no-gtk \
+        -no-icu \
+        -static \
+        -dbus-runtime \
+        -openssl-linked \
+        -I "$OPENSSL_DIR/include" \
+        OPENSSL_LIBS="$OPENSSL_DIR/lib/libssl.a $OPENSSL_DIR/lib/libcrypto.a -ldl -lpthread" \
+        -nomake examples \
+        -nomake tests
 
     make $MAKE_THREADS_CNT
     sudo make install
@@ -291,23 +292,23 @@ Go to ***BuildPath*** and run
     mkdir Debug
     cd Debug
     cmake -G Ninja \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DTG_OWT_SPECIAL_TARGET=linux \
-    -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
-    -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/desktop-app/openssl-1.1.1/include \
-    -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
-    -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../..
+        -DCMAKE_BUILD_TYPE=Debug \
+        -DTG_OWT_SPECIAL_TARGET=linux \
+        -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
+        -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/desktop-app/openssl-1.1.1/include \
+        -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
+        -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../..
     ninja
     cd ..
     mkdir Release
     cd Release
     cmake -G Ninja \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DTG_OWT_SPECIAL_TARGET=linux \
-    -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg \
-    -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/desktop-app/openssl-1.1.1/include \
-    -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
-    -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../..
+        -DCMAKE_BUILD_TYPE=Release \
+        -DTG_OWT_SPECIAL_TARGET=linux \
+        -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg \
+        -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/desktop-app/openssl-1.1.1/include \
+        -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
+        -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../..
     ninja
     cd ../../..
 
diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index 1bc58046c..798cade8f 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -61,8 +61,6 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     mkdir Libraries
     cd Libraries
 
-    SET LibrariesPath=%cd%
-
     git clone https://github.com/desktop-app/patches.git
     cd patches
     git checkout ddd4084
@@ -162,6 +160,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     SET PATH=%PATH_BACKUP_%
     cd ..
 
+    SET LibrariesPath=%cd%
     git clone git://code.qt.io/qt/qt5.git qt_5_12_8
     cd qt_5_12_8
     perl init-repository --module-subset=qtbase,qtimageformats
@@ -171,7 +170,27 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     for /r %i in (..\..\patches\qtbase_5_12_8\*) do git apply %i
     cd ..
 
-    configure -prefix "%LibrariesPath%\Qt-5.12.8" -debug-and-release -force-debug-info -opensource -confirm-license -static -static-runtime -I "%LibrariesPath%\openssl_1_1_1\include" -no-opengl -openssl-linked OPENSSL_LIBS_DEBUG="%LibrariesPath%\openssl_1_1_1\out32.dbg\libssl.lib %LibrariesPath%\openssl_1_1_1\out32.dbg\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" OPENSSL_LIBS_RELEASE="%LibrariesPath%\openssl_1_1_1\out32\libssl.lib %LibrariesPath%\openssl_1_1_1\out32\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" -mp -nomake examples -nomake tests -platform win32-msvc -I "%LibrariesPath%\mozjpeg" LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib"
+    configure ^
+        -prefix "%LibrariesPath%\Qt-5.12.8" ^
+        -debug-and-release ^
+        -force-debug-info ^
+        -opensource ^
+        -confirm-license ^
+        -static ^
+        -static-runtime ^
+        -no-opengl ^
+        -openssl-linked ^
+        -recheck ^
+        -I "%LibrariesPath%\openssl_1_1_1\include" ^
+        OPENSSL_LIBS_DEBUG="%LibrariesPath%\openssl_1_1_1\out32.dbg\libssl.lib %LibrariesPath%\openssl_1_1_1\out32.dbg\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
+        OPENSSL_LIBS_RELEASE="%LibrariesPath%\openssl_1_1_1\out32\libssl.lib %LibrariesPath%\openssl_1_1_1\out32\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
+        -I "%LibrariesPath%\mozjpeg" ^
+        LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
+        LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib" ^
+        -mp ^
+        -nomake examples ^
+        -nomake tests ^
+        -platform win32-msvc
 
     jom -j4
     jom -j4 install
@@ -184,23 +203,23 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     mkdir Debug
     cd Debug
     cmake -G Ninja ^
-    -DCMAKE_BUILD_TYPE=Debug ^
-    -DTG_OWT_SPECIAL_TARGET=win ^
-    -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^
-    -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^
-    -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
-    -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../..
+        -DCMAKE_BUILD_TYPE=Debug ^
+        -DTG_OWT_SPECIAL_TARGET=win ^
+        -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^
+        -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^
+        -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
+        -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../..
     ninja
     cd ..
     mkdir Release
     cd Release
     cmake -G Ninja ^
-    -DCMAKE_BUILD_TYPE=Release ^
-    -DTG_OWT_SPECIAL_TARGET=win ^
-    -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^
-    -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^
-    -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
-    -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../..
+        -DCMAKE_BUILD_TYPE=Release ^
+        -DTG_OWT_SPECIAL_TARGET=win ^
+        -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^
+        -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include ^
+        -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
+        -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../..
     ninja
     cd ..\..\..
 
diff --git a/docs/building-osx.md b/docs/building-osx.md
index e2b263dfc..6537f6940 100644
--- a/docs/building-osx.md
+++ b/docs/building-osx.md
@@ -1,6 +1,6 @@
 ## Build instructions for Xcode 10.1
 
-**NB** These are used for OS X 10.10/10.11 build, after the [Building using Xcode][xcode] instructions.
+**NB** These are outdated, please refer to [Building using Xcode][xcode] instructions.
 
 ### Prepare folder
 
diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index 1f47962af..dae91359e 100644
--- a/docs/building-xcode.md
+++ b/docs/building-xcode.md
@@ -78,10 +78,10 @@ Go to ***BuildPath*** and run
     git clone -b v4.0.1-rc2 https://github.com/mozilla/mozjpeg.git
     cd mozjpeg
     cmake -B build . \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr/local/macos \
-    -DWITH_JPEG8=ON \
-    -DPNG_SUPPORTED=OFF
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr/local/macos \
+        -DWITH_JPEG8=ON \
+        -DPNG_SUPPORTED=OFF
     cmake --build build $MAKE_THREADS_CNT
     sudo cmake --install build
     cd ..
@@ -263,20 +263,20 @@ Go to ***BuildPath*** and run
     cd ..
 
     ./configure -prefix "/usr/local/desktop-app/Qt-5.12.8" \
-    -debug-and-release \
-    -force-debug-info \
-    -opensource \
-    -confirm-license \
-    -static \
-    -opengl desktop \
-    -no-openssl \
-    -securetransport \
-    -nomake examples \
-    -nomake tests \
-    -platform macx-clang \
-    -I "/usr/local/macos/include" \
-    LIBJPEG_LIBS="/usr/local/macos/lib/libjpeg.a" \
-    ZLIB_LIBS="/usr/local/macos/lib/libz.a"
+        -debug-and-release \
+        -force-debug-info \
+        -opensource \
+        -confirm-license \
+        -static \
+        -opengl desktop \
+        -no-openssl \
+        -securetransport \
+        -I "/usr/local/macos/include" \
+        LIBJPEG_LIBS="/usr/local/macos/lib/libjpeg.a" \
+        ZLIB_LIBS="/usr/local/macos/lib/libz.a" \
+        -nomake examples \
+        -nomake tests \
+        -platform macx-clang
 
     make $MAKE_THREADS_CNT
     sudo make install
@@ -289,23 +289,23 @@ Go to ***BuildPath*** and run
     mkdir Debug
     cd Debug
     cmake -G Ninja \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DTG_OWT_SPECIAL_TARGET=mac \
-    -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \
-    -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \
-    -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \
-    -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../..
+        -DCMAKE_BUILD_TYPE=Debug \
+        -DTG_OWT_SPECIAL_TARGET=mac \
+        -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \
+        -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \
+        -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \
+        -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../..
     ninja
     cd ..
     mkdir Release
     cd Release
     cmake -G Ninja \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DTG_OWT_SPECIAL_TARGET=mac \
-    -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \
-    -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \
-    -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \
-    -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../..
+        -DCMAKE_BUILD_TYPE=Release \
+        -DTG_OWT_SPECIAL_TARGET=mac \
+        -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/macos/include \
+        -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include \
+        -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus \
+        -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../..
     ninja
     cd ../../..
 

From 1459e6f38e17947ef943c4c2df6418bb4016e520 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 30 Oct 2020 02:43:35 +0300
Subject: [PATCH 067/190] Moved request for attached stickers to separate file.

---
 Telegram/CMakeLists.txt                       |  2 +
 .../SourceFiles/api/api_attached_stickers.cpp | 64 +++++++++++++++++++
 .../SourceFiles/api/api_attached_stickers.h   | 35 ++++++++++
 Telegram/SourceFiles/apiwrap.cpp              |  6 ++
 Telegram/SourceFiles/apiwrap.h                |  3 +
 .../history/history_inner_widget.cpp          |  5 +-
 .../media/view/media_view_overlay_widget.cpp  |  8 ++-
 .../window/window_session_controller.cpp      | 40 +-----------
 .../window/window_session_controller.h        |  7 +-
 9 files changed, 122 insertions(+), 48 deletions(-)
 create mode 100644 Telegram/SourceFiles/api/api_attached_stickers.cpp
 create mode 100644 Telegram/SourceFiles/api/api_attached_stickers.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 19e767410..51d5689ac 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -157,6 +157,8 @@ nice_target_sources(Telegram ${src_loc}
 PRIVATE
     ${style_files}
 
+    api/api_attached_stickers.cpp
+    api/api_attached_stickers.h
     api/api_authorizations.cpp
     api/api_authorizations.h
     api/api_bot.cpp
diff --git a/Telegram/SourceFiles/api/api_attached_stickers.cpp b/Telegram/SourceFiles/api/api_attached_stickers.cpp
new file mode 100644
index 000000000..fcdfe7721
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_attached_stickers.cpp
@@ -0,0 +1,64 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "api/api_attached_stickers.h"
+
+#include "apiwrap.h"
+#include "boxes/confirm_box.h"
+#include "boxes/sticker_set_box.h"
+#include "boxes/stickers_box.h"
+#include "data/data_photo.h"
+#include "lang/lang_keys.h"
+#include "window/window_session_controller.h"
+
+namespace Api {
+
+AttachedStickers::AttachedStickers(not_null<ApiWrap*> api)
+: _api(&api->instance()) {
+}
+
+void AttachedStickers::requestAttachedStickerSets(
+		not_null<Window::SessionController*> controller,
+		not_null<PhotoData*> photo) {
+	const auto weak = base::make_weak(controller.get());
+	_api.request(_requestId).cancel();
+	_requestId = _api.request(
+		MTPmessages_GetAttachedStickers(
+			MTP_inputStickeredMediaPhoto(photo->mtpInput())
+	)).done([=](const MTPVector<MTPStickerSetCovered> &result) {
+		_requestId = 0;
+		const auto strongController = weak.get();
+		if (!strongController) {
+			return;
+		}
+		if (result.v.isEmpty()) {
+			Ui::show(Box<InformBox>(tr::lng_stickers_not_found(tr::now)));
+			return;
+		} else if (result.v.size() > 1) {
+			Ui::show(Box<StickersBox>(strongController, result));
+			return;
+		}
+		// Single attached sticker pack.
+		const auto setData = result.v.front().match([&](const auto &data) {
+			return data.vset().match([&](const MTPDstickerSet &data) {
+				return &data;
+			});
+		});
+
+		const auto setId = (setData->vid().v && setData->vaccess_hash().v)
+			? MTP_inputStickerSetID(setData->vid(), setData->vaccess_hash())
+			: MTP_inputStickerSetShortName(setData->vshort_name());
+		Ui::show(
+			Box<StickerSetBox>(strongController, setId),
+			Ui::LayerOption::KeepOther);
+	}).fail([=](const RPCError &error) {
+		_requestId = 0;
+		Ui::show(Box<InformBox>(tr::lng_stickers_not_found(tr::now)));
+	}).send();
+}
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/api/api_attached_stickers.h b/Telegram/SourceFiles/api/api_attached_stickers.h
new file mode 100644
index 000000000..bf186fef0
--- /dev/null
+++ b/Telegram/SourceFiles/api/api_attached_stickers.h
@@ -0,0 +1,35 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "mtproto/sender.h"
+
+class ApiWrap;
+class PhotoData;
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace Api {
+
+class AttachedStickers final {
+public:
+	explicit AttachedStickers(not_null<ApiWrap*> api);
+
+	void requestAttachedStickerSets(
+		not_null<Window::SessionController*> controller,
+		not_null<PhotoData*> photo);
+
+private:
+	MTP::Sender _api;
+	mtpRequestId _requestId = 0;
+
+};
+
+} // namespace Api
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 92805db3d..a082d9b88 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 
 #include "api/api_authorizations.h"
+#include "api/api_attached_stickers.h"
 #include "api/api_hash.h"
 #include "api/api_media.h"
 #include "api/api_sending.h"
@@ -188,6 +189,7 @@ ApiWrap::ApiWrap(not_null<Main::Session*> session)
 , _topPromotionTimer([=] { refreshTopPromotion(); })
 , _updateNotifySettingsTimer([=] { sendNotifySettingsUpdates(); })
 , _authorizations(std::make_unique<Api::Authorizations>(this))
+, _attachedStickers(std::make_unique<Api::AttachedStickers>(this))
 , _selfDestruct(std::make_unique<Api::SelfDestruct>(this))
 , _sensitiveContent(std::make_unique<Api::SensitiveContent>(this))
 , _globalPrivacy(std::make_unique<Api::GlobalPrivacy>(this)) {
@@ -5227,6 +5229,10 @@ Api::Authorizations &ApiWrap::authorizations() {
 	return *_authorizations;
 }
 
+Api::AttachedStickers &ApiWrap::attachedStickers() {
+	return *_attachedStickers;
+}
+
 Api::SelfDestruct &ApiWrap::selfDestruct() {
 	return *_selfDestruct;
 }
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index 3284a10cf..bf8140496 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -53,6 +53,7 @@ namespace Api {
 
 class Updates;
 class Authorizations;
+class AttachedStickers;
 class SelfDestruct;
 class SensitiveContent;
 class GlobalPrivacy;
@@ -455,6 +456,7 @@ public:
 	rpl::producer<BlockedPeersSlice> blockedPeersSlice();
 
 	[[nodiscard]] Api::Authorizations &authorizations();
+	[[nodiscard]] Api::AttachedStickers &attachedStickers();
 	[[nodiscard]] Api::SelfDestruct &selfDestruct();
 	[[nodiscard]] Api::SensitiveContent &sensitiveContent();
 	[[nodiscard]] Api::GlobalPrivacy &globalPrivacy();
@@ -818,6 +820,7 @@ private:
 	rpl::event_stream<BlockedPeersSlice> _blockedPeersChanges;
 
 	const std::unique_ptr<Api::Authorizations> _authorizations;
+	const std::unique_ptr<Api::AttachedStickers> _attachedStickers;
 	const std::unique_ptr<Api::SelfDestruct> _selfDestruct;
 	const std::unique_ptr<Api::SensitiveContent> _sensitiveContent;
 	const std::unique_ptr<Api::GlobalPrivacy> _globalPrivacy;
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 8f0b91a55..aea01efe8 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -45,6 +45,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session_settings.h"
 #include "core/application.h"
 #include "apiwrap.h"
+#include "api/api_attached_stickers.h"
 #include "api/api_toggling_media.h"
 #include "lang/lang_keys.h"
 #include "data/data_session.h"
@@ -1590,7 +1591,9 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		});
 		if (photo->hasSticker) {
 			_menu->addAction(tr::lng_context_attached_stickers(tr::now), [=] {
-				controller->requestAttachedStickerSets(photo);
+				session->api().attachedStickers().requestAttachedStickerSets(
+					controller,
+					photo);
 			});
 		}
 	};
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 38e7062e0..7d9840f1b 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/view/media_view_overlay_widget.h"
 
 #include "apiwrap.h"
+#include "api/api_attached_stickers.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
@@ -1545,15 +1546,16 @@ void OverlayWidget::onCopy() {
 }
 
 void OverlayWidget::onAttachedStickers() {
-	const auto session = _session;
-	if (!session || !_photo) {
+	if (!_session || !_photo) {
 		return;
 	}
 	const auto &active = _session->windows();
 	if (active.empty()) {
 		return;
 	}
-	active.front()->requestAttachedStickerSets(_photo);
+	_session->api().attachedStickers().requestAttachedStickerSets(
+		active.front(),
+		_photo);
 	close();
 }
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 4f8ebf3a3..7828489c0 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -28,7 +28,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_changes.h"
 #include "data/data_chat_filters.h"
-#include "data/data_photo.h" // requestAttachedStickerSets.
 #include "passport/passport_form_controller.h"
 #include "chat_helpers/tabbed_selector.h"
 #include "core/shortcuts.h"
@@ -40,10 +39,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/delayed_activation.h"
 #include "ui/toast/toast.h"
 #include "boxes/calendar_box.h"
-#include "boxes/sticker_set_box.h" // requestAttachedStickerSets.
-#include "boxes/confirm_box.h" // requestAttachedStickerSets.
-#include "boxes/stickers_box.h" // requestAttachedStickerSets.
-#include "lang/lang_keys.h" // requestAttachedStickerSets.
+#include "boxes/confirm_box.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "main/main_session.h"
@@ -545,36 +541,6 @@ rpl::producer<> SessionController::filtersMenuChanged() const {
 	return _filtersMenuChanged.events();
 }
 
-void SessionController::requestAttachedStickerSets(
-		not_null<PhotoData*> photo) {
-	session().api().request(_attachedStickerSetsRequestId).cancel();
-	_attachedStickerSetsRequestId = session().api().request(
-		MTPmessages_GetAttachedStickers(
-			MTP_inputStickeredMediaPhoto(photo->mtpInput())
-	)).done([=](const MTPVector<MTPStickerSetCovered> &result) {
-		if (result.v.isEmpty()) {
-			Ui::show(Box<InformBox>(tr::lng_stickers_not_found(tr::now)));
-			return;
-		} else if (result.v.size() > 1) {
-			Ui::show(Box<StickersBox>(this, result));
-			return;
-		}
-		// Single attached sticker pack.
-		const auto setData = result.v.front().match([&](const auto &data) {
-			return data.vset().match([&](const MTPDstickerSet &data) {
-				return &data;
-			});
-		});
-
-		const auto setId = (setData->vid().v && setData->vaccess_hash().v)
-			? MTP_inputStickerSetID(setData->vid(), setData->vaccess_hash())
-			: MTP_inputStickerSetShortName(setData->vshort_name());
-		Ui::show(Box<StickerSetBox>(this, setId), Ui::LayerOption::KeepOther);
-	}).fail([=](const RPCError &error) {
-		Ui::show(Box<InformBox>(tr::lng_stickers_not_found(tr::now)));
-	}).send();
-}
-
 void SessionController::checkOpenedFilter() {
 	if (const auto filterId = activeChatsFilterCurrent()) {
 		const auto &list = session().data().chatsFilters().list();
@@ -1132,8 +1098,6 @@ void SessionController::setActiveChatsFilter(FilterId id) {
 	}
 }
 
-SessionController::~SessionController() {
-	session().api().request(_attachedStickerSetsRequestId).cancel();
-}
+SessionController::~SessionController() = default;
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 980b7d2e7..2feaa18ec 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -230,6 +230,7 @@ public:
 	SessionController(
 		not_null<Main::Session*> session,
 		not_null<Controller*> window);
+	~SessionController();
 
 	[[nodiscard]] Controller &window() const {
 		return *_window;
@@ -348,14 +349,10 @@ public:
 	void toggleFiltersMenu(bool enabled);
 	[[nodiscard]] rpl::producer<> filtersMenuChanged() const;
 
-	void requestAttachedStickerSets(not_null<PhotoData*> photo);
-
 	rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
 
-	~SessionController();
-
 private:
 	void init();
 	void initSupportMode();
@@ -408,8 +405,6 @@ private:
 
 	rpl::event_stream<> _filtersMenuChanged;
 
-	mtpRequestId _attachedStickerSetsRequestId = 0;
-
 	rpl::lifetime _lifetime;
 
 };

From 391ec8ac288036e73ae52f4b87077a821db5c4a1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 30 Oct 2020 03:07:59 +0300
Subject: [PATCH 068/190] Moved public var indicating stickers presence to
 private in PhotoData.

---
 Telegram/SourceFiles/data/data_photo.cpp                  | 8 ++++++++
 Telegram/SourceFiles/data/data_photo.h                    | 5 ++++-
 Telegram/SourceFiles/data/data_session.cpp                | 8 ++++----
 Telegram/SourceFiles/data/data_session.h                  | 4 ++--
 Telegram/SourceFiles/history/history_inner_widget.cpp     | 2 +-
 .../SourceFiles/media/view/media_view_overlay_widget.cpp  | 2 +-
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_photo.cpp b/Telegram/SourceFiles/data/data_photo.cpp
index 254417ed2..d5ede173c 100644
--- a/Telegram/SourceFiles/data/data_photo.cpp
+++ b/Telegram/SourceFiles/data/data_photo.cpp
@@ -376,6 +376,14 @@ void PhotoData::updateImages(
 		[&](Data::FileOrigin origin) { loadVideo(origin); });
 }
 
+[[nodiscard]] bool PhotoData::hasAttachedStickers() const {
+	return _hasStickers;
+}
+
+void PhotoData::setHasAttachedStickers(bool value) {
+	_hasStickers = value;
+}
+
 int PhotoData::width() const {
 	return _images[PhotoSizeIndex(PhotoSize::Large)].location.width();
 }
diff --git a/Telegram/SourceFiles/data/data_photo.h b/Telegram/SourceFiles/data/data_photo.h
index 2c2a60066..09263dcf9 100644
--- a/Telegram/SourceFiles/data/data_photo.h
+++ b/Telegram/SourceFiles/data/data_photo.h
@@ -142,13 +142,15 @@ public:
 		bool forceRemoteLoader) const
 	-> std::unique_ptr<Media::Streaming::Loader>;
 
+	[[nodiscard]] bool hasAttachedStickers() const;
+	void setHasAttachedStickers(bool value);
+
 	// For now they return size of the 'large' image.
 	int width() const;
 	int height() const;
 
 	PhotoId id = 0;
 	TimeId date = 0;
-	bool hasSticker = false;
 
 	PeerData *peer = nullptr; // for chat and channel photos connection
 	// geo, caption
@@ -164,6 +166,7 @@ private:
 
 	int32 _dc = 0;
 	uint64 _access = 0;
+	bool _hasStickers = false;
 	QByteArray _fileReference;
 	std::unique_ptr<Data::ReplyPreview> _replyPreview;
 	std::weak_ptr<Data::PhotoMedia> _media;
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 3a186cc30..8ae6619a8 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -2291,7 +2291,7 @@ not_null<PhotoData*> Session::photo(
 		const QByteArray &fileReference,
 		TimeId date,
 		int32 dc,
-		bool hasSticker,
+		bool hasStickers,
 		const QByteArray &inlineThumbnailBytes,
 		const ImageWithLocation &small,
 		const ImageWithLocation &thumbnail,
@@ -2305,7 +2305,7 @@ not_null<PhotoData*> Session::photo(
 		fileReference,
 		date,
 		dc,
-		hasSticker,
+		hasStickers,
 		inlineThumbnailBytes,
 		small,
 		thumbnail,
@@ -2466,7 +2466,7 @@ void Session::photoApplyFields(
 		const QByteArray &fileReference,
 		TimeId date,
 		int32 dc,
-		bool hasSticker,
+		bool hasStickers,
 		const QByteArray &inlineThumbnailBytes,
 		const ImageWithLocation &small,
 		const ImageWithLocation &thumbnail,
@@ -2478,7 +2478,7 @@ void Session::photoApplyFields(
 	}
 	photo->setRemoteLocation(dc, access, fileReference);
 	photo->date = date;
-	photo->hasSticker = hasSticker;
+	photo->setHasAttachedStickers(hasStickers);
 	photo->updateImages(
 		inlineThumbnailBytes,
 		small,
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 52807a6e8..4474e89b5 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -414,7 +414,7 @@ public:
 		const QByteArray &fileReference,
 		TimeId date,
 		int32 dc,
-		bool hasSticker,
+		bool hasStickers,
 		const QByteArray &inlineThumbnailBytes,
 		const ImageWithLocation &small,
 		const ImageWithLocation &thumbnail,
@@ -685,7 +685,7 @@ private:
 		const QByteArray &fileReference,
 		TimeId date,
 		int32 dc,
-		bool hasSticker,
+		bool hasStickers,
 		const QByteArray &inlineThumbnailBytes,
 		const ImageWithLocation &small,
 		const ImageWithLocation &thumbnail,
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index aea01efe8..750a2273b 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1589,7 +1589,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		_menu->addAction(tr::lng_context_copy_image(tr::now), [=] {
 			copyContextImage(photo);
 		});
-		if (photo->hasSticker) {
+		if (photo->hasAttachedStickers()) {
 			_menu->addAction(tr::lng_context_attached_stickers(tr::now), [=] {
 				session->api().attachedStickers().requestAttachedStickerSets(
 					controller,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 7d9840f1b..43649dbe2 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -773,7 +773,7 @@ void OverlayWidget::updateActions() {
 	if ((_document && documentContentShown()) || (_photo && _photoMedia->loaded())) {
 		_actions.push_back({ tr::lng_mediaview_copy(tr::now), SLOT(onCopy()) });
 	}
-	if (_photo && _photo->hasSticker) {
+	if (_photo && _photo->hasAttachedStickers()) {
 		_actions.push_back({ tr::lng_context_attached_stickers(tr::now), SLOT(onAttachedStickers()) });
 	}
 	if (_canForwardItem) {

From 665e322fcef0e704bc59cf84c1b004192e0264f9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 30 Oct 2020 04:07:04 +0300
Subject: [PATCH 069/190] Added ability to see attached stickers on documents.

Fixed #8927.
---
 .../SourceFiles/api/api_attached_stickers.cpp | 28 +++++++++++++++----
 .../SourceFiles/api/api_attached_stickers.h   |  9 ++++++
 Telegram/SourceFiles/data/data_document.cpp   |  9 +++++-
 Telegram/SourceFiles/data/data_document.h     |  3 ++
 .../history/history_inner_widget.cpp          |  7 +++++
 .../media/view/media_view_overlay_widget.cpp  | 27 ++++++++++++++++--
 .../media/view/media_view_overlay_widget.h    |  3 +-
 7 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_attached_stickers.cpp b/Telegram/SourceFiles/api/api_attached_stickers.cpp
index fcdfe7721..dc38822da 100644
--- a/Telegram/SourceFiles/api/api_attached_stickers.cpp
+++ b/Telegram/SourceFiles/api/api_attached_stickers.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/confirm_box.h"
 #include "boxes/sticker_set_box.h"
 #include "boxes/stickers_box.h"
+#include "data/data_document.h"
 #include "data/data_photo.h"
 #include "lang/lang_keys.h"
 #include "window/window_session_controller.h"
@@ -21,15 +22,14 @@ AttachedStickers::AttachedStickers(not_null<ApiWrap*> api)
 : _api(&api->instance()) {
 }
 
-void AttachedStickers::requestAttachedStickerSets(
+void AttachedStickers::request(
 		not_null<Window::SessionController*> controller,
-		not_null<PhotoData*> photo) {
+		MTPmessages_GetAttachedStickers &&mtpRequest) {
 	const auto weak = base::make_weak(controller.get());
 	_api.request(_requestId).cancel();
 	_requestId = _api.request(
-		MTPmessages_GetAttachedStickers(
-			MTP_inputStickeredMediaPhoto(photo->mtpInput())
-	)).done([=](const MTPVector<MTPStickerSetCovered> &result) {
+		std::move(mtpRequest)
+	).done([=](const MTPVector<MTPStickerSetCovered> &result) {
 		_requestId = 0;
 		const auto strongController = weak.get();
 		if (!strongController) {
@@ -61,4 +61,22 @@ void AttachedStickers::requestAttachedStickerSets(
 	}).send();
 }
 
+void AttachedStickers::requestAttachedStickerSets(
+		not_null<Window::SessionController*> controller,
+		not_null<PhotoData*> photo) {
+	request(
+		controller,
+		MTPmessages_GetAttachedStickers(
+			MTP_inputStickeredMediaPhoto(photo->mtpInput())));
+}
+
+void AttachedStickers::requestAttachedStickerSets(
+		not_null<Window::SessionController*> controller,
+		not_null<DocumentData*> document) {
+	request(
+		controller,
+		MTPmessages_GetAttachedStickers(
+			MTP_inputStickeredMediaDocument(document->mtpInput())));
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_attached_stickers.h b/Telegram/SourceFiles/api/api_attached_stickers.h
index bf186fef0..d0dd18bb4 100644
--- a/Telegram/SourceFiles/api/api_attached_stickers.h
+++ b/Telegram/SourceFiles/api/api_attached_stickers.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/sender.h"
 
 class ApiWrap;
+class DocumentData;
 class PhotoData;
 
 namespace Window {
@@ -26,7 +27,15 @@ public:
 		not_null<Window::SessionController*> controller,
 		not_null<PhotoData*> photo);
 
+	void requestAttachedStickerSets(
+		not_null<Window::SessionController*> controller,
+		not_null<DocumentData*> document);
+
 private:
+	void request(
+		not_null<Window::SessionController*> controller,
+		MTPmessages_GetAttachedStickers &&mtpRequest);
+
 	MTP::Sender _api;
 	mtpRequestId _requestId = 0;
 
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index b80953ba5..56aee3cd0 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -499,7 +499,9 @@ Main::Session &DocumentData::session() const {
 
 void DocumentData::setattributes(
 		const QVector<MTPDocumentAttribute> &attributes) {
-	_flags &= ~(Flag::ImageType | kStreamingSupportedMask);
+	_flags &= ~(Flag::ImageType
+		| Flag::HasAttachedStickers
+		| kStreamingSupportedMask);
 	_flags |= kStreamingSupportedUnknown;
 
 	validateLottieSticker();
@@ -577,6 +579,7 @@ void DocumentData::setattributes(
 				_filename = std::move(_filename).replace(ch, "_");
 			}
 		}, [&](const MTPDdocumentAttributeHasStickers &data) {
+			_flags |= Flag::HasAttachedStickers;
 		});
 	}
 	if (type == StickerDocument
@@ -1539,6 +1542,10 @@ bool DocumentData::isImage() const {
 	return (_flags & Flag::ImageType);
 }
 
+bool DocumentData::hasAttachedStickers() const {
+	return (_flags & Flag::HasAttachedStickers);
+}
+
 bool DocumentData::supportsStreaming() const {
 	return (_flags & kStreamingSupportedMask) == kStreamingSupportedMaybeYes;
 }
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index efd777f5e..4c065e476 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -221,6 +221,8 @@ public:
 	[[nodiscard]] bool hasMimeType(QLatin1String mime) const;
 	void setMimeString(const QString &mime);
 
+	[[nodiscard]] bool hasAttachedStickers() const;
+
 	[[nodiscard]] MediaKey mediaKey() const;
 	[[nodiscard]] Storage::Cache::Key cacheKey() const;
 	[[nodiscard]] uint8 cacheTag() const;
@@ -259,6 +261,7 @@ private:
 		ImageType = 0x08,
 		DownloadCancelled = 0x10,
 		LoadedInMediaCache = 0x20,
+		HasAttachedStickers = 0x40,
 	};
 	using Flags = base::flags<Flag>;
 	friend constexpr bool is_flag_type(Flag) { return true; };
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 750a2273b..9489ea8f7 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1635,6 +1635,13 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		_menu->addAction(lnkIsVideo ? tr::lng_context_save_video(tr::now) : (lnkIsVoice ? tr::lng_context_save_audio(tr::now) : (lnkIsAudio ? tr::lng_context_save_audio_file(tr::now) : tr::lng_context_save_file(tr::now))), App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this, [=] {
 			saveDocumentToFile(itemId, document);
 		}));
+		if (document->hasAttachedStickers()) {
+			_menu->addAction(tr::lng_context_attached_stickers(tr::now), [=] {
+				session->api().attachedStickers().requestAttachedStickerSets(
+					controller,
+					document);
+			});
+		}
 	};
 	const auto link = ClickHandler::getActive();
 	auto lnkPhoto = dynamic_cast<PhotoClickHandler*>(link.get());
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 43649dbe2..38bf76a48 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -773,8 +773,15 @@ void OverlayWidget::updateActions() {
 	if ((_document && documentContentShown()) || (_photo && _photoMedia->loaded())) {
 		_actions.push_back({ tr::lng_mediaview_copy(tr::now), SLOT(onCopy()) });
 	}
-	if (_photo && _photo->hasAttachedStickers()) {
-		_actions.push_back({ tr::lng_context_attached_stickers(tr::now), SLOT(onAttachedStickers()) });
+	if ((_photo && _photo->hasAttachedStickers())
+		|| (_document && _document->hasAttachedStickers())) {
+		auto member = _photo
+			? SLOT(onPhotoAttachedStickers())
+			: SLOT(onDocumentAttachedStickers());
+		_actions.push_back({
+			tr::lng_context_attached_stickers(tr::now),
+			std::move(member)
+		});
 	}
 	if (_canForwardItem) {
 		_actions.push_back({ tr::lng_mediaview_forward(tr::now), SLOT(onForward()) });
@@ -1545,7 +1552,7 @@ void OverlayWidget::onCopy() {
 	}
 }
 
-void OverlayWidget::onAttachedStickers() {
+void OverlayWidget::onPhotoAttachedStickers() {
 	if (!_session || !_photo) {
 		return;
 	}
@@ -1559,6 +1566,20 @@ void OverlayWidget::onAttachedStickers() {
 	close();
 }
 
+void OverlayWidget::onDocumentAttachedStickers() {
+	if (!_session || !_document) {
+		return;
+	}
+	const auto &active = _session->windows();
+	if (active.empty()) {
+		return;
+	}
+	_session->api().attachedStickers().requestAttachedStickerSets(
+		active.front(),
+		_document);
+	close();
+}
+
 auto OverlayWidget::sharedMediaType() const
 -> std::optional<SharedMediaType> {
 	using Type = SharedMediaType;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index b1bbdc697..69902cfec 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -125,7 +125,8 @@ private slots:
 	void onCopy();
 	void onMenuDestroy(QObject *obj);
 	void receiveMouse();
-	void onAttachedStickers();
+	void onPhotoAttachedStickers();
+	void onDocumentAttachedStickers();
 
 	void onDropdown();
 

From 8d424f6eaf86f1d5a2c7a42ffe1f6dbf3e1397c4 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 30 Oct 2020 12:38:50 +0300
Subject: [PATCH 070/190] Added ability to see attached stickers from admin
 log.

---
 .../admin_log/history_admin_log_inner.cpp     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
index 2d0b7f92d..b3908f152 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwidget.h"
 #include "core/application.h"
 #include "apiwrap.h"
+#include "api/api_attached_stickers.h"
 #include "layout.h"
 #include "window/window_session_controller.h"
 #include "main/main_session.h"
@@ -1072,6 +1073,16 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			_menu->addAction(tr::lng_context_copy_image(tr::now), [=] {
 				copyContextImage(photo);
 			});
+			if (photo->hasAttachedStickers()) {
+				const auto controller = _controller;
+				auto callback = [=] {
+					auto &attached = session().api().attachedStickers();
+					attached.requestAttachedStickerSets(controller, photo);
+				};
+				_menu->addAction(
+					tr::lng_context_attached_stickers(tr::now),
+					std::move(callback));
+			}
 		} else {
 			auto document = lnkDocument->document();
 			if (document->loading()) {
@@ -1104,6 +1115,16 @@ void InnerWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				_menu->addAction(lnkIsVideo ? tr::lng_context_save_video(tr::now) : (lnkIsVoice ?  tr::lng_context_save_audio(tr::now) : (lnkIsAudio ?  tr::lng_context_save_audio_file(tr::now) :  tr::lng_context_save_file(tr::now))), App::LambdaDelayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this, [this, document] {
 					saveDocumentToFile(document);
 				}));
+				if (document->hasAttachedStickers()) {
+					const auto controller = _controller;
+					auto callback = [=, doc = document] {
+						auto &attached = session().api().attachedStickers();
+						attached.requestAttachedStickerSets(controller, doc);
+					};
+					_menu->addAction(
+						tr::lng_context_attached_stickers(tr::now),
+						std::move(callback));
+				}
 			}
 		}
 	} else if (lnkPeer) { // suggest to block

From 943593526f85ac42790430eed41a3a8e8c951c0f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 30 Oct 2020 13:16:03 +0300
Subject: [PATCH 071/190] Added ability to see attached stickers from sections.

---
 .../view/history_view_context_menu.cpp        | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 323476590..c4b5d101d 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/history_view_context_menu.h"
 
+#include "api/api_attached_stickers.h"
 #include "api/api_editing.h"
 #include "api/api_toggling_media.h" // Api::ToggleFavedSticker
 #include "base/unixtime.h"
@@ -137,7 +138,8 @@ void ToggleFavedSticker(
 
 void AddPhotoActions(
 		not_null<Ui::PopupMenu*> menu,
-		not_null<PhotoData*> photo) {
+		not_null<PhotoData*> photo,
+		not_null<ListWidget*> list) {
 	menu->addAction(
 		tr::lng_context_save_image(tr::now),
 		App::LambdaDelayed(
@@ -147,6 +149,16 @@ void AddPhotoActions(
 	menu->addAction(tr::lng_context_copy_image(tr::now), [=] {
 		CopyImage(photo);
 	});
+	if (photo->hasAttachedStickers()) {
+		const auto controller = list->controller();
+		auto callback = [=] {
+			auto &attached = photo->session().api().attachedStickers();
+			attached.requestAttachedStickerSets(controller, photo);
+		};
+		menu->addAction(
+			tr::lng_context_attached_stickers(tr::now),
+			std::move(callback));
+	}
 }
 
 void OpenGif(not_null<Main::Session*> session, FullMsgId itemId) {
@@ -239,6 +251,16 @@ void AddDocumentActions(
 				: tr::lng_context_show_in_folder(tr::now)),
 			[=] { ShowInFolder(document); });
 	}
+	if (document->hasAttachedStickers()) {
+		const auto controller = list->controller();
+		auto callback = [=] {
+			auto &attached = session->api().attachedStickers();
+			attached.requestAttachedStickerSets(controller, document);
+		};
+		menu->addAction(
+			tr::lng_context_attached_stickers(tr::now),
+			std::move(callback));
+	}
 	AddSaveDocumentAction(menu, contextId, document);
 }
 
@@ -768,7 +790,7 @@ base::unique_qptr<Ui::PopupMenu> FillContextMenu(
 
 	AddTopMessageActions(result, request, list);
 	if (linkPhoto) {
-		AddPhotoActions(result, photo);
+		AddPhotoActions(result, photo, list);
 	} else if (linkDocument) {
 		AddDocumentActions(result, document, itemId, list);
 	//} else if (linkPeer) { // #feed

From 02818a825162a30dbc065ebb1002fb346802840e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 30 Oct 2020 13:23:28 +0400
Subject: [PATCH 072/190] Use new tg_owt installation support in snap

---
 snap/snapcraft.yaml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index c1c4ff59f..bb734601b 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -67,8 +67,6 @@ parts:
     source: .
     source-type: git
     parse-info: [usr/share/metainfo/telegram-desktop_telegram-desktop.appdata.xml]
-    build-environment:
-      - tg_owt_DIR: $SNAPCRAFT_STAGE/tg_owt
     build-packages:
       - python
       - qtbase5-private-dev
@@ -268,16 +266,11 @@ parts:
     stage-packages:
       - libopus0
       - libssl1.1
-    override-build: |
-      cmake "$SNAPCRAFT_PART_SRC" \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DJPEG_LIBRARY_RELEASE="$SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so" \
-        -DJPEG_INCLUDE_DIR="$SNAPCRAFT_STAGE/usr/include"
-
-      cmake --build . -- -j$(nproc)
-      cp -a . "$SNAPCRAFT_PART_INSTALL"
-    organize:
-      "*": tg_owt/
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DJPEG_LIBRARY_RELEASE=$SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so
+      - -DJPEG_INCLUDE_DIR=$SNAPCRAFT_STAGE/usr/include
     prime: [-./*]
     after:
       - ffmpeg

From 18fe87c0d4b3fc9deca3186f6ddcd0f94d16feff Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 30 Oct 2020 15:01:00 +0400
Subject: [PATCH 073/190] Add MozJPEG to docker

---
 Telegram/build/docker/centos_env/Dockerfile | 32 ++++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index c02e0d331..0e055dee2 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -47,6 +47,25 @@ RUN scl enable devtoolset-8 -- cmake3 -B build . -DCMAKE_BUILD_TYPE=Release
 RUN scl enable devtoolset-8 -- cmake3 --build build -j$(nproc)
 RUN DESTDIR="$LibrariesPath/xz-cache" scl enable devtoolset-8 -- cmake3 --install build
 
+WORKDIR ..
+RUN rm -rf xz
+
+FROM builder AS mozjpeg
+RUN git clone -b v4.0.1-rc2 --depth=1 $GIT/mozilla/mozjpeg.git
+
+WORKDIR mozjpeg
+RUN scl enable devtoolset-8 -- cmake3 -B build . \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX=/usr/local \
+	-DWITH_JPEG8=ON \
+	-DPNG_SUPPORTED=OFF
+
+RUN scl enable devtoolset-8 -- cmake3 --build build -j$(nproc)
+RUN DESTDIR="$LibrariesPath/mozjpeg-cache" scl enable devtoolset-8 -- cmake3 --install build
+
+WORKDIR ..
+RUN rm -rf mozjpeg
+
 FROM builder AS opus
 RUN git clone -b v1.3 --depth=1 $GIT/xiph/opus.git
 
@@ -336,6 +355,7 @@ RUN rm -rf libxkbcommon
 FROM patches AS qt
 
 COPY --from=libffi ${LibrariesPath}/libffi-cache /
+COPY --from=mozjpeg ${LibrariesPath}/mozjpeg-cache /
 COPY --from=xcb ${LibrariesPath}/xcb-cache /
 COPY --from=libXext ${LibrariesPath}/libXext-cache /
 COPY --from=libXfixes ${LibrariesPath}/libXfixes-cache /
@@ -361,7 +381,6 @@ RUN scl enable devtoolset-8 -- ./configure -prefix "$QT_PREFIX" \
 	-opensource \
 	-confirm-license \
 	-qt-libpng \
-	-qt-libjpeg \
 	-qt-harfbuzz \
 	-qt-pcre \
 	-qt-xcb \
@@ -372,11 +391,15 @@ RUN scl enable devtoolset-8 -- ./configure -prefix "$QT_PREFIX" \
 	-openssl-linked \
 	-I "$OPENSSL_PREFIX/include" OPENSSL_LIBS="$OPENSSL_PREFIX/lib/libssl.a $OPENSSL_PREFIX/lib/libcrypto.a -lz -ldl -lpthread" \
 	-nomake examples \
-	-nomake tests
+	-nomake tests \
+	-L /usr/local/lib64
 
 RUN scl enable devtoolset-8 -- make -j$(nproc)
 RUN scl enable devtoolset-8 -- make INSTALL_ROOT="$LibrariesPath/qt-cache" install
 
+WORKDIR ..
+RUN rm -rf qt_${QT}
+
 FROM patches AS breakpad
 RUN git clone https://chromium.googlesource.com/breakpad/breakpad.git
 
@@ -418,10 +441,10 @@ RUN rm -rf gyp
 
 FROM builder AS webrtc
 
+COPY --from=mozjpeg ${LibrariesPath}/mozjpeg-cache /
 COPY --from=opus ${LibrariesPath}/opus-cache /
 COPY --from=ffmpeg ${LibrariesPath}/ffmpeg-cache /
 COPY --from=openssl ${LibrariesPath}/openssl-cache /
-COPY --from=qt ${LibrariesPath}/qt_${QT} qt_${QT}
 
 RUN git clone $GIT/desktop-app/tg_owt.git
 
@@ -431,7 +454,7 @@ RUN git checkout c73a471
 RUN scl enable devtoolset-8 -- cmake3 -B out/Release . \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DTG_OWT_SPECIAL_TARGET=linux \
-	-DTG_OWT_LIBJPEG_INCLUDE_PATH=$(pwd)/../qt_$QT/qtbase/src/3rdparty/libjpeg \
+	-DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
 	-DTG_OWT_OPENSSL_INCLUDE_PATH=$OPENSSL_PREFIX/include \
 	-DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
 	-DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include
@@ -442,6 +465,7 @@ FROM builder
 
 COPY --from=libffi ${LibrariesPath}/libffi-cache /
 COPY --from=xz ${LibrariesPath}/xz-cache /
+COPY --from=mozjpeg ${LibrariesPath}/mozjpeg-cache /
 COPY --from=opus ${LibrariesPath}/opus-cache /
 COPY --from=xcb ${LibrariesPath}/xcb-cache /
 COPY --from=libXext ${LibrariesPath}/libXext-cache /

From 30f07280aaa857dc56f7a3d577a8525a96e2dbc7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 30 Oct 2020 15:14:12 +0400
Subject: [PATCH 074/190] Add an action to test docker image build

---
 .github/workflows/docker.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 000000000..dc456da5c
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,25 @@
+name: Docker.
+
+on:
+  push:
+    paths:
+      - '.github/workflows/docker.yml'
+      - 'Telegram/build/docker/centos_env/**'
+  pull_request:
+    paths:
+      - '.github/workflows/docker.yml'
+      - 'Telegram/build/docker/centos_env/**'
+
+jobs:
+  docker:
+    name: Ubuntu
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone.
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Docker image build.
+        run: docker build -t telegram_desktop Telegram/build/docker/centos_env

From eb27763cae5c796ec8e956163060dfc54b6c48c2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 30 Oct 2020 19:12:41 +0400
Subject: [PATCH 075/190] Restore Ui::hideLayer call in ShowInFolder on Linux

---
 Telegram/SourceFiles/core/file_utilities.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp
index 5b3858ee6..edd0681c9 100644
--- a/Telegram/SourceFiles/core/file_utilities.cpp
+++ b/Telegram/SourceFiles/core/file_utilities.cpp
@@ -7,7 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "core/file_utilities.h"
 
+#include "boxes/abstract_box.h"
 #include "storage/localstorage.h"
+#include "base/platform/base_platform_info.h"
 #include "base/platform/base_platform_file_utilities.h"
 #include "platform/platform_file_utilities.h"
 #include "core/application.h"
@@ -155,6 +157,10 @@ void Launch(const QString &filepath) {
 void ShowInFolder(const QString &filepath) {
 	crl::on_main([=] {
 		Ui::PreventDelayedActivation();
+		if (Platform::IsLinux()) {
+			// Hide mediaview to make other apps visible.
+			Ui::hideLayer(anim::type::instant);
+		}
 		base::Platform::ShowInFolder(filepath);
 	});
 }

From cc28ba4284f3d508028b117bea8979ac7cb418c1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 6 Oct 2020 15:58:16 +0300
Subject: [PATCH 076/190] Update API scheme to layer 120.

---
 Telegram/Resources/tl/api.tl                  | 38 +++++++++-------
 Telegram/SourceFiles/api/api_updates.cpp      | 25 -----------
 Telegram/SourceFiles/apiwrap.cpp              |  3 ++
 .../boxes/peers/add_participants_box.h        |  3 ++
 .../boxes/peers/edit_participants_box.cpp     |  2 +
 .../calls/calls_box_controller.cpp            |  2 +-
 Telegram/SourceFiles/data/data_location.cpp   |  4 +-
 .../data/data_search_controller.cpp           |  2 +-
 .../dialogs/dialogs_inner_widget.cpp          | 18 ++++----
 .../dialogs/dialogs_inner_widget.h            |  6 +--
 .../dialogs_search_from_controllers.cpp       | 28 ++++++------
 .../dialogs/dialogs_search_from_controllers.h |  9 ++--
 .../SourceFiles/dialogs/dialogs_widget.cpp    | 44 +++++++++----------
 Telegram/SourceFiles/dialogs/dialogs_widget.h |  6 +--
 .../export/data/export_data_types.cpp         |  6 +++
 .../export/data/export_data_types.h           |  9 +++-
 .../SourceFiles/export/export_api_wrap.cpp    |  2 +-
 .../export/output/export_output_html.cpp      |  2 +
 .../export/output/export_output_json.cpp      |  3 ++
 .../SourceFiles/history/history_service.cpp   |  2 +
 .../storage/download_manager_mtproto.cpp      |  4 +-
 21 files changed, 113 insertions(+), 105 deletions(-)

diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index ce2e3b0b7..06f21cc28 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -69,7 +69,7 @@ inputMediaPhotoExternal#e5bbfe1a flags:# url:string ttl_seconds:flags.0?int = In
 inputMediaDocumentExternal#fb52dc99 flags:# url:string ttl_seconds:flags.0?int = InputMedia;
 inputMediaGame#d33f43f3 id:InputGame = InputMedia;
 inputMediaInvoice#f4e096c3 flags:# title:string description:string photo:flags.0?InputWebDocument invoice:Invoice payload:bytes provider:string provider_data:DataJSON start_param:string = InputMedia;
-inputMediaGeoLive#ce4e82fd flags:# stopped:flags.0?true geo_point:InputGeoPoint period:flags.1?int = InputMedia;
+inputMediaGeoLive#971fa843 flags:# stopped:flags.0?true geo_point:InputGeoPoint heading:flags.2?int period:flags.1?int proximity_notification_radius:flags.3?int = InputMedia;
 inputMediaPoll#f94e5f1 flags:# poll:Poll correct_answers:flags.0?Vector<bytes> solution:flags.1?string solution_entities:flags.1?Vector<MessageEntity> = InputMedia;
 inputMediaDice#e66fbf7b emoticon:string = InputMedia;
 
@@ -78,7 +78,7 @@ inputChatUploadedPhoto#c642724e flags:# file:flags.0?InputFile video:flags.1?Inp
 inputChatPhoto#8953ad37 id:InputPhoto = InputChatPhoto;
 
 inputGeoPointEmpty#e4c123d6 = InputGeoPoint;
-inputGeoPoint#f3b7acc9 lat:double long:double = InputGeoPoint;
+inputGeoPoint#48222faf flags:# lat:double long:double accuracy_radius:flags.0?int = InputGeoPoint;
 
 inputPhotoEmpty#1cd7bf0d = InputPhoto;
 inputPhoto#3bb3b94a id:long access_hash:long file_reference:bytes = InputPhoto;
@@ -141,7 +141,7 @@ chatPhotoEmpty#37c1011c = ChatPhoto;
 chatPhoto#d20b9f3c flags:# has_video:flags.0?true photo_small:FileLocation photo_big:FileLocation dc_id:int = ChatPhoto;
 
 messageEmpty#83e5de54 id:int = Message;
-message#58ae39c9 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true from_scheduled:flags.18?true legacy:flags.19?true edit_hide:flags.21?true id:int from_id:flags.8?Peer peer_id:Peer fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?int reply_to:flags.3?MessageReplyHeader date:int message:string media:flags.9?MessageMedia reply_markup:flags.6?ReplyMarkup entities:flags.7?Vector<MessageEntity> views:flags.10?int forwards:flags.10?int replies:flags.23?MessageReplies edit_date:flags.15?int post_author:flags.16?string grouped_id:flags.17?long restriction_reason:flags.22?Vector<RestrictionReason> = Message;
+message#58ae39c9 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true from_scheduled:flags.18?true legacy:flags.19?true edit_hide:flags.21?true pinned:flags.24?true id:int from_id:flags.8?Peer peer_id:Peer fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?int reply_to:flags.3?MessageReplyHeader date:int message:string media:flags.9?MessageMedia reply_markup:flags.6?ReplyMarkup entities:flags.7?Vector<MessageEntity> views:flags.10?int forwards:flags.10?int replies:flags.23?MessageReplies edit_date:flags.15?int post_author:flags.16?string grouped_id:flags.17?long restriction_reason:flags.22?Vector<RestrictionReason> = Message;
 messageService#286fa604 flags:# out:flags.1?true mentioned:flags.4?true media_unread:flags.5?true silent:flags.13?true post:flags.14?true legacy:flags.19?true id:int from_id:flags.8?Peer peer_id:Peer reply_to:flags.3?MessageReplyHeader date:int action:MessageAction = Message;
 
 messageMediaEmpty#3ded6320 = MessageMedia;
@@ -154,7 +154,7 @@ messageMediaWebPage#a32dd600 webpage:WebPage = MessageMedia;
 messageMediaVenue#2ec0533f geo:GeoPoint title:string address:string provider:string venue_id:string venue_type:string = MessageMedia;
 messageMediaGame#fdb19008 game:Game = MessageMedia;
 messageMediaInvoice#84551347 flags:# shipping_address_requested:flags.1?true test:flags.3?true title:string description:string photo:flags.0?WebDocument receipt_msg_id:flags.2?int currency:string total_amount:long start_param:string = MessageMedia;
-messageMediaGeoLive#7c3c2609 geo:GeoPoint period:int = MessageMedia;
+messageMediaGeoLive#b940c666 flags:# geo:GeoPoint heading:flags.0?int period:int proximity_notification_radius:flags.1?int = MessageMedia;
 messageMediaPoll#4bd6e798 poll:Poll results:PollResults = MessageMedia;
 messageMediaDice#3f7ee58b value:int emoticon:string = MessageMedia;
 
@@ -181,6 +181,7 @@ messageActionBotAllowed#abe9affe domain:string = MessageAction;
 messageActionSecureValuesSentMe#1b287353 values:Vector<SecureValue> credentials:SecureCredentialsEncrypted = MessageAction;
 messageActionSecureValuesSent#d95c6154 types:Vector<SecureValueType> = MessageAction;
 messageActionContactSignUp#f3f25f76 = MessageAction;
+messageActionGeoProximityReached#98e0d697 from_id:Peer to_id:Peer distance:int = MessageAction;
 
 dialog#2c171f72 flags:# pinned:flags.2?true unread_mark:flags.3?true peer:Peer top_message:int read_inbox_max_id:int read_outbox_max_id:int unread_count:int unread_mentions_count:int notify_settings:PeerNotifySettings pts:flags.0?int draft:flags.1?DraftMessage folder_id:flags.4?int = Dialog;
 dialogFolder#71bd134c flags:# pinned:flags.2?true folder:Folder peer:Peer top_message:int unread_muted_peers_count:int unread_unmuted_peers_count:int unread_muted_messages_count:int unread_unmuted_messages_count:int = Dialog;
@@ -195,7 +196,7 @@ photoStrippedSize#e0b0bc2e type:string bytes:bytes = PhotoSize;
 photoSizeProgressive#5aa86a51 type:string location:FileLocation w:int h:int sizes:Vector<int> = PhotoSize;
 
 geoPointEmpty#1117dd5f = GeoPoint;
-geoPoint#296f104 long:double lat:double access_hash:long = GeoPoint;
+geoPoint#b2a2f663 flags:# long:double lat:double access_hash:long accuracy_radius:flags.0?int = GeoPoint;
 
 auth.sentCode#5e002502 flags:# type:auth.SentCodeType phone_code_hash:string next_type:flags.1?auth.CodeType timeout:flags.2?int = auth.SentCode;
 
@@ -247,8 +248,8 @@ messages.dialogsSlice#71e094f3 count:int dialogs:Vector<Dialog> messages:Vector<
 messages.dialogsNotModified#f0e3e596 count:int = messages.Dialogs;
 
 messages.messages#8c718e87 messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
-messages.messagesSlice#c8edce1e flags:# inexact:flags.1?true count:int next_rate:flags.0?int messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
-messages.channelMessages#99262e37 flags:# inexact:flags.1?true pts:int count:int messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
+messages.messagesSlice#3a54685e flags:# inexact:flags.1?true count:int next_rate:flags.0?int offset_id_offset:flags.2?int messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
+messages.channelMessages#64479808 flags:# inexact:flags.1?true pts:int count:int offset_id_offset:flags.2?int messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
 messages.messagesNotModified#74535f21 count:int = messages.Messages;
 
 messages.chats#64ff9fd5 chats:Vector<Chat> = messages.Chats;
@@ -274,6 +275,7 @@ inputMessagesFilterRoundVideo#b549da53 = MessagesFilter;
 inputMessagesFilterMyMentions#c1f8e69a = MessagesFilter;
 inputMessagesFilterGeo#e7026d0d = MessagesFilter;
 inputMessagesFilterContacts#e062db83 = MessagesFilter;
+inputMessagesFilterPinned#1bb00451 = MessagesFilter;
 
 updateNewMessage#1f2b0afd message:Message pts:int pts_count:int = Update;
 updateMessageID#4e90bfd6 id:int random_id:long = Update;
@@ -313,7 +315,6 @@ updateSavedGifs#9375341e = Update;
 updateBotInlineQuery#54826690 flags:# query_id:long user_id:int query:string geo:flags.0?GeoPoint offset:string = Update;
 updateBotInlineSend#e48f964 flags:# user_id:int query:string geo:flags.0?GeoPoint id:string msg_id:flags.1?InputBotInlineMessageID = Update;
 updateEditChannelMessage#1b3f4df7 message:Message pts:int pts_count:int = Update;
-updateChannelPinnedMessage#98592475 channel_id:int id:int = Update;
 updateBotCallbackQuery#e73547e1 flags:# query_id:long user_id:int peer:Peer msg_id:int chat_instance:long data:flags.0?bytes game_short_name:flags.1?string = Update;
 updateEditMessage#e40370a3 message:Message pts:int pts_count:int = Update;
 updateInlineBotCallbackQuery#f9d27a5a flags:# query_id:long user_id:int msg_id:InputBotInlineMessageID chat_instance:long data:flags.0?bytes game_short_name:flags.1?string = Update;
@@ -338,8 +339,6 @@ updateChannelReadMessagesContents#89893b45 channel_id:int messages:Vector<int> =
 updateContactsReset#7084a7be = Update;
 updateChannelAvailableMessages#70db6837 channel_id:int available_min_id:int = Update;
 updateDialogUnreadMark#e16459c3 flags:# unread:flags.0?true peer:DialogPeer = Update;
-updateUserPinnedMessage#4c43da18 user_id:int id:int = Update;
-updateChatPinnedMessage#e10db349 chat_id:int id:int version:int = Update;
 updateMessagePoll#aca1657b flags:# poll_id:long poll:flags.0?Poll results:PollResults = Update;
 updateChatDefaultBannedRights#54c01850 peer:Peer default_banned_rights:ChatBannedRights version:int = Update;
 updateFolderPeers#19360dc0 folder_peers:Vector<FolderPeer> pts:int pts_count:int = Update;
@@ -361,6 +360,8 @@ updateReadChannelDiscussionInbox#1cc7de54 flags:# channel_id:int top_msg_id:int
 updateReadChannelDiscussionOutbox#4638a26c channel_id:int top_msg_id:int read_max_id:int = Update;
 updatePeerBlocked#246a4b22 peer_id:Peer blocked:Bool = Update;
 updateChannelUserTyping#ff2abe9f flags:# channel_id:int top_msg_id:flags.0?int user_id:int action:SendMessageAction = Update;
+updatePinnedMessages#ed85eab5 flags:# pinned:flags.0?true peer:Peer messages:Vector<int> pts:int pts_count:int = Update;
+updatePinnedChannelMessages#8588878b flags:# pinned:flags.0?true channel_id:int messages:Vector<int> pts:int pts_count:int = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -607,6 +608,7 @@ channelParticipantSelf#a3289a6d user_id:int inviter_id:int date:int = ChannelPar
 channelParticipantCreator#447dca4b flags:# user_id:int admin_rights:ChatAdminRights rank:flags.0?string = ChannelParticipant;
 channelParticipantAdmin#ccbebbaf flags:# can_edit:flags.0?true self:flags.1?true user_id:int inviter_id:flags.1?int promoted_by:int date:int admin_rights:ChatAdminRights rank:flags.2?string = ChannelParticipant;
 channelParticipantBanned#1c0facaf flags:# left:flags.0?true user_id:int kicked_by:int date:int banned_rights:ChatBannedRights = ChannelParticipant;
+channelParticipantLeft#c3c6796b user_id:int = ChannelParticipant;
 
 channelParticipantsRecent#de3f3c79 = ChannelParticipantsFilter;
 channelParticipantsAdmins#b4608969 = ChannelParticipantsFilter;
@@ -615,6 +617,7 @@ channelParticipantsBots#b0d1865b = ChannelParticipantsFilter;
 channelParticipantsBanned#1427a5e1 q:string = ChannelParticipantsFilter;
 channelParticipantsSearch#656ac4b q:string = ChannelParticipantsFilter;
 channelParticipantsContacts#bb6ae88d q:string = ChannelParticipantsFilter;
+channelParticipantsMentions#e04b5ceb flags:# q:flags.0?string top_msg_id:flags.1?int = ChannelParticipantsFilter;
 
 channels.channelParticipants#f56ee2a8 count:int participants:Vector<ChannelParticipant> users:Vector<User> = channels.ChannelParticipants;
 channels.channelParticipantsNotModified#f0173fe9 = channels.ChannelParticipants;
@@ -628,7 +631,7 @@ messages.savedGifs#2e0709a5 hash:int gifs:Vector<Document> = messages.SavedGifs;
 
 inputBotInlineMessageMediaAuto#3380c786 flags:# message:string entities:flags.1?Vector<MessageEntity> reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
 inputBotInlineMessageText#3dcd7a87 flags:# no_webpage:flags.0?true message:string entities:flags.1?Vector<MessageEntity> reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
-inputBotInlineMessageMediaGeo#c1b15d65 flags:# geo_point:InputGeoPoint period:int reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
+inputBotInlineMessageMediaGeo#96929a85 flags:# geo_point:InputGeoPoint heading:flags.0?int period:flags.1?int proximity_notification_radius:flags.3?int reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
 inputBotInlineMessageMediaVenue#417bbf11 flags:# geo_point:InputGeoPoint title:string address:string provider:string venue_id:string venue_type:string reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
 inputBotInlineMessageMediaContact#a6edbffd flags:# phone_number:string first_name:string last_name:string vcard:string reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
 inputBotInlineMessageGame#4b425864 flags:# reply_markup:flags.2?ReplyMarkup = InputBotInlineMessage;
@@ -640,7 +643,7 @@ inputBotInlineResultGame#4fa417f2 id:string short_name:string send_message:Input
 
 botInlineMessageMediaAuto#764cf810 flags:# message:string entities:flags.1?Vector<MessageEntity> reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
 botInlineMessageText#8c7f65e2 flags:# no_webpage:flags.0?true message:string entities:flags.1?Vector<MessageEntity> reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
-botInlineMessageMediaGeo#b722de65 flags:# geo:GeoPoint period:int reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
+botInlineMessageMediaGeo#51846fd flags:# geo:GeoPoint heading:flags.0?int period:flags.1?int proximity_notification_radius:flags.3?int reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
 botInlineMessageMediaVenue#8a86659c flags:# geo:GeoPoint title:string address:string provider:string venue_id:string venue_type:string reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
 botInlineMessageMediaContact#18d1cdc2 flags:# phone_number:string first_name:string last_name:string vcard:string reply_markup:flags.2?ReplyMarkup = BotInlineMessage;
 
@@ -1164,8 +1167,6 @@ messageViews#455b853d flags:# views:flags.0?int forwards:flags.1?int replies:fla
 
 messages.messageViews#b6c4f543 views:Vector<MessageViews> chats:Vector<Chat> users:Vector<User> = messages.MessageViews;
 
-stats.messageStats#8999f295 views_graph:StatsGraph = stats.MessageStats;
-
 messages.discussionMessage#f5dd8f9d flags:# messages:Vector<Message> max_id:flags.0?int read_inbox_max_id:flags.1?int read_outbox_max_id:flags.2?int chats:Vector<Chat> users:Vector<User> = messages.DiscussionMessage;
 
 messageReplyHeader#a6d57763 flags:# reply_to_msg_id:int reply_to_peer_id:flags.0?Peer reply_to_top_id:flags.1?int = MessageReplyHeader;
@@ -1174,6 +1175,8 @@ messageReplies#4128faac flags:# comments:flags.0?true replies:int replies_pts:in
 
 peerBlocked#e8fd8014 peer_id:Peer date:int = PeerBlocked;
 
+stats.messageStats#8999f295 views_graph:StatsGraph = stats.MessageStats;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1299,7 +1302,7 @@ contacts.blockFromReplies#29a8962c flags:# delete_message:flags.0?true delete_hi
 messages.getMessages#63c66506 id:Vector<InputMessage> = messages.Messages;
 messages.getDialogs#a0ee3b73 flags:# exclude_pinned:flags.0?true folder_id:flags.1?int offset_date:int offset_id:int offset_peer:InputPeer limit:int hash:int = messages.Dialogs;
 messages.getHistory#dcbb8260 peer:InputPeer offset_id:int offset_date:int add_offset:int limit:int max_id:int min_id:int hash:int = messages.Messages;
-messages.search#4e17810b flags:# peer:InputPeer q:string from_id:flags.0?InputUser top_msg_id:flags.1?int filter:MessagesFilter min_date:int max_date:int offset_id:int add_offset:int limit:int max_id:int min_id:int hash:int = messages.Messages;
+messages.search#c352eec flags:# peer:InputPeer q:string from_id:flags.0?InputPeer top_msg_id:flags.1?int filter:MessagesFilter min_date:int max_date:int offset_id:int add_offset:int limit:int max_id:int min_id:int hash:int = messages.Messages;
 messages.readHistory#e306d3a peer:InputPeer max_id:int = messages.AffectedMessages;
 messages.deleteHistory#1c015b09 flags:# just_clear:flags.0?true revoke:flags.1?true peer:InputPeer max_id:int = messages.AffectedHistory;
 messages.deleteMessages#e58e95d2 flags:# revoke:flags.0?true id:Vector<int> = messages.AffectedMessages;
@@ -1393,7 +1396,7 @@ messages.getSplitRanges#1cff7e08 = Vector<MessageRange>;
 messages.markDialogUnread#c286d98f flags:# unread:flags.0?true peer:InputDialogPeer = Bool;
 messages.getDialogUnreadMarks#22e24e22 = Vector<DialogPeer>;
 messages.clearAllDrafts#7e58ee9c = Bool;
-messages.updatePinnedMessage#d2aaf7ec flags:# silent:flags.0?true peer:InputPeer id:int = Updates;
+messages.updatePinnedMessage#d2aaf7ec flags:# silent:flags.0?true unpin:flags.1?true pm_oneside:flags.2?true peer:InputPeer id:int = Updates;
 messages.sendVote#10ea6184 peer:InputPeer msg_id:int options:Vector<bytes> = Updates;
 messages.getPollResults#73bb643b peer:InputPeer msg_id:int = Updates;
 messages.getOnlines#6e2be050 peer:InputPeer = ChatOnlines;
@@ -1422,6 +1425,7 @@ messages.getOldFeaturedStickers#5fe7025b offset:int limit:int hash:int = message
 messages.getReplies#24b581ba peer:InputPeer msg_id:int offset_id:int offset_date:int add_offset:int limit:int max_id:int min_id:int hash:int = messages.Messages;
 messages.getDiscussionMessage#446972fd peer:InputPeer msg_id:int = messages.DiscussionMessage;
 messages.readDiscussion#f731a9f4 peer:InputPeer msg_id:int read_max_id:int = Bool;
+messages.unpinAllMessages#f025bc8b peer:InputPeer = messages.AffectedHistory;
 
 updates.getState#edd4882a = updates.State;
 updates.getDifference#25939651 flags:# pts:int pts_total_limit:flags.0?int date:int qts:int = updates.Difference;
@@ -1543,4 +1547,4 @@ stats.getMegagroupStats#dcdf8607 flags:# dark:flags.0?true channel:InputChannel
 stats.getMessagePublicForwards#5630281b channel:InputChannel msg_id:int offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
 stats.getMessageStats#b6e0a3f5 flags:# dark:flags.0?true channel:InputChannel msg_id:int = stats.MessageStats;
 
-// LAYER 119
+// LAYER 120
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 28673ceac..7865403d6 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -1998,31 +1998,6 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		}
 	} break;
 
-	// Pinned message.
-	case mtpc_updateUserPinnedMessage: {
-		const auto &d = update.c_updateUserPinnedMessage();
-		if (const auto user = session().data().userLoaded(d.vuser_id().v)) {
-			user->setPinnedMessageId(d.vid().v);
-		}
-	} break;
-
-	case mtpc_updateChatPinnedMessage: {
-		const auto &d = update.c_updateChatPinnedMessage();
-		if (const auto chat = session().data().chatLoaded(d.vchat_id().v)) {
-			const auto status = chat->applyUpdateVersion(d.vversion().v);
-			if (status == ChatData::UpdateStatus::Good) {
-				chat->setPinnedMessageId(d.vid().v);
-			}
-		}
-	} break;
-
-	case mtpc_updateChannelPinnedMessage: {
-		const auto &d = update.c_updateChannelPinnedMessage();
-		if (const auto channel = session().data().channelLoaded(d.vchannel_id().v)) {
-			channel->setPinnedMessageId(d.vid().v);
-		}
-	} break;
-
 	////// Cloud sticker sets
 	case mtpc_updateNewStickerSet: {
 		const auto &d = update.c_updateNewStickerSet();
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index a082d9b88..5c4cd1225 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -1692,6 +1692,9 @@ void ApiWrap::requestSelfParticipant(not_null<ChannelData*> channel) {
 			}, [&](const MTPDchannelParticipant &data) {
 				LOG(("API Error: Got self regular participant."));
 				finalize(-1, 0);
+			}, [&](const MTPDchannelParticipantLeft &data) {
+				LOG(("API Error: Got self left participant."));
+				finalize(-1, 0);
 			});
 		});
 	}).fail([=](const RPCError &error) {
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.h b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
index 2761d172d..122491c6d 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.h
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
@@ -86,6 +86,9 @@ public:
 		AdminDoneCallback adminDoneCallback,
 		BannedDoneCallback bannedDoneCallback);
 
+	[[nodiscard]] not_null<PeerData*> peer() const {
+		return _peer;
+	}
 	[[nodiscard]] Main::Session &session() const override;
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index 9fb27894a..3cc3aca22 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -557,6 +557,8 @@ UserData *ParticipantsAdditionalData::applyParticipant(
 			return logBad();
 		}
 		return applyBanned(data);
+	}, [&](const MTPDchannelParticipantLeft &data) {
+		return logBad();
 	});
 }
 
diff --git a/Telegram/SourceFiles/calls/calls_box_controller.cpp b/Telegram/SourceFiles/calls/calls_box_controller.cpp
index 1e03fa153..f671469aa 100644
--- a/Telegram/SourceFiles/calls/calls_box_controller.cpp
+++ b/Telegram/SourceFiles/calls/calls_box_controller.cpp
@@ -296,7 +296,7 @@ void BoxController::loadMoreRows() {
 		MTP_flags(0),
 		MTP_inputPeerEmpty(),
 		MTP_string(),
-		MTP_inputUserEmpty(),
+		MTP_inputPeerEmpty(),
 		MTPint(), // top_msg_id
 		MTP_inputMessagesFilterPhoneCalls(MTP_flags(0)),
 		MTP_int(0),
diff --git a/Telegram/SourceFiles/data/data_location.cpp b/Telegram/SourceFiles/data/data_location.cpp
index c26e50e71..c08c6688f 100644
--- a/Telegram/SourceFiles/data/data_location.cpp
+++ b/Telegram/SourceFiles/data/data_location.cpp
@@ -36,9 +36,11 @@ QString LocationPoint::lonAsString() const {
 
 MTPGeoPoint LocationPoint::toMTP() const {
 	return MTP_geoPoint(
+		MTP_flags(0),
 		MTP_double(_lon),
 		MTP_double(_lat),
-		MTP_long(_access));
+		MTP_long(_access),
+		MTP_int(0)); // accuracy_radius
 }
 
 float64 LocationPoint::lat() const {
diff --git a/Telegram/SourceFiles/data/data_search_controller.cpp b/Telegram/SourceFiles/data/data_search_controller.cpp
index 7de8f2fc0..367ed2e97 100644
--- a/Telegram/SourceFiles/data/data_search_controller.cpp
+++ b/Telegram/SourceFiles/data/data_search_controller.cpp
@@ -87,7 +87,7 @@ std::optional<MTPmessages_Search> PrepareSearchRequest(
 		MTP_flags(0),
 		peer->input,
 		MTP_string(query),
-		MTP_inputUserEmpty(),
+		MTP_inputPeerEmpty(),
 		MTPint(), // top_msg_id
 		filter,
 		MTP_int(0),
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 5f4e32335..d7b03c4b8 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -380,7 +380,7 @@ int InnerWidget::searchedOffset() const {
 
 int InnerWidget::searchInChatSkip() const {
 	auto result = st::searchedBarHeight + st::dialogsSearchInHeight;
-	if (_searchFromUser) {
+	if (_searchFromPeer) {
 		result += st::lineWidth + st::dialogsSearchInHeight;
 	}
 	return result;
@@ -811,7 +811,7 @@ void InnerWidget::paintSearchInChat(Painter &p) const {
 
 	auto fullRect = QRect(0, top, width(), height - top);
 	p.fillRect(fullRect, st::dialogsBg);
-	if (_searchFromUser) {
+	if (_searchFromPeer) {
 		p.fillRect(QRect(0, top + st::dialogsSearchInHeight, width(), st::lineWidth), st::shadowFg);
 	}
 
@@ -829,7 +829,7 @@ void InnerWidget::paintSearchInChat(Painter &p) const {
 	} else {
 		Unexpected("Empty Key in paintSearchInChat.");
 	}
-	if (const auto from = _searchFromUser) {
+	if (const auto from = _searchFromPeer) {
 		top += st::dialogsSearchInHeight + st::lineWidth;
 		p.setPen(st::dialogsTextFg);
 		p.setTextPalette(st::dialogsSearchFromPalette);
@@ -1868,7 +1868,7 @@ void InnerWidget::applyFilterUpdate(QString newFilter, bool force) {
 	newFilter = words.isEmpty() ? QString() : words.join(' ');
 	if (newFilter != _filter || force) {
 		_filter = newFilter;
-		if (_filter.isEmpty() && !_searchFromUser) {
+		if (_filter.isEmpty() && !_searchFromPeer) {
 			clearFilter();
 		} else {
 			_state = WidgetState::Filtered;
@@ -2328,7 +2328,7 @@ bool InnerWidget::hasFilteredResults() const {
 	return !_filterResults.empty() && _hashtagResults.empty();
 }
 
-void InnerWidget::searchInChat(Key key, UserData *from) {
+void InnerWidget::searchInChat(Key key, PeerData *from) {
 	_searchInMigrated = nullptr;
 	if (const auto peer = key.peer()) {
 		if (const auto migrateTo = peer->migrateTo()) {
@@ -2338,7 +2338,7 @@ void InnerWidget::searchInChat(Key key, UserData *from) {
 		}
 	}
 	_searchInChat = key;
-	_searchFromUser = from;
+	_searchFromPeer = from;
 	if (_searchInChat) {
 		_controller->closeFolder();
 		onHashtagFilterUpdate(QStringRef());
@@ -2347,9 +2347,9 @@ void InnerWidget::searchInChat(Key key, UserData *from) {
 	} else {
 		_cancelSearchInChat->hide();
 	}
-	if (_searchFromUser) {
+	if (_searchFromPeer) {
 		_cancelSearchFromUser->show();
-		_searchFromUserUserpic = _searchFromUser->createUserpicView();
+		_searchFromUserUserpic = _searchFromPeer->createUserpicView();
 	} else {
 		_cancelSearchFromUser->hide();
 		_searchFromUserUserpic = nullptr;
@@ -2386,7 +2386,7 @@ void InnerWidget::refreshSearchInChatLabel() {
 			dialog,
 			Ui::DialogTextOptions());
 	}
-	const auto from = _searchFromUser ? _searchFromUser->name : QString();
+	const auto from = _searchFromPeer ? _searchFromPeer->name : QString();
 	if (!from.isEmpty()) {
 		const auto fromUserText = tr::lng_dlg_search_from(
 			tr::now,
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index e6a245d1f..ea3a59fa2 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -109,7 +109,7 @@ public:
 	}
 	bool hasFilteredResults() const;
 
-	void searchInChat(Key key, UserData *from);
+	void searchInChat(Key key, PeerData *from);
 
 	void applyFilterUpdate(QString newFilter, bool force = false);
 	void onHashtagFilterUpdate(QStringRef newFilter);
@@ -119,7 +119,7 @@ public:
 	void setLoadMoreCallback(Fn<void()> callback);
 	[[nodiscard]] rpl::producer<> listBottomReached() const;
 
-	base::Observable<UserData*> searchFromUserChanged;
+	base::Observable<PeerData*> searchFromUserChanged;
 
 	[[nodiscard]] rpl::producer<ChosenRow> chosenRow() const;
 	[[nodiscard]] rpl::producer<> updated() const;
@@ -395,7 +395,7 @@ private:
 
 	Key _searchInChat;
 	History *_searchInMigrated = nullptr;
-	UserData *_searchFromUser = nullptr;
+	PeerData *_searchFromPeer = nullptr;
 	mutable std::shared_ptr<Data::CloudImageView> _searchInChatUserpic;
 	mutable std::shared_ptr<Data::CloudImageView> _searchFromUserUserpic;
 	Ui::Text::String _searchInChatText;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
index 770b6d759..6ff20477c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
@@ -19,7 +19,7 @@ namespace Dialogs {
 
 void ShowSearchFromBox(
 		not_null<PeerData*> peer,
-		Fn<void(not_null<UserData*>)> callback,
+		Fn<void(not_null<PeerData*>)> callback,
 		Fn<void()> closedCallback) {
 	auto createController = [
 		peer,
@@ -47,33 +47,33 @@ void ShowSearchFromBox(
 
 SearchFromController::SearchFromController(
 	not_null<PeerData*> peer,
-	Fn<void(not_null<UserData*>)> callback)
+	Fn<void(not_null<PeerData*>)> callback)
 : AddSpecialBoxController(
 	peer,
 	ParticipantsBoxController::Role::Members,
 	AdminDoneCallback(),
 	BannedDoneCallback())
-, _callback(std::move(callback))
-{
+, _callback(std::move(callback)) {
 	_excludeSelf = false;
 }
 
 void SearchFromController::prepare() {
 	AddSpecialBoxController::prepare();
 	delegate()->peerListSetTitle(tr::lng_search_messages_from());
-}
-
-void SearchFromController::rowClicked(not_null<PeerListRow*> row) {
-	Expects(row->peer()->isUser());
-
-	if (const auto onstack = base::duplicate(_callback)) {
-		onstack(row->peer()->asUser());
+	if (const auto megagroup = peer()->asMegagroup()) {
+		if (!delegate()->peerListFindRow(megagroup->id)) {
+			delegate()->peerListAppendRow(
+				std::make_unique<PeerListRow>(megagroup));
+			setDescriptionText({});
+			delegate()->peerListRefreshRows();
+		}
 	}
 }
 
-std::unique_ptr<PeerListRow> SearchFromController::createRow(
-		not_null<UserData*> user) const {
-	return std::make_unique<PeerListRow>(user);
+void SearchFromController::rowClicked(not_null<PeerListRow*> row) {
+	if (const auto onstack = base::duplicate(_callback)) {
+		onstack(row->peer());
+	}
 }
 
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h
index 709353bb5..f095ae566 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.h
@@ -14,23 +14,20 @@ namespace Dialogs {
 
 void ShowSearchFromBox(
 	not_null<PeerData*> peer,
-	Fn<void(not_null<UserData*>)> callback,
+	Fn<void(not_null<PeerData*>)> callback,
 	Fn<void()> closedCallback);
 
 class SearchFromController : public AddSpecialBoxController {
 public:
 	SearchFromController(
 		not_null<PeerData*> peer,
-		Fn<void(not_null<UserData*>)> callback);
+		Fn<void(not_null<PeerData*>)> callback);
 
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
 
-protected:
-	std::unique_ptr<PeerListRow> createRow(not_null<UserData*> user) const;
-
 private:
-	Fn<void(not_null<UserData*>)> _callback;
+	Fn<void(not_null<PeerData*>)> _callback;
 
 };
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 3e00d4b87..731a4f957 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -208,8 +208,8 @@ Widget::Widget(
 	connect(_inner, SIGNAL(completeHashtag(QString)), this, SLOT(onCompleteHashtag(QString)));
 	connect(_inner, SIGNAL(refreshHashtags()), this, SLOT(onFilterCursorMoved()));
 	connect(_inner, SIGNAL(cancelSearchInChat()), this, SLOT(onCancelSearchInChat()));
-	subscribe(_inner->searchFromUserChanged, [this](UserData *user) {
-		setSearchInChat(_searchInChat, user);
+	subscribe(_inner->searchFromUserChanged, [this](PeerData *from) {
+		setSearchInChat(_searchInChat, from);
 		applyFilterUpdate(true);
 	});
 	_inner->chosenRow(
@@ -789,7 +789,7 @@ void Widget::onDraggingScrollTimer() {
 bool Widget::onSearchMessages(bool searchCache) {
 	auto result = false;
 	auto q = _filter->getLastText().trimmed();
-	if (q.isEmpty() && !_searchFromUser) {
+	if (q.isEmpty() && !_searchFromAuthor) {
 		cancelSearchRequest();
 		_api.request(base::take(_peerSearchRequest)).cancel();
 		return true;
@@ -804,7 +804,7 @@ bool Widget::onSearchMessages(bool searchCache) {
 		const auto i = _searchCache.find(q);
 		if (i != _searchCache.end()) {
 			_searchQuery = q;
-			_searchQueryFrom = _searchFromUser;
+			_searchQueryFrom = _searchFromAuthor;
 			_searchNextRate = 0;
 			_searchFull = _searchFullMigrated = false;
 			cancelSearchRequest();
@@ -816,9 +816,9 @@ bool Widget::onSearchMessages(bool searchCache) {
 				0);
 			result = true;
 		}
-	} else if (_searchQuery != q || _searchQueryFrom != _searchFromUser) {
+	} else if (_searchQuery != q || _searchQueryFrom != _searchFromAuthor) {
 		_searchQuery = q;
-		_searchQueryFrom = _searchFromUser;
+		_searchQueryFrom = _searchFromAuthor;
 		_searchNextRate = 0;
 		_searchFull = _searchFullMigrated = false;
 		cancelSearchRequest();
@@ -836,8 +836,8 @@ bool Widget::onSearchMessages(bool searchCache) {
 					peer->input,
 					MTP_string(_searchQuery),
 					(_searchQueryFrom
-						? _searchQueryFrom->inputUser
-						: MTP_inputUserEmpty()),
+						? _searchQueryFrom->input
+						: MTP_inputPeerEmpty()),
 					MTPint(), // top_msg_id
 					MTP_inputMessagesFilterEmpty(),
 					MTP_int(0),
@@ -1009,8 +1009,8 @@ void Widget::onSearchMore() {
 					peer->input,
 					MTP_string(_searchQuery),
 					(_searchQueryFrom
-						? _searchQueryFrom->inputUser
-						: MTP_inputUserEmpty()),
+						? _searchQueryFrom->input
+						: MTP_inputPeerEmpty()),
 					MTPint(), // top_msg_id
 					MTP_inputMessagesFilterEmpty(),
 					MTP_int(0),
@@ -1103,8 +1103,8 @@ void Widget::onSearchMore() {
 				_searchInMigrated->peer->input,
 				MTP_string(_searchQuery),
 				(_searchQueryFrom
-					? _searchQueryFrom->inputUser
-					: MTP_inputUserEmpty()),
+					? _searchQueryFrom->input
+					: MTP_inputPeerEmpty()),
 				MTPint(), // top_msg_id
 				MTP_inputMessagesFilterEmpty(),
 				MTP_int(0),
@@ -1380,7 +1380,7 @@ void Widget::applyFilterUpdate(bool force) {
 
 	auto filterText = _filter->getLastText();
 	_inner->applyFilterUpdate(filterText, force);
-	if (filterText.isEmpty() && !_searchFromUser) {
+	if (filterText.isEmpty() && !_searchFromAuthor) {
 		clearSearchCache();
 	}
 	_cancelSearch->toggle(!filterText.isEmpty(), anim::type::normal);
@@ -1395,7 +1395,7 @@ void Widget::applyFilterUpdate(bool force) {
 		_peerSearchQuery = QString();
 	}
 
-	if (_chooseFromUser->toggled() || _searchFromUser) {
+	if (_chooseFromUser->toggled() || _searchFromAuthor) {
 		auto switchToChooseFrom = SwitchToChooseFromQuery();
 		if (_lastFilterText != switchToChooseFrom
 			&& switchToChooseFrom.startsWith(_lastFilterText)
@@ -1412,7 +1412,7 @@ void Widget::searchInChat(Key chat) {
 	applyFilterUpdate(true);
 }
 
-void Widget::setSearchInChat(Key chat, UserData *from) {
+void Widget::setSearchInChat(Key chat, PeerData *from) {
 	if (chat.folder()) {
 		chat = Key();
 	}
@@ -1433,13 +1433,13 @@ void Widget::setSearchInChat(Key chat, UserData *from) {
 	} else if (!_searchInChat) {
 		from = nullptr;
 	}
-	if (_searchFromUser != from || searchInPeerUpdated) {
-		_searchFromUser = from;
+	if (_searchFromAuthor != from || searchInPeerUpdated) {
+		_searchFromAuthor = from;
 		updateSearchFromVisibility();
 		clearSearchCache();
 	}
-	_inner->searchInChat(_searchInChat, _searchFromUser);
-	if (_searchFromUser && _lastFilterText == SwitchToChooseFromQuery()) {
+	_inner->searchInChat(_searchInChat, _searchFromAuthor);
+	if (_searchFromAuthor && _lastFilterText == SwitchToChooseFromQuery()) {
 		onCancelSearch();
 	}
 	_filter->setFocus();
@@ -1467,9 +1467,9 @@ void Widget::showSearchFrom() {
 		const auto chat = _searchInChat;
 		ShowSearchFromBox(
 			peer,
-			crl::guard(this, [=](not_null<UserData*> user) {
+			crl::guard(this, [=](not_null<PeerData*> from) {
 				Ui::hideLayer();
-				setSearchInChat(chat, user);
+				setSearchInChat(chat, from);
 				applyFilterUpdate(true);
 			}),
 			crl::guard(this, [=] { _filter->setFocus(); }));
@@ -1558,7 +1558,7 @@ void Widget::updateSearchFromVisibility(bool fast) {
 	auto visible = [&] {
 		if (const auto peer = _searchInChat.peer()) {
 			if (peer->isChat() || peer->isMegagroup()) {
-				return !_searchFromUser;
+				return !_searchFromAuthor;
 			}
 		}
 		return false;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index f50b5b9e2..271754f09 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -141,7 +141,7 @@ private:
 	void setupConnectingWidget();
 	void setupMainMenuToggle();
 	bool searchForPeersRequired(const QString &query) const;
-	void setSearchInChat(Key chat, UserData *from = nullptr);
+	void setSearchInChat(Key chat, PeerData *from = nullptr);
 	void showJumpToDate();
 	void showSearchFrom();
 	void showMainMenu();
@@ -212,7 +212,7 @@ private:
 	Data::Folder *_openedFolder = nullptr;
 	Dialogs::Key _searchInChat;
 	History *_searchInMigrated = nullptr;
-	UserData *_searchFromUser = nullptr;
+	PeerData *_searchFromAuthor = nullptr;
 	QString _lastFilterText;
 
 	QTimer _searchTimer;
@@ -222,7 +222,7 @@ private:
 	mtpRequestId _peerSearchRequest = 0;
 
 	QString _searchQuery;
-	UserData *_searchQueryFrom = nullptr;
+	PeerData *_searchQueryFrom = nullptr;
 	int32 _searchNextRate = 0;
 	bool _searchFull = false;
 	bool _searchFullMigrated = false;
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index 260865f3c..3819cbec1 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -1094,6 +1094,12 @@ ServiceAction ParseServiceAction(
 		result.content = content;
 	}, [&](const MTPDmessageActionContactSignUp &data) {
 		result.content = ActionContactSignUp();
+	}, [&](const MTPDmessageActionGeoProximityReached &data) {
+		auto content = ActionGeoProximityReached();
+		content.fromId = ParsePeerId(data.vfrom_id());
+		content.toId = ParsePeerId(data.vto_id());
+		content.distance = data.vdistance().v;
+		result.content = content;
 	}, [](const MTPDmessageActionEmpty &data) {});
 	return result;
 }
diff --git a/Telegram/SourceFiles/export/data/export_data_types.h b/Telegram/SourceFiles/export/data/export_data_types.h
index 06fc860ba..70fbf56af 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.h
+++ b/Telegram/SourceFiles/export/data/export_data_types.h
@@ -450,6 +450,12 @@ struct ActionContactSignUp {
 struct ActionPhoneNumberRequest {
 };
 
+struct ActionGeoProximityReached {
+	PeerId fromId = 0;
+	PeerId toId = 0;
+	int distance = 0;
+};
+
 struct ServiceAction {
 	std::variant<
 		v::null_t,
@@ -473,7 +479,8 @@ struct ServiceAction {
 		ActionBotAllowed,
 		ActionSecureValuesSent,
 		ActionContactSignUp,
-		ActionPhoneNumberRequest> content;
+		ActionPhoneNumberRequest,
+		ActionGeoProximityReached> content;
 };
 
 ServiceAction ParseServiceAction(
diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
index 88caefa00..b317617e0 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
@@ -1429,7 +1429,7 @@ void ApiWrap::requestChatMessages(
 			MTP_flags(MTPmessages_Search::Flag::f_from_id),
 			realPeerInput,
 			MTP_string(), // query
-			_user,
+			MTP_inputPeerSelf(),
 			MTPint(), // top_msg_id
 			MTP_inputMessagesFilterEmpty(),
 			MTP_int(0), // min_date
diff --git a/Telegram/SourceFiles/export/output/export_output_html.cpp b/Telegram/SourceFiles/export/output/export_output_html.cpp
index 61b692d35..c527decca 100644
--- a/Telegram/SourceFiles/export/output/export_output_html.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_html.cpp
@@ -1092,6 +1092,8 @@ auto HtmlWriter::Wrap::pushMessage(
 			+ SerializeList(list);
 	}, [&](const ActionContactSignUp &data) {
 		return serviceFrom + " joined Telegram";
+	}, [&](const ActionGeoProximityReached &data) {
+		return serviceFrom + " reached"; // #TODO files distance from to
 	}, [&](const ActionPhoneNumberRequest &data) {
 		return serviceFrom + " requested your phone number";
 	}, [](v::null_t) { return QByteArray(); });
diff --git a/Telegram/SourceFiles/export/output/export_output_json.cpp b/Telegram/SourceFiles/export/output/export_output_json.cpp
index 4989e1608..20d6169b5 100644
--- a/Telegram/SourceFiles/export/output/export_output_json.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_json.cpp
@@ -473,6 +473,9 @@ QByteArray SerializeMessage(
 	}, [&](const ActionContactSignUp &data) {
 		pushActor();
 		pushAction("joined_telegram");
+	}, [&](const ActionGeoProximityReached &data) {
+		pushActor();
+		pushAction("proximity_reached"); // #TODO files distance from to
 	}, [&](const ActionPhoneNumberRequest &data) {
 		pushActor();
 		pushAction("requested_phone_number");
diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index 1ea514dfe..b3e61a7cf 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -260,6 +260,8 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 		return prepareSecureValuesSent(data);
 	}, [&](const MTPDmessageActionContactSignUp &data) {
 		return prepareContactSignUp();
+	}, [&](const MTPDmessageActionGeoProximityReached &data) {
+		return PreparedText{ tr::lng_message_empty(tr::now) }; // #TODO files
 	}, [](const MTPDmessageActionPaymentSentMe &) {
 		LOG(("API Error: messageActionPaymentSentMe received."));
 		return PreparedText{ tr::lng_message_empty(tr::now) };
diff --git a/Telegram/SourceFiles/storage/download_manager_mtproto.cpp b/Telegram/SourceFiles/storage/download_manager_mtproto.cpp
index 093d4c01e..4ba4a9ce9 100644
--- a/Telegram/SourceFiles/storage/download_manager_mtproto.cpp
+++ b/Telegram/SourceFiles/storage/download_manager_mtproto.cpp
@@ -541,8 +541,10 @@ mtpRequestId DownloadMtprotoTask::sendRequest(
 		return api().request(MTPupload_GetWebFile(
 			MTP_inputWebFileGeoPointLocation(
 				MTP_inputGeoPoint(
+					MTP_flags(0),
 					MTP_double(location.lat),
-					MTP_double(location.lon)),
+					MTP_double(location.lon),
+					MTP_int(0)), // accuracy_radius
 				MTP_long(location.access),
 				MTP_int(location.width),
 				MTP_int(location.height),

From 399b03beb20cb14841a5d610211f940dbc2cbd3a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 6 Oct 2020 21:27:26 +0300
Subject: [PATCH 077/190] Implement multi-song albums display.

---
 .../SourceFiles/data/data_media_types.cpp     |   2 +-
 .../history/view/history_view_message.cpp     | 141 ++++++++++++++++--
 .../view/media/history_view_document.cpp      | 125 ++++++++++++----
 .../view/media/history_view_document.h        |  32 ++++
 .../history/view/media/history_view_media.h   |  11 ++
 .../view/media/history_view_media_grouped.cpp |  91 +++++++++--
 .../view/media/history_view_media_grouped.h   |  16 +-
 7 files changed, 357 insertions(+), 61 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index d332394a7..6c2301ea8 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -465,7 +465,7 @@ Storage::SharedMediaTypesMask MediaFile::sharedMediaTypes() const {
 }
 
 bool MediaFile::canBeGrouped() const {
-	return _document->isVideoFile();
+	return _document->isVideoFile() || _document->isSong();
 }
 
 bool MediaFile::hasReplyPreview() const {
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 9121cf3f4..ab556e3a9 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -138,27 +138,101 @@ QString FastReplyText() {
 	return tr::lng_fast_reply(tr::now);
 }
 
-void PaintBubble(Painter &p, QRect rect, int outerWidth, bool selected, bool outbg, RectPart tailSide) {
+void PaintBubble(Painter &p, QRect rect, int outerWidth, bool selected, bool outbg, RectPart tailSide, RectParts skip) {
 	auto &bg = selected ? (outbg ? st::msgOutBgSelected : st::msgInBgSelected) : (outbg ? st::msgOutBg : st::msgInBg);
-	auto &sh = selected ? (outbg ? st::msgOutShadowSelected : st::msgInShadowSelected) : (outbg ? st::msgOutShadow : st::msgInShadow);
+	auto sh = &(selected ? (outbg ? st::msgOutShadowSelected : st::msgInShadowSelected) : (outbg ? st::msgOutShadow : st::msgInShadow));
 	auto cors = selected ? (outbg ? MessageOutSelectedCorners : MessageInSelectedCorners) : (outbg ? MessageOutCorners : MessageInCorners);
-	auto parts = RectPart::FullTop | RectPart::NoTopBottom | RectPart::Bottom;
+	auto parts = RectPart::None | RectPart::NoTopBottom;
+	if (skip & RectPart::Top) {
+		if (skip & RectPart::Bottom) {
+			p.fillRect(rect, bg);
+			return;
+		}
+		rect.setTop(rect.y() - st::historyMessageRadius);
+	} else {
+		parts |= RectPart::FullTop;
+	}
+	if (skip & RectPart::Bottom) {
+		rect.setHeight(rect.height() + st::historyMessageRadius);
+		sh = nullptr;
+		tailSide = RectPart::None;
+	} else {
+		parts |= RectPart::Bottom;
+	}
 	if (tailSide == RectPart::Right) {
 		parts |= RectPart::BottomLeft;
 		p.fillRect(rect.x() + rect.width() - st::historyMessageRadius, rect.y() + rect.height() - st::historyMessageRadius, st::historyMessageRadius, st::historyMessageRadius, bg);
 		auto &tail = selected ? st::historyBubbleTailOutRightSelected : st::historyBubbleTailOutRight;
 		tail.paint(p, rect.x() + rect.width(), rect.y() + rect.height() - tail.height(), outerWidth);
-		p.fillRect(rect.x() + rect.width() - st::historyMessageRadius, rect.y() + rect.height(), st::historyMessageRadius + tail.width(), st::msgShadow, sh);
+		p.fillRect(rect.x() + rect.width() - st::historyMessageRadius, rect.y() + rect.height(), st::historyMessageRadius + tail.width(), st::msgShadow, *sh);
 	} else if (tailSide == RectPart::Left) {
 		parts |= RectPart::BottomRight;
 		p.fillRect(rect.x(), rect.y() + rect.height() - st::historyMessageRadius, st::historyMessageRadius, st::historyMessageRadius, bg);
 		auto &tail = selected ? (outbg ? st::historyBubbleTailOutLeftSelected : st::historyBubbleTailInLeftSelected) : (outbg ? st::historyBubbleTailOutLeft : st::historyBubbleTailInLeft);
 		tail.paint(p, rect.x() - tail.width(), rect.y() + rect.height() - tail.height(), outerWidth);
-		p.fillRect(rect.x() - tail.width(), rect.y() + rect.height(), st::historyMessageRadius + tail.width(), st::msgShadow, sh);
-	} else {
+		p.fillRect(rect.x() - tail.width(), rect.y() + rect.height(), st::historyMessageRadius + tail.width(), st::msgShadow, *sh);
+	} else if (!(skip & RectPart::Bottom)) {
 		parts |= RectPart::FullBottom;
 	}
-	App::roundRect(p, rect, bg, cors, &sh, parts);
+	App::roundRect(p, rect, bg, cors, sh, parts);
+}
+
+void PaintBubble(Painter &p, QRect rect, int outerWidth, bool selected, const std::vector<BubbleSelectionInterval> &selection, bool outbg, RectPart tailSide) {
+	if (selection.empty()) {
+		PaintBubble(
+			p,
+			rect,
+			outerWidth,
+			selected,
+			outbg,
+			tailSide,
+			RectPart::None);
+		return;
+	}
+	const auto left = rect.x();
+	const auto width = rect.width();
+	const auto top = rect.y();
+	const auto bottom = top + rect.height();
+	auto from = top;
+	for (const auto &selected : selection) {
+		if (selected.top > from) {
+			const auto skip = RectPart::Bottom
+				| (from > top ? RectPart::Top : RectPart::None);
+			PaintBubble(
+				p,
+				QRect(left, from, width, selected.top - from),
+				outerWidth,
+				false,
+				outbg,
+				tailSide,
+				skip);
+		}
+		const auto skip = ((selected.top > top)
+			? RectPart::Top
+			: RectPart::None)
+			| ((selected.top + selected.height < bottom)
+				? RectPart::Bottom
+				: RectPart::None);
+		PaintBubble(
+			p,
+			QRect(left, selected.top, width, selected.height),
+			outerWidth,
+			true,
+			outbg,
+			tailSide,
+			skip);
+		from = selected.top + selected.height;
+	}
+	if (from < bottom) {
+		PaintBubble(
+			p,
+			QRect(left, from, width, bottom - from),
+			outerWidth,
+			false,
+			outbg,
+			tailSide,
+			RectPart::Top);
+	}
 }
 
 style::color FromNameFg(PeerId peerId, bool selected) {
@@ -535,20 +609,52 @@ void Message::draw(
 		auto entry = logEntryOriginal();
 		auto mediaDisplayed = media && media->isDisplayed();
 
+		// Entry page is always a bubble bottom.
+		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/);
+		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
+
+
+		auto mediaSelectionIntervals = (!selected && mediaDisplayed)
+			? media->getBubbleSelectionIntervals(selection)
+			: std::vector<BubbleSelectionInterval>();
+		if (!mediaSelectionIntervals.empty()) {
+			auto localMediaBottom = g.top() + g.height();
+			if (data()->repliesAreComments() || data()->externalReply()) {
+				localMediaBottom -= st::historyCommentsButtonHeight;
+			}
+			if (!mediaOnBottom) {
+				localMediaBottom -= st::msgPadding.bottom();
+			}
+			if (entry) {
+				localMediaBottom -= entry->height();
+			}
+			const auto localMediaTop = localMediaBottom - media->height();
+			for (auto &[top, height] : mediaSelectionIntervals) {
+				top += localMediaTop;
+			}
+		}
+
 		auto skipTail = isAttachedToNext()
 			|| (media && media->skipBubbleTail())
 			|| (keyboard != nullptr)
 			|| (context() == Context::Replies && data()->isDiscussionPost());
-		auto displayTail = skipTail ? RectPart::None : (outbg && !Core::App().settings().chatWide()) ? RectPart::Right : RectPart::Left;
-		PaintBubble(p, g, width(), selected, outbg, displayTail);
+		auto displayTail = skipTail
+			? RectPart::None
+			: (outbg && !Core::App().settings().chatWide())
+			? RectPart::Right
+			: RectPart::Left;
+		PaintBubble(
+			p,
+			g,
+			width(),
+			selected,
+			mediaSelectionIntervals,
+			outbg,
+			displayTail);
 
 		auto inner = g;
 		paintCommentsButton(p, inner, selected);
 
-		// Entry page is always a bubble bottom.
-		auto mediaOnBottom = (mediaDisplayed && media->isBubbleBottom()) || (entry/* && entry->isBubbleBottom()*/);
-		auto mediaOnTop = (mediaDisplayed && media->isBubbleTop()) || (entry && entry->isBubbleTop());
-
 		auto trect = inner.marginsRemoved(st::msgPadding);
 		if (mediaOnBottom) {
 			trect.setHeight(trect.height() + st::msgPadding.bottom());
@@ -591,11 +697,16 @@ void Message::draw(
 				? !media->customInfoLayout()
 				: true);
 		if (needDrawInfo) {
-			drawInfo(p, inner.left() + inner.width(), inner.top() + inner.height(), 2 * inner.left() + inner.width(), selected, InfoDisplayType::Default);
+			const auto bottomSelected = selected
+				|| (!mediaSelectionIntervals.empty()
+					&& (mediaSelectionIntervals.back().top
+						+ mediaSelectionIntervals.back().height
+						>= inner.y() + inner.height()));
+			drawInfo(p, inner.left() + inner.width(), inner.top() + inner.height(), 2 * inner.left() + inner.width(), bottomSelected, InfoDisplayType::Default);
 			if (g != inner) {
 				const auto o = p.opacity();
 				p.setOpacity(0.3);
-				const auto color = selected
+				const auto color = bottomSelected
 					? (outbg ? st::msgOutDateFgSelected : st::msgInDateFgSelected)
 					: (outbg ? st::msgOutDateFg : st::msgInDateFg);
 				p.fillRect(inner.left(), inner.top() + inner.height() - st::lineWidth, inner.width(), st::lineWidth, color);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 785998a76..158f2c71e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -247,8 +247,21 @@ QSize Document::countCurrentSize(int newWidth) {
 	return { newWidth, newHeight };
 }
 
-void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms) const {
-	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) return;
+void Document::draw(
+		Painter &p,
+		const QRect &r,
+		TextSelection selection,
+		crl::time ms) const {
+	draw(p, width(), selection, ms, LayoutMode::Full);
+}
+
+void Document::draw(
+		Painter &p,
+		int width,
+		TextSelection selection,
+		crl::time ms,
+		LayoutMode mode) const {
+	if (width < st::msgPadding.left() + st::msgPadding.right() + 1) return;
 
 	ensureDataMediaCreated();
 
@@ -260,7 +273,7 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
 	bool loaded = dataLoaded(), displayLoading = _data->displayLoading();
 	bool selected = (selection == FullSelection);
 
-	int captionw = width() - st::msgPadding.left() - st::msgPadding.right();
+	int captionw = width - st::msgPadding.left() - st::msgPadding.right();
 	auto outbg = _parent->hasOutLayout();
 
 	if (displayLoading) {
@@ -284,7 +297,7 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
 
 		auto inWebPage = (_parent->media() != this);
 		auto roundRadius = inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
-		QRect rthumb(style::rtlrect(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus, st::msgFileThumbSize, st::msgFileThumbSize, width()));
+		QRect rthumb(style::rtlrect(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus, st::msgFileThumbSize, st::msgFileThumbSize, width));
 		QPixmap thumb;
 		if (const auto normal = _dataMedia->thumbnail()) {
 			thumb = normal->pixSingle(thumbed->_thumbw, 0, st::msgFileThumbSize, st::msgFileThumbSize, roundRadius);
@@ -339,7 +352,7 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
 			bool over = ClickHandler::showAsActive(lnk);
 			p.setFont(over ? st::semiboldFont->underline() : st::semiboldFont);
 			p.setPen(outbg ? (selected ? st::msgFileThumbLinkOutFgSelected : st::msgFileThumbLinkOutFg) : (selected ? st::msgFileThumbLinkInFgSelected : st::msgFileThumbLinkInFg));
-			p.drawTextLeft(nameleft, linktop, width(), thumbed->_link, thumbed->_linkw);
+			p.drawTextLeft(nameleft, linktop, width, thumbed->_link, thumbed->_linkw);
 		}
 	} else {
 		nameleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
@@ -348,7 +361,7 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
 		statustop = st::msgFileStatusTop - topMinus;
 		bottom = st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom() - topMinus;
 
-		QRect inner(style::rtlrect(st::msgFilePadding.left(), st::msgFilePadding.top() - topMinus, st::msgFileSize, st::msgFileSize, width()));
+		QRect inner(style::rtlrect(st::msgFilePadding.left(), st::msgFilePadding.top() - topMinus, st::msgFileSize, st::msgFileSize, width));
 		p.setPen(Qt::NoPen);
 		if (selected) {
 			p.setBrush(outbg ? st::msgFileOutBgSelected : st::msgFileInBgSelected);
@@ -386,7 +399,7 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
 
 		drawCornerDownload(p, selected);
 	}
-	auto namewidth = width() - nameleft - nameright;
+	auto namewidth = width - nameleft - nameright;
 	auto statuswidth = namewidth;
 
 	auto voiceStatusOverride = QString();
@@ -470,9 +483,9 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
 		p.setFont(st::semiboldFont);
 		p.setPen(outbg ? (selected ? st::historyFileNameOutFgSelected : st::historyFileNameOutFg) : (selected ? st::historyFileNameInFgSelected : st::historyFileNameInFg));
 		if (namewidth < named->_namew) {
-			p.drawTextLeft(nameleft, nametop, width(), st::semiboldFont->elided(named->_name, namewidth, Qt::ElideMiddle));
+			p.drawTextLeft(nameleft, nametop, width, st::semiboldFont->elided(named->_name, namewidth, Qt::ElideMiddle));
 		} else {
-			p.drawTextLeft(nameleft, nametop, width(), named->_name, named->_namew);
+			p.drawTextLeft(nameleft, nametop, width, named->_name, named->_namew);
 		}
 	}
 
@@ -480,7 +493,7 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
 	auto status = outbg ? (selected ? st::mediaOutFgSelected : st::mediaOutFg) : (selected ? st::mediaInFgSelected : st::mediaInFg);
 	p.setFont(st::normalFont);
 	p.setPen(status);
-	p.drawTextLeft(nameleft, statustop, width(), statusText);
+	p.drawTextLeft(nameleft, statustop, width, statusText);
 
 	if (_parent->data()->hasUnreadMediaFlag()) {
 		auto w = st::normalFont->width(statusText);
@@ -490,14 +503,16 @@ void Document::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
 
 			{
 				PainterHighQualityEnabler hq(p);
-				p.drawEllipse(style::rtlrect(nameleft + w + st::mediaUnreadSkip, statustop + st::mediaUnreadTop, st::mediaUnreadSize, st::mediaUnreadSize, width()));
+				p.drawEllipse(style::rtlrect(nameleft + w + st::mediaUnreadSkip, statustop + st::mediaUnreadTop, st::mediaUnreadSize, st::mediaUnreadSize, width));
 			}
 		}
 	}
 
-	if (auto captioned = Get<HistoryDocumentCaptioned>()) {
-		p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
-		captioned->_caption.draw(p, st::msgPadding.left(), bottom, captionw, style::al_left, 0, -1, selection);
+	if (mode == LayoutMode::Full) {
+		if (auto captioned = Get<HistoryDocumentCaptioned>()) {
+			p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
+			captioned->_caption.draw(p, st::msgPadding.left(), bottom, captionw, style::al_left, 0, -1, selection);
+		}
 	}
 }
 
@@ -587,9 +602,20 @@ TextState Document::cornerDownloadTextState(
 }
 
 TextState Document::textState(QPoint point, StateRequest request) const {
+	return textState(point, { width(), height() }, request, LayoutMode::Full);
+}
+
+TextState Document::textState(
+		QPoint point,
+		QSize layout,
+		StateRequest request,
+		LayoutMode mode) const {
+	const auto width = layout.width();
+	const auto height = layout.height();
+
 	auto result = TextState(_parent);
 
-	if (width() < st::msgPadding.left() + st::msgPadding.right() + 1) {
+	if (width < st::msgPadding.left() + st::msgPadding.right() + 1) {
 		return result;
 	}
 
@@ -607,14 +633,14 @@ TextState Document::textState(QPoint point, StateRequest request) const {
 		linktop = st::msgFileThumbLinkTop - topMinus;
 		bottom = st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom() - topMinus;
 
-		QRect rthumb(style::rtlrect(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus, st::msgFileThumbSize, st::msgFileThumbSize, width()));
+		QRect rthumb(style::rtlrect(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus, st::msgFileThumbSize, st::msgFileThumbSize, width));
 		if ((_data->loading() || _data->uploading()) && rthumb.contains(point)) {
 			result.link = _cancell;
 			return result;
 		}
 
 		if (_data->status != FileUploadFailed) {
-			if (style::rtlrect(nameleft, linktop, thumbed->_linkw, st::semiboldFont->height, width()).contains(point)) {
+			if (style::rtlrect(nameleft, linktop, thumbed->_linkw, st::semiboldFont->height, width).contains(point)) {
 				result.link = (_data->loading() || _data->uploading())
 					? thumbed->_linkcancell
 					: dataLoaded()
@@ -632,7 +658,7 @@ TextState Document::textState(QPoint point, StateRequest request) const {
 		if (const auto state = cornerDownloadTextState(point, request); state.link) {
 			return state;
 		}
-		QRect inner(style::rtlrect(st::msgFilePadding.left(), st::msgFilePadding.top() - topMinus, st::msgFileSize, st::msgFileSize, width()));
+		QRect inner(style::rtlrect(st::msgFilePadding.left(), st::msgFilePadding.top() - topMinus, st::msgFileSize, st::msgFileSize, width));
 		if ((_data->loading() || _data->uploading()) && inner.contains(point) && !downloadInCorner()) {
 			result.link = _cancell;
 			return result;
@@ -640,7 +666,7 @@ TextState Document::textState(QPoint point, StateRequest request) const {
 	}
 
 	if (const auto voice = Get<HistoryDocumentVoice>()) {
-		auto namewidth = width() - nameleft - nameright;
+		auto namewidth = width - nameleft - nameright;
 		auto waveformbottom = st::msgFilePadding.top() - topMinus + st::msgWaveformMax + st::msgWaveformMin;
 		if (QRect(nameleft, nametop, namewidth, waveformbottom - nametop).contains(point)) {
 			const auto state = ::Media::Player::instance()->getState(AudioMsgId::Type::Voice);
@@ -655,22 +681,24 @@ TextState Document::textState(QPoint point, StateRequest request) const {
 		}
 	}
 
-	auto painth = height();
-	if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
-		if (point.y() >= bottom) {
-			result = TextState(_parent, captioned->_caption.getState(
-				point - QPoint(st::msgPadding.left(), bottom),
-				width() - st::msgPadding.left() - st::msgPadding.right(),
-				request.forText()));
-			return result;
-		}
-		auto captionw = width() - st::msgPadding.left() - st::msgPadding.right();
-		painth -= captioned->_caption.countHeight(captionw);
-		if (isBubbleBottom()) {
-			painth -= st::msgPadding.bottom();
+	auto painth = layout.height();
+	if (mode == LayoutMode::Full) {
+		if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
+			if (point.y() >= bottom) {
+				result = TextState(_parent, captioned->_caption.getState(
+					point - QPoint(st::msgPadding.left(), bottom),
+					width - st::msgPadding.left() - st::msgPadding.right(),
+					request.forText()));
+				return result;
+			}
+			auto captionw = width - st::msgPadding.left() - st::msgPadding.right();
+			painth -= captioned->_caption.countHeight(captionw);
+			if (isBubbleBottom()) {
+				painth -= st::msgPadding.bottom();
+			}
 		}
 	}
-	if (QRect(0, 0, width(), painth).contains(point)
+	if (QRect(0, 0, width, painth).contains(point)
 		&& (!_data->loading() || downloadInCorner())
 		&& !_data->uploading()
 		&& !_data->isNull()) {
@@ -831,6 +859,37 @@ bool Document::hideForwardedFrom() const {
 	return _data->isSong();
 }
 
+QSize Document::sizeForGrouping() const {
+	const auto height = st::msgFilePadding.top()
+		+ st::msgFileSize
+		+ st::msgFilePadding.bottom();
+	return { maxWidth(), height };
+}
+
+void Document::drawGrouped(
+		Painter &p,
+		const QRect &clip,
+		TextSelection selection,
+		crl::time ms,
+		const QRect &geometry,
+		RectParts sides,
+		RectParts corners,
+		not_null<uint64*> cacheKey,
+		not_null<QPixmap*> cache) const {
+	p.translate(geometry.topLeft());
+	draw(p, geometry.width(), selection, ms, LayoutMode::Grouped);
+	p.translate(-geometry.topLeft());
+}
+
+TextState Document::getStateGrouped(
+		const QRect &geometry,
+		RectParts sides,
+		QPoint point,
+		StateRequest request) const {
+	point -= geometry.topLeft();
+	return textState(point, geometry.size(), request, LayoutMode::Grouped);
+}
+
 bool Document::voiceProgressAnimationCallback(crl::time now) {
 	if (anim::Disabled()) {
 		now += (2 * kAudioVoiceMsgUpdateView);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.h b/Telegram/SourceFiles/history/view/media/history_view_document.h
index c024d04c8..5f7dc99ec 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.h
@@ -61,6 +61,23 @@ public:
 	QMargins bubbleMargins() const override;
 	bool hideForwardedFrom() const override;
 
+	QSize sizeForGrouping() const override;
+	void drawGrouped(
+		Painter &p,
+		const QRect &clip,
+		TextSelection selection,
+		crl::time ms,
+		const QRect &geometry,
+		RectParts sides,
+		RectParts corners,
+		not_null<uint64*> cacheKey,
+		not_null<QPixmap*> cache) const override;
+	TextState getStateGrouped(
+		const QRect &geometry,
+		RectParts sides,
+		QPoint point,
+		StateRequest request) const override;
+
 	bool voiceProgressAnimationCallback(crl::time now);
 
 	void clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed) override;
@@ -82,7 +99,22 @@ private:
 		bool showPause = false;
 		int realDuration = 0;
 	};
+	enum class LayoutMode {
+		Full,
+		Grouped,
+	};
 
+	void draw(
+		Painter &p,
+		int width,
+		TextSelection selection,
+		crl::time ms,
+		LayoutMode mode) const;
+	[[nodiscard]] TextState textState(
+		QPoint point,
+		QSize layout,
+		StateRequest request,
+		LayoutMode mode) const;
 	void ensureDataMediaCreated() const;
 
 	[[nodiscard]] Ui::Text::String createCaption();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.h b/Telegram/SourceFiles/history/view/media/history_view_media.h
index 98be50118..e0a227430 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.h
@@ -45,6 +45,11 @@ enum class MediaInBubbleState {
 	Bottom,
 };
 
+struct BubbleSelectionInterval {
+	int top = 0;
+	int height = 0;
+};
+
 [[nodiscard]] QString DocumentTimestampLinkBase(
 	not_null<DocumentData*> document,
 	FullMsgId context);
@@ -116,6 +121,12 @@ public:
 	[[nodiscard]] TextSelection unskipSelection(
 		TextSelection selection) const;
 
+	[[nodiscard]] virtual auto getBubbleSelectionIntervals(
+		TextSelection selection) const
+	-> std::vector<BubbleSelectionInterval> {
+		return {};
+	}
+
 	// if we press and drag this link should we drag the item
 	[[nodiscard]] virtual bool dragItemByHandler(
 		const ClickHandlerPtr &p) const = 0;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
index f724353b1..3e567220b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -22,6 +22,32 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_history.h"
 
 namespace HistoryView {
+namespace {
+
+std::vector<Ui::GroupMediaLayout> LayoutPlaylist(
+		const std::vector<QSize> &sizes) {
+	Expects(!sizes.empty());
+
+	auto result = std::vector<Ui::GroupMediaLayout>();
+	result.reserve(sizes.size());
+	const auto width = ranges::max_element(
+		sizes,
+		std::less<>(),
+		&QSize::width)->width();
+	auto top = 0;
+	for (const auto &size : sizes) {
+		result.push_back({
+			.geometry = QRect(0, top, width, size.height()),
+			.sides = RectPart::Left | RectPart::Right
+		});
+		top += size.height();
+	}
+	result.front().sides |= RectPart::Top;
+	result.back().sides |= RectPart::Bottom;
+	return result;
+}
+
+} // namespace
 
 GroupedMedia::Part::Part(
 	not_null<Element*> parent,
@@ -39,7 +65,7 @@ GroupedMedia::GroupedMedia(
 	const auto truncated = ranges::view::all(
 		medias
 	) | ranges::view::transform([](const std::unique_ptr<Data::Media> &v) {
-		return not_null<Data::Media*>(v.get());
+		return v.get();
 	}) | ranges::view::take(kMaxSize);
 	const auto result = applyGroup(truncated);
 
@@ -66,6 +92,13 @@ GroupedMedia::~GroupedMedia() {
 	base::take(_parts);
 }
 
+GroupedMedia::Mode GroupedMedia::DetectMode(not_null<Data::Media*> media) {
+	const auto document = media->document();
+	return (document && document->isSong())
+		? Mode::Playlist
+		: Mode::Grid;
+}
+
 QSize GroupedMedia::countOptimalSize() {
 	if (_caption.hasSkipBlock()) {
 		_caption.updateSkipBlock(
@@ -81,11 +114,13 @@ QSize GroupedMedia::countOptimalSize() {
 		sizes.push_back(media->sizeForGrouping());
 	}
 
-	const auto layout = Ui::LayoutMediaGroup(
-		sizes,
-		st::historyGroupWidthMax,
-		st::historyGroupWidthMin,
-		st::historyGroupSkip);
+	const auto layout = (_mode == Mode::Grid)
+		? Ui::LayoutMediaGroup(
+			sizes,
+			st::historyGroupWidthMax,
+			st::historyGroupWidthMin,
+			st::historyGroupSkip)
+		: LayoutPlaylist(sizes);
 	Assert(layout.size() == _parts.size());
 
 	auto maxWidth = 0;
@@ -313,6 +348,33 @@ TextForMimeData GroupedMedia::selectedText(
 	return _caption.toTextForMimeData(selection);
 }
 
+auto GroupedMedia::getBubbleSelectionIntervals(
+	TextSelection selection) const
+-> std::vector<BubbleSelectionInterval> {
+	auto result = std::vector<BubbleSelectionInterval>();
+	for (auto i = 0, count = int(_parts.size()); i != count; ++i) {
+		const auto &part = _parts[i];
+		if (!IsGroupItemSelection(selection, i)) {
+			continue;
+		}
+		const auto &geometry = part.geometry;
+		if (result.empty()
+			|| (result.back().top + result.back().height
+				< geometry.top())
+			|| (result.back().top > geometry.top() + geometry.height())) {
+			result.push_back({ geometry.top(), geometry.height() });
+		} else {
+			auto &last = result.back();
+			const auto newTop = std::min(last.top, geometry.top());
+			const auto newHeight = std::max(
+				last.top + last.height - newTop,
+				geometry.top() + geometry.height() - newTop);
+			last = BubbleSelectionInterval{ newTop, newHeight };
+		}
+	}
+	return result;
+}
+
 void GroupedMedia::clickHandlerActiveChanged(
 		const ClickHandlerPtr &p,
 		bool active) {
@@ -339,7 +401,15 @@ bool GroupedMedia::applyGroup(const DataMediaRange &medias) {
 		return true;
 	}
 
+	auto modeChosen = false;
 	for (const auto media : medias) {
+		const auto mediaMode = DetectMode(media);
+		if (!modeChosen) {
+			_mode = mediaMode;
+			modeChosen = true;
+		} else if (mediaMode != _mode) {
+			continue;
+		}
 		_parts.push_back(Part(_parent, media));
 	}
 	if (_parts.empty()) {
@@ -449,7 +519,7 @@ bool GroupedMedia::needsBubble() const {
 }
 
 bool GroupedMedia::computeNeedBubble() const {
-	if (!_caption.isEmpty()) {
+	if (!_caption.isEmpty() || _mode == Mode::Playlist) {
 		return true;
 	}
 	if (const auto item = _parent->data()) {
@@ -467,9 +537,10 @@ bool GroupedMedia::computeNeedBubble() const {
 }
 
 bool GroupedMedia::needInfoDisplay() const {
-	return (_parent->data()->id < 0
-		|| _parent->isUnderCursor()
-		|| _parent->isLastAndSelfMessage());
+	return (_mode != Mode::Playlist)
+		&& (_parent->data()->id < 0
+			|| _parent->isUnderCursor()
+			|| _parent->isLastAndSelfMessage());
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
index 92e7f33aa..3e1185c42 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
@@ -60,6 +60,9 @@ public:
 
 	TextForMimeData selectedText(TextSelection selection) const override;
 
+	std::vector<BubbleSelectionInterval> getBubbleSelectionIntervals(
+		TextSelection selection) const override;
+
 	void clickHandlerActiveChanged(
 		const ClickHandlerPtr &p,
 		bool active) override;
@@ -76,12 +79,14 @@ public:
 	HistoryMessageEdited *displayedEditBadge() const override;
 
 	bool skipBubbleTail() const override {
-		return isRoundedInBubbleBottom() && _caption.isEmpty();
+		return (_mode == Mode::Grid)
+			&& isRoundedInBubbleBottom()
+			&& _caption.isEmpty();
 	}
 	void updateNeedBubbleState() override;
 	bool needsBubble() const override;
 	bool customInfoLayout() const override {
-		return _caption.isEmpty();
+		return _caption.isEmpty() && (_mode != Mode::Playlist);
 	}
 	bool allowsFastShare() const override {
 		return true;
@@ -95,6 +100,10 @@ public:
 	void parentTextUpdated() override;
 
 private:
+	enum class Mode : char {
+		Grid,
+		Playlist,
+	};
 	struct Part {
 		Part(
 			not_null<Element*> parent,
@@ -111,6 +120,8 @@ private:
 
 	};
 
+	[[nodiscard]] static Mode DetectMode(not_null<Data::Media*> media);
+
 	template <typename DataMediaRange>
 	bool applyGroup(const DataMediaRange &medias);
 
@@ -131,6 +142,7 @@ private:
 
 	Ui::Text::String _caption;
 	std::vector<Part> _parts;
+	Mode _mode = Mode::Grid;
 	bool _needBubble = false;
 
 };

From ec35e3f081091514eb26dbbe8a71e0b4f455da05 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Oct 2020 15:56:33 +0300
Subject: [PATCH 078/190] Track multiple pinned messages in MessagesList.

---
 Telegram/CMakeLists.txt                       |  2 +
 Telegram/SourceFiles/api/api_updates.cpp      | 43 +++++++++
 Telegram/SourceFiles/boxes/confirm_box.cpp    | 10 ++-
 Telegram/SourceFiles/boxes/confirm_box.h      |  3 +-
 Telegram/SourceFiles/data/data_channel.cpp    |  8 +-
 Telegram/SourceFiles/data/data_chat.cpp       |  4 +-
 Telegram/SourceFiles/data/data_messages.cpp   | 84 +++++++++++++++---
 Telegram/SourceFiles/data/data_messages.h     | 73 +++++++--------
 Telegram/SourceFiles/data/data_peer.cpp       | 78 ++++++++++++++--
 Telegram/SourceFiles/data/data_peer.h         | 20 +++--
 .../SourceFiles/data/data_pinned_messages.cpp | 88 +++++++++++++++++++
 .../SourceFiles/data/data_pinned_messages.h   | 41 +++++++++
 Telegram/SourceFiles/data/data_user.cpp       |  4 +-
 Telegram/SourceFiles/history/history.cpp      | 22 +++--
 Telegram/SourceFiles/history/history_item.cpp | 19 ++--
 Telegram/SourceFiles/history/history_item.h   |  5 +-
 .../SourceFiles/history/history_widget.cpp    | 23 ++---
 Telegram/SourceFiles/history/history_widget.h |  2 +-
 .../view/history_view_replies_section.cpp     | 13 +--
 19 files changed, 435 insertions(+), 107 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/data_pinned_messages.cpp
 create mode 100644 Telegram/SourceFiles/data/data_pinned_messages.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 51d5689ac..8d6715541 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -435,6 +435,8 @@ PRIVATE
     data/data_photo.h
     data/data_photo_media.cpp
     data/data_photo_media.h
+    data/data_pinned_messages.cpp
+    data/data_pinned_messages.h
     data/data_poll.cpp
     data/data_poll.h
     data/data_pts_waiter.cpp
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 7865403d6..4b853a1e2 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -1083,6 +1083,17 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 		_session->data().updateEditedMessage(d.vmessage());
 	} break;
 
+	case mtpc_updatePinnedChannelMessages: {
+		const auto &d = update.c_updatePinnedChannelMessages();
+		const auto channelId = d.vchannel_id().v;
+		for (const auto &msgId : d.vmessages().v) {
+			const auto item = session().data().message(channelId, msgId.v);
+			if (item) {
+				item->setIsPinned(d.is_pinned());
+			}
+		}
+	} break;
+
 	case mtpc_updateEditMessage: {
 		auto &d = update.c_updateEditMessage();
 		_session->data().updateEditedMessage(d.vmessage());
@@ -1098,6 +1109,17 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 		_session->data().processMessagesDeleted(d.vchannel_id().v, d.vmessages().v);
 	} break;
 
+	case mtpc_updatePinnedMessages: {
+		const auto &d = update.c_updatePinnedMessages();
+		const auto peerId = peerFromMTP(d.vpeer());
+		for (const auto &msgId : d.vmessages().v) {
+			const auto item = session().data().message(0, msgId.v);
+			if (item) {
+				item->setIsPinned(d.is_pinned());
+			}
+		}
+	} break;
+
 	default: Unexpected("Type in applyUpdateNoPtsCheck()");
 	}
 }
@@ -1393,6 +1415,21 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		}
 	} break;
 
+	case mtpc_updatePinnedChannelMessages: {
+		auto &d = update.c_updatePinnedChannelMessages();
+		auto channel = session().data().channelLoaded(d.vchannel_id().v);
+
+		if (channel && !_handlingChannelDifference) {
+			if (channel->ptsRequesting()) { // skip global updates while getting channel difference
+				return;
+			} else {
+				channel->ptsUpdateAndApply(d.vpts().v, d.vpts_count().v, update);
+			}
+		} else {
+			applyUpdateNoPtsCheck(update);
+		}
+	} break;
+
 	// Messages being read.
 	case mtpc_updateReadHistoryInbox: {
 		auto &d = update.c_updateReadHistoryInbox();
@@ -1998,6 +2035,12 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		}
 	} break;
 
+	// Pinned message.
+	case mtpc_updatePinnedMessages: {
+		const auto &d = update.c_updatePinnedMessages();
+		updateAndApply(d.vpts().v, d.vpts_count().v, update);
+	} break;
+
 	////// Cloud sticker sets
 	case mtpc_updateNewStickerSet: {
 		const auto &d = update.c_updateNewStickerSet();
diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp
index fb13a8d5d..a534f0400 100644
--- a/Telegram/SourceFiles/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/boxes/confirm_box.cpp
@@ -444,14 +444,20 @@ PinMessageBox::PinMessageBox(
 : _peer(peer)
 , _api(&peer->session().mtp())
 , _msgId(msgId)
-, _text(this, tr::lng_pinned_pin_sure(tr::now), st::boxLabel) {
+, _pinningOld(msgId < peer->topPinnedMessageId())
+, _text(
+	this,
+	(_pinningOld
+		? "Do you want to pin an older message while leaving a more recent one pinned?" // #TODO pinned
+		: tr::lng_pinned_pin_sure(tr::now)),
+	st::boxLabel) {
 }
 
 void PinMessageBox::prepare() {
 	addButton(tr::lng_pinned_pin(), [this] { pinMessage(); });
 	addButton(tr::lng_cancel(), [this] { closeBox(); });
 
-	if (_peer->isChat() || _peer->isMegagroup()) {
+	if (!_pinningOld && (_peer->isChat() || _peer->isMegagroup())) {
 		_notify.create(this, tr::lng_pinned_notify(tr::now), true, st::defaultBoxCheckbox);
 	}
 
diff --git a/Telegram/SourceFiles/boxes/confirm_box.h b/Telegram/SourceFiles/boxes/confirm_box.h
index 3b8f80e05..585d8ec52 100644
--- a/Telegram/SourceFiles/boxes/confirm_box.h
+++ b/Telegram/SourceFiles/boxes/confirm_box.h
@@ -183,7 +183,8 @@ private:
 
 	const not_null<PeerData*> _peer;
 	MTP::Sender _api;
-	MsgId _msgId;
+	MsgId _msgId = 0;
+	bool _pinningOld = false;
 
 	object_ptr<Ui::FlatLabel> _text;
 	object_ptr<Ui::Checkbox> _notify = { nullptr };
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index 6164c94d6..1af259a67 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -383,9 +383,7 @@ void ChannelData::setUnavailableReasons(
 void ChannelData::setAvailableMinId(MsgId availableMinId) {
 	if (_availableMinId != availableMinId) {
 		_availableMinId = availableMinId;
-		if (pinnedMessageId() <= _availableMinId) {
-			clearPinnedMessage();
-		}
+		clearPinnedMessages(_availableMinId + 1);
 	}
 }
 
@@ -772,9 +770,9 @@ void ApplyChannelUpdate(
 		}
 	}
 	if (const auto pinned = update.vpinned_msg_id()) {
-		channel->setPinnedMessageId(pinned->v);
+		channel->setTopPinnedMessageId(pinned->v);
 	} else {
-		channel->clearPinnedMessage();
+		channel->clearPinnedMessages();
 	}
 	if (channel->isMegagroup()) {
 		const auto stickerSet = update.vstickerset();
diff --git a/Telegram/SourceFiles/data/data_chat.cpp b/Telegram/SourceFiles/data/data_chat.cpp
index 5cabfff25..37930f103 100644
--- a/Telegram/SourceFiles/data/data_chat.cpp
+++ b/Telegram/SourceFiles/data/data_chat.cpp
@@ -333,9 +333,9 @@ void ApplyChatUpdate(not_null<ChatData*> chat, const MTPDchatFull &update) {
 		return QString();
 	}));
 	if (const auto pinned = update.vpinned_msg_id()) {
-		chat->setPinnedMessageId(pinned->v);
+		chat->setTopPinnedMessageId(pinned->v);
 	} else {
-		chat->clearPinnedMessage();
+		chat->clearPinnedMessages();
 	}
 	chat->checkFolder(update.vfolder_id().value_or_empty());
 	chat->fullUpdated();
diff --git a/Telegram/SourceFiles/data/data_messages.cpp b/Telegram/SourceFiles/data/data_messages.cpp
index 857442270..65ef717c9 100644
--- a/Telegram/SourceFiles/data/data_messages.cpp
+++ b/Telegram/SourceFiles/data/data_messages.cpp
@@ -117,6 +117,11 @@ void MessagesList::addRange(
 	_sliceUpdated.fire(std::move(update));
 }
 
+void MessagesList::addOne(MessagePosition messageId) {
+	auto range = { messageId };
+	addRange(range, { messageId, messageId }, std::nullopt, true);
+}
+
 void MessagesList::addNew(MessagePosition messageId) {
 	auto range = { messageId };
 	addRange(range, { messageId, MaxMessagePosition }, std::nullopt, true);
@@ -165,6 +170,31 @@ void MessagesList::removeAll(ChannelId channelId) {
 	}
 }
 
+void MessagesList::removeLessThan(MessagePosition messageId) {
+	auto removed = 0;
+	for (auto i = begin(_slices); i != end(_slices);) {
+		if (i->range.till <= messageId) {
+			removed += i->messages.size();
+			i = _slices.erase(i);
+			continue;
+		} else if (i->range.from <= messageId) {
+			_slices.modify(i, [&](Slice &slice) {
+				slice.range.from = MinMessagePosition;
+				auto from = begin(slice.messages);
+				auto till = ranges::lower_bound(slice.messages, messageId);
+				if (from != till) {
+					removed += till - from;
+					slice.messages.erase(from, till);
+				}
+			});
+			break;
+		}
+	}
+	if (removed && _count) {
+		*_count -= removed;
+	}
+}
+
 void MessagesList::invalidate() {
 	_slices.clear();
 	_count = std::nullopt;
@@ -184,19 +214,26 @@ void MessagesList::invalidateBottom() {
 	_count = std::nullopt;
 }
 
+MessagesResult MessagesList::queryCurrent(const MessagesQuery &query) const {
+	if (!query.aroundId) {
+		return MessagesResult();
+	}
+	const auto slice = ranges::lower_bound(
+		_slices,
+		query.aroundId,
+		std::less<>(),
+		[](const Slice &slice) { return slice.range.till; });
+	return (slice != _slices.end() && slice->range.from <= query.aroundId)
+		? queryFromSlice(query, *slice)
+		: MessagesResult();
+}
+
 rpl::producer<MessagesResult> MessagesList::query(
 		MessagesQuery &&query) const {
 	return [this, query = std::move(query)](auto consumer) {
-		auto slice = query.aroundId
-			? ranges::lower_bound(
-				_slices,
-				query.aroundId,
-				std::less<>(),
-				[](const Slice &slice) { return slice.range.till; })
-			: _slices.end();
-		if (slice != _slices.end()
-			&& slice->range.from <= query.aroundId) {
-			consumer.put_next(queryFromSlice(query, *slice));
+		auto current = queryCurrent(query);
+		if (current.count.has_value() || !current.messageIds.empty()) {
+			consumer.put_next(std::move(current));
 		}
 		consumer.put_done();
 		return rpl::lifetime();
@@ -207,6 +244,31 @@ rpl::producer<MessagesSliceUpdate> MessagesList::sliceUpdated() const {
 	return _sliceUpdated.events();
 }
 
+MessagesResult MessagesList::snapshot(MessagesQuery &&query) const {
+	return queryCurrent(query);
+}
+
+bool MessagesList::empty() const {
+	for (const auto &slice : _slices) {
+		if (!slice.messages.empty()) {
+			return false;
+		}
+	}
+	return true;
+}
+
+rpl::producer<MessagesResult> MessagesList::viewer(
+		MessagesQuery &&query) const {
+	auto copy = query;
+	return rpl::single(
+		queryCurrent(query)
+	) | rpl::then(sliceUpdated() | rpl::map([=] {
+		return queryCurrent(query);
+	})) | rpl::filter([=](const MessagesResult &value) {
+		return value.count.has_value() || !value.messageIds.empty();
+	});
+}
+
 MessagesResult MessagesList::queryFromSlice(
 		const MessagesQuery &query,
 		const Slice &slice) const {
@@ -372,7 +434,7 @@ void MessagesSliceBuilder::mergeSliceData(
 	if (count) {
 		_fullCount = count;
 	}
-	const auto impossible = MessagePosition(-1, FullMsgId());
+	const auto impossible = MessagePosition{ .fullId = {}, .date = -1 };
 	auto wasMinId = _ids.empty() ? impossible : _ids.front();
 	auto wasMaxId = _ids.empty() ? impossible : _ids.back();
 	_ids.merge(messageIds.begin(), messageIds.end());
diff --git a/Telegram/SourceFiles/data/data_messages.h b/Telegram/SourceFiles/data/data_messages.h
index 083baf641..baf73af75 100644
--- a/Telegram/SourceFiles/data/data_messages.h
+++ b/Telegram/SourceFiles/data/data_messages.h
@@ -16,11 +16,8 @@ enum class LoadDirection : char {
 };
 
 struct MessagePosition {
-	constexpr MessagePosition() = default;
-	constexpr MessagePosition(TimeId date, FullMsgId fullId)
-	: fullId(fullId)
-	, date(date) {
-	}
+	FullMsgId fullId;
+	TimeId date = 0;
 
 	explicit operator bool() const {
 		return (fullId.msg != 0);
@@ -50,18 +47,11 @@ struct MessagePosition {
 	inline constexpr bool operator!=(const MessagePosition &other) const {
 		return !(*this == other);
 	}
-
-	FullMsgId fullId;
-	TimeId date = 0;
-
 };
 
 struct MessagesRange {
-	constexpr MessagesRange() = default;
-	constexpr MessagesRange(MessagePosition from, MessagePosition till)
-	: from(from)
-	, till(till) {
-	}
+	MessagePosition from;
+	MessagePosition till;
 
 	inline constexpr bool operator==(const MessagesRange &other) const {
 		return (from == other.from)
@@ -70,26 +60,26 @@ struct MessagesRange {
 	inline constexpr bool operator!=(const MessagesRange &other) const {
 		return !(*this == other);
 	}
-
-	MessagePosition from;
-	MessagePosition till;
-
 };
 
 constexpr auto MinDate = TimeId(0);
 constexpr auto MaxDate = std::numeric_limits<TimeId>::max();
-constexpr auto MinMessagePosition = MessagePosition(
-	MinDate,
-	FullMsgId(NoChannel, 1));
-constexpr auto MaxMessagePosition = MessagePosition(
-	MaxDate,
-	FullMsgId(NoChannel, ServerMaxMsgId - 1));
-constexpr auto FullMessagesRange = MessagesRange(
-	MinMessagePosition,
-	MaxMessagePosition);
-constexpr auto UnreadMessagePosition = MessagePosition(
-	MinDate,
-	FullMsgId(NoChannel, ShowAtUnreadMsgId));
+constexpr auto MinMessagePosition = MessagePosition{
+	.fullId = FullMsgId(NoChannel, 1),
+	.date = MinDate,
+};
+constexpr auto MaxMessagePosition = MessagePosition{
+	.fullId = FullMsgId(NoChannel, ServerMaxMsgId - 1),
+	.date = MaxDate,
+};
+constexpr auto FullMessagesRange = MessagesRange{
+	.from = MinMessagePosition,
+	.till = MaxMessagePosition,
+};
+constexpr auto UnreadMessagePosition = MessagePosition{
+	.fullId = FullMsgId(NoChannel, ShowAtUnreadMsgId),
+	.date = MinDate,
+};
 
 struct MessagesSlice {
 	std::vector<FullMsgId> ids;
@@ -100,15 +90,6 @@ struct MessagesSlice {
 };
 
 struct MessagesQuery {
-	MessagesQuery(
-		MessagePosition aroundId,
-		int limitBefore,
-		int limitAfter)
-	: aroundId(aroundId)
-	, limitBefore(limitBefore)
-	, limitAfter(limitAfter) {
-	}
-
 	MessagePosition aroundId;
 	int limitBefore = 0;
 	int limitAfter = 0;
@@ -129,6 +110,7 @@ struct MessagesSliceUpdate {
 
 class MessagesList {
 public:
+	void addOne(MessagePosition messageId);
 	void addNew(MessagePosition messageId);
 	void addSlice(
 		std::vector<MessagePosition> &&messageIds,
@@ -136,10 +118,18 @@ public:
 		std::optional<int> count);
 	void removeOne(MessagePosition messageId);
 	void removeAll(ChannelId channelId);
+	void removeLessThan(MessagePosition messageId);
 	void invalidate();
 	void invalidateBottom();
-	rpl::producer<MessagesResult> query(MessagesQuery &&query) const;
-	rpl::producer<MessagesSliceUpdate> sliceUpdated() const;
+	[[nodiscard]] rpl::producer<MessagesResult> query(
+		MessagesQuery &&query) const;
+	[[nodiscard]] rpl::producer<MessagesSliceUpdate> sliceUpdated() const;
+
+	[[nodiscard]] MessagesResult snapshot(MessagesQuery &&query) const;
+	[[nodiscard]] rpl::producer<MessagesResult> viewer(
+		MessagesQuery &&query) const;
+
+	[[nodiscard]] bool empty() const;
 
 private:
 	struct Slice {
@@ -183,6 +173,7 @@ private:
 	MessagesResult queryFromSlice(
 		const MessagesQuery &query,
 		const Slice &slice) const;
+	MessagesResult queryCurrent(const MessagesQuery &query) const;
 
 	std::optional<int> _count;
 	base::flat_set<Slice> _slices;
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 59e41781c..3cd7b45d6 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_file_origin.h"
 #include "data/data_histories.h"
+#include "data/data_pinned_messages.h"
 #include "base/unixtime.h"
 #include "base/crc32hash.h"
 #include "lang/lang_keys.h"
@@ -460,18 +461,83 @@ bool PeerData::canEditMessagesIndefinitely() const {
 	Unexpected("Peer type in PeerData::canEditMessagesIndefinitely.");
 }
 
-void PeerData::setPinnedMessageId(MsgId messageId) {
+MsgId PeerData::topPinnedMessageId() const {
+	return _pinnedMessages ? _pinnedMessages->topId() : 0;
+}
+
+void PeerData::ensurePinnedMessagesCreated() {
+	if (!_pinnedMessages) {
+		_pinnedMessages = std::make_unique<Data::PinnedMessages>(
+			peerToChannel(id));
+	}
+}
+
+void PeerData::removeEmptyPinnedMessages() {
+	if (_pinnedMessages && _pinnedMessages->empty()) {
+		_pinnedMessages = nullptr;
+	}
+}
+
+bool PeerData::messageIdTooSmall(MsgId messageId) const {
+	if (const auto channel = asChannel()) {
+		return (messageId <= channel->availableMinId());
+	}
+	return false;
+}
+
+void PeerData::setTopPinnedMessageId(MsgId messageId) {
+	if (messageIdTooSmall(messageId)) {
+		return;
+	}
+	ensurePinnedMessagesCreated();
+	_pinnedMessages->setTopId(messageId);
+}
+
+void PeerData::clearPinnedMessages(MsgId lessThanId) {
+	if (!_pinnedMessages) {
+		return;
+	}
+	_pinnedMessages->clearLessThanId(lessThanId);
+	removeEmptyPinnedMessages();
+}
+
+void PeerData::addPinnedMessage(MsgId messageId) {
+	if (messageIdTooSmall(messageId)) {
+		return;
+	}
+	ensurePinnedMessagesCreated();
+	_pinnedMessages->add(messageId);
+}
+
+void PeerData::addPinnedSlice(
+		std::vector<MsgId> &&ids,
+		MsgId from,
+		MsgId till) {
 	const auto min = [&] {
 		if (const auto channel = asChannel()) {
 			return channel->availableMinId();
 		}
-		return MsgId(0);
+		return 0;
 	}();
-	messageId = (messageId > min) ? messageId : MsgId(0);
-	if (_pinnedMessageId != messageId) {
-		_pinnedMessageId = messageId;
-		session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
+	ids.erase(
+		ranges::remove_if(ids, [&](MsgId id) { return id <= min; }),
+		end(ids));
+	if (from <= min) {
+		from = 0;
 	}
+	if (ids.empty() && !_pinnedMessages) {
+		return;
+	}
+	ensurePinnedMessagesCreated();
+	_pinnedMessages->add(std::move(ids), from, till, std::nullopt);
+}
+
+void PeerData::removePinnedMessage(MsgId messageId) {
+	if (!_pinnedMessages) {
+		return;
+	}
+	_pinnedMessages->remove(messageId);
+	removeEmptyPinnedMessages();
 }
 
 bool PeerData::canExportChatHistory() const {
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index 3712adca9..7aff79a44 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -29,6 +29,7 @@ class Session;
 namespace Data {
 
 class Session;
+class PinnedMessages;
 
 int PeerColorIndex(PeerId peerId);
 int PeerColorIndex(int32 bareId);
@@ -326,13 +327,12 @@ public:
 
 	[[nodiscard]] bool canPinMessages() const;
 	[[nodiscard]] bool canEditMessagesIndefinitely() const;
-	[[nodiscard]] MsgId pinnedMessageId() const {
-		return _pinnedMessageId;
-	}
-	void setPinnedMessageId(MsgId messageId);
-	void clearPinnedMessage() {
-		setPinnedMessageId(0);
-	}
+	[[nodiscard]] MsgId topPinnedMessageId() const;
+	void setTopPinnedMessageId(MsgId messageId);
+	void clearPinnedMessages(MsgId lessThanId = ServerMaxMsgId);
+	void addPinnedMessage(MsgId messageId);
+	void addPinnedSlice(std::vector<MsgId> &&ids, MsgId from, MsgId till);
+	void removePinnedMessage(MsgId messageId);
 
 	[[nodiscard]] bool canExportChatHistory() const;
 
@@ -411,6 +411,10 @@ private:
 		-> const std::vector<Data::UnavailableReason> &;
 
 	void setUserpicChecked(PhotoId photoId, const ImageLocation &location);
+	void ensurePinnedMessagesCreated();
+	void removeEmptyPinnedMessages();
+
+	[[nodiscard]] bool messageIdTooSmall(MsgId messageId) const;
 
 	static constexpr auto kUnknownPhotoId = PhotoId(0xFFFFFFFFFFFFFFFFULL);
 
@@ -428,7 +432,7 @@ private:
 	base::flat_set<QChar> _nameFirstLetters;
 
 	crl::time _lastFullUpdate = 0;
-	MsgId _pinnedMessageId = 0;
+	std::unique_ptr<Data::PinnedMessages> _pinnedMessages;
 
 	Settings _settings = { kSettingsUnknown };
 	BlockStatus _blockStatus = BlockStatus::Unknown;
diff --git a/Telegram/SourceFiles/data/data_pinned_messages.cpp b/Telegram/SourceFiles/data/data_pinned_messages.cpp
new file mode 100644
index 000000000..ad7037e85
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_pinned_messages.cpp
@@ -0,0 +1,88 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/data_pinned_messages.h"
+
+namespace Data {
+
+PinnedMessages::PinnedMessages(ChannelId channelId) : _channelId(channelId) {
+}
+
+bool PinnedMessages::empty() const {
+	return _list.empty();
+}
+
+MsgId PinnedMessages::topId() const {
+	const auto slice = _list.snapshot(MessagesQuery{
+		.aroundId = MaxMessagePosition,
+		.limitBefore = 1,
+		.limitAfter = 1
+	});
+	return slice.messageIds.empty() ? 0 : slice.messageIds.back().fullId.msg;
+}
+
+MessagePosition PinnedMessages::position(MsgId id) const {
+	return MessagePosition{
+	   .fullId = FullMsgId(_channelId, id),
+	};
+}
+
+void PinnedMessages::add(MsgId messageId) {
+	_list.addOne(position(messageId));
+}
+
+void PinnedMessages::add(
+		std::vector<MsgId> &&ids,
+		MsgId from,
+		MsgId till,
+		std::optional<int> count) {
+	auto positions = ids | ranges::view::transform([&](MsgId id) {
+		return position(id);
+	}) | ranges::to_vector;
+
+	_list.addSlice(
+		std::move(positions),
+		MessagesRange{
+			.from = from ? position(from) : MinMessagePosition,
+			.till = position(till)
+		},
+		count);
+}
+
+void PinnedMessages::remove(MsgId messageId) {
+	_list.removeOne(MessagePosition{
+		.fullId = FullMsgId(0, messageId),
+	});
+}
+
+void PinnedMessages::setTopId(MsgId messageId) {
+	while (true) {
+		auto top = topId();
+		if (top > messageId) {
+			remove(top);
+		} else if (top == messageId) {
+			return;
+		} else {
+			break;
+		}
+	}
+	const auto position = MessagePosition{
+		.fullId = FullMsgId(0, messageId),
+	};
+	_list.addSlice(
+		{ position },
+		{ .from = position, .till = MaxMessagePosition },
+		std::nullopt);
+}
+
+void PinnedMessages::clearLessThanId(MsgId messageId) {
+	_list.removeLessThan(MessagePosition{
+		.fullId = FullMsgId(0, messageId),
+	});
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_pinned_messages.h b/Telegram/SourceFiles/data/data_pinned_messages.h
new file mode 100644
index 000000000..7f825a343
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_pinned_messages.h
@@ -0,0 +1,41 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "data/data_messages.h"
+
+namespace Data {
+
+class PinnedMessages final {
+public:
+	explicit PinnedMessages(ChannelId channelId);
+
+	[[nodiscard]] bool empty() const;
+	[[nodiscard]] MsgId topId() const;
+
+	void add(MsgId messageId);
+	void add(
+		std::vector<MsgId> &&ids,
+		MsgId from,
+		MsgId till,
+		std::optional<int> count);
+	void remove(MsgId messageId);
+
+	void setTopId(MsgId messageId);
+
+	void clearLessThanId(MsgId messageId);
+
+private:
+	[[nodiscard]] MessagePosition position(MsgId id) const;
+
+	MessagesList _list;
+	ChannelId _channelId = 0;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index 6c36ea279..84b3b510a 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -262,9 +262,9 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 		user->setBotInfoVersion(-1);
 	}
 	if (const auto pinned = update.vpinned_msg_id()) {
-		user->setPinnedMessageId(pinned->v);
+		user->setTopPinnedMessageId(pinned->v);
 	} else {
-		user->clearPinnedMessage();
+		user->clearPinnedMessages();
 	}
 	user->setFullFlags(update.vflags().v);
 	user->setIsBlocked(update.is_blocked());
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 7c625f9e7..814252ba2 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -177,9 +177,7 @@ void History::itemVanished(not_null<HistoryItem*> item) {
 		&& unreadCount() > 0) {
 		setUnreadCount(unreadCount() - 1);
 	}
-	if (peer->pinnedMessageId() == item->id) {
-		peer->clearPinnedMessage();
-	}
+	peer->removePinnedMessage(item->id);
 }
 
 void History::setLocalDraft(std::unique_ptr<Data::Draft> &&draft) {
@@ -709,6 +707,9 @@ not_null<HistoryItem*> History::addNewToBack(
 				item->id,
 				{ from, till }));
 		}
+		if (item->isPinned()) {
+			item->history()->peer->addPinnedMessage(item->id);
+		}
 	}
 	if (item->from()->id) {
 		if (auto user = item->from()->asUser()) {
@@ -1005,8 +1006,8 @@ void History::applyServiceChanges(
 		if (const auto replyTo = data.vreply_to()) {
 			replyTo->match([&](const MTPDmessageReplyHeader &data) {
 				if (item) {
-					item->history()->peer->setPinnedMessageId(
-						data.vreply_to_msg_id().v);
+					//item->history()->peer->setTopPinnedMessageId( // #TODO pinned
+					//	data.vreply_to_msg_id().v);
 				}
 			});
 		}
@@ -1160,6 +1161,7 @@ void History::addEdgesToSharedMedia() {
 			{},
 			{ from, till }));
 	}
+	peer->addPinnedSlice({}, from, till);
 }
 
 void History::addOlderSlice(const QVector<MTPMessage> &slice) {
@@ -1323,6 +1325,7 @@ void History::checkAddAllToUnreadMentions() {
 
 void History::addToSharedMedia(
 		const std::vector<not_null<HistoryItem*>> &items) {
+	auto pinned = std::vector<MsgId>();
 	std::vector<MsgId> medias[Storage::kSharedMediaTypeCount];
 	for (const auto item : items) {
 		if (const auto types = item->sharedMediaTypes()) {
@@ -1336,6 +1339,12 @@ void History::addToSharedMedia(
 				}
 			}
 		}
+		if (item->isPinned()) {
+			if (pinned.empty()) {
+				pinned.reserve(items.size());
+			}
+			pinned.push_back(item->id);
+		}
 	}
 	const auto from = loadedAtTop() ? 0 : minMsgId();
 	const auto till = loadedAtBottom() ? ServerMaxMsgId : maxMsgId();
@@ -1349,6 +1358,7 @@ void History::addToSharedMedia(
 				{ from, till }));
 		}
 	}
+	peer->addPinnedSlice(std::move(pinned), from, till);
 }
 
 void History::calculateFirstUnreadMessage() {
@@ -3017,7 +3027,7 @@ void History::clear(ClearType type) {
 		clearSharedMedia();
 		clearLastKeyboard();
 		if (const auto channel = peer->asChannel()) {
-			channel->clearPinnedMessage();
+			channel->clearPinnedMessages();
 			//if (const auto feed = channel->feed()) { // #feed
 			//	// Should be after resetting the _lastMessage.
 			//	feed->historyCleared(this);
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index ad038352a..e75ed612c 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -347,6 +347,16 @@ void HistoryItem::markMediaRead() {
 	}
 }
 
+void HistoryItem::setIsPinned(bool pinned) {
+	if (pinned) {
+		_flags |= MTPDmessage::Flag::f_pinned;
+		history()->peer->addPinnedMessage(id);
+	} else {
+		_flags &= ~MTPDmessage::Flag::f_pinned;
+		history()->peer->removePinnedMessage(id);
+	}
+}
+
 bool HistoryItem::definesReplyKeyboard() const {
 	if (const auto markup = Get<HistoryMessageReplyMarkup>()) {
 		if (markup->flags & MTPDreplyKeyboardMarkup_ClientFlag::f_inline) {
@@ -476,6 +486,9 @@ void HistoryItem::indexAsNewItem() {
 				types,
 				id));
 		}
+		if (isPinned()) {
+			_history->peer->setTopPinnedMessageId(id);
+		}
 		//if (const auto channel = history()->peer->asChannel()) { // #feed
 		//	if (const auto feed = channel->feed()) {
 		//		_history->session().storage().add(Storage::FeedMessagesAddNew(
@@ -509,10 +522,6 @@ void HistoryItem::setRealId(MsgId newId) {
 	_history->owner().requestItemRepaint(this);
 }
 
-bool HistoryItem::isPinned() const {
-	return (_history->peer->pinnedMessageId() == id);
-}
-
 bool HistoryItem::canPin() const {
 	if (id < 0 || !toHistoryMessage()) {
 		return false;
@@ -656,7 +665,7 @@ ChannelId HistoryItem::channelId() const {
 }
 
 Data::MessagePosition HistoryItem::position() const {
-	return Data::MessagePosition(date(), fullId());
+	return { .fullId = fullId(), .date = date() };
 }
 
 MsgId HistoryItem::replyToId() const {
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 82b99f50c..280afbed2 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -113,6 +113,9 @@ public:
 	[[nodiscard]] bool out() const {
 		return _flags & MTPDmessage::Flag::f_out;
 	}
+	[[nodiscard]] bool isPinned() const {
+		return _flags & MTPDmessage::Flag::f_pinned;
+	}
 	[[nodiscard]] bool unread() const;
 	[[nodiscard]] bool showNotification() const;
 	void markClientSideAsRead();
@@ -121,6 +124,7 @@ public:
 	[[nodiscard]] bool isUnreadMedia() const;
 	[[nodiscard]] bool hasUnreadMediaFlag() const;
 	void markMediaRead();
+	void setIsPinned(bool isPinned);
 
 	// For edit media in history_message.
 	virtual void returnSavedMedia() {};
@@ -312,7 +316,6 @@ public:
 		return _text.isEmpty();
 	}
 
-	[[nodiscard]] bool isPinned() const;
 	[[nodiscard]] bool canPin() const;
 	[[nodiscard]] bool canStopPoll() const;
 	[[nodiscard]] virtual bool allowsSendNow() const;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 960238c68..4700db368 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5200,6 +5200,7 @@ void HistoryWidget::updatePinnedBar(bool force) {
 	if (!_pinnedBar) {
 		return;
 	}
+	const auto messageId = _pinnedBar->msgId;
 	if (!force) {
 		if (_pinnedBar->msg) {
 			return;
@@ -5208,7 +5209,9 @@ void HistoryWidget::updatePinnedBar(bool force) {
 
 	Assert(_history != nullptr);
 	if (!_pinnedBar->msg) {
-		_pinnedBar->msg = session().data().message(_history->channelId(), _pinnedBar->msgId);
+		_pinnedBar->msg = session().data().message(
+			_history->channelId(),
+			messageId);
 	}
 	if (_pinnedBar->msg) {
 		_pinnedBar->text.setText(
@@ -5217,17 +5220,15 @@ void HistoryWidget::updatePinnedBar(bool force) {
 			Ui::DialogTextOptions());
 		update();
 	} else if (force) {
-		if (auto channel = _peer ? _peer->asChannel() : nullptr) {
-			channel->clearPinnedMessage();
-		}
 		destroyPinnedBar();
+		_history->peer->removePinnedMessage(messageId);
 		updateControlsGeometry();
 	}
 }
 
 bool HistoryWidget::pinnedMsgVisibilityUpdated() {
 	auto result = false;
-	auto pinnedId = _peer->pinnedMessageId();
+	auto pinnedId = _peer->topPinnedMessageId();
 	if (pinnedId && !_peer->canPinMessages()) {
 		const auto hiddenId = session().settings().hiddenPinnedMessageId(
 			_peer->id);
@@ -5540,23 +5541,23 @@ void HistoryWidget::unpinMessage(FullMsgId itemId) {
 	if (!_peer) {
 		return;
 	}
-	UnpinMessage(_peer);
+	UnpinMessage(_peer, itemId.msg);
 }
 
-void HistoryWidget::UnpinMessage(not_null<PeerData*> peer) {
+void HistoryWidget::UnpinMessage(not_null<PeerData*> peer, MsgId msgId) {
 	if (!peer) {
 		return;
 	}
 
 	const auto session = &peer->session();
 	Ui::show(Box<ConfirmBox>(tr::lng_pinned_unpin_sure(tr::now), tr::lng_pinned_unpin(tr::now), crl::guard(session, [=] {
-		peer->clearPinnedMessage();
+		peer->removePinnedMessage(msgId);
 
 		Ui::hideLayer();
 		session->api().request(MTPmessages_UpdatePinnedMessage(
-			MTP_flags(0),
+			MTP_flags(MTPmessages_UpdatePinnedMessage::Flag::f_unpin),
 			peer->input,
-			MTP_int(0)
+			MTP_int(msgId)
 		)).done([=](const MTPUpdates &result) {
 			session->api().applyUpdates(result);
 		}).send();
@@ -5564,7 +5565,7 @@ void HistoryWidget::UnpinMessage(not_null<PeerData*> peer) {
 }
 
 void HistoryWidget::hidePinnedMessage() {
-	const auto pinnedId = _peer ? _peer->pinnedMessageId() : MsgId(0);
+	const auto pinnedId = _peer ? _peer->topPinnedMessageId() : MsgId(0);
 	if (!pinnedId) {
 		if (pinnedMsgVisibilityUpdated()) {
 			updateControlsGeometry();
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 759b5a0fc..12f943212 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -530,7 +530,7 @@ private:
 	void addMessagesToFront(PeerData *peer, const QVector<MTPMessage> &messages);
 	void addMessagesToBack(PeerData *peer, const QVector<MTPMessage> &messages);
 
-	static void UnpinMessage(not_null<PeerData*> peer);
+	static void UnpinMessage(not_null<PeerData*> peer, MsgId msgId);
 
 	void updateHistoryGeometry(bool initial = false, bool loadedDown = false, const ScrollChange &change = { ScrollChangeNone, 0 });
 	void updateListSize();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 26d9b0c4f..f5db39172 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -85,8 +85,9 @@ RepliesMemento::RepliesMemento(
 : RepliesMemento(commentsItem->history(), commentsItem->id, commentId) {
 	if (commentId) {
 		_list.setAroundPosition({
-			TimeId(0),
-			FullMsgId(commentsItem->history()->channelId(), commentId)
+			.fullId = FullMsgId(commentsItem->history()->channelId(), commentId),
+			.date = TimeId(0),
+
 		});
 	} else if (commentsItem->computeRepliesInboxReadTillFull() == MsgId(1)) {
 		_list.setAroundPosition(Data::MinMessagePosition);
@@ -1430,7 +1431,9 @@ bool RepliesWidget::showMessage(
 		}
 		return nullptr;
 	}();
-	showAtPosition(Data::MessagePosition(message->date(), id), originItem);
+	showAtPosition(
+		Data::MessagePosition{ .fullId = id, .date = message->date() },
+		originItem);
 	return true;
 }
 
@@ -1479,8 +1482,8 @@ void RepliesWidget::restoreState(not_null<RepliesMemento*> memento) {
 	_inner->restoreState(memento->list());
 	if (const auto highlight = memento->getHighlightId()) {
 		const auto position = Data::MessagePosition{
-			TimeId(0),
-			FullMsgId(_history->channelId(), highlight)
+			.fullId = FullMsgId(_history->channelId(), highlight),
+			.date = TimeId(0),
 		};
 		_inner->showAroundPosition(position, [=] {
 			return showAtPositionNow(position, nullptr);

From b9f40e35cd174809c61bcb575eb0fca577ee0b60 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Oct 2020 19:23:53 +0300
Subject: [PATCH 079/190] Switch between pinned messages in chat.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/Resources/langs/lang.strings         |   1 +
 Telegram/SourceFiles/data/data_peer.cpp       |  12 +-
 Telegram/SourceFiles/data/data_peer.h         |   9 +-
 .../SourceFiles/data/data_pinned_messages.cpp |  42 +--
 .../SourceFiles/data/data_pinned_messages.h   |  16 +-
 Telegram/SourceFiles/history/history.cpp      |  61 +++--
 Telegram/SourceFiles/history/history.h        |   4 +-
 .../SourceFiles/history/history_widget.cpp    |  83 +++++-
 Telegram/SourceFiles/history/history_widget.h |   6 +
 .../view/history_view_pinned_tracker.cpp      | 247 ++++++++++++++++++
 .../view/history_view_pinned_tracker.h        |  52 ++++
 12 files changed, 466 insertions(+), 69 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
 create mode 100644 Telegram/SourceFiles/history/view/history_view_pinned_tracker.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 8d6715541..fed5b1ce2 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -564,6 +564,8 @@ PRIVATE
     history/view/history_view_message.cpp
     history/view/history_view_message.h
     history/view/history_view_object.h
+    history/view/history_view_pinned_tracker.cpp
+    history/view/history_view_pinned_tracker.h
     history/view/history_view_replies_section.cpp
     history/view/history_view_replies_section.h
     history/view/history_view_schedule_box.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 78d54b851..8cfd5b8cb 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -161,6 +161,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_deleted" = "Deleted Account";
 "lng_deleted_message" = "Deleted message";
 "lng_pinned_message" = "Pinned message";
+"lng_pinned_previous" = "Previous message";
 "lng_pinned_poll" = "Pinned poll";
 "lng_pinned_quiz" = "Pinned quiz";
 "lng_pinned_unpin_sure" = "Would you like to unpin this message?";
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 3cd7b45d6..27347867c 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -469,12 +469,14 @@ void PeerData::ensurePinnedMessagesCreated() {
 	if (!_pinnedMessages) {
 		_pinnedMessages = std::make_unique<Data::PinnedMessages>(
 			peerToChannel(id));
+		session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 	}
 }
 
 void PeerData::removeEmptyPinnedMessages() {
 	if (_pinnedMessages && _pinnedMessages->empty()) {
 		_pinnedMessages = nullptr;
+		session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 	}
 }
 
@@ -511,8 +513,8 @@ void PeerData::addPinnedMessage(MsgId messageId) {
 
 void PeerData::addPinnedSlice(
 		std::vector<MsgId> &&ids,
-		MsgId from,
-		MsgId till) {
+		MsgRange noSkipRange,
+		std::optional<int> count) {
 	const auto min = [&] {
 		if (const auto channel = asChannel()) {
 			return channel->availableMinId();
@@ -522,14 +524,14 @@ void PeerData::addPinnedSlice(
 	ids.erase(
 		ranges::remove_if(ids, [&](MsgId id) { return id <= min; }),
 		end(ids));
-	if (from <= min) {
-		from = 0;
+	if (noSkipRange.from <= min) {
+		noSkipRange.from = 0;
 	}
 	if (ids.empty() && !_pinnedMessages) {
 		return;
 	}
 	ensurePinnedMessagesCreated();
-	_pinnedMessages->add(std::move(ids), from, till, std::nullopt);
+	_pinnedMessages->add(std::move(ids), noSkipRange, std::nullopt);
 }
 
 void PeerData::removePinnedMessage(MsgId messageId) {
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index 7aff79a44..c8bf6eac1 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -30,6 +30,7 @@ namespace Data {
 
 class Session;
 class PinnedMessages;
+struct PinnedAroundId;
 
 int PeerColorIndex(PeerId peerId);
 int PeerColorIndex(int32 bareId);
@@ -331,8 +332,14 @@ public:
 	void setTopPinnedMessageId(MsgId messageId);
 	void clearPinnedMessages(MsgId lessThanId = ServerMaxMsgId);
 	void addPinnedMessage(MsgId messageId);
-	void addPinnedSlice(std::vector<MsgId> &&ids, MsgId from, MsgId till);
+	void addPinnedSlice(
+		std::vector<MsgId> &&ids,
+		MsgRange noSkipRange,
+		std::optional<int> count);
 	void removePinnedMessage(MsgId messageId);
+	Data::PinnedMessages *currentPinnedMessages() const {
+		return _pinnedMessages.get();
+	}
 
 	[[nodiscard]] bool canExportChatHistory() const;
 
diff --git a/Telegram/SourceFiles/data/data_pinned_messages.cpp b/Telegram/SourceFiles/data/data_pinned_messages.cpp
index ad7037e85..e9fc9a110 100644
--- a/Telegram/SourceFiles/data/data_pinned_messages.cpp
+++ b/Telegram/SourceFiles/data/data_pinned_messages.cpp
@@ -25,6 +25,25 @@ MsgId PinnedMessages::topId() const {
 	return slice.messageIds.empty() ? 0 : slice.messageIds.back().fullId.msg;
 }
 
+rpl::producer<PinnedAroundId> PinnedMessages::viewer(
+		MsgId aroundId,
+		int limit) const {
+	return _list.viewer(MessagesQuery{
+		.aroundId = position(aroundId),
+		.limitBefore = limit,
+		.limitAfter = limit
+	}) | rpl::map([](const MessagesResult &result) {
+		auto data = PinnedAroundId();
+		data.fullCount = result.count;
+		data.skippedBefore = result.skippedBefore;
+		data.skippedAfter = result.skippedAfter;
+		data.ids = result.messageIds | ranges::view::transform(
+			[](MessagePosition position) { return position.fullId.msg; }
+		) | ranges::to_vector;
+		return data;
+	});
+}
+
 MessagePosition PinnedMessages::position(MsgId id) const {
 	return MessagePosition{
 	   .fullId = FullMsgId(_channelId, id),
@@ -37,8 +56,7 @@ void PinnedMessages::add(MsgId messageId) {
 
 void PinnedMessages::add(
 		std::vector<MsgId> &&ids,
-		MsgId from,
-		MsgId till,
+		MsgRange range,
 		std::optional<int> count) {
 	auto positions = ids | ranges::view::transform([&](MsgId id) {
 		return position(id);
@@ -47,16 +65,14 @@ void PinnedMessages::add(
 	_list.addSlice(
 		std::move(positions),
 		MessagesRange{
-			.from = from ? position(from) : MinMessagePosition,
-			.till = position(till)
+			.from = range.from ? position(range.from) : MinMessagePosition,
+			.till = position(range.till)
 		},
 		count);
 }
 
 void PinnedMessages::remove(MsgId messageId) {
-	_list.removeOne(MessagePosition{
-		.fullId = FullMsgId(0, messageId),
-	});
+	_list.removeOne(position(messageId));
 }
 
 void PinnedMessages::setTopId(MsgId messageId) {
@@ -70,19 +86,15 @@ void PinnedMessages::setTopId(MsgId messageId) {
 			break;
 		}
 	}
-	const auto position = MessagePosition{
-		.fullId = FullMsgId(0, messageId),
-	};
+	const auto wrapped = position(messageId);
 	_list.addSlice(
-		{ position },
-		{ .from = position, .till = MaxMessagePosition },
+		{ wrapped },
+		{ .from = wrapped, .till = MaxMessagePosition },
 		std::nullopt);
 }
 
 void PinnedMessages::clearLessThanId(MsgId messageId) {
-	_list.removeLessThan(MessagePosition{
-		.fullId = FullMsgId(0, messageId),
-	});
+	_list.removeLessThan(position(messageId));
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_pinned_messages.h b/Telegram/SourceFiles/data/data_pinned_messages.h
index 7f825a343..33cf120e5 100644
--- a/Telegram/SourceFiles/data/data_pinned_messages.h
+++ b/Telegram/SourceFiles/data/data_pinned_messages.h
@@ -8,21 +8,31 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "data/data_messages.h"
+#include "base/weak_ptr.h"
 
 namespace Data {
 
-class PinnedMessages final {
+struct PinnedAroundId {
+	std::vector<MsgId> ids;
+	std::optional<int> skippedBefore;
+	std::optional<int> skippedAfter;
+	std::optional<int> fullCount;
+};
+
+class PinnedMessages final : public base::has_weak_ptr {
 public:
 	explicit PinnedMessages(ChannelId channelId);
 
 	[[nodiscard]] bool empty() const;
 	[[nodiscard]] MsgId topId() const;
+	[[nodiscard]] rpl::producer<PinnedAroundId> viewer(
+		MsgId aroundId,
+		int limit) const;
 
 	void add(MsgId messageId);
 	void add(
 		std::vector<MsgId> &&ids,
-		MsgId from,
-		MsgId till,
+		MsgRange range,
 		std::optional<int> count);
 	void remove(MsgId messageId);
 
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 814252ba2..84d8d5a76 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -1161,7 +1161,7 @@ void History::addEdgesToSharedMedia() {
 			{},
 			{ from, till }));
 	}
-	peer->addPinnedSlice({}, from, till);
+	peer->addPinnedSlice({}, { from, till }, std::nullopt);
 }
 
 void History::addOlderSlice(const QVector<MTPMessage> &slice) {
@@ -1358,7 +1358,7 @@ void History::addToSharedMedia(
 				{ from, till }));
 		}
 	}
-	peer->addPinnedSlice(std::move(pinned), from, till);
+	peer->addPinnedSlice(std::move(pinned), { from, till }, std::nullopt);
 }
 
 void History::calculateFirstUnreadMessage() {
@@ -1785,16 +1785,19 @@ TimeId History::adjustedChatListTimeId() const {
 }
 
 void History::countScrollState(int top) {
-	countScrollTopItem(top);
-	if (scrollTopItem) {
-		scrollTopOffset = (top - scrollTopItem->block()->y() - scrollTopItem->y());
-	}
+	std::tie(scrollTopItem, scrollTopOffset) = findItemAndOffset(top);
 }
 
-void History::countScrollTopItem(int top) {
+auto History::findItemAndOffset(int top) const -> std::pair<Element*, int> {
+	if (const auto element = findScrollTopItem(top)) {
+		return { element, (top - element->block()->y() - element->y()) };
+	}
+	return {};
+}
+
+auto History::findScrollTopItem(int top) const -> Element* {
 	if (isEmpty()) {
-		forgetScrollState();
-		return;
+		return nullptr;
 	}
 
 	auto itemIndex = 0;
@@ -1813,8 +1816,7 @@ void History::countScrollTopItem(int top) {
 				const auto view = block->messages[itemIndex].get();
 				itemTop = block->y() + view->y();
 				if (itemTop <= top) {
-					scrollTopItem = view;
-					return;
+					return view;
 				}
 			}
 			if (--blockIndex >= 0) {
@@ -1824,27 +1826,24 @@ void History::countScrollTopItem(int top) {
 			}
 		} while (true);
 
-		scrollTopItem = blocks.front()->messages.front().get();
-	} else {
-		// go forward through history while we don't find the last item that starts above
-		for (auto blocksCount = int(blocks.size()); blockIndex < blocksCount; ++blockIndex) {
-			const auto &block = blocks[blockIndex];
-			for (auto itemsCount = int(block->messages.size()); itemIndex < itemsCount; ++itemIndex) {
-				itemTop = block->y() + block->messages[itemIndex]->y();
-				if (itemTop > top) {
-					Assert(itemIndex > 0 || blockIndex > 0);
-					if (itemIndex > 0) {
-						scrollTopItem = block->messages[itemIndex - 1].get();
-					} else {
-						scrollTopItem = blocks[blockIndex - 1]->messages.back().get();
-					}
-					return;
-				}
-			}
-			itemIndex = 0;
-		}
-		scrollTopItem = blocks.back()->messages.back().get();
+		return blocks.front()->messages.front().get();
 	}
+	// go forward through history while we don't find the last item that starts above
+	for (auto blocksCount = int(blocks.size()); blockIndex < blocksCount; ++blockIndex) {
+		const auto &block = blocks[blockIndex];
+		for (auto itemsCount = int(block->messages.size()); itemIndex < itemsCount; ++itemIndex) {
+			itemTop = block->y() + block->messages[itemIndex]->y();
+			if (itemTop > top) {
+				Assert(itemIndex > 0 || blockIndex > 0);
+				if (itemIndex > 0) {
+					return block->messages[itemIndex - 1].get();
+				}
+				return blocks[blockIndex - 1]->messages.back().get();
+			}
+		}
+		itemIndex = 0;
+	}
+	return blocks.back()->messages.back().get();
 }
 
 void History::getNextScrollTopItem(HistoryBlock *block, int32 i) {
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index 44718865d..30b09844b 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -366,6 +366,8 @@ public:
 	// of the displayed window relative to the history start coordinate
 	void countScrollState(int top);
 
+	[[nodiscard]] std::pair<Element*, int> findItemAndOffset(int top) const;
+
 	MsgId nextNonHistoryEntryId();
 
 	bool folderKnown() const override;
@@ -422,7 +424,7 @@ private:
 	void getNextScrollTopItem(HistoryBlock *block, int32 i);
 
 	// helper method for countScrollState(int top)
-	void countScrollTopItem(int top);
+	[[nodiscard]] Element *findScrollTopItem(int top) const;
 
 	// this method just removes a block from the blocks list
 	// when the last item from this block was detached and
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 4700db368..288a23f89 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -88,6 +88,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "history/view/history_view_top_bar_widget.h"
 #include "history/view/history_view_contact_status.h"
+#include "history/view/history_view_pinned_tracker.h"
 #include "base/qthelp_regex.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/text_options.h"
@@ -1697,7 +1698,8 @@ void HistoryWidget::showHistory(
 		_history->showAtMsgId = _showAtMsgId;
 
 		destroyUnreadBarOnClose();
-		destroyPinnedBar();
+		showPinnedMessage(FullMsgId());
+		_pinnedTracker = nullptr;
 		_membersDropdown.destroy();
 		_scrollToAnimation.stop();
 
@@ -1811,6 +1813,7 @@ void HistoryWidget::showHistory(
 
 		_updateHistoryItems.stop();
 
+		setupPinnedTracker();
 		pinnedMsgVisibilityUpdated();
 		if (_history->scrollTopItem
 			|| (_migrated && _migrated->scrollTopItem)
@@ -2732,6 +2735,7 @@ void HistoryWidget::delayedShowAt(MsgId showAtMsgId) {
 void HistoryWidget::onScroll() {
 	preloadHistoryIfNeeded();
 	visibleAreaUpdated();
+	updatePinnedViewer();
 	if (!_synteticScrollEvent) {
 		_lastUserScrolled = crl::now();
 	}
@@ -3211,6 +3215,7 @@ void HistoryWidget::doneShow() {
 		handlePendingHistoryUpdate();
 	}
 	preloadHistoryIfNeeded();
+	updatePinnedViewer();
 	checkHistoryActivation();
 	App::wnd()->setInnerFocus();
 }
@@ -5226,14 +5231,66 @@ void HistoryWidget::updatePinnedBar(bool force) {
 	}
 }
 
+void HistoryWidget::updatePinnedViewer() {
+	if (_firstLoadRequest
+		|| _delayedShowAtRequest
+		|| _scroll->isHidden()
+		|| !_history
+		|| !_historyInited) {
+		return;
+	}
+	const auto [item, offset] = [&] {
+		auto visibleTop = _scroll->scrollTop();
+		if (_migrated
+			&& _history->loadedAtBottom()
+			&& _migrated->loadedAtTop()) {
+			visibleTop -= _migrated->height();
+		}
+		auto [item, offset] = _history->findItemAndOffset(visibleTop);
+		while (item && !IsServerMsgId(item->data()->id)) {
+			offset -= item->height();
+			item = item->nextInBlocks();
+		}
+		return std::pair(item, offset);
+	}();
+	const auto last = _history->peer->topPinnedMessageId();
+	const auto lessThanId = item
+		? (item->data()->id + (offset > 0 ? 1 : 0))
+		: (last + 1);
+	_pinnedTracker->trackAround(lessThanId);
+}
+
+void HistoryWidget::setupPinnedTracker() {
+	Expects(_history != nullptr);
+
+	_pinnedTracker = std::make_unique<HistoryView::PinnedTracker>(_history);
+	_pinnedTracker->shownMessageId(
+	) | rpl::start_with_next([=](MsgId messageId) {
+		showPinnedMessage({ peerToChannel(_peer->id), messageId });
+	}, _list->lifetime());
+}
+
+void HistoryWidget::showPinnedMessage(FullMsgId id) {
+	if (_pinnedId == id) {
+		return;
+	}
+	_pinnedId = id;
+	if (pinnedMsgVisibilityUpdated()) {
+		updateHistoryGeometry();
+		updateControlsVisibility();
+		updateControlsGeometry();
+		this->update();
+	}
+}
+
 bool HistoryWidget::pinnedMsgVisibilityUpdated() {
 	auto result = false;
-	auto pinnedId = _peer->topPinnedMessageId();
+	auto pinnedId = _pinnedId;
 	if (pinnedId && !_peer->canPinMessages()) {
 		const auto hiddenId = session().settings().hiddenPinnedMessageId(
 			_peer->id);
-		if (hiddenId == pinnedId) {
-			pinnedId = 0;
+		if (hiddenId == pinnedId.msg) {
+			pinnedId = FullMsgId();
 		} else if (hiddenId) {
 			session().settings().setHiddenPinnedMessageId(_peer->id, 0);
 			session().saveSettings();
@@ -5241,7 +5298,7 @@ bool HistoryWidget::pinnedMsgVisibilityUpdated() {
 	}
 	if (pinnedId) {
 		if (!_pinnedBar) {
-			_pinnedBar = std::make_unique<PinnedBar>(pinnedId, this);
+			_pinnedBar = std::make_unique<PinnedBar>(pinnedId.msg, this);
 			if (_a_show.animating()) {
 				_pinnedBar->cancel->hide();
 				_pinnedBar->shadow->hide();
@@ -5261,8 +5318,8 @@ bool HistoryWidget::pinnedMsgVisibilityUpdated() {
 			if (!barTop || _scroll->scrollTop() != *barTop) {
 				synteticScrollToY(_scroll->scrollTop() + st::historyReplyHeight);
 			}
-		} else if (_pinnedBar->msgId != pinnedId) {
-			_pinnedBar->msgId = pinnedId;
+		} else if (_pinnedBar->msgId != pinnedId.msg) {
+			_pinnedBar->msgId = pinnedId.msg;
 			_pinnedBar->msg = nullptr;
 			_pinnedBar->text.clear();
 			updatePinnedBar();
@@ -5565,7 +5622,7 @@ void HistoryWidget::UnpinMessage(not_null<PeerData*> peer, MsgId msgId) {
 }
 
 void HistoryWidget::hidePinnedMessage() {
-	const auto pinnedId = _peer ? _peer->topPinnedMessageId() : MsgId(0);
+	const auto pinnedId = _pinnedId;
 	if (!pinnedId) {
 		if (pinnedMsgVisibilityUpdated()) {
 			updateControlsGeometry();
@@ -5575,11 +5632,9 @@ void HistoryWidget::hidePinnedMessage() {
 	}
 
 	if (_peer->canPinMessages()) {
-		unpinMessage(FullMsgId(
-			_peer->isChannel() ? peerToChannel(_peer->id) : NoChannel,
-			pinnedId));
+		unpinMessage(pinnedId);
 	} else {
-		session().settings().setHiddenPinnedMessageId(_peer->id, pinnedId);
+		session().settings().setHiddenPinnedMessageId(_peer->id, pinnedId.msg);
 		session().saveSettings();
 		if (pinnedMsgVisibilityUpdated()) {
 			updateControlsGeometry();
@@ -6389,7 +6444,9 @@ void HistoryWidget::drawPinnedBar(Painter &p) {
 		p.setPen(st::historyReplyNameFg);
 		p.setFont(st::msgServiceNameFont);
 		const auto poll = media ? media->poll() : nullptr;
-		const auto pinnedHeader = !poll
+		const auto pinnedHeader = (_pinnedBar->msgId < _peer->topPinnedMessageId())
+			? tr::lng_pinned_previous(tr::now)
+			: !poll
 			? tr::lng_pinned_message(tr::now)
 			: poll->quiz()
 			? tr::lng_pinned_quiz(tr::now)
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 12f943212..e23a4de00 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -93,6 +93,7 @@ namespace HistoryView {
 class TopBarWidget;
 class ContactStatus;
 class Element;
+class PinnedTracker;
 } // namespace HistoryView
 
 class DragArea;
@@ -491,9 +492,12 @@ private:
 	void updateReplyEditTexts(bool force = false);
 	void updateReplyEditText(not_null<HistoryItem*> item);
 
+	void showPinnedMessage(FullMsgId id);
 	void updatePinnedBar(bool force = false);
 	bool pinnedMsgVisibilityUpdated();
 	void destroyPinnedBar();
+	void updatePinnedViewer();
+	void setupPinnedTracker();
 
 	void sendInlineResult(
 		not_null<InlineBots::Result*> result,
@@ -610,7 +614,9 @@ private:
 
 	object_ptr<Ui::IconButton> _fieldBarCancel;
 
+	FullMsgId _pinnedId;
 	std::unique_ptr<PinnedBar> _pinnedBar;
+	std::unique_ptr<HistoryView::PinnedTracker> _pinnedTracker;
 
 	mtpRequestId _saveEditMsgRequestId = 0;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
new file mode 100644
index 000000000..ea6f076d7
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
@@ -0,0 +1,247 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_pinned_tracker.h"
+
+#include "data/data_changes.h"
+#include "data/data_pinned_messages.h"
+#include "data/data_peer.h"
+#include "data/data_channel.h"
+#include "data/data_session.h"
+#include "data/data_histories.h"
+#include "main/main_session.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "apiwrap.h"
+
+namespace HistoryView {
+namespace {
+
+constexpr auto kLoadedLimit = 4;
+constexpr auto kPerPage = 40;
+
+} // namespace
+
+PinnedTracker::PinnedTracker(not_null<History*> history) : _history(history) {
+	_history->session().changes().peerFlagsValue(
+		_history->peer,
+		Data::PeerUpdate::Flag::PinnedMessage
+	) | rpl::start_with_next([=] {
+		refreshData();
+	}, _lifetime);
+}
+
+PinnedTracker::~PinnedTracker() {
+	_history->owner().histories().cancelRequest(_beforeRequestId);
+	_history->owner().histories().cancelRequest(_afterRequestId);
+}
+
+rpl::producer<MsgId> PinnedTracker::shownMessageId() const {
+	return _current.value();
+}
+
+void PinnedTracker::refreshData() {
+	const auto now = _history->peer->currentPinnedMessages();
+	if (!now) {
+		_dataLifetime.destroy();
+		_current = MsgId(0);
+	} else if (_data.get() != now) {
+		_dataLifetime.destroy();
+		_data = now;
+		if (_aroundId) {
+			setupViewer(now);
+		}
+	}
+}
+
+void PinnedTracker::trackAround(MsgId messageId) {
+	if (_aroundId == messageId) {
+		return;
+	}
+	_dataLifetime.destroy();
+	_aroundId = messageId;
+	if (!_aroundId) {
+		_current = MsgId(0);
+	} else if (const auto now = _data.get()) {
+		setupViewer(now);
+	}
+}
+
+void PinnedTracker::setupViewer(not_null<Data::PinnedMessages*> data) {
+	data->viewer(
+		_aroundId,
+		kLoadedLimit + 2
+	) | rpl::start_with_next([=](const Data::PinnedAroundId &snapshot) {
+		const auto i = ranges::lower_bound(snapshot.ids, _aroundId);
+		const auto empty = snapshot.ids.empty();
+		const auto before = (i - begin(snapshot.ids));
+		const auto after = (end(snapshot.ids) - i);
+		if (before < kLoadedLimit && !snapshot.skippedBefore) {
+			load(
+				Data::LoadDirection::Before,
+				empty ? _aroundId : snapshot.ids.front());
+		}
+		if (after < kLoadedLimit && !snapshot.skippedAfter) {
+			load(
+				Data::LoadDirection::After,
+				empty ? _aroundId : snapshot.ids.back());
+		}
+		if (i != begin(snapshot.ids)) {
+			_current = *(i - 1);
+		} else if (snapshot.skippedBefore == 0) {
+			_current = 0;
+		}
+	}, _dataLifetime);
+}
+
+void PinnedTracker::load(Data::LoadDirection direction, MsgId id) {
+	const auto requestId = (direction == Data::LoadDirection::Before)
+		? &_beforeRequestId
+		: &_afterRequestId;
+	const auto aroundId = (direction == Data::LoadDirection::Before)
+		? &_beforeId
+		: &_afterId;
+	if (*requestId) {
+		if (*aroundId == id) {
+			return;
+		}
+		_history->owner().histories().cancelRequest(*requestId);
+	}
+	*aroundId = id;
+	const auto send = [=](Fn<void()> finish) {
+		const auto offsetId = [&] {
+			switch (direction) {
+			case Data::LoadDirection::Before: return id;
+			case Data::LoadDirection::After: return id + 1;
+			}
+			Unexpected("Direction in PinnedTracker::load");
+		}();
+		const auto addOffset = [&] {
+			switch (direction) {
+			case Data::LoadDirection::Before: return 0;
+			case Data::LoadDirection::After: return -kPerPage;
+			}
+			Unexpected("Direction in PinnedTracker::load");
+		}();
+		return _history->session().api().request(MTPmessages_Search(
+			MTP_flags(0),
+			_history->peer->input,
+			MTP_string(QString()),
+			MTP_inputPeerEmpty(),
+			MTPint(), // top_msg_id
+			MTP_inputMessagesFilterPinned(),
+			MTP_int(0),
+			MTP_int(0),
+			MTP_int(offsetId),
+			MTP_int(addOffset),
+			MTP_int(kPerPage),
+			MTP_int(0), // max_id
+			MTP_int(0), // min_id
+			MTP_int(0) // hash
+		)).done([=](const MTPmessages_Messages &result) {
+			*aroundId = 0;
+			*requestId = 0;
+			finish();
+
+			apply(direction, id, result);
+		}).fail([=](const RPCError &error) {
+			*aroundId = 0;
+			*requestId = 0;
+			finish();
+		}).send();
+	};
+	_beforeRequestId = _history->owner().histories().sendRequest(
+		_history,
+		Data::Histories::RequestType::History,
+		send);
+}
+
+void PinnedTracker::apply(
+		Data::LoadDirection direction,
+		MsgId aroundId,
+		const MTPmessages_Messages &result) {
+	auto noSkipRange = MsgRange{ aroundId, aroundId };
+	auto fullCount = std::optional<int>();
+	auto messages = [&] {
+		switch (result.type()) {
+		case mtpc_messages_messages: {
+			auto &d = result.c_messages_messages();
+			_history->owner().processUsers(d.vusers());
+			_history->owner().processChats(d.vchats());
+			fullCount = d.vmessages().v.size();
+			return &d.vmessages().v;
+		} break;
+
+		case mtpc_messages_messagesSlice: {
+			auto &d = result.c_messages_messagesSlice();
+			_history->owner().processUsers(d.vusers());
+			_history->owner().processChats(d.vchats());
+			fullCount = d.vcount().v;
+			return &d.vmessages().v;
+		} break;
+
+		case mtpc_messages_channelMessages: {
+			auto &d = result.c_messages_channelMessages();
+			if (auto channel = _history->peer->asChannel()) {
+				channel->ptsReceived(d.vpts().v);
+			} else {
+				LOG(("API Error: received messages.channelMessages when "
+					"no channel was passed! (PinnedTracker::apply)"));
+			}
+			_history->owner().processUsers(d.vusers());
+			_history->owner().processChats(d.vchats());
+			fullCount = d.vcount().v;
+			return &d.vmessages().v;
+		} break;
+
+		case mtpc_messages_messagesNotModified: {
+			LOG(("API Error: received messages.messagesNotModified! "
+				"(PinnedTracker::apply)"));
+			return (const QVector<MTPMessage>*)nullptr;
+		} break;
+		}
+		Unexpected("messages.Messages type in PinnedTracker::apply.");
+	}();
+
+	if (!messages) {
+		return;
+	}
+
+	const auto addType = NewMessageType::Existing;
+	auto list = std::vector<MsgId>();
+	list.reserve(messages->size());
+	for (const auto &message : *messages) {
+		const auto item = _history->owner().addNewMessage(
+			message,
+			MTPDmessage_ClientFlags(),
+			addType);
+		if (item) {
+			const auto itemId = item->id;
+			if (item->isPinned()) {
+				list.push_back(itemId);
+			}
+			accumulate_min(noSkipRange.from, itemId);
+			accumulate_max(noSkipRange.till, itemId);
+		}
+	}
+	if (aroundId && list.empty()) {
+		noSkipRange = [&]() -> MsgRange {
+			switch (direction) {
+			case Data::LoadDirection::Before: // All old loaded.
+				return { 0, noSkipRange.till };
+			case Data::LoadDirection::Around: // All loaded.
+				return { 0, ServerMaxMsgId };
+			case Data::LoadDirection::After: // All new loaded.
+				return { noSkipRange.from, ServerMaxMsgId };
+			}
+			Unexpected("Direction in PinnedTracker::apply.");
+		}();
+	}
+	_history->peer->addPinnedSlice(std::move(list), noSkipRange, fullCount);
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
new file mode 100644
index 000000000..e34df6af4
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
@@ -0,0 +1,52 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class History;
+
+namespace Data {
+class PinnedMessages;
+enum class LoadDirection : char;
+} // namespace Data
+
+namespace HistoryView {
+
+class PinnedTracker final {
+public:
+	explicit PinnedTracker(not_null<History*> history);
+	~PinnedTracker();
+
+	[[nodiscard]] rpl::producer<MsgId> shownMessageId() const;
+	void trackAround(MsgId messageId);
+
+private:
+	void refreshData();
+	void setupViewer(not_null<Data::PinnedMessages*> data);
+	void load(Data::LoadDirection direction, MsgId id);
+	void apply(
+		Data::LoadDirection direction,
+		MsgId aroundId,
+		const MTPmessages_Messages &result);
+
+	const not_null<History*> _history;
+
+	base::weak_ptr<Data::PinnedMessages> _data;
+	rpl::variable<MsgId> _current = MsgId();
+	rpl::lifetime _dataLifetime;
+
+	MsgId _aroundId = 0;
+	MsgId _beforeId = 0;
+	MsgId _afterId = 0;
+	MsgId _beforeRequestId = 0;
+	MsgId _afterRequestId = 0;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace HistoryView

From ae298818a8ae3200a4d4e749ca6af7bfb6903d09 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 10 Oct 2020 12:15:37 +0300
Subject: [PATCH 080/190] Implement message bar with animations.

---
 Telegram/CMakeLists.txt                       |   7 +-
 Telegram/SourceFiles/api/api_sending.cpp      |   2 +-
 Telegram/SourceFiles/apiwrap.cpp              |   2 +-
 Telegram/SourceFiles/app.cpp                  |   2 +-
 .../SourceFiles/boxes/add_contact_box.cpp     |   2 +-
 .../boxes/background_preview_box.cpp          |   2 +-
 Telegram/SourceFiles/boxes/connection_box.cpp |   2 +-
 .../SourceFiles/boxes/edit_caption_box.cpp    |   4 +-
 Telegram/SourceFiles/boxes/language_box.cpp   |   2 +-
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |   2 +-
 .../boxes/peers/edit_participant_box.cpp      |   2 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp |   4 +-
 Telegram/SourceFiles/boxes/share_box.cpp      |   4 +-
 Telegram/SourceFiles/calls/calls_panel.cpp    |   2 +-
 .../SourceFiles/chat_helpers/bot_keyboard.cpp |   2 +-
 .../chat_helpers/field_autocomplete.cpp       |   2 +-
 .../chat_helpers/message_field.cpp            |   2 +-
 .../stickers_emoji_image_loader.cpp           |   2 +-
 .../chat_helpers/stickers_emoji_pack.cpp      |   2 +-
 Telegram/SourceFiles/core/application.cpp     |   2 +-
 .../SourceFiles/data/data_media_types.cpp     |   2 +-
 Telegram/SourceFiles/data/data_peer.cpp       |   2 +-
 Telegram/SourceFiles/data/data_poll.cpp       |   2 +-
 Telegram/SourceFiles/data/data_user.cpp       |   2 +-
 .../dialogs/dialogs_inner_widget.cpp          |   2 +-
 .../SourceFiles/dialogs/dialogs_layout.cpp    |   2 +-
 Telegram/SourceFiles/dialogs/dialogs_row.cpp  |   2 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    |   2 +-
 Telegram/SourceFiles/facades.cpp              |   2 +-
 .../admin_log/history_admin_log_inner.cpp     |   2 +-
 .../admin_log/history_admin_log_section.cpp   |   2 +-
 Telegram/SourceFiles/history/history.cpp      |   2 +-
 .../history/history_inner_widget.cpp          |   4 +-
 Telegram/SourceFiles/history/history_item.cpp |   4 +-
 .../history/history_item_components.cpp       |   4 +-
 .../SourceFiles/history/history_item_text.cpp |   2 +-
 .../SourceFiles/history/history_message.cpp   |   4 +-
 .../SourceFiles/history/history_service.cpp   |   2 +-
 .../SourceFiles/history/history_widget.cpp    |   4 +-
 .../view/history_view_compose_controls.cpp    |   4 +-
 .../view/history_view_contact_status.cpp      |   2 +-
 .../history/view/history_view_element.cpp     |   2 +-
 .../history/view/history_view_list_widget.cpp |   2 +-
 .../history/view/history_view_message.cpp     |   2 +-
 .../view/history_view_replies_section.cpp     |   4 +-
 .../view/history_view_schedule_box.cpp        |   2 +-
 .../view/history_view_scheduled_section.cpp   |   4 +-
 .../history/view/history_view_send_action.cpp |   2 +-
 .../view/history_view_service_message.cpp     |   4 +-
 .../view/history_view_top_bar_widget.cpp      |   2 +-
 .../history/view/media/history_view_call.cpp  |   2 +-
 .../view/media/history_view_contact.cpp       |   4 +-
 .../history/view/media/history_view_dice.cpp  |   2 +-
 .../view/media/history_view_document.cpp      |   2 +-
 .../history/view/media/history_view_file.cpp  |   2 +-
 .../history/view/media/history_view_game.cpp  |   4 +-
 .../history/view/media/history_view_gif.cpp   |   2 +-
 .../view/media/history_view_invoice.cpp       |   4 +-
 .../view/media/history_view_large_emoji.cpp   |   2 +-
 .../view/media/history_view_location.cpp      |   4 +-
 .../history/view/media/history_view_media.cpp |   4 +-
 .../view/media/history_view_media_common.cpp  |   2 +-
 .../view/media/history_view_media_grouped.cpp |   4 +-
 .../media/history_view_media_unwrapped.cpp    |   2 +-
 .../history/view/media/history_view_photo.cpp |   2 +-
 .../history/view/media/history_view_poll.cpp  |   4 +-
 .../view/media/history_view_sticker.cpp       |   2 +-
 .../media/history_view_theme_document.cpp     |   2 +-
 .../view/media/history_view_web_page.cpp      |   4 +-
 .../inline_bot_layout_internal.cpp            |   2 +-
 Telegram/SourceFiles/mainwidget.cpp           |   4 +-
 .../media/player/media_player_float.cpp       |   2 +-
 .../media/view/media_view_overlay_widget.cpp  |   4 +-
 Telegram/SourceFiles/overview/overview.style  |   2 +-
 .../SourceFiles/overview/overview_layout.cpp  |   4 +-
 .../passport/passport_panel_edit_scans.cpp    |   2 +-
 .../passport/passport_panel_form.cpp          |   2 +-
 .../profile/profile_block_peer_list.cpp       |   2 +-
 .../settings/settings_privacy_controllers.cpp |   2 +-
 .../SourceFiles/support/support_helper.cpp    |   2 +-
 .../history.style => ui/chat/chat.style}      |  18 ++
 Telegram/SourceFiles/ui/chat/message_bar.cpp  | 295 ++++++++++++++++++
 Telegram/SourceFiles/ui/chat/message_bar.h    |  88 ++++++
 Telegram/SourceFiles/ui/empty_userpic.cpp     |   2 +-
 Telegram/SourceFiles/ui/item_text_options.cpp |  70 +++++
 Telegram/SourceFiles/ui/item_text_options.h   |  27 ++
 Telegram/SourceFiles/ui/special_buttons.cpp   |   2 +-
 .../ui/{ => text}/text_options.cpp            |  60 +---
 .../SourceFiles/ui/{ => text}/text_options.h  |  12 -
 Telegram/SourceFiles/ui/ui_pch.h              |   3 +
 .../SourceFiles/ui/widgets/multi_select.cpp   |   2 +-
 .../window/notifications_manager_default.cpp  |   2 +-
 .../window/themes/window_theme.cpp            |   2 +-
 .../window/themes/window_theme_preview.cpp    |   4 +-
 .../themes/window_themes_cloud_list.cpp       |   2 +-
 Telegram/SourceFiles/window/window.style      |   2 +-
 .../window/window_history_hider.cpp           |   2 +-
 .../window/window_media_preview.cpp           |   2 +-
 Telegram/cmake/td_ui.cmake                    |   7 +
 99 files changed, 626 insertions(+), 187 deletions(-)
 rename Telegram/SourceFiles/{history/history.style => ui/chat/chat.style} (98%)
 create mode 100644 Telegram/SourceFiles/ui/chat/message_bar.cpp
 create mode 100644 Telegram/SourceFiles/ui/chat/message_bar.h
 create mode 100644 Telegram/SourceFiles/ui/item_text_options.cpp
 create mode 100644 Telegram/SourceFiles/ui/item_text_options.h
 rename Telegram/SourceFiles/ui/{ => text}/text_options.cpp (70%)
 rename Telegram/SourceFiles/ui/{ => text}/text_options.h (66%)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index fed5b1ce2..abc87d05b 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -41,9 +41,7 @@ set(style_files
     boxes/boxes.style
     calls/calls.style
     chat_helpers/chat_helpers.style
-    dialogs/dialogs.style
     export/view/export.style
-    history/history.style
     info/info.style
     intro/intro.style
     media/view/media_view.style
@@ -53,7 +51,6 @@ set(style_files
     profile/profile.style
     settings/settings.style
     ui/filter_icons.style
-    window/window.style
 )
 
 set(dependent_style_files
@@ -1026,6 +1023,8 @@ PRIVATE
     ui/filter_icon_panel.h
     ui/grouped_layout.cpp
     ui/grouped_layout.h
+    ui/item_text_options.cpp
+    ui/item_text_options.h
     ui/resize_area.h
     ui/search_field_controller.cpp
     ui/search_field_controller.h
@@ -1033,8 +1032,6 @@ PRIVATE
     ui/special_buttons.h
     ui/special_fields.cpp
     ui/special_fields.h
-    ui/text_options.cpp
-    ui/text_options.h
     ui/unread_badge.cpp
     ui/unread_badge.h
     window/main_window.cpp
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index 6d569ad4f..f33429433 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -22,7 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_message.h" // NewMessageFlags.
 #include "chat_helpers/message_field.h" // ConvertTextTagsToEntities.
 #include "ui/text/text_entity.h" // TextWithEntities.
-#include "ui/text_options.h" // Ui::ItemTextOptions.
+#include "ui/item_text_options.h" // Ui::ItemTextOptions.
 #include "main/main_session.h"
 #include "main/main_account.h"
 #include "main/main_app_config.h"
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 5c4cd1225..f78d3dcd4 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -64,7 +64,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/themes/window_theme.h"
 #include "inline_bots/inline_bot_result.h"
 #include "chat_helpers/message_field.h"
-#include "ui/text_options.h"
+#include "ui/item_text_options.h"
 #include "ui/emoji_config.h"
 #include "support/support_helper.h"
 #include "storage/localimageloader.h"
diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp
index 61a0b95cb..4be5be873 100644
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
@@ -44,7 +44,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_overview.h"
 #include "styles/style_media_view.h"
 #include "styles/style_chat_helpers.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_layers.h"
 
 #include <QtCore/QBuffer>
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index aab5438ba..c0419a5ef 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/special_buttons.h"
 #include "ui/special_fields.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/unread_badge.h"
 #include "ui/ui_utility.h"
 #include "data/data_channel.h"
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 6597fe75a..487cf333f 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -29,7 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/background_preview_box.h"
 #include "window/window_session_controller.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 
diff --git a/Telegram/SourceFiles/boxes/connection_box.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp
index 638251871..0ede048a0 100644
--- a/Telegram/SourceFiles/boxes/connection_box.cpp
+++ b/Telegram/SourceFiles/boxes/connection_box.cpp
@@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/effects/animations.h"
 #include "ui/effects/radial_animation.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "facades.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 1f24fc049..b2e36864a 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -48,7 +48,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/checkbox.h"
 #include "ui/text/format_values.h"
 #include "ui/special_buttons.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "window/window_session_controller.h"
 #include "confirm_box.h"
 #include "apiwrap.h"
@@ -57,7 +57,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 #include <QtCore/QMimeData>
 
diff --git a/Telegram/SourceFiles/boxes/language_box.cpp b/Telegram/SourceFiles/boxes/language_box.cpp
index d852281a8..53ba3f53e 100644
--- a/Telegram/SourceFiles/boxes/language_box.cpp
+++ b/Telegram/SourceFiles/boxes/language_box.cpp
@@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/slide_wrap.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/toast/toast.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "storage/localstorage.h"
 #include "boxes/confirm_box.h"
 #include "mainwidget.h"
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index ec4c6cf46..9b8a5d51e 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "ui/empty_userpic.h"
 #include "ui/wrap/slide_wrap.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "lang/lang_keys.h"
 #include "storage/file_download.h"
 #include "data/data_peer_values.h"
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
index 7f82a7f3b..ab18b9f87 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
@@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 #include "ui/toast/toast.h"
 #include "ui/text/text_utilities.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/special_buttons.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "settings/settings_privacy_security.h"
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 5a0ca8ce9..fcfc37789 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -33,7 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/fade_wrap.h"
 #include "ui/text/format_values.h"
 #include "ui/grouped_layout.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/special_buttons.h"
 #include "lottie/lottie_single_player.h"
 #include "data/data_document.h"
@@ -44,7 +44,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/core_settings.h"
 #include "facades.h" // App::LambdaDelayed.
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index eb377c0b3..da1dd35fb 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/wrap/slide_wrap.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "chat_helpers/message_field.h"
 #include "chat_helpers/send_context_menu.h"
 #include "history/history.h"
@@ -40,7 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 class ShareBox::Inner final : public Ui::RpWidget, private base::Subscriber {
 public:
diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index 4ad6195fe..10b1d6bd3 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -42,7 +42,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "app.h"
 #include "webrtc/webrtc_video_track.h"
 #include "styles/style_calls.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 #ifdef Q_OS_WIN
 #include "ui/platform/win/ui_window_title_win.h"
diff --git a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
index 39ce30e89..375039449 100644
--- a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
+++ b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
@@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "facades.h"
 #include "app.h"
 #include "styles/style_widgets.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace {
 
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index a290af8cc..de207c1b5 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -33,7 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "facades.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_widgets.h"
 #include "styles/style_chat_helpers.h"
 
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 33f7f12f2..2513d507e 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -29,7 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 #include <QtCore/QMimeData>
 #include <QtCore/QStack>
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp b/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp
index fa47ce5f7..9829009fa 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_image_loader.cpp
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "chat_helpers/stickers_emoji_image_loader.h"
 
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace Stickers {
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
index a4cf34643..1cfec6d02 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp
@@ -22,7 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/call_delayed.h"
 #include "apiwrap.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 #include <QtCore/QBuffer>
 
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index d0f45f9b9..74152204e 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -57,7 +57,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_location_manager.h"
 #include "ui/widgets/tooltip.h"
 #include "ui/image/image.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/emoji_config.h"
 #include "ui/effects/animations.h"
 #include "storage/serialize_common.h"
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 6c2301ea8..40309e4c5 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -26,7 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_dice.h"
 #include "ui/image/image.h"
 #include "ui/text/format_values.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/emoji_config.h"
 #include "storage/storage_shared_media.h"
 #include "storage/localstorage.h"
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 27347867c..a74f95714 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -32,7 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "ui/image/image.h"
 #include "ui/empty_userpic.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "history/history.h"
 #include "history/view/history_view_element.h"
 #include "history/history_item.h"
diff --git a/Telegram/SourceFiles/data/data_poll.cpp b/Telegram/SourceFiles/data/data_poll.cpp
index 202edef2e..63ceb2a1a 100644
--- a/Telegram/SourceFiles/data/data_poll.cpp
+++ b/Telegram/SourceFiles/data/data_poll.cpp
@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/call_delayed.h"
 #include "main/main_session.h"
 #include "api/api_text_entities.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 
 namespace {
 
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index 84b3b510a..099da8df1 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "apiwrap.h"
 #include "lang/lang_keys.h"
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index d7b03c4b8..5aa666cc9 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/text/text_utilities.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/ui_utility.h"
 #include "data/data_drafts.h"
 #include "data/data_folder.h"
diff --git a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
index 4d44581b4..c8641fa1c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
@@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_window.h"
 #include "storage/localstorage.h"
 #include "ui/empty_userpic.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/unread_badge.h"
 #include "lang/lang_keys.h"
 #include "support/support_helper.h"
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
index 1e26442ad..97e045275 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/dialogs_row.h"
 
 #include "ui/effects/ripple_animation.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "dialogs/dialogs_entry.h"
 #include "data/data_folder.h"
 #include "data/data_peer_values.h"
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 731a4f957..b2840faeb 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -45,7 +45,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "facades.h"
 #include "app.h"
 #include "styles/style_dialogs.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_info.h"
 #include "styles/style_window.h"
 
diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp
index e5b23fccb..bf3c6989c 100644
--- a/Telegram/SourceFiles/facades.cpp
+++ b/Telegram/SourceFiles/facades.cpp
@@ -31,8 +31,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/view/media/history_view_media.h"
-#include "styles/style_history.h"
 #include "data/data_session.h"
+#include "styles/style_chat.h"
 
 namespace {
 
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
index b3908f152..f2a3a7753 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/admin_log/history_admin_log_inner.h"
 
-#include "styles/style_history.h"
 #include "history/history.h"
 #include "history/view/media/history_view_media.h"
 #include "history/view/media/history_view_web_page.h"
@@ -50,6 +49,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "facades.h"
 #include "app.h"
+#include "styles/style_chat.h"
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QClipboard>
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
index 351c2e59a..4200080ce 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
@@ -28,7 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "lang/lang_keys.h"
 #include "facades.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_window.h"
 #include "styles/style_info.h"
 
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 84d8d5a76..973e26aff 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -42,7 +42,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 //#include "storage/storage_feed_messages.h" // #feed
 #include "support/support_helper.h"
 #include "ui/image/image.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "core/crash_reports.h"
 #include "core/application.h"
 #include "base/unixtime.h"
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 9489ea8f7..e44c610b8 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/popup_menu.h"
 #include "ui/image/image.h"
 #include "ui/toast/toast.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/ui_utility.h"
 #include "ui/inactive_press.h"
 #include "window/window_session_controller.h"
@@ -62,7 +62,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/stickers/data_stickers.h"
 #include "facades.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_window.h" // st::windowMinWidth
 
 #include <QtGui/QClipboard>
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index e75ed612c..0bae6ffd7 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/clip/media_clip_reader.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/text_isolated_emoji.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "storage/file_upload.h"
 #include "storage/storage_facade.h"
 #include "storage/storage_shared_media.h"
@@ -44,7 +44,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_chat.h"
 #include "data/data_user.h"
 #include "styles/style_dialogs.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace {
 
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 817ef5aec..8a7f5e784 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "ui/image/image.h"
 #include "ui/toast/toast.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "history/history.h"
 #include "history/history_message.h"
 #include "history/view/history_view_service_message.h"
@@ -28,7 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "facades.h"
 #include "styles/style_widgets.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 #include <QtGui/QGuiApplication>
 
diff --git a/Telegram/SourceFiles/history/history_item_text.cpp b/Telegram/SourceFiles/history/history_item_text.cpp
index a21fb3460..3af55f05c 100644
--- a/Telegram/SourceFiles/history/history_item_text.cpp
+++ b/Telegram/SourceFiles/history/history_item_text.cpp
@@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_groups.h"
 #include "data/data_peer.h"
 #include "lang/lang_keys.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 
 TextForMimeData WrapAsReply(
 		TextForMimeData &&text,
diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp
index e6cb8970f..dba278fe5 100644
--- a/Telegram/SourceFiles/history/history_message.cpp
+++ b/Telegram/SourceFiles/history/history_message.cpp
@@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/text/text_isolated_emoji.h"
 #include "ui/text/format_values.h"
-#include "ui/text_options.h"
+#include "ui/item_text_options.h"
 #include "core/application.h"
 #include "core/ui_integration.h"
 #include "window/notifications_manager.h"
@@ -44,7 +44,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "app.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_widgets.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_window.h"
 
 #include <QtGui/QGuiApplication>
diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index b3e61a7cf..70b50a101 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -29,7 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "storage/storage_shared_media.h"
 #include "ui/text/format_values.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 
 namespace {
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 288a23f89..7474dc637 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -91,7 +91,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_pinned_tracker.h"
 #include "base/qthelp_regex.h"
 #include "ui/widgets/popup_menu.h"
-#include "ui/text_options.h"
+#include "ui/item_text_options.h"
 #include "ui/unread_badge.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
@@ -109,7 +109,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/dialogs_key.h"
 #include "facades.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_window.h"
 #include "styles/style_boxes.h"
diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
index 73974f3f9..154495ed4 100644
--- a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
@@ -31,9 +31,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "media/audio/media_audio_capture.h"
 #include "media/audio/media_audio.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "ui/special_buttons.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/ui_utility.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/text/format_values.h"
diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
index 84555f5ff..d3457cee1 100644
--- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
@@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/confirm_box.h"
 #include "boxes/peers/edit_contact_box.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_layers.h"
 
 namespace HistoryView {
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index f8768d2c3..c6a6d5b11 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "layout.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 15aeb735e..a39adecef 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -37,7 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_peer.h"
 #include "facades.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 #include <QtWidgets/QApplication>
 #include <QtCore/QMimeData>
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index ab556e3a9..56d59d5af 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -32,7 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "facades.h"
 #include "app.h"
 #include "styles/style_widgets.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
 
 namespace HistoryView {
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index f5db39172..d7751ce84 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/shadow.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/layers/generic_box.h"
-#include "ui/text_options.h"
+#include "ui/item_text_options.h"
 #include "ui/toast/toast.h"
 #include "ui/text/format_values.h"
 #include "ui/special_buttons.h"
@@ -52,7 +52,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "facades.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_window.h"
 #include "styles/style_info.h"
 #include "styles/style_boxes.h"
diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
index 73960991b..f09de4f01 100644
--- a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
@@ -23,7 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/send_context_menu.h"
 #include "styles/style_info.h"
 #include "styles/style_layers.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 #include <QGuiApplication>
 
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 227b2a1fa..ce7b5e9f7 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
 #include "ui/layers/generic_box.h"
-#include "ui/text_options.h"
+#include "ui/item_text_options.h"
 #include "ui/toast/toast.h"
 #include "ui/special_buttons.h"
 #include "ui/ui_utility.h"
@@ -47,7 +47,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "facades.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_window.h"
 #include "styles/style_info.h"
 #include "styles/style_boxes.h"
diff --git a/Telegram/SourceFiles/history/view/history_view_send_action.cpp b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
index cd4ad548a..705ad5942 100644
--- a/Telegram/SourceFiles/history/view/history_view_send_action.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "lang/lang_keys.h"
 #include "ui/effects/animations.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "styles/style_dialogs.h"
 
 namespace HistoryView {
diff --git a/Telegram/SourceFiles/history/view/history_view_service_message.cpp b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
index c72050603..083b85ff4 100644
--- a/Telegram/SourceFiles/history/view/history_view_service_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
@@ -15,14 +15,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_abstract_structure.h"
 #include "data/data_chat.h"
 #include "data/data_channel.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "core/core_settings.h"
 #include "core/application.h"
 #include "mainwidget.h"
 #include "layout.h"
 #include "lang/lang_keys.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
index 7583e433f..289eca0e3 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -46,7 +46,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "facades.h"
 #include "styles/style_window.h"
 #include "styles/style_dialogs.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_info.h"
 
 namespace HistoryView {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_call.cpp b/Telegram/SourceFiles/history/view/media/history_view_call.cpp
index dfa64941b..982e7c459 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_call.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_call.cpp
@@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_media_types.h"
 #include "data/data_user.h"
 #include "main/main_session.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_contact.cpp b/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
index e563516e8..eb8a5ca37 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
@@ -18,14 +18,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_cursor_state.h"
 #include "window/window_session_controller.h"
 #include "ui/empty_userpic.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_media_types.h"
 #include "data/data_cloud_file.h"
 #include "main/main_session.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_dice.cpp b/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
index 5dcc98492..3a79c6924 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
@@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 158f2c71e..6eb21fba3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_media_types.h"
 #include "data/data_file_origin.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_file.cpp b/Telegram/SourceFiles/history/view/media/history_view_file.cpp
index b089cb36f..a32d63dc2 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_file.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_file.cpp
@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "data/data_document.h"
 #include "data/data_session.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_game.cpp b/Telegram/SourceFiles/history/view/media/history_view_game.cpp
index dcb8dbf65..133c008f3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_game.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_game.cpp
@@ -14,13 +14,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/media/history_view_media_common.h"
-#include "ui/text_options.h"
+#include "ui/item_text_options.h"
 #include "core/ui_integration.h"
 #include "data/data_session.h"
 #include "data/data_game.h"
 #include "data/data_media_types.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 6ea53e0ca..3fab69882 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -36,7 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document_media.h"
 #include "app.h"
 #include "layout.h" // FullSelection
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp b/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp
index 230227c43..5e3549655 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp
@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/media/history_view_photo.h"
 #include "history/view/media/history_view_media_common.h"
-#include "ui/text_options.h"
+#include "ui/item_text_options.h"
 #include "ui/text/format_values.h"
 #include "data/data_media_types.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_large_emoji.cpp b/Telegram/SourceFiles/history/view/media/history_view_large_emoji.cpp
index cde50e11b..56ac0ceb0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_large_emoji.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_large_emoji.cpp
@@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/image/image.h"
 #include "data/data_file_origin.h"
 #include "layout.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_location.cpp b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
index e07b932e2..70a1bfbd7 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_location.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
@@ -15,12 +15,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
 #include "ui/image/image.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "data/data_session.h"
 #include "data/data_file_origin.h"
 #include "data/data_cloud_file.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.cpp b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
index 7f4f47b2a..64eb1ff5d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
@@ -14,9 +14,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lottie/lottie_single_player.h"
 #include "storage/storage_shared_media.h"
 #include "data/data_document.h"
-#include "ui/text_options.h"
+#include "ui/item_text_options.h"
 #include "core/ui_integration.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
index 71d6a3b2c..200325885 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
@@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_document.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/view/media/history_view_theme_document.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
index 3e567220b..a756931aa 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -17,9 +17,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/storage_shared_media.h"
 #include "lang/lang_keys.h"
 #include "ui/grouped_layout.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "layout.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
index bf45d56fe..9345ad268 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
@@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/core_settings.h"
 #include "layout.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index 6421bab8c..193455a9e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -29,7 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_auto_download.h"
 #include "core/application.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
index 138816721..2738debf8 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
 #include "calls/calls_instance.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
 #include "ui/text/format_values.h"
 #include "ui/effects/animations.h"
@@ -30,7 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "layout.h" // FullSelection
 #include "apiwrap.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_widgets.h"
 #include "styles/style_window.h"
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
index 92884b2e6..15ee3cb28 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
@@ -30,7 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_file_origin.h"
 #include "lottie/lottie_single_player.h"
 #include "chat_helpers/stickers_lottie.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index 33e8432aa..437ab56c0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/themes/window_theme.h"
 #include "layout.h" // FullSelection
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
index 5e84f604a..4e4e395f3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/media/history_view_media_common.h"
 #include "ui/image/image.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/text/format_values.h"
 #include "layout.h" // FullSelection
 #include "data/data_session.h"
@@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_photo_media.h"
 #include "data/data_file_origin.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
index f63fd149e..dde873ad1 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@@ -29,7 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "app.h"
 #include "styles/style_overview.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_widgets.h"
 
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 2c3b51af3..847b82de3 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -39,7 +39,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/image/image.h"
 #include "ui/focus_persister.h"
 #include "ui/resize_area.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/emoji_config.h"
 #include "window/section_memento.h"
 #include "window/section_widget.h"
@@ -109,7 +109,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "app.h"
 #include "facades.h"
 #include "styles/style_dialogs.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_boxes.h"
 
 #include <QtCore/QCoreApplication>
diff --git a/Telegram/SourceFiles/media/player/media_player_float.cpp b/Telegram/SourceFiles/media/player/media_player_float.cpp
index ef201aee2..637f3a70b 100644
--- a/Telegram/SourceFiles/media/player/media_player_float.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_float.cpp
@@ -28,7 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "facades.h"
 #include "app.h"
 #include "styles/style_media_player.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 #include <QtWidgets/QApplication>
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 38bf76a48..4771cea59 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -23,7 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/platform/ui_platform_utility.h"
 #include "ui/toast/toast.h"
 #include "ui/text/format_values.h"
-#include "ui/text_options.h"
+#include "ui/item_text_options.h"
 #include "ui/ui_utility.h"
 #include "boxes/confirm_box.h"
 #include "media/audio/media_audio.h"
@@ -62,7 +62,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "facades.h"
 #include "app.h"
 #include "styles/style_media_view.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 #ifdef Q_OS_MAC
 #include "platform/mac/touchbar/mac_touchbar_media_view.h"
diff --git a/Telegram/SourceFiles/overview/overview.style b/Telegram/SourceFiles/overview/overview.style
index c5e0915e0..818d39ce9 100644
--- a/Telegram/SourceFiles/overview/overview.style
+++ b/Telegram/SourceFiles/overview/overview.style
@@ -6,7 +6,7 @@ For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 using "ui/basic.style";
-using "history/history.style";
+using "ui/chat/chat.style";
 using "ui/widgets/widgets.style";
 using "media/view/media_view.style";
 using "boxes/boxes.style";
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 2821f54d0..5a4096ec1 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_photo_media.h"
 #include "data/data_document_media.h"
 #include "styles/style_overview.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "core/file_utilities.h"
 #include "boxes/add_contact_box.h"
 #include "boxes/confirm_box.h"
@@ -37,7 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/round_checkbox.h"
 #include "ui/image/image.h"
 #include "ui/text/format_values.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "app.h"
 
 namespace Overview {
diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
index a9f019e85..5148a10f9 100644
--- a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
@@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "core/file_utilities.h"
 #include "lang/lang_keys.h"
 #include "boxes/abstract_box.h"
diff --git a/Telegram/SourceFiles/passport/passport_panel_form.cpp b/Telegram/SourceFiles/passport/passport_panel_form.cpp
index 826851c74..75eeba4c3 100644
--- a/Telegram/SourceFiles/passport/passport_panel_form.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_form.cpp
@@ -22,7 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/text/text_utilities.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/special_buttons.h"
 #include "styles/style_passport.h"
 #include "styles/style_layers.h"
diff --git a/Telegram/SourceFiles/profile/profile_block_peer_list.cpp b/Telegram/SourceFiles/profile/profile_block_peer_list.cpp
index 23e9e8596..60c198f62 100644
--- a/Telegram/SourceFiles/profile/profile_block_peer_list.cpp
+++ b/Telegram/SourceFiles/profile/profile_block_peer_list.cpp
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "profile/profile_block_peer_list.h"
 
 #include "ui/effects/ripple_animation.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "data/data_peer.h"
 #include "data/data_cloud_file.h"
 #include "main/main_session.h"
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index bc66f2c60..786e1f5f4 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -37,7 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_privacy_security.h"
 #include "facades.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_boxes.h"
 #include "styles/style_settings.h"
 
diff --git a/Telegram/SourceFiles/support/support_helper.cpp b/Telegram/SourceFiles/support/support_helper.cpp
index 5b73d2c00..82c2fd328 100644
--- a/Telegram/SourceFiles/support/support_helper.cpp
+++ b/Telegram/SourceFiles/support/support_helper.cpp
@@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/text/text_entity.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "chat_helpers/message_field.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "base/unixtime.h"
diff --git a/Telegram/SourceFiles/history/history.style b/Telegram/SourceFiles/ui/chat/chat.style
similarity index 98%
rename from Telegram/SourceFiles/history/history.style
rename to Telegram/SourceFiles/ui/chat/chat.style
index 60cffe609..4364fca61 100644
--- a/Telegram/SourceFiles/history/history.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -9,6 +9,24 @@ using "ui/basic.style";
 using "dialogs/dialogs.style";
 using "ui/widgets/widgets.style";
 
+MessageBar {
+	title: TextStyle;
+	titleFg: color;
+	text: TextStyle;
+	textFg: color;
+	textPalette: TextPalette;
+	duration: int;
+}
+
+defaultMessageBar: MessageBar {
+	title: semiboldTextStyle;
+	titleFg: windowActiveTextFg;
+	text: messageTextStyle;
+	textFg: historyComposeAreaFg;
+	textPalette: historyComposeAreaPalette;
+	duration: 160;
+}
+
 minPhotoSize: 100px;
 minVideoSize: 160px;
 maxMediaSize: 430px;
diff --git a/Telegram/SourceFiles/ui/chat/message_bar.cpp b/Telegram/SourceFiles/ui/chat/message_bar.cpp
new file mode 100644
index 000000000..cf4a27c60
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/message_bar.cpp
@@ -0,0 +1,295 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/message_bar.h"
+
+#include "ui/text/text_options.h"
+#include "styles/style_chat.h"
+
+namespace Ui {
+
+MessageBar::MessageBar(not_null<QWidget*> parent, const style::MessageBar &st)
+: _st(st)
+, _widget(parent) {
+	setup();
+}
+
+void MessageBar::setup() {
+	_widget.resize(0, st::historyReplyHeight);
+	_widget.paintRequest(
+	) | rpl::start_with_next([=](QRect rect) {
+		auto p = Painter(&_widget);
+		paint(p);
+	}, _widget.lifetime());
+}
+
+void MessageBar::set(MessageBarContent &&content) {
+	_contentLifetime.destroy();
+	tweenTo(std::move(content));
+}
+
+void MessageBar::set(rpl::producer<MessageBarContent> content) {
+	_contentLifetime.destroy();
+	std::move(
+		content
+	) | rpl::start_with_next([=](MessageBarContent &&content) {
+		tweenTo(std::move(content));
+	}, _contentLifetime);
+}
+
+MessageBar::BodyAnimation MessageBar::DetectBodyAnimationType(
+		Animation *currentAnimation,
+		const MessageBarContent &currentContent,
+		const MessageBarContent &nextContent) {
+	const auto now = currentAnimation
+		? currentAnimation->bodyAnimation
+		: BodyAnimation::None;
+	return (now == BodyAnimation::Full
+		|| currentContent.title != nextContent.title)
+		? BodyAnimation::Full
+		: (now == BodyAnimation::Text
+			|| currentContent.text != nextContent.text
+			|| currentContent.id != nextContent.id)
+		? BodyAnimation::Text
+		: BodyAnimation::None;
+}
+
+void MessageBar::tweenTo(MessageBarContent &&content) {
+	_widget.update();
+	if (!_st.duration || anim::Disabled() || _widget.size().isEmpty()) {
+		updateFromContent(std::move(content));
+		return;
+	}
+	const auto hasImageChanged = (_content.preview.isNull()
+		!= content.preview.isNull());
+	const auto bodyChanged = (_content.id != content.id
+		|| _content.title != content.title
+		|| _content.text != content.text
+		|| _content.preview.constBits() != content.preview.constBits());
+	auto animation = Animation();
+	animation.bodyAnimation = DetectBodyAnimationType(
+		_animation.get(),
+		_content,
+		content);
+	animation.movingTo = (content.id > _content.id)
+		? RectPart::Top
+		: (content.id < _content.id)
+		? RectPart::Bottom
+		: RectPart::None;
+	animation.imageFrom = grabImagePart();
+	animation.bodyOrTextFrom = grabBodyOrTextPart(animation.bodyAnimation);
+	auto was = std::move(_animation);
+	updateFromContent(std::move(content));
+	animation.imageTo = grabImagePart();
+	animation.bodyOrTextTo = grabBodyOrTextPart(animation.bodyAnimation);
+	if (was) {
+		_animation = std::move(was);
+		std::swap(*_animation, animation);
+		_animation->imageShown = std::move(animation.imageShown);
+	} else {
+		_animation = std::make_unique<Animation>(std::move(animation));
+	}
+
+	if (hasImageChanged) {
+		_animation->imageShown.start(
+			[=] { _widget.update(); },
+			_image.isNull() ? 1. : 0.,
+			_image.isNull() ? 0. : 1.,
+			_st.duration);
+	}
+	if (bodyChanged) {
+		_animation->bodyMoved.start(
+			[=] { _widget.update(); },
+			0.,
+			1.,
+			_st.duration);
+	}
+}
+
+void MessageBar::updateFromContent(MessageBarContent &&content) {
+	_content = std::move(content);
+	_title.setText(_st.title, _content.title);
+	_text.setMarkedText(_st.text, _content.text, Ui::DialogTextOptions());
+	_image = prepareImage(_content.preview);
+}
+
+QRect MessageBar::imageRect() const {
+	const auto left = st::msgReplyBarSkip + st::msgReplyBarSkip;
+	const auto top = st::msgReplyPadding.top();
+	const auto size = st::msgReplyBarSize.height();
+	return QRect(left, top, size, size);
+}
+
+QRect MessageBar::bodyRect(bool withImage) const {
+	const auto innerLeft = st::msgReplyBarSkip + st::msgReplyBarSkip;
+	const auto imageSkip = st::msgReplyBarSize.height()
+		+ st::msgReplyBarSkip
+		- st::msgReplyBarSize.width()
+		- st::msgReplyBarPos.x();
+	const auto left = innerLeft + (withImage ? imageSkip : 0);
+	const auto top = st::msgReplyPadding.top();
+	const auto width = _widget.width() - left - st::msgReplyPadding.right();
+	const auto height = st::msgReplyBarSize.height();
+	return QRect(left, top, width, height);
+}
+
+QRect MessageBar::bodyRect() const {
+	return bodyRect(!_image.isNull());
+}
+
+QRect MessageBar::textRect() const {
+	auto result = bodyRect();
+	result.setTop(result.top() + st::msgServiceNameFont->height);
+	return result;
+}
+
+auto MessageBar::makeGrabGuard() {
+	auto imageShown = _animation
+		? std::move(_animation->imageShown)
+		: Ui::Animations::Simple();
+	return gsl::finally([&, shown = std::move(imageShown)]() mutable {
+		if (_animation) {
+			_animation->imageShown = std::move(shown);
+		}
+	});
+}
+
+QPixmap MessageBar::grabBodyOrTextPart(BodyAnimation type) {
+	return (type == BodyAnimation::Full)
+		? grabBodyPart()
+		: (type == BodyAnimation::Text)
+		? grabTextPart()
+		: QPixmap();
+}
+
+QPixmap MessageBar::grabBodyPart() {
+	const auto guard = makeGrabGuard();
+	return GrabWidget(widget(), bodyRect());
+}
+
+QPixmap MessageBar::grabTextPart() {
+	const auto guard = makeGrabGuard();
+	return GrabWidget(widget(), textRect());
+}
+
+QPixmap MessageBar::grabImagePart() {
+	if (!_animation) {
+		return _image;
+	}
+	const auto guard = makeGrabGuard();
+	return (_animation->bodyMoved.animating()
+		&& !_animation->imageFrom.isNull()
+		&& !_animation->imageTo.isNull())
+		? GrabWidget(widget(), imageRect())
+		: _animation->imageFrom;
+}
+
+void MessageBar::finishAnimating() {
+	if (_animation) {
+		_animation = nullptr;
+		_widget.update();
+	}
+}
+
+QPixmap MessageBar::prepareImage(const QImage &preview) {
+	return QPixmap::fromImage(preview, Qt::ColorOnly);
+}
+
+void MessageBar::paint(Painter &p) {
+	const auto progress = _animation ? _animation->bodyMoved.value(1.) : 1.;
+	const auto imageFinal = _image.isNull() ? 0. : 1.;
+	const auto imageShown = _animation
+		? _animation->imageShown.value(imageFinal)
+		: imageFinal;
+	if (progress == 1. && imageShown == 1. && _animation) {
+		_animation = nullptr;
+	}
+	const auto body = [&] {
+		if (!_animation || !_animation->imageShown.animating()) {
+			return bodyRect();
+		}
+		const auto noImage = bodyRect(false);
+		const auto withImage = bodyRect(true);
+		return QRect(
+			anim::interpolate(noImage.x(), withImage.x(), imageShown),
+			noImage.y(),
+			anim::interpolate(noImage.width(), withImage.width(), imageShown),
+			noImage.height());
+	}();
+	const auto text = textRect();
+	const auto image = imageRect();
+	const auto width = _widget.width();
+	const auto noShift = !_animation
+		|| (_animation->movingTo == RectPart::None);
+	const auto shiftFull = st::msgReplyBarSkip;
+	const auto shiftTo = noShift
+		? 0
+		: (_animation->movingTo == RectPart::Top)
+		? anim::interpolate(shiftFull, 0, progress)
+		: anim::interpolate(-shiftFull, 0, progress);
+	const auto shiftFrom = noShift
+		? 0
+		: (_animation->movingTo == RectPart::Top)
+		? (shiftTo - shiftFull)
+		: (shiftTo + shiftFull);
+
+	if (!_animation) {
+		if (!_image.isNull()) {
+			p.drawPixmap(image, _image);
+		}
+	} else if (!_animation->imageFrom.isNull()
+		|| !_animation->imageTo.isNull()) {
+		const auto rect = [&] {
+			if (!_animation->imageShown.animating()) {
+				return image;
+			}
+			const auto size = anim::interpolate(0, image.width(), imageShown);
+			return QRect(
+				image.x(),
+				image.y() + (image.height() - size) / 2,
+				size,
+				size);
+		}();
+		if (_animation->bodyMoved.animating()) {
+			p.setOpacity(1. - progress);
+			p.drawPixmap(
+				rect.translated(0, shiftFrom),
+				_animation->imageFrom);
+			p.setOpacity(progress);
+			p.drawPixmap(rect.translated(0, shiftTo), _animation->imageTo);
+		} else {
+			p.drawPixmap(rect, _image);
+		}
+	}
+	if (!_animation || _animation->bodyAnimation == BodyAnimation::None) {
+		p.setPen(_st.textFg);
+		p.setTextPalette(_st.textPalette);
+		_text.drawLeftElided(p, body.x(), text.y(), body.width(), width);
+	} else if (_animation->bodyAnimation == BodyAnimation::Text) {
+		p.setOpacity(1. - progress);
+		p.drawPixmap(
+			body.x(),
+			text.y() + shiftFrom,
+			_animation->bodyOrTextFrom);
+		p.setOpacity(progress);
+		p.drawPixmap(body.x(), text.y() + shiftTo, _animation->bodyOrTextTo);
+	}
+	if (!_animation || _animation->bodyAnimation != BodyAnimation::Full) {
+		p.setPen(_st.titleFg);
+		_title.drawLeftElided(p, body.x(), body.y(), body.width(), width);
+	} else {
+		p.setOpacity(1. - progress);
+		p.drawPixmap(
+			body.x(),
+			body.y() + shiftFrom,
+			_animation->bodyOrTextFrom);
+		p.setOpacity(progress);
+		p.drawPixmap(body.x(), body.y() + shiftTo, _animation->bodyOrTextTo);
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/message_bar.h b/Telegram/SourceFiles/ui/chat/message_bar.h
new file mode 100644
index 000000000..73bf97330
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/message_bar.h
@@ -0,0 +1,88 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+
+class Painter;
+
+namespace style {
+struct MessageBar;
+} // namespace style
+
+namespace Ui {
+
+struct MessageBarContent {
+	int id = 0;
+	QString title;
+	TextWithEntities text;
+	QImage preview;
+};
+
+class MessageBar final {
+public:
+	MessageBar(not_null<QWidget*> parent, const style::MessageBar &st);
+
+	void set(MessageBarContent &&content);
+	void set(rpl::producer<MessageBarContent> content);
+
+	[[nodiscard]] not_null<Ui::RpWidget*> widget() {
+		return &_widget;
+	}
+
+	void finishAnimating();
+
+private:
+	enum class BodyAnimation : char {
+		Full,
+		Text,
+		None,
+	};
+	struct Animation {
+		Ui::Animations::Simple bodyMoved;
+		Ui::Animations::Simple imageShown;
+		QPixmap bodyOrTextFrom;
+		QPixmap bodyOrTextTo;
+		QPixmap imageFrom;
+		QPixmap imageTo;
+		BodyAnimation bodyAnimation = BodyAnimation::None;
+		RectPart movingTo = RectPart::None;
+	};
+	void setup();
+	void paint(Painter &p);
+	void tweenTo(MessageBarContent &&content);
+	void updateFromContent(MessageBarContent &&content);
+	[[nodiscard]] QPixmap prepareImage(const QImage &preview);
+
+	[[nodiscard]] QRect imageRect() const;
+	[[nodiscard]] QRect bodyRect(bool withImage) const;
+	[[nodiscard]] QRect bodyRect() const;
+	[[nodiscard]] QRect textRect() const;
+
+	auto makeGrabGuard();
+	[[nodiscard]] QPixmap grabBodyOrTextPart(BodyAnimation type);
+	[[nodiscard]] QPixmap grabImagePart();
+	[[nodiscard]] QPixmap grabBodyPart();
+	[[nodiscard]] QPixmap grabTextPart();
+
+	[[nodiscard]] static BodyAnimation DetectBodyAnimationType(
+		Animation *currentAnimation,
+		const MessageBarContent &currentContent,
+		const MessageBarContent &nextContent);
+
+	const style::MessageBar &_st;
+	Ui::RpWidget _widget;
+	MessageBarContent _content;
+	rpl::lifetime _contentLifetime;
+	Ui::Text::String _title, _text;
+	QPixmap _image;
+	std::unique_ptr<Animation> _animation;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/empty_userpic.cpp b/Telegram/SourceFiles/ui/empty_userpic.cpp
index ba07e0cc2..7fdd39374 100644
--- a/Telegram/SourceFiles/ui/empty_userpic.cpp
+++ b/Telegram/SourceFiles/ui/empty_userpic.cpp
@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/emoji_config.h"
 #include "ui/effects/animation_value.h"
 #include "app.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
 
 namespace Ui {
diff --git a/Telegram/SourceFiles/ui/item_text_options.cpp b/Telegram/SourceFiles/ui/item_text_options.cpp
new file mode 100644
index 000000000..57ccc44c5
--- /dev/null
+++ b/Telegram/SourceFiles/ui/item_text_options.cpp
@@ -0,0 +1,70 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/item_text_options.h"
+
+#include "history/history.h"
+#include "history/history_item.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_user.h"
+
+namespace Ui {
+namespace {
+
+bool UseBotTextOptions(
+		not_null<History*> history,
+		not_null<PeerData*> author) {
+	if (const auto user = history->peer->asUser()) {
+		if (user->isBot()) {
+			return true;
+		}
+	} else if (const auto chat = history->peer->asChat()) {
+		if (chat->botStatus >= 0) {
+			return true;
+		}
+	} else if (const auto group = history->peer->asMegagroup()) {
+		if (group->mgInfo->botStatus >= 0) {
+			return true;
+		}
+	}
+	if (const auto user = author->asUser()) {
+		if (user->isBot()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+} // namespace
+
+const TextParseOptions &ItemTextOptions(
+		not_null<History*> history,
+		not_null<PeerData*> author) {
+	return UseBotTextOptions(history, author)
+		? ItemTextBotDefaultOptions()
+		: ItemTextDefaultOptions();
+}
+
+const TextParseOptions &ItemTextOptions(not_null<const HistoryItem*> item) {
+	return ItemTextOptions(item->history(), item->author());
+}
+
+const TextParseOptions &ItemTextNoMonoOptions(
+		not_null<History*> history,
+		not_null<PeerData*> author) {
+	return UseBotTextOptions(history, author)
+		? ItemTextBotNoMonoOptions()
+		: ItemTextNoMonoOptions();
+}
+
+const TextParseOptions &ItemTextNoMonoOptions(
+		not_null<const HistoryItem*> item) {
+	return ItemTextNoMonoOptions(item->history(), item->author());
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/item_text_options.h b/Telegram/SourceFiles/ui/item_text_options.h
new file mode 100644
index 000000000..4ec410243
--- /dev/null
+++ b/Telegram/SourceFiles/ui/item_text_options.h
@@ -0,0 +1,27 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/text/text_options.h"
+
+class History;
+class PeerData;
+class HistoryItem;
+
+namespace Ui {
+
+const TextParseOptions &ItemTextOptions(
+	not_null<History*> history,
+	not_null<PeerData*> author);
+const TextParseOptions &ItemTextNoMonoOptions(
+	not_null<History*> history,
+	not_null<PeerData*> author);
+const TextParseOptions &ItemTextOptions(not_null<const HistoryItem*> item);
+const TextParseOptions &ItemTextNoMonoOptions(not_null<const HistoryItem*> item);
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/special_buttons.cpp b/Telegram/SourceFiles/ui/special_buttons.cpp
index d26fa88bc..29fce70ba 100644
--- a/Telegram/SourceFiles/ui/special_buttons.cpp
+++ b/Telegram/SourceFiles/ui/special_buttons.cpp
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/special_buttons.h"
 
 #include "styles/style_boxes.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "dialogs/dialogs_layout.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/effects/radial_animation.h"
diff --git a/Telegram/SourceFiles/ui/text_options.cpp b/Telegram/SourceFiles/ui/text/text_options.cpp
similarity index 70%
rename from Telegram/SourceFiles/ui/text_options.cpp
rename to Telegram/SourceFiles/ui/text/text_options.cpp
index 99247f568..74e2f997f 100644
--- a/Telegram/SourceFiles/ui/text_options.cpp
+++ b/Telegram/SourceFiles/ui/text/text_options.cpp
@@ -5,15 +5,10 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 
-#include "history/history.h"
-#include "history/history_item.h"
-#include "data/data_channel.h"
-#include "data/data_chat.h"
-#include "data/data_user.h"
-#include "styles/style_history.h"
 #include "styles/style_window.h"
+#include "styles/style_chat.h"
 
 namespace Ui {
 namespace {
@@ -110,37 +105,13 @@ TextParseOptions WebpageDescriptionOptions = {
 	Qt::LayoutDirectionAuto, // dir
 };
 
-bool UseBotTextOptions(
-		not_null<History*> history,
-		not_null<PeerData*> author) {
-	if (const auto user = history->peer->asUser()) {
-		if (user->isBot()) {
-			return true;
-		}
-	} else if (const auto chat = history->peer->asChat()) {
-		if (chat->botStatus >= 0) {
-			return true;
-		}
-	} else if (const auto group = history->peer->asMegagroup()) {
-		if (group->mgInfo->botStatus >= 0) {
-			return true;
-		}
-	}
-	if (const auto user = author->asUser()) {
-		if (user->isBot()) {
-			return true;
-		}
-	}
-	return false;
-}
-
 } // namespace
 
 void InitTextOptions() {
 	HistoryServiceOptions.dir
 		= TextNameOptions.dir
 		= TextDialogOptions.dir
-		= cLangDir();
+		= Qt::LeftToRight;
 	TextDialogOptions.maxw = st::columnMaximalWidthLeft * 2;
 	WebpageTitleOptions.maxh = st::webPageTitleFont->height * 2;
 	WebpageTitleOptions.maxw
@@ -188,29 +159,4 @@ const TextParseOptions &DialogTextOptions() {
 	return TextDialogOptions;
 }
 
-const TextParseOptions &ItemTextOptions(
-		not_null<History*> history,
-		not_null<PeerData*> author) {
-	return UseBotTextOptions(history, author)
-		? HistoryBotOptions
-		: HistoryTextOptions;
-}
-
-const TextParseOptions &ItemTextOptions(not_null<const HistoryItem*> item) {
-	return ItemTextOptions(item->history(), item->author());
-}
-
-const TextParseOptions &ItemTextNoMonoOptions(
-		not_null<History*> history,
-		not_null<PeerData*> author) {
-	return UseBotTextOptions(history, author)
-		? HistoryBotNoMonoOptions
-		: HistoryTextNoMonoOptions;
-}
-
-const TextParseOptions &ItemTextNoMonoOptions(
-		not_null<const HistoryItem*> item) {
-	return ItemTextNoMonoOptions(item->history(), item->author());
-}
-
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/text_options.h b/Telegram/SourceFiles/ui/text/text_options.h
similarity index 66%
rename from Telegram/SourceFiles/ui/text_options.h
rename to Telegram/SourceFiles/ui/text/text_options.h
index 85b0a80c3..59bf8b182 100644
--- a/Telegram/SourceFiles/ui/text_options.h
+++ b/Telegram/SourceFiles/ui/text/text_options.h
@@ -7,9 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-class History;
-class PeerData;
-
 struct TextParseOptions;
 
 namespace Ui {
@@ -28,13 +25,4 @@ const TextParseOptions &WebpageTextDescriptionOptions();
 const TextParseOptions &NameTextOptions();
 const TextParseOptions &DialogTextOptions();
 
-const TextParseOptions &ItemTextOptions(
-	not_null<History*> history,
-	not_null<PeerData*> author);
-const TextParseOptions &ItemTextNoMonoOptions(
-	not_null<History*> history,
-	not_null<PeerData*> author);
-const TextParseOptions &ItemTextOptions(not_null<const HistoryItem*> item);
-const TextParseOptions &ItemTextNoMonoOptions(not_null<const HistoryItem*> item);
-
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/ui_pch.h b/Telegram/SourceFiles/ui/ui_pch.h
index 1894747b8..07af4a4fb 100644
--- a/Telegram/SourceFiles/ui/ui_pch.h
+++ b/Telegram/SourceFiles/ui/ui_pch.h
@@ -31,3 +31,6 @@
 #include "base/basic_types.h"
 #include "base/flat_map.h"
 #include "base/flat_set.h"
+
+#include "ui/text/text.h"
+#include "ui/effects/animations.h"
diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.cpp b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
index 17ceb2f7c..cef0403f4 100644
--- a/Telegram/SourceFiles/ui/widgets/multi_select.cpp
+++ b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/effects/cross_animation.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "lang/lang_keys.h"
 #include "app.h"
 
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index 3162481b6..27d534b4f 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/platform/ui_platform_utility.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/emoji_config.h"
 #include "ui/empty_userpic.h"
 #include "ui/ui_utility.h"
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index 67391766f..c90ba42f9 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -30,7 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "app.h"
 #include "styles/style_widgets.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 #include <QtCore/QBuffer>
 
diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
index 11c7236bb..c8737cd2f 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
@@ -10,13 +10,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/themes/window_theme.h"
 #include "lang/lang_keys.h"
 #include "platform/platform_window_title.h"
-#include "ui/text_options.h"
+#include "ui/text/text_options.h"
 #include "ui/image/image_prepare.h"
 #include "ui/emoji_config.h"
 #include "styles/style_widgets.h"
 #include "styles/style_window.h"
 #include "styles/style_media_view.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_info.h"
 
diff --git a/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp b/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
index ab355c0e0..4b18cca3b 100644
--- a/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
+++ b/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
@@ -26,7 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "styles/style_settings.h"
 #include "styles/style_boxes.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 36ee49616..3b3577e08 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 using "ui/basic.style";
 using "ui/widgets/widgets.style";
-using "history/history.style";
+using "ui/chat/chat.style";
 using "boxes/boxes.style"; // UserpicButton
 
 windowMinWidth: 380px;
diff --git a/Telegram/SourceFiles/window/window_history_hider.cpp b/Telegram/SourceFiles/window/window_history_hider.cpp
index a989ef1a2..df519d3f7 100644
--- a/Telegram/SourceFiles/window/window_history_hider.cpp
+++ b/Telegram/SourceFiles/window/window_history_hider.cpp
@@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "facades.h"
 #include "app.h"
 #include "styles/style_layers.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace Window {
 
diff --git a/Telegram/SourceFiles/window/window_media_preview.cpp b/Telegram/SourceFiles/window/window_media_preview.cpp
index c7f7d4aca..ea24e9b5f 100644
--- a/Telegram/SourceFiles/window/window_media_preview.cpp
+++ b/Telegram/SourceFiles/window/window_media_preview.cpp
@@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "styles/style_layers.h"
 #include "styles/style_chat_helpers.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace Window {
 namespace {
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 609d05a96..086a78e73 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -12,6 +12,9 @@ include(lib_ui/cmake/generate_styles.cmake)
 
 set(style_files
     ui/td_common.style
+    ui/chat/chat.style
+    dialogs/dialogs.style
+    window/window.style
 )
 
 set(dependent_style_files
@@ -29,8 +32,12 @@ PRIVATE
     ${style_files}
     
     ui/ui_pch.h
+    ui/chat/message_bar.cpp
+    ui/chat/message_bar.h
     ui/text/format_values.cpp
     ui/text/format_values.h
+    ui/text/text_options.cpp
+    ui/text/text_options.h
     ui/toasts/common_toasts.cpp
     ui/toasts/common_toasts.h
 )

From 67290eed586a0429195f86c9ff4c0de662ec6ecc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 10 Oct 2020 15:04:28 +0300
Subject: [PATCH 081/190] Use new message bar for pinned message.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../SourceFiles/history/history_widget.cpp    | 386 ++++++++----------
 Telegram/SourceFiles/history/history_widget.h |  22 +-
 .../history/view/history_view_pinned_bar.cpp  | 229 +++++++++++
 .../history/view/history_view_pinned_bar.h    |  59 +++
 Telegram/SourceFiles/ui/chat/message_bar.cpp  |  13 +-
 6 files changed, 473 insertions(+), 238 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
 create mode 100644 Telegram/SourceFiles/history/view/history_view_pinned_bar.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index abc87d05b..5a0a439a9 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -561,6 +561,8 @@ PRIVATE
     history/view/history_view_message.cpp
     history/view/history_view_message.h
     history/view/history_view_object.h
+    history/view/history_view_pinned_bar.cpp
+    history/view/history_view_pinned_bar.h
     history/view/history_view_pinned_tracker.cpp
     history/view/history_view_pinned_tracker.h
     history/view/history_view_replies_section.cpp
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 7474dc637..ff32dd3e1 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "ui/text/format_values.h"
+#include "ui/chat/message_bar.h"
 #include "ui/image/image.h"
 #include "ui/special_buttons.h"
 #include "inline_bots/inline_bot_result.h"
@@ -62,6 +63,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_scheduled_section.h"
 #include "history/view/history_view_schedule_box.h"
 #include "history/view/history_view_webpage_preview.h"
+#include "history/view/history_view_top_bar_widget.h"
+#include "history/view/history_view_contact_status.h"
+#include "history/view/history_view_pinned_tracker.h"
+#include "history/view/history_view_pinned_bar.h"
 #include "history/view/media/history_view_media.h"
 #include "profile/profile_block_group_members.h"
 #include "info/info_memento.h"
@@ -86,9 +91,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/player/media_player_instance.h"
 #include "core/application.h"
 #include "apiwrap.h"
-#include "history/view/history_view_top_bar_widget.h"
-#include "history/view/history_view_contact_status.h"
-#include "history/view/history_view_pinned_tracker.h"
 #include "base/qthelp_regex.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/item_text_options.h"
@@ -552,7 +554,6 @@ HistoryWidget::HistoryWidget(
 		UpdateFlag::Rights
 		| UpdateFlag::Migration
 		| UpdateFlag::UnavailableReason
-		| UpdateFlag::PinnedMessage
 		| UpdateFlag::IsBlocked
 		| UpdateFlag::Admins
 		| UpdateFlag::Members
@@ -590,14 +591,6 @@ HistoryWidget::HistoryWidget(
 			updateControlsVisibility();
 			updateControlsGeometry();
 		}
-		if (flags & UpdateFlag::PinnedMessage) {
-			if (pinnedMsgVisibilityUpdated()) {
-				updateHistoryGeometry();
-				updateControlsVisibility();
-				updateControlsGeometry();
-				this->update();
-			}
-		}
 		if (flags & UpdateFlag::Slowmode) {
 			updateSendButtonType();
 		}
@@ -1142,7 +1135,7 @@ void HistoryWidget::orderWidgets() {
 		_contactStatus->raise();
 	}
 	if (_pinnedBar) {
-		_pinnedBar->shadow->raise();
+		_pinnedBar->raise();
 	}
 	_topShadow->raise();
 	if (_membersDropdown) {
@@ -1698,7 +1691,7 @@ void HistoryWidget::showHistory(
 		_history->showAtMsgId = _showAtMsgId;
 
 		destroyUnreadBarOnClose();
-		showPinnedMessage(FullMsgId());
+		_pinnedBar = nullptr;
 		_pinnedTracker = nullptr;
 		_membersDropdown.destroy();
 		_scrollToAnimation.stop();
@@ -1814,7 +1807,6 @@ void HistoryWidget::showHistory(
 		_updateHistoryItems.stop();
 
 		setupPinnedTracker();
-		pinnedMsgVisibilityUpdated();
 		if (_history->scrollTopItem
 			|| (_migrated && _migrated->scrollTopItem)
 			|| _history->isReadyFor(_showAtMsgId)) {
@@ -2026,13 +2018,15 @@ void HistoryWidget::updateControlsVisibility() {
 		if (_tabbedPanel) {
 			_tabbedPanel->hideFast();
 		}
+		if (_pinnedBar) {
+			_pinnedBar->hide();
+		}
 		hideChildren();
 		return;
 	}
 
 	if (_pinnedBar) {
-		_pinnedBar->cancel->show();
-		_pinnedBar->shadow->show();
+		_pinnedBar->show();
 	}
 	if (_firstLoadRequest && !_scroll->isHidden()) {
 		_scroll->hide();
@@ -2242,7 +2236,7 @@ void HistoryWidget::showAboutTopPromotion() {
 }
 
 void HistoryWidget::updateMouseTracking() {
-	bool trackMouse = !_fieldBarCancel->isHidden() || _pinnedBar;
+	const auto trackMouse = !_fieldBarCancel->isHidden();
 	setMouseTracking(trackMouse);
 }
 
@@ -3180,6 +3174,9 @@ void HistoryWidget::showAnimated(
 	if (_tabbedPanel) {
 		_tabbedPanel->hideFast();
 	}
+	if (_pinnedBar) {
+		_pinnedBar->hide();
+	}
 	hideChildren();
 	if (params.withTopBarShadow) _topShadow->show();
 
@@ -3336,14 +3333,12 @@ void HistoryWidget::mouseMoveEvent(QMouseEvent *e) {
 void HistoryWidget::updateOverStates(QPoint pos) {
 	auto inField = pos.y() >= (_scroll->y() + _scroll->height()) && pos.y() < height() && pos.x() >= 0 && pos.x() < width();
 	auto inReplyEditForward = QRect(st::historyReplySkip, _field->y() - st::historySendPadding - st::historyReplyHeight, width() - st::historyReplySkip - _fieldBarCancel->width(), st::historyReplyHeight).contains(pos) && (_editMsgId || replyToId() || readyToForward());
-	auto inPinnedMsg = QRect(0, _topBar->bottomNoMargins(), width(), st::historyReplyHeight).contains(pos) && _pinnedBar;
-	auto inClickable = inReplyEditForward || inPinnedMsg;
+	auto inClickable = inReplyEditForward;
 	if (inField != _inField && _recording) {
 		_inField = inField;
 		_send->setRecordActive(_inField);
 	}
 	_inReplyEditForward = inReplyEditForward;
-	_inPinnedMsg = inPinnedMsg;
 	if (inClickable != _inClickable) {
 		_inClickable = inClickable;
 		setCursor(_inClickable ? style::cur_pointer : style::cur_default);
@@ -4442,10 +4437,10 @@ void HistoryWidget::updateControlsGeometry() {
 
 	const auto pinnedBarTop = _topBar->bottomNoMargins();
 	if (_pinnedBar) {
-		_pinnedBar->cancel->moveToLeft(width() - _pinnedBar->cancel->width(), pinnedBarTop);
-		_pinnedBar->shadow->setGeometryToLeft(0, pinnedBarTop + st::historyReplyHeight, width(), st::lineWidth);
+		_pinnedBar->move(0, pinnedBarTop);
+		_pinnedBar->resizeToWidth(width());
 	}
-	const auto contactStatusTop = pinnedBarTop + (_pinnedBar ? st::historyReplyHeight : 0);
+	const auto contactStatusTop = pinnedBarTop + (_pinnedBar ? _pinnedBar->height() : 0);
 	if (_contactStatus) {
 		_contactStatus->move(0, contactStatusTop);
 	}
@@ -4487,9 +4482,6 @@ void HistoryWidget::itemRemoved(not_null<const HistoryItem*> item) {
 	while (item == _replyReturn) {
 		calcNextReplyReturn();
 	}
-	if (_pinnedBar && item->id == _pinnedBar->msgId) {
-		pinnedMsgVisibilityUpdated();
-	}
 	if (_kbReplyTo && item == _kbReplyTo) {
 		toggleKeyboard();
 		_kbReplyTo = nullptr;
@@ -4509,9 +4501,6 @@ void HistoryWidget::itemEdited(not_null<HistoryItem*> item) {
 	if (item.get() == _replyEditMsg) {
 		updateReplyEditTexts(true);
 	}
-	if (_pinnedBar && item->id == _pinnedBar->msgId) {
-		updatePinnedBar(true);
-	}
 }
 
 void HistoryWidget::updateScrollColors() {
@@ -4612,7 +4601,7 @@ void HistoryWidget::updateHistoryGeometry(
 
 	auto newScrollHeight = height() - _topBar->height();
 	if (_pinnedBar) {
-		newScrollHeight -= st::historyReplyHeight;
+		newScrollHeight -= _pinnedBar->height();
 	}
 	if (_contactStatus) {
 		newScrollHeight -= _contactStatus->height();
@@ -4848,7 +4837,7 @@ int HistoryWidget::computeMaxFieldHeight() const {
 	const auto available = height()
 		- _topBar->height()
 		- (_contactStatus ? _contactStatus->height() : 0)
-		- (_pinnedBar ? st::historyReplyHeight : 0)
+		- (_pinnedBar ? _pinnedBar->height() : 0)
 		- ((_editMsgId
 			|| replyToId()
 			|| readyToForward()
@@ -4980,9 +4969,9 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
 		} else {
 			Ui::showPeerHistory(_peer, _editMsgId ? _editMsgId : replyToId());
 		}
-	} else if (_inPinnedMsg) {
-		Assert(_pinnedBar != nullptr);
-		Ui::showPeerHistory(_peer, _pinnedBar->msgId);
+	//} else if (_inPinnedMsg) { // #TODO pinned
+	//	Assert(_pinnedBar != nullptr);
+	//	Ui::showPeerHistory(_peer, _pinnedBar->msgId);
 	}
 }
 
@@ -5189,48 +5178,6 @@ void HistoryWidget::sendInlineResult(
 	_field->setFocus();
 }
 
-HistoryWidget::PinnedBar::PinnedBar(MsgId msgId, HistoryWidget *parent)
-: msgId(msgId)
-, cancel(parent, st::historyReplyCancel)
-, shadow(parent) {
-}
-
-HistoryWidget::PinnedBar::~PinnedBar() {
-	cancel.destroyDelayed();
-	shadow.destroyDelayed();
-}
-
-void HistoryWidget::updatePinnedBar(bool force) {
-	update();
-	if (!_pinnedBar) {
-		return;
-	}
-	const auto messageId = _pinnedBar->msgId;
-	if (!force) {
-		if (_pinnedBar->msg) {
-			return;
-		}
-	}
-
-	Assert(_history != nullptr);
-	if (!_pinnedBar->msg) {
-		_pinnedBar->msg = session().data().message(
-			_history->channelId(),
-			messageId);
-	}
-	if (_pinnedBar->msg) {
-		_pinnedBar->text.setText(
-			st::messageTextStyle,
-			_pinnedBar->msg->inReplyText(),
-			Ui::DialogTextOptions());
-		update();
-	} else if (force) {
-		destroyPinnedBar();
-		_history->peer->removePinnedMessage(messageId);
-		updateControlsGeometry();
-	}
-}
-
 void HistoryWidget::updatePinnedViewer() {
 	if (_firstLoadRequest
 		|| _delayedShowAtRequest
@@ -5264,80 +5211,90 @@ void HistoryWidget::setupPinnedTracker() {
 	Expects(_history != nullptr);
 
 	_pinnedTracker = std::make_unique<HistoryView::PinnedTracker>(_history);
-	_pinnedTracker->shownMessageId(
-	) | rpl::start_with_next([=](MsgId messageId) {
-		showPinnedMessage({ peerToChannel(_peer->id), messageId });
-	}, _list->lifetime());
-}
+	_pinnedBar = std::make_unique<HistoryView::PinnedBar>(
+		this,
+		&session(),
+		_pinnedTracker->shownMessageId() | rpl::map([=](MsgId messageId) {
+			return FullMsgId{ peerToChannel(_peer->id), messageId };
+		}),
+		true);
 
-void HistoryWidget::showPinnedMessage(FullMsgId id) {
-	if (_pinnedId == id) {
-		return;
-	}
-	_pinnedId = id;
-	if (pinnedMsgVisibilityUpdated()) {
+	_pinnedBar->closeClicks(
+	) | rpl::start_with_next([=] {
+		hidePinnedMessage();
+	}, _pinnedBar->lifetime());
+
+	_pinnedBarHeight = 0;
+	_pinnedBar->heightValue(
+	) | rpl::start_with_next([=](int height) {
+		_topDelta = (height - _pinnedBarHeight);
+		_pinnedBarHeight = height;
 		updateHistoryGeometry();
-		updateControlsVisibility();
 		updateControlsGeometry();
-		this->update();
+		_topDelta = 0;
+	}, _pinnedBar->lifetime());
+	orderWidgets();
+	if (_a_show.animating()) {
+		_pinnedBar->hide();
 	}
 }
-
-bool HistoryWidget::pinnedMsgVisibilityUpdated() {
-	auto result = false;
-	auto pinnedId = _pinnedId;
-	if (pinnedId && !_peer->canPinMessages()) {
-		const auto hiddenId = session().settings().hiddenPinnedMessageId(
-			_peer->id);
-		if (hiddenId == pinnedId.msg) {
-			pinnedId = FullMsgId();
-		} else if (hiddenId) {
-			session().settings().setHiddenPinnedMessageId(_peer->id, 0);
-			session().saveSettings();
-		}
-	}
-	if (pinnedId) {
-		if (!_pinnedBar) {
-			_pinnedBar = std::make_unique<PinnedBar>(pinnedId.msg, this);
-			if (_a_show.animating()) {
-				_pinnedBar->cancel->hide();
-				_pinnedBar->shadow->hide();
-			} else {
-				_pinnedBar->cancel->show();
-				_pinnedBar->shadow->show();
-			}
-			_pinnedBar->cancel->addClickHandler([=] {
-				hidePinnedMessage();
-			});
-			orderWidgets();
-
-			updatePinnedBar();
-			result = true;
-
-			const auto barTop = unreadBarTop();
-			if (!barTop || _scroll->scrollTop() != *barTop) {
-				synteticScrollToY(_scroll->scrollTop() + st::historyReplyHeight);
-			}
-		} else if (_pinnedBar->msgId != pinnedId.msg) {
-			_pinnedBar->msgId = pinnedId.msg;
-			_pinnedBar->msg = nullptr;
-			_pinnedBar->text.clear();
-			updatePinnedBar();
-		}
-		if (!_pinnedBar->msg) {
-			requestMessageData(_pinnedBar->msgId);
-		}
-	} else if (_pinnedBar) {
-		destroyPinnedBar();
-		result = true;
-		const auto barTop = unreadBarTop();
-		if (!barTop || _scroll->scrollTop() != *barTop) {
-			synteticScrollToY(_scroll->scrollTop() - st::historyReplyHeight);
-		}
-		updateControlsGeometry();
-	}
-	return result;
-}
+//
+//bool HistoryWidget::pinnedMsgVisibilityUpdated() {
+//	auto result = false;
+//	auto pinnedId = _pinnedId;
+//	if (pinnedId && !_peer->canPinMessages()) {
+//		const auto hiddenId = session().settings().hiddenPinnedMessageId(
+//			_peer->id);
+//		if (hiddenId == pinnedId.msg) {
+//			pinnedId = FullMsgId();
+//		} else if (hiddenId) {
+//			session().settings().setHiddenPinnedMessageId(_peer->id, 0);
+//			session().saveSettings();
+//		}
+//	}
+//	if (pinnedId) {
+//		if (!_pinnedBar) {
+//			_pinnedBar = std::make_unique<PinnedBar>(pinnedId.msg, this);
+//			if (_a_show.animating()) {
+//				_pinnedBar->cancel->hide();
+//				_pinnedBar->bar->widget()->hide();
+//				_pinnedBar->shadow->hide();
+//			} else {
+//				_pinnedBar->cancel->show();
+//				_pinnedBar->bar->widget()->show();
+//				_pinnedBar->shadow->show();
+//			}
+//			_pinnedBar->cancel->addClickHandler([=] {
+//				hidePinnedMessage();
+//			});
+//			orderWidgets();
+//
+//			updatePinnedBar();
+//			result = true;
+//
+//			const auto barTop = unreadBarTop();
+//			if (!barTop || _scroll->scrollTop() != *barTop) {
+//				synteticScrollToY(_scroll->scrollTop() + st::historyReplyHeight);
+//			}
+//		} else if (_pinnedBar->msgId != pinnedId.msg) {
+//			_pinnedBar->msgId = pinnedId.msg;
+//			_pinnedBar->msg = nullptr;
+//			updatePinnedBar();
+//		}
+//		if (!_pinnedBar->msg) {
+//			requestMessageData(_pinnedBar->msgId);
+//		}
+//	} else if (_pinnedBar) {
+//		destroyPinnedBar();
+//		result = true;
+//		const auto barTop = unreadBarTop();
+//		if (!barTop || _scroll->scrollTop() != *barTop) {
+//			synteticScrollToY(_scroll->scrollTop() - st::historyReplyHeight);
+//		}
+//		updateControlsGeometry();
+//	}
+//	return result;
+//}
 
 void HistoryWidget::requestMessageData(MsgId msgId) {
 	const auto callback = [=](ChannelData *channel, MsgId msgId) {
@@ -5349,11 +5306,6 @@ void HistoryWidget::requestMessageData(MsgId msgId) {
 		crl::guard(this, callback));
 }
 
-void HistoryWidget::destroyPinnedBar() {
-	_pinnedBar.reset();
-	_inPinnedMsg = false;
-}
-
 bool HistoryWidget::sendExistingDocument(
 		not_null<DocumentData*> document,
 		Api::SendOptions options) {
@@ -5622,25 +5574,25 @@ void HistoryWidget::UnpinMessage(not_null<PeerData*> peer, MsgId msgId) {
 }
 
 void HistoryWidget::hidePinnedMessage() {
-	const auto pinnedId = _pinnedId;
-	if (!pinnedId) {
-		if (pinnedMsgVisibilityUpdated()) {
-			updateControlsGeometry();
-			update();
-		}
-		return;
-	}
+	//const auto pinnedId = _pinnedId; // #TODO pinned
+	//if (!pinnedId) {
+	//	if (pinnedMsgVisibilityUpdated()) {
+	//		updateControlsGeometry();
+	//		update();
+	//	}
+	//	return;
+	//}
 
-	if (_peer->canPinMessages()) {
-		unpinMessage(pinnedId);
-	} else {
-		session().settings().setHiddenPinnedMessageId(_peer->id, pinnedId.msg);
-		session().saveSettings();
-		if (pinnedMsgVisibilityUpdated()) {
-			updateControlsGeometry();
-			update();
-		}
-	}
+	//if (_peer->canPinMessages()) {
+	//	unpinMessage(pinnedId);
+	//} else {
+	//	session().settings().setHiddenPinnedMessageId(_peer->id, pinnedId.msg);
+	//	session().saveSettings();
+	//	if (pinnedMsgVisibilityUpdated()) {
+	//		updateControlsGeometry();
+	//		update();
+	//	}
+	//}
 }
 
 bool HistoryWidget::lastForceReplyReplied(const FullMsgId &replyTo) const {
@@ -6080,13 +6032,12 @@ void HistoryWidget::updateTopBarSelection() {
 }
 
 void HistoryWidget::messageDataReceived(ChannelData *channel, MsgId msgId) {
-	if (!_peer || _peer->asChannel() != channel || !msgId) return;
+	if (!_peer || _peer->asChannel() != channel || !msgId) {
+		return;
+	}
 	if (_editMsgId == msgId || _replyToId == msgId) {
 		updateReplyEditTexts(true);
 	}
-	if (_pinnedBar && _pinnedBar->msgId == msgId) {
-		updatePinnedBar(true);
-	}
 }
 
 void HistoryWidget::updateReplyEditText(not_null<HistoryItem*> item) {
@@ -6420,49 +6371,49 @@ void HistoryWidget::drawRecording(Painter &p, float64 recordActive) {
 	p.setPen(anim::pen(st::historyRecordCancel, st::historyRecordCancelActive, 1. - recordActive));
 	p.drawText(left + (right - left - _recordCancelWidth) / 2, _attachToggle->y() + st::historyRecordTextTop + st::historyRecordFont->ascent, tr::lng_record_cancel(tr::now));
 }
-
-void HistoryWidget::drawPinnedBar(Painter &p) {
-	Expects(_pinnedBar != nullptr);
-
-	auto top = _topBar->bottomNoMargins();
-	p.fillRect(myrtlrect(0, top, width(), st::historyReplyHeight), st::historyPinnedBg);
-
-	top += st::msgReplyPadding.top();
-	QRect rbar(myrtlrect(st::msgReplyBarSkip + st::msgReplyBarPos.x(), top + st::msgReplyBarPos.y(), st::msgReplyBarSize.width(), st::msgReplyBarSize.height()));
-	p.fillRect(rbar, st::msgInReplyBarColor);
-
-	int32 left = st::msgReplyBarSkip + st::msgReplyBarSkip;
-	if (_pinnedBar->msg) {
-		const auto media = _pinnedBar->msg->media();
-		if (media && media->hasReplyPreview()) {
-			if (const auto image = media->replyPreview()) {
-				QRect to(left, top, st::msgReplyBarSize.height(), st::msgReplyBarSize.height());
-				p.drawPixmap(to.x(), to.y(), image->pixSingle(image->width() / cIntRetinaFactor(), image->height() / cIntRetinaFactor(), to.width(), to.height(), ImageRoundRadius::Small));
-			}
-			left += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x();
-		}
-		p.setPen(st::historyReplyNameFg);
-		p.setFont(st::msgServiceNameFont);
-		const auto poll = media ? media->poll() : nullptr;
-		const auto pinnedHeader = (_pinnedBar->msgId < _peer->topPinnedMessageId())
-			? tr::lng_pinned_previous(tr::now)
-			: !poll
-			? tr::lng_pinned_message(tr::now)
-			: poll->quiz()
-			? tr::lng_pinned_quiz(tr::now)
-			: tr::lng_pinned_poll(tr::now);
-		p.drawText(left, top + st::msgServiceNameFont->ascent, pinnedHeader);
-
-		p.setPen(st::historyComposeAreaFg);
-		p.setTextPalette(st::historyComposeAreaPalette);
-		_pinnedBar->text.drawElided(p, left, top + st::msgServiceNameFont->height, width() - left - _pinnedBar->cancel->width() - st::msgReplyPadding.right());
-		p.restoreTextPalette();
-	} else {
-		p.setFont(st::msgDateFont);
-		p.setPen(st::historyComposeAreaFgService);
-		p.drawText(left, top + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2 + st::msgDateFont->ascent, st::msgDateFont->elided(tr::lng_profile_loading(tr::now), width() - left - _pinnedBar->cancel->width() - st::msgReplyPadding.right()));
-	}
-}
+//
+//void HistoryWidget::drawPinnedBar(Painter &p) {
+//	Expects(_pinnedBar != nullptr);
+//
+//	auto top = _topBar->bottomNoMargins();
+//	p.fillRect(myrtlrect(0, top, width(), st::historyReplyHeight), st::historyPinnedBg);
+//
+//	top += st::msgReplyPadding.top();
+//	QRect rbar(myrtlrect(st::msgReplyBarSkip + st::msgReplyBarPos.x(), top + st::msgReplyBarPos.y(), st::msgReplyBarSize.width(), st::msgReplyBarSize.height()));
+//	p.fillRect(rbar, st::msgInReplyBarColor);
+//
+//	//int32 left = st::msgReplyBarSkip + st::msgReplyBarSkip;
+//	//if (_pinnedBar->msg) {
+//	//	const auto media = _pinnedBar->msg->media();
+//	//	if (media && media->hasReplyPreview()) {
+//	//		if (const auto image = media->replyPreview()) {
+//	//			QRect to(left, top, st::msgReplyBarSize.height(), st::msgReplyBarSize.height());
+//	//			p.drawPixmap(to.x(), to.y(), image->pixSingle(image->width() / cIntRetinaFactor(), image->height() / cIntRetinaFactor(), to.width(), to.height(), ImageRoundRadius::Small));
+//	//		}
+//	//		left += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x();
+//	//	}
+//	//	p.setPen(st::historyReplyNameFg);
+//	//	p.setFont(st::msgServiceNameFont);
+//	//	const auto poll = media ? media->poll() : nullptr;
+//	//	const auto pinnedHeader = (_pinnedBar->msgId < _peer->topPinnedMessageId())
+//	//		? tr::lng_pinned_previous(tr::now)
+//	//		: !poll
+//	//		? tr::lng_pinned_message(tr::now)
+//	//		: poll->quiz()
+//	//		? tr::lng_pinned_quiz(tr::now)
+//	//		: tr::lng_pinned_poll(tr::now);
+//	//	p.drawText(left, top + st::msgServiceNameFont->ascent, pinnedHeader);
+//
+//	//	p.setPen(st::historyComposeAreaFg);
+//	//	p.setTextPalette(st::historyComposeAreaPalette);
+//	//	_pinnedBar->text.drawElided(p, left, top + st::msgServiceNameFont->height, width() - left - _pinnedBar->cancel->width() - st::msgReplyPadding.right());
+//	//	p.restoreTextPalette();
+//	//} else {
+//	//	p.setFont(st::msgDateFont);
+//	//	p.setPen(st::historyComposeAreaFgService);
+//	//	p.drawText(left, top + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2 + st::msgDateFont->ascent, st::msgDateFont->elided(tr::lng_profile_loading(tr::now), width() - left - _pinnedBar->cancel->width() - st::msgReplyPadding.right()));
+//	//}
+//}
 
 bool HistoryWidget::paintShowAnimationFrame() {
 	auto progress = _a_show.value(1.);
@@ -6513,9 +6464,6 @@ void HistoryWidget::paintEvent(QPaintEvent *e) {
 		} else if (const auto error = writeRestriction()) {
 			drawRestrictedWrite(p, *error);
 		}
-		if (_pinnedBar && !_pinnedBar->cancel->isHidden()) {
-			drawPinnedBar(p);
-		}
 	} else {
 		const auto w = st::msgServiceFont->width(tr::lng_willbe_history(tr::now))
 			+ st::msgPadding.left()
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index e23a4de00..db6ed145b 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -66,6 +66,7 @@ class SilentToggle;
 class FlatButton;
 class LinkButton;
 class RoundButton;
+class MessageBar;
 namespace Toast {
 class Instance;
 } // namespace Toast
@@ -94,6 +95,7 @@ class TopBarWidget;
 class ContactStatus;
 class Element;
 class PinnedTracker;
+class PinnedBar;
 } // namespace HistoryView
 
 class DragArea;
@@ -326,16 +328,6 @@ private slots:
 private:
 	using TabbedPanel = ChatHelpers::TabbedPanel;
 	using TabbedSelector = ChatHelpers::TabbedSelector;
-	struct PinnedBar {
-		PinnedBar(MsgId msgId, HistoryWidget *parent);
-		~PinnedBar();
-
-		MsgId msgId = 0;
-		HistoryItem *msg = nullptr;
-		Ui::Text::String text;
-		object_ptr<Ui::IconButton> cancel;
-		object_ptr<Ui::PlainShadow> shadow;
-	};
 	enum ScrollChangeType {
 		ScrollChangeNone,
 
@@ -492,10 +484,6 @@ private:
 	void updateReplyEditTexts(bool force = false);
 	void updateReplyEditText(not_null<HistoryItem*> item);
 
-	void showPinnedMessage(FullMsgId id);
-	void updatePinnedBar(bool force = false);
-	bool pinnedMsgVisibilityUpdated();
-	void destroyPinnedBar();
 	void updatePinnedViewer();
 	void setupPinnedTracker();
 
@@ -511,7 +499,6 @@ private:
 		int left,
 		int top) const;
 	void drawRecording(Painter &p, float64 recordActive);
-	void drawPinnedBar(Painter &p);
 	void drawRestrictedWrite(Painter &p, const QString &error);
 	bool paintShowAnimationFrame();
 
@@ -614,9 +601,9 @@ private:
 
 	object_ptr<Ui::IconButton> _fieldBarCancel;
 
-	FullMsgId _pinnedId;
-	std::unique_ptr<PinnedBar> _pinnedBar;
 	std::unique_ptr<HistoryView::PinnedTracker> _pinnedTracker;
+	std::unique_ptr<HistoryView::PinnedBar> _pinnedBar;
+	int _pinnedBarHeight = 0;
 
 	mtpRequestId _saveEditMsgRequestId = 0;
 
@@ -705,7 +692,6 @@ private:
 	bool _recording = false;
 	bool _inField = false;
 	bool _inReplyEditForward = false;
-	bool _inPinnedMsg = false;
 	bool _inClickable = false;
 	int _recordingSamples = 0;
 	int _recordCancelWidth;
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
new file mode 100644
index 000000000..82aaafc42
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -0,0 +1,229 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_pinned_bar.h"
+
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "data/data_session.h"
+#include "data/data_changes.h"
+#include "data/data_poll.h"
+#include "ui/widgets/shadow.h"
+#include "ui/widgets/buttons.h"
+#include "history/history_item.h"
+#include "history/history.h"
+#include "apiwrap.h"
+#include "styles/style_chat.h"
+
+namespace HistoryView {
+namespace {
+
+[[nodiscard]] rpl::producer<Ui::MessageBarContent> ContentByItem(
+		not_null<HistoryItem*> item) {
+	return item->history()->session().changes().messageFlagsValue(
+		item,
+		Data::MessageUpdate::Flag::Edited
+	) | rpl::map([=] {
+		const auto media = item->media();
+		const auto poll = media ? media->poll() : nullptr;
+		return Ui::MessageBarContent{
+			.id = item->id,
+			.title = ((item->id < item->history()->peer->topPinnedMessageId())
+				? tr::lng_pinned_previous(tr::now)
+				: !poll
+				? tr::lng_pinned_message(tr::now)
+				: poll->quiz()
+				? tr::lng_pinned_quiz(tr::now)
+				: tr::lng_pinned_poll(tr::now)),
+			.text = item->inReplyText(),
+		};
+	});
+}
+
+[[nodiscard]] rpl::producer<Ui::MessageBarContent> ContentByItemId(
+		not_null<Main::Session*> session,
+		FullMsgId id,
+		bool alreadyLoaded = false) {
+	if (!id) {
+		return rpl::single(Ui::MessageBarContent());
+	} else if (const auto item = session->data().message(id)) {
+		return ContentByItem(item);
+	} else if (alreadyLoaded) {
+		return rpl::single(Ui::MessageBarContent()); // Deleted message?..
+	}
+	auto load = rpl::make_producer<Ui::MessageBarContent>([=](auto consumer) {
+		consumer.put_next(Ui::MessageBarContent{
+			.text = tr::lng_contacts_loading(tr::now),
+		});
+		const auto channel = id.channel
+			? session->data().channel(id.channel).get()
+			: nullptr;
+		const auto callback = [=](ChannelData *channel, MsgId id) {
+			consumer.put_done();
+		};
+		session->api().requestMessageData(channel, id.msg, callback);
+		return rpl::lifetime();
+	});
+	return std::move(
+		load
+	) | rpl::then(rpl::deferred([=] {
+		return ContentByItemId(session, id, true);
+	}));
+}
+
+} // namespace
+
+PinnedBar::PinnedBar(
+	not_null<QWidget*> parent,
+	not_null<Main::Session*> session,
+	rpl::producer<FullMsgId> itemId,
+	bool withClose)
+: _wrap(parent, object_ptr<Ui::RpWidget>(parent))
+, _close(withClose
+	? std::make_unique<Ui::IconButton>(
+		_wrap.entity(),
+		st::historyReplyCancel)
+	: nullptr)
+, _shadow(std::make_unique<Ui::PlainShadow>(_wrap.parentWidget())) {
+	_wrap.hide(anim::type::instant);
+	_shadow->hide();
+
+	_wrap.entity()->paintRequest(
+	) | rpl::start_with_next([=](QRect clip) {
+		QPainter(_wrap.entity()).fillRect(clip, st::historyPinnedBg);
+	}, lifetime());
+	_wrap.setAttribute(Qt::WA_OpaquePaintEvent);
+
+	rpl::duplicate(
+		itemId
+	) | rpl::distinct_until_changed(
+	) | rpl::map([=](FullMsgId id) {
+		return ContentByItemId(session, id);
+	}) | rpl::flatten_latest(
+	) | rpl::filter([=](const Ui::MessageBarContent &content) {
+		return !content.title.isEmpty() || !content.text.text.isEmpty();
+	}) | rpl::start_with_next([=](Ui::MessageBarContent &&content) {
+		const auto creating = !_bar;
+		if (creating) {
+			createControls();
+		}
+		_bar->set(std::move(content));
+		if (creating) {
+			_bar->finishAnimating();
+		}
+	}, lifetime());
+
+	std::move(
+		itemId
+	) | rpl::map([=](FullMsgId id) {
+		return !id;
+	}) | rpl::start_with_next([=](bool hidden) {
+		_shouldBeShown = !hidden;
+		if (!_forceHidden) {
+			_wrap.toggle(_shouldBeShown, anim::type::normal);
+		} else if (!_shouldBeShown) {
+			_bar = nullptr;
+		}
+	}, lifetime());
+}
+
+void PinnedBar::createControls() {
+	Expects(!_bar);
+
+	_bar = std::make_unique<Ui::MessageBar>(
+		_wrap.entity(),
+		st::defaultMessageBar);
+	if (_close) {
+		_close->raise();
+	}
+
+	_bar->widget()->move(0, 0);
+	_bar->widget()->show();
+	_wrap.entity()->resize(_wrap.entity()->width(), _bar->widget()->height());
+
+	_wrap.geometryValue(
+	) | rpl::start_with_next([=](QRect rect) {
+		_shadow->setGeometry(
+			rect.x(),
+			rect.y() + rect.height(),
+			rect.width(),
+			st::lineWidth);
+		_bar->widget()->resizeToWidth(
+			rect.width() - (_close ? _close->width() : 0));
+		const auto hidden = _wrap.isHidden() || !rect.height();
+		if (_shadow->isHidden() != hidden) {
+			_shadow->setVisible(!hidden);
+		}
+		if (_close) {
+			_close->moveToRight(0, 0);
+		}
+	}, _bar->widget()->lifetime());
+
+	_wrap.shownValue(
+	) | rpl::skip(
+		1
+	) | rpl::filter([=](bool shown) {
+		return !shown && !_forceHidden;
+	}) | rpl::start_with_next([=] {
+		_bar = nullptr;
+	}, _bar->widget()->lifetime());
+
+	Ensures(_bar != nullptr);
+}
+
+void PinnedBar::show() {
+	if (!_forceHidden) {
+		return;
+	}
+	_forceHidden = false;
+	if (_shouldBeShown) {
+		_wrap.show(anim::type::instant);
+		_shadow->show();
+	}
+}
+
+void PinnedBar::hide() {
+	if (_forceHidden) {
+		return;
+	}
+	_forceHidden = true;
+	_wrap.hide(anim::type::instant);
+	_shadow->hide();
+}
+
+void PinnedBar::raise() {
+	_wrap.raise();
+	_shadow->raise();
+}
+
+void PinnedBar::move(int x, int y) {
+	_wrap.move(x, y);
+}
+
+void PinnedBar::resizeToWidth(int width) {
+	_wrap.entity()->resizeToWidth(width);
+}
+
+int PinnedBar::height() const {
+	return !_forceHidden
+		? _wrap.height()
+		: _shouldBeShown
+		? st::historyReplyHeight
+		: 0;
+}
+
+rpl::producer<int> PinnedBar::heightValue() const {
+	return _wrap.heightValue();
+}
+
+rpl::producer<> PinnedBar::closeClicks() const {
+	return !_close
+		? (rpl::never<>() | rpl::type_erased())
+		: (_close->clicks() | rpl::map([] { return rpl::empty_value(); }));
+}
+
+} // namespace HistoryView
\ No newline at end of file
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
new file mode 100644
index 000000000..e6e61e931
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
@@ -0,0 +1,59 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/wrap/slide_wrap.h"
+#include "ui/chat/message_bar.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class IconButton;
+class PlainShadow;
+} // namespace Ui
+
+namespace HistoryView {
+
+class PinnedBar final {
+public:
+	PinnedBar(
+		not_null<QWidget*> parent,
+		not_null<Main::Session*> session,
+		rpl::producer<FullMsgId> itemId,
+		bool withClose = false);
+
+	void show();
+	void hide();
+	void raise();
+
+	void move(int x, int y);
+	void resizeToWidth(int width);
+	[[nodiscard]] int height() const;
+	[[nodiscard]] rpl::producer<int> heightValue() const;
+	[[nodiscard]] rpl::producer<> closeClicks() const;
+
+	[[nodiscard]] rpl::lifetime &lifetime() {
+		return _wrap.lifetime();
+	}
+
+private:
+	void createControls();
+
+	Ui::SlideWrap<> _wrap;
+	std::unique_ptr<Ui::MessageBar> _bar;
+	std::unique_ptr<Ui::IconButton> _close;
+	std::unique_ptr<Ui::PlainShadow> _shadow;
+	rpl::event_stream<Ui::MessageBarContent> _content;
+	bool _shouldBeShown = false;
+	bool _forceHidden = false;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/ui/chat/message_bar.cpp b/Telegram/SourceFiles/ui/chat/message_bar.cpp
index cf4a27c60..05a02f16c 100644
--- a/Telegram/SourceFiles/ui/chat/message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/message_bar.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/text/text_options.h"
 #include "styles/style_chat.h"
+#include "styles/palette.h"
 
 namespace Ui {
 
@@ -205,7 +206,7 @@ void MessageBar::paint(Painter &p) {
 	const auto imageShown = _animation
 		? _animation->imageShown.value(imageFinal)
 		: imageFinal;
-	if (progress == 1. && imageShown == 1. && _animation) {
+	if (progress == 1. && imageShown == imageFinal && _animation) {
 		_animation = nullptr;
 	}
 	const auto body = [&] {
@@ -237,6 +238,13 @@ void MessageBar::paint(Painter &p) {
 		? (shiftTo - shiftFull)
 		: (shiftTo + shiftFull);
 
+	const auto bar = QRect(
+		st::msgReplyBarSkip + st::msgReplyBarPos.x(),
+		st::msgReplyPadding.top() + st::msgReplyBarPos.y(),
+		st::msgReplyBarSize.width(),
+		st::msgReplyBarSize.height());
+	p.fillRect(bar, st::msgInReplyBarColor);
+
 	if (!_animation) {
 		if (!_image.isNull()) {
 			p.drawPixmap(image, _image);
@@ -261,6 +269,7 @@ void MessageBar::paint(Painter &p) {
 				_animation->imageFrom);
 			p.setOpacity(progress);
 			p.drawPixmap(rect.translated(0, shiftTo), _animation->imageTo);
+			p.setOpacity(1.);
 		} else {
 			p.drawPixmap(rect, _image);
 		}
@@ -277,6 +286,7 @@ void MessageBar::paint(Painter &p) {
 			_animation->bodyOrTextFrom);
 		p.setOpacity(progress);
 		p.drawPixmap(body.x(), text.y() + shiftTo, _animation->bodyOrTextTo);
+		p.setOpacity(1.);
 	}
 	if (!_animation || _animation->bodyAnimation != BodyAnimation::Full) {
 		p.setPen(_st.titleFg);
@@ -289,6 +299,7 @@ void MessageBar::paint(Painter &p) {
 			_animation->bodyOrTextFrom);
 		p.setOpacity(progress);
 		p.drawPixmap(body.x(), body.y() + shiftTo, _animation->bodyOrTextTo);
+		p.setOpacity(1.);
 	}
 }
 

From 91a041603746a4e115a328a29d75c3bf49aba505 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 12 Oct 2020 12:41:05 +0300
Subject: [PATCH 082/190] Implement local pinned bar hiding.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 Telegram/SourceFiles/boxes/confirm_box.cpp    |   2 +-
 Telegram/SourceFiles/data/data_peer.cpp       |  18 +-
 Telegram/SourceFiles/history/history.cpp      |   7 +-
 .../SourceFiles/history/history_widget.cpp    | 169 +++++++-----------
 Telegram/SourceFiles/history/history_widget.h |   1 +
 .../history/view/history_view_pinned_bar.cpp  |  35 ++--
 .../history/view/history_view_pinned_bar.h    |  15 +-
 .../view/history_view_pinned_tracker.cpp      |  27 ++-
 .../view/history_view_pinned_tracker.h        |  23 ++-
 10 files changed, 167 insertions(+), 131 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 8cfd5b8cb..556f2fd35 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -166,6 +166,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_pinned_quiz" = "Pinned quiz";
 "lng_pinned_unpin_sure" = "Would you like to unpin this message?";
 "lng_pinned_pin_sure" = "Would you like to pin this message?";
+"lng_pinned_pin_old_sure" = "Do you want to pin an older message while leaving a more recent one pinned?";
 "lng_pinned_pin" = "Pin";
 "lng_pinned_unpin" = "Unpin";
 "lng_pinned_notify" = "Notify all members";
diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp
index a534f0400..b098ef100 100644
--- a/Telegram/SourceFiles/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/boxes/confirm_box.cpp
@@ -448,7 +448,7 @@ PinMessageBox::PinMessageBox(
 , _text(
 	this,
 	(_pinningOld
-		? "Do you want to pin an older message while leaving a more recent one pinned?" // #TODO pinned
+		? tr::lng_pinned_pin_old_sure(tr::now)
 		: tr::lng_pinned_pin_sure(tr::now)),
 	st::boxLabel) {
 }
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index a74f95714..3e1490909 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "boxes/confirm_box.h"
 #include "main/main_session.h"
+#include "main/main_session_settings.h"
 #include "main/main_account.h"
 #include "main/main_domain.h"
 #include "main/main_app_config.h"
@@ -469,14 +470,12 @@ void PeerData::ensurePinnedMessagesCreated() {
 	if (!_pinnedMessages) {
 		_pinnedMessages = std::make_unique<Data::PinnedMessages>(
 			peerToChannel(id));
-		session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 	}
 }
 
 void PeerData::removeEmptyPinnedMessages() {
 	if (_pinnedMessages && _pinnedMessages->empty()) {
 		_pinnedMessages = nullptr;
-		session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 	}
 }
 
@@ -489,18 +488,30 @@ bool PeerData::messageIdTooSmall(MsgId messageId) const {
 
 void PeerData::setTopPinnedMessageId(MsgId messageId) {
 	if (messageIdTooSmall(messageId)) {
+		clearPinnedMessages();
 		return;
 	}
+	if (session().settings().hiddenPinnedMessageId(id) != messageId) {
+		session().settings().setHiddenPinnedMessageId(id, 0);
+		session().saveSettingsDelayed();
+	}
 	ensurePinnedMessagesCreated();
 	_pinnedMessages->setTopId(messageId);
+	session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 }
 
 void PeerData::clearPinnedMessages(MsgId lessThanId) {
+	if (lessThanId == ServerMaxMsgId
+		&& session().settings().hiddenPinnedMessageId(id) != 0) {
+		session().settings().setHiddenPinnedMessageId(id, 0);
+		session().saveSettingsDelayed();
+	}
 	if (!_pinnedMessages) {
 		return;
 	}
 	_pinnedMessages->clearLessThanId(lessThanId);
 	removeEmptyPinnedMessages();
+	session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 }
 
 void PeerData::addPinnedMessage(MsgId messageId) {
@@ -509,6 +520,7 @@ void PeerData::addPinnedMessage(MsgId messageId) {
 	}
 	ensurePinnedMessagesCreated();
 	_pinnedMessages->add(messageId);
+	session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 }
 
 void PeerData::addPinnedSlice(
@@ -532,6 +544,7 @@ void PeerData::addPinnedSlice(
 	}
 	ensurePinnedMessagesCreated();
 	_pinnedMessages->add(std::move(ids), noSkipRange, std::nullopt);
+	session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 }
 
 void PeerData::removePinnedMessage(MsgId messageId) {
@@ -540,6 +553,7 @@ void PeerData::removePinnedMessage(MsgId messageId) {
 	}
 	_pinnedMessages->remove(messageId);
 	removeEmptyPinnedMessages();
+	session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 }
 
 bool PeerData::canExportChatHistory() const {
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 973e26aff..847d512a9 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -1005,9 +1005,12 @@ void History::applyServiceChanges(
 	case mtpc_messageActionPinMessage: {
 		if (const auto replyTo = data.vreply_to()) {
 			replyTo->match([&](const MTPDmessageReplyHeader &data) {
+				const auto id = data.vreply_to_msg_id().v;
 				if (item) {
-					//item->history()->peer->setTopPinnedMessageId( // #TODO pinned
-					//	data.vreply_to_msg_id().v);
+					item->history()->peer->addPinnedSlice(
+						{ id },
+						{ id, ServerMaxMsgId },
+						std::nullopt);
 				}
 			});
 		}
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index ff32dd3e1..705ff00fd 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -563,6 +563,7 @@ HistoryWidget::HistoryWidget(
 		| UpdateFlag::ChannelLinkedChat
 		| UpdateFlag::Slowmode
 		| UpdateFlag::BotStartToken
+		| UpdateFlag::PinnedMessage
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer.get() == _peer);
 	}) | rpl::map([](const Data::PeerUpdate &update) {
@@ -603,6 +604,9 @@ HistoryWidget::HistoryWidget(
 			| UpdateFlag::ChannelLinkedChat)) {
 			handlePeerUpdate();
 		}
+		if (_pinnedTracker && (flags & UpdateFlag::PinnedMessage)) {
+			checkPinnedBarState();
+		}
 	}, lifetime());
 
 	rpl::merge(
@@ -5211,12 +5215,50 @@ void HistoryWidget::setupPinnedTracker() {
 	Expects(_history != nullptr);
 
 	_pinnedTracker = std::make_unique<HistoryView::PinnedTracker>(_history);
+	_pinnedBar = nullptr;
+	checkPinnedBarState();
+}
+
+void HistoryWidget::checkPinnedBarState() {
+	Expects(_pinnedTracker != nullptr);
+
+	const auto hiddenId = _peer->canPinMessages()
+		? MsgId(0)
+		: session().settings().hiddenPinnedMessageId(_peer->id);
+	const auto currentPinnedId = _peer->topPinnedMessageId();
+	if (currentPinnedId == hiddenId) {
+		if (_pinnedBar) {
+			_pinnedTracker->reset();
+			auto qobject = base::unique_qptr{
+				Ui::WrapAsQObject(this, std::move(_pinnedBar)).get()
+			};
+			auto destroyer = [this, object = std::move(qobject)]() mutable {
+				object = nullptr;
+				updateHistoryGeometry();
+				updateControlsGeometry();
+			};
+			base::call_delayed(
+				st::defaultMessageBar.duration,
+				this,
+				std::move(destroyer));
+		}
+		return;
+	}
+	if (_pinnedBar || !currentPinnedId) {
+		return;
+	}
+
+	auto shown = _pinnedTracker->shownMessageId(
+	) | rpl::map([=](HistoryView::PinnedId messageId) {
+		return HistoryView::PinnedBarId{
+			FullMsgId{ peerToChannel(_peer->id), messageId.message },
+			messageId.type
+		};
+	});
 	_pinnedBar = std::make_unique<HistoryView::PinnedBar>(
 		this,
 		&session(),
-		_pinnedTracker->shownMessageId() | rpl::map([=](MsgId messageId) {
-			return FullMsgId{ peerToChannel(_peer->id), messageId };
-		}),
+		std::move(shown),
 		true);
 
 	_pinnedBar->closeClicks(
@@ -5233,68 +5275,13 @@ void HistoryWidget::setupPinnedTracker() {
 		updateControlsGeometry();
 		_topDelta = 0;
 	}, _pinnedBar->lifetime());
+
 	orderWidgets();
+
 	if (_a_show.animating()) {
 		_pinnedBar->hide();
 	}
 }
-//
-//bool HistoryWidget::pinnedMsgVisibilityUpdated() {
-//	auto result = false;
-//	auto pinnedId = _pinnedId;
-//	if (pinnedId && !_peer->canPinMessages()) {
-//		const auto hiddenId = session().settings().hiddenPinnedMessageId(
-//			_peer->id);
-//		if (hiddenId == pinnedId.msg) {
-//			pinnedId = FullMsgId();
-//		} else if (hiddenId) {
-//			session().settings().setHiddenPinnedMessageId(_peer->id, 0);
-//			session().saveSettings();
-//		}
-//	}
-//	if (pinnedId) {
-//		if (!_pinnedBar) {
-//			_pinnedBar = std::make_unique<PinnedBar>(pinnedId.msg, this);
-//			if (_a_show.animating()) {
-//				_pinnedBar->cancel->hide();
-//				_pinnedBar->bar->widget()->hide();
-//				_pinnedBar->shadow->hide();
-//			} else {
-//				_pinnedBar->cancel->show();
-//				_pinnedBar->bar->widget()->show();
-//				_pinnedBar->shadow->show();
-//			}
-//			_pinnedBar->cancel->addClickHandler([=] {
-//				hidePinnedMessage();
-//			});
-//			orderWidgets();
-//
-//			updatePinnedBar();
-//			result = true;
-//
-//			const auto barTop = unreadBarTop();
-//			if (!barTop || _scroll->scrollTop() != *barTop) {
-//				synteticScrollToY(_scroll->scrollTop() + st::historyReplyHeight);
-//			}
-//		} else if (_pinnedBar->msgId != pinnedId.msg) {
-//			_pinnedBar->msgId = pinnedId.msg;
-//			_pinnedBar->msg = nullptr;
-//			updatePinnedBar();
-//		}
-//		if (!_pinnedBar->msg) {
-//			requestMessageData(_pinnedBar->msgId);
-//		}
-//	} else if (_pinnedBar) {
-//		destroyPinnedBar();
-//		result = true;
-//		const auto barTop = unreadBarTop();
-//		if (!barTop || _scroll->scrollTop() != *barTop) {
-//			synteticScrollToY(_scroll->scrollTop() - st::historyReplyHeight);
-//		}
-//		updateControlsGeometry();
-//	}
-//	return result;
-//}
 
 void HistoryWidget::requestMessageData(MsgId msgId) {
 	const auto callback = [=](ChannelData *channel, MsgId msgId) {
@@ -5574,25 +5561,25 @@ void HistoryWidget::UnpinMessage(not_null<PeerData*> peer, MsgId msgId) {
 }
 
 void HistoryWidget::hidePinnedMessage() {
-	//const auto pinnedId = _pinnedId; // #TODO pinned
-	//if (!pinnedId) {
-	//	if (pinnedMsgVisibilityUpdated()) {
-	//		updateControlsGeometry();
-	//		update();
-	//	}
-	//	return;
-	//}
+	Expects(_pinnedBar != nullptr);
 
-	//if (_peer->canPinMessages()) {
-	//	unpinMessage(pinnedId);
-	//} else {
-	//	session().settings().setHiddenPinnedMessageId(_peer->id, pinnedId.msg);
-	//	session().saveSettings();
-	//	if (pinnedMsgVisibilityUpdated()) {
-	//		updateControlsGeometry();
-	//		update();
-	//	}
-	//}
+	const auto id = _pinnedTracker->currentMessageId();
+	if (!id.message) {
+		return;
+	}
+	if (_peer->canPinMessages()) {
+		unpinMessage({ peerToChannel(_peer->id), id.message });
+	} else {
+		const auto top = _peer->topPinnedMessageId();
+		if (top) {
+			session().settings().setHiddenPinnedMessageId(_peer->id, top);
+			session().saveSettingsDelayed();
+
+			checkPinnedBarState();
+		} else {
+			session().api().requestFullPeer(_peer);
+		}
+	}
 }
 
 bool HistoryWidget::lastForceReplyReplied(const FullMsgId &replyTo) const {
@@ -6373,16 +6360,6 @@ void HistoryWidget::drawRecording(Painter &p, float64 recordActive) {
 }
 //
 //void HistoryWidget::drawPinnedBar(Painter &p) {
-//	Expects(_pinnedBar != nullptr);
-//
-//	auto top = _topBar->bottomNoMargins();
-//	p.fillRect(myrtlrect(0, top, width(), st::historyReplyHeight), st::historyPinnedBg);
-//
-//	top += st::msgReplyPadding.top();
-//	QRect rbar(myrtlrect(st::msgReplyBarSkip + st::msgReplyBarPos.x(), top + st::msgReplyBarPos.y(), st::msgReplyBarSize.width(), st::msgReplyBarSize.height()));
-//	p.fillRect(rbar, st::msgInReplyBarColor);
-//
-//	//int32 left = st::msgReplyBarSkip + st::msgReplyBarSkip;
 //	//if (_pinnedBar->msg) {
 //	//	const auto media = _pinnedBar->msg->media();
 //	//	if (media && media->hasReplyPreview()) {
@@ -6392,22 +6369,6 @@ void HistoryWidget::drawRecording(Painter &p, float64 recordActive) {
 //	//		}
 //	//		left += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x();
 //	//	}
-//	//	p.setPen(st::historyReplyNameFg);
-//	//	p.setFont(st::msgServiceNameFont);
-//	//	const auto poll = media ? media->poll() : nullptr;
-//	//	const auto pinnedHeader = (_pinnedBar->msgId < _peer->topPinnedMessageId())
-//	//		? tr::lng_pinned_previous(tr::now)
-//	//		: !poll
-//	//		? tr::lng_pinned_message(tr::now)
-//	//		: poll->quiz()
-//	//		? tr::lng_pinned_quiz(tr::now)
-//	//		: tr::lng_pinned_poll(tr::now);
-//	//	p.drawText(left, top + st::msgServiceNameFont->ascent, pinnedHeader);
-//
-//	//	p.setPen(st::historyComposeAreaFg);
-//	//	p.setTextPalette(st::historyComposeAreaPalette);
-//	//	_pinnedBar->text.drawElided(p, left, top + st::msgServiceNameFont->height, width() - left - _pinnedBar->cancel->width() - st::msgReplyPadding.right());
-//	//	p.restoreTextPalette();
 //	//} else {
 //	//	p.setFont(st::msgDateFont);
 //	//	p.setPen(st::historyComposeAreaFgService);
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index db6ed145b..1be6ab3bc 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -486,6 +486,7 @@ private:
 
 	void updatePinnedViewer();
 	void setupPinnedTracker();
+	void checkPinnedBarState();
 
 	void sendInlineResult(
 		not_null<InlineBots::Result*> result,
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index 82aaafc42..c8af04b24 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_poll.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/buttons.h"
+#include "history/view/history_view_pinned_tracker.h"
 #include "history/history_item.h"
 #include "history/history.h"
 #include "apiwrap.h"
@@ -23,7 +24,8 @@ namespace HistoryView {
 namespace {
 
 [[nodiscard]] rpl::producer<Ui::MessageBarContent> ContentByItem(
-		not_null<HistoryItem*> item) {
+		not_null<HistoryItem*> item,
+		PinnedIdType type) {
 	return item->history()->session().changes().messageFlagsValue(
 		item,
 		Data::MessageUpdate::Flag::Edited
@@ -32,7 +34,9 @@ namespace {
 		const auto poll = media ? media->poll() : nullptr;
 		return Ui::MessageBarContent{
 			.id = item->id,
-			.title = ((item->id < item->history()->peer->topPinnedMessageId())
+			.title = ((type == PinnedIdType::First)
+				? "First message"
+				: (type == PinnedIdType::Middle)
 				? tr::lng_pinned_previous(tr::now)
 				: !poll
 				? tr::lng_pinned_message(tr::now)
@@ -46,12 +50,12 @@ namespace {
 
 [[nodiscard]] rpl::producer<Ui::MessageBarContent> ContentByItemId(
 		not_null<Main::Session*> session,
-		FullMsgId id,
+		PinnedBarId id,
 		bool alreadyLoaded = false) {
-	if (!id) {
+	if (!id.message) {
 		return rpl::single(Ui::MessageBarContent());
-	} else if (const auto item = session->data().message(id)) {
-		return ContentByItem(item);
+	} else if (const auto item = session->data().message(id.message)) {
+		return ContentByItem(item, id.type);
 	} else if (alreadyLoaded) {
 		return rpl::single(Ui::MessageBarContent()); // Deleted message?..
 	}
@@ -59,13 +63,13 @@ namespace {
 		consumer.put_next(Ui::MessageBarContent{
 			.text = tr::lng_contacts_loading(tr::now),
 		});
-		const auto channel = id.channel
-			? session->data().channel(id.channel).get()
+		const auto channel = id.message.channel
+			? session->data().channel(id.message.channel).get()
 			: nullptr;
 		const auto callback = [=](ChannelData *channel, MsgId id) {
 			consumer.put_done();
 		};
-		session->api().requestMessageData(channel, id.msg, callback);
+		session->api().requestMessageData(channel, id.message.msg, callback);
 		return rpl::lifetime();
 	});
 	return std::move(
@@ -80,7 +84,7 @@ namespace {
 PinnedBar::PinnedBar(
 	not_null<QWidget*> parent,
 	not_null<Main::Session*> session,
-	rpl::producer<FullMsgId> itemId,
+	rpl::producer<PinnedBarId> itemId,
 	bool withClose)
 : _wrap(parent, object_ptr<Ui::RpWidget>(parent))
 , _close(withClose
@@ -101,7 +105,7 @@ PinnedBar::PinnedBar(
 	rpl::duplicate(
 		itemId
 	) | rpl::distinct_until_changed(
-	) | rpl::map([=](FullMsgId id) {
+	) | rpl::map([=](PinnedBarId id) {
 		return ContentByItemId(session, id);
 	}) | rpl::flatten_latest(
 	) | rpl::filter([=](const Ui::MessageBarContent &content) {
@@ -119,15 +123,18 @@ PinnedBar::PinnedBar(
 
 	std::move(
 		itemId
-	) | rpl::map([=](FullMsgId id) {
-		return !id;
-	}) | rpl::start_with_next([=](bool hidden) {
+	) | rpl::map([=](PinnedBarId id) {
+		return !id.message;
+	}) | rpl::start_with_next_done([=](bool hidden) {
 		_shouldBeShown = !hidden;
 		if (!_forceHidden) {
 			_wrap.toggle(_shouldBeShown, anim::type::normal);
 		} else if (!_shouldBeShown) {
 			_bar = nullptr;
 		}
+	}, [=] {
+		_forceHidden = true;
+		_wrap.toggle(false, anim::type::normal);
 	}, lifetime());
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
index e6e61e931..397cbc92f 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
@@ -21,12 +21,25 @@ class PlainShadow;
 
 namespace HistoryView {
 
+enum class PinnedIdType;
+struct PinnedBarId {
+	FullMsgId message;
+	PinnedIdType type = PinnedIdType();
+
+	bool operator<(const PinnedBarId &other) const {
+		return std::tie(message, type) < std::tie(other.message, other.type);
+	}
+	bool operator==(const PinnedBarId &other) const {
+		return std::tie(message, type) == std::tie(other.message, other.type);
+	}
+};
+
 class PinnedBar final {
 public:
 	PinnedBar(
 		not_null<QWidget*> parent,
 		not_null<Main::Session*> session,
-		rpl::producer<FullMsgId> itemId,
+		rpl::producer<PinnedBarId> itemId,
 		bool withClose = false);
 
 	void show();
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
index ea6f076d7..bb18c8356 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
@@ -40,15 +40,23 @@ PinnedTracker::~PinnedTracker() {
 	_history->owner().histories().cancelRequest(_afterRequestId);
 }
 
-rpl::producer<MsgId> PinnedTracker::shownMessageId() const {
+rpl::producer<PinnedId> PinnedTracker::shownMessageId() const {
 	return _current.value();
 }
 
+void PinnedTracker::reset() {
+	_current.reset(currentMessageId());
+}
+
+PinnedId PinnedTracker::currentMessageId() const {
+	return _current.current();
+}
+
 void PinnedTracker::refreshData() {
 	const auto now = _history->peer->currentPinnedMessages();
 	if (!now) {
 		_dataLifetime.destroy();
-		_current = MsgId(0);
+		_current = PinnedId();
 	} else if (_data.get() != now) {
 		_dataLifetime.destroy();
 		_data = now;
@@ -65,7 +73,7 @@ void PinnedTracker::trackAround(MsgId messageId) {
 	_dataLifetime.destroy();
 	_aroundId = messageId;
 	if (!_aroundId) {
-		_current = MsgId(0);
+		_current = PinnedId();
 	} else if (const auto now = _data.get()) {
 		setupViewer(now);
 	}
@@ -90,10 +98,19 @@ void PinnedTracker::setupViewer(not_null<Data::PinnedMessages*> data) {
 				Data::LoadDirection::After,
 				empty ? _aroundId : snapshot.ids.back());
 		}
+		if (snapshot.ids.empty()) {
+			_current = PinnedId();
+			return;
+		}
+		const auto type = (!after && (snapshot.skippedAfter == 0))
+			? PinnedIdType::Last
+			: (before < 2 && (snapshot.skippedBefore == 0))
+			? PinnedIdType::First
+			: PinnedIdType::Middle;
 		if (i != begin(snapshot.ids)) {
-			_current = *(i - 1);
+			_current = PinnedId{ *(i - 1), type };
 		} else if (snapshot.skippedBefore == 0) {
-			_current = 0;
+			_current = PinnedId{ snapshot.ids.front(), type };
 		}
 	}, _dataLifetime);
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
index e34df6af4..1fbf061b4 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
@@ -16,13 +16,32 @@ enum class LoadDirection : char;
 
 namespace HistoryView {
 
+enum class PinnedIdType {
+	First,
+	Middle,
+	Last,
+};
+struct PinnedId {
+	MsgId message = 0;
+	PinnedIdType type = PinnedIdType::Middle;
+
+	bool operator<(const PinnedId &other) const {
+		return std::tie(message, type) < std::tie(other.message, other.type);
+	}
+	bool operator==(const PinnedId &other) const {
+		return std::tie(message, type) == std::tie(other.message, other.type);
+	}
+};
+
 class PinnedTracker final {
 public:
 	explicit PinnedTracker(not_null<History*> history);
 	~PinnedTracker();
 
-	[[nodiscard]] rpl::producer<MsgId> shownMessageId() const;
+	[[nodiscard]] rpl::producer<PinnedId> shownMessageId() const;
+	[[nodiscard]] PinnedId currentMessageId() const;
 	void trackAround(MsgId messageId);
+	void reset();
 
 private:
 	void refreshData();
@@ -36,7 +55,7 @@ private:
 	const not_null<History*> _history;
 
 	base::weak_ptr<Data::PinnedMessages> _data;
-	rpl::variable<MsgId> _current = MsgId();
+	rpl::variable<PinnedId> _current;
 	rpl::lifetime _dataLifetime;
 
 	MsgId _aroundId = 0;

From 9b4b15ee6d25037cecb71893b921640f60a447bf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 12 Oct 2020 15:28:54 +0300
Subject: [PATCH 083/190] Handle pinned bar clicks.

---
 Telegram/SourceFiles/data/data_messages.cpp   |  9 +++++++
 .../SourceFiles/history/history_widget.cpp    | 15 ++++++-----
 .../history/view/history_view_pinned_bar.cpp  | 26 +++++++++++++++++--
 .../history/view/history_view_pinned_bar.h    |  2 ++
 Telegram/SourceFiles/ui/chat/message_bar.cpp  | 26 ++++++++++++++-----
 5 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_messages.cpp b/Telegram/SourceFiles/data/data_messages.cpp
index 65ef717c9..6e312cbd9 100644
--- a/Telegram/SourceFiles/data/data_messages.cpp
+++ b/Telegram/SourceFiles/data/data_messages.cpp
@@ -135,6 +135,7 @@ void MessagesList::addSlice(
 }
 
 void MessagesList::removeOne(MessagePosition messageId) {
+	auto update = MessagesSliceUpdate();
 	auto slice = ranges::lower_bound(
 		_slices,
 		messageId,
@@ -144,10 +145,16 @@ void MessagesList::removeOne(MessagePosition messageId) {
 		_slices.modify(slice, [&](Slice &slice) {
 			return slice.messages.remove(messageId);
 		});
+		update.messages = &slice->messages;
+		update.range = slice->range;
 	}
 	if (_count) {
 		--*_count;
 	}
+	update.count = _count;
+	if (update.messages) {
+		_sliceUpdated.fire(std::move(update));
+	}
 }
 
 void MessagesList::removeAll(ChannelId channelId) {
@@ -188,6 +195,8 @@ void MessagesList::removeLessThan(MessagePosition messageId) {
 				}
 			});
 			break;
+		} else {
+			break;
 		}
 	}
 	if (removed && _count) {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 705ff00fd..a92dd5ab7 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4973,9 +4973,6 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
 		} else {
 			Ui::showPeerHistory(_peer, _editMsgId ? _editMsgId : replyToId());
 		}
-	//} else if (_inPinnedMsg) { // #TODO pinned
-	//	Assert(_pinnedBar != nullptr);
-	//	Ui::showPeerHistory(_peer, _pinnedBar->msgId);
 	}
 }
 
@@ -5266,6 +5263,14 @@ void HistoryWidget::checkPinnedBarState() {
 		hidePinnedMessage();
 	}, _pinnedBar->lifetime());
 
+	_pinnedBar->barClicks(
+	) | rpl::start_with_next([=] {
+		const auto id = _pinnedTracker->currentMessageId();
+		if (id.message) {
+			Ui::showPeerHistory(_peer, id.message);
+		}
+	}, _pinnedBar->lifetime());
+
 	_pinnedBarHeight = 0;
 	_pinnedBar->heightValue(
 	) | rpl::start_with_next([=](int height) {
@@ -6369,10 +6374,6 @@ void HistoryWidget::drawRecording(Painter &p, float64 recordActive) {
 //	//		}
 //	//		left += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x();
 //	//	}
-//	//} else {
-//	//	p.setFont(st::msgDateFont);
-//	//	p.setPen(st::historyComposeAreaFgService);
-//	//	p.drawText(left, top + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2 + st::msgDateFont->ascent, st::msgDateFont->elided(tr::lng_profile_loading(tr::now), width() - left - _pinnedBar->cancel->width() - st::msgReplyPadding.right()));
 //	//}
 //}
 
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index c8af04b24..824705a77 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -35,7 +35,7 @@ namespace {
 		return Ui::MessageBarContent{
 			.id = item->id,
 			.title = ((type == PinnedIdType::First)
-				? "First message"
+				? tr::lng_pinned_previous(tr::now) // #TODO pinned first?
 				: (type == PinnedIdType::Middle)
 				? tr::lng_pinned_previous(tr::now)
 				: !poll
@@ -148,6 +148,24 @@ void PinnedBar::createControls() {
 		_close->raise();
 	}
 
+	// Clicks.
+	_bar->widget()->setCursor(style::cur_pointer);
+	_bar->widget()->events(
+	) | rpl::filter([=](not_null<QEvent*> event) {
+		return (event->type() == QEvent::MouseButtonPress);
+	}) | rpl::map([=] {
+		return _bar->widget()->events(
+		) | rpl::filter([=](not_null<QEvent*> event) {
+			return (event->type() == QEvent::MouseButtonRelease);
+		}) | rpl::take(1) | rpl::filter([=](not_null<QEvent*> event) {
+			return _bar->widget()->rect().contains(
+				static_cast<QMouseEvent*>(event.get())->pos());
+		});
+	}) | rpl::flatten_latest(
+	) | rpl::map([] {
+		return rpl::empty_value();
+	}) | rpl::start_to_stream(_barClicks, _bar->widget()->lifetime());
+
 	_bar->widget()->move(0, 0);
 	_bar->widget()->show();
 	_wrap.entity()->resize(_wrap.entity()->width(), _bar->widget()->height());
@@ -233,4 +251,8 @@ rpl::producer<> PinnedBar::closeClicks() const {
 		: (_close->clicks() | rpl::map([] { return rpl::empty_value(); }));
 }
 
-} // namespace HistoryView
\ No newline at end of file
+rpl::producer<> PinnedBar::barClicks() const {
+	return _barClicks.events();
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
index 397cbc92f..469e6f2a1 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
@@ -51,6 +51,7 @@ public:
 	[[nodiscard]] int height() const;
 	[[nodiscard]] rpl::producer<int> heightValue() const;
 	[[nodiscard]] rpl::producer<> closeClicks() const;
+	[[nodiscard]] rpl::producer<> barClicks() const;
 
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _wrap.lifetime();
@@ -64,6 +65,7 @@ private:
 	std::unique_ptr<Ui::IconButton> _close;
 	std::unique_ptr<Ui::PlainShadow> _shadow;
 	rpl::event_stream<Ui::MessageBarContent> _content;
+	rpl::event_stream<> _barClicks;
 	bool _shouldBeShown = false;
 	bool _forceHidden = false;
 
diff --git a/Telegram/SourceFiles/ui/chat/message_bar.cpp b/Telegram/SourceFiles/ui/chat/message_bar.cpp
index 05a02f16c..1cb11a7ae 100644
--- a/Telegram/SourceFiles/ui/chat/message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/message_bar.cpp
@@ -49,12 +49,13 @@ MessageBar::BodyAnimation MessageBar::DetectBodyAnimationType(
 	const auto now = currentAnimation
 		? currentAnimation->bodyAnimation
 		: BodyAnimation::None;
+	const auto somethingChanged = (currentContent.text != nextContent.text)
+		|| (currentContent.id != nextContent.id);
 	return (now == BodyAnimation::Full
-		|| currentContent.title != nextContent.title)
+		|| currentContent.title != nextContent.title
+		|| (currentContent.title.isEmpty() && somethingChanged))
 		? BodyAnimation::Full
-		: (now == BodyAnimation::Text
-			|| currentContent.text != nextContent.text
-			|| currentContent.id != nextContent.id)
+		: (now == BodyAnimation::Text || somethingChanged)
 		? BodyAnimation::Text
 		: BodyAnimation::None;
 }
@@ -275,9 +276,20 @@ void MessageBar::paint(Painter &p) {
 		}
 	}
 	if (!_animation || _animation->bodyAnimation == BodyAnimation::None) {
-		p.setPen(_st.textFg);
-		p.setTextPalette(_st.textPalette);
-		_text.drawLeftElided(p, body.x(), text.y(), body.width(), width);
+		if (_title.isEmpty()) {
+			// "Loading..." state.
+			p.setPen(st::historyComposeAreaFgService);
+			_text.drawLeftElided(
+				p,
+				body.x(),
+				body.y() + (body.height() - st::normalFont->height) / 2,
+				body.width(),
+				width);
+		} else {
+			p.setPen(_st.textFg);
+			p.setTextPalette(_st.textPalette);
+			_text.drawLeftElided(p, body.x(), text.y(), body.width(), width);
+		}
 	} else if (_animation->bodyAnimation == BodyAnimation::Text) {
 		p.setOpacity(1. - progress);
 		p.drawPixmap(

From 37fb94cbfb28e31ab2465846d64e67f8733f1f7f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 12 Oct 2020 16:24:45 +0300
Subject: [PATCH 084/190] Load and show image previews in pinned bar.

---
 Telegram/SourceFiles/data/data_document.cpp   |  9 ++
 Telegram/SourceFiles/data/data_document.h     |  1 +
 .../SourceFiles/data/data_media_types.cpp     | 37 ++++++++
 Telegram/SourceFiles/data/data_media_types.h  |  6 ++
 Telegram/SourceFiles/data/data_photo.cpp      |  7 ++
 Telegram/SourceFiles/data/data_photo.h        |  1 +
 .../SourceFiles/data/data_reply_preview.cpp   |  4 +
 .../SourceFiles/data/data_reply_preview.h     |  1 +
 .../history/view/history_view_pinned_bar.cpp  | 85 +++++++++++++++----
 9 files changed, 136 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 56aee3cd0..38a511a8e 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -1266,6 +1266,15 @@ Image *DocumentData::getReplyPreview(Data::FileOrigin origin) {
 	return _replyPreview->image(origin);
 }
 
+bool DocumentData::replyPreviewLoaded() const {
+	if (!hasThumbnail()) {
+		return true;
+	} else if (!_replyPreview) {
+		return false;
+	}
+	return _replyPreview->loaded();
+}
+
 StickerData *DocumentData::sticker() const {
 	return (type == StickerDocument)
 		? static_cast<StickerData*>(_additional.get())
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index 4c065e476..e8b5b905f 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -126,6 +126,7 @@ public:
 	[[nodiscard]] bool saveToCache() const;
 
 	[[nodiscard]] Image *getReplyPreview(Data::FileOrigin origin);
+	[[nodiscard]] bool replyPreviewLoaded() const;
 
 	[[nodiscard]] StickerData *sticker() const;
 	[[nodiscard]] Data::FileOrigin stickerSetOrigin() const;
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 40309e4c5..c87b7b733 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -209,6 +209,10 @@ Image *Media::replyPreview() const {
 	return nullptr;
 }
 
+bool Media::replyPreviewLoaded() const {
+	return true;
+}
+
 bool Media::allowsForward() const {
 	return true;
 }
@@ -312,6 +316,10 @@ Image *MediaPhoto::replyPreview() const {
 	return _photo->getReplyPreview(parent()->fullId());
 }
 
+bool MediaPhoto::replyPreviewLoaded() const {
+	return _photo->replyPreviewLoaded();
+}
+
 QString MediaPhoto::notificationText() const {
 	return WithCaptionNotificationText(
 		tr::lng_in_dlg_photo(tr::now),
@@ -476,6 +484,10 @@ Image *MediaFile::replyPreview() const {
 	return _document->getReplyPreview(parent()->fullId());
 }
 
+bool MediaFile::replyPreviewLoaded() const {
+	return _document->replyPreviewLoaded();
+}
+
 QString MediaFile::chatListText() const {
 	if (const auto sticker = _document->sticker()) {
 		return Media::chatListText();
@@ -987,6 +999,15 @@ Image *MediaWebPage::replyPreview() const {
 	return nullptr;
 }
 
+bool MediaWebPage::replyPreviewLoaded() const {
+	if (const auto document = MediaWebPage::document()) {
+		return document->replyPreviewLoaded();
+	} else if (const auto photo = MediaWebPage::photo()) {
+		return photo->replyPreviewLoaded();
+	}
+	return true;
+}
+
 QString MediaWebPage::chatListText() const {
 	return notificationText();
 }
@@ -1051,6 +1072,15 @@ Image *MediaGame::replyPreview() const {
 	return nullptr;
 }
 
+bool MediaGame::replyPreviewLoaded() const {
+	if (const auto document = _game->document) {
+		return document->replyPreviewLoaded();
+	} else if (const auto photo = _game->photo) {
+		return photo->replyPreviewLoaded();
+	}
+	return true;
+}
+
 QString MediaGame::notificationText() const {
 	// Add a game controller emoji before game title.
 	auto result = QString();
@@ -1153,6 +1183,13 @@ Image *MediaInvoice::replyPreview() const {
 	return nullptr;
 }
 
+bool MediaInvoice::replyPreviewLoaded() const {
+	if (const auto photo = _invoice.photo) {
+		return photo->replyPreviewLoaded();
+	}
+	return true;
+}
+
 QString MediaInvoice::notificationText() const {
 	return _invoice.title;
 }
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index caba0e25c..5037a2592 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -88,6 +88,7 @@ public:
 	virtual bool canBeGrouped() const;
 	virtual bool hasReplyPreview() const;
 	virtual Image *replyPreview() const;
+	virtual bool replyPreviewLoaded() const;
 	// Returns text with link-start and link-end commands for service-color highlighting.
 	// Example: "[link1-start]You:[link1-end] [link1-start]Photo,[link1-end] caption text"
 	virtual QString chatListText() const;
@@ -143,6 +144,7 @@ public:
 	bool canBeGrouped() const override;
 	bool hasReplyPreview() const override;
 	Image *replyPreview() const override;
+	bool replyPreviewLoaded() const override;
 	QString chatListText() const override;
 	QString notificationText() const override;
 	QString pinnedTextSubstring() const override;
@@ -180,6 +182,7 @@ public:
 	bool canBeGrouped() const override;
 	bool hasReplyPreview() const override;
 	Image *replyPreview() const override;
+	bool replyPreviewLoaded() const override;
 	QString chatListText() const override;
 	QString notificationText() const override;
 	QString pinnedTextSubstring() const override;
@@ -311,6 +314,7 @@ public:
 
 	bool hasReplyPreview() const override;
 	Image *replyPreview() const override;
+	bool replyPreviewLoaded() const override;
 	QString chatListText() const override;
 	QString notificationText() const override;
 	QString pinnedTextSubstring() const override;
@@ -341,6 +345,7 @@ public:
 
 	bool hasReplyPreview() const override;
 	Image *replyPreview() const override;
+	bool replyPreviewLoaded() const override;
 	QString notificationText() const override;
 	QString pinnedTextSubstring() const override;
 	TextForMimeData clipboardText() const override;
@@ -377,6 +382,7 @@ public:
 
 	bool hasReplyPreview() const override;
 	Image *replyPreview() const override;
+	bool replyPreviewLoaded() const override;
 	QString notificationText() const override;
 	QString pinnedTextSubstring() const override;
 	TextForMimeData clipboardText() const override;
diff --git a/Telegram/SourceFiles/data/data_photo.cpp b/Telegram/SourceFiles/data/data_photo.cpp
index d5ede173c..b1d67d1cd 100644
--- a/Telegram/SourceFiles/data/data_photo.cpp
+++ b/Telegram/SourceFiles/data/data_photo.cpp
@@ -205,6 +205,13 @@ Image *PhotoData::getReplyPreview(Data::FileOrigin origin) {
 	return _replyPreview->image(origin);
 }
 
+bool PhotoData::replyPreviewLoaded() const {
+	if (!_replyPreview) {
+		return false;
+	}
+	return _replyPreview->loaded();
+}
+
 void PhotoData::setRemoteLocation(
 		int32 dc,
 		uint64 access,
diff --git a/Telegram/SourceFiles/data/data_photo.h b/Telegram/SourceFiles/data/data_photo.h
index 09263dcf9..bcd3f9ccf 100644
--- a/Telegram/SourceFiles/data/data_photo.h
+++ b/Telegram/SourceFiles/data/data_photo.h
@@ -65,6 +65,7 @@ public:
 	[[nodiscard]] bool waitingForAlbum() const;
 
 	[[nodiscard]] Image *getReplyPreview(Data::FileOrigin origin);
+	[[nodiscard]] bool replyPreviewLoaded() const;
 
 	void setRemoteLocation(
 		int32 dc,
diff --git a/Telegram/SourceFiles/data/data_reply_preview.cpp b/Telegram/SourceFiles/data/data_reply_preview.cpp
index 960328506..1067e2346 100644
--- a/Telegram/SourceFiles/data/data_reply_preview.cpp
+++ b/Telegram/SourceFiles/data/data_reply_preview.cpp
@@ -107,4 +107,8 @@ Image *ReplyPreview::image(Data::FileOrigin origin) {
 	return _image.get();
 }
 
+bool ReplyPreview::loaded() const {
+	return _checked;
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_reply_preview.h b/Telegram/SourceFiles/data/data_reply_preview.h
index 3c31cbe84..01314e7ef 100644
--- a/Telegram/SourceFiles/data/data_reply_preview.h
+++ b/Telegram/SourceFiles/data/data_reply_preview.h
@@ -24,6 +24,7 @@ public:
 	~ReplyPreview();
 
 	[[nodiscard]] Image *image(Data::FileOrigin origin);
+	[[nodiscard]] bool loaded() const;
 
 private:
 	void prepare(not_null<Image*> image, Images::Options options);
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index 824705a77..4401bbb09 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -23,29 +23,84 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace HistoryView {
 namespace {
 
+[[nodiscard]] Ui::MessageBarContent ContentWithoutPreview(
+		not_null<HistoryItem*> item,
+		PinnedIdType type) {
+	const auto media = item->media();
+	const auto poll = media ? media->poll() : nullptr;
+	return Ui::MessageBarContent{
+		.id = item->id,
+		.title = ((type == PinnedIdType::First)
+			? tr::lng_pinned_previous(tr::now) // #TODO pinned first?
+			: (type == PinnedIdType::Middle)
+			? tr::lng_pinned_previous(tr::now)
+			: !poll
+			? tr::lng_pinned_message(tr::now)
+			: poll->quiz()
+			? tr::lng_pinned_quiz(tr::now)
+			: tr::lng_pinned_poll(tr::now)),
+		.text = item->inReplyText(),
+	};
+}
+
+[[nodiscard]] Ui::MessageBarContent ContentWithPreview(
+		not_null<HistoryItem*> item,
+		PinnedIdType type,
+		Image *preview) {
+	auto result = ContentWithoutPreview(item, type);
+	if (!preview) {
+		static const auto kEmpty = [&] {
+			const auto size = st::historyReplyHeight * cIntRetinaFactor();
+			auto result = QImage(
+				QSize(size, size),
+				QImage::Format_ARGB32_Premultiplied);
+			result.fill(Qt::transparent);
+			result.setDevicePixelRatio(cRetinaFactor());
+			return result;
+		}();
+		result.preview = kEmpty;
+	} else {
+		result.preview = preview->original();
+	}
+	return result;
+}
+
 [[nodiscard]] rpl::producer<Ui::MessageBarContent> ContentByItem(
 		not_null<HistoryItem*> item,
 		PinnedIdType type) {
 	return item->history()->session().changes().messageFlagsValue(
 		item,
 		Data::MessageUpdate::Flag::Edited
-	) | rpl::map([=] {
+	) | rpl::map([=]() -> rpl::producer<Ui::MessageBarContent> {
 		const auto media = item->media();
-		const auto poll = media ? media->poll() : nullptr;
-		return Ui::MessageBarContent{
-			.id = item->id,
-			.title = ((type == PinnedIdType::First)
-				? tr::lng_pinned_previous(tr::now) // #TODO pinned first?
-				: (type == PinnedIdType::Middle)
-				? tr::lng_pinned_previous(tr::now)
-				: !poll
-				? tr::lng_pinned_message(tr::now)
-				: poll->quiz()
-				? tr::lng_pinned_quiz(tr::now)
-				: tr::lng_pinned_poll(tr::now)),
-			.text = item->inReplyText(),
+		if (!media || !media->hasReplyPreview()) {
+			return rpl::single(ContentWithoutPreview(item, type));
+		}
+		constexpr auto kFullLoaded = 2;
+		constexpr auto kSomeLoaded = 1;
+		constexpr auto kNotLoaded = 0;
+		const auto loadedLevel = [=] {
+			const auto preview = media->replyPreview();
+			return media->replyPreviewLoaded()
+				? kFullLoaded
+				: preview
+				? kSomeLoaded
+				: kNotLoaded;
 		};
-	});
+		return rpl::single(
+			loadedLevel()
+		) | rpl::then(
+			item->history()->session().downloaderTaskFinished(
+			) | rpl::map(loadedLevel)
+		) | rpl::distinct_until_changed(
+		) | rpl::take_while([=](int loadLevel) {
+			return loadLevel < kFullLoaded;
+		}) | rpl::then(
+			rpl::single(kFullLoaded)
+		) | rpl::map([=] {
+			return ContentWithPreview(item, type, media->replyPreview());
+		});
+	}) | rpl::flatten_latest();
 }
 
 [[nodiscard]] rpl::producer<Ui::MessageBarContent> ContentByItemId(

From 0873db58d0ffef9c4bcd7a5c9e574293a9315430 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 12 Oct 2020 18:05:54 +0300
Subject: [PATCH 085/190] Moved PinnedBar to Ui:: in td_ui.

---
 .../SourceFiles/history/history_widget.cpp    |   6 +-
 Telegram/SourceFiles/history/history_widget.h |   5 +-
 .../history/view/history_view_pinned_bar.cpp  | 245 ++++--------------
 .../history/view/history_view_pinned_bar.h    |  48 +---
 Telegram/SourceFiles/ui/chat/message_bar.h    |   1 +
 Telegram/SourceFiles/ui/chat/pinned_bar.cpp   | 195 ++++++++++++++
 Telegram/SourceFiles/ui/chat/pinned_bar.h     |  54 ++++
 Telegram/cmake/td_ui.cmake                    |   2 +
 8 files changed, 316 insertions(+), 240 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/chat/pinned_bar.cpp
 create mode 100644 Telegram/SourceFiles/ui/chat/pinned_bar.h

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index a92dd5ab7..3514e9eca 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -92,6 +92,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "apiwrap.h"
 #include "base/qthelp_regex.h"
+#include "ui/chat/pinned_bar.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/item_text_options.h"
 #include "ui/unread_badge.h"
@@ -5252,10 +5253,9 @@ void HistoryWidget::checkPinnedBarState() {
 			messageId.type
 		};
 	});
-	_pinnedBar = std::make_unique<HistoryView::PinnedBar>(
+	_pinnedBar = std::make_unique<Ui::PinnedBar>(
 		this,
-		&session(),
-		std::move(shown),
+		HistoryView::PinnedBarContent(&session(), std::move(shown)),
 		true);
 
 	_pinnedBar->closeClicks(
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 1be6ab3bc..230570317 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -66,7 +66,7 @@ class SilentToggle;
 class FlatButton;
 class LinkButton;
 class RoundButton;
-class MessageBar;
+class PinnedBar;
 namespace Toast {
 class Instance;
 } // namespace Toast
@@ -95,7 +95,6 @@ class TopBarWidget;
 class ContactStatus;
 class Element;
 class PinnedTracker;
-class PinnedBar;
 } // namespace HistoryView
 
 class DragArea;
@@ -603,7 +602,7 @@ private:
 	object_ptr<Ui::IconButton> _fieldBarCancel;
 
 	std::unique_ptr<HistoryView::PinnedTracker> _pinnedTracker;
-	std::unique_ptr<HistoryView::PinnedBar> _pinnedBar;
+	std::unique_ptr<Ui::PinnedBar> _pinnedBar;
 	int _pinnedBarHeight = 0;
 
 	mtpRequestId _saveEditMsgRequestId = 0;
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index 4401bbb09..a31713bbc 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -12,42 +12,29 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "data/data_poll.h"
-#include "ui/widgets/shadow.h"
-#include "ui/widgets/buttons.h"
 #include "history/view/history_view_pinned_tracker.h"
 #include "history/history_item.h"
 #include "history/history.h"
 #include "apiwrap.h"
-#include "styles/style_chat.h"
+#include "styles/style_history.h"
 
 namespace HistoryView {
 namespace {
 
 [[nodiscard]] Ui::MessageBarContent ContentWithoutPreview(
-		not_null<HistoryItem*> item,
-		PinnedIdType type) {
+		not_null<HistoryItem*> item) {
 	const auto media = item->media();
 	const auto poll = media ? media->poll() : nullptr;
 	return Ui::MessageBarContent{
 		.id = item->id,
-		.title = ((type == PinnedIdType::First)
-			? tr::lng_pinned_previous(tr::now) // #TODO pinned first?
-			: (type == PinnedIdType::Middle)
-			? tr::lng_pinned_previous(tr::now)
-			: !poll
-			? tr::lng_pinned_message(tr::now)
-			: poll->quiz()
-			? tr::lng_pinned_quiz(tr::now)
-			: tr::lng_pinned_poll(tr::now)),
 		.text = item->inReplyText(),
 	};
 }
 
 [[nodiscard]] Ui::MessageBarContent ContentWithPreview(
 		not_null<HistoryItem*> item,
-		PinnedIdType type,
 		Image *preview) {
-	auto result = ContentWithoutPreview(item, type);
+	auto result = ContentWithoutPreview(item);
 	if (!preview) {
 		static const auto kEmpty = [&] {
 			const auto size = st::historyReplyHeight * cIntRetinaFactor();
@@ -66,15 +53,14 @@ namespace {
 }
 
 [[nodiscard]] rpl::producer<Ui::MessageBarContent> ContentByItem(
-		not_null<HistoryItem*> item,
-		PinnedIdType type) {
+		not_null<HistoryItem*> item) {
 	return item->history()->session().changes().messageFlagsValue(
 		item,
 		Data::MessageUpdate::Flag::Edited
 	) | rpl::map([=]() -> rpl::producer<Ui::MessageBarContent> {
 		const auto media = item->media();
 		if (!media || !media->hasReplyPreview()) {
-			return rpl::single(ContentWithoutPreview(item, type));
+			return rpl::single(ContentWithoutPreview(item));
 		}
 		constexpr auto kFullLoaded = 2;
 		constexpr auto kSomeLoaded = 1;
@@ -98,19 +84,19 @@ namespace {
 		}) | rpl::then(
 			rpl::single(kFullLoaded)
 		) | rpl::map([=] {
-			return ContentWithPreview(item, type, media->replyPreview());
+			return ContentWithPreview(item, media->replyPreview());
 		});
 	}) | rpl::flatten_latest();
 }
 
 [[nodiscard]] rpl::producer<Ui::MessageBarContent> ContentByItemId(
 		not_null<Main::Session*> session,
-		PinnedBarId id,
+		FullMsgId id,
 		bool alreadyLoaded = false) {
-	if (!id.message) {
+	if (!id) {
 		return rpl::single(Ui::MessageBarContent());
-	} else if (const auto item = session->data().message(id.message)) {
-		return ContentByItem(item, id.type);
+	} else if (const auto item = session->data().message(id)) {
+		return ContentByItem(item);
 	} else if (alreadyLoaded) {
 		return rpl::single(Ui::MessageBarContent()); // Deleted message?..
 	}
@@ -118,13 +104,13 @@ namespace {
 		consumer.put_next(Ui::MessageBarContent{
 			.text = tr::lng_contacts_loading(tr::now),
 		});
-		const auto channel = id.message.channel
-			? session->data().channel(id.message.channel).get()
+		const auto channel = id.channel
+			? session->data().channel(id.channel).get()
 			: nullptr;
 		const auto callback = [=](ChannelData *channel, MsgId id) {
 			consumer.put_done();
 		};
-		session->api().requestMessageData(channel, id.message.msg, callback);
+		session->api().requestMessageData(channel, id.msg, callback);
 		return rpl::lifetime();
 	});
 	return std::move(
@@ -134,180 +120,47 @@ namespace {
 	}));
 }
 
+auto WithPinnedTitle(not_null<Main::Session*> session, PinnedBarId id) {
+	return [=](Ui::MessageBarContent &&content) {
+		const auto item = session->data().message(id.message);
+		if (!item) {
+			return std::move(content);
+		}
+		const auto media = item->media();
+		const auto poll = media ? media->poll() : nullptr;
+		content.title = (id.type == PinnedIdType::First)
+			? tr::lng_pinned_previous(tr::now) // #TODO pinned first?
+			: (id.type == PinnedIdType::Middle)
+			? tr::lng_pinned_previous(tr::now)
+			: !poll
+			? tr::lng_pinned_message(tr::now)
+			: poll->quiz()
+			? tr::lng_pinned_quiz(tr::now)
+			: tr::lng_pinned_poll(tr::now);
+		return std::move(content);
+	};
+}
+
 } // namespace
 
-PinnedBar::PinnedBar(
-	not_null<QWidget*> parent,
-	not_null<Main::Session*> session,
-	rpl::producer<PinnedBarId> itemId,
-	bool withClose)
-: _wrap(parent, object_ptr<Ui::RpWidget>(parent))
-, _close(withClose
-	? std::make_unique<Ui::IconButton>(
-		_wrap.entity(),
-		st::historyReplyCancel)
-	: nullptr)
-, _shadow(std::make_unique<Ui::PlainShadow>(_wrap.parentWidget())) {
-	_wrap.hide(anim::type::instant);
-	_shadow->hide();
+rpl::producer<Ui::MessageBarContent> MessageBarContentByItemId(
+		not_null<Main::Session*> session,
+		FullMsgId id) {
+	return ContentByItemId(session, id);
+}
 
-	_wrap.entity()->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
-		QPainter(_wrap.entity()).fillRect(clip, st::historyPinnedBg);
-	}, lifetime());
-	_wrap.setAttribute(Qt::WA_OpaquePaintEvent);
-
-	rpl::duplicate(
-		itemId
+rpl::producer<Ui::MessageBarContent> PinnedBarContent(
+		not_null<Main::Session*> session,
+		rpl::producer<PinnedBarId> id) {
+	return std::move(
+		id
 	) | rpl::distinct_until_changed(
 	) | rpl::map([=](PinnedBarId id) {
-		return ContentByItemId(session, id);
-	}) | rpl::flatten_latest(
-	) | rpl::filter([=](const Ui::MessageBarContent &content) {
-		return !content.title.isEmpty() || !content.text.text.isEmpty();
-	}) | rpl::start_with_next([=](Ui::MessageBarContent &&content) {
-		const auto creating = !_bar;
-		if (creating) {
-			createControls();
-		}
-		_bar->set(std::move(content));
-		if (creating) {
-			_bar->finishAnimating();
-		}
-	}, lifetime());
-
-	std::move(
-		itemId
-	) | rpl::map([=](PinnedBarId id) {
-		return !id.message;
-	}) | rpl::start_with_next_done([=](bool hidden) {
-		_shouldBeShown = !hidden;
-		if (!_forceHidden) {
-			_wrap.toggle(_shouldBeShown, anim::type::normal);
-		} else if (!_shouldBeShown) {
-			_bar = nullptr;
-		}
-	}, [=] {
-		_forceHidden = true;
-		_wrap.toggle(false, anim::type::normal);
-	}, lifetime());
-}
-
-void PinnedBar::createControls() {
-	Expects(!_bar);
-
-	_bar = std::make_unique<Ui::MessageBar>(
-		_wrap.entity(),
-		st::defaultMessageBar);
-	if (_close) {
-		_close->raise();
-	}
-
-	// Clicks.
-	_bar->widget()->setCursor(style::cur_pointer);
-	_bar->widget()->events(
-	) | rpl::filter([=](not_null<QEvent*> event) {
-		return (event->type() == QEvent::MouseButtonPress);
-	}) | rpl::map([=] {
-		return _bar->widget()->events(
-		) | rpl::filter([=](not_null<QEvent*> event) {
-			return (event->type() == QEvent::MouseButtonRelease);
-		}) | rpl::take(1) | rpl::filter([=](not_null<QEvent*> event) {
-			return _bar->widget()->rect().contains(
-				static_cast<QMouseEvent*>(event.get())->pos());
-		});
-	}) | rpl::flatten_latest(
-	) | rpl::map([] {
-		return rpl::empty_value();
-	}) | rpl::start_to_stream(_barClicks, _bar->widget()->lifetime());
-
-	_bar->widget()->move(0, 0);
-	_bar->widget()->show();
-	_wrap.entity()->resize(_wrap.entity()->width(), _bar->widget()->height());
-
-	_wrap.geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
-		_shadow->setGeometry(
-			rect.x(),
-			rect.y() + rect.height(),
-			rect.width(),
-			st::lineWidth);
-		_bar->widget()->resizeToWidth(
-			rect.width() - (_close ? _close->width() : 0));
-		const auto hidden = _wrap.isHidden() || !rect.height();
-		if (_shadow->isHidden() != hidden) {
-			_shadow->setVisible(!hidden);
-		}
-		if (_close) {
-			_close->moveToRight(0, 0);
-		}
-	}, _bar->widget()->lifetime());
-
-	_wrap.shownValue(
-	) | rpl::skip(
-		1
-	) | rpl::filter([=](bool shown) {
-		return !shown && !_forceHidden;
-	}) | rpl::start_with_next([=] {
-		_bar = nullptr;
-	}, _bar->widget()->lifetime());
-
-	Ensures(_bar != nullptr);
-}
-
-void PinnedBar::show() {
-	if (!_forceHidden) {
-		return;
-	}
-	_forceHidden = false;
-	if (_shouldBeShown) {
-		_wrap.show(anim::type::instant);
-		_shadow->show();
-	}
-}
-
-void PinnedBar::hide() {
-	if (_forceHidden) {
-		return;
-	}
-	_forceHidden = true;
-	_wrap.hide(anim::type::instant);
-	_shadow->hide();
-}
-
-void PinnedBar::raise() {
-	_wrap.raise();
-	_shadow->raise();
-}
-
-void PinnedBar::move(int x, int y) {
-	_wrap.move(x, y);
-}
-
-void PinnedBar::resizeToWidth(int width) {
-	_wrap.entity()->resizeToWidth(width);
-}
-
-int PinnedBar::height() const {
-	return !_forceHidden
-		? _wrap.height()
-		: _shouldBeShown
-		? st::historyReplyHeight
-		: 0;
-}
-
-rpl::producer<int> PinnedBar::heightValue() const {
-	return _wrap.heightValue();
-}
-
-rpl::producer<> PinnedBar::closeClicks() const {
-	return !_close
-		? (rpl::never<>() | rpl::type_erased())
-		: (_close->clicks() | rpl::map([] { return rpl::empty_value(); }));
-}
-
-rpl::producer<> PinnedBar::barClicks() const {
-	return _barClicks.events();
+		return ContentByItemId(
+			session,
+			id.message
+		) | rpl::map(WithPinnedTitle(session, id));
+	}) | rpl::flatten_latest();
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
index 469e6f2a1..0995d1cb5 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
@@ -7,9 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "ui/wrap/slide_wrap.h"
 #include "ui/chat/message_bar.h"
 
+#include <tuple>
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -17,10 +18,15 @@ class Session;
 namespace Ui {
 class IconButton;
 class PlainShadow;
+struct MessageBarContent;
 } // namespace Ui
 
 namespace HistoryView {
 
+[[nodiscard]] rpl::producer<Ui::MessageBarContent> MessageBarContentByItemId(
+	not_null<Main::Session*> session,
+	FullMsgId id);
+
 enum class PinnedIdType;
 struct PinnedBarId {
 	FullMsgId message;
@@ -33,42 +39,8 @@ struct PinnedBarId {
 		return std::tie(message, type) == std::tie(other.message, other.type);
 	}
 };
-
-class PinnedBar final {
-public:
-	PinnedBar(
-		not_null<QWidget*> parent,
-		not_null<Main::Session*> session,
-		rpl::producer<PinnedBarId> itemId,
-		bool withClose = false);
-
-	void show();
-	void hide();
-	void raise();
-
-	void move(int x, int y);
-	void resizeToWidth(int width);
-	[[nodiscard]] int height() const;
-	[[nodiscard]] rpl::producer<int> heightValue() const;
-	[[nodiscard]] rpl::producer<> closeClicks() const;
-	[[nodiscard]] rpl::producer<> barClicks() const;
-
-	[[nodiscard]] rpl::lifetime &lifetime() {
-		return _wrap.lifetime();
-	}
-
-private:
-	void createControls();
-
-	Ui::SlideWrap<> _wrap;
-	std::unique_ptr<Ui::MessageBar> _bar;
-	std::unique_ptr<Ui::IconButton> _close;
-	std::unique_ptr<Ui::PlainShadow> _shadow;
-	rpl::event_stream<Ui::MessageBarContent> _content;
-	rpl::event_stream<> _barClicks;
-	bool _shouldBeShown = false;
-	bool _forceHidden = false;
-
-};
+[[nodiscard]] rpl::producer<Ui::MessageBarContent> PinnedBarContent(
+	not_null<Main::Session*> session,
+	rpl::producer<PinnedBarId> id);
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/ui/chat/message_bar.h b/Telegram/SourceFiles/ui/chat/message_bar.h
index 73bf97330..1c82d5672 100644
--- a/Telegram/SourceFiles/ui/chat/message_bar.h
+++ b/Telegram/SourceFiles/ui/chat/message_bar.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "ui/rp_widget.h"
+#include "ui/effects/animations.h"
 
 class Painter;
 
diff --git a/Telegram/SourceFiles/ui/chat/pinned_bar.cpp b/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
new file mode 100644
index 000000000..b925b91d7
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
@@ -0,0 +1,195 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/pinned_bar.h"
+
+#include "ui/chat/message_bar.h"
+#include "ui/widgets/shadow.h"
+#include "ui/widgets/buttons.h"
+#include "styles/style_chat.h"
+#include "styles/palette.h"
+
+#include <QtGui/QtEvents>
+
+namespace Ui {
+
+PinnedBar::PinnedBar(
+	not_null<QWidget*> parent,
+	rpl::producer<MessageBarContent> content,
+	bool withClose)
+: _wrap(parent, object_ptr<RpWidget>(parent))
+, _close(withClose
+	? std::make_unique<IconButton>(
+		_wrap.entity(),
+		st::historyReplyCancel)
+	: nullptr)
+, _shadow(std::make_unique<PlainShadow>(_wrap.parentWidget())) {
+	_wrap.hide(anim::type::instant);
+	_shadow->hide();
+
+	_wrap.entity()->paintRequest(
+	) | rpl::start_with_next([=](QRect clip) {
+		QPainter(_wrap.entity()).fillRect(clip, st::historyPinnedBg);
+	}, lifetime());
+	_wrap.setAttribute(Qt::WA_OpaquePaintEvent);
+
+	auto copy = std::move(
+		content
+	) | rpl::start_spawning(_wrap.lifetime());
+
+	rpl::duplicate(
+		copy
+	) | rpl::filter([=](const MessageBarContent &content) {
+		return !content.title.isEmpty() || !content.text.text.isEmpty();
+	}) | rpl::start_with_next([=](MessageBarContent &&content) {
+		const auto creating = !_bar;
+		if (creating) {
+			createControls();
+		}
+		_bar->set(std::move(content));
+		if (creating) {
+			_bar->finishAnimating();
+		}
+	}, lifetime());
+
+	std::move(
+		copy
+	) | rpl::map([=](const MessageBarContent &content) {
+		return content.title.isEmpty() || content.text.text.isEmpty();
+	}) | rpl::start_with_next_done([=](bool hidden) {
+		_shouldBeShown = !hidden;
+		if (!_forceHidden) {
+			_wrap.toggle(_shouldBeShown, anim::type::normal);
+		} else if (!_shouldBeShown) {
+			_bar = nullptr;
+		}
+	}, [=] {
+		_forceHidden = true;
+		_wrap.toggle(false, anim::type::normal);
+	}, lifetime());
+}
+
+PinnedBar::~PinnedBar() = default;
+
+void PinnedBar::createControls() {
+	Expects(!_bar);
+
+	_bar = std::make_unique<MessageBar>(
+		_wrap.entity(),
+		st::defaultMessageBar);
+	if (_close) {
+		_close->raise();
+	}
+
+	// Clicks.
+	_bar->widget()->setCursor(style::cur_pointer);
+	_bar->widget()->events(
+	) | rpl::filter([=](not_null<QEvent*> event) {
+		return (event->type() == QEvent::MouseButtonPress);
+	}) | rpl::map([=] {
+		return _bar->widget()->events(
+		) | rpl::filter([=](not_null<QEvent*> event) {
+			return (event->type() == QEvent::MouseButtonRelease);
+		}) | rpl::take(1) | rpl::filter([=](not_null<QEvent*> event) {
+			return _bar->widget()->rect().contains(
+				static_cast<QMouseEvent*>(event.get())->pos());
+		});
+	}) | rpl::flatten_latest(
+	) | rpl::map([] {
+		return rpl::empty_value();
+	}) | rpl::start_to_stream(_barClicks, _bar->widget()->lifetime());
+
+	_bar->widget()->move(0, 0);
+	_bar->widget()->show();
+	_wrap.entity()->resize(_wrap.entity()->width(), _bar->widget()->height());
+
+	_wrap.geometryValue(
+	) | rpl::start_with_next([=](QRect rect) {
+		_shadow->setGeometry(
+			rect.x(),
+			rect.y() + rect.height(),
+			rect.width(),
+			st::lineWidth);
+		_bar->widget()->resizeToWidth(
+			rect.width() - (_close ? _close->width() : 0));
+		const auto hidden = _wrap.isHidden() || !rect.height();
+		if (_shadow->isHidden() != hidden) {
+			_shadow->setVisible(!hidden);
+		}
+		if (_close) {
+			_close->moveToRight(0, 0);
+		}
+	}, _bar->widget()->lifetime());
+
+	_wrap.shownValue(
+	) | rpl::skip(
+		1
+	) | rpl::filter([=](bool shown) {
+		return !shown && !_forceHidden;
+	}) | rpl::start_with_next([=] {
+		_bar = nullptr;
+	}, _bar->widget()->lifetime());
+
+	Ensures(_bar != nullptr);
+}
+
+void PinnedBar::show() {
+	if (!_forceHidden) {
+		return;
+	}
+	_forceHidden = false;
+	if (_shouldBeShown) {
+		_wrap.show(anim::type::instant);
+		_shadow->show();
+	}
+}
+
+void PinnedBar::hide() {
+	if (_forceHidden) {
+		return;
+	}
+	_forceHidden = true;
+	_wrap.hide(anim::type::instant);
+	_shadow->hide();
+}
+
+void PinnedBar::raise() {
+	_wrap.raise();
+	_shadow->raise();
+}
+
+void PinnedBar::move(int x, int y) {
+	_wrap.move(x, y);
+}
+
+void PinnedBar::resizeToWidth(int width) {
+	_wrap.entity()->resizeToWidth(width);
+}
+
+int PinnedBar::height() const {
+	return !_forceHidden
+		? _wrap.height()
+		: _shouldBeShown
+		? st::historyReplyHeight
+		: 0;
+}
+
+rpl::producer<int> PinnedBar::heightValue() const {
+	return _wrap.heightValue();
+}
+
+rpl::producer<> PinnedBar::closeClicks() const {
+	return !_close
+		? (rpl::never<>() | rpl::type_erased())
+		: (_close->clicks() | rpl::map([] { return rpl::empty_value(); }));
+}
+
+rpl::producer<> PinnedBar::barClicks() const {
+	return _barClicks.events();
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/pinned_bar.h b/Telegram/SourceFiles/ui/chat/pinned_bar.h
new file mode 100644
index 000000000..dca2ee50e
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/pinned_bar.h
@@ -0,0 +1,54 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+#include "ui/wrap/slide_wrap.h"
+
+namespace Ui {
+
+struct MessageBarContent;
+class MessageBar;
+class IconButton;
+class PlainShadow;
+
+class PinnedBar final {
+public:
+	PinnedBar(
+		not_null<QWidget*> parent,
+		rpl::producer<Ui::MessageBarContent> content,
+		bool withClose = false);
+	~PinnedBar();
+
+	void show();
+	void hide();
+	void raise();
+
+	void move(int x, int y);
+	void resizeToWidth(int width);
+	[[nodiscard]] int height() const;
+	[[nodiscard]] rpl::producer<int> heightValue() const;
+	[[nodiscard]] rpl::producer<> closeClicks() const;
+	[[nodiscard]] rpl::producer<> barClicks() const;
+
+	[[nodiscard]] rpl::lifetime &lifetime() {
+		return _wrap.lifetime();
+	}
+
+private:
+	void createControls();
+
+	Ui::SlideWrap<> _wrap;
+	std::unique_ptr<Ui::MessageBar> _bar;
+	std::unique_ptr<Ui::IconButton> _close;
+	std::unique_ptr<Ui::PlainShadow> _shadow;
+	rpl::event_stream<> _barClicks;
+	bool _shouldBeShown = false;
+	bool _forceHidden = false;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 086a78e73..9c41becf5 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -34,6 +34,8 @@ PRIVATE
     ui/ui_pch.h
     ui/chat/message_bar.cpp
     ui/chat/message_bar.h
+    ui/chat/pinned_bar.cpp
+    ui/chat/pinned_bar.h
     ui/text/format_values.cpp
     ui/text/format_values.h
     ui/text/text_options.cpp

From af1854e87735fc67851ca2383dd2125878363f33 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 13 Oct 2020 10:16:16 +0300
Subject: [PATCH 086/190] Use Ui::PinnedBar in Replies section.

---
 .../SourceFiles/history/history_widget.cpp    |  15 ++
 .../view/history_view_replies_section.cpp     | 167 +++++++-----------
 .../view/history_view_replies_section.h       |  10 +-
 Telegram/SourceFiles/ui/chat/pinned_bar.cpp   |  26 ++-
 Telegram/SourceFiles/ui/chat/pinned_bar.h     |   5 +
 5 files changed, 103 insertions(+), 120 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 3514e9eca..6d48a15f2 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5258,6 +5258,21 @@ void HistoryWidget::checkPinnedBarState() {
 		HistoryView::PinnedBarContent(&session(), std::move(shown)),
 		true);
 
+	rpl::single(
+		rpl::empty_value()
+	) | rpl::then(
+		base::ObservableViewer(Adaptive::Changed())
+	) | rpl::map([] {
+		return Adaptive::OneColumn();
+	}) | rpl::start_with_next([=](bool one) {
+		_pinnedBar->setShadowGeometryPostprocess([=](QRect geometry) {
+			if (!one) {
+				geometry.setLeft(geometry.left() + st::lineWidth);
+			}
+			return geometry;
+		});
+	}, _pinnedBar->lifetime());
+
 	_pinnedBar->closeClicks(
 	) | rpl::start_with_next([=] {
 		hidePinnedMessage();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index d7751ce84..d433276e1 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -11,11 +11,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_top_bar_widget.h"
 #include "history/view/history_view_list_widget.h"
 #include "history/view/history_view_schedule_box.h"
+#include "history/view/history_view_pinned_bar.h"
 #include "history/history.h"
 #include "history/history_drag_area.h"
 #include "history/history_item_components.h"
 #include "history/history_item.h"
 #include "chat_helpers/send_context_menu.h" // SendMenu::Type.
+#include "ui/chat/pinned_bar.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
 #include "ui/wrap/slide_wrap.h"
@@ -23,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/item_text_options.h"
 #include "ui/toast/toast.h"
 #include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
 #include "ui/special_buttons.h"
 #include "ui/ui_utility.h"
 #include "ui/toasts/common_toasts.h"
@@ -77,6 +80,27 @@ bool CanSendFiles(not_null<const QMimeData*> data) {
 	return false;
 }
 
+rpl::producer<Ui::MessageBarContent> RootViewContent(
+		not_null<History*> history,
+		MsgId rootId) {
+	return MessageBarContentByItemId(
+		&history->session(),
+		FullMsgId{ history->channelId(), rootId }
+	) | rpl::map([=](Ui::MessageBarContent &&content) {
+		const auto item = history->owner().message(
+			history->channelId(),
+			rootId);
+		if (!item) {
+			content.text = Ui::Text::Link(tr::lng_deleted_message(tr::now));
+		}
+		const auto sender = (item && item->discussionPostOriginalSender())
+			? item->discussionPostOriginalSender()
+			: history->peer.get();
+		content.title = sender->name.isEmpty() ? "Message" : sender->name;
+		return std::move(content);
+	});
+}
+
 } // namespace
 
 RepliesMemento::RepliesMemento(
@@ -131,8 +155,6 @@ RepliesWidget::RepliesWidget(
 	this,
 	controller,
 	ComposeControls::Mode::Normal))
-, _rootView(this, object_ptr<Ui::RpWidget>(this))
-, _rootShadow(this)
 , _scroll(std::make_unique<Ui::ScrollArea>(this, st::historyScroll, false))
 , _scrollDown(_scroll.get(), st::historyToDown)
 , _readRequestTimer([=] { sendReadTillRequest(); }) {
@@ -170,7 +192,6 @@ RepliesWidget::RepliesWidget(
 	}, _topBar->lifetime());
 
 	_rootView->raise();
-	_rootShadow->raise();
 	_topBarShadow->raise();
 	updateAdaptiveLayout();
 	subscribe(Adaptive::Changed(), [=] { updateAdaptiveLayout(); });
@@ -263,9 +284,7 @@ void RepliesWidget::sendReadTillRequest() {
 }
 
 void RepliesWidget::setupRoot() {
-	if (_root) {
-		refreshRootView();
-	} else {
+	if (!_root) {
 		const auto channel = _history->peer->asChannel();
 		const auto done = crl::guard(this, [=](ChannelData*, MsgId) {
 			_root = lookupRoot();
@@ -277,86 +296,41 @@ void RepliesWidget::setupRoot() {
 				_inner->update();
 			}
 			updatePinnedVisibility();
-			refreshRootView();
 		});
 		_history->session().api().requestMessageData(channel, _rootId, done);
 	}
 }
 
 void RepliesWidget::setupRootView() {
-	const auto raw = _rootView->entity();
-	raw->resize(raw->width(), st::historyReplyHeight);
-	raw->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
-		auto p = Painter(raw);
-		p.fillRect(clip, st::historyPinnedBg);
+	auto content = rpl::combine(
+		RootViewContent(_history, _rootId),
+		_rootVisible.value()
+	) | rpl::map([=](Ui::MessageBarContent &&content, bool shown) {
+		return shown ? std::move(content) : Ui::MessageBarContent();
+	});
+	_rootView = std::make_unique<Ui::PinnedBar>(this, std::move(content));
 
-		auto top = st::msgReplyPadding.top();
-		QRect rbar(myrtlrect(st::msgReplyBarSkip + st::msgReplyBarPos.x(), top + st::msgReplyBarPos.y(), st::msgReplyBarSize.width(), st::msgReplyBarSize.height()));
-		p.fillRect(rbar, st::msgInReplyBarColor);
-
-		int32 left = st::msgReplyBarSkip + st::msgReplyBarSkip;
-		if (!_rootTitle.isEmpty()) {
-			const auto media = _root ? _root->media() : nullptr;
-			if (media && media->hasReplyPreview()) {
-				if (const auto image = media->replyPreview()) {
-					QRect to(left, top, st::msgReplyBarSize.height(), st::msgReplyBarSize.height());
-					p.drawPixmap(to.x(), to.y(), image->pixSingle(image->width() / cIntRetinaFactor(), image->height() / cIntRetinaFactor(), to.width(), to.height(), ImageRoundRadius::Small));
-				}
-				left += st::msgReplyBarSize.height() + st::msgReplyBarSkip - st::msgReplyBarSize.width() - st::msgReplyBarPos.x();
+	rpl::single(
+		rpl::empty_value()
+	) | rpl::then(
+		base::ObservableViewer(Adaptive::Changed())
+	) | rpl::map([] {
+		return Adaptive::OneColumn();
+	}) | rpl::start_with_next([=](bool one) {
+		_rootView->setShadowGeometryPostprocess([=](QRect geometry) {
+			if (!one) {
+				geometry.setLeft(geometry.left() + st::lineWidth);
 			}
-			p.setPen(st::historyReplyNameFg);
-			p.setFont(st::msgServiceNameFont);
-			const auto poll = media ? media->poll() : nullptr;
-			const auto pinnedHeader = !poll
-				? tr::lng_pinned_message(tr::now)
-				: poll->quiz()
-				? tr::lng_pinned_quiz(tr::now)
-				: tr::lng_pinned_poll(tr::now);
-			_rootTitle.drawElided(p, left, top, width() - left - st::msgReplyPadding.right());
-
-			p.setPen(st::historyComposeAreaFg);
-			p.setTextPalette(st::historyComposeAreaPalette);
-			_rootMessage.drawElided(p, left, top + st::msgServiceNameFont->height, width() - left - st::msgReplyPadding.right());
-			p.restoreTextPalette();
-		} else {
-			p.setFont(st::msgDateFont);
-			p.setPen(st::historyComposeAreaFgService);
-			p.drawText(left, top + (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2 + st::msgDateFont->ascent, st::msgDateFont->elided(tr::lng_profile_loading(tr::now), width() - left - st::msgReplyPadding.right()));
-		}
-	}, raw->lifetime());
-
-	raw->setCursor(style::cur_pointer);
-	const auto pressed = raw->lifetime().make_state<bool>();
-	raw->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
-		const auto mouse = static_cast<QMouseEvent*>(e.get());
-		if (e->type() == QEvent::MouseButtonPress) {
-			if (mouse->button() == Qt::LeftButton) {
-				*pressed = true;
-			}
-		} else if (e->type() == QEvent::MouseButtonRelease) {
-			if (mouse->button() == Qt::LeftButton) {
-				if (base::take(*pressed)
-					&& raw->rect().contains(mouse->pos())) {
-					showAtStart();
-				}
-			}
-		}
-	}, raw->lifetime());
-
-	_rootView->geometryValue(
-	) | rpl::start_with_next([=](QRect rect) {
-		_rootShadow->moveToLeft(
-			_rootShadow->x(),
-			rect.y() + rect.height());
+			return geometry;
+		});
 	}, _rootView->lifetime());
 
-	_rootShadow->showOn(_rootView->shownValue());
+	_rootView->barClicks(
+	) | rpl::start_with_next([=] {
+		showAtStart();
+	}, lifetime());
 
-	_rootView->hide(anim::type::instant);
 	_rootViewHeight = 0;
-
 	_rootView->heightValue(
 	) | rpl::start_with_next([=](int height) {
 		if (const auto delta = height - _rootViewHeight) {
@@ -366,34 +340,6 @@ void RepliesWidget::setupRootView() {
 	}, _rootView->lifetime());
 }
 
-void RepliesWidget::refreshRootView() {
-	const auto sender = (_root && _root->discussionPostOriginalSender())
-		? _root->discussionPostOriginalSender()
-		: _history->peer.get();
-	_rootTitle.setText(
-		st::fwdTextStyle,
-		sender->name,
-		Ui::NameTextOptions());
-	if (_rootTitle.isEmpty()) {
-		_rootTitle.setText(
-			st::fwdTextStyle,
-			"Message",
-			Ui::NameTextOptions());
-	}
-	if (_root) {
-		_rootMessage.setText(
-			st::messageTextStyle,
-			_root->inReplyText(),
-			Ui::DialogTextOptions());
-	} else {
-		_rootMessage.setText(
-			st::messageTextStyle,
-			textcmdLink(1, tr::lng_deleted_message(tr::now)),
-			Ui::DialogTextOptions());
-	}
-	update();
-}
-
 HistoryItem *RepliesWidget::lookupRoot() const {
 	return _history->owner().message(_history->channelId(), _rootId);
 }
@@ -1332,9 +1278,6 @@ void RepliesWidget::updateAdaptiveLayout() {
 	_topBarShadow->moveToLeft(
 		Adaptive::OneColumn() ? 0 : st::lineWidth,
 		_topBar->height());
-	_rootShadow->moveToLeft(
-		Adaptive::OneColumn() ? 0 : st::lineWidth,
-		_rootShadow->y());
 }
 
 not_null<History*> RepliesWidget::history() const {
@@ -1518,7 +1461,9 @@ void RepliesWidget::updateControlsGeometry() {
 		: base::make_optional(_scroll->scrollTop() + topDelta());
 	_topBar->resizeToWidth(contentWidth);
 	_topBarShadow->resize(contentWidth, st::lineWidth);
-	_rootShadow->resize(contentWidth, st::lineWidth);
+	if (_rootView) {
+		_rootView->resizeToWidth(contentWidth);
+	}
 	_rootView->resizeToWidth(contentWidth);
 
 	const auto bottom = height();
@@ -1606,10 +1551,16 @@ void RepliesWidget::setPinnedVisibility(bool shown) {
 					updateControlsGeometry();
 				}
 			}
-			_rootView->toggle(shown, anim::type::instant);
+			if (shown) {
+				_rootView->show();
+			} else {
+				_rootView->hide();
+			}
+			_rootVisible = shown;
+			_rootView->finishAnimating();
 			_rootViewInited = true;
 		} else {
-			_rootView->toggle(shown, anim::type::normal);
+			_rootVisible = shown;
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 90c9a64b8..5adf27731 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -35,8 +35,7 @@ class ScrollArea;
 class PlainShadow;
 class FlatButton;
 class HistoryDownButton;
-template <typename Widget>
-class SlideWrap;
+class PinnedBar;
 } // namespace Ui
 
 namespace Profile {
@@ -158,7 +157,6 @@ private:
 
 	void setupRoot();
 	void setupRootView();
-	void refreshRootView();
 	void setupDragArea();
 	void sendReadTillRequest();
 	void readTill(not_null<HistoryItem*> item);
@@ -250,12 +248,10 @@ private:
 	std::unique_ptr<ComposeControls> _composeControls;
 	bool _skipScrollEvent = false;
 
-	Ui::Text::String _rootTitle;
-	Ui::Text::String _rootMessage;
-	object_ptr<Ui::SlideWrap<Ui::RpWidget>> _rootView;
+	std::unique_ptr<Ui::PinnedBar> _rootView;
 	int _rootViewHeight = 0;
-	object_ptr<Ui::PlainShadow> _rootShadow;
 	bool _rootViewInited = false;
+	rpl::variable<bool> _rootVisible = false;
 
 	std::unique_ptr<Ui::ScrollArea> _scroll;
 
diff --git a/Telegram/SourceFiles/ui/chat/pinned_bar.cpp b/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
index b925b91d7..c4878ed28 100644
--- a/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
@@ -75,6 +75,22 @@ PinnedBar::PinnedBar(
 
 PinnedBar::~PinnedBar() = default;
 
+void PinnedBar::setShadowGeometryPostprocess(Fn<QRect(QRect)> postprocess) {
+	_shadowGeometryPostprocess = std::move(postprocess);
+	updateShadowGeometry(_wrap.geometry());
+}
+
+void PinnedBar::updateShadowGeometry(QRect wrapGeometry) {
+	const auto regular = QRect(
+		wrapGeometry.x(),
+		wrapGeometry.y() + wrapGeometry.height(),
+		wrapGeometry.width(),
+		st::lineWidth);
+	_shadow->setGeometry(_shadowGeometryPostprocess
+		? _shadowGeometryPostprocess(regular)
+		: regular);
+}
+
 void PinnedBar::createControls() {
 	Expects(!_bar);
 
@@ -109,11 +125,7 @@ void PinnedBar::createControls() {
 
 	_wrap.geometryValue(
 	) | rpl::start_with_next([=](QRect rect) {
-		_shadow->setGeometry(
-			rect.x(),
-			rect.y() + rect.height(),
-			rect.width(),
-			st::lineWidth);
+		updateShadowGeometry(rect);
 		_bar->widget()->resizeToWidth(
 			rect.width() - (_close ? _close->width() : 0));
 		const auto hidden = _wrap.isHidden() || !rect.height();
@@ -162,6 +174,10 @@ void PinnedBar::raise() {
 	_shadow->raise();
 }
 
+void PinnedBar::finishAnimating() {
+	_wrap.finishAnimating();
+}
+
 void PinnedBar::move(int x, int y) {
 	_wrap.move(x, y);
 }
diff --git a/Telegram/SourceFiles/ui/chat/pinned_bar.h b/Telegram/SourceFiles/ui/chat/pinned_bar.h
index dca2ee50e..55ca6a283 100644
--- a/Telegram/SourceFiles/ui/chat/pinned_bar.h
+++ b/Telegram/SourceFiles/ui/chat/pinned_bar.h
@@ -26,6 +26,9 @@ public:
 	void show();
 	void hide();
 	void raise();
+	void finishAnimating();
+
+	void setShadowGeometryPostprocess(Fn<QRect(QRect)> postprocess);
 
 	void move(int x, int y);
 	void resizeToWidth(int width);
@@ -40,12 +43,14 @@ public:
 
 private:
 	void createControls();
+	void updateShadowGeometry(QRect wrapGeometry);
 
 	Ui::SlideWrap<> _wrap;
 	std::unique_ptr<Ui::MessageBar> _bar;
 	std::unique_ptr<Ui::IconButton> _close;
 	std::unique_ptr<Ui::PlainShadow> _shadow;
 	rpl::event_stream<> _barClicks;
+	Fn<QRect(QRect)> _shadowGeometryPostprocess;
 	bool _shouldBeShown = false;
 	bool _forceHidden = false;
 

From 39cf51c0664135bfdfde918798f88c8676307620 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 13 Oct 2020 13:00:35 +0300
Subject: [PATCH 087/190] Move SendButton/EmojiButton to td_ui.

---
 .../SourceFiles/boxes/edit_caption_box.cpp    |   2 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp |   2 +-
 Telegram/SourceFiles/config.h                 |  22 --
 Telegram/SourceFiles/core/file_utilities.cpp  |  15 +-
 Telegram/SourceFiles/core/file_utilities.h    |   7 +-
 .../SourceFiles/history/history_widget.cpp    |   7 +-
 .../view/history_view_compose_controls.cpp    |   3 +-
 .../view/history_view_replies_section.cpp     |   6 +-
 .../view/history_view_scheduled_section.cpp   |   6 +-
 .../passport/passport_panel_edit_scans.cpp    |   5 +-
 .../SourceFiles/settings/settings_chat.cpp    |   4 +-
 .../settings/settings_information.cpp         |   6 +-
 .../storage/storage_media_prepare.cpp         |   5 +-
 .../ui/chat/attach/attach_extensions.cpp      |  33 ++
 .../ui/chat/attach/attach_extensions.h        |  15 +
 .../SourceFiles/ui/controls/emoji_button.cpp  | 127 +++++++
 .../SourceFiles/ui/controls/emoji_button.h    |  46 +++
 .../SourceFiles/ui/controls/send_button.cpp   | 265 ++++++++++++++
 .../SourceFiles/ui/controls/send_button.h     |  92 +++++
 Telegram/SourceFiles/ui/special_buttons.cpp   | 344 +-----------------
 Telegram/SourceFiles/ui/special_buttons.h     | 107 ------
 Telegram/SourceFiles/ui/ui_pch.h              |   2 +
 Telegram/cmake/td_ui.cmake                    |   9 +-
 23 files changed, 624 insertions(+), 506 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_extensions.cpp
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_extensions.h
 create mode 100644 Telegram/SourceFiles/ui/controls/emoji_button.cpp
 create mode 100644 Telegram/SourceFiles/ui/controls/emoji_button.h
 create mode 100644 Telegram/SourceFiles/ui/controls/send_button.cpp
 create mode 100644 Telegram/SourceFiles/ui/controls/send_button.h

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index b2e36864a..93ca21033 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -47,8 +47,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/text/format_values.h"
-#include "ui/special_buttons.h"
 #include "ui/text/text_options.h"
+#include "ui/controls/emoji_button.h"
 #include "window/window_session_controller.h"
 #include "confirm_box.h"
 #include "apiwrap.h"
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index fcfc37789..a247b56b0 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -34,7 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/format_values.h"
 #include "ui/grouped_layout.h"
 #include "ui/text/text_options.h"
-#include "ui/special_buttons.h"
+#include "ui/controls/emoji_button.h"
 #include "lottie/lottie_single_player.h"
 #include "data/data_document.h"
 #include "media/clip/media_clip_reader.h"
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 40d01e9fc..5bc8f9c47 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -133,25 +133,3 @@ inline const QRegularExpression &cRussianLetters() {
 	static QRegularExpression regexp(QString::fromUtf8("[а-яА-ЯёЁ]"));
 	return regexp;
 }
-
-inline const QStringList &cImgExtensions() {
-	static QStringList result;
-	if (result.isEmpty()) {
-		result.reserve(4);
-		result.push_back(qsl(".jpg"));
-		result.push_back(qsl(".jpeg"));
-		result.push_back(qsl(".png"));
-		result.push_back(qsl(".gif"));
-	}
-	return result;
-}
-
-inline const QStringList &cExtensionsForCompress() {
-	static QStringList result;
-	if (result.isEmpty()) {
-		result.push_back(qsl(".jpg"));
-		result.push_back(qsl(".jpeg"));
-		result.push_back(qsl(".png"));
-	}
-	return result;
-}
diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp
index edd0681c9..90560e7a6 100644
--- a/Telegram/SourceFiles/core/file_utilities.cpp
+++ b/Telegram/SourceFiles/core/file_utilities.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "base/unixtime.h"
 #include "ui/delayed_activation.h"
+#include "ui/chat/attach/attach_extensions.h"
 #include "main/main_session.h"
 #include "mainwindow.h"
 
@@ -316,8 +317,20 @@ QString AllFilesFilter() {
 #endif // Q_OS_WIN
 }
 
+QString ImagesFilter() {
+	return u"Image files (*"_q + Ui::ImageExtensions().join(u" *"_q) + u")"_q;
+}
+
+QString AllOrImagesFilter() {
+	return AllFilesFilter() + u";;"_q + ImagesFilter();
+}
+
+QString ImagesOrAllFilter() {
+	return ImagesFilter() + u";;"_q + AllFilesFilter();
+}
+
 QString AlbumFilesFilter() {
-	return qsl("Image and Video Files (*.png *.jpg *.jpeg *.mp4 *.mov)");
+	return u"Image and Video Files (*.png *.jpg *.jpeg *.mp4 *.mov)"_q;
 }
 
 namespace internal {
diff --git a/Telegram/SourceFiles/core/file_utilities.h b/Telegram/SourceFiles/core/file_utilities.h
index ecefe35bb..d44072bb1 100644
--- a/Telegram/SourceFiles/core/file_utilities.h
+++ b/Telegram/SourceFiles/core/file_utilities.h
@@ -89,8 +89,11 @@ void GetFolder(
 	Fn<void(QString &&result)> callback,
 	Fn<void()> failed = Fn<void()>());
 
-QString AllFilesFilter();
-QString AlbumFilesFilter();
+[[nodiscard]] QString AllFilesFilter();
+[[nodiscard]] QString ImagesFilter();
+[[nodiscard]] QString AllOrImagesFilter();
+[[nodiscard]] QString ImagesOrAllFilter();
+[[nodiscard]] QString AlbumFilesFilter();
 
 namespace internal {
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 6d48a15f2..751f3023b 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -32,6 +32,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/message_bar.h"
 #include "ui/image/image.h"
 #include "ui/special_buttons.h"
+#include "ui/controls/emoji_button.h"
+#include "ui/controls/send_button.h"
 #include "inline_bots/inline_bot_result.h"
 #include "base/event_filter.h"
 #include "base/unixtime.h"
@@ -3276,10 +3278,7 @@ void HistoryWidget::chooseAttach() {
 		return;
 	}
 
-	const auto filter = FileDialog::AllFilesFilter()
-		+ qsl(";;Image files (*")
-		+ cImgExtensions().join(qsl(" *"))
-		+ qsl(")");
+	const auto filter = FileDialog::AllOrImagesFilter();
 
 	FileDialog::GetOpenPaths(this, tr::lng_choose_files(tr::now), filter, crl::guard(this, [=](
 			FileDialog::OpenResult &&result) {
diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
index 154495ed4..6e3ec83d2 100644
--- a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
@@ -32,11 +32,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/audio/media_audio_capture.h"
 #include "media/audio/media_audio.h"
 #include "styles/style_chat.h"
-#include "ui/special_buttons.h"
 #include "ui/text/text_options.h"
 #include "ui/ui_utility.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/text/format_values.h"
+#include "ui/controls/emoji_button.h"
+#include "ui/controls/send_button.h"
 #include "window/window_session_controller.h"
 #include "mainwindow.h"
 
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index d433276e1..41d644c40 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -526,11 +526,7 @@ void RepliesWidget::chooseAttach() {
 		return;
 	}
 
-	const auto filter = FileDialog::AllFilesFilter()
-		+ qsl(";;Image files (*")
-		+ cImgExtensions().join(qsl(" *"))
-		+ qsl(")");
-
+	const auto filter = FileDialog::AllOrImagesFilter();
 	FileDialog::GetOpenPaths(this, tr::lng_choose_files(tr::now), filter, crl::guard(this, [=](
 			FileDialog::OpenResult &&result) {
 		if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index ce7b5e9f7..dca932b12 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -266,11 +266,7 @@ void ScheduledWidget::chooseAttach() {
 		return;
 	}
 
-	const auto filter = FileDialog::AllFilesFilter()
-		+ qsl(";;Image files (*")
-		+ cImgExtensions().join(qsl(" *"))
-		+ qsl(")");
-
+	const auto filter = FileDialog::AllOrImagesFilter();
 	FileDialog::GetOpenPaths(this, tr::lng_choose_files(tr::now), filter, crl::guard(this, [=](
 			FileDialog::OpenResult &&result) {
 		if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
index 5148a10f9..6bdad1c90 100644
--- a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
@@ -853,10 +853,7 @@ void EditScans::ChooseScan(
 		Fn<void(ReadScanError)> errorCallback) {
 	Expects(parent != nullptr);
 
-	const auto filter = FileDialog::AllFilesFilter()
-		+ qsl(";;Image files (*")
-		+ cImgExtensions().join(qsl(" *"))
-		+ qsl(")");
+	const auto filter = FileDialog::AllOrImagesFilter();
 	const auto guardedCallback = crl::guard(parent, doneCallback);
 	const auto guardedError = crl::guard(parent, errorCallback);
 	const auto onMainError = [=](ReadScanError error) {
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index 8633a560e..a27a33f60 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/chat/attach/attach_extensions.h"
 #include "ui/layers/generic_box.h"
 #include "ui/effects/radial_animation.h"
 #include "ui/toast/toast.h"
@@ -600,10 +601,9 @@ void BackgroundRow::updateImage() {
 void ChooseFromFile(
 		not_null<Window::SessionController*> controller,
 		not_null<QWidget*> parent) {
-	const auto &imgExtensions = cImgExtensions();
 	auto filters = QStringList(
 		qsl("Theme files (*.tdesktop-theme *.tdesktop-palette *")
-		+ imgExtensions.join(qsl(" *"))
+		+ Ui::ImageExtensions().join(qsl(" *"))
 		+ qsl(")"));
 	filters.push_back(FileDialog::AllFilesFilter());
 	const auto callback = crl::guard(controller, [=](
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index 476c6ba32..da2fd6461 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -63,11 +63,7 @@ void SetupPhoto(
 		st::settingsInfoPhotoSet);
 	upload->setFullRadius(true);
 	upload->addClickHandler([=] {
-		const auto imageExtensions = cImgExtensions();
-		const auto filter = qsl("Image files (*")
-			+ imageExtensions.join(qsl(" *"))
-			+ qsl(");;")
-			+ FileDialog::AllFilesFilter();
+		const auto filter = FileDialog::ImagesOrAllFilter();
 		const auto callback = [=](const FileDialog::OpenResult &result) {
 			if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
 				return;
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index c67f36b34..6099d31df 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/localimageloader.h"
 #include "core/mime_type.h"
 #include "ui/image/image_prepare.h"
+#include "ui/chat/attach/attach_extensions.h"
 #include "app.h"
 
 #include <QtCore/QSemaphore>
@@ -194,7 +195,7 @@ MimeDataState ComputeMimeDataState(const QMimeData *data) {
 		return MimeDataState::None;
 	}
 
-	const auto imageExtensions = cImgExtensions();
+	const auto imageExtensions = Ui::ImageExtensions();
 	auto files = QStringList();
 	auto allAreSmallImages = true;
 	for (const auto &url : urls) {
@@ -242,7 +243,7 @@ PreparedList PrepareMediaList(const QList<QUrl> &files, int previewWidth) {
 PreparedList PrepareMediaList(const QStringList &files, int previewWidth) {
 	auto result = PreparedList();
 	result.files.reserve(files.size());
-	const auto extensionsToCompress = cExtensionsForCompress();
+	const auto extensionsToCompress = Ui::ExtensionsForCompression();
 	for (const auto &file : files) {
 		const auto fileinfo = QFileInfo(file);
 		const auto filesize = fileinfo.size();
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_extensions.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_extensions.cpp
new file mode 100644
index 000000000..73fbaf25b
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_extensions.cpp
@@ -0,0 +1,33 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/attach/attach_extensions.h"
+
+namespace Ui {
+
+const QStringList &ImageExtensions() {
+	static const auto result = QStringList{
+		u".bmp"_q,
+		u".jpg"_q,
+		u".jpeg"_q,
+		u".png"_q,
+		u".gif"_q,
+	};
+	return result;
+}
+
+const QStringList &ExtensionsForCompression() {
+	static const auto result = QStringList{
+		u".bmp"_q,
+		u".jpg"_q,
+		u".jpeg"_q,
+		u".png"_q,
+	};
+	return result;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_extensions.h b/Telegram/SourceFiles/ui/chat/attach/attach_extensions.h
new file mode 100644
index 000000000..f49f685ae
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_extensions.h
@@ -0,0 +1,15 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+
+[[nodiscard]] const QStringList &ImageExtensions();
+[[nodiscard]] const QStringList &ExtensionsForCompression();
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/emoji_button.cpp b/Telegram/SourceFiles/ui/controls/emoji_button.cpp
new file mode 100644
index 000000000..83b9ba31b
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/emoji_button.cpp
@@ -0,0 +1,127 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/emoji_button.h"
+
+#include "ui/effects/radial_animation.h"
+#include "ui/effects/ripple_animation.h"
+#include "styles/style_chat.h"
+
+namespace Ui {
+namespace {
+
+} // namespace
+
+EmojiButton::EmojiButton(QWidget *parent, const style::IconButton &st)
+: RippleButton(parent, st.ripple)
+, _st(st) {
+	resize(_st.width, _st.height);
+	setCursor(style::cur_pointer);
+}
+
+void EmojiButton::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+
+	p.fillRect(e->rect(), st::historyComposeAreaBg);
+	paintRipple(p, _st.rippleAreaPosition.x(), _st.rippleAreaPosition.y(), _rippleOverride ? &(*_rippleOverride)->c : nullptr);
+
+	const auto over = isOver();
+	const auto loadingState = _loading
+		? _loading->computeState()
+		: RadialState{ 0., 0, RadialState::kFull };
+	if (loadingState.shown < 1.) {
+		p.setOpacity(1. - loadingState.shown);
+
+		const auto icon = _iconOverride ? _iconOverride : &(over ? _st.iconOver : _st.icon);
+		auto position = _st.iconPosition;
+		if (position.x() < 0) {
+			position.setX((width() - icon->width()) / 2);
+		}
+		if (position.y() < 0) {
+			position.setY((height() - icon->height()) / 2);
+		}
+		icon->paint(p, position, width());
+
+		p.setOpacity(1.);
+	}
+
+	QRect inner(QPoint((width() - st::historyEmojiCircle.width()) / 2, (height() - st::historyEmojiCircle.height()) / 2), st::historyEmojiCircle);
+	const auto color = (_colorOverride
+		? *_colorOverride
+		: (over
+			? st::historyEmojiCircleFgOver
+			: st::historyEmojiCircleFg));
+	if (anim::Disabled() && _loading && _loading->animating()) {
+		anim::DrawStaticLoading(
+			p,
+			inner,
+			st::historyEmojiCircleLine,
+			color);
+	} else {
+		auto pen = color->p;
+		pen.setWidth(st::historyEmojiCircleLine);
+		pen.setCapStyle(Qt::RoundCap);
+		p.setPen(pen);
+		p.setBrush(Qt::NoBrush);
+
+		PainterHighQualityEnabler hq(p);
+		if (loadingState.arcLength < RadialState::kFull) {
+			p.drawArc(inner, loadingState.arcFrom, loadingState.arcLength);
+		} else {
+			p.drawEllipse(inner);
+		}
+	}
+}
+
+void EmojiButton::loadingAnimationCallback() {
+	if (!anim::Disabled()) {
+		update();
+	}
+}
+
+void EmojiButton::setLoading(bool loading) {
+	if (loading && !_loading) {
+		_loading = std::make_unique<InfiniteRadialAnimation>(
+			[=] { loadingAnimationCallback(); },
+			st::defaultInfiniteRadialAnimation);
+	}
+	if (loading) {
+		_loading->start();
+		update();
+	} else if (_loading) {
+		_loading->stop();
+		update();
+	}
+}
+
+void EmojiButton::setColorOverrides(const style::icon *iconOverride, const style::color *colorOverride, const style::color *rippleOverride) {
+	_iconOverride = iconOverride;
+	_colorOverride = colorOverride;
+	_rippleOverride = rippleOverride;
+	update();
+}
+
+void EmojiButton::onStateChanged(State was, StateChangeSource source) {
+	RippleButton::onStateChanged(was, source);
+	auto wasOver = static_cast<bool>(was & StateFlag::Over);
+	if (isOver() != wasOver) {
+		update();
+	}
+}
+
+QPoint EmojiButton::prepareRippleStartPosition() const {
+	if (!_st.rippleAreaSize) {
+		return DisabledRippleStartPosition();
+	}
+	return mapFromGlobal(QCursor::pos()) - _st.rippleAreaPosition;
+}
+
+QImage EmojiButton::prepareRippleMask() const {
+	return RippleAnimation::ellipseMask(QSize(_st.rippleAreaSize, _st.rippleAreaSize));
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/emoji_button.h b/Telegram/SourceFiles/ui/controls/emoji_button.h
new file mode 100644
index 000000000..a39d40c9c
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/emoji_button.h
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/buttons.h"
+
+namespace Ui {
+
+class InfiniteRadialAnimation;
+
+class EmojiButton final : public RippleButton {
+public:
+	EmojiButton(QWidget *parent, const style::IconButton &st);
+
+	void setLoading(bool loading);
+	void setColorOverrides(
+		const style::icon *iconOverride,
+		const style::color *colorOverride,
+		const style::color *rippleOverride);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void onStateChanged(State was, StateChangeSource source) override;
+
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+private:
+	void loadingAnimationCallback();
+
+	const style::IconButton &_st;
+
+	std::unique_ptr<Ui::InfiniteRadialAnimation> _loading;
+
+	const style::icon *_iconOverride = nullptr;
+	const style::color *_colorOverride = nullptr;
+	const style::color *_rippleOverride = nullptr;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/send_button.cpp b/Telegram/SourceFiles/ui/controls/send_button.cpp
new file mode 100644
index 000000000..3c7df9e84
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/send_button.cpp
@@ -0,0 +1,265 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/send_button.h"
+
+#include "ui/effects/ripple_animation.h"
+#include "styles/style_chat.h"
+
+namespace Ui {
+namespace {
+
+constexpr int kWideScale = 5;
+
+} // namespace
+
+SendButton::SendButton(QWidget *parent)
+: RippleButton(parent, st::historyReplyCancel.ripple) {
+	resize(st::historySendSize);
+}
+
+void SendButton::setType(Type type) {
+	Expects(isSlowmode() || type != Type::Slowmode);
+
+	if (isSlowmode() && type != Type::Slowmode) {
+		_afterSlowmodeType = type;
+		return;
+	}
+	if (_type != type) {
+		_contentFrom = grabContent();
+		_type = type;
+		_a_typeChanged.stop();
+		_contentTo = grabContent();
+		_a_typeChanged.start(
+			[=] { update(); },
+			0.,
+			1.,
+			st::historyRecordVoiceDuration);
+		setPointerCursor(_type != Type::Slowmode);
+		update();
+	}
+	if (_type != Type::Record) {
+		_recordActive = false;
+		_a_recordActive.stop();
+	}
+}
+
+void SendButton::setRecordActive(bool recordActive) {
+	if (_recordActive != recordActive) {
+		_recordActive = recordActive;
+		_a_recordActive.start(
+			[=] { recordAnimationCallback(); },
+			_recordActive ? 0. : 1.,
+			_recordActive ? 1. : 0,
+			st::historyRecordVoiceDuration);
+		update();
+	}
+}
+
+void SendButton::setSlowmodeDelay(int seconds) {
+	Expects(seconds >= 0 && seconds < kSlowmodeDelayLimit);
+
+	if (_slowmodeDelay == seconds) {
+		return;
+	}
+	_slowmodeDelay = seconds;
+	_slowmodeDelayText = isSlowmode()
+		? u"%1:%2"_q.arg(seconds / 60).arg(seconds % 60, 2, 10, QChar('0'))
+		: QString();
+	setType(isSlowmode() ? Type::Slowmode : _afterSlowmodeType);
+	update();
+}
+
+void SendButton::finishAnimating() {
+	_a_typeChanged.stop();
+	_a_recordActive.stop();
+	update();
+}
+
+void SendButton::mouseMoveEvent(QMouseEvent *e) {
+	AbstractButton::mouseMoveEvent(e);
+	if (_recording) {
+		if (_recordUpdateCallback) {
+			_recordUpdateCallback(e->globalPos());
+		}
+	}
+}
+
+void SendButton::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+
+	auto over = (isDown() || isOver());
+	auto changed = _a_typeChanged.value(1.);
+	if (changed < 1.) {
+		PainterHighQualityEnabler hq(p);
+		p.setOpacity(1. - changed);
+		auto targetRect = QRect((1 - kWideScale) / 2 * width(), (1 - kWideScale) / 2 * height(), kWideScale * width(), kWideScale * height());
+		auto hiddenWidth = anim::interpolate(0, (1 - kWideScale) / 2 * width(), changed);
+		auto hiddenHeight = anim::interpolate(0, (1 - kWideScale) / 2 * height(), changed);
+		p.drawPixmap(targetRect.marginsAdded(QMargins(hiddenWidth, hiddenHeight, hiddenWidth, hiddenHeight)), _contentFrom);
+		p.setOpacity(changed);
+		auto shownWidth = anim::interpolate((1 - kWideScale) / 2 * width(), 0, changed);
+		auto shownHeight = anim::interpolate((1 - kWideScale) / 2 * height(), 0, changed);
+		p.drawPixmap(targetRect.marginsAdded(QMargins(shownWidth, shownHeight, shownWidth, shownHeight)), _contentTo);
+		return;
+	}
+	switch (_type) {
+	case Type::Record: paintRecord(p, over); break;
+	case Type::Save: paintSave(p, over); break;
+	case Type::Cancel: paintCancel(p, over); break;
+	case Type::Send: paintSend(p, over); break;
+	case Type::Schedule: paintSchedule(p, over); break;
+	case Type::Slowmode: paintSlowmode(p); break;
+	}
+}
+
+void SendButton::paintRecord(Painter &p, bool over) {
+	auto recordActive = recordActiveRatio();
+	if (!isDisabled()) {
+		auto rippleColor = anim::color(st::historyAttachEmoji.ripple.color, st::historyRecordVoiceRippleBgActive, recordActive);
+		paintRipple(p, (width() - st::historyAttachEmoji.rippleAreaSize) / 2, st::historyAttachEmoji.rippleAreaPosition.y(), &rippleColor);
+	}
+
+	auto fastIcon = [&] {
+		if (isDisabled()) {
+			return &st::historyRecordVoice;
+		} else if (recordActive == 1.) {
+			return &st::historyRecordVoiceActive;
+		} else if (over) {
+			return &st::historyRecordVoiceOver;
+		}
+		return &st::historyRecordVoice;
+	};
+	fastIcon()->paintInCenter(p, rect());
+	if (!isDisabled() && recordActive > 0. && recordActive < 1.) {
+		p.setOpacity(recordActive);
+		st::historyRecordVoiceActive.paintInCenter(p, rect());
+		p.setOpacity(1.);
+	}
+}
+
+void SendButton::paintSave(Painter &p, bool over) {
+	const auto &saveIcon = over
+		? st::historyEditSaveIconOver
+		: st::historyEditSaveIcon;
+	saveIcon.paint(p, st::historySendIconPosition, width());
+}
+
+void SendButton::paintCancel(Painter &p, bool over) {
+	paintRipple(p, (width() - st::historyAttachEmoji.rippleAreaSize) / 2, st::historyAttachEmoji.rippleAreaPosition.y());
+
+	const auto &cancelIcon = over
+		? st::historyReplyCancelIconOver
+		: st::historyReplyCancelIcon;
+	cancelIcon.paintInCenter(p, rect());
+}
+
+void SendButton::paintSend(Painter &p, bool over) {
+	const auto &sendIcon = over
+		? st::historySendIconOver
+		: st::historySendIcon;
+	if (isDisabled()) {
+		const auto color = st::historyRecordVoiceFg->c;
+		sendIcon.paint(p, st::historySendIconPosition, width(), color);
+	} else {
+		sendIcon.paint(p, st::historySendIconPosition, width());
+	}
+}
+
+void SendButton::paintSchedule(Painter &p, bool over) {
+	{
+		PainterHighQualityEnabler hq(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(over ? st::historySendIconFgOver : st::historySendIconFg);
+		p.drawEllipse(
+			st::historyScheduleIconPosition.x(),
+			st::historyScheduleIconPosition.y(),
+			st::historyScheduleIcon.width(),
+			st::historyScheduleIcon.height());
+	}
+	st::historyScheduleIcon.paint(
+		p,
+		st::historyScheduleIconPosition,
+		width());
+}
+
+void SendButton::paintSlowmode(Painter &p) {
+	p.setFont(st::normalFont);
+	p.setPen(st::windowSubTextFg);
+	p.drawText(
+		rect().marginsRemoved(st::historySlowmodeCounterMargins),
+		_slowmodeDelayText,
+		style::al_center);
+}
+
+void SendButton::onStateChanged(State was, StateChangeSource source) {
+	RippleButton::onStateChanged(was, source);
+
+	auto down = (state() & StateFlag::Down);
+	if ((was & StateFlag::Down) != down) {
+		if (down) {
+			if (_type == Type::Record) {
+				_recording = true;
+				if (_recordStartCallback) {
+					_recordStartCallback();
+				}
+			}
+		} else if (_recording) {
+			_recording = false;
+			if (_recordStopCallback) {
+				_recordStopCallback(_recordActive);
+			}
+		}
+	}
+}
+
+bool SendButton::isSlowmode() const {
+	return (_slowmodeDelay > 0);
+}
+
+QPixmap SendButton::grabContent() {
+	auto result = QImage(
+		kWideScale * size() * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(style::DevicePixelRatio());
+	result.fill(Qt::transparent);
+	{
+		Painter p(&result);
+		p.drawPixmap(
+			(kWideScale - 1) / 2 * width(),
+			(kWideScale - 1) / 2 * height(),
+			GrabWidget(this));
+	}
+	return Ui::PixmapFromImage(std::move(result));
+}
+
+QImage SendButton::prepareRippleMask() const {
+	auto size = (_type == Type::Record)
+		? st::historyAttachEmoji.rippleAreaSize
+		: st::historyReplyCancel.rippleAreaSize;
+	return RippleAnimation::ellipseMask(QSize(size, size));
+}
+
+QPoint SendButton::prepareRippleStartPosition() const {
+	auto real = mapFromGlobal(QCursor::pos());
+	auto size = (_type == Type::Record)
+		? st::historyAttachEmoji.rippleAreaSize
+		: st::historyReplyCancel.rippleAreaSize;
+	auto y = (_type == Type::Record)
+		? st::historyAttachEmoji.rippleAreaPosition.y()
+		: (height() - st::historyReplyCancel.rippleAreaSize) / 2;
+	return real - QPoint((width() - size) / 2, y);
+}
+
+void SendButton::recordAnimationCallback() {
+	update();
+	if (_recordAnimationCallback) {
+		_recordAnimationCallback();
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/send_button.h b/Telegram/SourceFiles/ui/controls/send_button.h
new file mode 100644
index 000000000..ad6500699
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/send_button.h
@@ -0,0 +1,92 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/buttons.h"
+
+namespace Ui {
+
+class SendButton final : public RippleButton {
+public:
+	SendButton(QWidget *parent);
+
+	static constexpr auto kSlowmodeDelayLimit = 100 * 60;
+
+	enum class Type {
+		Send,
+		Schedule,
+		Save,
+		Record,
+		Cancel,
+		Slowmode,
+	};
+	[[nodiscard]] Type type() const {
+		return _type;
+	}
+	void setType(Type state);
+	void setRecordActive(bool recordActive);
+	void setSlowmodeDelay(int seconds);
+	void finishAnimating();
+
+	void setRecordStartCallback(Fn<void()> callback) {
+		_recordStartCallback = std::move(callback);
+	}
+	void setRecordUpdateCallback(Fn<void(QPoint globalPos)> callback) {
+		_recordUpdateCallback = std::move(callback);
+	}
+	void setRecordStopCallback(Fn<void(bool active)> callback) {
+		_recordStopCallback = std::move(callback);
+	}
+	void setRecordAnimationCallback(Fn<void()> callback) {
+		_recordAnimationCallback = std::move(callback);
+	}
+
+	[[nodiscard]] float64 recordActiveRatio() {
+		return _a_recordActive.value(_recordActive ? 1. : 0.);
+	}
+
+protected:
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+	void onStateChanged(State was, StateChangeSource source) override;
+
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+private:
+	void recordAnimationCallback();
+	[[nodiscard]] QPixmap grabContent();
+	[[nodiscard]] bool isSlowmode() const;
+
+	void paintRecord(Painter &p, bool over);
+	void paintSave(Painter &p, bool over);
+	void paintCancel(Painter &p, bool over);
+	void paintSend(Painter &p, bool over);
+	void paintSchedule(Painter &p, bool over);
+	void paintSlowmode(Painter &p);
+
+	Type _type = Type::Send;
+	Type _afterSlowmodeType = Type::Send;
+	bool _recordActive = false;
+	QPixmap _contentFrom, _contentTo;
+
+	Ui::Animations::Simple _a_typeChanged;
+	Ui::Animations::Simple _a_recordActive;
+
+	bool _recording = false;
+	Fn<void()> _recordStartCallback;
+	Fn<void(bool active)> _recordStopCallback;
+	Fn<void(QPoint globalPos)> _recordUpdateCallback;
+	Fn<void()> _recordAnimationCallback;
+
+	int _slowmodeDelay = 0;
+	QString _slowmodeDelayText;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/special_buttons.cpp b/Telegram/SourceFiles/ui/special_buttons.cpp
index 29fce70ba..a353e5465 100644
--- a/Telegram/SourceFiles/ui/special_buttons.cpp
+++ b/Telegram/SourceFiles/ui/special_buttons.cpp
@@ -43,8 +43,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Ui {
 namespace {
 
-constexpr int kWideScale = 5;
-
 QString CropTitle(not_null<PeerData*> peer) {
 	if (peer->isChat() || peer->isMegagroup()) {
 		return tr::lng_create_group_crop(tr::now);
@@ -122,11 +120,7 @@ void ShowChoosePhotoBox(
 		QPointer<QWidget> parent,
 		const QString &title,
 		Callback &&callback) {
-	auto imgExtensions = cImgExtensions();
-	auto filter = qsl("Image files (*")
-		+ imgExtensions.join(qsl(" *"))
-		+ qsl(");;")
-		+ FileDialog::AllFilesFilter();
+	auto filter = FileDialog::ImagesOrAllFilter();
 	auto handleChosenPhoto = [
 		title,
 		callback = std::forward<Callback>(callback)
@@ -185,342 +179,6 @@ void HistoryDownButton::setUnreadCount(int unreadCount) {
 	}
 }
 
-EmojiButton::EmojiButton(QWidget *parent, const style::IconButton &st)
-: RippleButton(parent, st.ripple)
-, _st(st) {
-	resize(_st.width, _st.height);
-	setCursor(style::cur_pointer);
-}
-
-void EmojiButton::paintEvent(QPaintEvent *e) {
-	Painter p(this);
-
-	p.fillRect(e->rect(), st::historyComposeAreaBg);
-	paintRipple(p, _st.rippleAreaPosition.x(), _st.rippleAreaPosition.y(), _rippleOverride ? &(*_rippleOverride)->c : nullptr);
-
-	const auto over = isOver();
-	const auto loadingState = _loading
-		? _loading->computeState()
-		: Ui::RadialState{ 0., 0, FullArcLength };
-	if (loadingState.shown < 1.) {
-		p.setOpacity(1. - loadingState.shown);
-
-		const auto icon = _iconOverride ? _iconOverride : &(over ? _st.iconOver : _st.icon);
-		auto position = _st.iconPosition;
-		if (position.x() < 0) {
-			position.setX((width() - icon->width()) / 2);
-		}
-		if (position.y() < 0) {
-			position.setY((height() - icon->height()) / 2);
-		}
-		icon->paint(p, position, width());
-
-		p.setOpacity(1.);
-	}
-
-	QRect inner(QPoint((width() - st::historyEmojiCircle.width()) / 2, (height() - st::historyEmojiCircle.height()) / 2), st::historyEmojiCircle);
-	const auto color = (_colorOverride
-		? *_colorOverride
-		: (over
-			? st::historyEmojiCircleFgOver
-			: st::historyEmojiCircleFg));
-	if (anim::Disabled() && _loading && _loading->animating()) {
-		anim::DrawStaticLoading(
-			p,
-			inner,
-			st::historyEmojiCircleLine,
-			color);
-	} else {
-		auto pen = color->p;
-		pen.setWidth(st::historyEmojiCircleLine);
-		pen.setCapStyle(Qt::RoundCap);
-		p.setPen(pen);
-		p.setBrush(Qt::NoBrush);
-
-		PainterHighQualityEnabler hq(p);
-		if (loadingState.arcLength < FullArcLength) {
-			p.drawArc(inner, loadingState.arcFrom, loadingState.arcLength);
-		} else {
-			p.drawEllipse(inner);
-		}
-	}
-}
-
-void EmojiButton::loadingAnimationCallback() {
-	if (!anim::Disabled()) {
-		update();
-	}
-}
-
-void EmojiButton::setLoading(bool loading) {
-	if (loading && !_loading) {
-		_loading = std::make_unique<Ui::InfiniteRadialAnimation>(
-			[=] { loadingAnimationCallback(); },
-			st::defaultInfiniteRadialAnimation);
-	}
-	if (loading) {
-		_loading->start();
-		update();
-	} else if (_loading) {
-		_loading->stop();
-		update();
-	}
-}
-
-void EmojiButton::setColorOverrides(const style::icon *iconOverride, const style::color *colorOverride, const style::color *rippleOverride) {
-	_iconOverride = iconOverride;
-	_colorOverride = colorOverride;
-	_rippleOverride = rippleOverride;
-	update();
-}
-
-void EmojiButton::onStateChanged(State was, StateChangeSource source) {
-	RippleButton::onStateChanged(was, source);
-	auto wasOver = static_cast<bool>(was & StateFlag::Over);
-	if (isOver() != wasOver) {
-		update();
-	}
-}
-
-QPoint EmojiButton::prepareRippleStartPosition() const {
-	if (!_st.rippleAreaSize) {
-		return DisabledRippleStartPosition();
-	}
-	return mapFromGlobal(QCursor::pos()) - _st.rippleAreaPosition;
-}
-
-QImage EmojiButton::prepareRippleMask() const {
-	return RippleAnimation::ellipseMask(QSize(_st.rippleAreaSize, _st.rippleAreaSize));
-}
-
-SendButton::SendButton(QWidget *parent) : RippleButton(parent, st::historyReplyCancel.ripple) {
-	resize(st::historySendSize);
-}
-
-void SendButton::setType(Type type) {
-	Expects(isSlowmode() || type != Type::Slowmode);
-
-	if (isSlowmode() && type != Type::Slowmode) {
-		_afterSlowmodeType = type;
-		return;
-	}
-	if (_type != type) {
-		_contentFrom = grabContent();
-		_type = type;
-		_a_typeChanged.stop();
-		_contentTo = grabContent();
-		_a_typeChanged.start([=] { update(); }, 0., 1., st::historyRecordVoiceDuration);
-		setPointerCursor(_type != Type::Slowmode);
-		update();
-	}
-	if (_type != Type::Record) {
-		_recordActive = false;
-		_a_recordActive.stop();
-	}
-}
-
-void SendButton::setRecordActive(bool recordActive) {
-	if (_recordActive != recordActive) {
-		_recordActive = recordActive;
-		_a_recordActive.start([this] { recordAnimationCallback(); }, _recordActive ? 0. : 1., _recordActive ? 1. : 0, st::historyRecordVoiceDuration);
-		update();
-	}
-}
-
-void SendButton::setSlowmodeDelay(int seconds) {
-	Expects(seconds >= 0 && seconds < kSlowmodeDelayLimit);
-
-	if (_slowmodeDelay == seconds) {
-		return;
-	}
-	_slowmodeDelay = seconds;
-	_slowmodeDelayText = isSlowmode()
-		? qsl("%1:%2").arg(seconds / 60).arg(seconds % 60, 2, 10, QChar('0'))
-		: QString();
-	setType(isSlowmode() ? Type::Slowmode : _afterSlowmodeType);
-	update();
-}
-
-void SendButton::finishAnimating() {
-	_a_typeChanged.stop();
-	_a_recordActive.stop();
-	update();
-}
-
-void SendButton::mouseMoveEvent(QMouseEvent *e) {
-	AbstractButton::mouseMoveEvent(e);
-	if (_recording) {
-		if (_recordUpdateCallback) {
-			_recordUpdateCallback(e->globalPos());
-		}
-	}
-}
-
-void SendButton::paintEvent(QPaintEvent *e) {
-	Painter p(this);
-
-	auto over = (isDown() || isOver());
-	auto changed = _a_typeChanged.value(1.);
-	if (changed < 1.) {
-		PainterHighQualityEnabler hq(p);
-		p.setOpacity(1. - changed);
-		auto targetRect = QRect((1 - kWideScale) / 2 * width(), (1 - kWideScale) / 2 * height(), kWideScale * width(), kWideScale * height());
-		auto hiddenWidth = anim::interpolate(0, (1 - kWideScale) / 2 * width(), changed);
-		auto hiddenHeight = anim::interpolate(0, (1 - kWideScale) / 2 * height(), changed);
-		p.drawPixmap(targetRect.marginsAdded(QMargins(hiddenWidth, hiddenHeight, hiddenWidth, hiddenHeight)), _contentFrom);
-		p.setOpacity(changed);
-		auto shownWidth = anim::interpolate((1 - kWideScale) / 2 * width(), 0, changed);
-		auto shownHeight = anim::interpolate((1 - kWideScale) / 2 * height(), 0, changed);
-		p.drawPixmap(targetRect.marginsAdded(QMargins(shownWidth, shownHeight, shownWidth, shownHeight)), _contentTo);
-		return;
-	}
-	switch (_type) {
-	case Type::Record: paintRecord(p, over); break;
-	case Type::Save: paintSave(p, over); break;
-	case Type::Cancel: paintCancel(p, over); break;
-	case Type::Send: paintSend(p, over); break;
-	case Type::Schedule: paintSchedule(p, over); break;
-	case Type::Slowmode: paintSlowmode(p); break;
-	}
-}
-
-void SendButton::paintRecord(Painter &p, bool over) {
-	auto recordActive = recordActiveRatio();
-	if (!isDisabled()) {
-		auto rippleColor = anim::color(st::historyAttachEmoji.ripple.color, st::historyRecordVoiceRippleBgActive, recordActive);
-		paintRipple(p, (width() - st::historyAttachEmoji.rippleAreaSize) / 2, st::historyAttachEmoji.rippleAreaPosition.y(), &rippleColor);
-	}
-
-	auto fastIcon = [&] {
-		if (isDisabled()) {
-			return &st::historyRecordVoice;
-		} else if (recordActive == 1.) {
-			return &st::historyRecordVoiceActive;
-		} else if (over) {
-			return &st::historyRecordVoiceOver;
-		}
-		return &st::historyRecordVoice;
-	};
-	fastIcon()->paintInCenter(p, rect());
-	if (!isDisabled() && recordActive > 0. && recordActive < 1.) {
-		p.setOpacity(recordActive);
-		st::historyRecordVoiceActive.paintInCenter(p, rect());
-		p.setOpacity(1.);
-	}
-}
-
-void SendButton::paintSave(Painter &p, bool over) {
-	const auto &saveIcon = over
-		? st::historyEditSaveIconOver
-		: st::historyEditSaveIcon;
-	saveIcon.paint(p, st::historySendIconPosition, width());
-}
-
-void SendButton::paintCancel(Painter &p, bool over) {
-	paintRipple(p, (width() - st::historyAttachEmoji.rippleAreaSize) / 2, st::historyAttachEmoji.rippleAreaPosition.y());
-
-	const auto &cancelIcon = over
-		? st::historyReplyCancelIconOver
-		: st::historyReplyCancelIcon;
-	cancelIcon.paintInCenter(p, rect());
-}
-
-void SendButton::paintSend(Painter &p, bool over) {
-	const auto &sendIcon = over
-		? st::historySendIconOver
-		: st::historySendIcon;
-	if (isDisabled()) {
-		const auto color = st::historyRecordVoiceFg->c;
-		sendIcon.paint(p, st::historySendIconPosition, width(), color);
-	} else {
-		sendIcon.paint(p, st::historySendIconPosition, width());
-	}
-}
-
-void SendButton::paintSchedule(Painter &p, bool over) {
-	{
-		PainterHighQualityEnabler hq(p);
-		p.setPen(Qt::NoPen);
-		p.setBrush(over ? st::historySendIconFgOver : st::historySendIconFg);
-		p.drawEllipse(
-			st::historyScheduleIconPosition.x(),
-			st::historyScheduleIconPosition.y(),
-			st::historyScheduleIcon.width(),
-			st::historyScheduleIcon.height());
-	}
-	st::historyScheduleIcon.paint(
-		p,
-		st::historyScheduleIconPosition,
-		width());
-}
-
-void SendButton::paintSlowmode(Painter &p) {
-	p.setFont(st::normalFont);
-	p.setPen(st::windowSubTextFg);
-	p.drawText(
-		rect().marginsRemoved(st::historySlowmodeCounterMargins),
-		_slowmodeDelayText,
-		style::al_center);
-}
-
-void SendButton::onStateChanged(State was, StateChangeSource source) {
-	RippleButton::onStateChanged(was, source);
-
-	auto down = (state() & StateFlag::Down);
-	if ((was & StateFlag::Down) != down) {
-		if (down) {
-			if (_type == Type::Record) {
-				_recording = true;
-				if (_recordStartCallback) {
-					_recordStartCallback();
-				}
-			}
-		} else if (_recording) {
-			_recording = false;
-			if (_recordStopCallback) {
-				_recordStopCallback(_recordActive);
-			}
-		}
-	}
-}
-
-bool SendButton::isSlowmode() const {
-	return (_slowmodeDelay > 0);
-}
-
-QPixmap SendButton::grabContent() {
-	auto result = QImage(kWideScale * size() * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied);
-	result.setDevicePixelRatio(cRetinaFactor());
-	result.fill(Qt::transparent);
-	{
-		Painter p(&result);
-		p.drawPixmap(
-			(kWideScale - 1) / 2 * width(),
-			(kWideScale - 1) / 2 * height(),
-			GrabWidget(this));
-	}
-	return App::pixmapFromImageInPlace(std::move(result));
-}
-
-QImage SendButton::prepareRippleMask() const {
-	auto size = (_type == Type::Record) ? st::historyAttachEmoji.rippleAreaSize : st::historyReplyCancel.rippleAreaSize;
-	return Ui::RippleAnimation::ellipseMask(QSize(size, size));
-}
-
-QPoint SendButton::prepareRippleStartPosition() const {
-	auto real = mapFromGlobal(QCursor::pos());
-	auto size = (_type == Type::Record) ? st::historyAttachEmoji.rippleAreaSize : st::historyReplyCancel.rippleAreaSize;
-	auto y = (_type == Type::Record) ? st::historyAttachEmoji.rippleAreaPosition.y() : (height() - st::historyReplyCancel.rippleAreaSize) / 2;
-	return real - QPoint((width() - size) / 2, y);
-}
-
-void SendButton::recordAnimationCallback() {
-	update();
-	if (_recordAnimationCallback) {
-		_recordAnimationCallback();
-	}
-}
-
 UserpicButton::UserpicButton(
 	QWidget *parent,
 	const QString &cropTitle,
diff --git a/Telegram/SourceFiles/ui/special_buttons.h b/Telegram/SourceFiles/ui/special_buttons.h
index 86d908e01..4cc13286f 100644
--- a/Telegram/SourceFiles/ui/special_buttons.h
+++ b/Telegram/SourceFiles/ui/special_buttons.h
@@ -34,8 +34,6 @@ struct Information;
 
 namespace Ui {
 
-class InfiniteRadialAnimation;
-
 class HistoryDownButton : public RippleButton {
 public:
 	HistoryDownButton(QWidget *parent, const style::TwoIconButton &st);
@@ -58,111 +56,6 @@ private:
 
 };
 
-class EmojiButton : public RippleButton {
-public:
-	EmojiButton(QWidget *parent, const style::IconButton &st);
-
-	void setLoading(bool loading);
-	void setColorOverrides(const style::icon *iconOverride, const style::color *colorOverride, const style::color *rippleOverride);
-
-protected:
-	void paintEvent(QPaintEvent *e) override;
-	void onStateChanged(State was, StateChangeSource source) override;
-
-	QImage prepareRippleMask() const override;
-	QPoint prepareRippleStartPosition() const override;
-
-private:
-	void loadingAnimationCallback();
-
-	const style::IconButton &_st;
-
-	std::unique_ptr<Ui::InfiniteRadialAnimation> _loading;
-
-	const style::icon *_iconOverride = nullptr;
-	const style::color *_colorOverride = nullptr;
-	const style::color *_rippleOverride = nullptr;
-
-};
-
-class SendButton : public RippleButton {
-public:
-	SendButton(QWidget *parent);
-
-	static constexpr auto kSlowmodeDelayLimit = 100 * 60;
-
-	enum class Type {
-		Send,
-		Schedule,
-		Save,
-		Record,
-		Cancel,
-		Slowmode,
-	};
-	Type type() const {
-		return _type;
-	}
-	void setType(Type state);
-	void setRecordActive(bool recordActive);
-	void setSlowmodeDelay(int seconds);
-	void finishAnimating();
-
-	void setRecordStartCallback(Fn<void()> callback) {
-		_recordStartCallback = std::move(callback);
-	}
-	void setRecordUpdateCallback(Fn<void(QPoint globalPos)> callback) {
-		_recordUpdateCallback = std::move(callback);
-	}
-	void setRecordStopCallback(Fn<void(bool active)> callback) {
-		_recordStopCallback = std::move(callback);
-	}
-	void setRecordAnimationCallback(Fn<void()> callback) {
-		_recordAnimationCallback = std::move(callback);
-	}
-
-	float64 recordActiveRatio() {
-		return _a_recordActive.value(_recordActive ? 1. : 0.);
-	}
-
-protected:
-	void mouseMoveEvent(QMouseEvent *e) override;
-	void paintEvent(QPaintEvent *e) override;
-	void onStateChanged(State was, StateChangeSource source) override;
-
-	QImage prepareRippleMask() const override;
-	QPoint prepareRippleStartPosition() const override;
-
-private:
-	void recordAnimationCallback();
-	QPixmap grabContent();
-	bool isSlowmode() const;
-
-	void paintRecord(Painter &p, bool over);
-	void paintSave(Painter &p, bool over);
-	void paintCancel(Painter &p, bool over);
-	void paintSend(Painter &p, bool over);
-	void paintSchedule(Painter &p, bool over);
-	void paintSlowmode(Painter &p);
-
-	Type _type = Type::Send;
-	Type _afterSlowmodeType = Type::Send;
-	bool _recordActive = false;
-	QPixmap _contentFrom, _contentTo;
-
-	Ui::Animations::Simple _a_typeChanged;
-	Ui::Animations::Simple _a_recordActive;
-
-	bool _recording = false;
-	Fn<void()> _recordStartCallback;
-	Fn<void(bool active)> _recordStopCallback;
-	Fn<void(QPoint globalPos)> _recordUpdateCallback;
-	Fn<void()> _recordAnimationCallback;
-
-	int _slowmodeDelay = 0;
-	QString _slowmodeDelayText;
-
-};
-
 class UserpicButton : public RippleButton {
 public:
 	enum class Role {
diff --git a/Telegram/SourceFiles/ui/ui_pch.h b/Telegram/SourceFiles/ui/ui_pch.h
index 07af4a4fb..52bc1e52a 100644
--- a/Telegram/SourceFiles/ui/ui_pch.h
+++ b/Telegram/SourceFiles/ui/ui_pch.h
@@ -19,6 +19,7 @@
 #include <QtGui/QPainter>
 #include <QtGui/QImage>
 #include <QtGui/QPixmap>
+#include <QtGui/QtEvents>
 
 #include <QtWidgets/QWidget>
 
@@ -34,3 +35,4 @@
 
 #include "ui/text/text.h"
 #include "ui/effects/animations.h"
+#include "styles/palette.h"
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 9c41becf5..b1feecb12 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -31,17 +31,24 @@ nice_target_sources(td_ui ${src_loc}
 PRIVATE
     ${style_files}
     
-    ui/ui_pch.h
+    ui/chat/attach/attach_extensions.cpp
+    ui/chat/attach/attach_extensions.h
     ui/chat/message_bar.cpp
     ui/chat/message_bar.h
     ui/chat/pinned_bar.cpp
     ui/chat/pinned_bar.h
+    ui/controls/emoji_button.cpp
+    ui/controls/emoji_button.h
+    ui/controls/send_button.cpp
+    ui/controls/send_button.h
     ui/text/format_values.cpp
     ui/text/format_values.h
     ui/text/text_options.cpp
     ui/text/text_options.h
     ui/toasts/common_toasts.cpp
     ui/toasts/common_toasts.h
+
+    ui/ui_pch.h
 )
 
 target_include_directories(td_ui

From b3b11bd9e7de205b42b1b60e81029c7346ce4caa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 13 Oct 2020 15:07:53 +0300
Subject: [PATCH 088/190] Move PreparedFile/PreparedList to td_ui.

---
 Telegram/SourceFiles/apiwrap.cpp              |  9 +-
 Telegram/SourceFiles/apiwrap.h                |  9 +-
 .../SourceFiles/boxes/edit_caption_box.cpp    | 15 +--
 Telegram/SourceFiles/boxes/edit_caption_box.h |  3 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp | 71 +++++++-------
 Telegram/SourceFiles/boxes/send_files_box.h   | 11 ++-
 Telegram/SourceFiles/core/mime_type.cpp       | 28 +++---
 Telegram/SourceFiles/core/mime_type.h         |  1 +
 .../SourceFiles/history/history_widget.cpp    | 15 +--
 Telegram/SourceFiles/history/history_widget.h |  9 +-
 .../view/history_view_replies_section.cpp     | 15 +--
 .../view/history_view_replies_section.h       |  8 +-
 .../view/history_view_scheduled_section.cpp   | 15 +--
 .../view/history_view_scheduled_section.h     | 11 +--
 .../SourceFiles/media/audio/media_audio.cpp   |  4 +-
 .../SourceFiles/media/audio/media_audio.h     |  6 +-
 .../media/clip/media_clip_reader.cpp          |  4 +-
 .../media/clip/media_clip_reader.h            |  6 +-
 .../SourceFiles/storage/localimageloader.cpp  | 33 ++++---
 .../SourceFiles/storage/localimageloader.h    | 42 ++-------
 .../storage/storage_media_prepare.cpp         | 93 +++----------------
 .../storage/storage_media_prepare.h           | 75 +++------------
 .../SourceFiles/support/support_helper.cpp    |  1 +
 .../ui/chat/attach/attach_prepare.cpp         | 91 ++++++++++++++++++
 .../ui/chat/attach/attach_prepare.h           | 85 +++++++++++++++++
 25 files changed, 358 insertions(+), 302 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_prepare.h

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index f78d3dcd4..686d8924a 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -66,6 +66,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/message_field.h"
 #include "ui/item_text_options.h"
 #include "ui/emoji_config.h"
+#include "ui/chat/attach/attach_prepare.h"
 #include "support/support_helper.h"
 #include "storage/localimageloader.h"
 #include "storage/download_manager_mtproto.h"
@@ -4183,7 +4184,7 @@ void ApiWrap::sendVoiceMessage(
 }
 
 void ApiWrap::editMedia(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		const SendAction &action,
@@ -4205,7 +4206,7 @@ void ApiWrap::editMedia(
 }
 
 void ApiWrap::sendFiles(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		std::shared_ptr<SendingAlbum> album,
@@ -4231,10 +4232,10 @@ void ApiWrap::sendFiles(
 	for (auto &file : list.files) {
 		if (album) {
 			switch (file.type) {
-			case Storage::PreparedFile::AlbumType::Photo:
+			case Ui::PreparedFile::AlbumType::Photo:
 				type = SendMediaType::Photo;
 				break;
-			case Storage::PreparedFile::AlbumType::Video:
+			case Ui::PreparedFile::AlbumType::Video:
 				type = SendMediaType::File;
 				break;
 			default: Unexpected("AlbumType in uploadFilesAfterConfirmation");
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index bf8140496..24c0d0960 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -36,7 +36,6 @@ class Result;
 
 namespace Storage {
 enum class SharedMediaType : signed char;
-struct PreparedList;
 class DownloadMtprotoTask;
 class Account;
 } // namespace Storage
@@ -49,6 +48,10 @@ namespace Core {
 struct CloudPasswordState;
 } // namespace Core
 
+namespace Ui {
+struct PreparedList;
+} // namespace Ui
+
 namespace Api {
 
 class Updates;
@@ -393,7 +396,7 @@ public:
 		int duration,
 		const SendAction &action);
 	void sendFiles(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		std::shared_ptr<SendingAlbum> album,
@@ -404,7 +407,7 @@ public:
 		const SendAction &action);
 
 	void editMedia(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		const SendAction &action,
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 93ca21033..371d966f5 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -48,6 +48,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/checkbox.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_options.h"
+#include "ui/chat/attach/attach_prepare.h"
 #include "ui/controls/emoji_button.h"
 #include "window/window_session_controller.h"
 #include "confirm_box.h"
@@ -67,13 +68,13 @@ using namespace ::Media::Streaming;
 using Data::PhotoSize;
 
 auto ListFromMimeData(not_null<const QMimeData*> data) {
-	using Error = Storage::PreparedList::Error;
+	using Error = Ui::PreparedList::Error;
 	auto result = data->hasUrls()
 		? Storage::PrepareMediaList(
 			// When we edit media, we need only 1 file.
 			data->urls().mid(0, 1),
 			st::sendMediaPreviewSize)
-		: Storage::PreparedList(Error::EmptyFile, QString());
+		: Ui::PreparedList(Error::EmptyFile, QString());
 	if (result.error == Error::None) {
 		return result;
 	} else if (data->hasImage()) {
@@ -475,7 +476,7 @@ void EditCaptionBox::streamingReady(Information &&info) {
 }
 
 void EditCaptionBox::updateEditPreview() {
-	using Info = FileMediaInformation;
+	using Info = Ui::PreparedFileInformation;
 
 	const auto file = &_preparedList.files.front();
 	const auto fileMedia = &file->information->media;
@@ -590,7 +591,7 @@ void EditCaptionBox::createEditMediaButton() {
 			Ui::show(Box<InformBox>(t(tr::now)), Ui::LayerOption::KeepOther);
 		};
 
-		auto list = Storage::PreparedList::PreparedFileFromFilesDialog(
+		auto list = Storage::PreparedFileFromFilesDialog(
 			std::move(result),
 			_isAlbum,
 			std::move(showBoxErrorCallback),
@@ -677,8 +678,8 @@ bool EditCaptionBox::fileFromClipboard(not_null<const QMimeData*> data) {
 	if (!_isAllowedEditMedia) {
 		return false;
 	}
-	using Error = Storage::PreparedList::Error;
-	using AlbumType = Storage::PreparedFile::AlbumType;
+	using Error = Ui::PreparedList::Error;
+	using AlbumType = Ui::PreparedFile::AlbumType;
 	auto list = ListFromMimeData(data);
 
 	if (list.error != Error::None || list.files.empty()) {
@@ -688,7 +689,7 @@ bool EditCaptionBox::fileFromClipboard(not_null<const QMimeData*> data) {
 	const auto file = &list.files.front();
 	if (_isAlbum && (file->type == AlbumType::None)) {
 		const auto imageAsDoc = [&] {
-			using Info = FileMediaInformation;
+			using Info = Ui::PreparedFileInformation;
 			const auto fileMedia = &file->information->media;
 			if (const auto image = std::get_if<Info::Image>(fileMedia)) {
 				return !Storage::ValidateThumbDimensions(
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.h b/Telegram/SourceFiles/boxes/edit_caption_box.h
index 4ffc10ffc..a91e35e9e 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.h
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/abstract_box.h"
 #include "storage/storage_media_prepare.h"
 #include "ui/wrap/slide_wrap.h"
+#include "ui/chat/attach/attach_prepare.h"
 
 class Image;
 
@@ -130,7 +131,7 @@ private:
 	int _gifh = 0;
 	int _gifx = 0;
 
-	Storage::PreparedList _preparedList;
+	Ui::PreparedList _preparedList;
 
 	mtpRequestId _saveRequestId = 0;
 
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index a247b56b0..b927cc1f4 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -31,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/wrap/fade_wrap.h"
+#include "ui/chat/attach/attach_prepare.h"
 #include "ui/text/format_values.h"
 #include "ui/grouped_layout.h"
 #include "ui/text/text_options.h"
@@ -67,13 +68,13 @@ inline bool CanAddUrls(const QList<QUrl> &urls) {
 	return !urls.isEmpty() && ranges::all_of(urls, &QUrl::isLocalFile);
 }
 
-inline bool IsFirstAlbumItem(const Storage::PreparedList &list) {
-	using AlbumType = Storage::PreparedFile::AlbumType;
+inline bool IsFirstAlbumItem(const Ui::PreparedList &list) {
+	using AlbumType = Ui::PreparedFile::AlbumType;
 	return (list.files.size() > 0)
 		&& (list.files.front().type != AlbumType::None);
 }
 
-inline bool IsSingleItem(const Storage::PreparedList &list) {
+inline bool IsSingleItem(const Ui::PreparedList &list) {
 	return list.files.size() == 1;
 }
 
@@ -132,12 +133,12 @@ QRect PaintAlbumThumbButtons(
 void FileDialogCallback(
 	FileDialog::OpenResult &&result,
 	bool isAlbum,
-	Fn<void(Storage::PreparedList)> callback) {
+	Fn<void(Ui::PreparedList)> callback) {
 	auto showBoxErrorCallback = [](tr::phrase<> text) {
 		Ui::show(Box<InformBox>(text(tr::now)), Ui::LayerOption::KeepOther);
 	};
 
-	auto list = Storage::PreparedList::PreparedFileFromFilesDialog(
+	auto list = Storage::PreparedFileFromFilesDialog(
 		std::move(result),
 		isAlbum,
 		std::move(showBoxErrorCallback),
@@ -155,7 +156,7 @@ public:
 	static SingleMediaPreview *Create(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
-		const Storage::PreparedFile &file);
+		const Ui::PreparedFile &file);
 
 	SingleMediaPreview(
 		QWidget *parent,
@@ -198,7 +199,7 @@ class SingleFilePreview : public Ui::RpWidget {
 public:
 	SingleFilePreview(
 		QWidget *parent,
-		const Storage::PreparedFile &file);
+		const Ui::PreparedFile &file);
 
 	rpl::producer<int> desiredHeightValue() const override;
 
@@ -206,7 +207,7 @@ protected:
 	void paintEvent(QPaintEvent *e) override;
 
 private:
-	void preparePreview(const Storage::PreparedFile &file);
+	void preparePreview(const Ui::PreparedFile &file);
 	void prepareThumb(const QImage &preview);
 
 	QPixmap _fileThumb;
@@ -221,7 +222,7 @@ private:
 class AlbumThumb {
 public:
 	AlbumThumb(
-		const Storage::PreparedFile &file,
+		const Ui::PreparedFile &file,
 		const Ui::GroupMediaLayout &layout,
 		QWidget *parent,
 		Fn<void()> editCallback,
@@ -287,7 +288,7 @@ private:
 };
 
 AlbumThumb::AlbumThumb(
-	const Storage::PreparedFile &file,
+	const Ui::PreparedFile &file,
 	const Ui::GroupMediaLayout &layout,
 	QWidget *parent,
 	Fn<void()> editCallback,
@@ -295,7 +296,7 @@ AlbumThumb::AlbumThumb(
 : _layout(layout)
 , _fullPreview(file.preview)
 , _shrinkSize(int(std::ceil(st::historyMessageRadius / 1.4)))
-, _isVideo(file.type == Storage::PreparedFile::AlbumType::Video) {
+, _isVideo(file.type == Ui::PreparedFile::AlbumType::Video) {
 	Expects(!_fullPreview.isNull());
 
 	moveToLayout(layout);
@@ -762,15 +763,15 @@ void AlbumThumb::finishAnimations() {
 SingleMediaPreview *SingleMediaPreview::Create(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
-		const Storage::PreparedFile &file) {
+		const Ui::PreparedFile &file) {
 	auto preview = QImage();
 	bool animated = false;
 	bool animationPreview = false;
-	if (const auto image = std::get_if<FileMediaInformation::Image>(
+	if (const auto image = std::get_if<Ui::PreparedFileInformation::Image>(
 			&file.information->media)) {
 		preview = image->data;
 		animated = animationPreview = image->animated;
-	} else if (const auto video = std::get_if<FileMediaInformation::Video>(
+	} else if (const auto video = std::get_if<Ui::PreparedFileInformation::Video>(
 			&file.information->media)) {
 		preview = video->thumbnail;
 		animated = true;
@@ -970,7 +971,7 @@ rpl::producer<int> SingleMediaPreview::desiredHeightValue() const {
 
 SingleFilePreview::SingleFilePreview(
 	QWidget *parent,
-	const Storage::PreparedFile &file)
+	const Ui::PreparedFile &file)
 : RpWidget(parent) {
 	preparePreview(file);
 }
@@ -1002,12 +1003,12 @@ void SingleFilePreview::prepareThumb(const QImage &preview) {
 		st::msgFileThumbSize));
 }
 
-void SingleFilePreview::preparePreview(const Storage::PreparedFile &file) {
+void SingleFilePreview::preparePreview(const Ui::PreparedFile &file) {
 	auto preview = QImage();
-	if (const auto image = std::get_if<FileMediaInformation::Image>(
+	if (const auto image = std::get_if<Ui::PreparedFileInformation::Image>(
 		&file.information->media)) {
 		preview = image->data;
-	} else if (const auto video = std::get_if<FileMediaInformation::Video>(
+	} else if (const auto video = std::get_if<Ui::PreparedFileInformation::Video>(
 		&file.information->media)) {
 		preview = video->thumbnail;
 	}
@@ -1034,7 +1035,7 @@ void SingleFilePreview::preparePreview(const Storage::PreparedFile &file) {
 		auto songTitle = QString();
 		auto songPerformer = QString();
 		if (file.information) {
-			if (const auto song = std::get_if<FileMediaInformation::Song>(
+			if (const auto song = std::get_if<Ui::PreparedFileInformation::Song>(
 					&file.information->media)) {
 				songTitle = song->title;
 				songPerformer = song->performer;
@@ -1118,7 +1119,7 @@ rpl::producer<int> SingleFilePreview::desiredHeightValue() const {
 }
 
 rpl::producer<QString> FieldPlaceholder(
-		const Storage::PreparedList &list,
+		const Ui::PreparedList &list,
 		SendFilesWay way) {
 	const auto isAlbum = (way == SendFilesWay::Album);
 	const auto compressImages = (way != SendFilesWay::Files);
@@ -1133,7 +1134,7 @@ class SendFilesBox::AlbumPreview : public Ui::RpWidget {
 public:
 	AlbumPreview(
 		QWidget *parent,
-		const Storage::PreparedList &list,
+		const Ui::PreparedList &list,
 		SendFilesWay way);
 
 	void setSendWay(SendFilesWay way);
@@ -1185,7 +1186,7 @@ private:
 	void cancelDrag();
 	void finishDrag();
 
-	const Storage::PreparedList &_list;
+	const Ui::PreparedList &_list;
 	SendFilesWay _sendWay = SendFilesWay::Files;
 	style::cursor _cursor = style::cur_default;
 	std::vector<int> _order;
@@ -1210,7 +1211,7 @@ private:
 
 SendFilesBox::AlbumPreview::AlbumPreview(
 	QWidget *parent,
-	const Storage::PreparedList &list,
+	const Ui::PreparedList &list,
 	SendFilesWay way)
 : RpWidget(parent)
 , _list(list)
@@ -1662,7 +1663,7 @@ void SendFilesBox::AlbumPreview::mouseReleaseEvent(QMouseEvent *e) {
 SendFilesBox::SendFilesBox(
 	QWidget*,
 	not_null<Window::SessionController*> controller,
-	Storage::PreparedList &&list,
+	Ui::PreparedList &&list,
 	const TextWithTags &caption,
 	CompressConfirm compressed,
 	SendLimit limit,
@@ -1899,7 +1900,7 @@ void SendFilesBox::setupDragArea() {
 
 void SendFilesBox::updateLeftButtonVisibility() {
 	const auto isAlbum = _list.albumIsPossible
-		&& (_list.files.size() < Storage::MaxAlbumItems());
+		&& (_list.files.size() < Ui::MaxAlbumItems());
 	if (isAlbum || (IsSingleItem(_list) && IsFirstAlbumItem(_list))) {
 		_addFileToAlbum->show();
 	} else {
@@ -1999,8 +2000,8 @@ void SendFilesBox::refreshAlbumMediaCount() {
 	_albumVideosCount = _list.albumIsPossible
 		? ranges::count(
 			_list.files,
-			Storage::PreparedFile::AlbumType::Video,
-			[](const Storage::PreparedFile &file) { return file.type; })
+			Ui::PreparedFile::AlbumType::Video,
+			[](const Ui::PreparedFile &file) { return file.type; })
 		: 0;
 	_albumPhotosCount = _list.albumIsPossible
 		? (_list.files.size() - _albumVideosCount)
@@ -2076,7 +2077,7 @@ void SendFilesBox::applyAlbumOrder() {
 		return;
 	}
 
-	_list = Storage::PreparedList::Reordered(std::move(_list), order);
+	_list = Ui::PreparedList::Reordered(std::move(_list), order);
 }
 
 void SendFilesBox::setupCaption() {
@@ -2189,7 +2190,7 @@ bool SendFilesBox::canAddFiles(not_null<const QMimeData*> data) const {
 		++filesCount;
 	}
 
-	if (_list.files.size() + filesCount > Storage::MaxAlbumItems()) {
+	if (_list.files.size() + filesCount > Ui::MaxAlbumItems()) {
 		return false;
 	} else if (_list.files.size() > 1 && !_albumPreview) {
 		return false;
@@ -2204,10 +2205,10 @@ bool SendFilesBox::addFiles(not_null<const QMimeData*> data) {
 		const auto urls = data->hasUrls() ? data->urls() : QList<QUrl>();
 		auto result = CanAddUrls(urls)
 			? Storage::PrepareMediaList(urls, st::sendMediaPreviewSize)
-			: Storage::PreparedList(
-				Storage::PreparedList::Error::EmptyFile,
+			: Ui::PreparedList(
+				Ui::PreparedList::Error::EmptyFile,
 				QString());
-		if (result.error == Storage::PreparedList::Error::None) {
+		if (result.error == Ui::PreparedList::Error::None) {
 			return result;
 		} else if (data->hasImage()) {
 			auto image = Platform::GetImageFromClipboard();
@@ -2226,10 +2227,10 @@ bool SendFilesBox::addFiles(not_null<const QMimeData*> data) {
 	return addFiles(std::move(list));
 }
 
-bool SendFilesBox::addFiles(Storage::PreparedList list) {
+bool SendFilesBox::addFiles(Ui::PreparedList list) {
 	const auto sumFiles = _list.files.size() + list.files.size();
-	const auto cutToAlbumSize = (sumFiles > Storage::MaxAlbumItems());
-	if (list.error != Storage::PreparedList::Error::None) {
+	const auto cutToAlbumSize = (sumFiles > Ui::MaxAlbumItems());
+	if (list.error != Ui::PreparedList::Error::None) {
 		return false;
 	} else if (!IsSingleItem(list) && !list.albumIsPossible) {
 		return false;
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index e7b013071..d8bfc5f99 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <rpl/variable.h>
 #include "boxes/abstract_box.h"
+#include "ui/chat/attach/attach_prepare.h"
 #include "storage/localimageloader.h"
 #include "storage/storage_media_prepare.h"
 
@@ -59,7 +60,7 @@ public:
 	SendFilesBox(
 		QWidget*,
 		not_null<Window::SessionController*> controller,
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		const TextWithTags &caption,
 		CompressConfirm compressed,
 		SendLimit limit,
@@ -68,7 +69,7 @@ public:
 
 	void setConfirmedCallback(
 		Fn<void(
-			Storage::PreparedList &&list,
+			Ui::PreparedList &&list,
 			SendFilesWay way,
 			TextWithTags &&caption,
 			Api::SendOptions options,
@@ -127,7 +128,7 @@ private:
 
 	bool canAddFiles(not_null<const QMimeData*> data) const;
 	bool addFiles(not_null<const QMimeData*> data);
-	bool addFiles(Storage::PreparedList list);
+	bool addFiles(Ui::PreparedList list);
 
 	void openDialogToAddFileToAlbum();
 	void updateLeftButtonVisibility();
@@ -139,7 +140,7 @@ private:
 	QString _titleText;
 	int _titleHeight = 0;
 
-	Storage::PreparedList _list;
+	Ui::PreparedList _list;
 
 	CompressConfirm _compressConfirmInitial = CompressConfirm::None;
 	CompressConfirm _compressConfirm = CompressConfirm::None;
@@ -147,7 +148,7 @@ private:
 	SendMenu::Type _sendMenuType = SendMenu::Type();
 
 	Fn<void(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendFilesWay way,
 		TextWithTags &&caption,
 		Api::SendOptions options,
diff --git a/Telegram/SourceFiles/core/mime_type.cpp b/Telegram/SourceFiles/core/mime_type.cpp
index 339415e6a..c1596e550 100644
--- a/Telegram/SourceFiles/core/mime_type.cpp
+++ b/Telegram/SourceFiles/core/mime_type.cpp
@@ -19,10 +19,10 @@ MimeType::MimeType(Known type) : _type(type) {
 
 QStringList MimeType::globPatterns() const {
 	switch (_type) {
-	case Known::WebP: return QStringList(qsl("*.webp"));
-	case Known::Tgs: return QStringList(qsl("*.tgs"));
-	case Known::TDesktopTheme: return QStringList(qsl("*.tdesktop-theme"));
-	case Known::TDesktopPalette: return QStringList(qsl("*.tdesktop-palette"));
+	case Known::WebP: return QStringList(u"*.webp"_q);
+	case Known::Tgs: return QStringList(u"*.tgs"_q);
+	case Known::TDesktopTheme: return QStringList(u"*.tdesktop-theme"_q);
+	case Known::TDesktopPalette: return QStringList(u"*.tdesktop-palette"_q);
 	default: break;
 	}
 	return _typeStruct.globPatterns();
@@ -30,10 +30,10 @@ QStringList MimeType::globPatterns() const {
 
 QString MimeType::filterString() const {
 	switch (_type) {
-	case Known::WebP: return qsl("WebP image (*.webp)");
-	case Known::Tgs: return qsl("Telegram sticker (*.tgs)");
-	case Known::TDesktopTheme: return qsl("Theme files (*.tdesktop-theme)");
-	case Known::TDesktopPalette: return qsl("Palette files (*.tdesktop-palette)");
+	case Known::WebP: return u"WebP image (*.webp)"_q;
+	case Known::Tgs: return u"Telegram sticker (*.tgs)"_q;
+	case Known::TDesktopTheme: return u"Theme files (*.tdesktop-theme)"_q;
+	case Known::TDesktopPalette: return u"Palette files (*.tdesktop-palette)"_q;
 	default: break;
 	}
 	return _typeStruct.filterString();
@@ -41,10 +41,10 @@ QString MimeType::filterString() const {
 
 QString MimeType::name() const {
 	switch (_type) {
-	case Known::WebP: return qsl("image/webp");
-	case Known::Tgs: return qsl("application/x-tgsticker");
-	case Known::TDesktopTheme: return qsl("application/x-tdesktop-theme");
-	case Known::TDesktopPalette: return qsl("application/x-tdesktop-palette");
+	case Known::WebP: return u"image/webp"_q;
+	case Known::Tgs: return u"application/x-tgsticker"_q;
+	case Known::TDesktopTheme: return u"application/x-tdesktop-theme"_q;
+	case Known::TDesktopPalette: return u"application/x-tdesktop-palette"_q;
 	default: break;
 	}
 	return _typeStruct.name();
@@ -103,11 +103,11 @@ MimeType MimeTypeForData(const QByteArray &data) {
 }
 
 bool IsMimeStickerAnimated(const QString &mime) {
-	return mime == qsl("application/x-tgsticker");
+	return (mime == u"application/x-tgsticker"_q);
 }
 
 bool IsMimeSticker(const QString &mime) {
-	return mime == qsl("image/webp")
+	return (mime == u"image/webp"_q)
 		|| IsMimeStickerAnimated(mime);
 }
 
diff --git a/Telegram/SourceFiles/core/mime_type.h b/Telegram/SourceFiles/core/mime_type.h
index 22a5fda4c..b817305f1 100644
--- a/Telegram/SourceFiles/core/mime_type.h
+++ b/Telegram/SourceFiles/core/mime_type.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include <QtCore/QFileInfo>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QMimeType>
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 751f3023b..9abb0d823 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toasts/common_toasts.h"
 #include "ui/special_buttons.h"
 #include "ui/emoji_config.h"
+#include "ui/chat/attach/attach_prepare.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/inner_dropdown.h"
 #include "ui/widgets/dropdown_menu.h"
@@ -4091,7 +4092,7 @@ void HistoryWidget::updateFieldPlaceholder() {
 }
 
 bool HistoryWidget::showSendingFilesError(
-		const Storage::PreparedList &list) const {
+		const Ui::PreparedList &list) const {
 	const auto text = [&] {
 		const auto error = _peer
 			? Data::RestrictionError(
@@ -4113,7 +4114,7 @@ bool HistoryWidget::showSendingFilesError(
 				lt_left,
 				Ui::FormatDurationWords(left));
 		}
-		using Error = Storage::PreparedList::Error;
+		using Error = Ui::PreparedList::Error;
 		switch (list.error) {
 		case Error::None: return QString();
 		case Error::EmptyFile:
@@ -4158,7 +4159,7 @@ bool HistoryWidget::confirmSendingFiles(
 }
 
 bool HistoryWidget::confirmSendingFiles(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		CompressConfirm compressed,
 		const QString &insertTextOnCancel) {
 	if (showSendingFilesError(list)) {
@@ -4191,7 +4192,7 @@ bool HistoryWidget::confirmSendingFiles(
 		sendMenuType());
 	_field->setTextWithTags({});
 	box->setConfirmedCallback(crl::guard(this, [=](
-			Storage::PreparedList &&list,
+			Ui::PreparedList &&list,
 			SendFilesWay way,
 			TextWithTags &&caption,
 			Api::SendOptions options,
@@ -4279,8 +4280,8 @@ bool HistoryWidget::confirmSendingFiles(
 		auto list = Storage::PrepareMediaList(
 			urls,
 			st::sendMediaPreviewSize);
-		if (list.error != Storage::PreparedList::Error::NonLocalUrl) {
-			if (list.error == Storage::PreparedList::Error::None
+		if (list.error != Ui::PreparedList::Error::NonLocalUrl) {
+			if (list.error == Ui::PreparedList::Error::None
 				|| !hasImage) {
 				const auto emptyTextOnCancel = QString();
 				confirmSendingFiles(
@@ -4310,7 +4311,7 @@ bool HistoryWidget::confirmSendingFiles(
 }
 
 void HistoryWidget::uploadFilesAfterConfirmation(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		MsgId replyTo,
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 230570317..2e5f034c8 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -21,7 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 class RPCError;
 struct FileLoadResult;
-struct FileMediaInformation;
 struct SendingAlbum;
 enum class SendMediaType;
 enum class CompressConfirm;
@@ -67,6 +66,7 @@ class FlatButton;
 class LinkButton;
 class RoundButton;
 class PinnedBar;
+struct PreparedList;
 namespace Toast {
 class Instance;
 } // namespace Toast
@@ -84,7 +84,6 @@ class TabbedSelector;
 
 namespace Storage {
 enum class MimeDataState;
-struct PreparedList;
 struct UploadedPhoto;
 struct UploadedDocument;
 struct UploadedThumbDocument;
@@ -424,15 +423,15 @@ private:
 		CompressConfirm compressed,
 		const QString &insertTextOnCancel = QString());
 	bool confirmSendingFiles(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		CompressConfirm compressed,
 		const QString &insertTextOnCancel = QString());
-	bool showSendingFilesError(const Storage::PreparedList &list) const;
+	bool showSendingFilesError(const Ui::PreparedList &list) const;
 
 	void uploadFile(const QByteArray &fileContent, SendMediaType type);
 
 	void uploadFilesAfterConfirmation(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		MsgId replyTo,
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 41d644c40..613acdc9d 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
+#include "ui/chat/attach/attach_prepare.h"
 #include "ui/special_buttons.h"
 #include "ui/ui_utility.h"
 #include "ui/toasts/common_toasts.h"
@@ -571,8 +572,8 @@ bool RepliesWidget::confirmSendingFiles(
 		auto list = Storage::PrepareMediaList(
 			urls,
 			st::sendMediaPreviewSize);
-		if (list.error != Storage::PreparedList::Error::NonLocalUrl) {
-			if (list.error == Storage::PreparedList::Error::None
+		if (list.error != Ui::PreparedList::Error::NonLocalUrl) {
+			if (list.error == Ui::PreparedList::Error::None
 				|| !hasImage) {
 				const auto emptyTextOnCancel = QString();
 				confirmSendingFiles(
@@ -602,7 +603,7 @@ bool RepliesWidget::confirmSendingFiles(
 }
 
 bool RepliesWidget::confirmSendingFiles(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		CompressConfirm compressed,
 		const QString &insertTextOnCancel) {
 	if (showSendingFilesError(list)) {
@@ -633,7 +634,7 @@ bool RepliesWidget::confirmSendingFiles(
 
 	const auto replyTo = replyToId();
 	box->setConfirmedCallback(crl::guard(this, [=](
-			Storage::PreparedList &&list,
+			Ui::PreparedList &&list,
 			SendFilesWay way,
 			TextWithTags &&caption,
 			Api::SendOptions options,
@@ -728,7 +729,7 @@ std::optional<QString> RepliesWidget::writeRestriction() const {
 }
 
 void RepliesWidget::uploadFilesAfterConfirmation(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		MsgId replyTo,
@@ -818,7 +819,7 @@ void RepliesWidget::uploadFile(
 }
 
 bool RepliesWidget::showSendingFilesError(
-		const Storage::PreparedList &list) const {
+		const Ui::PreparedList &list) const {
 	const auto text = [&] {
 		const auto error = Data::RestrictionError(
 			_history->peer,
@@ -836,7 +837,7 @@ bool RepliesWidget::showSendingFilesError(
 				lt_left,
 				Ui::FormatDurationWords(left));
 		}
-		using Error = Storage::PreparedList::Error;
+		using Error = Ui::PreparedList::Error;
 		switch (list.error) {
 		case Error::None: return QString();
 		case Error::EmptyFile:
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 5adf27731..97e061a55 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -27,7 +27,6 @@ struct SendOptions;
 } // namespace Api
 
 namespace Storage {
-struct PreparedList;
 } // namespace Storage
 
 namespace Ui {
@@ -36,6 +35,7 @@ class PlainShadow;
 class FlatButton;
 class HistoryDownButton;
 class PinnedBar;
+struct PreparedList;
 } // namespace Ui
 
 namespace Profile {
@@ -201,16 +201,16 @@ private:
 		CompressConfirm compressed,
 		const QString &insertTextOnCancel = QString());
 	bool confirmSendingFiles(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		CompressConfirm compressed,
 		const QString &insertTextOnCancel = QString());
 	bool confirmSendingFiles(
 		not_null<const QMimeData*> data,
 		CompressConfirm compressed,
 		const QString &insertTextOnCancel = QString());
-	bool showSendingFilesError(const Storage::PreparedList &list) const;
+	bool showSendingFilesError(const Ui::PreparedList &list) const;
 	void uploadFilesAfterConfirmation(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		MsgId replyTo,
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index dca932b12..ad47b2da3 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 #include "ui/item_text_options.h"
 #include "ui/toast/toast.h"
+#include "ui/chat/attach/attach_prepare.h"
 #include "ui/special_buttons.h"
 #include "ui/ui_utility.h"
 #include "ui/toasts/common_toasts.h"
@@ -311,8 +312,8 @@ bool ScheduledWidget::confirmSendingFiles(
 		auto list = Storage::PrepareMediaList(
 			urls,
 			st::sendMediaPreviewSize);
-		if (list.error != Storage::PreparedList::Error::NonLocalUrl) {
-			if (list.error == Storage::PreparedList::Error::None
+		if (list.error != Ui::PreparedList::Error::NonLocalUrl) {
+			if (list.error == Ui::PreparedList::Error::None
 				|| !hasImage) {
 				const auto emptyTextOnCancel = QString();
 				confirmSendingFiles(
@@ -342,7 +343,7 @@ bool ScheduledWidget::confirmSendingFiles(
 }
 
 bool ScheduledWidget::confirmSendingFiles(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		CompressConfirm compressed,
 		const QString &insertTextOnCancel) {
 	if (showSendingFilesError(list)) {
@@ -374,7 +375,7 @@ bool ScheduledWidget::confirmSendingFiles(
 	//_field->setTextWithTags({});
 
 	box->setConfirmedCallback(crl::guard(this, [=](
-			Storage::PreparedList &&list,
+			Ui::PreparedList &&list,
 			SendFilesWay way,
 			TextWithTags &&caption,
 			Api::SendOptions options,
@@ -436,7 +437,7 @@ bool ScheduledWidget::confirmSendingFiles(
 }
 
 void ScheduledWidget::uploadFilesAfterConfirmation(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		MsgId replyTo,
@@ -480,7 +481,7 @@ void ScheduledWidget::uploadFile(
 }
 
 bool ScheduledWidget::showSendingFilesError(
-		const Storage::PreparedList &list) const {
+		const Ui::PreparedList &list) const {
 	const auto text = [&] {
 		const auto error = Data::RestrictionError(
 			_history->peer,
@@ -488,7 +489,7 @@ bool ScheduledWidget::showSendingFilesError(
 		if (error) {
 			return *error;
 		}
-		using Error = Storage::PreparedList::Error;
+		using Error = Ui::PreparedList::Error;
 		switch (list.error) {
 		case Error::None: return QString();
 		case Error::EmptyFile:
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 1cc916625..57af2c5c3 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -25,15 +25,12 @@ namespace Api {
 struct SendOptions;
 } // namespace Api
 
-namespace Storage {
-struct PreparedList;
-} // namespace Storage
-
 namespace Ui {
 class ScrollArea;
 class PlainShadow;
 class FlatButton;
 class HistoryDownButton;
+struct PreparedList;
 } // namespace Ui
 
 namespace Profile {
@@ -170,16 +167,16 @@ private:
 		CompressConfirm compressed,
 		const QString &insertTextOnCancel = QString());
 	bool confirmSendingFiles(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		CompressConfirm compressed,
 		const QString &insertTextOnCancel = QString());
 	bool confirmSendingFiles(
 		not_null<const QMimeData*> data,
 		CompressConfirm compressed,
 		const QString &insertTextOnCancel = QString());
-	bool showSendingFilesError(const Storage::PreparedList &list) const;
+	bool showSendingFilesError(const Ui::PreparedList &list) const;
 	void uploadFilesAfterConfirmation(
-		Storage::PreparedList &&list,
+		Ui::PreparedList &&list,
 		SendMediaType type,
 		TextWithTags &&caption,
 		MsgId replyTo,
diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp
index 5e79687ad..e429ee774 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio.cpp
@@ -1630,8 +1630,8 @@ private:
 
 namespace Player {
 
-FileMediaInformation::Song PrepareForSending(const QString &fname, const QByteArray &data) {
-	auto result = FileMediaInformation::Song();
+Ui::PreparedFileInformation::Song PrepareForSending(const QString &fname, const QByteArray &data) {
+	auto result = Ui::PreparedFileInformation::Song();
 	FFMpegAttributesReader reader(FileLocation(fname), data);
 	const auto positionMs = crl::time(0);
 	if (reader.open(positionMs) && reader.samplesCount() > 0) {
diff --git a/Telegram/SourceFiles/media/audio/media_audio.h b/Telegram/SourceFiles/media/audio/media_audio.h
index 369ee4507..962017073 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.h
+++ b/Telegram/SourceFiles/media/audio/media_audio.h
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "ui/effects/animation_value.h"
-#include "storage/localimageloader.h"
+#include "ui/chat/attach/attach_prepare.h"
 #include "base/bytes.h"
 
 #include <QtCore/QTimer>
@@ -345,7 +345,9 @@ private:
 
 };
 
-FileMediaInformation::Song PrepareForSending(const QString &fname, const QByteArray &data);
+[[nodiscard]] Ui::PreparedFileInformation::Song PrepareForSending(
+	const QString &fname,
+	const QByteArray &data);
 
 namespace internal {
 
diff --git a/Telegram/SourceFiles/media/clip/media_clip_reader.cpp b/Telegram/SourceFiles/media/clip/media_clip_reader.cpp
index 84b57b9a6..7cb071529 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_reader.cpp
+++ b/Telegram/SourceFiles/media/clip/media_clip_reader.cpp
@@ -883,8 +883,8 @@ Manager::~Manager() {
 	clear();
 }
 
-FileMediaInformation::Video PrepareForSending(const QString &fname, const QByteArray &data) {
-	auto result = FileMediaInformation::Video();
+Ui::PreparedFileInformation::Video PrepareForSending(const QString &fname, const QByteArray &data) {
+	auto result = Ui::PreparedFileInformation::Video();
 	auto localLocation = FileLocation(fname);
 	auto localData = QByteArray(data);
 
diff --git a/Telegram/SourceFiles/media/clip/media_clip_reader.h b/Telegram/SourceFiles/media/clip/media_clip_reader.h
index fc85b1e10..cb84dffd9 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_reader.h
+++ b/Telegram/SourceFiles/media/clip/media_clip_reader.h
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "storage/localimageloader.h"
+#include "ui/chat/attach/attach_prepare.h"
 #include "ui/image/image_prepare.h"
 
 #include <QtCore/QTimer>
@@ -294,7 +294,9 @@ private:
 
 };
 
-FileMediaInformation::Video PrepareForSending(const QString &fname, const QByteArray &data);
+[[nodiscard]] Ui::PreparedFileInformation::Video PrepareForSending(
+	const QString &fname,
+	const QByteArray &data);
 
 void Finish();
 
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 09f7146ac..782e73fb3 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -489,7 +489,7 @@ FileLoadTask::FileLoadTask(
 	not_null<Main::Session*> session,
 	const QString &filepath,
 	const QByteArray &content,
-	std::unique_ptr<FileMediaInformation> information,
+	std::unique_ptr<Ui::PreparedFileInformation> information,
 	SendMediaType type,
 	const FileLoadTo &to,
 	const TextWithTags &caption,
@@ -528,11 +528,13 @@ FileLoadTask::FileLoadTask(
 , _caption(caption) {
 }
 
-std::unique_ptr<FileMediaInformation> FileLoadTask::ReadMediaInformation(
+FileLoadTask::~FileLoadTask() = default;
+
+std::unique_ptr<Ui::PreparedFileInformation> FileLoadTask::ReadMediaInformation(
 		const QString &filepath,
 		const QByteArray &content,
 		const QString &filemime) {
-	auto result = std::make_unique<FileMediaInformation>();
+	auto result = std::make_unique<Ui::PreparedFileInformation>();
 	result->filemime = filemime;
 
 	if (CheckForSong(filepath, content, result)) {
@@ -565,7 +567,7 @@ bool FileLoadTask::CheckMimeOrExtensions(
 bool FileLoadTask::CheckForSong(
 		const QString &filepath,
 		const QByteArray &content,
-		std::unique_ptr<FileMediaInformation> &result) {
+		std::unique_ptr<Ui::PreparedFileInformation> &result) {
 	static const auto mimes = {
 		qstr("audio/mp3"),
 		qstr("audio/m4a"),
@@ -606,7 +608,7 @@ bool FileLoadTask::CheckForSong(
 bool FileLoadTask::CheckForVideo(
 		const QString &filepath,
 		const QByteArray &content,
-		std::unique_ptr<FileMediaInformation> &result) {
+		std::unique_ptr<Ui::PreparedFileInformation> &result) {
 	static const auto mimes = {
 		qstr("video/mp4"),
 		qstr("video/quicktime"),
@@ -640,7 +642,7 @@ bool FileLoadTask::CheckForVideo(
 bool FileLoadTask::CheckForImage(
 		const QString &filepath,
 		const QByteArray &content,
-		std::unique_ptr<FileMediaInformation> &result) {
+		std::unique_ptr<Ui::PreparedFileInformation> &result) {
 	auto animated = false;
 	auto image = [&] {
 		if (filepath.endsWith(qstr(".tgs"), Qt::CaseInsensitive)) {
@@ -665,13 +667,13 @@ bool FileLoadTask::CheckForImage(
 bool FileLoadTask::FillImageInformation(
 		QImage &&image,
 		bool animated,
-		std::unique_ptr<FileMediaInformation> &result) {
+		std::unique_ptr<Ui::PreparedFileInformation> &result) {
 	Expects(result != nullptr);
 
 	if (image.isNull()) {
 		return false;
 	}
-	auto media = FileMediaInformation::Image();
+	auto media = Ui::PreparedFileInformation::Image();
 	media.data = std::move(image);
 	media.animated = animated;
 	result->media = media;
@@ -717,7 +719,7 @@ void FileLoadTask::process() {
 			_information = readMediaInformation(Core::MimeTypeForFile(info).name());
 		}
 		filemime = _information->filemime;
-		if (auto image = std::get_if<FileMediaInformation::Image>(
+		if (auto image = std::get_if<Ui::PreparedFileInformation::Image>(
 				&_information->media)) {
 			fullimage = base::take(image->data);
 			if (!Core::IsMimeSticker(filemime)) {
@@ -732,7 +734,7 @@ void FileLoadTask::process() {
 			filemime = "audio/ogg";
 		} else {
 			if (_information) {
-				if (auto image = std::get_if<FileMediaInformation::Image>(
+				if (auto image = std::get_if<Ui::PreparedFileInformation::Image>(
 						&_information->media)) {
 					fullimage = base::take(image->data);
 				}
@@ -757,7 +759,7 @@ void FileLoadTask::process() {
 		}
 	} else {
 		if (_information) {
-			if (auto image = std::get_if<FileMediaInformation::Image>(
+			if (auto image = std::get_if<Ui::PreparedFileInformation::Image>(
 					&_information->media)) {
 				fullimage = base::take(image->data);
 			}
@@ -807,13 +809,13 @@ void FileLoadTask::process() {
 			_information = readMediaInformation(filemime);
 			filemime = _information->filemime;
 		}
-		if (auto song = std::get_if<FileMediaInformation::Song>(
+		if (auto song = std::get_if<Ui::PreparedFileInformation::Song>(
 				&_information->media)) {
 			isSong = true;
 			auto flags = MTPDdocumentAttributeAudio::Flag::f_title | MTPDdocumentAttributeAudio::Flag::f_performer;
 			attributes.push_back(MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(song->duration), MTP_string(song->title), MTP_string(song->performer), MTPstring()));
 			thumbnail = PrepareFileThumbnail(std::move(song->cover));
-		} else if (auto video = std::get_if<FileMediaInformation::Video>(
+		} else if (auto video = std::get_if<Ui::PreparedFileInformation::Video>(
 				&_information->media)) {
 			isVideo = true;
 			auto coverWidth = video->thumbnail.width();
@@ -996,6 +998,11 @@ FileLoadResult *FileLoadTask::peekResult() const {
 	return _result.get();
 }
 
+std::unique_ptr<Ui::PreparedFileInformation> FileLoadTask::readMediaInformation(
+		const QString &filemime) const {
+	return ReadMediaInformation(_filepath, _content, filemime);
+}
+
 void FileLoadTask::removeFromAlbum() {
 	if (!_album) {
 		return;
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index fed9e2a9d..e80058430 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/variant.h"
 #include "api/api_common.h"
+#include "ui/chat/attach/attach_prepare.h"
 
 constexpr auto kFileSizeLimit = 2000 * 1024 * 1024; // Load files up to 1500mb
 
@@ -239,44 +240,22 @@ struct FileLoadResult {
 
 };
 
-struct FileMediaInformation {
-	struct Image {
-		QImage data;
-		bool animated = false;
-	};
-	struct Song {
-		int duration = -1;
-		QString title;
-		QString performer;
-		QImage cover;
-	};
-	struct Video {
-		bool isGifv = false;
-		bool supportsStreaming = false;
-		int duration = -1;
-		QImage thumbnail;
-	};
-
-	QString filemime;
-	std::variant<v::null_t, Image, Song, Video> media;
-};
-
 class FileLoadTask final : public Task {
 public:
-	static std::unique_ptr<FileMediaInformation> ReadMediaInformation(
+	static std::unique_ptr<Ui::PreparedFileInformation> ReadMediaInformation(
 		const QString &filepath,
 		const QByteArray &content,
 		const QString &filemime);
 	static bool FillImageInformation(
 		QImage &&image,
 		bool animated,
-		std::unique_ptr<FileMediaInformation> &result);
+		std::unique_ptr<Ui::PreparedFileInformation> &result);
 
 	FileLoadTask(
 		not_null<Main::Session*> session,
 		const QString &filepath,
 		const QByteArray &content,
-		std::unique_ptr<FileMediaInformation> information,
+		std::unique_ptr<Ui::PreparedFileInformation> information,
 		SendMediaType type,
 		const FileLoadTo &to,
 		const TextWithTags &caption,
@@ -289,6 +268,7 @@ public:
 		const VoiceWaveform &waveform,
 		const FileLoadTo &to,
 		const TextWithTags &caption);
+	~FileLoadTask();
 
 	uint64 fileid() const {
 		return _id;
@@ -303,22 +283,20 @@ private:
 	static bool CheckForSong(
 		const QString &filepath,
 		const QByteArray &content,
-		std::unique_ptr<FileMediaInformation> &result);
+		std::unique_ptr<Ui::PreparedFileInformation> &result);
 	static bool CheckForVideo(
 		const QString &filepath,
 		const QByteArray &content,
-		std::unique_ptr<FileMediaInformation> &result);
+		std::unique_ptr<Ui::PreparedFileInformation> &result);
 	static bool CheckForImage(
 		const QString &filepath,
 		const QByteArray &content,
-		std::unique_ptr<FileMediaInformation> &result);
+		std::unique_ptr<Ui::PreparedFileInformation> &result);
 
 	template <typename Mimes, typename Extensions>
 	static bool CheckMimeOrExtensions(const QString &filepath, const QString &filemime, Mimes &mimes, Extensions &extensions);
 
-	std::unique_ptr<FileMediaInformation> readMediaInformation(const QString &filemime) const {
-		return ReadMediaInformation(_filepath, _content, filemime);
-	}
+	std::unique_ptr<Ui::PreparedFileInformation> readMediaInformation(const QString &filemime) const;
 	void removeFromAlbum();
 
 	uint64 _id = 0;
@@ -328,7 +306,7 @@ private:
 	const std::shared_ptr<SendingAlbum> _album;
 	QString _filepath;
 	QByteArray _content;
-	std::unique_ptr<FileMediaInformation> _information;
+	std::unique_ptr<Ui::PreparedFileInformation> _information;
 	int32 _duration = 0;
 	VoiceWaveform _waveform;
 	SendMediaType _type;
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index 6099d31df..629ea4766 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/mime_type.h"
 #include "ui/image/image_prepare.h"
 #include "ui/chat/attach/attach_extensions.h"
+#include "ui/chat/attach/attach_prepare.h"
 #include "app.h"
 
 #include <QtCore/QSemaphore>
@@ -20,7 +21,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Storage {
 namespace {
 
-constexpr auto kMaxAlbumCount = 10;
+using Ui::PreparedFileInformation;
+using Ui::PreparedFile;
+using Ui::PreparedList;
 
 bool HasExtensionFrom(const QString &file, const QStringList &extensions) {
 	for (const auto &extension : extensions) {
@@ -33,7 +36,7 @@ bool HasExtensionFrom(const QString &file, const QStringList &extensions) {
 }
 
 bool ValidPhotoForAlbum(
-		const FileMediaInformation::Image &image,
+		const PreparedFileInformation::Image &image,
 		const QString &mime) {
 	if (image.animated || Core::IsMimeSticker(mime)) {
 		return false;
@@ -43,7 +46,7 @@ bool ValidPhotoForAlbum(
 	return ValidateThumbDimensions(width, height);
 }
 
-bool ValidVideoForAlbum(const FileMediaInformation::Video &video) {
+bool ValidVideoForAlbum(const PreparedFileInformation::Video &video) {
 	const auto width = video.thumbnail.width();
 	const auto height = video.thumbnail.height();
 	return ValidateThumbDimensions(width, height);
@@ -82,8 +85,8 @@ bool PrepareAlbumMediaIsWaiting(
 			Assert(file.information != nullptr);
 		}
 
-		using Image = FileMediaInformation::Image;
-		using Video = FileMediaInformation::Video;
+		using Image = PreparedFileInformation::Image;
+		using Video = PreparedFileInformation::Video;
 		if (const auto image = std::get_if<Image>(
 				&file.information->media)) {
 			if (ValidPhotoForAlbum(*image, file.mime)) {
@@ -115,7 +118,7 @@ bool PrepareAlbumMediaIsWaiting(
 
 void PrepareAlbum(PreparedList &result, int previewWidth) {
 	const auto count = int(result.files.size());
-	if (count > kMaxAlbumCount) {
+	if (count > Ui::MaxAlbumItems()) {
 		return;
 	}
 
@@ -167,15 +170,6 @@ bool ValidateThumbDimensions(int width, int height) {
 		&& (height < 20 * width);
 }
 
-PreparedFile::PreparedFile(const QString &path) : path(path) {
-}
-
-PreparedFile::PreparedFile(PreparedFile &&other) = default;
-
-PreparedFile &PreparedFile::operator=(PreparedFile &&other) = default;
-
-PreparedFile::~PreparedFile() = default;
-
 MimeDataState ComputeMimeDataState(const QMimeData *data) {
 	if (!data || data->hasFormat(qsl("application/x-td-forward"))) {
 		return MimeDataState::None;
@@ -284,7 +278,7 @@ PreparedList PrepareMediaFromImage(
 	auto file = PreparedFile(QString());
 	file.content = content;
 	if (file.content.isEmpty()) {
-		file.information = std::make_unique<FileMediaInformation>();
+		file.information = std::make_unique<PreparedFileInformation>();
 		const auto animated = false;
 		FileLoadTask::FillImageInformation(
 			std::move(image),
@@ -296,7 +290,7 @@ PreparedList PrepareMediaFromImage(
 	return result;
 }
 
-std::optional<PreparedList> PreparedList::PreparedFileFromFilesDialog(
+std::optional<PreparedList> PreparedFileFromFilesDialog(
 		FileDialog::OpenResult &&result,
 		bool isAlbum,
 		Fn<void(tr::phrase<>)> errorCallback,
@@ -347,7 +341,7 @@ std::optional<PreparedList> PreparedList::PreparedFileFromFilesDialog(
 			if (!isAlbum) {
 				return true;
 			}
-			using Info = FileMediaInformation;
+			using Info = PreparedFileInformation;
 
 			const auto media = &file.information->media;
 			const auto valid = v::match(*media, [](const Info::Image &data) {
@@ -386,68 +380,5 @@ std::optional<PreparedList> PreparedList::PreparedFileFromFilesDialog(
 	return std::nullopt;
 }
 
-PreparedList PreparedList::Reordered(
-		PreparedList &&list,
-		std::vector<int> order) {
-	Expects(list.error == PreparedList::Error::None);
-	Expects(list.files.size() == order.size());
-
-	auto result = PreparedList(list.error, list.errorData);
-	result.albumIsPossible = list.albumIsPossible;
-	result.allFilesForCompress = list.allFilesForCompress;
-	result.files.reserve(list.files.size());
-	for (auto index : order) {
-		result.files.push_back(std::move(list.files[index]));
-	}
-	return result;
-}
-
-void PreparedList::mergeToEnd(PreparedList &&other, bool cutToAlbumSize) {
-	if (error != Error::None) {
-		return;
-	}
-	if (other.error != Error::None) {
-		error = other.error;
-		errorData = other.errorData;
-		return;
-	}
-	allFilesForCompress = allFilesForCompress && other.allFilesForCompress;
-	files.reserve(std::min(
-		size_t(cutToAlbumSize ? kMaxAlbumCount : INT_MAX),
-		files.size() + other.files.size()));
-	for (auto &file : other.files) {
-		if (cutToAlbumSize && files.size() == kMaxAlbumCount) {
-			break;
-		}
-		files.push_back(std::move(file));
-	}
-	if (files.size() > 1 && files.size() <= kMaxAlbumCount) {
-		const auto badIt = ranges::find(
-			files,
-			PreparedFile::AlbumType::None,
-			[](const PreparedFile &file) { return file.type; });
-		albumIsPossible = (badIt == files.end());
-	} else {
-		albumIsPossible = false;
-	}
-}
-
-bool PreparedList::canAddCaption(bool isAlbum, bool compressImages) const {
-	const auto isSticker = [&] {
-		if (files.empty()) {
-			return false;
-		}
-		return Core::IsMimeSticker(files.front().mime)
-			|| files.front().path.endsWith(
-				qstr(".tgs"),
-				Qt::CaseInsensitive);
-	};
-	return isAlbum || (files.size() == 1 && !isSticker());
-}
-
-int MaxAlbumItems() {
-	return kMaxAlbumCount;
-}
-
 } // namespace Storage
 
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.h b/Telegram/SourceFiles/storage/storage_media_prepare.h
index 1cdfa3082..d07d90abe 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.h
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.h
@@ -10,7 +10,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/file_utilities.h"
 #include "lang/lang_keys.h"
 
-struct FileMediaInformation;
+namespace Ui {
+struct PreparedFileInformation;
+struct PreparedFile;
+struct PreparedList;
+} // namespace Ui
 
 namespace Storage {
 
@@ -21,72 +25,19 @@ enum class MimeDataState {
 	Image,
 };
 
+std::optional<Ui::PreparedList> PreparedFileFromFilesDialog(
+	FileDialog::OpenResult &&result,
+	bool isAlbum,
+	Fn<void(tr::phrase<>)> errorCallback,
+	int previewWidth);
 MimeDataState ComputeMimeDataState(const QMimeData *data);
-
-struct PreparedFile {
-	enum class AlbumType {
-		None,
-		Photo,
-		Video,
-	};
-
-	PreparedFile(const QString &path);
-	PreparedFile(PreparedFile &&other);
-	PreparedFile &operator=(PreparedFile &&other);
-	~PreparedFile();
-
-	QString path;
-	QByteArray content;
-	QString mime;
-	std::unique_ptr<FileMediaInformation> information;
-	QImage preview;
-	QSize shownDimensions;
-	AlbumType type = AlbumType::None;
-
-};
-
-struct PreparedList {
-	enum class Error {
-		None,
-		NonLocalUrl,
-		Directory,
-		EmptyFile,
-		TooLargeFile,
-	};
-
-	PreparedList() = default;
-	PreparedList(Error error, QString errorData)
-	: error(error)
-	, errorData(errorData) {
-	}
-	static PreparedList Reordered(
-		PreparedList &&list,
-		std::vector<int> order);
-	static std::optional<PreparedList> PreparedFileFromFilesDialog(
-		FileDialog::OpenResult &&result,
-		bool isAlbum,
-		Fn<void(tr::phrase<>)> errorCallback,
-		int previewWidth);
-	void mergeToEnd(PreparedList &&other, bool cutToAlbumSize = false);
-
-	bool canAddCaption(bool isAlbum, bool compressImages) const;
-
-	Error error = Error::None;
-	QString errorData;
-	std::vector<PreparedFile> files;
-	bool allFilesForCompress = true;
-	bool albumIsPossible = false;
-
-};
-
 bool ValidateDragData(not_null<const QMimeData*> data, bool isAlbum);
 bool ValidateThumbDimensions(int width, int height);
-PreparedList PrepareMediaList(const QList<QUrl> &files, int previewWidth);
-PreparedList PrepareMediaList(const QStringList &files, int previewWidth);
-PreparedList PrepareMediaFromImage(
+Ui::PreparedList PrepareMediaList(const QList<QUrl> &files, int previewWidth);
+Ui::PreparedList PrepareMediaList(const QStringList &files, int previewWidth);
+Ui::PreparedList PrepareMediaFromImage(
 	QImage &&image,
 	QByteArray &&content,
 	int previewWidth);
-int MaxAlbumItems();
 
 } // namespace Storage
diff --git a/Telegram/SourceFiles/support/support_helper.cpp b/Telegram/SourceFiles/support/support_helper.cpp
index 82c2fd328..c660a5de7 100644
--- a/Telegram/SourceFiles/support/support_helper.cpp
+++ b/Telegram/SourceFiles/support/support_helper.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/abstract_box.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/input_fields.h"
+#include "ui/chat/attach/attach_prepare.h"
 #include "ui/text/text_entity.h"
 #include "ui/text/text_options.h"
 #include "chat_helpers/message_field.h"
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
new file mode 100644
index 000000000..94a03753d
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -0,0 +1,91 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/attach/attach_prepare.h"
+
+#include "core/mime_type.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kMaxAlbumCount = 10;
+
+} // namespace
+
+PreparedFile::PreparedFile(const QString &path) : path(path) {
+}
+
+PreparedFile::PreparedFile(PreparedFile &&other) = default;
+
+PreparedFile &PreparedFile::operator=(PreparedFile && other) = default;
+
+PreparedFile::~PreparedFile() = default;
+
+PreparedList PreparedList::Reordered(
+		PreparedList &&list,
+		std::vector<int> order) {
+	Expects(list.error == PreparedList::Error::None);
+	Expects(list.files.size() == order.size());
+
+	auto result = PreparedList(list.error, list.errorData);
+	result.albumIsPossible = list.albumIsPossible;
+	result.allFilesForCompress = list.allFilesForCompress;
+	result.files.reserve(list.files.size());
+	for (auto index : order) {
+		result.files.push_back(std::move(list.files[index]));
+	}
+	return result;
+}
+
+void PreparedList::mergeToEnd(PreparedList &&other, bool cutToAlbumSize) {
+	if (error != Error::None) {
+		return;
+	}
+	if (other.error != Error::None) {
+		error = other.error;
+		errorData = other.errorData;
+		return;
+	}
+	allFilesForCompress = allFilesForCompress && other.allFilesForCompress;
+	files.reserve(std::min(
+		size_t(cutToAlbumSize ? kMaxAlbumCount : INT_MAX),
+		files.size() + other.files.size()));
+	for (auto &file : other.files) {
+		if (cutToAlbumSize && files.size() == kMaxAlbumCount) {
+			break;
+		}
+		files.push_back(std::move(file));
+	}
+	if (files.size() > 1 && files.size() <= kMaxAlbumCount) {
+		const auto badIt = ranges::find(
+			files,
+			PreparedFile::AlbumType::None,
+			[](const PreparedFile &file) { return file.type; });
+		albumIsPossible = (badIt == files.end());
+	} else {
+		albumIsPossible = false;
+	}
+}
+
+bool PreparedList::canAddCaption(bool isAlbum, bool compressImages) const {
+	const auto isSticker = [&] {
+		if (files.empty()) {
+			return false;
+		}
+		return Core::IsMimeSticker(files.front().mime)
+			|| files.front().path.endsWith(
+				qstr(".tgs"),
+				Qt::CaseInsensitive);
+	};
+	return isAlbum || (files.size() == 1 && !isSticker());
+}
+
+int MaxAlbumItems() {
+	return kMaxAlbumCount;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
new file mode 100644
index 000000000..2853996cd
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -0,0 +1,85 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+
+struct PreparedFileInformation {
+	struct Image {
+		QImage data;
+		bool animated = false;
+	};
+	struct Song {
+		int duration = -1;
+		QString title;
+		QString performer;
+		QImage cover;
+	};
+	struct Video {
+		bool isGifv = false;
+		bool supportsStreaming = false;
+		int duration = -1;
+		QImage thumbnail;
+	};
+
+	QString filemime;
+	std::variant<v::null_t, Image, Song, Video> media;
+};
+
+struct PreparedFile {
+	enum class AlbumType {
+		None,
+		Photo,
+		Video,
+	};
+
+	PreparedFile(const QString &path);
+	PreparedFile(PreparedFile &&other);
+	PreparedFile &operator=(PreparedFile &&other);
+	~PreparedFile();
+
+	QString path;
+	QByteArray content;
+	QString mime;
+	std::unique_ptr<Ui::PreparedFileInformation> information;
+	QImage preview;
+	QSize shownDimensions;
+	AlbumType type = AlbumType::None;
+};
+
+struct PreparedList {
+	enum class Error {
+		None,
+		NonLocalUrl,
+		Directory,
+		EmptyFile,
+		TooLargeFile,
+	};
+
+	PreparedList() = default;
+	PreparedList(Error error, QString errorData)
+		: error(error)
+		, errorData(errorData) {
+	}
+	[[nodiscard]] static PreparedList Reordered(
+		PreparedList &&list,
+		std::vector<int> order);
+	void mergeToEnd(PreparedList &&other, bool cutToAlbumSize = false);
+
+	[[nodiscard]] bool canAddCaption(bool isAlbum, bool compressImages) const;
+
+	Error error = Error::None;
+	QString errorData;
+	std::vector<PreparedFile> files;
+	bool allFilesForCompress = true;
+	bool albumIsPossible = false;
+};
+
+[[nodiscard]] int MaxAlbumItems();
+
+} // namespace Ui

From 05eb549a3db6e7222688c3a6f39b69ac7802d9d1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 13 Oct 2020 18:11:53 +0300
Subject: [PATCH 089/190] Move App::roundRect to Ui::FillRoundRect.

---
 Telegram/CMakeLists.txt                       |   34 -
 Telegram/SourceFiles/app.cpp                  |  244 +--
 Telegram/SourceFiles/app.h                    |   59 -
 .../SourceFiles/boxes/edit_caption_box.cpp    |   16 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp | 1312 +----------------
 Telegram/SourceFiles/boxes/send_files_box.h   |   26 +-
 .../SourceFiles/boxes/sticker_set_box.cpp     |    4 +-
 Telegram/SourceFiles/boxes/stickers_box.cpp   |    6 +-
 .../SourceFiles/chat_helpers/bot_keyboard.cpp |    4 +-
 .../chat_helpers/emoji_list_widget.cpp        |    8 +-
 .../chat_helpers/emoji_suggestions_widget.cpp |    6 +-
 .../chat_helpers/field_autocomplete.cpp       |    4 +-
 .../chat_helpers/stickers_list_widget.cpp     |    8 +-
 .../chat_helpers/tabbed_selector.cpp          |   11 +-
 Telegram/SourceFiles/core/core_settings.cpp   |   13 +-
 Telegram/SourceFiles/core/core_settings.h     |    8 +-
 Telegram/SourceFiles/core/mime_type.cpp       |   19 +
 Telegram/SourceFiles/core/mime_type.h         |   14 +-
 Telegram/SourceFiles/data/data_document.cpp   |   42 +-
 Telegram/SourceFiles/data/data_document.h     |    6 -
 .../SourceFiles/history/history_drag_area.cpp |    4 +-
 .../history/history_inner_widget.cpp          |    3 +-
 .../SourceFiles/history/history_widget.cpp    |    7 +-
 .../history/view/history_view_message.cpp     |   14 +-
 .../view/history_view_replies_section.cpp     |    7 +-
 .../view/history_view_scheduled_section.cpp   |    7 +-
 .../view/media/history_view_document.cpp      |    6 +-
 .../history/view/media/history_view_game.cpp  |    4 +-
 .../history/view/media/history_view_gif.cpp   |   16 +-
 .../view/media/history_view_invoice.cpp       |    4 +-
 .../view/media/history_view_location.cpp      |    8 +-
 .../media/history_view_media_unwrapped.cpp    |    4 +-
 .../history/view/media/history_view_photo.cpp |    8 +-
 .../media/history_view_theme_document.cpp     |    7 +-
 .../view/media/history_view_web_page.cpp      |    6 +-
 .../SourceFiles/info/info_layer_widget.cpp    |    7 +-
 .../inline_bot_layout_internal.cpp            |    6 +-
 .../inline_bots/inline_results_widget.cpp     |    4 +-
 Telegram/SourceFiles/layout.cpp               |    6 +-
 Telegram/SourceFiles/layout.h                 |    6 +-
 .../main/main_session_settings.cpp            |    9 +-
 .../media/player/media_player_panel.cpp       |    4 +-
 .../player/media_player_volume_controller.cpp |    4 +-
 .../media/view/media_view_overlay_widget.cpp  |    3 +-
 .../view/media_view_playback_controls.cpp     |    4 +-
 .../SourceFiles/overview/overview_layout.cpp  |   15 +-
 .../SourceFiles/settings/settings_intro.cpp   |    6 +-
 .../settings/settings_privacy_controllers.cpp |    3 +-
 .../details/storage_settings_scheme.cpp       |    5 +-
 .../SourceFiles/ui/cached_round_corners.cpp   |  255 ++++
 .../SourceFiles/ui/cached_round_corners.h     |   75 +
 .../ui/chat/attach/attach_album_preview.cpp   |  484 ++++++
 .../ui/chat/attach/attach_album_preview.h     |   99 ++
 .../ui/chat/attach/attach_album_thumbnail.cpp |  543 +++++++
 .../ui/chat/attach/attach_album_thumbnail.h   |   97 ++
 .../ui/chat/attach/attach_common.h            |   24 +
 .../attach/attach_single_file_preview.cpp     |  173 +++
 .../chat/attach/attach_single_file_preview.h  |   40 +
 Telegram/SourceFiles/ui/filter_icon_panel.cpp |    8 +-
 Telegram/SourceFiles/ui/grouped_layout.cpp    |    4 +-
 .../SourceFiles/ui/text/format_values.cpp     |   16 +
 Telegram/SourceFiles/ui/text/format_values.h  |    5 +
 .../SourceFiles/window/themes/window_theme.h  |    3 +-
 .../window/themes/window_theme_warning.cpp    |    4 +-
 .../window/window_history_hider.cpp           |    4 +-
 Telegram/cmake/td_ui.cmake                    |   33 +-
 66 files changed, 2051 insertions(+), 1847 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/cached_round_corners.cpp
 create mode 100644 Telegram/SourceFiles/ui/cached_round_corners.h
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_common.h
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 5a0a439a9..d6fdb2a4d 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -21,9 +21,6 @@ add_subdirectory(lib_qr)
 add_subdirectory(lib_webrtc)
 add_subdirectory(codegen)
 
-include(lib_ui/cmake/generate_styles.cmake)
-include(cmake/generate_numbers.cmake)
-
 get_filename_component(src_loc SourceFiles REALPATH)
 get_filename_component(res_loc Resources REALPATH)
 
@@ -37,33 +34,6 @@ include(cmake/td_lang.cmake)
 include(cmake/td_scheme.cmake)
 include(cmake/td_ui.cmake)
 
-set(style_files
-    boxes/boxes.style
-    calls/calls.style
-    chat_helpers/chat_helpers.style
-    export/view/export.style
-    info/info.style
-    intro/intro.style
-    media/view/media_view.style
-    media/player/media_player.style
-    overview/overview.style
-    passport/passport.style
-    profile/profile.style
-    settings/settings.style
-    ui/filter_icons.style
-)
-
-set(dependent_style_files
-    ${submodules_loc}/lib_ui/ui/colors.palette
-    ${submodules_loc}/lib_ui/ui/basic.style
-    ${submodules_loc}/lib_ui/ui/layers/layers.style
-    ${submodules_loc}/lib_ui/ui/widgets/widgets.style
-    ${src_loc}/ui/td_common.style
-)
-
-generate_styles(Telegram ${src_loc} "${style_files}" "${dependent_style_files}")
-generate_numbers(Telegram ${res_loc}/numbers.txt)
-
 set_target_properties(Telegram PROPERTIES AUTOMOC ON AUTORCC ON)
 
 target_link_libraries(Telegram
@@ -359,8 +329,6 @@ PRIVATE
     core/launcher.h
     core/local_url_handlers.cpp
     core/local_url_handlers.h
-    core/mime_type.cpp
-    core/mime_type.h
     core/sandbox.cpp
     core/sandbox.h
     core/shortcuts.cpp
@@ -1023,8 +991,6 @@ PRIVATE
     ui/filter_icons.h
     ui/filter_icon_panel.cpp
     ui/filter_icon_panel.h
-    ui/grouped_layout.cpp
-    ui/grouped_layout.h
     ui/item_text_options.cpp
     ui/item_text_options.h
     ui/resize_area.h
diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp
index 4be5be873..8c244d6fa 100644
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_service_message.h"
 #include "media/audio/media_audio.h"
 #include "ui/image/image.h"
+#include "ui/cached_round_corners.h"
 #include "inline_bots/inline_bot_layout_item.h"
 #include "core/crash_reports.h"
 #include "core/update_checker.h"
@@ -66,14 +67,6 @@ HistoryView::Element *hoveredItem = nullptr,
 	*pressedLinkItem = nullptr,
 	*mousedItem = nullptr;
 
-struct CornersPixmaps {
-	QPixmap p[4];
-};
-QVector<CornersPixmaps> corners;
-using CornersMap = QMap<uint32, CornersPixmaps>;
-CornersMap cornersMap;
-QImage cornersMaskLarge[4], cornersMaskSmall[4];
-
 } // namespace
 
 namespace App {
@@ -104,114 +97,12 @@ namespace App {
 		return result;
 	}
 
-	void prepareCorners(RoundCorners index, int32 radius, const QBrush &brush, const style::color *shadow = nullptr, QImage *cors = nullptr) {
-		Expects(::corners.size() > index);
-
-		int32 r = radius * cIntRetinaFactor(), s = st::msgShadow * cIntRetinaFactor();
-		QImage rect(r * 3, r * 3 + (shadow ? s : 0), QImage::Format_ARGB32_Premultiplied), localCors[4];
-		{
-			Painter p(&rect);
-			PainterHighQualityEnabler hq(p);
-
-			p.setCompositionMode(QPainter::CompositionMode_Source);
-			p.fillRect(QRect(0, 0, rect.width(), rect.height()), Qt::transparent);
-			p.setCompositionMode(QPainter::CompositionMode_SourceOver);
-			p.setPen(Qt::NoPen);
-			if (shadow) {
-				p.setBrush((*shadow)->b);
-				p.drawRoundedRect(0, s, r * 3, r * 3, r, r);
-			}
-			p.setBrush(brush);
-			p.drawRoundedRect(0, 0, r * 3, r * 3, r, r);
-		}
-		if (!cors) cors = localCors;
-		cors[0] = rect.copy(0, 0, r, r);
-		cors[1] = rect.copy(r * 2, 0, r, r);
-		cors[2] = rect.copy(0, r * 2, r, r + (shadow ? s : 0));
-		cors[3] = rect.copy(r * 2, r * 2, r, r + (shadow ? s : 0));
-		if (index != SmallMaskCorners && index != LargeMaskCorners) {
-			for (int i = 0; i < 4; ++i) {
-				::corners[index].p[i] = pixmapFromImageInPlace(std::move(cors[i]));
-				::corners[index].p[i].setDevicePixelRatio(cRetinaFactor());
-			}
-		}
-	}
-
-	void createMaskCorners() {
-		QImage mask[4];
-		prepareCorners(SmallMaskCorners, st::buttonRadius, QColor(255, 255, 255), nullptr, mask);
-		for (int i = 0; i < 4; ++i) {
-			::cornersMaskSmall[i] = mask[i].convertToFormat(QImage::Format_ARGB32_Premultiplied);
-			::cornersMaskSmall[i].setDevicePixelRatio(cRetinaFactor());
-		}
-		prepareCorners(LargeMaskCorners, st::historyMessageRadius, QColor(255, 255, 255), nullptr, mask);
-		for (int i = 0; i < 4; ++i) {
-			::cornersMaskLarge[i] = mask[i].convertToFormat(QImage::Format_ARGB32_Premultiplied);
-			::cornersMaskLarge[i].setDevicePixelRatio(cRetinaFactor());
-		}
-	}
-
-	void createPaletteCorners() {
-		prepareCorners(MenuCorners, st::buttonRadius, st::menuBg);
-		prepareCorners(BoxCorners, st::boxRadius, st::boxBg);
-		prepareCorners(BotKbOverCorners, st::dateRadius, st::msgBotKbOverBgAdd);
-		prepareCorners(StickerCorners, st::dateRadius, st::msgServiceBg);
-		prepareCorners(StickerSelectedCorners, st::dateRadius, st::msgServiceBgSelected);
-		prepareCorners(SelectedOverlaySmallCorners, st::buttonRadius, st::msgSelectOverlay);
-		prepareCorners(SelectedOverlayLargeCorners, st::historyMessageRadius, st::msgSelectOverlay);
-		prepareCorners(DateCorners, st::dateRadius, st::msgDateImgBg);
-		prepareCorners(DateSelectedCorners, st::dateRadius, st::msgDateImgBgSelected);
-		prepareCorners(OverviewVideoCorners, st::overviewVideoStatusRadius, st::msgDateImgBg);
-		prepareCorners(OverviewVideoSelectedCorners, st::overviewVideoStatusRadius, st::msgDateImgBgSelected);
-		prepareCorners(InShadowCorners, st::historyMessageRadius, st::msgInShadow);
-		prepareCorners(InSelectedShadowCorners, st::historyMessageRadius, st::msgInShadowSelected);
-		prepareCorners(ForwardCorners, st::historyMessageRadius, st::historyForwardChooseBg);
-		prepareCorners(MediaviewSaveCorners, st::mediaviewControllerRadius, st::mediaviewSaveMsgBg);
-		prepareCorners(EmojiHoverCorners, st::buttonRadius, st::emojiPanHover);
-		prepareCorners(StickerHoverCorners, st::buttonRadius, st::emojiPanHover);
-		prepareCorners(BotKeyboardCorners, st::buttonRadius, st::botKbBg);
-		prepareCorners(PhotoSelectOverlayCorners, st::buttonRadius, st::overviewPhotoSelectOverlay);
-
-		prepareCorners(Doc1Corners, st::buttonRadius, st::msgFile1Bg);
-		prepareCorners(Doc2Corners, st::buttonRadius, st::msgFile2Bg);
-		prepareCorners(Doc3Corners, st::buttonRadius, st::msgFile3Bg);
-		prepareCorners(Doc4Corners, st::buttonRadius, st::msgFile4Bg);
-
-		prepareCorners(MessageInCorners, st::historyMessageRadius, st::msgInBg, &st::msgInShadow);
-		prepareCorners(MessageInSelectedCorners, st::historyMessageRadius, st::msgInBgSelected, &st::msgInShadowSelected);
-		prepareCorners(MessageOutCorners, st::historyMessageRadius, st::msgOutBg, &st::msgOutShadow);
-		prepareCorners(MessageOutSelectedCorners, st::historyMessageRadius, st::msgOutBgSelected, &st::msgOutShadowSelected);
-
-		prepareCorners(SendFilesBoxAlbumGroupCorners, st::sendBoxAlbumGroupRadius, st::callFingerprintBg);
-	}
-
-	void createCorners() {
-		::corners.resize(RoundCornersCount);
-		createMaskCorners();
-		createPaletteCorners();
-	}
-
-	void clearCorners() {
-		::corners.clear();
-		::cornersMap.clear();
-	}
-
 	void initMedia() {
-		createCorners();
+		Ui::StartCachedCorners();
 
 		using Update = Window::Theme::BackgroundUpdate;
 		static auto subscription = Window::Theme::Background()->add_subscription([](const Update &update) {
 			if (update.paletteChanged()) {
-				createPaletteCorners();
-
-				if (const auto m = App::main()) { // multi good
-					m->updateScrollColors();
-				}
-				HistoryView::serviceColorsUpdated();
-			} else if (update.type == Update::Type::New) {
-				prepareCorners(StickerCorners, st::dateRadius, st::msgServiceBg);
-				prepareCorners(StickerSelectedCorners, st::dateRadius, st::msgServiceBgSelected);
-
 				if (const auto m = App::main()) { // multi good
 					m->updateScrollColors();
 				}
@@ -221,8 +112,7 @@ namespace App {
 	}
 
 	void deinitMedia() {
-		clearCorners();
-
+		Ui::FinishCachedCorners();
 		Data::clearGlobalStructures();
 	}
 
@@ -396,132 +286,4 @@ namespace App {
 		return QPixmap::fromImage(std::move(image), Qt::ColorOnly);
 	}
 
-	void rectWithCorners(Painter &p, QRect rect, const style::color &bg, RoundCorners index, RectParts corners) {
-		auto parts = RectPart::Top
-			| RectPart::NoTopBottom
-			| RectPart::Bottom
-			| corners;
-		roundRect(p, rect, bg, index, nullptr, parts);
-		if ((corners & RectPart::AllCorners) != RectPart::AllCorners) {
-			const auto size = ::corners[index].p[0].width() / cIntRetinaFactor();
-			if (!(corners & RectPart::TopLeft)) {
-				p.fillRect(rect.x(), rect.y(), size, size, bg);
-			}
-			if (!(corners & RectPart::TopRight)) {
-				p.fillRect(rect.x() + rect.width() - size, rect.y(), size, size, bg);
-			}
-			if (!(corners & RectPart::BottomLeft)) {
-				p.fillRect(rect.x(), rect.y() + rect.height() - size, size, size, bg);
-			}
-			if (!(corners & RectPart::BottomRight)) {
-				p.fillRect(rect.x() + rect.width() - size, rect.y() + rect.height() - size, size, size, bg);
-			}
-		}
-	}
-
-	void complexOverlayRect(Painter &p, QRect rect, ImageRoundRadius radius, RectParts corners) {
-		if (radius == ImageRoundRadius::Ellipse) {
-			PainterHighQualityEnabler hq(p);
-			p.setPen(Qt::NoPen);
-			p.setBrush(p.textPalette().selectOverlay);
-			p.drawEllipse(rect);
-		} else {
-			auto overlayCorners = (radius == ImageRoundRadius::Small)
-				? SelectedOverlaySmallCorners
-				: SelectedOverlayLargeCorners;
-			const auto bg = p.textPalette().selectOverlay;
-			rectWithCorners(p, rect, bg, overlayCorners, corners);
-		}
-	}
-
-	void complexLocationRect(Painter &p, QRect rect, ImageRoundRadius radius, RectParts corners) {
-		rectWithCorners(p, rect, st::msgInBg, MessageInCorners, corners);
-	}
-
-	void roundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, const CornersPixmaps &corner, const style::color *shadow, RectParts parts) {
-		auto cornerWidth = corner.p[0].width() / cIntRetinaFactor();
-		auto cornerHeight = corner.p[0].height() / cIntRetinaFactor();
-		if (w < 2 * cornerWidth || h < 2 * cornerHeight) return;
-		if (w > 2 * cornerWidth) {
-			if (parts & RectPart::Top) {
-				p.fillRect(x + cornerWidth, y, w - 2 * cornerWidth, cornerHeight, bg);
-			}
-			if (parts & RectPart::Bottom) {
-				p.fillRect(x + cornerWidth, y + h - cornerHeight, w - 2 * cornerWidth, cornerHeight, bg);
-				if (shadow) {
-					p.fillRect(x + cornerWidth, y + h, w - 2 * cornerWidth, st::msgShadow, *shadow);
-				}
-			}
-		}
-		if (h > 2 * cornerHeight) {
-			if ((parts & RectPart::NoTopBottom) == RectPart::NoTopBottom) {
-				p.fillRect(x, y + cornerHeight, w, h - 2 * cornerHeight, bg);
-			} else {
-				if (parts & RectPart::Left) {
-					p.fillRect(x, y + cornerHeight, cornerWidth, h - 2 * cornerHeight, bg);
-				}
-				if ((parts & RectPart::Center) && w > 2 * cornerWidth) {
-					p.fillRect(x + cornerWidth, y + cornerHeight, w - 2 * cornerWidth, h - 2 * cornerHeight, bg);
-				}
-				if (parts & RectPart::Right) {
-					p.fillRect(x + w - cornerWidth, y + cornerHeight, cornerWidth, h - 2 * cornerHeight, bg);
-				}
-			}
-		}
-		if (parts & RectPart::TopLeft) {
-			p.drawPixmap(x, y, corner.p[0]);
-		}
-		if (parts & RectPart::TopRight) {
-			p.drawPixmap(x + w - cornerWidth, y, corner.p[1]);
-		}
-		if (parts & RectPart::BottomLeft) {
-			p.drawPixmap(x, y + h - cornerHeight, corner.p[2]);
-		}
-		if (parts & RectPart::BottomRight) {
-			p.drawPixmap(x + w - cornerWidth, y + h - cornerHeight, corner.p[3]);
-		}
-	}
-
-	void roundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, RoundCorners index, const style::color *shadow, RectParts parts) {
-		roundRect(p, x, y, w, h, bg, ::corners[index], shadow, parts);
-	}
-
-	void roundShadow(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color shadow, RoundCorners index, RectParts parts) {
-		auto &corner = ::corners[index];
-		auto cornerWidth = corner.p[0].width() / cIntRetinaFactor();
-		auto cornerHeight = corner.p[0].height() / cIntRetinaFactor();
-		if (parts & RectPart::Bottom) {
-			p.fillRect(x + cornerWidth, y + h, w - 2 * cornerWidth, st::msgShadow, shadow);
-		}
-		if (parts & RectPart::BottomLeft) {
-			p.fillRect(x, y + h - cornerHeight, cornerWidth, st::msgShadow, shadow);
-			p.drawPixmap(x, y + h - cornerHeight + st::msgShadow, corner.p[2]);
-		}
-		if (parts & RectPart::BottomRight) {
-			p.fillRect(x + w - cornerWidth, y + h - cornerHeight, cornerWidth, st::msgShadow, shadow);
-			p.drawPixmap(x + w - cornerWidth, y + h - cornerHeight + st::msgShadow, corner.p[3]);
-		}
-	}
-
-	void roundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, ImageRoundRadius radius, RectParts parts) {
-		auto colorKey = ((uint32(bg->c.alpha()) & 0xFF) << 24) | ((uint32(bg->c.red()) & 0xFF) << 16) | ((uint32(bg->c.green()) & 0xFF) << 8) | ((uint32(bg->c.blue()) & 0xFF) << 24);
-		auto i = cornersMap.find(colorKey);
-		if (i == cornersMap.cend()) {
-			QImage images[4];
-			switch (radius) {
-			case ImageRoundRadius::Small: prepareCorners(SmallMaskCorners, st::buttonRadius, bg, nullptr, images); break;
-			case ImageRoundRadius::Large: prepareCorners(LargeMaskCorners, st::historyMessageRadius, bg, nullptr, images); break;
-			default: p.fillRect(x, y, w, h, bg); return;
-			}
-
-			CornersPixmaps pixmaps;
-			for (int j = 0; j < 4; ++j) {
-				pixmaps.p[j] = pixmapFromImageInPlace(std::move(images[j]));
-				pixmaps.p[j].setDevicePixelRatio(cRetinaFactor());
-			}
-			i = cornersMap.insert(colorKey, pixmaps);
-		}
-		roundRect(p, x, y, w, h, bg, i.value(), nullptr, parts);
-	}
-
 }
diff --git a/Telegram/SourceFiles/app.h b/Telegram/SourceFiles/app.h
index fc7c3c6a8..5d12e4665 100644
--- a/Telegram/SourceFiles/app.h
+++ b/Telegram/SourceFiles/app.h
@@ -8,54 +8,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "data/data_types.h"
-#include "ui/rect_part.h"
-
-enum class ImageRoundRadius;
 
 namespace HistoryView {
 class Element;
 } // namespace HistoryView
 
-enum RoundCorners : int {
-	SmallMaskCorners = 0x00, // for images
-	LargeMaskCorners,
-
-	BoxCorners,
-	MenuCorners,
-	BotKbOverCorners,
-	StickerCorners,
-	StickerSelectedCorners,
-	SelectedOverlaySmallCorners,
-	SelectedOverlayLargeCorners,
-	DateCorners,
-	DateSelectedCorners,
-	OverviewVideoCorners,
-	OverviewVideoSelectedCorners,
-	ForwardCorners,
-	MediaviewSaveCorners,
-	EmojiHoverCorners,
-	StickerHoverCorners,
-	BotKeyboardCorners,
-	PhotoSelectOverlayCorners,
-
-	Doc1Corners,
-	Doc2Corners,
-	Doc3Corners,
-	Doc4Corners,
-
-	InShadowCorners, // for photos without bg
-	InSelectedShadowCorners,
-
-	MessageInCorners, // with shadow
-	MessageInSelectedCorners,
-	MessageOutCorners,
-	MessageOutSelectedCorners,
-
-	SendFilesBoxAlbumGroupCorners,
-
-	RoundCornersCount
-};
-
 namespace App {
 	QString formatPhone(QString phone);
 
@@ -90,20 +47,4 @@ namespace App {
 	QImage readImage(const QString &file, QByteArray *format = nullptr, bool opaque = true, bool *animated = nullptr, QByteArray *content = 0);
 	QPixmap pixmapFromImageInPlace(QImage &&image);
 
-	void complexOverlayRect(Painter &p, QRect rect, ImageRoundRadius radius, RectParts corners);
-	void complexLocationRect(Painter &p, QRect rect, ImageRoundRadius radius, RectParts corners);
-
-	void roundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, RoundCorners index, const style::color *shadow = nullptr, RectParts parts = RectPart::Full);
-	inline void roundRect(Painter &p, const QRect &rect, style::color bg, RoundCorners index, const style::color *shadow = nullptr, RectParts parts = RectPart::Full) {
-		return roundRect(p, rect.x(), rect.y(), rect.width(), rect.height(), bg, index, shadow, parts);
-	}
-	void roundShadow(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color shadow, RoundCorners index, RectParts parts = RectPart::Full);
-	inline void roundShadow(Painter &p, const QRect &rect, style::color shadow, RoundCorners index, RectParts parts = RectPart::Full) {
-		return roundShadow(p, rect.x(), rect.y(), rect.width(), rect.height(), shadow, index, parts);
-	}
-	void roundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, ImageRoundRadius radius, RectParts parts = RectPart::Full);
-	inline void roundRect(Painter &p, const QRect &rect, style::color bg, ImageRoundRadius radius, RectParts parts = RectPart::Full) {
-		return roundRect(p, rect.x(), rect.y(), rect.width(), rect.height(), bg, radius, parts);
-	}
-
 };
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 371d966f5..e3f6e530f 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -50,11 +50,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_options.h"
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/controls/emoji_button.h"
+#include "ui/cached_round_corners.h"
 #include "window/window_session_controller.h"
 #include "confirm_box.h"
 #include "apiwrap.h"
+#include "app.h" // App::pixmapFromImageInPlace.
 #include "facades.h" // App::LambdaDelayed.
-#include "app.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
@@ -484,7 +485,7 @@ void EditCaptionBox::updateEditPreview() {
 	const auto fileinfo = QFileInfo(file->path);
 	const auto filename = fileinfo.fileName();
 
-	_isImage = fileIsImage(filename, file->mime);
+	_isImage = Core::FileIsImage(filename, file->mime);
 	_isAudio = false;
 	_animated = false;
 	_photo = false;
@@ -516,7 +517,7 @@ void EditCaptionBox::updateEditPreview() {
 	if (shouldAsDoc) {
 		auto nameString = filename;
 		if (const auto song = std::get_if<Info::Song>(fileMedia)) {
-			nameString = DocumentData::ComposeNameString(
+			nameString = Ui::ComposeNameString(
 				filename,
 				song->title,
 				song->performer);
@@ -623,9 +624,10 @@ void EditCaptionBox::createEditMediaButton() {
 	_editMedia.create(this, st::editMediaButton);
 	updateEditMediaButton();
 	_editMedia->setClickedCallback(
-		App::LambdaDelayed(st::historyAttach.ripple.hideDuration, this, [=] {
-		buttonCallback();
-	}));
+		App::LambdaDelayed(
+			st::historyAttach.ripple.hideDuration,
+			this,
+			buttonCallback));
 }
 
 void EditCaptionBox::prepare() {
@@ -894,7 +896,7 @@ void EditCaptionBox::paintEvent(QPaintEvent *e) {
 		const auto namewidth = w - nameleft - editButton;
 		const auto x = (width() - w) / 2, y = st::boxPhotoPadding.top();
 
-//		App::roundRect(p, x, y, w, h, st::msgInBg, MessageInCorners, &st::msgInShadow);
+//		Ui::FillRoundCorner(p, x, y, w, h, st::msgInBg, Ui::MessageInCorners, &st::msgInShadow);
 
 		if (_thumbw) {
 			QRect rthumb(style::rtlrect(x + 0, y + 0, st::msgFileThumbSize, st::msgFileThumbSize, width()));
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index b927cc1f4..f6ac6012b 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -32,6 +32,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/scroll_area.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/chat/attach/attach_prepare.h"
+#include "ui/chat/attach/attach_album_preview.h"
+#include "ui/chat/attach/attach_single_file_preview.h"
 #include "ui/text/format_values.h"
 #include "ui/grouped_layout.h"
 #include "ui/text/text_options.h"
@@ -55,14 +57,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace {
 
 constexpr auto kMinPreviewWidth = 20;
-constexpr auto kShrinkDuration = crl::time(150);
-constexpr auto kDragDuration = crl::time(200);
 
-enum class ButtonType {
-	Edit,
-	Delete,
-	None,
-};
+using Ui::SendFilesWay;
 
 inline bool CanAddUrls(const QList<QUrl> &urls) {
 	return !urls.isEmpty() && ranges::all_of(urls, &QUrl::isLocalFile);
@@ -78,58 +74,6 @@ inline bool IsSingleItem(const Ui::PreparedList &list) {
 	return list.files.size() == 1;
 }
 
-QRect PaintAlbumThumbButtons(
-	Painter &p,
-	QPoint point,
-	int outerWidth,
-	float64 shrinkProgress) {
-
-	const auto skipInternal = st::sendBoxAlbumGroupEditInternalSkip;
-	const auto size = st::sendBoxAlbumGroupHeight;
-	const auto skipRight = st::sendBoxAlbumGroupSkipRight;
-	const auto skipTop = st::sendBoxAlbumGroupSkipTop;
-	const auto groupWidth = size * 2 + skipInternal;
-
-	// If the width is tiny, it would be better to not display the buttons.
-	if (groupWidth > outerWidth) {
-		return QRect();
-	}
-
-	// If the width is too small,
-	// it would be better to display the buttons in the center.
-	const auto groupX = point.x() + ((groupWidth + skipRight * 2 > outerWidth)
-		? (outerWidth - groupWidth) / 2
-		: outerWidth - skipRight - groupWidth);
-	const auto groupY = point.y() + skipTop;
-	const auto deleteLeft = skipInternal + size;
-
-	p.setOpacity(1.0 - shrinkProgress);
-
-	QRect groupRect(groupX, groupY, groupWidth, size);
-	App::roundRect(
-		p,
-		groupRect,
-		st::callFingerprintBg,
-		SendFilesBoxAlbumGroupCorners);
-
-	const auto editP = st::sendBoxAlbumGroupEditButtonIconPosition;
-	const auto deleteP = st::sendBoxAlbumGroupDeleteButtonIconPosition;
-
-	st::sendBoxAlbumGroupEditButtonIcon.paintInCenter(
-		p,
-		QRect(groupX + editP.x(), groupY + editP.y(), size, size));
-	st::sendBoxAlbumGroupDeleteButtonIcon.paintInCenter(
-		p,
-		QRect(
-			groupX + deleteLeft + deleteP.x(),
-			groupY + deleteP.y(),
-			size,
-			size));
-	p.setOpacity(1);
-
-	return groupRect;
-}
-
 void FileDialogCallback(
 	FileDialog::OpenResult &&result,
 	bool isAlbum,
@@ -195,571 +139,6 @@ private:
 
 };
 
-class SingleFilePreview : public Ui::RpWidget {
-public:
-	SingleFilePreview(
-		QWidget *parent,
-		const Ui::PreparedFile &file);
-
-	rpl::producer<int> desiredHeightValue() const override;
-
-protected:
-	void paintEvent(QPaintEvent *e) override;
-
-private:
-	void preparePreview(const Ui::PreparedFile &file);
-	void prepareThumb(const QImage &preview);
-
-	QPixmap _fileThumb;
-	Ui::Text::String _nameText;
-	bool _fileIsAudio = false;
-	bool _fileIsImage = false;
-	QString _statusText;
-	int _statusWidth = 0;
-
-};
-
-class AlbumThumb {
-public:
-	AlbumThumb(
-		const Ui::PreparedFile &file,
-		const Ui::GroupMediaLayout &layout,
-		QWidget *parent,
-		Fn<void()> editCallback,
-		Fn<void()> deleteCallback);
-
-	void moveToLayout(const Ui::GroupMediaLayout &layout);
-	void animateLayoutToInitial();
-	void resetLayoutAnimation();
-
-	int photoHeight() const;
-
-	void paintInAlbum(
-		Painter &p,
-		int left,
-		int top,
-		float64 shrinkProgress,
-		float64 moveProgress);
-	void paintPhoto(Painter &p, int left, int top, int outerWidth);
-	void paintFile(Painter &p, int left, int top, int outerWidth);
-
-	bool containsPoint(QPoint position) const;
-	bool buttonsContainPoint(QPoint position) const;
-	ButtonType buttonTypeFromPoint(QPoint position) const;
-	int distanceTo(QPoint position) const;
-	bool isPointAfter(QPoint position) const;
-	void moveInAlbum(QPoint to);
-	QPoint center() const;
-	void suggestMove(float64 delta, Fn<void()> callback);
-	void finishAnimations();
-
-	void updateFileRow(int row);
-
-private:
-	QRect countRealGeometry() const;
-	QRect countCurrentGeometry(float64 progress) const;
-	void prepareCache(QSize size, int shrink);
-	void drawSimpleFrame(Painter &p, QRect to, QSize size) const;
-
-	Ui::GroupMediaLayout _layout;
-	std::optional<QRect> _animateFromGeometry;
-	const QImage _fullPreview;
-	const int _shrinkSize = 0;
-	QPixmap _albumImage;
-	QImage _albumCache;
-	QPoint _albumPosition;
-	RectParts _albumCorners = RectPart::None;
-	QPixmap _photo;
-	QPixmap _fileThumb;
-	QString _name;
-	QString _status;
-	int _nameWidth = 0;
-	int _statusWidth = 0;
-	bool _isVideo = false;
-	float64 _suggestedMove = 0.;
-	Ui::Animations::Simple _suggestedMoveAnimation;
-	int _lastShrinkValue = 0;
-
-	QRect _lastRectOfButtons;
-
-	object_ptr<Ui::IconButton> _editMedia = nullptr;
-	object_ptr<Ui::IconButton> _deleteMedia = nullptr;
-
-};
-
-AlbumThumb::AlbumThumb(
-	const Ui::PreparedFile &file,
-	const Ui::GroupMediaLayout &layout,
-	QWidget *parent,
-	Fn<void()> editCallback,
-	Fn<void()> deleteCallback)
-: _layout(layout)
-, _fullPreview(file.preview)
-, _shrinkSize(int(std::ceil(st::historyMessageRadius / 1.4)))
-, _isVideo(file.type == Ui::PreparedFile::AlbumType::Video) {
-	Expects(!_fullPreview.isNull());
-
-	moveToLayout(layout);
-
-	using Option = Images::Option;
-	const auto previewWidth = _fullPreview.width();
-	const auto previewHeight = _fullPreview.height();
-	const auto imageWidth = std::max(
-		previewWidth / cIntRetinaFactor(),
-		st::minPhotoSize);
-	const auto imageHeight = std::max(
-		previewHeight / cIntRetinaFactor(),
-		st::minPhotoSize);
-	_photo = App::pixmapFromImageInPlace(Images::prepare(
-		_fullPreview,
-		previewWidth,
-		previewHeight,
-		Option::RoundedLarge | Option::RoundedAll,
-		imageWidth,
-		imageHeight));
-
-	const auto idealSize = st::sendMediaFileThumbSize * cIntRetinaFactor();
-	const auto fileThumbSize = (previewWidth > previewHeight)
-		? QSize(previewWidth * idealSize / previewHeight, idealSize)
-		: QSize(idealSize, previewHeight * idealSize / previewWidth);
-	_fileThumb = App::pixmapFromImageInPlace(Images::prepare(
-		_fullPreview,
-		fileThumbSize.width(),
-		fileThumbSize.height(),
-		Option::RoundedSmall | Option::RoundedAll,
-		st::sendMediaFileThumbSize,
-		st::sendMediaFileThumbSize
-	));
-
-	const auto availableFileWidth = st::sendMediaPreviewSize
-		- st::sendMediaFileThumbSkip
-		- st::sendMediaFileThumbSize
-		// Right buttons.
-		- st::sendBoxAlbumGroupButtonFile.width * 2
-		- st::sendBoxAlbumGroupEditInternalSkip * 2
-		- st::sendBoxAlbumGroupSkipRight;
-	const auto filepath = file.path;
-	if (filepath.isEmpty()) {
-		_name = filedialogDefaultName(
-			qsl("image"),
-			qsl(".png"),
-			QString(),
-			true);
-		_status = qsl("%1x%2").arg(
-			_fullPreview.width()
-		).arg(
-			_fullPreview.height()
-		);
-	} else {
-		auto fileinfo = QFileInfo(filepath);
-		_name = fileinfo.fileName();
-		_status = Ui::FormatSizeText(fileinfo.size());
-	}
-	_nameWidth = st::semiboldFont->width(_name);
-	if (_nameWidth > availableFileWidth) {
-		_name = st::semiboldFont->elided(
-			_name,
-			availableFileWidth,
-			Qt::ElideMiddle);
-		_nameWidth = st::semiboldFont->width(_name);
-	}
-	_statusWidth = st::normalFont->width(_status);
-
-	_editMedia.create(parent, st::sendBoxAlbumGroupButtonFile);
-	_deleteMedia.create(parent, st::sendBoxAlbumGroupButtonFile);
-
-	const auto duration = st::historyAttach.ripple.hideDuration;
-	_editMedia->setClickedCallback(App::LambdaDelayed(
-		duration,
-		parent,
-		std::move(editCallback)));
-	_deleteMedia->setClickedCallback(App::LambdaDelayed(
-		duration,
-		parent,
-		std::move(deleteCallback)));
-
-	_editMedia->setIconOverride(&st::editMediaButtonIconFile);
-	_deleteMedia->setIconOverride(&st::sendBoxAlbumGroupDeleteButtonIconFile);
-
-	updateFileRow(-1);
-}
-
-void AlbumThumb::updateFileRow(int row) {
-	if (row < 0) {
-		_editMedia->hide();
-		_deleteMedia->hide();
-		return;
-	}
-	_editMedia->show();
-	_deleteMedia->show();
-
-	const auto fileHeight = st::sendMediaFileThumbSize
-		+ st::sendMediaFileThumbSkip;
-
-	const auto top = row * fileHeight + st::sendBoxAlbumGroupSkipTop;
-	const auto size = st::editMediaButtonSize;
-
-	auto right = st::sendBoxAlbumGroupSkipRight + size;
-	_deleteMedia->moveToRight(right, top);
-	right += st::sendBoxAlbumGroupEditInternalSkip + size;
-	_editMedia->moveToRight(right, top);
-}
-
-void AlbumThumb::resetLayoutAnimation() {
-	_animateFromGeometry = std::nullopt;
-}
-
-void AlbumThumb::animateLayoutToInitial() {
-	_animateFromGeometry = countRealGeometry();
-	_suggestedMove = 0.;
-	_albumPosition = QPoint(0, 0);
-}
-
-void AlbumThumb::moveToLayout(const Ui::GroupMediaLayout &layout) {
-	animateLayoutToInitial();
-	_layout = layout;
-
-	const auto width = _layout.geometry.width();
-	const auto height = _layout.geometry.height();
-	_albumCorners = Ui::GetCornersFromSides(_layout.sides);
-	using Option = Images::Option;
-	const auto options = Option::Smooth
-		| Option::RoundedLarge
-		| ((_albumCorners & RectPart::TopLeft)
-			? Option::RoundedTopLeft
-			: Option::None)
-		| ((_albumCorners & RectPart::TopRight)
-			? Option::RoundedTopRight
-			: Option::None)
-		| ((_albumCorners & RectPart::BottomLeft)
-			? Option::RoundedBottomLeft
-			: Option::None)
-		| ((_albumCorners & RectPart::BottomRight)
-			? Option::RoundedBottomRight
-			: Option::None);
-	const auto pixSize = Ui::GetImageScaleSizeForGeometry(
-		{ _fullPreview.width(), _fullPreview.height() },
-		{ width, height });
-	const auto pixWidth = pixSize.width() * cIntRetinaFactor();
-	const auto pixHeight = pixSize.height() * cIntRetinaFactor();
-
-	_albumImage = App::pixmapFromImageInPlace(Images::prepare(
-		_fullPreview,
-		pixWidth,
-		pixHeight,
-		options,
-		width,
-		height));
-}
-
-int AlbumThumb::photoHeight() const {
-	return _photo.height() / cIntRetinaFactor();
-}
-
-void AlbumThumb::paintInAlbum(
-		Painter &p,
-		int left,
-		int top,
-		float64 shrinkProgress,
-		float64 moveProgress) {
-	const auto shrink = anim::interpolate(0, _shrinkSize, shrinkProgress);
-	_lastShrinkValue = shrink;
-	const auto geometry = countCurrentGeometry(moveProgress);
-	const auto x = left + geometry.x();
-	const auto y = top + geometry.y();
-	if (shrink > 0 || moveProgress < 1.) {
-		const auto size = geometry.size();
-		if (shrinkProgress < 1 && _albumCorners != RectPart::None) {
-			prepareCache(size, shrink);
-			p.drawImage(x, y, _albumCache);
-		} else {
-			const auto to = QRect({ x, y }, size).marginsRemoved(
-				{ shrink, shrink, shrink, shrink }
-			);
-			drawSimpleFrame(p, to, size);
-		}
-	} else {
-		p.drawPixmap(x, y, _albumImage);
-	}
-	if (_isVideo) {
-		const auto inner = QRect(
-			x + (geometry.width() - st::msgFileSize) / 2,
-			y + (geometry.height() - st::msgFileSize) / 2,
-			st::msgFileSize,
-			st::msgFileSize);
-		{
-			PainterHighQualityEnabler hq(p);
-			p.setPen(Qt::NoPen);
-			p.setBrush(st::msgDateImgBg);
-			p.drawEllipse(inner);
-		}
-		st::historyFileThumbPlay.paintInCenter(p, inner);
-	}
-
-	_lastRectOfButtons = PaintAlbumThumbButtons(
-		p,
-		{ x, y },
-		geometry.width(),
-		shrinkProgress);
-}
-
-void AlbumThumb::prepareCache(QSize size, int shrink) {
-	const auto width = std::max(
-		_layout.geometry.width(),
-		_animateFromGeometry ? _animateFromGeometry->width() : 0);
-	const auto height = std::max(
-		_layout.geometry.height(),
-		_animateFromGeometry ? _animateFromGeometry->height() : 0);
-	const auto cacheSize = QSize(width, height) * cIntRetinaFactor();
-
-	if (_albumCache.width() < cacheSize.width()
-		|| _albumCache.height() < cacheSize.height()) {
-		_albumCache = QImage(cacheSize, QImage::Format_ARGB32_Premultiplied);
-	}
-	_albumCache.fill(Qt::transparent);
-	{
-		Painter p(&_albumCache);
-		const auto to = QRect(QPoint(), size).marginsRemoved(
-			{ shrink, shrink, shrink, shrink }
-		);
-		drawSimpleFrame(p, to, size);
-	}
-	Images::prepareRound(
-		_albumCache,
-		ImageRoundRadius::Large,
-		_albumCorners,
-		QRect(QPoint(), size * cIntRetinaFactor()));
-	_albumCache.setDevicePixelRatio(cRetinaFactor());
-}
-
-void AlbumThumb::drawSimpleFrame(Painter &p, QRect to, QSize size) const {
-	const auto fullWidth = _fullPreview.width();
-	const auto fullHeight = _fullPreview.height();
-	const auto previewSize = Ui::GetImageScaleSizeForGeometry(
-		{ fullWidth, fullHeight },
-		{ size.width(), size.height() });
-	const auto previewWidth = previewSize.width() * cIntRetinaFactor();
-	const auto previewHeight = previewSize.height() * cIntRetinaFactor();
-	const auto width = size.width() * cIntRetinaFactor();
-	const auto height = size.height() * cIntRetinaFactor();
-	const auto scaleWidth = to.width() / float64(width);
-	const auto scaleHeight = to.height() / float64(height);
-	const auto Round = [](float64 value) {
-		return int(std::round(value));
-	};
-	const auto [from, fillBlack] = [&] {
-		if (previewWidth < width && previewHeight < height) {
-			const auto toWidth = Round(previewWidth * scaleWidth);
-			const auto toHeight = Round(previewHeight * scaleHeight);
-			return std::make_pair(
-				QRect(0, 0, fullWidth, fullHeight),
-				QMargins(
-					(to.width() - toWidth) / 2,
-					(to.height() - toHeight) / 2,
-					to.width() - toWidth - (to.width() - toWidth) / 2,
-					to.height() - toHeight - (to.height() - toHeight) / 2));
-		} else if (previewWidth * height > previewHeight * width) {
-			if (previewHeight >= height) {
-				const auto takeWidth = previewWidth * height / previewHeight;
-				const auto useWidth = fullWidth * width / takeWidth;
-				return std::make_pair(
-					QRect(
-						(fullWidth - useWidth) / 2,
-						0,
-						useWidth,
-						fullHeight),
-					QMargins(0, 0, 0, 0));
-			} else {
-				const auto takeWidth = previewWidth;
-				const auto useWidth = fullWidth * width / takeWidth;
-				const auto toHeight = Round(previewHeight * scaleHeight);
-				const auto toSkip = (to.height() - toHeight) / 2;
-				return std::make_pair(
-					QRect(
-						(fullWidth - useWidth) / 2,
-						0,
-						useWidth,
-						fullHeight),
-					QMargins(
-						0,
-						toSkip,
-						0,
-						to.height() - toHeight - toSkip));
-			}
-		} else {
-			if (previewWidth >= width) {
-				const auto takeHeight = previewHeight * width / previewWidth;
-				const auto useHeight = fullHeight * height / takeHeight;
-				return std::make_pair(
-					QRect(
-						0,
-						(fullHeight - useHeight) / 2,
-						fullWidth,
-						useHeight),
-					QMargins(0, 0, 0, 0));
-			} else {
-				const auto takeHeight = previewHeight;
-				const auto useHeight = fullHeight * height / takeHeight;
-				const auto toWidth = Round(previewWidth * scaleWidth);
-				const auto toSkip = (to.width() - toWidth) / 2;
-				return std::make_pair(
-					QRect(
-						0,
-						(fullHeight - useHeight) / 2,
-						fullWidth,
-						useHeight),
-					QMargins(
-						toSkip,
-						0,
-						to.width() - toWidth - toSkip,
-						0));
-			}
-		}
-	}();
-
-	p.drawImage(to.marginsRemoved(fillBlack), _fullPreview, from);
-	if (fillBlack.top() > 0) {
-		p.fillRect(to.x(), to.y(), to.width(), fillBlack.top(), st::imageBg);
-	}
-	if (fillBlack.bottom() > 0) {
-		p.fillRect(
-			to.x(),
-			to.y() + to.height() - fillBlack.bottom(),
-			to.width(),
-			fillBlack.bottom(),
-			st::imageBg);
-	}
-	if (fillBlack.left() > 0) {
-		p.fillRect(
-			to.x(),
-			to.y() + fillBlack.top(),
-			fillBlack.left(),
-			to.height() - fillBlack.top() - fillBlack.bottom(),
-			st::imageBg);
-	}
-	if (fillBlack.right() > 0) {
-		p.fillRect(
-			to.x() + to.width() - fillBlack.right(),
-			to.y() + fillBlack.top(),
-			fillBlack.right(),
-			to.height() - fillBlack.top() - fillBlack.bottom(),
-			st::imageBg);
-	}
-}
-
-void AlbumThumb::paintPhoto(Painter &p, int left, int top, int outerWidth) {
-	const auto width = _photo.width() / cIntRetinaFactor();
-	p.drawPixmapLeft(
-		left + (st::sendMediaPreviewSize - width) / 2,
-		top,
-		outerWidth,
-		_photo);
-
-	_lastRectOfButtons = PaintAlbumThumbButtons(
-		p,
-		{ left, top },
-		st::sendMediaPreviewSize,
-		0);
-}
-
-void AlbumThumb::paintFile(Painter &p, int left, int top, int outerWidth) {
-	const auto textLeft = left
-		+ st::sendMediaFileThumbSize
-		+ st::sendMediaFileThumbSkip;
-
-	p.drawPixmap(left, top, _fileThumb);
-	p.setFont(st::semiboldFont);
-	p.setPen(st::historyFileNameInFg);
-	p.drawTextLeft(
-		textLeft,
-		top + st::sendMediaFileNameTop,
-		outerWidth,
-		_name,
-		_nameWidth);
-	p.setFont(st::normalFont);
-	p.setPen(st::mediaInFg);
-	p.drawTextLeft(
-		textLeft,
-		top + st::sendMediaFileStatusTop,
-		outerWidth,
-		_status,
-		_statusWidth);
-}
-
-bool AlbumThumb::containsPoint(QPoint position) const {
-	return _layout.geometry.contains(position);
-}
-
-bool AlbumThumb::buttonsContainPoint(QPoint position) const {
-	return _lastRectOfButtons.contains(position);
-}
-
-ButtonType AlbumThumb::buttonTypeFromPoint(QPoint position) const {
-	if (!buttonsContainPoint(position)) {
-		return ButtonType::None;
-	}
-	return (position.x() < _lastRectOfButtons.center().x())
-		? ButtonType::Edit
-		: ButtonType::Delete;
-}
-
-int AlbumThumb::distanceTo(QPoint position) const {
-	const auto delta = (_layout.geometry.center() - position);
-	return QPoint::dotProduct(delta, delta);
-}
-
-bool AlbumThumb::isPointAfter(QPoint position) const {
-	return position.x() > _layout.geometry.center().x();
-}
-
-void AlbumThumb::moveInAlbum(QPoint to) {
-	_albumPosition = to;
-}
-
-QPoint AlbumThumb::center() const {
-	auto realGeometry = _layout.geometry;
-	realGeometry.moveTopLeft(realGeometry.topLeft() + _albumPosition);
-	return realGeometry.center();
-}
-
-void AlbumThumb::suggestMove(float64 delta, Fn<void()> callback) {
-	if (_suggestedMove != delta) {
-		_suggestedMoveAnimation.start(
-			std::move(callback),
-			_suggestedMove,
-			delta,
-			kShrinkDuration);
-		_suggestedMove = delta;
-	}
-}
-
-QRect AlbumThumb::countRealGeometry() const {
-	const auto addLeft = int(std::round(
-		_suggestedMoveAnimation.value(_suggestedMove) * _lastShrinkValue));
-	const auto current = _layout.geometry;
-	const auto realTopLeft = current.topLeft()
-		+ _albumPosition
-		+ QPoint(addLeft, 0);
-	return { realTopLeft, current.size() };
-}
-
-QRect AlbumThumb::countCurrentGeometry(float64 progress) const {
-	const auto now = countRealGeometry();
-	if (_animateFromGeometry && progress < 1.) {
-		return {
-			anim::interpolate(_animateFromGeometry->x(), now.x(), progress),
-			anim::interpolate(_animateFromGeometry->y(), now.y(), progress),
-			anim::interpolate(_animateFromGeometry->width(), now.width(), progress),
-			anim::interpolate(_animateFromGeometry->height(), now.height(), progress)
-		};
-	}
-	return now;
-}
-
-void AlbumThumb::finishAnimations() {
-	_suggestedMoveAnimation.stop();
-}
-
 SingleMediaPreview *SingleMediaPreview::Create(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
@@ -969,155 +348,6 @@ rpl::producer<int> SingleMediaPreview::desiredHeightValue() const {
 	return rpl::single(st::boxPhotoPadding.top() + _previewHeight);
 }
 
-SingleFilePreview::SingleFilePreview(
-	QWidget *parent,
-	const Ui::PreparedFile &file)
-: RpWidget(parent) {
-	preparePreview(file);
-}
-
-void SingleFilePreview::prepareThumb(const QImage &preview) {
-	if (preview.isNull()) {
-		return;
-	}
-
-	auto originalWidth = preview.width();
-	auto originalHeight = preview.height();
-	auto thumbWidth = st::msgFileThumbSize;
-	if (originalWidth > originalHeight) {
-		thumbWidth = (originalWidth * st::msgFileThumbSize)
-			/ originalHeight;
-	}
-	auto options = Images::Option::Smooth
-		| Images::Option::RoundedSmall
-		| Images::Option::RoundedTopLeft
-		| Images::Option::RoundedTopRight
-		| Images::Option::RoundedBottomLeft
-		| Images::Option::RoundedBottomRight;
-	_fileThumb = App::pixmapFromImageInPlace(Images::prepare(
-		preview,
-		thumbWidth * cIntRetinaFactor(),
-		0,
-		options,
-		st::msgFileThumbSize,
-		st::msgFileThumbSize));
-}
-
-void SingleFilePreview::preparePreview(const Ui::PreparedFile &file) {
-	auto preview = QImage();
-	if (const auto image = std::get_if<Ui::PreparedFileInformation::Image>(
-		&file.information->media)) {
-		preview = image->data;
-	} else if (const auto video = std::get_if<Ui::PreparedFileInformation::Video>(
-		&file.information->media)) {
-		preview = video->thumbnail;
-	}
-	prepareThumb(preview);
-	const auto filepath = file.path;
-	if (filepath.isEmpty()) {
-		auto filename = filedialogDefaultName(
-			qsl("image"),
-			qsl(".png"),
-			QString(),
-			true);
-		_nameText.setText(
-			st::semiboldTextStyle,
-			filename,
-			Ui::NameTextOptions());
-		_statusText = qsl("%1x%2").arg(preview.width()).arg(preview.height());
-		_statusWidth = qMax(_nameText.maxWidth(), st::normalFont->width(_statusText));
-		_fileIsImage = true;
-	} else {
-		auto fileinfo = QFileInfo(filepath);
-		auto filename = fileinfo.fileName();
-		_fileIsImage = fileIsImage(filename, Core::MimeTypeForFile(fileinfo).name());
-
-		auto songTitle = QString();
-		auto songPerformer = QString();
-		if (file.information) {
-			if (const auto song = std::get_if<Ui::PreparedFileInformation::Song>(
-					&file.information->media)) {
-				songTitle = song->title;
-				songPerformer = song->performer;
-				_fileIsAudio = true;
-			}
-		}
-
-		const auto nameString = DocumentData::ComposeNameString(
-			filename,
-			songTitle,
-			songPerformer);
-		_nameText.setText(
-			st::semiboldTextStyle,
-			nameString,
-			Ui::NameTextOptions());
-		_statusText = Ui::FormatSizeText(fileinfo.size());
-		_statusWidth = qMax(
-			_nameText.maxWidth(),
-			st::normalFont->width(_statusText));
-	}
-}
-
-void SingleFilePreview::paintEvent(QPaintEvent *e) {
-	Painter p(this);
-
-	auto w = width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right();
-	auto h = _fileThumb.isNull() ? (st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom()) : (st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom());
-	auto nameleft = 0, nametop = 0, nameright = 0, statustop = 0, linktop = 0;
-	if (_fileThumb.isNull()) {
-		nameleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
-		nametop = st::msgFileNameTop;
-		nameright = st::msgFilePadding.left();
-		statustop = st::msgFileStatusTop;
-	} else {
-		nameleft = st::msgFileThumbPadding.left() + st::msgFileThumbSize + st::msgFileThumbPadding.right();
-		nametop = st::msgFileThumbNameTop;
-		nameright = st::msgFileThumbPadding.left();
-		statustop = st::msgFileThumbStatusTop;
-		linktop = st::msgFileThumbLinkTop;
-	}
-	auto namewidth = w - nameleft - (_fileThumb.isNull() ? st::msgFilePadding.left() : st::msgFileThumbPadding.left());
-	int32 x = (width() - w) / 2, y = st::boxPhotoPadding.top();
-
-	App::roundRect(p, x, y, w, h, st::msgOutBg, MessageOutCorners, &st::msgOutShadow);
-
-	if (_fileThumb.isNull()) {
-		QRect inner(style::rtlrect(x + st::msgFilePadding.left(), y + st::msgFilePadding.top(), st::msgFileSize, st::msgFileSize, width()));
-		p.setPen(Qt::NoPen);
-		p.setBrush(st::msgFileOutBg);
-
-		{
-			PainterHighQualityEnabler hq(p);
-			p.drawEllipse(inner);
-		}
-
-		auto &icon = _fileIsAudio
-			? st::historyFileOutPlay
-			: _fileIsImage
-			? st::historyFileOutImage
-			: st::historyFileOutDocument;
-		icon.paintInCenter(p, inner);
-	} else {
-		QRect rthumb(style::rtlrect(x + st::msgFileThumbPadding.left(), y + st::msgFileThumbPadding.top(), st::msgFileThumbSize, st::msgFileThumbSize, width()));
-		p.drawPixmap(rthumb.topLeft(), _fileThumb);
-	}
-	p.setFont(st::semiboldFont);
-	p.setPen(st::historyFileNameOutFg);
-	_nameText.drawLeftElided(p, x + nameleft, y + nametop, namewidth, width());
-
-	auto &status = st::mediaOutFg;
-	p.setFont(st::normalFont);
-	p.setPen(status);
-	p.drawTextLeft(x + nameleft, y + statustop, width(), _statusText);
-}
-
-rpl::producer<int> SingleFilePreview::desiredHeightValue() const {
-	auto h = _fileThumb.isNull()
-		? (st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom())
-		: (st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom());
-	return rpl::single(st::boxPhotoPadding.top() + h + st::msgShadow);
-}
-
 rpl::producer<QString> FieldPlaceholder(
 		const Ui::PreparedList &list,
 		SendFilesWay way) {
@@ -1130,536 +360,6 @@ rpl::producer<QString> FieldPlaceholder(
 
 } // namespace
 
-class SendFilesBox::AlbumPreview : public Ui::RpWidget {
-public:
-	AlbumPreview(
-		QWidget *parent,
-		const Ui::PreparedList &list,
-		SendFilesWay way);
-
-	void setSendWay(SendFilesWay way);
-	std::vector<int> takeOrder();
-
-	auto thumbDeleted() {
-		return _thumbDeleted.events();
-	}
-
-	auto thumbChanged() {
-		return _thumbChanged.events();
-	}
-
-protected:
-	void paintEvent(QPaintEvent *e) override;
-	void mousePressEvent(QMouseEvent *e) override;
-	void mouseMoveEvent(QMouseEvent *e) override;
-	void mouseReleaseEvent(QMouseEvent *e) override;
-
-private:
-	int countLayoutHeight(
-		const std::vector<Ui::GroupMediaLayout> &layout) const;
-	std::vector<Ui::GroupMediaLayout> generateOrderedLayout() const;
-	std::vector<int> defaultOrder() const;
-	void prepareThumbs();
-	void updateSizeAnimated(const std::vector<Ui::GroupMediaLayout> &layout);
-	void updateSize();
-	void updateFileRows();
-
-	int thumbIndex(AlbumThumb *thumb);
-	AlbumThumb *thumbUnderCursor();
-	void deleteThumbByIndex(int index);
-	void changeThumbByIndex(int index);
-	void thumbButtonsCallback(
-		not_null<AlbumThumb*> thumb,
-		ButtonType type);
-
-	void paintAlbum(Painter &p) const;
-	void paintPhotos(Painter &p, QRect clip) const;
-	void paintFiles(Painter &p, QRect clip) const;
-
-	void applyCursor(style::cursor cursor);
-	int contentLeft() const;
-	int contentTop() const;
-	AlbumThumb *findThumb(QPoint position) const;
-	not_null<AlbumThumb*> findClosestThumb(QPoint position) const;
-	void updateSuggestedDrag(QPoint position);
-	int orderIndex(not_null<AlbumThumb*> thumb) const;
-	void cancelDrag();
-	void finishDrag();
-
-	const Ui::PreparedList &_list;
-	SendFilesWay _sendWay = SendFilesWay::Files;
-	style::cursor _cursor = style::cur_default;
-	std::vector<int> _order;
-	std::vector<std::unique_ptr<AlbumThumb>> _thumbs;
-	int _thumbsHeight = 0;
-	int _photosHeight = 0;
-	int _filesHeight = 0;
-
-	AlbumThumb *_draggedThumb = nullptr;
-	AlbumThumb *_suggestedThumb = nullptr;
-	AlbumThumb *_paintedAbove = nullptr;
-	QPoint _draggedStartPosition;
-
-	rpl::event_stream<int> _thumbDeleted;
-	rpl::event_stream<int> _thumbChanged;
-
-	mutable Ui::Animations::Simple _thumbsHeightAnimation;
-	mutable Ui::Animations::Simple _shrinkAnimation;
-	mutable Ui::Animations::Simple _finishDragAnimation;
-
-};
-
-SendFilesBox::AlbumPreview::AlbumPreview(
-	QWidget *parent,
-	const Ui::PreparedList &list,
-	SendFilesWay way)
-: RpWidget(parent)
-, _list(list)
-, _sendWay(way) {
-	setMouseTracking(true);
-	prepareThumbs();
-	updateSize();
-	updateFileRows();
-}
-
-void SendFilesBox::AlbumPreview::setSendWay(SendFilesWay way) {
-	if (_sendWay != way) {
-		cancelDrag();
-		_sendWay = way;
-	}
-	updateSize();
-	updateFileRows();
-	update();
-}
-
-void SendFilesBox::AlbumPreview::updateFileRows() {
-	Expects(_order.size() == _thumbs.size());
-	const auto isFile = (_sendWay == SendFilesWay::Files);
-	for (auto i = 0; i < _order.size(); i++) {
-		_thumbs[i]->updateFileRow(isFile ? _order[i] : -1);
-	}
-}
-
-std::vector<int> SendFilesBox::AlbumPreview::takeOrder() {
-	auto reordered = std::vector<std::unique_ptr<AlbumThumb>>();
-	reordered.reserve(_thumbs.size());
-	for (auto index : _order) {
-		reordered.push_back(std::move(_thumbs[index]));
-	}
-	_thumbs = std::move(reordered);
-	return std::exchange(_order, defaultOrder());
-}
-
-auto SendFilesBox::AlbumPreview::generateOrderedLayout() const
--> std::vector<Ui::GroupMediaLayout> {
-	auto sizes = ranges::view::all(
-		_order
-	) | ranges::view::transform([&](int index) {
-		return _list.files[index].shownDimensions;
-	}) | ranges::to_vector;
-
-	auto layout = Ui::LayoutMediaGroup(
-		sizes,
-		st::sendMediaPreviewSize,
-		st::historyGroupWidthMin / 2,
-		st::historyGroupSkip / 2);
-	Assert(layout.size() == _order.size());
-	return layout;
-}
-
-std::vector<int> SendFilesBox::AlbumPreview::defaultOrder() const {
-	const auto count = int(_list.files.size());
-	return ranges::view::ints(0, count) | ranges::to_vector;
-}
-
-void SendFilesBox::AlbumPreview::prepareThumbs() {
-	_order = defaultOrder();
-
-	const auto count = int(_list.files.size());
-	const auto layout = generateOrderedLayout();
-	_thumbs.reserve(count);
-	for (auto i = 0; i != count; ++i) {
-		_thumbs.push_back(std::make_unique<AlbumThumb>(
-			_list.files[i],
-			layout[i],
-			this,
-			[=] { changeThumbByIndex(thumbIndex(thumbUnderCursor())); },
-			[=] { deleteThumbByIndex(thumbIndex(thumbUnderCursor())); }));
-	}
-	_thumbsHeight = countLayoutHeight(layout);
-	_photosHeight = ranges::accumulate(ranges::view::all(
-		_thumbs
-	) | ranges::view::transform([](const auto &thumb) {
-		return thumb->photoHeight();
-	}), 0) + (count - 1) * st::sendMediaPreviewPhotoSkip;
-
-	_filesHeight = count * st::sendMediaFileThumbSize
-		+ (count - 1) * st::sendMediaFileThumbSkip;
-}
-
-int SendFilesBox::AlbumPreview::contentLeft() const {
-	return (st::boxWideWidth - st::sendMediaPreviewSize) / 2;
-}
-
-int SendFilesBox::AlbumPreview::contentTop() const {
-	return 0;
-}
-
-AlbumThumb *SendFilesBox::AlbumPreview::findThumb(QPoint position) const {
-	position -= QPoint(contentLeft(), contentTop());
-
-	auto top = 0;
-	const auto isPhotosWay = (_sendWay == SendFilesWay::Photos);
-	const auto skip = isPhotosWay
-		? st::sendMediaPreviewPhotoSkip
-		: st::sendMediaFileThumbSkip;
-	auto find = [&](const auto &thumb) {
-		if (_sendWay == SendFilesWay::Album) {
-			return thumb->containsPoint(position);
-		} else if (isPhotosWay || _sendWay == SendFilesWay::Files) {
-			const auto bottom = top + (isPhotosWay
-				? thumb->photoHeight()
-				: st::sendMediaFileThumbSize);
-			const auto isUnderTop = (position.y() > top);
-			top = bottom + skip;
-			return isUnderTop && (position.y() < bottom);
-		}
-		return false;
-	};
-
-	const auto i = ranges::find_if(_thumbs, std::move(find));
-	return (i == _thumbs.end()) ? nullptr : i->get();
-}
-
-not_null<AlbumThumb*> SendFilesBox::AlbumPreview::findClosestThumb(
-		QPoint position) const {
-	Expects(_draggedThumb != nullptr);
-
-	if (const auto exact = findThumb(position)) {
-		return exact;
-	}
-	auto result = _draggedThumb;
-	auto distance = _draggedThumb->distanceTo(position);
-	for (const auto &thumb : _thumbs) {
-		const auto check = thumb->distanceTo(position);
-		if (check < distance) {
-			distance = check;
-			result = thumb.get();
-		}
-	}
-	return result;
-}
-
-int SendFilesBox::AlbumPreview::orderIndex(
-		not_null<AlbumThumb*> thumb) const {
-	const auto i = ranges::find_if(_order, [&](int index) {
-		return (_thumbs[index].get() == thumb);
-	});
-	Assert(i != _order.end());
-	return int(i - _order.begin());
-}
-
-void SendFilesBox::AlbumPreview::cancelDrag() {
-	_thumbsHeightAnimation.stop();
-	_finishDragAnimation.stop();
-	_shrinkAnimation.stop();
-	if (_draggedThumb) {
-		_draggedThumb->moveInAlbum({ 0, 0 });
-		_draggedThumb = nullptr;
-	}
-	if (_suggestedThumb) {
-		const auto suggestedIndex = orderIndex(_suggestedThumb);
-		if (suggestedIndex > 0) {
-			_thumbs[_order[suggestedIndex - 1]]->suggestMove(0., [] {});
-		}
-		if (suggestedIndex < int(_order.size() - 1)) {
-			_thumbs[_order[suggestedIndex + 1]]->suggestMove(0., [] {});
-		}
-		_suggestedThumb->suggestMove(0., [] {});
-		_suggestedThumb->finishAnimations();
-		_suggestedThumb = nullptr;
-	}
-	_paintedAbove = nullptr;
-	update();
-}
-
-void SendFilesBox::AlbumPreview::finishDrag() {
-	Expects(_draggedThumb != nullptr);
-	Expects(_suggestedThumb != nullptr);
-
-	if (_suggestedThumb != _draggedThumb) {
-		const auto currentIndex = orderIndex(_draggedThumb);
-		const auto newIndex = orderIndex(_suggestedThumb);
-		const auto delta = (currentIndex < newIndex) ? 1 : -1;
-		const auto realIndex = _order[currentIndex];
-		for (auto i = currentIndex; i != newIndex; i += delta) {
-			_order[i] = _order[i + delta];
-		}
-		_order[newIndex] = realIndex;
-		const auto layout = generateOrderedLayout();
-		for (auto i = 0, count = int(_order.size()); i != count; ++i) {
-			_thumbs[_order[i]]->moveToLayout(layout[i]);
-		}
-		_finishDragAnimation.start([=] { update(); }, 0., 1., kDragDuration);
-
-		updateSizeAnimated(layout);
-	} else {
-		for (const auto &thumb : _thumbs) {
-			thumb->resetLayoutAnimation();
-		}
-		_draggedThumb->animateLayoutToInitial();
-		_finishDragAnimation.start([=] { update(); }, 0., 1., kDragDuration);
-	}
-}
-
-int SendFilesBox::AlbumPreview::countLayoutHeight(
-		const std::vector<Ui::GroupMediaLayout> &layout) const {
-	const auto accumulator = [](int current, const auto &item) {
-		return std::max(current, item.geometry.y() + item.geometry.height());
-	};
-	return ranges::accumulate(layout, 0, accumulator);
-}
-
-void SendFilesBox::AlbumPreview::updateSizeAnimated(
-		const std::vector<Ui::GroupMediaLayout> &layout) {
-	const auto newHeight = countLayoutHeight(layout);
-	if (newHeight != _thumbsHeight) {
-		_thumbsHeightAnimation.start(
-			[=] { updateSize(); },
-			_thumbsHeight,
-			newHeight,
-			kDragDuration);
-		_thumbsHeight = newHeight;
-	}
-}
-
-void SendFilesBox::AlbumPreview::updateSize() {
-	const auto newHeight = [&] {
-		switch (_sendWay) {
-		case SendFilesWay::Album:
-			return int(std::round(_thumbsHeightAnimation.value(
-				_thumbsHeight)));
-		case SendFilesWay::Photos: return _photosHeight;
-		case SendFilesWay::Files: return _filesHeight;
-		}
-		Unexpected("Send way in SendFilesBox::AlbumPreview::updateSize");
-	}();
-	if (height() != newHeight) {
-		resize(st::boxWideWidth, newHeight);
-	}
-}
-
-void SendFilesBox::AlbumPreview::paintEvent(QPaintEvent *e) {
-	Painter p(this);
-
-	switch (_sendWay) {
-	case SendFilesWay::Album: paintAlbum(p); break;
-	case SendFilesWay::Photos: paintPhotos(p, e->rect()); break;
-	case SendFilesWay::Files: paintFiles(p, e->rect()); break;
-	}
-}
-
-void SendFilesBox::AlbumPreview::paintAlbum(Painter &p) const {
-	const auto shrink = _shrinkAnimation.value(_draggedThumb ? 1. : 0.);
-	const auto moveProgress = _finishDragAnimation.value(1.);
-	const auto left = contentLeft();
-	const auto top = contentTop();
-	for (const auto &thumb : _thumbs) {
-		if (thumb.get() != _paintedAbove) {
-			thumb->paintInAlbum(p, left, top, shrink, moveProgress);
-		}
-	}
-	if (_paintedAbove) {
-		_paintedAbove->paintInAlbum(p, left, top, shrink, moveProgress);
-	}
-}
-
-void SendFilesBox::AlbumPreview::paintPhotos(Painter &p, QRect clip) const {
-	const auto left = (st::boxWideWidth - st::sendMediaPreviewSize) / 2;
-	auto top = 0;
-	const auto outerWidth = width();
-	for (const auto &thumb : _thumbs) {
-		const auto bottom = top + thumb->photoHeight();
-		const auto guard = gsl::finally([&] {
-			top = bottom + st::sendMediaPreviewPhotoSkip;
-		});
-		if (top >= clip.y() + clip.height()) {
-			break;
-		} else if (bottom <= clip.y()) {
-			continue;
-		}
-		thumb->paintPhoto(p, left, top, outerWidth);
-	}
-}
-
-void SendFilesBox::AlbumPreview::paintFiles(Painter &p, QRect clip) const {
-	const auto fileHeight = st::sendMediaFileThumbSize
-		+ st::sendMediaFileThumbSkip;
-	const auto bottom = clip.y() + clip.height();
-	const auto from = floorclamp(clip.y(), fileHeight, 0, _thumbs.size());
-	const auto till = ceilclamp(bottom, fileHeight, 0, _thumbs.size());
-	const auto left = (st::boxWideWidth - st::sendMediaPreviewSize) / 2;
-	const auto outerWidth = width();
-
-	auto top = from * fileHeight;
-	for (auto i = from; i != till; ++i) {
-		_thumbs[i]->paintFile(p, left, top, outerWidth);
-		top += fileHeight;
-	}
-}
-
-int SendFilesBox::AlbumPreview::thumbIndex(AlbumThumb *thumb) {
-	if (!thumb) {
-		return -1;
-	}
-	const auto thumbIt = ranges::find_if(_thumbs, [&](auto &t) {
-		return t.get() == thumb;
-	});
-	Expects(thumbIt != _thumbs.end());
-	return std::distance(_thumbs.begin(), thumbIt);
-}
-
-AlbumThumb *SendFilesBox::AlbumPreview::thumbUnderCursor() {
-	return findThumb(mapFromGlobal(QCursor::pos()));
-}
-
-void SendFilesBox::AlbumPreview::deleteThumbByIndex(int index) {
-	if (index < 0) {
-		return;
-	}
-	const auto orderIt = ranges::find(_order, index);
-	Expects(orderIt != _order.end());
-
-	_order.erase(orderIt);
-	ranges::for_each(_order, [=](auto &i) {
-		if (i > index) {
-			i--;
-		}
-	});
-	_thumbDeleted.fire(std::move(index));
-}
-
-void SendFilesBox::AlbumPreview::changeThumbByIndex(int index) {
-	if (index < 0) {
-		return;
-	}
-	_thumbChanged.fire(std::move(index));
-}
-
-void SendFilesBox::AlbumPreview::thumbButtonsCallback(
-	not_null<AlbumThumb*> thumb,
-	ButtonType type) {
-	const auto index = thumbIndex(thumb);
-
-	switch (type) {
-	case ButtonType::None: return;
-	case ButtonType::Edit: changeThumbByIndex(index); break;
-	case ButtonType::Delete: deleteThumbByIndex(index); break;
-	}
-}
-
-void SendFilesBox::AlbumPreview::mousePressEvent(QMouseEvent *e) {
-	if (_finishDragAnimation.animating()) {
-		return;
-	}
-	const auto position = e->pos();
-	cancelDrag();
-	if (const auto thumb = findThumb(position)) {
-		if (thumb->buttonsContainPoint(e->pos())) {
-			thumbButtonsCallback(thumb, thumb->buttonTypeFromPoint(e->pos()));
-			return;
-		}
-		_paintedAbove = _suggestedThumb = _draggedThumb = thumb;
-		_draggedStartPosition = position;
-		_shrinkAnimation.start([=] { update(); }, 0., 1., kShrinkDuration);
-	}
-}
-
-void SendFilesBox::AlbumPreview::mouseMoveEvent(QMouseEvent *e) {
-	if (_sendWay == SendFilesWay::Files) {
-		applyCursor(style::cur_default);
-		return;
-	}
-	const auto isAlbum = (_sendWay == SendFilesWay::Album);
-	if (isAlbum && _draggedThumb) {
-		const auto position = e->pos();
-		_draggedThumb->moveInAlbum(position - _draggedStartPosition);
-		updateSuggestedDrag(_draggedThumb->center());
-		update();
-	} else {
-		const auto thumb = findThumb(e->pos());
-		const auto regularCursor = isAlbum
-			? style::cur_sizeall
-			: style::cur_default;
-		const auto cursor = thumb
-			? (thumb->buttonsContainPoint(e->pos())
-				? style::cur_pointer
-				: regularCursor)
-			: style::cur_default;
-		applyCursor(cursor);
-	}
-}
-
-void SendFilesBox::AlbumPreview::applyCursor(style::cursor cursor) {
-	if (_cursor != cursor) {
-		_cursor = cursor;
-		setCursor(_cursor);
-	}
-}
-
-void SendFilesBox::AlbumPreview::updateSuggestedDrag(QPoint position) {
-	auto closest = findClosestThumb(position);
-	auto closestIndex = orderIndex(closest);
-
-	const auto draggedIndex = orderIndex(_draggedThumb);
-	const auto closestIsBeforePoint = closest->isPointAfter(position);
-	if (closestIndex < draggedIndex && closestIsBeforePoint) {
-		closest = _thumbs[_order[++closestIndex]].get();
-	} else if (closestIndex > draggedIndex && !closestIsBeforePoint) {
-		closest = _thumbs[_order[--closestIndex]].get();
-	}
-
-	if (_suggestedThumb == closest) {
-		return;
-	}
-
-	const auto last = int(_order.size()) - 1;
-	if (_suggestedThumb) {
-		const auto suggestedIndex = orderIndex(_suggestedThumb);
-		if (suggestedIndex < draggedIndex && suggestedIndex > 0) {
-			const auto previous = _thumbs[_order[suggestedIndex - 1]].get();
-			previous->suggestMove(0., [=] { update(); });
-		} else if (suggestedIndex > draggedIndex && suggestedIndex < last) {
-			const auto next = _thumbs[_order[suggestedIndex + 1]].get();
-			next->suggestMove(0., [=] { update(); });
-		}
-		_suggestedThumb->suggestMove(0., [=] { update(); });
-	}
-	_suggestedThumb = closest;
-	const auto suggestedIndex = closestIndex;
-	if (_suggestedThumb != _draggedThumb) {
-		const auto delta = (suggestedIndex < draggedIndex) ? 1. : -1.;
-		if (delta > 0. && suggestedIndex > 0) {
-			const auto previous = _thumbs[_order[suggestedIndex - 1]].get();
-			previous->suggestMove(-delta, [=] { update(); });
-		} else if (delta < 0. && suggestedIndex < last) {
-			const auto next = _thumbs[_order[suggestedIndex + 1]].get();
-			next->suggestMove(-delta, [=] { update(); });
-		}
-		_suggestedThumb->suggestMove(delta, [=] { update(); });
-	}
-}
-
-void SendFilesBox::AlbumPreview::mouseReleaseEvent(QMouseEvent *e) {
-	if (_draggedThumb) {
-		finishDrag();
-		_shrinkAnimation.start([=] { update(); }, 1., 0., kShrinkDuration);
-		_draggedThumb = nullptr;
-		_suggestedThumb = nullptr;
-		update();
-	}
-}
-
 SendFilesBox::SendFilesBox(
 	QWidget*,
 	not_null<Window::SessionController*> controller,
@@ -1718,7 +418,7 @@ void SendFilesBox::prepareSingleFilePreview() {
 		_preview = media;
 		initPreview(media->desiredHeightValue());
 	} else {
-		const auto preview = Ui::CreateChild<SingleFilePreview>(this, file);
+		const auto preview = Ui::CreateChild<Ui::SingleFilePreview>(this, file);
 		_compressConfirm = CompressConfirm::None;
 		_preview = preview;
 		initPreview(preview->desiredHeightValue());
@@ -1731,7 +431,7 @@ void SendFilesBox::prepareAlbumPreview() {
 	const auto wrap = Ui::CreateChild<Ui::ScrollArea>(
 		this,
 		st::boxScroll);
-	_albumPreview = wrap->setOwnedWidget(object_ptr<AlbumPreview>(
+	_albumPreview = wrap->setOwnedWidget(object_ptr<Ui::AlbumPreview>(
 		this,
 		_list,
 		_sendWay->value()));
@@ -1807,7 +507,7 @@ void SendFilesBox::addThumbButtonHandlers(not_null<Ui::ScrollArea*> wrap) {
 
 void SendFilesBox::setupShadows(
 		not_null<Ui::ScrollArea*> wrap,
-		not_null<AlbumPreview*> content) {
+		not_null<Ui::AlbumPreview*> content) {
 	using namespace rpl::mappers;
 
 	const auto topShadow = Ui::CreateChild<Ui::FadeShadow>(this);
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index d8bfc5f99..4b99028d7 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -35,6 +35,8 @@ class RoundButton;
 class InputField;
 struct GroupMediaLayout;
 class EmojiButton;
+class AlbumPreview;
+enum class SendFilesWay;
 } // namespace Ui
 
 namespace Window {
@@ -45,12 +47,6 @@ namespace SendMenu {
 enum class Type;
 } // namespace SendMenu
 
-enum class SendFilesWay {
-	Album,
-	Photos,
-	Files,
-};
-
 class SendFilesBox : public Ui::BoxContent {
 public:
 	enum class SendLimit {
@@ -70,7 +66,7 @@ public:
 	void setConfirmedCallback(
 		Fn<void(
 			Ui::PreparedList &&list,
-			SendFilesWay way,
+			Ui::SendFilesWay way,
 			TextWithTags &&caption,
 			Api::SendOptions options,
 			bool ctrlShiftEnter)> callback) {
@@ -91,8 +87,6 @@ protected:
 	void resizeEvent(QResizeEvent *e) override;
 
 private:
-	class AlbumPreview;
-
 	void initSendWay();
 	void initPreview(rpl::producer<int> desiredPreviewHeight);
 
@@ -101,7 +95,7 @@ private:
 	void setupCaption();
 	void setupShadows(
 		not_null<Ui::ScrollArea*> wrap,
-		not_null<AlbumPreview*> content);
+		not_null<Ui::AlbumPreview*> content);
 
 	void setupEmojiPanel();
 	void updateEmojiPanelGeometry();
@@ -149,7 +143,7 @@ private:
 
 	Fn<void(
 		Ui::PreparedList &&list,
-		SendFilesWay way,
+		Ui::SendFilesWay way,
 		TextWithTags &&caption,
 		Api::SendOptions options,
 		bool ctrlShiftEnter)> _confirmedCallback;
@@ -161,16 +155,16 @@ private:
 	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
 	base::unique_qptr<QObject> _emojiFilter;
 
-	object_ptr<Ui::Radioenum<SendFilesWay>> _sendAlbum = { nullptr };
-	object_ptr<Ui::Radioenum<SendFilesWay>> _sendPhotos = { nullptr };
-	object_ptr<Ui::Radioenum<SendFilesWay>> _sendFiles = { nullptr };
-	std::shared_ptr<Ui::RadioenumGroup<SendFilesWay>> _sendWay;
+	object_ptr<Ui::Radioenum<Ui::SendFilesWay>> _sendAlbum = { nullptr };
+	object_ptr<Ui::Radioenum<Ui::SendFilesWay>> _sendPhotos = { nullptr };
+	object_ptr<Ui::Radioenum<Ui::SendFilesWay>> _sendFiles = { nullptr };
+	std::shared_ptr<Ui::RadioenumGroup<Ui::SendFilesWay>> _sendWay;
 
 	rpl::variable<int> _footerHeight = 0;
 	rpl::event_stream<> _albumChanged;
 
 	QWidget *_preview = nullptr;
-	AlbumPreview *_albumPreview = nullptr;
+	Ui::AlbumPreview *_albumPreview = nullptr;
 	int _albumVideosCount = 0;
 	int _albumPhotosCount = 0;
 
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index d7488d2c5..62f75f797 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/emoji_config.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/popup_menu.h"
+#include "ui/cached_round_corners.h"
 #include "lottie/lottie_multi_player.h"
 #include "lottie/lottie_animation.h"
 #include "chat_helpers/stickers_lottie.h"
@@ -35,7 +36,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "app.h"
 #include "styles/style_layers.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_info.h"
@@ -661,7 +661,7 @@ void StickerSetBox::Inner::paintSticker(
 		p.setOpacity(over);
 		auto tl = position;
 		if (rtl()) tl.setX(width() - tl.x() - st::stickersSize.width());
-		App::roundRect(p, QRect(tl, st::stickersSize), st::emojiPanHover, StickerHoverCorners);
+		Ui::FillRoundRect(p, QRect(tl, st::stickersSize), st::emojiPanHover, Ui::StickerHoverCorners);
 		p.setOpacity(1);
 	}
 
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index c70fa623c..5ed95a24b 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -33,9 +33,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/discrete_sliders.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/image/image.h"
+#include "ui/cached_round_corners.h"
 #include "window/window_session_controller.h"
 #include "main/main_session.h"
-#include "app.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat_helpers.h"
@@ -1129,7 +1129,7 @@ void StickersBox::Inner::paintRow(Painter &p, not_null<Row*> row, int index) {
 			Ui::Shadow::paint(p, rect, width(), st::boxRoundShadow);
 			p.setOpacity(1);
 
-			App::roundRect(p, rect, st::boxBg, BoxCorners);
+			Ui::FillRoundRect(p, rect, st::boxBg, Ui::BoxCorners);
 
 			p.setOpacity(1. - current);
 			paintFakeButton(p, row, index);
@@ -1318,7 +1318,7 @@ void StickersBox::Inner::paintFakeButton(Painter &p, not_null<Row*> row, int ind
 			auto textWidth = (_section == Section::Installed) ? _undoWidth : _addWidth;
 			auto &text = (_section == Section::Installed) ? _undoText : _addText;
 			auto &textBg = selected ? st.textBgOver : st.textBg;
-			App::roundRect(p, myrtlrect(rect), textBg, ImageRoundRadius::Small);
+			Ui::FillRoundRect(p, myrtlrect(rect), textBg, ImageRoundRadius::Small);
 			if (row->ripple) {
 				row->ripple->paint(p, rect.x(), rect.y(), width());
 				if (row->ripple->empty()) {
diff --git a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
index 375039449..17ee74a6b 100644
--- a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
+++ b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
@@ -12,8 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_session.h"
 #include "main/main_session.h"
+#include "ui/cached_round_corners.h"
 #include "facades.h"
-#include "app.h"
 #include "styles/style_widgets.h"
 #include "styles/style_chat.h"
 
@@ -76,7 +76,7 @@ void Style::paintButtonBg(
 		Painter &p,
 		const QRect &rect,
 		float64 howMuchOver) const {
-	App::roundRect(p, rect, st::botKbBg, BotKeyboardCorners);
+	Ui::FillRoundRect(p, rect, st::botKbBg, Ui::BotKeyboardCorners);
 }
 
 void Style::paintButtonIcon(
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index ec66b0cfc..ea5213b66 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/shadow.h"
 #include "ui/emoji_config.h"
 #include "ui/ui_utility.h"
+#include "ui/cached_round_corners.h"
 #include "lang/lang_keys.h"
 #include "emoji_suggestions_data.h"
 #include "emoji_suggestions_helper.h"
@@ -20,7 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "window/window_session_controller.h"
 #include "facades.h"
-#include "app.h"
 #include "styles/style_chat_helpers.h"
 
 namespace ChatHelpers {
@@ -211,7 +211,7 @@ void EmojiColorPicker::paintEvent(QPaintEvent *e) {
 		return;
 	}
 	Ui::Shadow::paint(p, inner, width(), st::defaultRoundShadow);
-	App::roundRect(p, inner, st::boxBg, BoxCorners);
+	Ui::FillRoundRect(p, inner, st::boxBg, Ui::BoxCorners);
 
 	auto x = st::emojiPanMargins.left() + 2 * st::emojiColorsPadding + _singleSize.width();
 	if (rtl()) x = width() - x - st::emojiColorsSep;
@@ -372,7 +372,7 @@ void EmojiColorPicker::drawVariant(Painter &p, int variant) {
 	if (variant == _selected) {
 		QPoint tl(w);
 		if (rtl()) tl.setX(width() - tl.x() - _singleSize.width());
-		App::roundRect(p, QRect(tl, _singleSize), st::emojiPanHover, StickerHoverCorners);
+		Ui::FillRoundRect(p, QRect(tl, _singleSize), st::emojiPanHover, Ui::StickerHoverCorners);
 	}
 	const auto esize = Ui::Emoji::GetSizeLarge();
 	Ui::Emoji::Draw(
@@ -558,7 +558,7 @@ void EmojiListWidget::paintEvent(QPaintEvent *e) {
 					if (selected) {
 						auto tl = w;
 						if (rtl()) tl.setX(width() - tl.x() - _singleSize.width());
-						App::roundRect(p, QRect(tl, _singleSize), st::emojiPanHover, StickerHoverCorners);
+						Ui::FillRoundRect(p, QRect(tl, _singleSize), st::emojiPanHover, Ui::StickerHoverCorners);
 					}
 					Ui::Emoji::Draw(
 						p,
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
index d77ebf94e..c3693d3b3 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
@@ -17,11 +17,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/input_fields.h"
 #include "ui/emoji_config.h"
 #include "ui/ui_utility.h"
+#include "ui/cached_round_corners.h"
 #include "platform/platform_specific.h"
 #include "core/application.h"
 #include "base/event_filter.h"
 #include "main/main_session.h"
-#include "app.h"
 #include "styles/style_chat_helpers.h"
 
 #include <QtWidgets/QApplication>
@@ -218,11 +218,11 @@ void SuggestionsWidget::paintEvent(QPaintEvent *e) {
 		? _pressed
 		: _selectedAnimation.value(_selected);
 	if (selected > -1.) {
-		App::roundRect(
+		Ui::FillRoundRect(
 			p,
 			QRect(selected * _oneWidth, 0, _oneWidth, _oneWidth),
 			st::emojiPanHover,
-			StickerHoverCorners);
+			Ui::StickerHoverCorners);
 	}
 
 	for (auto i = from; i != till; ++i) {
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index de207c1b5..41bce617a 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -29,10 +29,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/scroll_area.h"
 #include "ui/image/image.h"
 #include "ui/ui_utility.h"
+#include "ui/cached_round_corners.h"
 #include "base/unixtime.h"
 #include "window/window_session_controller.h"
 #include "facades.h"
-#include "app.h"
 #include "styles/style_chat.h"
 #include "styles/style_widgets.h"
 #include "styles/style_chat_helpers.h"
@@ -686,7 +686,7 @@ void FieldAutocompleteInner::paintEvent(QPaintEvent *e) {
 				if (_sel == index) {
 					QPoint tl(pos);
 					if (rtl()) tl.setX(width() - tl.x() - st::stickerPanSize.width());
-					App::roundRect(p, QRect(tl, st::stickerPanSize), st::emojiPanHover, StickerHoverCorners);
+					Ui::FillRoundRect(p, QRect(tl, st::stickerPanSize), st::emojiPanHover, Ui::StickerHoverCorners);
 				}
 
 				media->checkStickerSmall();
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 28b35ff14..bece2cd01 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/animations.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/image/image.h"
+#include "ui/cached_round_corners.h"
 #include "lottie/lottie_multi_player.h"
 #include "lottie/lottie_single_player.h"
 #include "lottie/lottie_animation.h"
@@ -38,7 +39,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session_settings.h"
 #include "apiwrap.h"
 #include "api/api_toggling_media.h" // Api::ToggleFavedSticker
-#include "app.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_window.h"
 
@@ -1537,7 +1537,7 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 				auto selected = selectedButton ? (selectedButton->section == info.section) : false;
 				auto &textBg = selected ? st::stickersTrendingAdd.textBgOver : st::stickersTrendingAdd.textBg;
 
-				App::roundRect(p, myrtlrect(add), textBg, ImageRoundRadius::Small);
+				Ui::FillRoundRect(p, myrtlrect(add), textBg, ImageRoundRadius::Small);
 				if (set.ripple) {
 					set.ripple->paint(p, add.x(), add.y(), width());
 					if (set.ripple->empty()) {
@@ -1767,7 +1767,7 @@ void StickersListWidget::paintMegagroupEmptySet(Painter &p, int y, bool buttonSe
 		: st::stickerGroupCategoryAdd.textBg;
 
 	auto button = _megagroupSetButtonRect.translated(0, y);
-	App::roundRect(p, myrtlrect(button), textBg, ImageRoundRadius::Small);
+	Ui::FillRoundRect(p, myrtlrect(button), textBg, ImageRoundRadius::Small);
 	if (_megagroupSetButtonRipple) {
 		_megagroupSetButtonRipple->paint(p, button.x(), button.y(), width());
 		if (_megagroupSetButtonRipple->empty()) {
@@ -1847,7 +1847,7 @@ void StickersListWidget::paintSticker(Painter &p, Set &set, int y, int section,
 	if (selected) {
 		auto tl = pos;
 		if (rtl()) tl.setX(width() - tl.x() - _singleSize.width());
-		App::roundRect(p, QRect(tl, _singleSize), st::emojiPanHover, StickerHoverCorners);
+		Ui::FillRoundRect(p, QRect(tl, _singleSize), st::emojiPanHover, Ui::StickerHoverCorners);
 	}
 
 	media->checkStickerSmall();
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index b60304b46..1121c7cf4 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/image/image_prepare.h"
+#include "ui/cached_round_corners.h"
 #include "window/window_session_controller.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
@@ -521,10 +522,10 @@ void TabbedSelector::paintSlideFrame(Painter &p) {
 	if (_roundRadius > 0) {
 		if (full()) {
 			auto topPart = QRect(0, 0, width(), _tabsSlider->height() + _roundRadius);
-			App::roundRect(p, topPart, st::emojiPanBg, ImageRoundRadius::Small, RectPart::FullTop | RectPart::NoTopBottom);
+			Ui::FillRoundRect(p, topPart, st::emojiPanBg, ImageRoundRadius::Small, RectPart::FullTop | RectPart::NoTopBottom);
 		} else {
 			auto topPart = QRect(0, 0, width(), 3 * _roundRadius);
-			App::roundRect(p, topPart, st::emojiPanBg, ImageRoundRadius::Small, RectPart::FullTop);
+			Ui::FillRoundRect(p, topPart, st::emojiPanBg, ImageRoundRadius::Small, RectPart::FullTop);
 		}
 	} else if (full()) {
 		p.fillRect(0, 0, width(), _tabsSlider->height(), st::emojiPanBg);
@@ -538,15 +539,15 @@ void TabbedSelector::paintContent(Painter &p) {
 	if (_roundRadius > 0) {
 		if (full()) {
 			auto topPart = QRect(0, 0, width(), _tabsSlider->height() + _roundRadius);
-			App::roundRect(p, topPart, st::emojiPanBg, ImageRoundRadius::Small, RectPart::FullTop | RectPart::NoTopBottom);
+			Ui::FillRoundRect(p, topPart, st::emojiPanBg, ImageRoundRadius::Small, RectPart::FullTop | RectPart::NoTopBottom);
 		} else {
 			auto topPart = QRect(0, 0, width(), 3 * _roundRadius);
-			App::roundRect(p, topPart, st::emojiPanBg, ImageRoundRadius::Small, RectPart::FullTop);
+			Ui::FillRoundRect(p, topPart, st::emojiPanBg, ImageRoundRadius::Small, RectPart::FullTop);
 		}
 
 		auto bottomPart = QRect(0, _footerTop - _roundRadius, width(), st::emojiFooterHeight + _roundRadius);
 		auto bottomParts = RectPart::NoTopBottom | RectPart::FullBottom;
-		App::roundRect(p, bottomPart, bottomBg, ImageRoundRadius::Small, bottomParts);
+		Ui::FillRoundRect(p, bottomPart, bottomBg, ImageRoundRadius::Small, bottomParts);
 	} else {
 		if (full()) {
 			p.fillRect(0, 0, width(), _tabsSlider->height(), st::emojiPanBg);
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index a7b0b124d..41d138ebf 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "boxes/send_files_box.h"
 #include "ui/widgets/input_fields.h"
+#include "ui/chat/attach/attach_common.h"
 #include "storage/serialize_common.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
@@ -18,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Core {
 
 Settings::Settings()
-: _sendFilesWay(SendFilesWay::Album)
+: _sendFilesWay(Ui::SendFilesWay::Album)
 , _sendSubmitWay(Ui::InputSubmitSettings::Enter)
 , _floatPlayerColumn(Window::Column::Second)
 , _floatPlayerCorner(RectPart::TopRight)
@@ -309,11 +310,11 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_callAudioDuckingEnabled = (callAudioDuckingEnabled == 1);
 	_lastSeenWarningSeen = (lastSeenWarningSeen == 1);
 	_soundOverrides = std::move(soundOverrides);
-	auto uncheckedSendFilesWay = static_cast<SendFilesWay>(sendFilesWay);
+	auto uncheckedSendFilesWay = static_cast<Ui::SendFilesWay>(sendFilesWay);
 	switch (uncheckedSendFilesWay) {
-	case SendFilesWay::Album:
-	case SendFilesWay::Photos:
-	case SendFilesWay::Files: _sendFilesWay = uncheckedSendFilesWay; break;
+	case Ui::SendFilesWay::Album:
+	case Ui::SendFilesWay::Photos:
+	case Ui::SendFilesWay::Files: _sendFilesWay = uncheckedSendFilesWay; break;
 	}
 	auto uncheckedSendSubmitWay = static_cast<Ui::InputSubmitSettings>(sendSubmitWay);
 	switch (uncheckedSendSubmitWay) {
@@ -469,7 +470,7 @@ void Settings::resetOnLastLogout() {
 	//_themesAccentColors = Window::Theme::AccentColors();
 
 	_lastSeenWarningSeen = false;
-	_sendFilesWay = SendFilesWay::Album;
+	_sendFilesWay = Ui::SendFilesWay::Album;
 	//_sendSubmitWay = Ui::InputSubmitSettings::Enter;
 	_soundOverrides = {};
 
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index d9c0bfaa8..bab3bd920 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -10,11 +10,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/themes/window_themes_embedded.h"
 #include "window/window_controls_layout.h"
 
-enum class SendFilesWay;
 enum class RectPart;
 
 namespace Ui {
 enum class InputSubmitSettings;
+enum class SendFilesWay;
 } // namespace Ui
 
 namespace Window {
@@ -229,10 +229,10 @@ public:
 	[[nodiscard]] bool lastSeenWarningSeen() const {
 		return _lastSeenWarningSeen;
 	}
-	void setSendFilesWay(SendFilesWay way) {
+	void setSendFilesWay(Ui::SendFilesWay way) {
 		_sendFilesWay = way;
 	}
-	[[nodiscard]] SendFilesWay sendFilesWay() const {
+	[[nodiscard]] Ui::SendFilesWay sendFilesWay() const {
 		return _sendFilesWay;
 	}
 	void setSendSubmitWay(Ui::InputSubmitSettings value) {
@@ -515,7 +515,7 @@ private:
 	bool _callAudioDuckingEnabled = true;
 	Window::Theme::AccentColors _themesAccentColors;
 	bool _lastSeenWarningSeen = false;
-	SendFilesWay _sendFilesWay;
+	Ui::SendFilesWay _sendFilesWay;
 	Ui::InputSubmitSettings _sendSubmitWay;
 	base::flat_map<QString, QString> _soundOverrides;
 	bool _exeLaunchWarning = true;
diff --git a/Telegram/SourceFiles/core/mime_type.cpp b/Telegram/SourceFiles/core/mime_type.cpp
index c1596e550..71e7ae065 100644
--- a/Telegram/SourceFiles/core/mime_type.cpp
+++ b/Telegram/SourceFiles/core/mime_type.cpp
@@ -118,4 +118,23 @@ bool IsMimeAcceptedForAlbum(const QString &mime) {
 		|| (mime == u"video/quicktime"_q);
 }
 
+bool FileIsImage(const QString &name, const QString &mime) {
+	QString lowermime = mime.toLower(), namelower = name.toLower();
+	if (lowermime.startsWith(qstr("image/"))) {
+		return true;
+	} else if (namelower.endsWith(qstr(".bmp"))
+		|| namelower.endsWith(qstr(".jpg"))
+		|| namelower.endsWith(qstr(".jpeg"))
+		|| namelower.endsWith(qstr(".gif"))
+		|| namelower.endsWith(qstr(".webp"))
+		|| namelower.endsWith(qstr(".tga"))
+		|| namelower.endsWith(qstr(".tiff"))
+		|| namelower.endsWith(qstr(".tif"))
+		|| namelower.endsWith(qstr(".psd"))
+		|| namelower.endsWith(qstr(".png"))) {
+		return true;
+	}
+	return false;
+}
+
 } // namespace Core
diff --git a/Telegram/SourceFiles/core/mime_type.h b/Telegram/SourceFiles/core/mime_type.h
index b817305f1..73b2dcc9b 100644
--- a/Telegram/SourceFiles/core/mime_type.h
+++ b/Telegram/SourceFiles/core/mime_type.h
@@ -36,12 +36,14 @@ private:
 
 };
 
-MimeType MimeTypeForName(const QString &mime);
-MimeType MimeTypeForFile(const QFileInfo &file);
-MimeType MimeTypeForData(const QByteArray &data);
+[[nodiscard]] MimeType MimeTypeForName(const QString &mime);
+[[nodiscard]] MimeType MimeTypeForFile(const QFileInfo &file);
+[[nodiscard]] MimeType MimeTypeForData(const QByteArray &data);
 
-bool IsMimeStickerAnimated(const QString &mime);
-bool IsMimeSticker(const QString &mime);
-bool IsMimeAcceptedForAlbum(const QString &mime);
+[[nodiscard]] bool IsMimeStickerAnimated(const QString &mime);
+[[nodiscard]] bool IsMimeSticker(const QString &mime);
+[[nodiscard]] bool IsMimeAcceptedForAlbum(const QString &mime);
+
+[[nodiscard]] bool FileIsImage(const QString &name, const QString &mime);
 
 } // namespace Core
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 38a511a8e..9d9dbf3e1 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -39,6 +39,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/confirm_box.h"
 #include "ui/image/image.h"
 #include "ui/text/text_utilities.h"
+#include "ui/text/format_values.h"
 #include "base/base_file_utilities.h"
 #include "mainwindow.h"
 #include "core/application.h"
@@ -125,25 +126,6 @@ void LaunchWithWarning(
 
 } // namespace
 
-bool fileIsImage(const QString &name, const QString &mime) {
-	QString lowermime = mime.toLower(), namelower = name.toLower();
-	if (lowermime.startsWith(qstr("image/"))) {
-		return true;
-	} else if (namelower.endsWith(qstr(".bmp"))
-		|| namelower.endsWith(qstr(".jpg"))
-		|| namelower.endsWith(qstr(".jpeg"))
-		|| namelower.endsWith(qstr(".gif"))
-		|| namelower.endsWith(qstr(".webp"))
-		|| namelower.endsWith(qstr(".tga"))
-		|| namelower.endsWith(qstr(".tiff"))
-		|| namelower.endsWith(qstr(".tif"))
-		|| namelower.endsWith(qstr(".psd"))
-		|| namelower.endsWith(qstr(".png"))) {
-		return true;
-	}
-	return false;
-}
-
 QString FileNameUnsafe(
 		not_null<Main::Session*> session,
 		const QString &title,
@@ -1456,12 +1438,12 @@ uint8 DocumentData::cacheTag() const {
 
 QString DocumentData::composeNameString() const {
 	if (auto songData = song()) {
-		return ComposeNameString(
+		return Ui::ComposeNameString(
 			_filename,
 			songData->title,
 			songData->performer);
 	}
-	return ComposeNameString(_filename, QString(), QString());
+	return Ui::ComposeNameString(_filename, QString(), QString());
 }
 
 LocationType DocumentData::locationType() const {
@@ -1577,7 +1559,7 @@ void DocumentData::setMaybeSupportsStreaming(bool supports) {
 void DocumentData::recountIsImage() {
 	const auto isImage = !isAnimation()
 		&& !isVideoFile()
-		&& fileIsImage(filename(), mimeString());
+		&& Core::FileIsImage(filename(), mimeString());
 	if (isImage) {
 		_flags |= Flag::ImageType;
 	} else {
@@ -1635,22 +1617,6 @@ void DocumentData::collectLocalData(not_null<DocumentData*> local) {
 	}
 }
 
-QString DocumentData::ComposeNameString(
-		const QString &filename,
-		const QString &songTitle,
-		const QString &songPerformer) {
-	if (songTitle.isEmpty() && songPerformer.isEmpty()) {
-		return filename.isEmpty() ? qsl("Unknown File") : filename;
-	}
-
-	if (songPerformer.isEmpty()) {
-		return songTitle;
-	}
-
-	auto trackTitle = (songTitle.isEmpty() ? qsl("Unknown Track") : songTitle);
-	return songPerformer + QString::fromUtf8(" \xe2\x80\x93 ") + trackTitle;
-}
-
 namespace Data {
 
 QString FileExtension(const QString &filepath) {
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index e8b5b905f..a31dd6370 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -78,8 +78,6 @@ struct VoiceData : public DocumentAdditionalData {
 	char wavemax = 0;
 };
 
-bool fileIsImage(const QString &name, const QString &mime);
-
 namespace Serialize {
 class Document;
 } // namespace Serialize;
@@ -228,10 +226,6 @@ public:
 	[[nodiscard]] Storage::Cache::Key cacheKey() const;
 	[[nodiscard]] uint8 cacheTag() const;
 
-	[[nodiscard]] static QString ComposeNameString(
-		const QString &filename,
-		const QString &songTitle,
-		const QString &songPerformer);
 	[[nodiscard]] QString composeNameString() const;
 
 	[[nodiscard]] bool canBeStreamed() const;
diff --git a/Telegram/SourceFiles/history/history_drag_area.cpp b/Telegram/SourceFiles/history/history_drag_area.cpp
index 5614ad254..92a3041a9 100644
--- a/Telegram/SourceFiles/history/history_drag_area.cpp
+++ b/Telegram/SourceFiles/history/history_drag_area.cpp
@@ -18,10 +18,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "ui/widgets/shadow.h"
 #include "ui/ui_utility.h"
+#include "ui/cached_round_corners.h"
 #include "mainwindow.h"
 #include "apiwrap.h"
 #include "mainwidget.h"
-#include "app.h"
 #include "storage/storage_media_prepare.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_layers.h"
@@ -315,7 +315,7 @@ void DragArea::paintEvent(QPaintEvent *e) {
 	}
 
 	Ui::Shadow::paint(p, inner, width(), st::boxRoundShadow);
-	App::roundRect(p, inner, st::boxBg, BoxCorners);
+	Ui::FillRoundRect(p, inner, st::boxBg, Ui::BoxCorners);
 
 	p.setPen(anim::pen(
 		st::dragColor,
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index e44c610b8..6f9db66fd 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/text/text_options.h"
 #include "ui/ui_utility.h"
+#include "ui/cached_round_corners.h"
 #include "ui/inactive_press.h"
 #include "window/window_session_controller.h"
 #include "window/window_peer_menu.h"
@@ -591,7 +592,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 	if (!_firstLoading && _botAbout && !_botAbout->info->text.isEmpty() && _botAbout->height > 0) {
 		if (clip.y() < _botAbout->rect.y() + _botAbout->rect.height() && clip.y() + clip.height() > _botAbout->rect.y()) {
 			p.setTextPalette(st::inTextPalette);
-			App::roundRect(p, _botAbout->rect, st::msgInBg, MessageInCorners, &st::msgInShadow);
+			Ui::FillRoundRect(p, _botAbout->rect, st::msgInBg, Ui::MessageInCorners, &st::msgInShadow);
 
 			auto top = _botAbout->rect.top() + st::msgPadding.top();
 			if (!_history->peer->isRepliesChat()) {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 9abb0d823..8bd28b1dc 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -31,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "ui/text/format_values.h"
 #include "ui/chat/message_bar.h"
+#include "ui/chat/attach/attach_common.h"
 #include "ui/image/image.h"
 #include "ui/special_buttons.h"
 #include "ui/controls/emoji_button.h"
@@ -4193,17 +4194,17 @@ bool HistoryWidget::confirmSendingFiles(
 	_field->setTextWithTags({});
 	box->setConfirmedCallback(crl::guard(this, [=](
 			Ui::PreparedList &&list,
-			SendFilesWay way,
+			Ui::SendFilesWay way,
 			TextWithTags &&caption,
 			Api::SendOptions options,
 			bool ctrlShiftEnter) {
 		if (showSendingFilesError(list)) {
 			return;
 		}
-		const auto type = (way == SendFilesWay::Files)
+		const auto type = (way == Ui::SendFilesWay::Files)
 			? SendMediaType::File
 			: SendMediaType::Photo;
-		const auto album = (way == SendFilesWay::Album)
+		const auto album = (way == Ui::SendFilesWay::Album)
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
 		uploadFilesAfterConfirmation(
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 56d59d5af..1eaf6786a 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/text/text_utilities.h"
 #include "ui/text/text_entity.h"
+#include "ui/cached_round_corners.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_channel.h"
@@ -30,7 +31,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "layout.h"
 #include "facades.h"
-#include "app.h"
 #include "styles/style_widgets.h"
 #include "styles/style_chat.h"
 #include "styles/style_dialogs.h"
@@ -81,11 +81,11 @@ void KeyboardStyle::paintButtonBg(
 		Painter &p,
 		const QRect &rect,
 		float64 howMuchOver) const {
-	App::roundRect(p, rect, st::msgServiceBg, StickerCorners);
+	Ui::FillRoundRect(p, rect, st::msgServiceBg, Ui::StickerCorners);
 	if (howMuchOver > 0) {
 		auto o = p.opacity();
 		p.setOpacity(o * howMuchOver);
-		App::roundRect(p, rect, st::msgBotKbOverBgAdd, BotKbOverCorners);
+		Ui::FillRoundRect(p, rect, st::msgBotKbOverBgAdd, Ui::BotKbOverCorners);
 		p.setOpacity(o);
 	}
 }
@@ -141,7 +141,7 @@ QString FastReplyText() {
 void PaintBubble(Painter &p, QRect rect, int outerWidth, bool selected, bool outbg, RectPart tailSide, RectParts skip) {
 	auto &bg = selected ? (outbg ? st::msgOutBgSelected : st::msgInBgSelected) : (outbg ? st::msgOutBg : st::msgInBg);
 	auto sh = &(selected ? (outbg ? st::msgOutShadowSelected : st::msgInShadowSelected) : (outbg ? st::msgOutShadow : st::msgInShadow));
-	auto cors = selected ? (outbg ? MessageOutSelectedCorners : MessageInSelectedCorners) : (outbg ? MessageOutCorners : MessageInCorners);
+	auto cors = selected ? (outbg ? Ui::MessageOutSelectedCorners : Ui::MessageInSelectedCorners) : (outbg ? Ui::MessageOutCorners : Ui::MessageInCorners);
 	auto parts = RectPart::None | RectPart::NoTopBottom;
 	if (skip & RectPart::Top) {
 		if (skip & RectPart::Bottom) {
@@ -174,7 +174,7 @@ void PaintBubble(Painter &p, QRect rect, int outerWidth, bool selected, bool out
 	} else if (!(skip & RectPart::Bottom)) {
 		parts |= RectPart::FullBottom;
 	}
-	App::roundRect(p, rect, bg, cors, sh, parts);
+	Ui::FillRoundRect(p, rect, bg, cors, sh, parts);
 }
 
 void PaintBubble(Painter &p, QRect rect, int outerWidth, bool selected, const std::vector<BubbleSelectionInterval> &selection, bool outbg, RectPart tailSide) {
@@ -1799,10 +1799,10 @@ void Message::drawInfo(
 	auto dateY = infoBottom - st::msgDateFont->height;
 	if (type == InfoDisplayType::Image) {
 		auto dateW = infoW + 2 * st::msgDateImgPadding.x(), dateH = st::msgDateFont->height + 2 * st::msgDateImgPadding.y();
-		App::roundRect(p, dateX - st::msgDateImgPadding.x(), dateY - st::msgDateImgPadding.y(), dateW, dateH, selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
+		Ui::FillRoundRect(p, dateX - st::msgDateImgPadding.x(), dateY - st::msgDateImgPadding.y(), dateW, dateH, selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? Ui::DateSelectedCorners : Ui::DateCorners);
 	} else if (type == InfoDisplayType::Background) {
 		auto dateW = infoW + 2 * st::msgDateImgPadding.x(), dateH = st::msgDateFont->height + 2 * st::msgDateImgPadding.y();
-		App::roundRect(p, dateX - st::msgDateImgPadding.x(), dateY - st::msgDateImgPadding.y(), dateW, dateH, selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? StickerSelectedCorners : StickerCorners);
+		Ui::FillRoundRect(p, dateX - st::msgDateImgPadding.x(), dateY - st::msgDateImgPadding.y(), dateW, dateH, selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? Ui::StickerSelectedCorners : Ui::StickerCorners);
 	}
 	dateX += timeLeft();
 
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 613acdc9d..37d256a6b 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/chat/attach/attach_prepare.h"
+#include "ui/chat/attach/attach_common.h"
 #include "ui/special_buttons.h"
 #include "ui/ui_utility.h"
 #include "ui/toasts/common_toasts.h"
@@ -635,17 +636,17 @@ bool RepliesWidget::confirmSendingFiles(
 	const auto replyTo = replyToId();
 	box->setConfirmedCallback(crl::guard(this, [=](
 			Ui::PreparedList &&list,
-			SendFilesWay way,
+			Ui::SendFilesWay way,
 			TextWithTags &&caption,
 			Api::SendOptions options,
 			bool ctrlShiftEnter) {
 		if (showSendingFilesError(list)) {
 			return;
 		}
-		const auto type = (way == SendFilesWay::Files)
+		const auto type = (way == Ui::SendFilesWay::Files)
 			? SendMediaType::File
 			: SendMediaType::Photo;
-		const auto album = (way == SendFilesWay::Album)
+		const auto album = (way == Ui::SendFilesWay::Album)
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
 		uploadFilesAfterConfirmation(
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index ad47b2da3..94015efa2 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/item_text_options.h"
 #include "ui/toast/toast.h"
 #include "ui/chat/attach/attach_prepare.h"
+#include "ui/chat/attach/attach_common.h"
 #include "ui/special_buttons.h"
 #include "ui/ui_utility.h"
 #include "ui/toasts/common_toasts.h"
@@ -376,17 +377,17 @@ bool ScheduledWidget::confirmSendingFiles(
 
 	box->setConfirmedCallback(crl::guard(this, [=](
 			Ui::PreparedList &&list,
-			SendFilesWay way,
+			Ui::SendFilesWay way,
 			TextWithTags &&caption,
 			Api::SendOptions options,
 			bool ctrlShiftEnter) {
 		if (showSendingFilesError(list)) {
 			return;
 		}
-		const auto type = (way == SendFilesWay::Files)
+		const auto type = (way == Ui::SendFilesWay::Files)
 			? SendMediaType::File
 			: SendMediaType::Photo;
-		const auto album = (way == SendFilesWay::Album)
+		const auto album = (way == Ui::SendFilesWay::Album)
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
 		uploadFilesAfterConfirmation(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 6eb21fba3..0aa633d6e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -18,13 +18,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_media_common.h"
 #include "ui/image/image.h"
 #include "ui/text/format_values.h"
+#include "ui/cached_round_corners.h"
 #include "layout.h" // FullSelection
 #include "data/data_session.h"
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_media_types.h"
 #include "data/data_file_origin.h"
-#include "app.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -306,8 +306,8 @@ void Document::draw(
 		}
 		p.drawPixmap(rthumb.topLeft(), thumb);
 		if (selected) {
-			auto overlayCorners = inWebPage ? SelectedOverlaySmallCorners : SelectedOverlayLargeCorners;
-			App::roundRect(p, rthumb, p.textPalette().selectOverlay, overlayCorners);
+			auto overlayCorners = inWebPage ? Ui::SelectedOverlaySmallCorners : Ui::SelectedOverlayLargeCorners;
+			Ui::FillRoundRect(p, rthumb, p.textPalette().selectOverlay, overlayCorners);
 		}
 
 		if (radial || (!loaded && !_data->loading())) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_game.cpp b/Telegram/SourceFiles/history/view/media/history_view_game.cpp
index 133c008f3..af6f8a282 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_game.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_game.cpp
@@ -15,11 +15,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/media/history_view_media_common.h"
 #include "ui/item_text_options.h"
+#include "ui/cached_round_corners.h"
 #include "core/ui_integration.h"
 #include "data/data_session.h"
 #include "data/data_game.h"
 #include "data/data_media_types.h"
-#include "app.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -261,7 +261,7 @@ void Game::draw(Painter &p, const QRect &r, TextSelection selection, crl::time m
 		auto gameX = pixwidth - st::msgDateImgDelta - gameW;
 		auto gameY = pixheight - st::msgDateImgDelta - gameH;
 
-		App::roundRect(p, style::rtlrect(gameX, gameY, gameW, gameH, pixwidth), selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
+		Ui::FillRoundRect(p, style::rtlrect(gameX, gameY, gameW, gameH, pixwidth), selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? Ui::DateSelectedCorners : Ui::DateCorners);
 
 		p.setFont(st::msgDateFont);
 		p.setPen(st::msgDateImgFg);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 3fab69882..43916d11d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -29,12 +29,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/image/image.h"
 #include "ui/text/format_values.h"
 #include "ui/grouped_layout.h"
+#include "ui/cached_round_corners.h"
 #include "data/data_session.h"
 #include "data/data_streaming.h"
 #include "data/data_document.h"
 #include "data/data_file_origin.h"
 #include "data/data_document_media.h"
-#include "app.h"
 #include "layout.h" // FullSelection
 #include "styles/style_chat.h"
 
@@ -343,7 +343,7 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 			}
 		}
 	} else if (!isRound) {
-		App::roundShadow(p, 0, 0, paintw, height(), selected ? st::msgInShadowSelected : st::msgInShadow, selected ? InSelectedShadowCorners : InShadowCorners);
+		Ui::FillRoundShadow(p, 0, 0, paintw, height(), selected ? st::msgInShadowSelected : st::msgInShadow, selected ? Ui::InSelectedShadowCorners : Ui::InShadowCorners);
 	}
 
 	auto usex = 0, usew = paintw;
@@ -451,14 +451,14 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 						| RectPart::NoTopBottom
 						| (roundTop ? RectPart::Top : RectPart::None)
 						| (roundBottom ? RectPart::Bottom : RectPart::None);
-					App::roundRect(p, rthumb.marginsAdded({ 0, roundTop ? 0 : margin, 0, roundBottom ? 0 : margin }), st::imageBg, roundRadius, parts);
+					Ui::FillRoundRect(p, rthumb.marginsAdded({ 0, roundTop ? 0 : margin, 0, roundBottom ? 0 : margin }), st::imageBg, roundRadius, parts);
 				}
 			}
 		}
 	}
 
 	if (selected) {
-		App::complexOverlayRect(p, rthumb, roundRadius, roundCorners);
+		Ui::FillComplexOverlayRect(p, rthumb, roundRadius, roundCorners);
 	}
 
 	if (radial
@@ -553,7 +553,7 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 		if (mediaUnread) {
 			statusW += st::mediaUnreadSkip + st::mediaUnreadSize;
 		}
-		App::roundRect(p, style::rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, width()), selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? StickerSelectedCorners : StickerCorners);
+		Ui::FillRoundRect(p, style::rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, width()), selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? Ui::StickerSelectedCorners : Ui::StickerCorners);
 		p.setFont(st::normalFont);
 		p.setPen(st::msgServiceFg);
 		p.drawTextLeft(statusX, statusY, width(), _statusText, statusW - 2 * st::msgDateImgPadding.x());
@@ -584,7 +584,7 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 			int recty = painty;
 			if (rtl()) rectx = width() - rectx - rectw;
 
-			App::roundRect(p, rectx, recty, rectw, recth, selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? StickerSelectedCorners : StickerCorners);
+			Ui::FillRoundRect(p, rectx, recty, rectw, recth, selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? Ui::StickerSelectedCorners : Ui::StickerCorners);
 			p.setPen(st::msgServiceFg);
 			rectx += st::msgReplyPadding.left();
 			rectw = innerw;
@@ -677,7 +677,7 @@ void Gif::drawCornerStatus(Painter &p, bool selected, QPoint position) const {
 	const auto statusY = position.y() + st::msgDateImgDelta + padding.y();
 	const auto around = style::rtlrect(statusX - padding.x(), statusY - padding.y(), statusW, statusH, width());
 	const auto statusTextTop = statusY + (cornerDownload ? (((statusH - 2 * st::normalFont->height) / 3)  - padding.y()) : 0);
-	App::roundRect(p, around, selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
+	Ui::FillRoundRect(p, around, selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? Ui::DateSelectedCorners : Ui::DateCorners);
 	p.setFont(st::normalFont);
 	p.setPen(st::msgDateImgFg);
 	p.drawTextLeft(statusX + addLeft, statusTextTop, width(), text, statusW - 2 * padding.x());
@@ -985,7 +985,7 @@ void Gif::drawGrouped(
 	}
 
 	if (selected) {
-		App::complexOverlayRect(p, geometry, roundRadius, corners);
+		Ui::FillComplexOverlayRect(p, geometry, roundRadius, corners);
 	}
 
 	if (radial
diff --git a/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp b/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp
index 5e3549655..dbd40997b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp
@@ -15,8 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_media_common.h"
 #include "ui/item_text_options.h"
 #include "ui/text/format_values.h"
+#include "ui/cached_round_corners.h"
 #include "data/data_media_types.h"
-#include "app.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -260,7 +260,7 @@ void Invoice::draw(Painter &p, const QRect &r, TextSelection selection, crl::tim
 		auto statusX = st::msgDateImgDelta;
 		auto statusY = st::msgDateImgDelta;
 
-		App::roundRect(p, style::rtlrect(statusX, statusY, statusW, statusH, pixwidth), selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
+		Ui::FillRoundRect(p, style::rtlrect(statusX, statusY, statusW, statusH, pixwidth), selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? Ui::DateSelectedCorners : Ui::DateCorners);
 
 		p.setFont(st::msgDateFont);
 		p.setPen(st::msgDateImgFg);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_location.cpp b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
index 70a1bfbd7..f539dddcb 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_location.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_location.cpp
@@ -16,10 +16,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_cursor_state.h"
 #include "ui/image/image.h"
 #include "ui/text/text_options.h"
+#include "ui/cached_round_corners.h"
 #include "data/data_session.h"
 #include "data/data_file_origin.h"
 #include "data/data_cloud_file.h"
-#include "app.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -179,7 +179,7 @@ void Location::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
 		}
 		painth -= painty;
 	} else {
-		App::roundShadow(p, 0, 0, paintw, painth, selected ? st::msgInShadowSelected : st::msgInShadow, selected ? InSelectedShadowCorners : InShadowCorners);
+		Ui::FillRoundShadow(p, 0, 0, paintw, painth, selected ? st::msgInShadowSelected : st::msgInShadow, selected ? Ui::InSelectedShadowCorners : Ui::InShadowCorners);
 	}
 
 	auto roundRadius = ImageRoundRadius::Large;
@@ -191,7 +191,7 @@ void Location::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
 		const auto &pix = thumbnail->pixSingle(paintw, painth, paintw, painth, roundRadius, roundCorners);
 		p.drawPixmap(rthumb.topLeft(), pix);
 	} else {
-		App::complexLocationRect(p, rthumb, roundRadius, roundCorners);
+		Ui::FillComplexLocationRect(p, rthumb, roundRadius, roundCorners);
 	}
 	const auto paintMarker = [&](const style::icon &icon) {
 		icon.paint(
@@ -203,7 +203,7 @@ void Location::draw(Painter &p, const QRect &r, TextSelection selection, crl::ti
 	paintMarker(st::historyMapPoint);
 	paintMarker(st::historyMapPointInner);
 	if (selected) {
-		App::complexOverlayRect(p, rthumb, roundRadius, roundCorners);
+		Ui::FillComplexOverlayRect(p, rthumb, roundRadius, roundCorners);
 	}
 
 	if (_parent->media() == this) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
index 9345ad268..8b2b63b97 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.cpp
@@ -15,8 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lottie/lottie_single_player.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "ui/cached_round_corners.h"
 #include "layout.h"
-#include "app.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -206,7 +206,7 @@ void UnwrappedMedia::drawSurrounding(
 		int recty = 0;
 		if (rtl()) rectx = width() - rectx - rectw;
 
-		App::roundRect(p, rectx, recty, rectw, recth, selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? StickerSelectedCorners : StickerCorners);
+		Ui::FillRoundRect(p, rectx, recty, rectw, recth, selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? Ui::StickerSelectedCorners : Ui::StickerCorners);
 		p.setPen(st::msgServiceFg);
 		rectx += st::msgReplyPadding.left();
 		rectw -= st::msgReplyPadding.left() + st::msgReplyPadding.right();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index 193455a9e..87f7e7bf9 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session_settings.h"
 #include "ui/image/image.h"
 #include "ui/grouped_layout.h"
+#include "ui/cached_round_corners.h"
 #include "data/data_session.h"
 #include "data/data_streaming.h"
 #include "data/data_photo.h"
@@ -28,7 +29,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_file_origin.h"
 #include "data/data_auto_download.h"
 #include "core/application.h"
-#include "app.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -249,7 +249,7 @@ void Photo::draw(Painter &p, const QRect &r, TextSelection selection, crl::time
 				rthumb = style::rtlrect(paintx, painty, paintw, painth, width());
 			}
 		} else {
-			App::roundShadow(p, 0, 0, paintw, painth, selected ? st::msgInShadowSelected : st::msgInShadow, selected ? InSelectedShadowCorners : InShadowCorners);
+			Ui::FillRoundShadow(p, 0, 0, paintw, painth, selected ? st::msgInShadowSelected : st::msgInShadow, selected ? Ui::InSelectedShadowCorners : Ui::InShadowCorners);
 		}
 		auto inWebPage = (_parent->media() != this);
 		auto roundRadius = inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
@@ -272,7 +272,7 @@ void Photo::draw(Painter &p, const QRect &r, TextSelection selection, crl::time
 		}();
 		p.drawPixmap(rthumb.topLeft(), pix);
 		if (selected) {
-			App::complexOverlayRect(p, rthumb, roundRadius, roundCorners);
+			Ui::FillComplexOverlayRect(p, rthumb, roundRadius, roundCorners);
 		}
 	}
 	if (radial || (!loaded && !_data->loading())) {
@@ -505,7 +505,7 @@ void Photo::drawGrouped(
 	p.drawPixmap(geometry.topLeft(), *cache);
 	if (selected) {
 		const auto roundRadius = ImageRoundRadius::Large;
-		App::complexOverlayRect(p, geometry, roundRadius, corners);
+		Ui::FillComplexOverlayRect(p, geometry, roundRadius, corners);
 	}
 
 	const auto displayState = radial
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index 437ab56c0..f6055a7fb 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -17,9 +17,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_file_origin.h"
 #include "base/qthelp_url.h"
 #include "ui/text/format_values.h"
+#include "ui/cached_round_corners.h"
 #include "window/themes/window_theme.h"
 #include "layout.h" // FullSelection
-#include "app.h"
+#include "app.h" // App::pixmapFromImageInPlace.
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -139,14 +140,14 @@ void ThemeDocument::draw(Painter &p, const QRect &r, TextSelection selection, cr
 	validateThumbnail();
 	p.drawPixmap(rthumb.topLeft(), _thumbnail);
 	if (selected) {
-		App::complexOverlayRect(p, rthumb, roundRadius, roundCorners);
+		Ui::FillComplexOverlayRect(p, rthumb, roundRadius, roundCorners);
 	}
 
 	auto statusX = paintx + st::msgDateImgDelta + st::msgDateImgPadding.x();
 	auto statusY = painty + st::msgDateImgDelta + st::msgDateImgPadding.y();
 	auto statusW = st::normalFont->width(_statusText) + 2 * st::msgDateImgPadding.x();
 	auto statusH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
-	App::roundRect(p, style::rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, width()), selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
+	Ui::FillRoundRect(p, style::rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, width()), selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? Ui::DateSelectedCorners : Ui::DateCorners);
 	p.setFont(st::normalFont);
 	p.setPen(st::msgDateImgFg);
 	p.drawTextLeft(statusX, statusY, width(), _statusText, statusW - 2 * st::msgDateImgPadding.x());
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
index 4e4e395f3..52a6a76ed 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/image/image.h"
 #include "ui/text/text_options.h"
 #include "ui/text/format_values.h"
+#include "ui/cached_round_corners.h"
 #include "layout.h" // FullSelection
 #include "data/data_session.h"
 #include "data/data_media_types.h"
@@ -26,7 +27,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_photo.h"
 #include "data/data_photo_media.h"
 #include "data/data_file_origin.h"
-#include "app.h"
 #include "styles/style_chat.h"
 
 namespace HistoryView {
@@ -501,7 +501,7 @@ void WebPage::draw(Painter &p, const QRect &r, TextSelection selection, crl::tim
 		}
 		p.drawPixmapLeft(padding.left() + paintw - pw, tshift, width(), pix);
 		if (selected) {
-			App::roundRect(p, style::rtlrect(padding.left() + paintw - pw, tshift, pw, _pixh, width()), p.textPalette().selectOverlay, SelectedOverlaySmallCorners);
+			Ui::FillRoundRect(p, style::rtlrect(padding.left() + paintw - pw, tshift, pw, _pixh, width()), p.textPalette().selectOverlay, Ui::SelectedOverlaySmallCorners);
 		}
 		paintw -= pw + st::webPagePhotoDelta;
 	}
@@ -569,7 +569,7 @@ void WebPage::draw(Painter &p, const QRect &r, TextSelection selection, crl::tim
 				auto dateW = pixwidth - dateX - st::msgDateImgDelta;
 				auto dateH = pixheight - dateY - st::msgDateImgDelta;
 
-				App::roundRect(p, dateX, dateY, dateW, dateH, selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
+				Ui::FillRoundRect(p, dateX, dateY, dateW, dateH, selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? Ui::DateSelectedCorners : Ui::DateCorners);
 
 				p.setFont(st::msgDateFont);
 				p.setPen(st::msgDateImgFg);
diff --git a/Telegram/SourceFiles/info/info_layer_widget.cpp b/Telegram/SourceFiles/info/info_layer_widget.cpp
index cd062dbc7..1627b1383 100644
--- a/Telegram/SourceFiles/info/info_layer_widget.cpp
+++ b/Telegram/SourceFiles/info/info_layer_widget.cpp
@@ -13,13 +13,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rp_widget.h"
 #include "ui/focus_persister.h"
 #include "ui/widgets/buttons.h"
+#include "ui/cached_round_corners.h"
 #include "window/section_widget.h"
 #include "window/window_session_controller.h"
 #include "window/main_window.h"
 #include "main/main_session.h"
 #include "boxes/abstract_box.h"
 #include "core/application.h"
-#include "app.h"
+#include "app.h" // App::quitting.
 #include "styles/style_info.h"
 #include "styles/style_window.h"
 #include "styles/style_layers.h"
@@ -269,11 +270,11 @@ void LayerWidget::paintEvent(QPaintEvent *e) {
 		}
 	}
 	if (parts) {
-		App::roundRect(
+		Ui::FillRoundRect(
 			p,
 			rect(),
 			st::boxBg,
-			BoxCorners,
+			Ui::BoxCorners,
 			nullptr,
 			parts);
 	}
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
index dde873ad1..4810cbc4a 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@@ -25,9 +25,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_cursor_state.h"
 #include "ui/image/image.h"
 #include "ui/text/format_values.h"
+#include "ui/cached_round_corners.h"
 #include "main/main_session.h"
 #include "lang/lang_keys.h"
-#include "app.h"
 #include "styles/style_overview.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
@@ -460,7 +460,7 @@ void Sticker::paint(Painter &p, const QRect &clip, const PaintContext *context)
 	auto over = _a_over.value(_active ? 1. : 0.);
 	if (over > 0) {
 		p.setOpacity(over);
-		App::roundRect(p, QRect(QPoint(0, 0), st::stickerPanSize), st::emojiPanHover, StickerHoverCorners);
+		Ui::FillRoundRect(p, QRect(QPoint(0, 0), st::stickerPanSize), st::emojiPanHover, Ui::StickerHoverCorners);
 		p.setOpacity(1);
 	}
 
@@ -734,7 +734,7 @@ void Video::paint(Painter &p, const QRect &clip, const PaintContext *context) co
 		int durationTop = st::inlineRowMargin + st::inlineThumbSize - st::normalFont->height - st::inlineDurationMargin;
 		int durationW = _durationWidth + 2 * st::msgDateImgPadding.x(), durationH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
 		int durationX = (st::inlineThumbSize - durationW) / 2, durationY = st::inlineRowMargin + st::inlineThumbSize - durationH;
-		App::roundRect(p, durationX, durationY - st::msgDateImgPadding.y(), durationW, durationH, st::msgDateImgBg, DateCorners);
+		Ui::FillRoundRect(p, durationX, durationY - st::msgDateImgPadding.y(), durationW, durationH, st::msgDateImgBg, Ui::DateCorners);
 		p.setPen(st::msgDateImgFg);
 		p.setFont(st::normalFont);
 		p.drawText(durationX + st::msgDateImgPadding.x(), durationTop + st::normalFont->ascent, _duration);
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
index 335ca6cd5..c3184fbb9 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
@@ -33,9 +33,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/labels.h"
+#include "ui/cached_round_corners.h"
 #include "history/view/history_view_cursor_state.h"
 #include "facades.h"
-#include "app.h"
 #include "styles/style_chat_helpers.h"
 
 #include <QtWidgets/QApplication>
@@ -905,7 +905,7 @@ void Widget::paintEvent(QPaintEvent *e) {
 
 void Widget::paintContent(Painter &p) {
 	auto inner = innerRect();
-	App::roundRect(p, inner, st::emojiPanBg, ImageRoundRadius::Small, RectPart::FullTop | RectPart::FullBottom);
+	Ui::FillRoundRect(p, inner, st::emojiPanBg, ImageRoundRadius::Small, RectPart::FullTop | RectPart::FullBottom);
 
 	auto horizontal = horizontalRect();
 	auto sidesTop = horizontal.y();
diff --git a/Telegram/SourceFiles/layout.cpp b/Telegram/SourceFiles/layout.cpp
index cea341830..6dcba44ab 100644
--- a/Telegram/SourceFiles/layout.cpp
+++ b/Telegram/SourceFiles/layout.cpp
@@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/audio/media_audio.h"
 #include "storage/localstorage.h"
 #include "history/view/history_view_cursor_state.h"
-#include "app.h"
+#include "ui/cached_round_corners.h"
 
 int32 documentColorIndex(DocumentData *document, QString &ext) {
 	auto colorIndex = 0;
@@ -118,8 +118,8 @@ style::color documentSelectedColor(int32 colorIndex) {
 	return colors[colorIndex & 3];
 }
 
-RoundCorners documentCorners(int32 colorIndex) {
-	return RoundCorners(Doc1Corners + (colorIndex & 3));
+Ui::CachedRoundCorners documentCorners(int32 colorIndex) {
+	return Ui::CachedRoundCorners(Ui::Doc1Corners + (colorIndex & 3));
 }
 
 [[nodiscard]] HistoryView::TextState LayoutItemBase::getState(
diff --git a/Telegram/SourceFiles/layout.h b/Telegram/SourceFiles/layout.h
index 7f5033db3..8fd524927 100644
--- a/Telegram/SourceFiles/layout.h
+++ b/Telegram/SourceFiles/layout.h
@@ -14,7 +14,9 @@ struct TextState;
 struct StateRequest;
 } // namespace HistoryView
 
-enum RoundCorners : int;
+namespace Ui {
+enum CachedRoundCorners : int;
+} // namespace Ui
 
 constexpr auto FullSelection = TextSelection { 0xFFFF, 0xFFFF };
 
@@ -57,7 +59,7 @@ style::color documentColor(int colorIndex);
 style::color documentDarkColor(int colorIndex);
 style::color documentOverColor(int colorIndex);
 style::color documentSelectedColor(int colorIndex);
-RoundCorners documentCorners(int colorIndex);
+Ui::CachedRoundCorners documentCorners(int colorIndex);
 
 class PaintContextBase {
 public:
diff --git a/Telegram/SourceFiles/main/main_session_settings.cpp b/Telegram/SourceFiles/main/main_session_settings.cpp
index 4a80fe280..6b178cd01 100644
--- a/Telegram/SourceFiles/main/main_session_settings.cpp
+++ b/Telegram/SourceFiles/main/main_session_settings.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "chat_helpers/tabbed_selector.h"
 #include "ui/widgets/input_fields.h"
+#include "ui/chat/attach/attach_common.h"
 #include "window/section_widget.h"
 #include "support/support_common.h"
 #include "storage/serialize_common.h"
@@ -367,11 +368,11 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 		for (const auto &[key, value] : appSoundOverrides) {
 			app.setSoundOverride(key, value);
 		}
-		auto uncheckedSendFilesWay = static_cast<SendFilesWay>(appSendFilesWay);
+		auto uncheckedSendFilesWay = static_cast<Ui::SendFilesWay>(appSendFilesWay);
 		switch (uncheckedSendFilesWay) {
-		case SendFilesWay::Album:
-		case SendFilesWay::Photos:
-		case SendFilesWay::Files: app.setSendFilesWay(uncheckedSendFilesWay); break;
+		case Ui::SendFilesWay::Album:
+		case Ui::SendFilesWay::Photos:
+		case Ui::SendFilesWay::Files: app.setSendFilesWay(uncheckedSendFilesWay); break;
 		}
 		auto uncheckedSendSubmitWay = static_cast<Ui::InputSubmitSettings>(
 			appSendSubmitWay);
diff --git a/Telegram/SourceFiles/media/player/media_player_panel.cpp b/Telegram/SourceFiles/media/player/media_player_panel.cpp
index 2be6eb4da..fcc7fe218 100644
--- a/Telegram/SourceFiles/media/player/media_player_panel.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_panel.cpp
@@ -19,9 +19,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/ui_utility.h"
+#include "ui/cached_round_corners.h"
 #include "mainwindow.h"
 #include "main/main_session.h"
-#include "app.h"
 #include "styles/style_overview.h"
 #include "styles/style_widgets.h"
 #include "styles/style_media_player.h"
@@ -159,7 +159,7 @@ void Panel::paintEvent(QPaintEvent *e) {
 		| RectPart::Top;
 	Ui::Shadow::paint(p, shadowedRect, width(), st::defaultRoundShadow, shadowedSides);
 	auto parts = RectPart::Full;
-	App::roundRect(p, shadowedRect, st::menuBg, MenuCorners, nullptr, parts);
+	Ui::FillRoundRect(p, shadowedRect, st::menuBg, Ui::MenuCorners, nullptr, parts);
 }
 
 void Panel::enterEventHook(QEvent *e) {
diff --git a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
index d21a1fbdc..2e2c452af 100644
--- a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
@@ -12,13 +12,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/continuous_sliders.h"
 #include "ui/ui_utility.h"
+#include "ui/cached_round_corners.h"
 #include "base/object_ptr.h"
 #include "mainwindow.h"
 #include "main/main_session.h"
 #include "window/window_session_controller.h"
 #include "core/application.h"
 #include "core/core_settings.h"
-#include "app.h"
 #include "styles/style_media_player.h"
 #include "styles/style_widgets.h"
 
@@ -146,7 +146,7 @@ void VolumeWidget::paintEvent(QPaintEvent *e) {
 	auto shadowedSides = RectPart::Left | RectPart::Right | RectPart::Bottom;
 	Ui::Shadow::paint(p, shadowedRect, width(), st::defaultRoundShadow, shadowedSides);
 	auto parts = RectPart::NoTopBottom | RectPart::FullBottom;
-	App::roundRect(p, QRect(shadowedRect.x(), -st::buttonRadius, shadowedRect.width(), shadowedRect.y() + shadowedRect.height() + st::buttonRadius), st::menuBg, MenuCorners, nullptr, parts);
+	Ui::FillRoundRect(p, QRect(shadowedRect.x(), -st::buttonRadius, shadowedRect.width(), shadowedRect.y() + shadowedRect.height() + st::buttonRadius), st::menuBg, Ui::MenuCorners, nullptr, parts);
 }
 
 void VolumeWidget::enterEventHook(QEvent *e) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 4771cea59..eff607fcb 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/format_values.h"
 #include "ui/item_text_options.h"
 #include "ui/ui_utility.h"
+#include "ui/cached_round_corners.h"
 #include "boxes/confirm_box.h"
 #include "media/audio/media_audio.h"
 #include "media/view/media_view_playback_controls.h"
@@ -3014,7 +3015,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
 				_saveMsgOpacity.update(qMin(progress, 1.), anim::linear);
 				if (_saveMsgOpacity.current() > 0) {
 					p.setOpacity(_saveMsgOpacity.current());
-					App::roundRect(p, _saveMsg, st::mediaviewSaveMsgBg, MediaviewSaveCorners);
+					Ui::FillRoundRect(p, _saveMsg, st::mediaviewSaveMsgBg, Ui::MediaviewSaveCorners);
 					st::mediaviewSaveMsgCheck.paint(p, _saveMsg.topLeft() + st::mediaviewSaveMsgCheckPos, width());
 
 					p.setPen(st::mediaviewSaveMsgFg);
diff --git a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
index f2ed6ccbd..3b8bb05be 100644
--- a/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
@@ -15,8 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/text/format_values.h"
+#include "ui/cached_round_corners.h"
 #include "lang/lang_keys.h"
-#include "app.h"
 #include "styles/style_media_view.h"
 
 namespace Media {
@@ -429,7 +429,7 @@ void PlaybackControls::paintEvent(QPaintEvent *e) {
 		_volumeController->setFadeOpacity(1.);
 		_childrenHidden = false;
 	}
-	App::roundRect(p, rect(), st::mediaviewSaveMsgBg, MediaviewSaveCorners);
+	Ui::FillRoundRect(p, rect(), st::mediaviewSaveMsgBg, Ui::MediaviewSaveCorners);
 }
 
 void PlaybackControls::mousePressEvent(QMouseEvent *e) {
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 5a4096ec1..57d25bdf4 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -38,6 +38,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/image/image.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_options.h"
+#include "ui/cached_round_corners.h"
 #include "app.h"
 
 namespace Overview {
@@ -501,7 +502,7 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			const auto statusW = icon.width() + padding.x() + st::normalFont->width(text) + 2 * padding.x();
 			const auto statusH = st::normalFont->height + 2 * padding.y();
 			p.setOpacity(1. - radialOpacity);
-			App::roundRect(p, statusX - padding.x(), statusY - padding.y(), statusW, statusH, selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? OverviewVideoSelectedCorners : OverviewVideoCorners);
+			Ui::FillRoundRect(p, statusX - padding.x(), statusY - padding.y(), statusW, statusH, selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? Ui::OverviewVideoSelectedCorners : Ui::OverviewVideoCorners);
 			p.setFont(st::normalFont);
 			p.setPen(st::msgDateImgFg);
 			icon.paint(p, statusX, statusY + (st::normalFont->height - icon.height()) / 2, _width);
@@ -1658,19 +1659,19 @@ void Link::validateThumbnail() {
 		const auto index = _letter.isEmpty()
 			? 0
 			: (_letter[0].unicode() % 4);
-		const auto fill = [&](style::color color, RoundCorners corners) {
+		const auto fill = [&](style::color color, Ui::CachedRoundCorners corners) {
 			auto pixRect = QRect(
 				0,
 				0,
 				st::linksPhotoSize,
 				st::linksPhotoSize);
-			App::roundRect(p, pixRect, color, corners);
+			Ui::FillRoundRect(p, pixRect, color, corners);
 		};
 		switch (index) {
-		case 0: fill(st::msgFile1Bg, Doc1Corners); break;
-		case 1: fill(st::msgFile2Bg, Doc2Corners); break;
-		case 2: fill(st::msgFile3Bg, Doc3Corners); break;
-		case 3: fill(st::msgFile4Bg, Doc4Corners); break;
+		case 0: fill(st::msgFile1Bg, Ui::Doc1Corners); break;
+		case 1: fill(st::msgFile2Bg, Ui::Doc2Corners); break;
+		case 2: fill(st::msgFile3Bg, Ui::Doc3Corners); break;
+		case 3: fill(st::msgFile4Bg, Ui::Doc4Corners); break;
 		}
 
 		if (!_letter.isEmpty()) {
diff --git a/Telegram/SourceFiles/settings/settings_intro.cpp b/Telegram/SourceFiles/settings/settings_intro.cpp
index 85a323fbf..7f7424433 100644
--- a/Telegram/SourceFiles/settings/settings_intro.cpp
+++ b/Telegram/SourceFiles/settings/settings_intro.cpp
@@ -18,10 +18,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/labels.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
+#include "ui/cached_round_corners.h"
 #include "lang/lang_keys.h"
 #include "boxes/abstract_box.h"
 #include "window/window_controller.h"
-#include "app.h"
 #include "styles/style_settings.h"
 #include "styles/style_layers.h"
 #include "styles/style_info.h"
@@ -524,11 +524,11 @@ void LayerWidget::paintEvent(QPaintEvent *e) {
 		parts |= RectPart::FullBottom;
 	}
 	if (parts) {
-		App::roundRect(
+		Ui::FillRoundRect(
 			p,
 			rect(),
 			st::boxBg,
-			BoxCorners,
+			Ui::BoxCorners,
 			nullptr,
 			parts);
 	}
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index 786e1f5f4..466f1bc9a 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/image/image_prepare.h"
+#include "ui/cached_round_corners.h"
 #include "window/section_widget.h"
 #include "window/window_session_controller.h"
 #include "boxes/peer_list_controllers.h"
@@ -859,7 +860,7 @@ void ForwardsPrivacyController::PaintForwardedTooltip(
 	const auto arrowLeft = arrowLeft2;
 	const auto geometry = rect.translated(left, top);
 
-	App::roundRect(p, geometry, st::toastBg, ImageRoundRadius::Small);
+	Ui::FillRoundRect(p, geometry, st::toastBg, ImageRoundRadius::Small);
 
 	p.setFont(font);
 	p.setPen(st::toastFg);
diff --git a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
index 729181abf..2bed620ff 100644
--- a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
+++ b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/mtproto_config.h"
 #include "ui/effects/animation_value.h"
 #include "ui/widgets/input_fields.h"
+#include "ui/chat/attach/attach_common.h"
 #include "window/themes/window_theme.h"
 #include "core/update_checker.h"
 #include "platform/platform_specific.h"
@@ -918,8 +919,8 @@ bool ReadSetting(
 		if (!CheckStreamStatus(stream)) return false;
 
 		Core::App().settings().setSendFilesWay((v == 1)
-			? SendFilesWay::Album
-			: SendFilesWay::Files);
+			? Ui::SendFilesWay::Album
+			: Ui::SendFilesWay::Files);
 		context.legacyRead = true;
 	} break;
 
diff --git a/Telegram/SourceFiles/ui/cached_round_corners.cpp b/Telegram/SourceFiles/ui/cached_round_corners.cpp
new file mode 100644
index 000000000..3402363b9
--- /dev/null
+++ b/Telegram/SourceFiles/ui/cached_round_corners.cpp
@@ -0,0 +1,255 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/cached_round_corners.h"
+
+#include "ui/ui_utility.h"
+#include "ui/image/image_prepare.h"
+#include "styles/style_chat.h"
+#include "styles/style_layers.h"
+#include "styles/style_overview.h"
+#include "styles/style_media_view.h"
+#include "styles/style_chat_helpers.h"
+
+namespace Ui {
+namespace {
+
+struct CornersPixmaps {
+	QPixmap p[4];
+};
+std::vector<CornersPixmaps> Corners;
+base::flat_map<uint32, CornersPixmaps> CornersMap;
+QImage CornersMaskLarge[4], CornersMaskSmall[4];
+rpl::lifetime PaletteChangedLifetime;
+
+void PrepareCorners(CachedRoundCorners index, int32 radius, const QBrush &brush, const style::color *shadow = nullptr, QImage *cors = nullptr) {
+	Expects(Corners.size() > index);
+
+	int32 r = radius * style::DevicePixelRatio(), s = st::msgShadow * style::DevicePixelRatio();
+	QImage rect(r * 3, r * 3 + (shadow ? s : 0), QImage::Format_ARGB32_Premultiplied), localCors[4];
+	{
+		Painter p(&rect);
+		PainterHighQualityEnabler hq(p);
+
+		p.setCompositionMode(QPainter::CompositionMode_Source);
+		p.fillRect(QRect(0, 0, rect.width(), rect.height()), Qt::transparent);
+		p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		p.setPen(Qt::NoPen);
+		if (shadow) {
+			p.setBrush((*shadow)->b);
+			p.drawRoundedRect(0, s, r * 3, r * 3, r, r);
+		}
+		p.setBrush(brush);
+		p.drawRoundedRect(0, 0, r * 3, r * 3, r, r);
+	}
+	if (!cors) cors = localCors;
+	cors[0] = rect.copy(0, 0, r, r);
+	cors[1] = rect.copy(r * 2, 0, r, r);
+	cors[2] = rect.copy(0, r * 2, r, r + (shadow ? s : 0));
+	cors[3] = rect.copy(r * 2, r * 2, r, r + (shadow ? s : 0));
+	if (index != SmallMaskCorners && index != LargeMaskCorners) {
+		for (int i = 0; i < 4; ++i) {
+			Corners[index].p[i] = PixmapFromImage(std::move(cors[i]));
+			Corners[index].p[i].setDevicePixelRatio(style::DevicePixelRatio());
+		}
+	}
+}
+
+void CreateMaskCorners() {
+	QImage mask[4];
+	PrepareCorners(SmallMaskCorners, st::buttonRadius, QColor(255, 255, 255), nullptr, mask);
+	for (int i = 0; i < 4; ++i) {
+		CornersMaskSmall[i] = mask[i].convertToFormat(QImage::Format_ARGB32_Premultiplied);
+		CornersMaskSmall[i].setDevicePixelRatio(style::DevicePixelRatio());
+	}
+	PrepareCorners(LargeMaskCorners, st::historyMessageRadius, QColor(255, 255, 255), nullptr, mask);
+	for (int i = 0; i < 4; ++i) {
+		CornersMaskLarge[i] = mask[i].convertToFormat(QImage::Format_ARGB32_Premultiplied);
+		CornersMaskLarge[i].setDevicePixelRatio(style::DevicePixelRatio());
+	}
+}
+
+void CreatePaletteCorners() {
+	PrepareCorners(MenuCorners, st::buttonRadius, st::menuBg);
+	PrepareCorners(BoxCorners, st::boxRadius, st::boxBg);
+	PrepareCorners(BotKbOverCorners, st::dateRadius, st::msgBotKbOverBgAdd);
+	PrepareCorners(StickerCorners, st::dateRadius, st::msgServiceBg);
+	PrepareCorners(StickerSelectedCorners, st::dateRadius, st::msgServiceBgSelected);
+	PrepareCorners(SelectedOverlaySmallCorners, st::buttonRadius, st::msgSelectOverlay);
+	PrepareCorners(SelectedOverlayLargeCorners, st::historyMessageRadius, st::msgSelectOverlay);
+	PrepareCorners(DateCorners, st::dateRadius, st::msgDateImgBg);
+	PrepareCorners(DateSelectedCorners, st::dateRadius, st::msgDateImgBgSelected);
+	PrepareCorners(OverviewVideoCorners, st::overviewVideoStatusRadius, st::msgDateImgBg);
+	PrepareCorners(OverviewVideoSelectedCorners, st::overviewVideoStatusRadius, st::msgDateImgBgSelected);
+	PrepareCorners(InShadowCorners, st::historyMessageRadius, st::msgInShadow);
+	PrepareCorners(InSelectedShadowCorners, st::historyMessageRadius, st::msgInShadowSelected);
+	PrepareCorners(ForwardCorners, st::historyMessageRadius, st::historyForwardChooseBg);
+	PrepareCorners(MediaviewSaveCorners, st::mediaviewControllerRadius, st::mediaviewSaveMsgBg);
+	PrepareCorners(EmojiHoverCorners, st::buttonRadius, st::emojiPanHover);
+	PrepareCorners(StickerHoverCorners, st::buttonRadius, st::emojiPanHover);
+	PrepareCorners(BotKeyboardCorners, st::buttonRadius, st::botKbBg);
+	PrepareCorners(PhotoSelectOverlayCorners, st::buttonRadius, st::overviewPhotoSelectOverlay);
+
+	PrepareCorners(Doc1Corners, st::buttonRadius, st::msgFile1Bg);
+	PrepareCorners(Doc2Corners, st::buttonRadius, st::msgFile2Bg);
+	PrepareCorners(Doc3Corners, st::buttonRadius, st::msgFile3Bg);
+	PrepareCorners(Doc4Corners, st::buttonRadius, st::msgFile4Bg);
+
+	PrepareCorners(MessageInCorners, st::historyMessageRadius, st::msgInBg, &st::msgInShadow);
+	PrepareCorners(MessageInSelectedCorners, st::historyMessageRadius, st::msgInBgSelected, &st::msgInShadowSelected);
+	PrepareCorners(MessageOutCorners, st::historyMessageRadius, st::msgOutBg, &st::msgOutShadow);
+	PrepareCorners(MessageOutSelectedCorners, st::historyMessageRadius, st::msgOutBgSelected, &st::msgOutShadowSelected);
+}
+
+} // namespace
+
+void StartCachedCorners() {
+	Corners.resize(RoundCornersCount);
+	CreateMaskCorners();
+	CreatePaletteCorners();
+
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		CreatePaletteCorners();
+	}, PaletteChangedLifetime);
+}
+
+void FinishCachedCorners() {
+	Corners.clear();
+	CornersMap.clear();
+	PaletteChangedLifetime.destroy();
+}
+
+void RectWithCorners(Painter &p, QRect rect, const style::color &bg, CachedRoundCorners index, RectParts corners) {
+	auto parts = RectPart::Top
+		| RectPart::NoTopBottom
+		| RectPart::Bottom
+		| corners;
+	FillRoundRect(p, rect, bg, index, nullptr, parts);
+	if ((corners & RectPart::AllCorners) != RectPart::AllCorners) {
+		const auto size = Corners[index].p[0].width() / style::DevicePixelRatio();
+		if (!(corners & RectPart::TopLeft)) {
+			p.fillRect(rect.x(), rect.y(), size, size, bg);
+		}
+		if (!(corners & RectPart::TopRight)) {
+			p.fillRect(rect.x() + rect.width() - size, rect.y(), size, size, bg);
+		}
+		if (!(corners & RectPart::BottomLeft)) {
+			p.fillRect(rect.x(), rect.y() + rect.height() - size, size, size, bg);
+		}
+		if (!(corners & RectPart::BottomRight)) {
+			p.fillRect(rect.x() + rect.width() - size, rect.y() + rect.height() - size, size, size, bg);
+		}
+	}
+}
+
+void FillComplexOverlayRect(Painter &p, QRect rect, ImageRoundRadius radius, RectParts corners) {
+	if (radius == ImageRoundRadius::Ellipse) {
+		PainterHighQualityEnabler hq(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(p.textPalette().selectOverlay);
+		p.drawEllipse(rect);
+	} else {
+		auto overlayCorners = (radius == ImageRoundRadius::Small)
+			? SelectedOverlaySmallCorners
+			: SelectedOverlayLargeCorners;
+		const auto bg = p.textPalette().selectOverlay;
+		RectWithCorners(p, rect, bg, overlayCorners, corners);
+	}
+}
+
+void FillComplexLocationRect(Painter &p, QRect rect, ImageRoundRadius radius, RectParts corners) {
+	RectWithCorners(p, rect, st::msgInBg, MessageInCorners, corners);
+}
+
+void FillRoundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, const CornersPixmaps &corner, const style::color *shadow, RectParts parts) {
+	auto cornerWidth = corner.p[0].width() / style::DevicePixelRatio();
+	auto cornerHeight = corner.p[0].height() / style::DevicePixelRatio();
+	if (w < 2 * cornerWidth || h < 2 * cornerHeight) return;
+	if (w > 2 * cornerWidth) {
+		if (parts & RectPart::Top) {
+			p.fillRect(x + cornerWidth, y, w - 2 * cornerWidth, cornerHeight, bg);
+		}
+		if (parts & RectPart::Bottom) {
+			p.fillRect(x + cornerWidth, y + h - cornerHeight, w - 2 * cornerWidth, cornerHeight, bg);
+			if (shadow) {
+				p.fillRect(x + cornerWidth, y + h, w - 2 * cornerWidth, st::msgShadow, *shadow);
+			}
+		}
+	}
+	if (h > 2 * cornerHeight) {
+		if ((parts & RectPart::NoTopBottom) == RectPart::NoTopBottom) {
+			p.fillRect(x, y + cornerHeight, w, h - 2 * cornerHeight, bg);
+		} else {
+			if (parts & RectPart::Left) {
+				p.fillRect(x, y + cornerHeight, cornerWidth, h - 2 * cornerHeight, bg);
+			}
+			if ((parts & RectPart::Center) && w > 2 * cornerWidth) {
+				p.fillRect(x + cornerWidth, y + cornerHeight, w - 2 * cornerWidth, h - 2 * cornerHeight, bg);
+			}
+			if (parts & RectPart::Right) {
+				p.fillRect(x + w - cornerWidth, y + cornerHeight, cornerWidth, h - 2 * cornerHeight, bg);
+			}
+		}
+	}
+	if (parts & RectPart::TopLeft) {
+		p.drawPixmap(x, y, corner.p[0]);
+	}
+	if (parts & RectPart::TopRight) {
+		p.drawPixmap(x + w - cornerWidth, y, corner.p[1]);
+	}
+	if (parts & RectPart::BottomLeft) {
+		p.drawPixmap(x, y + h - cornerHeight, corner.p[2]);
+	}
+	if (parts & RectPart::BottomRight) {
+		p.drawPixmap(x + w - cornerWidth, y + h - cornerHeight, corner.p[3]);
+	}
+}
+
+void FillRoundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, CachedRoundCorners index, const style::color *shadow, RectParts parts) {
+	FillRoundRect(p, x, y, w, h, bg, Corners[index], shadow, parts);
+}
+
+void FillRoundShadow(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color shadow, CachedRoundCorners index, RectParts parts) {
+	auto &corner = Corners[index];
+	auto cornerWidth = corner.p[0].width() / style::DevicePixelRatio();
+	auto cornerHeight = corner.p[0].height() / style::DevicePixelRatio();
+	if (parts & RectPart::Bottom) {
+		p.fillRect(x + cornerWidth, y + h, w - 2 * cornerWidth, st::msgShadow, shadow);
+	}
+	if (parts & RectPart::BottomLeft) {
+		p.fillRect(x, y + h - cornerHeight, cornerWidth, st::msgShadow, shadow);
+		p.drawPixmap(x, y + h - cornerHeight + st::msgShadow, corner.p[2]);
+	}
+	if (parts & RectPart::BottomRight) {
+		p.fillRect(x + w - cornerWidth, y + h - cornerHeight, cornerWidth, st::msgShadow, shadow);
+		p.drawPixmap(x + w - cornerWidth, y + h - cornerHeight + st::msgShadow, corner.p[3]);
+	}
+}
+
+void FillRoundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, ImageRoundRadius radius, RectParts parts) {
+	auto colorKey = ((uint32(bg->c.alpha()) & 0xFF) << 24) | ((uint32(bg->c.red()) & 0xFF) << 16) | ((uint32(bg->c.green()) & 0xFF) << 8) | ((uint32(bg->c.blue()) & 0xFF) << 24);
+	auto i = CornersMap.find(colorKey);
+	if (i == CornersMap.cend()) {
+		QImage images[4];
+		switch (radius) {
+		case ImageRoundRadius::Small: PrepareCorners(SmallMaskCorners, st::buttonRadius, bg, nullptr, images); break;
+		case ImageRoundRadius::Large: PrepareCorners(LargeMaskCorners, st::historyMessageRadius, bg, nullptr, images); break;
+		default: p.fillRect(x, y, w, h, bg); return;
+		}
+
+		CornersPixmaps pixmaps;
+		for (int j = 0; j < 4; ++j) {
+			pixmaps.p[j] = PixmapFromImage(std::move(images[j]));
+			pixmaps.p[j].setDevicePixelRatio(style::DevicePixelRatio());
+		}
+		i = CornersMap.emplace(colorKey, pixmaps).first;
+	}
+	FillRoundRect(p, x, y, w, h, bg, i->second, nullptr, parts);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/cached_round_corners.h b/Telegram/SourceFiles/ui/cached_round_corners.h
new file mode 100644
index 000000000..92e61df08
--- /dev/null
+++ b/Telegram/SourceFiles/ui/cached_round_corners.h
@@ -0,0 +1,75 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rect_part.h"
+
+class Painter;
+
+enum class ImageRoundRadius;
+
+namespace Ui {
+
+enum CachedRoundCorners : int {
+	SmallMaskCorners = 0x00, // for images
+	LargeMaskCorners,
+
+	BoxCorners,
+	MenuCorners,
+	BotKbOverCorners,
+	StickerCorners,
+	StickerSelectedCorners,
+	SelectedOverlaySmallCorners,
+	SelectedOverlayLargeCorners,
+	DateCorners,
+	DateSelectedCorners,
+	OverviewVideoCorners,
+	OverviewVideoSelectedCorners,
+	ForwardCorners,
+	MediaviewSaveCorners,
+	EmojiHoverCorners,
+	StickerHoverCorners,
+	BotKeyboardCorners,
+	PhotoSelectOverlayCorners,
+
+	Doc1Corners,
+	Doc2Corners,
+	Doc3Corners,
+	Doc4Corners,
+
+	InShadowCorners, // for photos without bg
+	InSelectedShadowCorners,
+
+	MessageInCorners, // with shadow
+	MessageInSelectedCorners,
+	MessageOutCorners,
+	MessageOutSelectedCorners,
+
+	RoundCornersCount
+};
+
+void FillComplexOverlayRect(Painter &p, QRect rect, ImageRoundRadius radius, RectParts corners);
+void FillComplexLocationRect(Painter &p, QRect rect, ImageRoundRadius radius, RectParts corners);
+
+void FillRoundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, CachedRoundCorners index, const style::color *shadow = nullptr, RectParts parts = RectPart::Full);
+inline void FillRoundRect(Painter &p, const QRect &rect, style::color bg, CachedRoundCorners index, const style::color *shadow = nullptr, RectParts parts = RectPart::Full) {
+	return FillRoundRect(p, rect.x(), rect.y(), rect.width(), rect.height(), bg, index, shadow, parts);
+}
+void FillRoundShadow(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color shadow, CachedRoundCorners index, RectParts parts = RectPart::Full);
+inline void FillRoundShadow(Painter &p, const QRect &rect, style::color shadow, CachedRoundCorners index, RectParts parts = RectPart::Full) {
+	return FillRoundShadow(p, rect.x(), rect.y(), rect.width(), rect.height(), shadow, index, parts);
+}
+void FillRoundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color bg, ImageRoundRadius radius, RectParts parts = RectPart::Full);
+inline void FillRoundRect(Painter &p, const QRect &rect, style::color bg, ImageRoundRadius radius, RectParts parts = RectPart::Full) {
+	return FillRoundRect(p, rect.x(), rect.y(), rect.width(), rect.height(), bg, radius, parts);
+}
+
+void StartCachedCorners();
+void FinishCachedCorners();
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
new file mode 100644
index 000000000..f7086ccd6
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
@@ -0,0 +1,484 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/attach/attach_album_preview.h"
+
+#include "ui/chat/attach/attach_album_thumbnail.h"
+#include "ui/chat/attach/attach_prepare.h"
+#include "styles/style_chat.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kDragDuration = crl::time(200);
+
+} // namespace
+
+AlbumPreview::AlbumPreview(
+	QWidget *parent,
+	const PreparedList &list,
+	SendFilesWay way)
+: RpWidget(parent)
+, _list(list)
+, _sendWay(way) {
+	setMouseTracking(true);
+	prepareThumbs();
+	updateSize();
+	updateFileRows();
+}
+
+AlbumPreview::~AlbumPreview() = default;
+
+void AlbumPreview::setSendWay(SendFilesWay way) {
+	if (_sendWay != way) {
+		cancelDrag();
+		_sendWay = way;
+	}
+	updateSize();
+	updateFileRows();
+	update();
+}
+
+void AlbumPreview::updateFileRows() {
+	Expects(_order.size() == _thumbs.size());
+	const auto isFile = (_sendWay == SendFilesWay::Files);
+	for (auto i = 0; i < _order.size(); i++) {
+		_thumbs[i]->updateFileRow(isFile ? _order[i] : -1);
+	}
+}
+
+std::vector<int> AlbumPreview::takeOrder() {
+	auto reordered = std::vector<std::unique_ptr<AlbumThumbnail>>();
+	reordered.reserve(_thumbs.size());
+	for (auto index : _order) {
+		reordered.push_back(std::move(_thumbs[index]));
+	}
+	_thumbs = std::move(reordered);
+	return std::exchange(_order, defaultOrder());
+}
+
+auto AlbumPreview::generateOrderedLayout() const
+-> std::vector<GroupMediaLayout> {
+	auto sizes = ranges::view::all(
+		_order
+	) | ranges::view::transform([&](int index) {
+		return _list.files[index].shownDimensions;
+	}) | ranges::to_vector;
+
+	auto layout = LayoutMediaGroup(
+		sizes,
+		st::sendMediaPreviewSize,
+		st::historyGroupWidthMin / 2,
+		st::historyGroupSkip / 2);
+	Assert(layout.size() == _order.size());
+	return layout;
+}
+
+std::vector<int> AlbumPreview::defaultOrder() const {
+	const auto count = int(_list.files.size());
+	return ranges::view::ints(0, count) | ranges::to_vector;
+}
+
+void AlbumPreview::prepareThumbs() {
+	_order = defaultOrder();
+
+	const auto count = int(_list.files.size());
+	const auto layout = generateOrderedLayout();
+	_thumbs.reserve(count);
+	for (auto i = 0; i != count; ++i) {
+		_thumbs.push_back(std::make_unique<AlbumThumbnail>(
+			_list.files[i],
+			layout[i],
+			this,
+			[=] { changeThumbByIndex(thumbIndex(thumbUnderCursor())); },
+			[=] { deleteThumbByIndex(thumbIndex(thumbUnderCursor())); }));
+	}
+	_thumbsHeight = countLayoutHeight(layout);
+	_photosHeight = ranges::accumulate(ranges::view::all(
+		_thumbs
+	) | ranges::view::transform([](const auto &thumb) {
+		return thumb->photoHeight();
+	}), 0) + (count - 1) * st::sendMediaPreviewPhotoSkip;
+
+	_filesHeight = count * st::sendMediaFileThumbSize
+		+ (count - 1) * st::sendMediaFileThumbSkip;
+}
+
+int AlbumPreview::contentLeft() const {
+	return (st::boxWideWidth - st::sendMediaPreviewSize) / 2;
+}
+
+int AlbumPreview::contentTop() const {
+	return 0;
+}
+
+AlbumThumbnail *AlbumPreview::findThumb(QPoint position) const {
+	position -= QPoint(contentLeft(), contentTop());
+
+	auto top = 0;
+	const auto isPhotosWay = (_sendWay == SendFilesWay::Photos);
+	const auto skip = isPhotosWay
+		? st::sendMediaPreviewPhotoSkip
+		: st::sendMediaFileThumbSkip;
+	auto find = [&](const auto &thumb) {
+		if (_sendWay == SendFilesWay::Album) {
+			return thumb->containsPoint(position);
+		} else if (isPhotosWay || _sendWay == SendFilesWay::Files) {
+			const auto bottom = top + (isPhotosWay
+				? thumb->photoHeight()
+				: st::sendMediaFileThumbSize);
+			const auto isUnderTop = (position.y() > top);
+			top = bottom + skip;
+			return isUnderTop && (position.y() < bottom);
+		}
+		return false;
+	};
+
+	const auto i = ranges::find_if(_thumbs, std::move(find));
+	return (i == _thumbs.end()) ? nullptr : i->get();
+}
+
+not_null<AlbumThumbnail*> AlbumPreview::findClosestThumb(
+	QPoint position) const {
+	Expects(_draggedThumb != nullptr);
+
+	if (const auto exact = findThumb(position)) {
+		return exact;
+	}
+	auto result = _draggedThumb;
+	auto distance = _draggedThumb->distanceTo(position);
+	for (const auto &thumb : _thumbs) {
+		const auto check = thumb->distanceTo(position);
+		if (check < distance) {
+			distance = check;
+			result = thumb.get();
+		}
+	}
+	return result;
+}
+
+int AlbumPreview::orderIndex(
+	not_null<AlbumThumbnail*> thumb) const {
+	const auto i = ranges::find_if(_order, [&](int index) {
+		return (_thumbs[index].get() == thumb);
+	});
+	Assert(i != _order.end());
+	return int(i - _order.begin());
+}
+
+void AlbumPreview::cancelDrag() {
+	_thumbsHeightAnimation.stop();
+	_finishDragAnimation.stop();
+	_shrinkAnimation.stop();
+	if (_draggedThumb) {
+		_draggedThumb->moveInAlbum({ 0, 0 });
+		_draggedThumb = nullptr;
+	}
+	if (_suggestedThumb) {
+		const auto suggestedIndex = orderIndex(_suggestedThumb);
+		if (suggestedIndex > 0) {
+			_thumbs[_order[suggestedIndex - 1]]->suggestMove(0., [] {});
+		}
+		if (suggestedIndex < int(_order.size() - 1)) {
+			_thumbs[_order[suggestedIndex + 1]]->suggestMove(0., [] {});
+		}
+		_suggestedThumb->suggestMove(0., [] {});
+		_suggestedThumb->finishAnimations();
+		_suggestedThumb = nullptr;
+	}
+	_paintedAbove = nullptr;
+	update();
+}
+
+void AlbumPreview::finishDrag() {
+	Expects(_draggedThumb != nullptr);
+	Expects(_suggestedThumb != nullptr);
+
+	if (_suggestedThumb != _draggedThumb) {
+		const auto currentIndex = orderIndex(_draggedThumb);
+		const auto newIndex = orderIndex(_suggestedThumb);
+		const auto delta = (currentIndex < newIndex) ? 1 : -1;
+		const auto realIndex = _order[currentIndex];
+		for (auto i = currentIndex; i != newIndex; i += delta) {
+			_order[i] = _order[i + delta];
+		}
+		_order[newIndex] = realIndex;
+		const auto layout = generateOrderedLayout();
+		for (auto i = 0, count = int(_order.size()); i != count; ++i) {
+			_thumbs[_order[i]]->moveToLayout(layout[i]);
+		}
+		_finishDragAnimation.start([=] { update(); }, 0., 1., kDragDuration);
+
+		updateSizeAnimated(layout);
+	} else {
+		for (const auto &thumb : _thumbs) {
+			thumb->resetLayoutAnimation();
+		}
+		_draggedThumb->animateLayoutToInitial();
+		_finishDragAnimation.start([=] { update(); }, 0., 1., kDragDuration);
+	}
+}
+
+int AlbumPreview::countLayoutHeight(
+	const std::vector<GroupMediaLayout> &layout) const {
+	const auto accumulator = [](int current, const auto &item) {
+		return std::max(current, item.geometry.y() + item.geometry.height());
+	};
+	return ranges::accumulate(layout, 0, accumulator);
+}
+
+void AlbumPreview::updateSizeAnimated(
+	const std::vector<GroupMediaLayout> &layout) {
+	const auto newHeight = countLayoutHeight(layout);
+	if (newHeight != _thumbsHeight) {
+		_thumbsHeightAnimation.start(
+			[=] { updateSize(); },
+			_thumbsHeight,
+			newHeight,
+			kDragDuration);
+		_thumbsHeight = newHeight;
+	}
+}
+
+void AlbumPreview::updateSize() {
+	const auto newHeight = [&] {
+		switch (_sendWay) {
+		case SendFilesWay::Album:
+			return int(std::round(_thumbsHeightAnimation.value(
+				_thumbsHeight)));
+		case SendFilesWay::Photos: return _photosHeight;
+		case SendFilesWay::Files: return _filesHeight;
+		}
+		Unexpected("Send way in AlbumPreview::updateSize");
+	}();
+	if (height() != newHeight) {
+		resize(st::boxWideWidth, newHeight);
+	}
+}
+
+void AlbumPreview::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+
+	switch (_sendWay) {
+	case SendFilesWay::Album: paintAlbum(p); break;
+	case SendFilesWay::Photos: paintPhotos(p, e->rect()); break;
+	case SendFilesWay::Files: paintFiles(p, e->rect()); break;
+	}
+}
+
+void AlbumPreview::paintAlbum(Painter &p) const {
+	const auto shrink = _shrinkAnimation.value(_draggedThumb ? 1. : 0.);
+	const auto moveProgress = _finishDragAnimation.value(1.);
+	const auto left = contentLeft();
+	const auto top = contentTop();
+	for (const auto &thumb : _thumbs) {
+		if (thumb.get() != _paintedAbove) {
+			thumb->paintInAlbum(p, left, top, shrink, moveProgress);
+		}
+	}
+	if (_paintedAbove) {
+		_paintedAbove->paintInAlbum(p, left, top, shrink, moveProgress);
+	}
+}
+
+void AlbumPreview::paintPhotos(Painter &p, QRect clip) const {
+	const auto left = (st::boxWideWidth - st::sendMediaPreviewSize) / 2;
+	auto top = 0;
+	const auto outerWidth = width();
+	for (const auto &thumb : _thumbs) {
+		const auto bottom = top + thumb->photoHeight();
+		const auto guard = gsl::finally([&] {
+			top = bottom + st::sendMediaPreviewPhotoSkip;
+		});
+		if (top >= clip.y() + clip.height()) {
+			break;
+		} else if (bottom <= clip.y()) {
+			continue;
+		}
+		thumb->paintPhoto(p, left, top, outerWidth);
+	}
+}
+
+void AlbumPreview::paintFiles(Painter &p, QRect clip) const {
+	const auto fileHeight = st::sendMediaFileThumbSize
+		+ st::sendMediaFileThumbSkip;
+	const auto bottom = clip.y() + clip.height();
+	const auto from = std::clamp(clip.y() / fileHeight, 0, int(_thumbs.size()));
+	const auto till = std::clamp((bottom + fileHeight - 1) / fileHeight, 0, int(_thumbs.size()));
+	const auto left = (st::boxWideWidth - st::sendMediaPreviewSize) / 2;
+	const auto outerWidth = width();
+
+	auto top = from * fileHeight;
+	for (auto i = from; i != till; ++i) {
+		_thumbs[i]->paintFile(p, left, top, outerWidth);
+		top += fileHeight;
+	}
+}
+
+int AlbumPreview::thumbIndex(AlbumThumbnail *thumb) {
+	if (!thumb) {
+		return -1;
+	}
+	const auto thumbIt = ranges::find_if(_thumbs, [&](auto &t) {
+		return t.get() == thumb;
+	});
+	Expects(thumbIt != _thumbs.end());
+	return std::distance(_thumbs.begin(), thumbIt);
+}
+
+AlbumThumbnail *AlbumPreview::thumbUnderCursor() {
+	return findThumb(mapFromGlobal(QCursor::pos()));
+}
+
+void AlbumPreview::deleteThumbByIndex(int index) {
+	if (index < 0) {
+		return;
+	}
+	const auto orderIt = ranges::find(_order, index);
+	Expects(orderIt != _order.end());
+
+	_order.erase(orderIt);
+	ranges::for_each(_order, [=](auto &i) {
+		if (i > index) {
+			i--;
+		}
+	});
+	_thumbDeleted.fire(std::move(index));
+}
+
+void AlbumPreview::changeThumbByIndex(int index) {
+	if (index < 0) {
+		return;
+	}
+	_thumbChanged.fire(std::move(index));
+}
+
+void AlbumPreview::thumbButtonsCallback(
+		not_null<AlbumThumbnail*> thumb,
+		AttachButtonType type) {
+	const auto index = thumbIndex(thumb);
+
+	switch (type) {
+	case AttachButtonType::None: return;
+	case AttachButtonType::Edit: changeThumbByIndex(index); break;
+	case AttachButtonType::Delete: deleteThumbByIndex(index); break;
+	}
+}
+
+void AlbumPreview::mousePressEvent(QMouseEvent *e) {
+	if (_finishDragAnimation.animating()) {
+		return;
+	}
+	const auto position = e->pos();
+	cancelDrag();
+	if (const auto thumb = findThumb(position)) {
+		if (thumb->buttonsContainPoint(e->pos())) {
+			thumbButtonsCallback(thumb, thumb->buttonTypeFromPoint(e->pos()));
+			return;
+		}
+		_paintedAbove = _suggestedThumb = _draggedThumb = thumb;
+		_draggedStartPosition = position;
+		_shrinkAnimation.start(
+			[=] { update(); },
+			0.,
+			1.,
+			AlbumThumbnail::kShrinkDuration);
+	}
+}
+
+void AlbumPreview::mouseMoveEvent(QMouseEvent *e) {
+	if (_sendWay == SendFilesWay::Files) {
+		applyCursor(style::cur_default);
+		return;
+	}
+	const auto isAlbum = (_sendWay == SendFilesWay::Album);
+	if (isAlbum && _draggedThumb) {
+		const auto position = e->pos();
+		_draggedThumb->moveInAlbum(position - _draggedStartPosition);
+		updateSuggestedDrag(_draggedThumb->center());
+		update();
+	} else {
+		const auto thumb = findThumb(e->pos());
+		const auto regularCursor = isAlbum
+			? style::cur_sizeall
+			: style::cur_default;
+		const auto cursor = thumb
+			? (thumb->buttonsContainPoint(e->pos())
+				? style::cur_pointer
+				: regularCursor)
+			: style::cur_default;
+		applyCursor(cursor);
+	}
+}
+
+void AlbumPreview::applyCursor(style::cursor cursor) {
+	if (_cursor != cursor) {
+		_cursor = cursor;
+		setCursor(_cursor);
+	}
+}
+
+void AlbumPreview::updateSuggestedDrag(QPoint position) {
+	auto closest = findClosestThumb(position);
+	auto closestIndex = orderIndex(closest);
+
+	const auto draggedIndex = orderIndex(_draggedThumb);
+	const auto closestIsBeforePoint = closest->isPointAfter(position);
+	if (closestIndex < draggedIndex && closestIsBeforePoint) {
+		closest = _thumbs[_order[++closestIndex]].get();
+	} else if (closestIndex > draggedIndex && !closestIsBeforePoint) {
+		closest = _thumbs[_order[--closestIndex]].get();
+	}
+
+	if (_suggestedThumb == closest) {
+		return;
+	}
+
+	const auto last = int(_order.size()) - 1;
+	if (_suggestedThumb) {
+		const auto suggestedIndex = orderIndex(_suggestedThumb);
+		if (suggestedIndex < draggedIndex && suggestedIndex > 0) {
+			const auto previous = _thumbs[_order[suggestedIndex - 1]].get();
+			previous->suggestMove(0., [=] { update(); });
+		} else if (suggestedIndex > draggedIndex && suggestedIndex < last) {
+			const auto next = _thumbs[_order[suggestedIndex + 1]].get();
+			next->suggestMove(0., [=] { update(); });
+		}
+		_suggestedThumb->suggestMove(0., [=] { update(); });
+	}
+	_suggestedThumb = closest;
+	const auto suggestedIndex = closestIndex;
+	if (_suggestedThumb != _draggedThumb) {
+		const auto delta = (suggestedIndex < draggedIndex) ? 1. : -1.;
+		if (delta > 0. && suggestedIndex > 0) {
+			const auto previous = _thumbs[_order[suggestedIndex - 1]].get();
+			previous->suggestMove(-delta, [=] { update(); });
+		} else if (delta < 0. && suggestedIndex < last) {
+			const auto next = _thumbs[_order[suggestedIndex + 1]].get();
+			next->suggestMove(-delta, [=] { update(); });
+		}
+		_suggestedThumb->suggestMove(delta, [=] { update(); });
+	}
+}
+
+void AlbumPreview::mouseReleaseEvent(QMouseEvent *e) {
+	if (_draggedThumb) {
+		finishDrag();
+		_shrinkAnimation.start(
+			[=] { update(); },
+			1.,
+			0.,
+			AlbumThumbnail::kShrinkDuration);
+		_draggedThumb = nullptr;
+		_suggestedThumb = nullptr;
+		update();
+	}
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
new file mode 100644
index 000000000..752cc2af7
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
@@ -0,0 +1,99 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/chat/attach/attach_common.h"
+
+namespace Ui {
+
+struct PreparedList;
+struct GroupMediaLayout;
+class AlbumThumbnail;
+
+class AlbumPreview final : public RpWidget {
+public:
+	AlbumPreview(
+		QWidget *parent,
+		const PreparedList &list,
+		SendFilesWay way);
+	~AlbumPreview();
+
+	void setSendWay(SendFilesWay way);
+	std::vector<int> takeOrder();
+
+	auto thumbDeleted() {
+		return _thumbDeleted.events();
+	}
+
+	auto thumbChanged() {
+		return _thumbChanged.events();
+	}
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+
+private:
+	int countLayoutHeight(
+		const std::vector<GroupMediaLayout> &layout) const;
+	std::vector<GroupMediaLayout> generateOrderedLayout() const;
+	std::vector<int> defaultOrder() const;
+	void prepareThumbs();
+	void updateSizeAnimated(const std::vector<GroupMediaLayout> &layout);
+	void updateSize();
+	void updateFileRows();
+
+	int thumbIndex(AlbumThumbnail *thumb);
+	AlbumThumbnail *thumbUnderCursor();
+	void deleteThumbByIndex(int index);
+	void changeThumbByIndex(int index);
+	void thumbButtonsCallback(
+		not_null<AlbumThumbnail*> thumb,
+		AttachButtonType type);
+
+	void paintAlbum(Painter &p) const;
+	void paintPhotos(Painter &p, QRect clip) const;
+	void paintFiles(Painter &p, QRect clip) const;
+
+	void applyCursor(style::cursor cursor);
+	int contentLeft() const;
+	int contentTop() const;
+	AlbumThumbnail *findThumb(QPoint position) const;
+	not_null<AlbumThumbnail*> findClosestThumb(QPoint position) const;
+	void updateSuggestedDrag(QPoint position);
+	int orderIndex(not_null<AlbumThumbnail*> thumb) const;
+	void cancelDrag();
+	void finishDrag();
+
+	const PreparedList &_list;
+	SendFilesWay _sendWay = SendFilesWay::Files;
+	style::cursor _cursor = style::cur_default;
+	std::vector<int> _order;
+	std::vector<std::unique_ptr<AlbumThumbnail>> _thumbs;
+	int _thumbsHeight = 0;
+	int _photosHeight = 0;
+	int _filesHeight = 0;
+
+	AlbumThumbnail *_draggedThumb = nullptr;
+	AlbumThumbnail *_suggestedThumb = nullptr;
+	AlbumThumbnail *_paintedAbove = nullptr;
+	QPoint _draggedStartPosition;
+
+	rpl::event_stream<int> _thumbDeleted;
+	rpl::event_stream<int> _thumbChanged;
+
+	mutable Animations::Simple _thumbsHeightAnimation;
+	mutable Animations::Simple _shrinkAnimation;
+	mutable Animations::Simple _finishDragAnimation;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
new file mode 100644
index 000000000..7664a2168
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
@@ -0,0 +1,543 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/attach/attach_album_thumbnail.h"
+
+#include "ui/chat/attach/attach_prepare.h"
+#include "ui/image/image_prepare.h"
+#include "ui/text/format_values.h"
+#include "ui/widgets/buttons.h"
+#include "ui/ui_utility.h"
+#include "base/call_delayed.h"
+#include "styles/style_chat.h"
+#include "styles/style_boxes.h"
+
+#include <QtCore/QFileInfo>
+
+namespace Ui {
+
+AlbumThumbnail::AlbumThumbnail(
+	const PreparedFile &file,
+	const GroupMediaLayout &layout,
+	QWidget *parent,
+	Fn<void()> editCallback,
+	Fn<void()> deleteCallback)
+: _layout(layout)
+, _fullPreview(file.preview)
+, _shrinkSize(int(std::ceil(st::historyMessageRadius / 1.4)))
+, _isVideo(file.type == PreparedFile::AlbumType::Video)
+, _buttonsRect(st::sendBoxAlbumGroupRadius, st::callFingerprintBg) {
+	Expects(!_fullPreview.isNull());
+
+	moveToLayout(layout);
+
+	using Option = Images::Option;
+	const auto previewWidth = _fullPreview.width();
+	const auto previewHeight = _fullPreview.height();
+	const auto imageWidth = std::max(
+		previewWidth / style::DevicePixelRatio(),
+		st::minPhotoSize);
+	const auto imageHeight = std::max(
+		previewHeight / style::DevicePixelRatio(),
+		st::minPhotoSize);
+	_photo = PixmapFromImage(Images::prepare(
+		_fullPreview,
+		previewWidth,
+		previewHeight,
+		Option::RoundedLarge | Option::RoundedAll,
+		imageWidth,
+		imageHeight));
+
+	const auto idealSize = st::sendMediaFileThumbSize * style::DevicePixelRatio();
+	const auto fileThumbSize = (previewWidth > previewHeight)
+		? QSize(previewWidth * idealSize / previewHeight, idealSize)
+		: QSize(idealSize, previewHeight * idealSize / previewWidth);
+	_fileThumb = PixmapFromImage(Images::prepare(
+		_fullPreview,
+		fileThumbSize.width(),
+		fileThumbSize.height(),
+		Option::RoundedSmall | Option::RoundedAll,
+		st::sendMediaFileThumbSize,
+		st::sendMediaFileThumbSize
+	));
+
+	const auto availableFileWidth = st::sendMediaPreviewSize
+		- st::sendMediaFileThumbSkip
+		- st::sendMediaFileThumbSize
+		// Right buttons.
+		- st::sendBoxAlbumGroupButtonFile.width * 2
+		- st::sendBoxAlbumGroupEditInternalSkip * 2
+		- st::sendBoxAlbumGroupSkipRight;
+	const auto filepath = file.path;
+	if (filepath.isEmpty()) {
+		//_name = filedialogDefaultName( // #TODO files
+		//	u"image"_q,
+		//	u".png"_q,
+		//	QString(),
+		//	true);
+		_name = "image.png";
+		_status = u"%1x%2"_q.arg(
+			_fullPreview.width()
+		).arg(
+			_fullPreview.height()
+		);
+	} else {
+		auto fileinfo = QFileInfo(filepath);
+		_name = fileinfo.fileName();
+		_status = FormatSizeText(fileinfo.size());
+	}
+	_nameWidth = st::semiboldFont->width(_name);
+	if (_nameWidth > availableFileWidth) {
+		_name = st::semiboldFont->elided(
+			_name,
+			availableFileWidth,
+			Qt::ElideMiddle);
+		_nameWidth = st::semiboldFont->width(_name);
+	}
+	_statusWidth = st::normalFont->width(_status);
+
+	_editMedia.create(parent, st::sendBoxAlbumGroupButtonFile);
+	_deleteMedia.create(parent, st::sendBoxAlbumGroupButtonFile);
+
+	const auto duration = st::historyAttach.ripple.hideDuration;
+	_editMedia->setClickedCallback([=] {
+		base::call_delayed(duration, parent, editCallback);
+	});
+	_deleteMedia->setClickedCallback([=] {
+		base::call_delayed(duration, parent, deleteCallback);
+	});
+
+	_editMedia->setIconOverride(&st::editMediaButtonIconFile);
+	_deleteMedia->setIconOverride(&st::sendBoxAlbumGroupDeleteButtonIconFile);
+
+	updateFileRow(-1);
+}
+
+void AlbumThumbnail::updateFileRow(int row) {
+	if (row < 0) {
+		_editMedia->hide();
+		_deleteMedia->hide();
+		return;
+	}
+	_editMedia->show();
+	_deleteMedia->show();
+
+	const auto fileHeight = st::sendMediaFileThumbSize
+		+ st::sendMediaFileThumbSkip;
+
+	const auto top = row * fileHeight + st::sendBoxAlbumGroupSkipTop;
+	const auto size = st::editMediaButtonSize;
+
+	auto right = st::sendBoxAlbumGroupSkipRight + size;
+	_deleteMedia->moveToRight(right, top);
+	right += st::sendBoxAlbumGroupEditInternalSkip + size;
+	_editMedia->moveToRight(right, top);
+}
+
+void AlbumThumbnail::resetLayoutAnimation() {
+	_animateFromGeometry = std::nullopt;
+}
+
+void AlbumThumbnail::animateLayoutToInitial() {
+	_animateFromGeometry = countRealGeometry();
+	_suggestedMove = 0.;
+	_albumPosition = QPoint(0, 0);
+}
+
+void AlbumThumbnail::moveToLayout(const GroupMediaLayout &layout) {
+	animateLayoutToInitial();
+	_layout = layout;
+
+	const auto width = _layout.geometry.width();
+	const auto height = _layout.geometry.height();
+	_albumCorners = GetCornersFromSides(_layout.sides);
+	using Option = Images::Option;
+	const auto options = Option::Smooth
+		| Option::RoundedLarge
+		| ((_albumCorners & RectPart::TopLeft)
+			? Option::RoundedTopLeft
+			: Option::None)
+		| ((_albumCorners & RectPart::TopRight)
+			? Option::RoundedTopRight
+			: Option::None)
+		| ((_albumCorners & RectPart::BottomLeft)
+			? Option::RoundedBottomLeft
+			: Option::None)
+		| ((_albumCorners & RectPart::BottomRight)
+			? Option::RoundedBottomRight
+			: Option::None);
+	const auto pixSize = GetImageScaleSizeForGeometry(
+		{ _fullPreview.width(), _fullPreview.height() },
+		{ width, height });
+	const auto pixWidth = pixSize.width() * style::DevicePixelRatio();
+	const auto pixHeight = pixSize.height() * style::DevicePixelRatio();
+
+	_albumImage = PixmapFromImage(Images::prepare(
+		_fullPreview,
+		pixWidth,
+		pixHeight,
+		options,
+		width,
+		height));
+}
+
+int AlbumThumbnail::photoHeight() const {
+	return _photo.height() / style::DevicePixelRatio();
+}
+
+void AlbumThumbnail::paintInAlbum(
+		Painter &p,
+		int left,
+		int top,
+		float64 shrinkProgress,
+		float64 moveProgress) {
+	const auto shrink = anim::interpolate(0, _shrinkSize, shrinkProgress);
+	_lastShrinkValue = shrink;
+	const auto geometry = countCurrentGeometry(moveProgress);
+	const auto x = left + geometry.x();
+	const auto y = top + geometry.y();
+	if (shrink > 0 || moveProgress < 1.) {
+		const auto size = geometry.size();
+		if (shrinkProgress < 1 && _albumCorners != RectPart::None) {
+			prepareCache(size, shrink);
+			p.drawImage(x, y, _albumCache);
+		} else {
+			const auto to = QRect({ x, y }, size).marginsRemoved(
+				{ shrink, shrink, shrink, shrink }
+			);
+			drawSimpleFrame(p, to, size);
+		}
+	} else {
+		p.drawPixmap(x, y, _albumImage);
+	}
+	if (_isVideo) {
+		const auto inner = QRect(
+			x + (geometry.width() - st::msgFileSize) / 2,
+			y + (geometry.height() - st::msgFileSize) / 2,
+			st::msgFileSize,
+			st::msgFileSize);
+		{
+			PainterHighQualityEnabler hq(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::msgDateImgBg);
+			p.drawEllipse(inner);
+		}
+		st::historyFileThumbPlay.paintInCenter(p, inner);
+	}
+
+	_lastRectOfButtons = paintButtons(
+		p,
+		{ x, y },
+		geometry.width(),
+		shrinkProgress);
+}
+
+void AlbumThumbnail::prepareCache(QSize size, int shrink) {
+	const auto width = std::max(
+		_layout.geometry.width(),
+		_animateFromGeometry ? _animateFromGeometry->width() : 0);
+	const auto height = std::max(
+		_layout.geometry.height(),
+		_animateFromGeometry ? _animateFromGeometry->height() : 0);
+	const auto cacheSize = QSize(width, height) * style::DevicePixelRatio();
+
+	if (_albumCache.width() < cacheSize.width()
+		|| _albumCache.height() < cacheSize.height()) {
+		_albumCache = QImage(cacheSize, QImage::Format_ARGB32_Premultiplied);
+	}
+	_albumCache.fill(Qt::transparent);
+	{
+		Painter p(&_albumCache);
+		const auto to = QRect(QPoint(), size).marginsRemoved(
+			{ shrink, shrink, shrink, shrink }
+		);
+		drawSimpleFrame(p, to, size);
+	}
+	Images::prepareRound(
+		_albumCache,
+		ImageRoundRadius::Large,
+		_albumCorners,
+		QRect(QPoint(), size * style::DevicePixelRatio()));
+	_albumCache.setDevicePixelRatio(style::DevicePixelRatio());
+}
+
+void AlbumThumbnail::drawSimpleFrame(Painter &p, QRect to, QSize size) const {
+	const auto fullWidth = _fullPreview.width();
+	const auto fullHeight = _fullPreview.height();
+	const auto previewSize = GetImageScaleSizeForGeometry(
+		{ fullWidth, fullHeight },
+		{ size.width(), size.height() });
+	const auto previewWidth = previewSize.width() * style::DevicePixelRatio();
+	const auto previewHeight = previewSize.height() * style::DevicePixelRatio();
+	const auto width = size.width() * style::DevicePixelRatio();
+	const auto height = size.height() * style::DevicePixelRatio();
+	const auto scaleWidth = to.width() / float64(width);
+	const auto scaleHeight = to.height() / float64(height);
+	const auto Round = [](float64 value) {
+		return int(std::round(value));
+	};
+	const auto [from, fillBlack] = [&] {
+		if (previewWidth < width && previewHeight < height) {
+			const auto toWidth = Round(previewWidth * scaleWidth);
+			const auto toHeight = Round(previewHeight * scaleHeight);
+			return std::make_pair(
+				QRect(0, 0, fullWidth, fullHeight),
+				QMargins(
+					(to.width() - toWidth) / 2,
+					(to.height() - toHeight) / 2,
+					to.width() - toWidth - (to.width() - toWidth) / 2,
+					to.height() - toHeight - (to.height() - toHeight) / 2));
+		} else if (previewWidth * height > previewHeight * width) {
+			if (previewHeight >= height) {
+				const auto takeWidth = previewWidth * height / previewHeight;
+				const auto useWidth = fullWidth * width / takeWidth;
+				return std::make_pair(
+					QRect(
+						(fullWidth - useWidth) / 2,
+						0,
+						useWidth,
+						fullHeight),
+					QMargins(0, 0, 0, 0));
+			} else {
+				const auto takeWidth = previewWidth;
+				const auto useWidth = fullWidth * width / takeWidth;
+				const auto toHeight = Round(previewHeight * scaleHeight);
+				const auto toSkip = (to.height() - toHeight) / 2;
+				return std::make_pair(
+					QRect(
+						(fullWidth - useWidth) / 2,
+						0,
+						useWidth,
+						fullHeight),
+					QMargins(
+						0,
+						toSkip,
+						0,
+						to.height() - toHeight - toSkip));
+			}
+		} else {
+			if (previewWidth >= width) {
+				const auto takeHeight = previewHeight * width / previewWidth;
+				const auto useHeight = fullHeight * height / takeHeight;
+				return std::make_pair(
+					QRect(
+						0,
+						(fullHeight - useHeight) / 2,
+						fullWidth,
+						useHeight),
+					QMargins(0, 0, 0, 0));
+			} else {
+				const auto takeHeight = previewHeight;
+				const auto useHeight = fullHeight * height / takeHeight;
+				const auto toWidth = Round(previewWidth * scaleWidth);
+				const auto toSkip = (to.width() - toWidth) / 2;
+				return std::make_pair(
+					QRect(
+						0,
+						(fullHeight - useHeight) / 2,
+						fullWidth,
+						useHeight),
+					QMargins(
+						toSkip,
+						0,
+						to.width() - toWidth - toSkip,
+						0));
+			}
+		}
+	}();
+
+	p.drawImage(to.marginsRemoved(fillBlack), _fullPreview, from);
+	if (fillBlack.top() > 0) {
+		p.fillRect(to.x(), to.y(), to.width(), fillBlack.top(), st::imageBg);
+	}
+	if (fillBlack.bottom() > 0) {
+		p.fillRect(
+			to.x(),
+			to.y() + to.height() - fillBlack.bottom(),
+			to.width(),
+			fillBlack.bottom(),
+			st::imageBg);
+	}
+	if (fillBlack.left() > 0) {
+		p.fillRect(
+			to.x(),
+			to.y() + fillBlack.top(),
+			fillBlack.left(),
+			to.height() - fillBlack.top() - fillBlack.bottom(),
+			st::imageBg);
+	}
+	if (fillBlack.right() > 0) {
+		p.fillRect(
+			to.x() + to.width() - fillBlack.right(),
+			to.y() + fillBlack.top(),
+			fillBlack.right(),
+			to.height() - fillBlack.top() - fillBlack.bottom(),
+			st::imageBg);
+	}
+}
+
+void AlbumThumbnail::paintPhoto(Painter &p, int left, int top, int outerWidth) {
+	const auto width = _photo.width() / style::DevicePixelRatio();
+	p.drawPixmapLeft(
+		left + (st::sendMediaPreviewSize - width) / 2,
+		top,
+		outerWidth,
+		_photo);
+
+	_lastRectOfButtons = paintButtons(
+		p,
+		{ left, top },
+		st::sendMediaPreviewSize,
+		0);
+}
+
+void AlbumThumbnail::paintFile(Painter &p, int left, int top, int outerWidth) {
+	const auto textLeft = left
+		+ st::sendMediaFileThumbSize
+		+ st::sendMediaFileThumbSkip;
+
+	p.drawPixmap(left, top, _fileThumb);
+	p.setFont(st::semiboldFont);
+	p.setPen(st::historyFileNameInFg);
+	p.drawTextLeft(
+		textLeft,
+		top + st::sendMediaFileNameTop,
+		outerWidth,
+		_name,
+		_nameWidth);
+	p.setFont(st::normalFont);
+	p.setPen(st::mediaInFg);
+	p.drawTextLeft(
+		textLeft,
+		top + st::sendMediaFileStatusTop,
+		outerWidth,
+		_status,
+		_statusWidth);
+}
+
+bool AlbumThumbnail::containsPoint(QPoint position) const {
+	return _layout.geometry.contains(position);
+}
+
+bool AlbumThumbnail::buttonsContainPoint(QPoint position) const {
+	return _lastRectOfButtons.contains(position);
+}
+
+AttachButtonType AlbumThumbnail::buttonTypeFromPoint(QPoint position) const {
+	if (!buttonsContainPoint(position)) {
+		return AttachButtonType::None;
+	}
+	return (position.x() < _lastRectOfButtons.center().x())
+		? AttachButtonType::Edit
+		: AttachButtonType::Delete;
+}
+
+int AlbumThumbnail::distanceTo(QPoint position) const {
+	const auto delta = (_layout.geometry.center() - position);
+	return QPoint::dotProduct(delta, delta);
+}
+
+bool AlbumThumbnail::isPointAfter(QPoint position) const {
+	return position.x() > _layout.geometry.center().x();
+}
+
+void AlbumThumbnail::moveInAlbum(QPoint to) {
+	_albumPosition = to;
+}
+
+QPoint AlbumThumbnail::center() const {
+	auto realGeometry = _layout.geometry;
+	realGeometry.moveTopLeft(realGeometry.topLeft() + _albumPosition);
+	return realGeometry.center();
+}
+
+void AlbumThumbnail::suggestMove(float64 delta, Fn<void()> callback) {
+	if (_suggestedMove != delta) {
+		_suggestedMoveAnimation.start(
+			std::move(callback),
+			_suggestedMove,
+			delta,
+			kShrinkDuration);
+		_suggestedMove = delta;
+	}
+}
+
+QRect AlbumThumbnail::countRealGeometry() const {
+	const auto addLeft = int(std::round(
+		_suggestedMoveAnimation.value(_suggestedMove) * _lastShrinkValue));
+	const auto current = _layout.geometry;
+	const auto realTopLeft = current.topLeft()
+		+ _albumPosition
+		+ QPoint(addLeft, 0);
+	return { realTopLeft, current.size() };
+}
+
+QRect AlbumThumbnail::countCurrentGeometry(float64 progress) const {
+	const auto now = countRealGeometry();
+	if (_animateFromGeometry && progress < 1.) {
+		return {
+			anim::interpolate(_animateFromGeometry->x(), now.x(), progress),
+			anim::interpolate(_animateFromGeometry->y(), now.y(), progress),
+			anim::interpolate(_animateFromGeometry->width(), now.width(), progress),
+			anim::interpolate(_animateFromGeometry->height(), now.height(), progress)
+		};
+	}
+	return now;
+}
+
+void AlbumThumbnail::finishAnimations() {
+	_suggestedMoveAnimation.stop();
+}
+
+QRect AlbumThumbnail::paintButtons(
+		Painter &p,
+		QPoint point,
+		int outerWidth,
+		float64 shrinkProgress) {
+	const auto skipInternal = st::sendBoxAlbumGroupEditInternalSkip;
+	const auto size = st::sendBoxAlbumGroupHeight;
+	const auto skipRight = st::sendBoxAlbumGroupSkipRight;
+	const auto skipTop = st::sendBoxAlbumGroupSkipTop;
+	const auto groupWidth = size * 2 + skipInternal;
+
+	// If the width is tiny, it would be better to not display the buttons.
+	if (groupWidth > outerWidth) {
+		return QRect();
+	}
+
+	// If the width is too small,
+	// it would be better to display the buttons in the center.
+	const auto groupX = point.x() + ((groupWidth + skipRight * 2 > outerWidth)
+		? (outerWidth - groupWidth) / 2
+		: outerWidth - skipRight - groupWidth);
+	const auto groupY = point.y() + skipTop;
+	const auto deleteLeft = skipInternal + size;
+
+	p.setOpacity(1.0 - shrinkProgress);
+
+	QRect groupRect(groupX, groupY, groupWidth, size);
+	_buttonsRect.paint(p, groupRect);
+
+	const auto editP = st::sendBoxAlbumGroupEditButtonIconPosition;
+	const auto deleteP = st::sendBoxAlbumGroupDeleteButtonIconPosition;
+
+	st::sendBoxAlbumGroupEditButtonIcon.paintInCenter(
+		p,
+		QRect(groupX + editP.x(), groupY + editP.y(), size, size));
+	st::sendBoxAlbumGroupDeleteButtonIcon.paintInCenter(
+		p,
+		QRect(
+			groupX + deleteLeft + deleteP.x(),
+			groupY + deleteP.y(),
+			size,
+			size));
+	p.setOpacity(1);
+
+	return groupRect;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
new file mode 100644
index 000000000..13683d356
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
@@ -0,0 +1,97 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/chat/attach/attach_common.h"
+#include "ui/effects/animations.h"
+#include "ui/grouped_layout.h"
+#include "ui/round_rect.h"
+#include "base/object_ptr.h"
+
+namespace Ui {
+
+struct PreparedFile;
+class IconButton;
+
+class AlbumThumbnail final {
+public:
+	AlbumThumbnail(
+		const PreparedFile &file,
+		const GroupMediaLayout &layout,
+		QWidget *parent,
+		Fn<void()> editCallback,
+		Fn<void()> deleteCallback);
+
+	void moveToLayout(const GroupMediaLayout &layout);
+	void animateLayoutToInitial();
+	void resetLayoutAnimation();
+
+	int photoHeight() const;
+
+	void paintInAlbum(
+		Painter &p,
+		int left,
+		int top,
+		float64 shrinkProgress,
+		float64 moveProgress);
+	void paintPhoto(Painter &p, int left, int top, int outerWidth);
+	void paintFile(Painter &p, int left, int top, int outerWidth);
+
+	bool containsPoint(QPoint position) const;
+	bool buttonsContainPoint(QPoint position) const;
+	AttachButtonType buttonTypeFromPoint(QPoint position) const;
+	int distanceTo(QPoint position) const;
+	bool isPointAfter(QPoint position) const;
+	void moveInAlbum(QPoint to);
+	QPoint center() const;
+	void suggestMove(float64 delta, Fn<void()> callback);
+	void finishAnimations();
+
+	void updateFileRow(int row);
+
+	static constexpr auto kShrinkDuration = crl::time(150);
+
+private:
+	QRect countRealGeometry() const;
+	QRect countCurrentGeometry(float64 progress) const;
+	void prepareCache(QSize size, int shrink);
+	void drawSimpleFrame(Painter &p, QRect to, QSize size) const;
+	QRect paintButtons(
+		Painter &p,
+		QPoint point,
+		int outerWidth,
+		float64 shrinkProgress);
+
+	GroupMediaLayout _layout;
+	std::optional<QRect> _animateFromGeometry;
+	const QImage _fullPreview;
+	const int _shrinkSize = 0;
+	QPixmap _albumImage;
+	QImage _albumCache;
+	QPoint _albumPosition;
+	RectParts _albumCorners = RectPart::None;
+	QPixmap _photo;
+	QPixmap _fileThumb;
+	QString _name;
+	QString _status;
+	int _nameWidth = 0;
+	int _statusWidth = 0;
+	bool _isVideo = false;
+	float64 _suggestedMove = 0.;
+	Animations::Simple _suggestedMoveAnimation;
+	int _lastShrinkValue = 0;
+	RoundRect _buttonsRect;
+
+	QRect _lastRectOfButtons;
+
+	object_ptr<IconButton> _editMedia = nullptr;
+	object_ptr<IconButton> _deleteMedia = nullptr;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_common.h b/Telegram/SourceFiles/ui/chat/attach/attach_common.h
new file mode 100644
index 000000000..89226df88
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_common.h
@@ -0,0 +1,24 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Ui {
+
+enum class AttachButtonType {
+	Edit,
+	Delete,
+	None,
+};
+
+enum class SendFilesWay {
+	Album,
+	Photos,
+	Files,
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
new file mode 100644
index 000000000..43f0e0911
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
@@ -0,0 +1,173 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/attach/attach_single_file_preview.h"
+
+#include "ui/chat/attach/attach_prepare.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_options.h"
+#include "ui/image/image_prepare.h"
+#include "ui/cached_round_corners.h"
+#include "core/mime_type.h"
+#include "styles/style_chat.h"
+#include "styles/style_boxes.h"
+
+#include <QtCore/QFileInfo>
+
+namespace Ui {
+
+SingleFilePreview::SingleFilePreview(
+	QWidget *parent,
+	const PreparedFile &file)
+: RpWidget(parent) {
+	preparePreview(file);
+}
+
+void SingleFilePreview::prepareThumb(const QImage &preview) {
+	if (preview.isNull()) {
+		return;
+	}
+
+	auto originalWidth = preview.width();
+	auto originalHeight = preview.height();
+	auto thumbWidth = st::msgFileThumbSize;
+	if (originalWidth > originalHeight) {
+		thumbWidth = (originalWidth * st::msgFileThumbSize)
+			/ originalHeight;
+	}
+	auto options = Images::Option::Smooth
+		| Images::Option::RoundedSmall
+		| Images::Option::RoundedTopLeft
+		| Images::Option::RoundedTopRight
+		| Images::Option::RoundedBottomLeft
+		| Images::Option::RoundedBottomRight;
+	_fileThumb = PixmapFromImage(Images::prepare(
+		preview,
+		thumbWidth * style::DevicePixelRatio(),
+		0,
+		options,
+		st::msgFileThumbSize,
+		st::msgFileThumbSize));
+}
+
+void SingleFilePreview::preparePreview(const PreparedFile &file) {
+	auto preview = QImage();
+	if (const auto image = std::get_if<PreparedFileInformation::Image>(
+		&file.information->media)) {
+		preview = image->data;
+	} else if (const auto video = std::get_if<PreparedFileInformation::Video>(
+		&file.information->media)) {
+		preview = video->thumbnail;
+	}
+	prepareThumb(preview);
+	const auto filepath = file.path;
+	if (filepath.isEmpty()) {
+		//auto filename = filedialogDefaultName(
+		//	qsl("image"),
+		//	qsl(".png"),
+		//	QString(),
+		//	true); // #TODO files
+		auto filename = "image.png";
+		_nameText.setText(
+			st::semiboldTextStyle,
+			filename,
+			NameTextOptions());
+		_statusText = u"%1x%2"_q.arg(preview.width()).arg(preview.height());
+		_statusWidth = qMax(_nameText.maxWidth(), st::normalFont->width(_statusText));
+		_fileIsImage = true;
+	} else {
+		auto fileinfo = QFileInfo(filepath);
+		auto filename = fileinfo.fileName();
+		_fileIsImage = Core::FileIsImage(filename, Core::MimeTypeForFile(fileinfo).name());
+
+		auto songTitle = QString();
+		auto songPerformer = QString();
+		if (file.information) {
+			if (const auto song = std::get_if<PreparedFileInformation::Song>(
+					&file.information->media)) {
+				songTitle = song->title;
+				songPerformer = song->performer;
+				_fileIsAudio = true;
+			}
+		}
+
+		const auto nameString = ComposeNameString(
+			filename,
+			songTitle,
+			songPerformer);
+		_nameText.setText(
+			st::semiboldTextStyle,
+			nameString,
+			NameTextOptions());
+		_statusText = FormatSizeText(fileinfo.size());
+		_statusWidth = qMax(
+			_nameText.maxWidth(),
+			st::normalFont->width(_statusText));
+	}
+}
+
+void SingleFilePreview::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+
+	auto w = width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right();
+	auto h = _fileThumb.isNull() ? (st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom()) : (st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom());
+	auto nameleft = 0, nametop = 0, nameright = 0, statustop = 0, linktop = 0;
+	if (_fileThumb.isNull()) {
+		nameleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
+		nametop = st::msgFileNameTop;
+		nameright = st::msgFilePadding.left();
+		statustop = st::msgFileStatusTop;
+	} else {
+		nameleft = st::msgFileThumbPadding.left() + st::msgFileThumbSize + st::msgFileThumbPadding.right();
+		nametop = st::msgFileThumbNameTop;
+		nameright = st::msgFileThumbPadding.left();
+		statustop = st::msgFileThumbStatusTop;
+		linktop = st::msgFileThumbLinkTop;
+	}
+	auto namewidth = w - nameleft - (_fileThumb.isNull() ? st::msgFilePadding.left() : st::msgFileThumbPadding.left());
+	int32 x = (width() - w) / 2, y = st::boxPhotoPadding.top();
+
+	FillRoundRect(p, x, y, w, h, st::msgOutBg, MessageOutCorners, &st::msgOutShadow);
+
+	if (_fileThumb.isNull()) {
+		QRect inner(style::rtlrect(x + st::msgFilePadding.left(), y + st::msgFilePadding.top(), st::msgFileSize, st::msgFileSize, width()));
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::msgFileOutBg);
+
+		{
+			PainterHighQualityEnabler hq(p);
+			p.drawEllipse(inner);
+		}
+
+		auto &icon = _fileIsAudio
+			? st::historyFileOutPlay
+			: _fileIsImage
+			? st::historyFileOutImage
+			: st::historyFileOutDocument;
+		icon.paintInCenter(p, inner);
+	} else {
+		QRect rthumb(style::rtlrect(x + st::msgFileThumbPadding.left(), y + st::msgFileThumbPadding.top(), st::msgFileThumbSize, st::msgFileThumbSize, width()));
+		p.drawPixmap(rthumb.topLeft(), _fileThumb);
+	}
+	p.setFont(st::semiboldFont);
+	p.setPen(st::historyFileNameOutFg);
+	_nameText.drawLeftElided(p, x + nameleft, y + nametop, namewidth, width());
+
+	auto &status = st::mediaOutFg;
+	p.setFont(st::normalFont);
+	p.setPen(status);
+	p.drawTextLeft(x + nameleft, y + statustop, width(), _statusText);
+}
+
+rpl::producer<int> SingleFilePreview::desiredHeightValue() const {
+	auto h = _fileThumb.isNull()
+		? (st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom())
+		: (st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom());
+	return rpl::single(st::boxPhotoPadding.top() + h + st::msgShadow);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
new file mode 100644
index 000000000..442106148
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
@@ -0,0 +1,40 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+
+namespace Ui {
+
+struct PreparedFile;
+
+class SingleFilePreview final : public RpWidget {
+public:
+	SingleFilePreview(
+		QWidget *parent,
+		const PreparedFile &file);
+
+	rpl::producer<int> desiredHeightValue() const override;
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	void preparePreview(const PreparedFile &file);
+	void prepareThumb(const QImage &preview);
+
+	QPixmap _fileThumb;
+	Text::String _nameText;
+	bool _fileIsAudio = false;
+	bool _fileIsImage = false;
+	QString _statusText;
+	int _statusWidth = 0;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/filter_icon_panel.cpp b/Telegram/SourceFiles/ui/filter_icon_panel.cpp
index c4df60cf6..e9d3d8f47 100644
--- a/Telegram/SourceFiles/ui/filter_icon_panel.cpp
+++ b/Telegram/SourceFiles/ui/filter_icon_panel.cpp
@@ -12,9 +12,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/panel_animation.h"
 #include "ui/ui_utility.h"
 #include "ui/filter_icons.h"
+#include "ui/cached_round_corners.h"
 #include "lang/lang_keys.h"
 #include "core/application.h"
-#include "app.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_window.h"
 
@@ -102,7 +102,7 @@ void FilterIconPanel::setupInner() {
 	_inner->paintRequest(
 		) | rpl::start_with_next([=](QRect clip) {
 		auto p = Painter(_inner);
-		App::roundRect(
+		Ui::FillRoundRect(
 			p,
 			_inner->rect(),
 			st::emojiPanBg,
@@ -122,11 +122,11 @@ void FilterIconPanel::setupInner() {
 				continue;
 			}
 			if (i == selected) {
-				App::roundRect(
+				Ui::FillRoundRect(
 					p,
 					rect,
 					st::emojiPanHover,
-					StickerHoverCorners);
+					Ui::StickerHoverCorners);
 			}
 			const auto icon = LookupFilterIcon(kIcons[i]).normal;
 			icon->paintInCenter(p, rect, st::emojiIconFg->c);
diff --git a/Telegram/SourceFiles/ui/grouped_layout.cpp b/Telegram/SourceFiles/ui/grouped_layout.cpp
index 7b98af8b3..cefc127b5 100644
--- a/Telegram/SourceFiles/ui/grouped_layout.cpp
+++ b/Telegram/SourceFiles/ui/grouped_layout.cpp
@@ -444,8 +444,8 @@ std::vector<float64> ComplexLayouter::CropRatios(
 		constexpr auto kMaxRatio = 2.75;
 		constexpr auto kMinRatio = 0.6667;
 		return (averageRatio > 1.1)
-			? snap(ratio, 1., kMaxRatio)
-			: snap(ratio, kMinRatio, 1.);
+			? std::clamp(ratio, 1., kMaxRatio)
+			: std::clamp(ratio, kMinRatio, 1.);
 	}) | ranges::to_vector;
 }
 
diff --git a/Telegram/SourceFiles/ui/text/format_values.cpp b/Telegram/SourceFiles/ui/text/format_values.cpp
index 0bc069c82..60534c3ad 100644
--- a/Telegram/SourceFiles/ui/text/format_values.cpp
+++ b/Telegram/SourceFiles/ui/text/format_values.cpp
@@ -128,4 +128,20 @@ QString FillAmountAndCurrency(uint64 amount, const QString &currency) {
 	//return currencyText + amountText;
 }
 
+QString ComposeNameString(
+		const QString &filename,
+		const QString &songTitle,
+		const QString &songPerformer) {
+	if (songTitle.isEmpty() && songPerformer.isEmpty()) {
+		return filename.isEmpty() ? u"Unknown File"_q : filename;
+	}
+
+	if (songPerformer.isEmpty()) {
+		return songTitle;
+	}
+
+	auto trackTitle = (songTitle.isEmpty() ? u"Unknown Track"_q : songTitle);
+	return songPerformer + QString::fromUtf8(" \xe2\x80\x93 ") + trackTitle;
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/text/format_values.h b/Telegram/SourceFiles/ui/text/format_values.h
index 9fb6c00c8..0e0ce8680 100644
--- a/Telegram/SourceFiles/ui/text/format_values.h
+++ b/Telegram/SourceFiles/ui/text/format_values.h
@@ -25,4 +25,9 @@ inline constexpr auto FileStatusSizeFailed = 0x7FFFFFF2;
 	uint64 amount,
 	const QString &currency);
 
+[[nodiscard]] QString ComposeNameString(
+	const QString &filename,
+	const QString &songTitle,
+	const QString &songPerformer);
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/window/themes/window_theme.h b/Telegram/SourceFiles/window/themes/window_theme.h
index ec06f9eb9..0d38ecf14 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.h
+++ b/Telegram/SourceFiles/window/themes/window_theme.h
@@ -118,7 +118,8 @@ struct BackgroundUpdate {
 	[[nodiscard]] bool paletteChanged() const {
 		return (type == Type::TestingTheme)
 			|| (type == Type::RevertingTheme)
-			|| (type == Type::ApplyingEdit);
+			|| (type == Type::ApplyingEdit)
+			|| (type == Type::New);
 	}
 	Type type;
 	bool tiled;
diff --git a/Telegram/SourceFiles/window/themes/window_theme_warning.cpp b/Telegram/SourceFiles/window/themes/window_theme_warning.cpp
index 09929d22a..13d86a951 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_warning.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_warning.cpp
@@ -10,9 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/shadow.h"
 #include "ui/ui_utility.h"
+#include "ui/cached_round_corners.h"
 #include "window/themes/window_theme.h"
 #include "lang/lang_keys.h"
-#include "app.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 
@@ -62,7 +62,7 @@ void WarningWidget::paintEvent(QPaintEvent *e) {
 	}
 
 	Ui::Shadow::paint(p, _inner, width(), st::boxRoundShadow);
-	App::roundRect(p, _inner, st::boxBg, BoxCorners);
+	Ui::FillRoundRect(p, _inner, st::boxBg, Ui::BoxCorners);
 
 	p.setFont(st::boxTitleFont);
 	p.setPen(st::boxTitleFg);
diff --git a/Telegram/SourceFiles/window/window_history_hider.cpp b/Telegram/SourceFiles/window/window_history_hider.cpp
index df519d3f7..442e6a156 100644
--- a/Telegram/SourceFiles/window/window_history_hider.cpp
+++ b/Telegram/SourceFiles/window/window_history_hider.cpp
@@ -10,9 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/shadow.h"
+#include "ui/cached_round_corners.h"
 #include "mainwidget.h"
 #include "facades.h"
-#include "app.h"
 #include "styles/style_layers.h"
 #include "styles/style_chat.h"
 
@@ -57,7 +57,7 @@ void HistoryHider::paintEvent(QPaintEvent *e) {
 	p.setFont(st::historyForwardChooseFont);
 	auto w = st::historyForwardChooseMargins.left() + _chooseWidth + st::historyForwardChooseMargins.right();
 	auto h = st::historyForwardChooseMargins.top() + st::historyForwardChooseFont->height + st::historyForwardChooseMargins.bottom();
-	App::roundRect(p, (width() - w) / 2, (height() - h) / 2, w, h, st::historyForwardChooseBg, ForwardCorners);
+	Ui::FillRoundRect(p, (width() - w) / 2, (height() - h) / 2, w, h, st::historyForwardChooseBg, Ui::ForwardCorners);
 
 	p.setPen(st::historyForwardChooseFg);
 	p.drawText(_box, _text, QTextOption(style::al_center));
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index b1feecb12..12d26d2da 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -9,11 +9,25 @@ init_target(td_ui)
 add_library(tdesktop::td_ui ALIAS td_ui)
 
 include(lib_ui/cmake/generate_styles.cmake)
+include(cmake/generate_numbers.cmake)
 
 set(style_files
     ui/td_common.style
+    ui/filter_icons.style
     ui/chat/chat.style
+    boxes/boxes.style
     dialogs/dialogs.style
+    chat_helpers/chat_helpers.style
+    calls/calls.style
+    export/view/export.style
+    info/info.style
+    intro/intro.style
+    media/player/media_player.style
+    passport/passport.style
+    profile/profile.style
+    settings/settings.style
+    media/view/media_view.style
+    overview/overview.style
     window/window.style
 )
 
@@ -25,14 +39,27 @@ set(dependent_style_files
 )
 
 generate_styles(td_ui ${src_loc} "${style_files}" "${dependent_style_files}")
+generate_numbers(td_ui ${res_loc}/numbers.txt)
 
 target_precompile_headers(td_ui PRIVATE ${src_loc}/ui/ui_pch.h)
 nice_target_sources(td_ui ${src_loc}
 PRIVATE
     ${style_files}
     
+    core/mime_type.cpp
+    core/mime_type.h
+
+    ui/chat/attach/attach_album_thumbnail.cpp
+    ui/chat/attach/attach_album_thumbnail.h
+    ui/chat/attach/attach_album_preview.cpp
+    ui/chat/attach/attach_album_preview.h
+    ui/chat/attach/attach_common.h
     ui/chat/attach/attach_extensions.cpp
     ui/chat/attach/attach_extensions.h
+    ui/chat/attach/attach_prepare.cpp
+    ui/chat/attach/attach_prepare.h
+    ui/chat/attach/attach_single_file_preview.cpp
+    ui/chat/attach/attach_single_file_preview.h
     ui/chat/message_bar.cpp
     ui/chat/message_bar.h
     ui/chat/pinned_bar.cpp
@@ -47,7 +74,11 @@ PRIVATE
     ui/text/text_options.h
     ui/toasts/common_toasts.cpp
     ui/toasts/common_toasts.h
-
+    ui/cached_round_corners.cpp
+    ui/cached_round_corners.h
+    ui/grouped_layout.cpp
+    ui/grouped_layout.h
+    
     ui/ui_pch.h
 )
 

From 8b96f4c214d119b1665d9c66083512385d243ac8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 13 Oct 2020 19:43:18 +0300
Subject: [PATCH 090/190] Move Media::Clip::Reader and FileLocation to td_ui.

---
 Telegram/CMakeLists.txt                       |   8 -
 .../chat_helpers/stickers_dice_pack.cpp       |   2 +-
 Telegram/SourceFiles/config.h                 |   5 -
 Telegram/SourceFiles/core/file_location.cpp   | 121 +++++++++++
 Telegram/SourceFiles/core/file_location.h     |  72 +++++++
 Telegram/SourceFiles/data/data_document.cpp   |  18 +-
 Telegram/SourceFiles/data/data_document.h     |   7 +-
 .../SourceFiles/data/data_document_media.cpp  |   6 +-
 Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h  |   1 +
 .../inline_bot_layout_internal.cpp            |   7 +-
 .../SourceFiles/media/audio/media_audio.cpp   |  10 +-
 .../SourceFiles/media/audio/media_audio.h     |   5 +-
 .../media/audio/media_audio_capture.cpp       |   5 +-
 .../media/audio/media_audio_ffmpeg_loader.cpp |  16 +-
 .../media/audio/media_audio_ffmpeg_loader.h   |  10 +-
 .../media/audio/media_audio_loader.cpp        |   4 +-
 .../media/audio/media_audio_loader.h          |   7 +-
 .../media/audio/media_audio_track.cpp         |   5 +-
 .../media/audio/media_audio_track.h           |   6 +-
 .../media/audio/media_child_ffmpeg_loader.cpp |   3 +-
 .../media/audio/media_child_ffmpeg_loader.h   |   2 +-
 .../media/clip/media_clip_check_streaming.cpp |   8 +-
 .../media/clip/media_clip_check_streaming.h   |   6 +-
 .../media/clip/media_clip_ffmpeg.cpp          | 146 +++-----------
 .../media/clip/media_clip_ffmpeg.h            |  28 ++-
 .../media/clip/media_clip_implementation.cpp  |   2 +
 .../media/clip/media_clip_implementation.h    |  14 +-
 .../media/clip/media_clip_reader.cpp          | 189 +++++++-----------
 .../media/clip/media_clip_reader.h            |  56 ++----
 .../platform/linux/specific_linux.h           |  24 ---
 .../platform/mac/file_bookmark_mac.h          |  33 +++
 .../platform/mac/file_bookmark_mac.mm         | 125 ++++++++++++
 .../SourceFiles/platform/mac/specific_mac.h   |  25 ---
 .../SourceFiles/platform/mac/specific_mac.mm  |   4 -
 .../SourceFiles/platform/mac/specific_mac_p.h |  21 --
 .../platform/mac/specific_mac_p.mm            | 111 ----------
 .../platform/platform_file_bookmark.h         |  43 ++++
 .../SourceFiles/platform/win/specific_win.h   |  24 ---
 .../SourceFiles/storage/file_download.cpp     |   3 +-
 Telegram/SourceFiles/storage/file_upload.cpp  |   5 +-
 Telegram/SourceFiles/storage/localstorage.cpp |   5 +-
 .../SourceFiles/storage/storage_account.cpp   |   9 +-
 .../SourceFiles/storage/storage_account.h     |  11 +-
 .../SourceFiles/ui/image/image_location.cpp   | 100 ---------
 .../SourceFiles/ui/image/image_location.h     |  52 -----
 .../window/window_media_preview.cpp           |   4 +-
 Telegram/cmake/td_ui.cmake                    |  16 ++
 47 files changed, 637 insertions(+), 747 deletions(-)
 create mode 100644 Telegram/SourceFiles/core/file_location.cpp
 create mode 100644 Telegram/SourceFiles/core/file_location.h
 create mode 100644 Telegram/SourceFiles/platform/mac/file_bookmark_mac.h
 create mode 100644 Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm
 create mode 100644 Telegram/SourceFiles/platform/platform_file_bookmark.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index d6fdb2a4d..94741dda3 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -692,14 +692,6 @@ PRIVATE
     media/audio/media_child_ffmpeg_loader.h
     media/audio/media_openal_functions.cpp
     media/audio/media_openal_functions.h
-    media/clip/media_clip_check_streaming.cpp
-    media/clip/media_clip_check_streaming.h
-    media/clip/media_clip_ffmpeg.cpp
-    media/clip/media_clip_ffmpeg.h
-    media/clip/media_clip_implementation.cpp
-    media/clip/media_clip_implementation.h
-    media/clip/media_clip_reader.cpp
-    media/clip/media_clip_reader.h
     media/player/media_player_button.cpp
     media/player/media_player_button.h
     media/player/media_player_float.cpp
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
index baca58e7b..083778c9e 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
@@ -110,7 +110,7 @@ void DicePack::tryGenerateLocalZero() {
 	const auto document = _session->data().processDocument(
 		result->document,
 		Images::FromImageInMemory(result->thumb, "PNG"));
-	document->setLocation(FileLocation(path));
+	document->setLocation(Core::FileLocation(path));
 
 	_map.emplace(0, document);
 
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 5bc8f9c47..f9b9f496d 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -21,13 +21,8 @@ enum {
 	LocalEncryptSaltSize = 32, // 256 bit
 
 	AnimationTimerDelta = 7,
-	ClipThreadsCount = 8,
-	AverageGifSize = 320 * 240,
-	WaitBeforeGifPause = 200, // wait 200ms for gif draw before pausing it
 	RecentInlineBotsLimit = 10,
 
-	AVBlockSize = 4096, // 4Kb for ffmpeg blocksize
-
 	AutoSearchTimeout = 900, // 0.9 secs
 	SearchPerPage = 50,
 	SearchManyPerPage = 100,
diff --git a/Telegram/SourceFiles/core/file_location.cpp b/Telegram/SourceFiles/core/file_location.cpp
new file mode 100644
index 000000000..641bf0ea0
--- /dev/null
+++ b/Telegram/SourceFiles/core/file_location.cpp
@@ -0,0 +1,121 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "core/file_location.h"
+
+#include "platform/platform_file_bookmark.h"
+#include "logs.h"
+
+#include <QtCore/QFileInfo>
+
+namespace Core {
+namespace {
+
+const auto kInMediaCacheLocation = u"*media_cache*"_q;
+
+} // namespace
+
+ReadAccessEnabler::ReadAccessEnabler(const Platform::FileBookmark *bookmark)
+: _bookmark(bookmark)
+, _failed(_bookmark ? !_bookmark->enable() : false) {
+}
+
+ReadAccessEnabler::ReadAccessEnabler(
+	const std::shared_ptr<Platform::FileBookmark> &bookmark)
+: _bookmark(bookmark.get())
+, _failed(_bookmark ? !_bookmark->enable() : false) {
+}
+
+ReadAccessEnabler::~ReadAccessEnabler() {
+	if (_bookmark && !_failed) _bookmark->disable();
+}
+
+FileLocation::FileLocation(const QString &name) : fname(name) {
+	if (fname.isEmpty() || fname == kInMediaCacheLocation) {
+		size = 0;
+	} else {
+		setBookmark(Platform::PathBookmark(name));
+
+		QFileInfo f(name);
+		if (f.exists()) {
+			qint64 s = f.size();
+			if (s > INT_MAX) {
+				fname = QString();
+				_bookmark = nullptr;
+				size = 0;
+			} else {
+				modified = f.lastModified();
+				size = qint32(s);
+			}
+		} else {
+			fname = QString();
+			_bookmark = nullptr;
+			size = 0;
+		}
+	}
+}
+
+FileLocation FileLocation::InMediaCacheLocation() {
+	return FileLocation(kInMediaCacheLocation);
+}
+
+bool FileLocation::check() const {
+	if (fname.isEmpty() || fname == kInMediaCacheLocation) {
+		return false;
+	}
+
+	ReadAccessEnabler enabler(_bookmark);
+	if (enabler.failed()) {
+		const_cast<FileLocation*>(this)->_bookmark = nullptr;
+	}
+
+	QFileInfo f(name());
+	if (!f.isReadable()) return false;
+
+	quint64 s = f.size();
+	if (s > INT_MAX) {
+		DEBUG_LOG(("File location check: Wrong size %1").arg(s));
+		return false;
+	}
+
+	if (qint32(s) != size) {
+		DEBUG_LOG(("File location check: Wrong size %1 when should be %2").arg(s).arg(size));
+		return false;
+	}
+	auto realModified = f.lastModified();
+	if (realModified != modified) {
+		DEBUG_LOG(("File location check: Wrong last modified time %1 when should be %2").arg(realModified.toMSecsSinceEpoch()).arg(modified.toMSecsSinceEpoch()));
+		return false;
+	}
+	return true;
+}
+
+const QString &FileLocation::name() const {
+	return _bookmark ? _bookmark->name(fname) : fname;
+}
+
+QByteArray FileLocation::bookmark() const {
+	return _bookmark ? _bookmark->bookmark() : QByteArray();
+}
+
+bool FileLocation::inMediaCache() const {
+	return (fname == kInMediaCacheLocation);
+}
+
+void FileLocation::setBookmark(const QByteArray &bm) {
+	_bookmark.reset(bm.isEmpty() ? nullptr : new Platform::FileBookmark(bm));
+}
+
+bool FileLocation::accessEnable() const {
+	return isEmpty() ? false : (_bookmark ? _bookmark->enable() : true);
+}
+
+void FileLocation::accessDisable() const {
+	return _bookmark ? _bookmark->disable() : (void)0;
+}
+
+} // namespace Core
diff --git a/Telegram/SourceFiles/core/file_location.h b/Telegram/SourceFiles/core/file_location.h
new file mode 100644
index 000000000..16db6fce3
--- /dev/null
+++ b/Telegram/SourceFiles/core/file_location.h
@@ -0,0 +1,72 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include <QtCore/QDateTime>
+
+namespace Platform {
+class FileBookmark;
+} // namespace Platform
+
+namespace Core {
+
+class ReadAccessEnabler {
+public:
+	ReadAccessEnabler(const Platform::FileBookmark *bookmark);
+	ReadAccessEnabler(
+		const std::shared_ptr<Platform::FileBookmark> &bookmark);
+	bool failed() const {
+		return _failed;
+	}
+	~ReadAccessEnabler();
+
+private:
+	const Platform::FileBookmark *_bookmark = nullptr;
+	bool _failed;
+
+};
+
+class FileLocation {
+public:
+	FileLocation() = default;
+	explicit FileLocation(const QString &name);
+
+	static FileLocation InMediaCacheLocation();
+
+	[[nodiscard]] bool check() const;
+	[[nodiscard]] const QString &name() const;
+	void setBookmark(const QByteArray &bookmark);
+	QByteArray bookmark() const;
+	[[nodiscard]] bool isEmpty() const {
+		return name().isEmpty();
+	}
+	[[nodiscard]] bool inMediaCache() const;
+
+	bool accessEnable() const;
+	void accessDisable() const;
+
+	QString fname;
+	QDateTime modified;
+	qint32 size;
+
+private:
+	std::shared_ptr<Platform::FileBookmark> _bookmark;
+
+};
+
+inline bool operator==(const FileLocation &a, const FileLocation &b) {
+	return (a.name() == b.name())
+		&& (a.modified == b.modified)
+		&& (a.size == b.size);
+}
+
+inline bool operator!=(const FileLocation &a, const FileLocation &b) {
+	return !(a == b);
+}
+
+} // namespace Core
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 9d9dbf3e1..a4784561b 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -849,7 +849,7 @@ void DocumentData::finishLoad() {
 		_flags |= Flag::DownloadCancelled;
 		return;
 	}
-	setLocation(FileLocation(_loader->fileName()));
+	setLocation(Core::FileLocation(_loader->fileName()));
 	setGoodThumbnailDataReady();
 	if (const auto media = activeMediaView()) {
 		media->setBytes(_loader->bytes());
@@ -917,7 +917,7 @@ void DocumentData::setLoadedInMediaCache(bool loaded) {
 		if (loadedInMediaCache()) {
 			session().local().writeFileLocation(
 				mediaKey(),
-				FileLocation::InMediaCacheLocation());
+				Core::FileLocation::InMediaCacheLocation());
 		} else {
 			session().local().removeFileLocation(mediaKey());
 		}
@@ -926,7 +926,7 @@ void DocumentData::setLoadedInMediaCache(bool loaded) {
 }
 
 void DocumentData::setLoadedInMediaCacheLocation() {
-	_location = FileLocation();
+	_location = Core::FileLocation();
 	_flags |= Flag::LoadedInMediaCache;
 }
 
@@ -954,10 +954,10 @@ void DocumentData::save(
 				f.write(media->bytes());
 				f.close();
 
-				setLocation(FileLocation(toFile));
+				setLocation(Core::FileLocation(toFile));
 				session().local().writeFileLocation(
 					mediaKey(),
-					FileLocation(toFile));
+					Core::FileLocation(toFile));
 			} else if (l.accessEnable()) {
 				const auto &alreadyName = l.name();
 				if (alreadyName != toFile) {
@@ -1151,7 +1151,7 @@ QByteArray documentWaveformEncode5bit(const VoiceWaveform &waveform) {
 	return result;
 }
 
-const FileLocation &DocumentData::location(bool check) const {
+const Core::FileLocation &DocumentData::location(bool check) const {
 	if (check && !_location.check()) {
 		const auto location = session().local().readFileLocation(mediaKey());
 		const auto that = const_cast<DocumentData*>(this);
@@ -1164,7 +1164,7 @@ const FileLocation &DocumentData::location(bool check) const {
 	return _location;
 }
 
-void DocumentData::setLocation(const FileLocation &loc) {
+void DocumentData::setLocation(const Core::FileLocation &loc) {
 	if (loc.inMediaCache()) {
 		setLoadedInMediaCacheLocation();
 	} else if (loc.check()) {
@@ -1207,7 +1207,7 @@ bool DocumentData::saveFromDataChecked() {
 		return false;
 	}
 	file.close();
-	_location = FileLocation(path);
+	_location = Core::FileLocation(path);
 	session().local().writeFileLocation(mediaKey(), _location);
 	return true;
 }
@@ -1585,7 +1585,7 @@ void DocumentData::setRemoteLocation(
 				} else if (_location.isEmpty() && loadedInMediaCache()) {
 					session().local().writeFileLocation(
 						mediaKey(),
-						FileLocation::InMediaCacheLocation());
+						Core::FileLocation::InMediaCacheLocation());
 				}
 			}
 		}
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index a31dd6370..35b998d12 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/binary_guard.h"
 #include "data/data_types.h"
 #include "data/data_cloud_file.h"
+#include "core/file_location.h"
 #include "ui/image/image.h"
 
 class mtpFileLoader;
@@ -114,8 +115,8 @@ public:
 	void setWaitingForAlbum();
 	[[nodiscard]] bool waitingForAlbum() const;
 
-	[[nodiscard]] const FileLocation &location(bool check = false) const;
-	void setLocation(const FileLocation &loc);
+	[[nodiscard]] const Core::FileLocation &location(bool check = false) const;
+	void setLocation(const Core::FileLocation &loc);
 
 	bool saveFromData();
 	bool saveFromDataSilent();
@@ -315,7 +316,7 @@ private:
 	std::weak_ptr<Data::DocumentMedia> _media;
 	PhotoData *_goodThumbnailPhoto = nullptr;
 
-	FileLocation _location;
+	Core::FileLocation _location;
 	std::unique_ptr<DocumentAdditionalData> _additional;
 	int32 _duration = -1;
 	mutable Flags _flags = kStreamingSupportedUnknown;
diff --git a/Telegram/SourceFiles/data/data_document_media.cpp b/Telegram/SourceFiles/data/data_document_media.cpp
index 28916e511..4a1267e6e 100644
--- a/Telegram/SourceFiles/data/data_document_media.cpp
+++ b/Telegram/SourceFiles/data/data_document_media.cpp
@@ -111,8 +111,8 @@ void VideoPreviewState::automaticLoad(Data::FileOrigin origin) const {
 			_media->videoThumbnailContent(),
 			std::move(callback))
 		: ::Media::Clip::MakeReader(
-			_media,
-			FullMsgId(),
+			_media->owner()->location(),
+			_media->bytes(),
 			std::move(callback));
 }
 
@@ -386,7 +386,7 @@ void DocumentMedia::GenerateGoodThumbnail(
 		: FileType::Video;
 	auto location = document->location().isEmpty()
 		? nullptr
-		: std::make_unique<FileLocation>(document->location());
+		: std::make_unique<Core::FileLocation>(document->location());
 	if (data.isEmpty() && !location) {
 		document->setGoodThumbnailChecked(false);
 		return;
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
index de7db7a21..4be81913c 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.h
@@ -25,6 +25,7 @@ class QImage;
 namespace FFmpeg {
 
 inline constexpr auto kPixelBytesSize = 4;
+inline constexpr auto kAVBlockSize = 4096; // 4Kb for ffmpeg blocksize
 
 constexpr auto kUniversalTimeBase = AVRational{ 1, AV_TIME_BASE };
 constexpr auto kNormalAspect = AVRational{ 1, 1 };
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
index 4810cbc4a..c36ac5937 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@@ -1373,9 +1373,10 @@ void Game::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 		bool loaded = _documentMedia->loaded(), loading = document->loading(), displayLoading = document->displayLoading();
 		if (loaded && !_gif && !_gif.isBad()) {
 			auto that = const_cast<Game*>(this);
-			that->_gif = Media::Clip::MakeReader(_documentMedia.get(), FullMsgId(), [that](Media::Clip::Notification notification) {
-				that->clipCallback(notification);
-			});
+			that->_gif = Media::Clip::MakeReader(
+				_documentMedia->owner()->location(),
+				_documentMedia->bytes(),
+				[=](Media::Clip::Notification notification) { that->clipCallback(notification); });
 		}
 
 		bool animating = (_gif && _gif->started());
diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp
index e429ee774..02dcffd79 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio.cpp
@@ -430,7 +430,7 @@ void Mixer::Track::clear() {
 	detach();
 
 	state = TrackState();
-	file = FileLocation();
+	file = Core::FileLocation();
 	data = QByteArray();
 	bufferedPosition = 0;
 	bufferedLength = 0;
@@ -1519,7 +1519,7 @@ void DetachFromDevice(not_null<Audio::Instance*> instance) {
 
 class FFMpegAttributesReader : public AbstractFFMpegLoader {
 public:
-	FFMpegAttributesReader(const FileLocation &file, const QByteArray &data)
+	FFMpegAttributesReader(const Core::FileLocation &file, const QByteArray &data)
 	: AbstractFFMpegLoader(file, data, bytes::vector()) {
 	}
 
@@ -1632,7 +1632,7 @@ namespace Player {
 
 Ui::PreparedFileInformation::Song PrepareForSending(const QString &fname, const QByteArray &data) {
 	auto result = Ui::PreparedFileInformation::Song();
-	FFMpegAttributesReader reader(FileLocation(fname), data);
+	FFMpegAttributesReader reader(Core::FileLocation(fname), data);
 	const auto positionMs = crl::time(0);
 	if (reader.open(positionMs) && reader.samplesCount() > 0) {
 		result.duration = reader.samplesCount() / reader.samplesFrequency();
@@ -1647,7 +1647,7 @@ Ui::PreparedFileInformation::Song PrepareForSending(const QString &fname, const
 
 class FFMpegWaveformCounter : public FFMpegLoader {
 public:
-	FFMpegWaveformCounter(const FileLocation &file, const QByteArray &data) : FFMpegLoader(file, data, bytes::vector()) {
+	FFMpegWaveformCounter(const Core::FileLocation &file, const QByteArray &data) : FFMpegLoader(file, data, bytes::vector()) {
 	}
 
 	bool open(crl::time positionMs) override {
@@ -1732,7 +1732,7 @@ private:
 } // namespace Media
 
 VoiceWaveform audioCountWaveform(
-		const FileLocation &file,
+		const Core::FileLocation &file,
 		const QByteArray &data) {
 	Media::FFMpegWaveformCounter counter(file, data);
 	const auto positionMs = crl::time(0);
diff --git a/Telegram/SourceFiles/media/audio/media_audio.h b/Telegram/SourceFiles/media/audio/media_audio.h
index 962017073..890570cdb 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.h
+++ b/Telegram/SourceFiles/media/audio/media_audio.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/effects/animation_value.h"
 #include "ui/chat/attach/attach_prepare.h"
+#include "core/file_location.h"
 #include "base/bytes.h"
 
 #include <QtCore/QTimer>
@@ -221,7 +222,7 @@ private:
 
 		TrackState state;
 
-		FileLocation file;
+		Core::FileLocation file;
 		QByteArray data;
 		int64 bufferedPosition = 0;
 		int64 bufferedLength = 0;
@@ -368,7 +369,7 @@ bool audioCheckError();
 } // namespace Player
 } // namespace Media
 
-VoiceWaveform audioCountWaveform(const FileLocation &file, const QByteArray &data);
+VoiceWaveform audioCountWaveform(const Core::FileLocation &file, const QByteArray &data);
 
 namespace Media {
 namespace Audio {
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
index 224bd7ffb..580a8f8bc 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/audio/media_audio_capture.h"
 
 #include "media/audio/media_audio_ffmpeg_loader.h"
+#include "ffmpeg/ffmpeg_utility.h"
 #include "base/timer.h"
 
 #include <al.h>
@@ -247,9 +248,9 @@ void Instance::Inner::start(Fn<void(Update)> updated, Fn<void()> error) {
 
 	// Create encoding context
 
-	d->ioBuffer = (uchar*)av_malloc(AVBlockSize);
+	d->ioBuffer = (uchar*)av_malloc(FFmpeg::kAVBlockSize);
 
-	d->ioContext = avio_alloc_context(d->ioBuffer, AVBlockSize, 1, static_cast<void*>(d.get()), &Private::_read_data, &Private::_write_data, &Private::_seek_data);
+	d->ioContext = avio_alloc_context(d->ioBuffer, FFmpeg::kAVBlockSize, 1, static_cast<void*>(d.get()), &Private::_read_data, &Private::_write_data, &Private::_seek_data);
 	int res = 0;
 	char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
 	AVOutputFormat *fmt = 0;
diff --git a/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp
index 258e46a41..24c8bac2a 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/audio/media_audio_ffmpeg_loader.h"
 
+#include "core/file_location.h"
+#include "ffmpeg/ffmpeg_utility.h"
 #include "base/bytes.h"
 
 namespace Media {
@@ -34,13 +36,13 @@ bool AbstractFFMpegLoader::open(crl::time positionMs) {
 	int res = 0;
 	char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
 
-	ioBuffer = (uchar *)av_malloc(AVBlockSize);
+	ioBuffer = (uchar *)av_malloc(FFmpeg::kAVBlockSize);
 	if (!_data.isEmpty()) {
-		ioContext = avio_alloc_context(ioBuffer, AVBlockSize, 0, reinterpret_cast<void *>(this), &AbstractFFMpegLoader::_read_data, 0, &AbstractFFMpegLoader::_seek_data);
+		ioContext = avio_alloc_context(ioBuffer, FFmpeg::kAVBlockSize, 0, reinterpret_cast<void *>(this), &AbstractFFMpegLoader::_read_data, 0, &AbstractFFMpegLoader::_seek_data);
 	} else if (!_bytes.empty()) {
-		ioContext = avio_alloc_context(ioBuffer, AVBlockSize, 0, reinterpret_cast<void *>(this), &AbstractFFMpegLoader::_read_bytes, 0, &AbstractFFMpegLoader::_seek_bytes);
+		ioContext = avio_alloc_context(ioBuffer, FFmpeg::kAVBlockSize, 0, reinterpret_cast<void *>(this), &AbstractFFMpegLoader::_read_bytes, 0, &AbstractFFMpegLoader::_seek_bytes);
 	} else {
-		ioContext = avio_alloc_context(ioBuffer, AVBlockSize, 0, reinterpret_cast<void *>(this), &AbstractFFMpegLoader::_read_file, 0, &AbstractFFMpegLoader::_seek_file);
+		ioContext = avio_alloc_context(ioBuffer, FFmpeg::kAVBlockSize, 0, reinterpret_cast<void *>(this), &AbstractFFMpegLoader::_read_file, 0, &AbstractFFMpegLoader::_seek_file);
 	}
 	fmtContext = avformat_alloc_context();
 	if (!fmtContext) {
@@ -187,7 +189,7 @@ int64_t AbstractFFMpegLoader::_seek_file(void *opaque, int64_t offset, int whenc
 }
 
 AbstractAudioFFMpegLoader::AbstractAudioFFMpegLoader(
-	const FileLocation &file,
+	const Core::FileLocation &file,
 	const QByteArray &data,
 	bytes::vector &&buffer)
 : AbstractFFMpegLoader(file, data, std::move(buffer))
@@ -389,7 +391,7 @@ bool AbstractAudioFFMpegLoader::ensureResampleSpaceAvailable(int samples) {
 		return true;
 	}
 	const auto allocate = std::max(samples, int(av_rescale_rnd(
-		AVBlockSize / _outputSampleSize,
+		FFmpeg::kAVBlockSize / _outputSampleSize,
 		_swrDstRate,
 		_swrSrcRate,
 		AV_ROUND_UP)));
@@ -501,7 +503,7 @@ AbstractAudioFFMpegLoader::~AbstractAudioFFMpegLoader() {
 }
 
 FFMpegLoader::FFMpegLoader(
-	const FileLocation & file,
+	const Core::FileLocation & file,
 	const QByteArray & data,
 	bytes::vector && buffer)
 : AbstractAudioFFMpegLoader(file, data, std::move(buffer)) {
diff --git a/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h
index c0c5f32ca..83de13bad 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.h
@@ -20,12 +20,16 @@ extern "C" {
 
 #include <al.h>
 
+namespace Core {
+class FileLocation;
+} // namespace Core
+
 namespace Media {
 
 class AbstractFFMpegLoader : public AudioPlayerLoader {
 public:
 	AbstractFFMpegLoader(
-		const FileLocation &file,
+		const Core::FileLocation &file,
 		const QByteArray &data,
 		bytes::vector &&buffer)
 	: AudioPlayerLoader(file, data, std::move(buffer)) {
@@ -74,7 +78,7 @@ private:
 class AbstractAudioFFMpegLoader : public AbstractFFMpegLoader {
 public:
 	AbstractAudioFFMpegLoader(
-		const FileLocation &file,
+		const Core::FileLocation &file,
 		const QByteArray &data,
 		bytes::vector &&buffer);
 
@@ -149,7 +153,7 @@ private:
 class FFMpegLoader : public AbstractAudioFFMpegLoader {
 public:
 	FFMpegLoader(
-		const FileLocation &file,
+		const Core::FileLocation &file,
 		const QByteArray &data,
 		bytes::vector &&buffer);
 
diff --git a/Telegram/SourceFiles/media/audio/media_audio_loader.cpp b/Telegram/SourceFiles/media/audio/media_audio_loader.cpp
index a71f66835..7871f7195 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_loader.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_loader.cpp
@@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Media {
 
 AudioPlayerLoader::AudioPlayerLoader(
-	const FileLocation &file,
+	const Core::FileLocation &file,
 	const QByteArray &data,
 	bytes::vector &&buffer)
 : _file(file)
@@ -26,7 +26,7 @@ AudioPlayerLoader::~AudioPlayerLoader() {
 }
 
 bool AudioPlayerLoader::check(
-		const FileLocation &file,
+		const Core::FileLocation &file,
 		const QByteArray &data) {
 	return (this->_file == file) && (this->_data.size() == data.size());
 }
diff --git a/Telegram/SourceFiles/media/audio/media_audio_loader.h b/Telegram/SourceFiles/media/audio/media_audio_loader.h
index cdf51ca8d..399d85f71 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_loader.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_loader.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/bytes.h"
+#include "core/file_location.h"
 #include "media/streaming/media_streaming_utility.h"
 
 namespace Media {
@@ -15,12 +16,12 @@ namespace Media {
 class AudioPlayerLoader {
 public:
 	AudioPlayerLoader(
-		const FileLocation &file,
+		const Core::FileLocation &file,
 		const QByteArray &data,
 		bytes::vector &&buffer);
 	virtual ~AudioPlayerLoader();
 
-	virtual bool check(const FileLocation &file, const QByteArray &data);
+	virtual bool check(const Core::FileLocation &file, const QByteArray &data);
 
 	virtual bool open(crl::time positionMs) = 0;
 	virtual int64 samplesCount() = 0;
@@ -56,7 +57,7 @@ public:
 	bool holdsSavedDecodedSamples() const;
 
 protected:
-	FileLocation _file;
+	Core::FileLocation _file;
 	bool _access = false;
 	QByteArray _data;
 	bytes::vector _bytes;
diff --git a/Telegram/SourceFiles/media/audio/media_audio_track.cpp b/Telegram/SourceFiles/media/audio/media_audio_track.cpp
index 6e5e56c45..034aff421 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_track.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_track.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/audio/media_audio_ffmpeg_loader.h"
 #include "media/audio/media_audio.h"
 #include "core/application.h"
+#include "core/file_location.h"
 
 #include <al.h>
 #include <alc.h>
@@ -49,7 +50,7 @@ void Track::samplePeakEach(crl::time peakDuration) {
 }
 
 void Track::fillFromData(bytes::vector &&data) {
-	FFMpegLoader loader(FileLocation(), QByteArray(), std::move(data));
+	FFMpegLoader loader(Core::FileLocation(), QByteArray(), std::move(data));
 
 	auto position = qint64(0);
 	if (!loader.open(position)) {
@@ -110,7 +111,7 @@ void Track::fillFromData(bytes::vector &&data) {
 	_lengthMs = (loader.samplesCount() * crl::time(1000)) / _sampleRate;
 }
 
-void Track::fillFromFile(const FileLocation &location) {
+void Track::fillFromFile(const Core::FileLocation &location) {
 	if (location.accessEnable()) {
 		fillFromFile(location.name());
 		location.accessDisable();
diff --git a/Telegram/SourceFiles/media/audio/media_audio_track.h b/Telegram/SourceFiles/media/audio/media_audio_track.h
index 81656d190..b24b50b28 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_track.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_track.h
@@ -10,6 +10,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "base/bytes.h"
 
+namespace Core {
+class FileLocation;
+} // namespace Core
+
 namespace Media {
 namespace Audio {
 
@@ -22,7 +26,7 @@ public:
 	void samplePeakEach(crl::time peakDuration);
 
 	void fillFromData(bytes::vector &&data);
-	void fillFromFile(const FileLocation &location);
+	void fillFromFile(const Core::FileLocation &location);
 	void fillFromFile(const QString &filePath);
 
 	void playOnce() {
diff --git a/Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.cpp b/Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.cpp
index e50ae0ad2..179a53589 100644
--- a/Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.cpp
+++ b/Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/audio/media_child_ffmpeg_loader.h"
 
 #include "core/crash_reports.h"
+#include "core/file_location.h"
 
 namespace Media {
 namespace {
@@ -30,7 +31,7 @@ bool IsPlanarFormat(int format) {
 ChildFFMpegLoader::ChildFFMpegLoader(
 	std::unique_ptr<ExternalSoundData> &&data)
 : AbstractAudioFFMpegLoader(
-	FileLocation(),
+	Core::FileLocation(),
 	QByteArray(),
 	bytes::vector())
 , _parentData(std::move(data)) {
diff --git a/Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.h b/Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.h
index 95fb9a320..a68dd5529 100644
--- a/Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.h
+++ b/Telegram/SourceFiles/media/audio/media_child_ffmpeg_loader.h
@@ -31,7 +31,7 @@ public:
 
 	bool open(crl::time positionMs) override;
 
-	bool check(const FileLocation &file, const QByteArray &data) override {
+	bool check(const Core::FileLocation &file, const QByteArray &data) override {
 		return true;
 	}
 
diff --git a/Telegram/SourceFiles/media/clip/media_clip_check_streaming.cpp b/Telegram/SourceFiles/media/clip/media_clip_check_streaming.cpp
index 38e659de5..3e37dc7cf 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_check_streaming.cpp
+++ b/Telegram/SourceFiles/media/clip/media_clip_check_streaming.cpp
@@ -7,8 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/clip/media_clip_check_streaming.h"
 
-#include <QtCore/QBuffer>
+#include "core/file_location.h"
+#include "base/bytes.h"
+#include "logs.h"
+
 #include <QtCore/QtEndian>
+#include <QtCore/QBuffer>
 
 namespace Media {
 namespace Clip {
@@ -33,7 +37,7 @@ bool IsAtom(bytes::const_span header, const char (&atom)[5]) {
 } // namespace
 
 bool CheckStreamingSupport(
-		const FileLocation &location,
+		const Core::FileLocation &location,
 		QByteArray data) {
 	QBuffer buffer;
 	QFile file;
diff --git a/Telegram/SourceFiles/media/clip/media_clip_check_streaming.h b/Telegram/SourceFiles/media/clip/media_clip_check_streaming.h
index c2071e89f..093a456cb 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_check_streaming.h
+++ b/Telegram/SourceFiles/media/clip/media_clip_check_streaming.h
@@ -7,11 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+namespace Core {
+class FileLocation;
+} // namespace Core
+
 namespace Media {
 namespace Clip {
 
 bool CheckStreamingSupport(
-	const FileLocation &location,
+	const Core::FileLocation &location,
 	QByteArray data);
 
 } // namespace Clip
diff --git a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
index 2053da32d..15afec3ec 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
+++ b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
@@ -7,9 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/clip/media_clip_ffmpeg.h"
 
-#include "media/audio/media_audio.h"
-#include "media/audio/media_child_ffmpeg_loader.h"
-#include "storage/file_download.h"
+#include "core/file_location.h"
+#include "logs.h"
 
 namespace Media {
 namespace Clip {
@@ -49,12 +48,10 @@ bool isAlignedImage(const QImage &image) {
 } // namespace
 
 FFMpegReaderImplementation::FFMpegReaderImplementation(
-	FileLocation *location,
-	QByteArray *data,
-	const AudioMsgId &audio)
+	Core::FileLocation *location,
+	QByteArray *data)
 : ReaderImplementation(location, data)
-, _frame(FFmpeg::MakeFramePointer())
-, _audioMsgId(audio) {
+, _frame(FFmpeg::MakeFramePointer()) {
 }
 
 ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
@@ -73,9 +70,6 @@ ReaderImplementation::ReadResult FFMpegReaderImplementation::readNextFrame() {
 
 		if (res == AVERROR_EOF) {
 			_packetQueue.clear();
-			if (_mode == Mode::Normal) {
-				return ReadResult::EndOfFile;
-			}
 			if (!_hadFrame) {
 				LOG(("Gif Error: Got EOF before a single frame was read!"));
 				return ReadResult::Error;
@@ -171,44 +165,18 @@ void FFMpegReaderImplementation::processReadFrame() {
 }
 
 ReaderImplementation::ReadResult FFMpegReaderImplementation::readFramesTill(crl::time frameMs, crl::time systemMs) {
-	if (_audioStreamId < 0) { // just keep up
-		if (_frameRead && _frameTime > frameMs) {
-			return ReadResult::Success;
-		}
-		auto readResult = readNextFrame();
-		if (readResult != ReadResult::Success || _frameTime > frameMs) {
-			return readResult;
-		}
-		readResult = readNextFrame();
-		if (_frameTime <= frameMs) {
-			_frameTime = frameMs + 5; // keep up
-		}
+	if (_frameRead && _frameTime > frameMs) {
+		return ReadResult::Success;
+	}
+	auto readResult = readNextFrame();
+	if (readResult != ReadResult::Success || _frameTime > frameMs) {
 		return readResult;
 	}
-
-	// sync by audio stream
-	auto correctMs = (frameMs >= 0)
-		? Player::mixer()->getExternalCorrectedTime(
-			_audioMsgId,
-			frameMs,
-			systemMs)
-		: frameMs;
-	if (!_frameRead) {
-		auto readResult = readNextFrame();
-		if (readResult != ReadResult::Success) {
-			return readResult;
-		}
+	readResult = readNextFrame();
+	if (_frameTime <= frameMs) {
+		_frameTime = frameMs + 5; // keep up
 	}
-	while (_frameTime <= correctMs) {
-		auto readResult = readNextFrame();
-		if (readResult != ReadResult::Success) {
-			return readResult;
-		}
-	}
-	if (frameMs >= 0) {
-		_frameTimeCorrection = frameMs - correctMs;
-	}
-	return ReadResult::Success;
+	return readResult;
 }
 
 crl::time FFMpegReaderImplementation::frameRealTime() const {
@@ -273,17 +241,6 @@ bool FFMpegReaderImplementation::renderFrame(QImage &to, bool &hasAlpha, const Q
 		to = to.transformed(rotationTransform);
 	}
 
-	// Read some future packets for audio stream.
-	if (_audioStreamId >= 0) {
-		while (_frameMs + 5000 > _lastReadAudioMs
-			&& _frameMs + 15000 > _lastReadVideoMs) {
-			auto packetResult = readAndProcessPacket();
-			if (packetResult != PacketResult::Ok) {
-				break;
-			}
-		}
-	}
-
 	FFmpeg::ClearFrameMemory(_frame.get());
 
 	return true;
@@ -306,8 +263,8 @@ bool FFMpegReaderImplementation::start(Mode mode, crl::time &positionMs) {
 		LOG(("Gif Error: Unable to open device %1").arg(logData()));
 		return false;
 	}
-	_ioBuffer = (uchar*)av_malloc(AVBlockSize);
-	_ioContext = avio_alloc_context(_ioBuffer, AVBlockSize, 0, static_cast<void*>(this), &FFMpegReaderImplementation::_read, nullptr, &FFMpegReaderImplementation::_seek);
+	_ioBuffer = (uchar*)av_malloc(FFmpeg::kAVBlockSize);
+	_ioContext = avio_alloc_context(_ioBuffer, FFmpeg::kAVBlockSize, 0, static_cast<void*>(this), &FFMpegReaderImplementation::_read, nullptr, &FFMpegReaderImplementation::_seek);
 	_fmtContext = avformat_alloc_context();
 	if (!_fmtContext) {
 		LOG(("Gif Error: Unable to avformat_alloc_context %1").arg(logData()));
@@ -360,12 +317,9 @@ bool FFMpegReaderImplementation::start(Mode mode, crl::time &positionMs) {
 
 	const auto codec = avcodec_find_decoder(_codecContext->codec_id);
 
-	_audioStreamId = av_find_best_stream(_fmtContext, AVMEDIA_TYPE_AUDIO, -1, -1, nullptr, 0);
 	if (_mode == Mode::Inspecting) {
-		_hasAudioStream = (_audioStreamId >= 0);
-		_audioStreamId = -1;
-	} else if (_mode == Mode::Silent || !_audioMsgId.externalPlayId()) {
-		_audioStreamId = -1;
+		const auto audioStreamId = av_find_best_stream(_fmtContext, AVMEDIA_TYPE_AUDIO, -1, -1, nullptr, 0);
+		_hasAudioStream = (audioStreamId >= 0);
 	}
 
 	if ((res = avcodec_open2(_codecContext, codec, nullptr)) < 0) {
@@ -373,36 +327,6 @@ bool FFMpegReaderImplementation::start(Mode mode, crl::time &positionMs) {
 		return false;
 	}
 
-	std::unique_ptr<ExternalSoundData> soundData;
-	if (_audioStreamId >= 0) {
-		auto audioContext = avcodec_alloc_context3(nullptr);
-		if (!audioContext) {
-			LOG(("Audio Error: Unable to avcodec_alloc_context3 %1").arg(logData()));
-			return false;
-		}
-		if ((res = avcodec_parameters_to_context(audioContext, _fmtContext->streams[_audioStreamId]->codecpar)) < 0) {
-			LOG(("Audio Error: Unable to avcodec_parameters_to_context %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-			return false;
-		}
-		av_codec_set_pkt_timebase(audioContext, _fmtContext->streams[_audioStreamId]->time_base);
-		av_opt_set_int(audioContext, "refcounted_frames", 1, 0);
-
-		const auto audioCodec = avcodec_find_decoder(audioContext->codec_id);
-		if ((res = avcodec_open2(audioContext, audioCodec, 0)) < 0) {
-			avcodec_free_context(&audioContext);
-			LOG(("Gif Error: Unable to avcodec_open2 %1, error %2, %3").arg(logData()).arg(res).arg(av_make_error_string(err, sizeof(err), res)));
-			_audioStreamId = -1;
-		} else {
-			soundData = std::make_unique<ExternalSoundData>();
-			soundData->codec = FFmpeg::CodecPointer(audioContext);
-			soundData->frequency = _fmtContext->streams[_audioStreamId]->codecpar->sample_rate;
-			if (_fmtContext->streams[_audioStreamId]->duration == AV_NOPTS_VALUE) {
-				soundData->length = (_fmtContext->duration * soundData->frequency) / AV_TIME_BASE;
-			} else {
-				soundData->length = (_fmtContext->streams[_audioStreamId]->duration * soundData->frequency * _fmtContext->streams[_audioStreamId]->time_base.num) / _fmtContext->streams[_audioStreamId]->time_base.den;
-			}
-		}
-	}
 	if (positionMs > 0) {
 		const auto timeBase = _fmtContext->streams[_streamId]->time_base;
 		const auto timeStamp = (positionMs * timeBase.den)
@@ -420,10 +344,6 @@ bool FFMpegReaderImplementation::start(Mode mode, crl::time &positionMs) {
 		positionMs = countPacketMs(packet);
 	}
 
-	if (hasAudio()) {
-		Player::mixer()->play(_audioMsgId, std::move(soundData), positionMs);
-	}
-
 	if (readResult == PacketResult::Ok) {
 		processPacket(std::move(packet));
 	}
@@ -462,7 +382,7 @@ bool FFMpegReaderImplementation::isGifv() const {
 	if (_hasAudioStream) {
 		return false;
 	}
-	if (dataSize() > Storage::kMaxAnimationInMemory) {
+	if (dataSize() > kMaxInMemory) {
 		return false;
 	}
 	if (_codecContext->codec_id != AV_CODEC_ID_H264) {
@@ -472,7 +392,7 @@ bool FFMpegReaderImplementation::isGifv() const {
 }
 
 QString FFMpegReaderImplementation::logData() const {
-	return qsl("for file '%1', data size '%2'").arg(_location ? _location->name() : QString()).arg(_data->size());
+	return u"for file '%1', data size '%2'"_q.arg(_location ? _location->name() : QString()).arg(_data->size());
 }
 
 FFMpegReaderImplementation::~FFMpegReaderImplementation() {
@@ -494,14 +414,6 @@ FFMpegReaderImplementation::PacketResult FFMpegReaderImplementation::readPacket(
 	int res = 0;
 	if ((res = av_read_frame(_fmtContext, &packet.fields())) < 0) {
 		if (res == AVERROR_EOF) {
-			if (_audioStreamId >= 0) {
-				// queue terminating packet to audio player
-				auto empty = FFmpeg::Packet();
-				Player::mixer()->feedFromExternal({
-					_audioMsgId,
-					gsl::make_span(&empty, 1)
-				});
-			}
 			return PacketResult::EndOfFile;
 		}
 		char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
@@ -514,21 +426,9 @@ FFMpegReaderImplementation::PacketResult FFMpegReaderImplementation::readPacket(
 void FFMpegReaderImplementation::processPacket(FFmpeg::Packet &&packet) {
 	const auto &native = packet.fields();
 	auto videoPacket = (native.stream_index == _streamId);
-	auto audioPacket = (_audioStreamId >= 0 && native.stream_index == _audioStreamId);
-	if (audioPacket || videoPacket) {
-		if (videoPacket) {
-			_lastReadVideoMs = countPacketMs(packet);
-
-			_packetQueue.push_back(std::move(packet));
-		} else if (audioPacket) {
-			_lastReadAudioMs = countPacketMs(packet);
-
-			// queue packet to audio player
-			Player::mixer()->feedFromExternal({
-				_audioMsgId,
-				gsl::make_span(&packet, 1)
-			});
-		}
+	if (videoPacket) {
+		_lastReadVideoMs = countPacketMs(packet);
+		_packetQueue.push_back(std::move(packet));
 	}
 }
 
diff --git a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.h b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.h
index 6e1c7b11b..03d96ff0e 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.h
+++ b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.h
@@ -7,23 +7,26 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-extern "C" {
-
-#include <libswscale/swscale.h>
-
-} // extern "C"
-
 #include "media/clip/media_clip_implementation.h"
-#include "media/audio/media_child_ffmpeg_loader.h"
-#include "media/streaming/media_streaming_utility.h"
+#include "ffmpeg/ffmpeg_utility.h"
+
+extern "C" {
+#include <libswscale/swscale.h>
+#include <libavutil/opt.h>
+} // extern "C"
+#include <deque>
+
+//#include "media/streaming/media_streaming_utility.h"
 
 namespace Media {
 namespace Clip {
 namespace internal {
 
+constexpr auto kMaxInMemory = 10 * 1024 * 1024;
+
 class FFMpegReaderImplementation : public ReaderImplementation {
 public:
-	FFMpegReaderImplementation(FileLocation *location, QByteArray *data, const AudioMsgId &audio);
+	FFMpegReaderImplementation(Core::FileLocation *location, QByteArray *data);
 
 	ReadResult readFramesTill(crl::time frameMs, crl::time systemMs) override;
 
@@ -33,9 +36,6 @@ public:
 	bool renderFrame(QImage &to, bool &hasAlpha, const QSize &size) override;
 
 	crl::time durationMs() const override;
-	bool hasAudio() const override {
-		return (_audioStreamId >= 0);
-	}
 
 	bool start(Mode mode, crl::time &positionMs) override;
 	bool inspectAt(crl::time &positionMs);
@@ -74,7 +74,7 @@ private:
 	static int _read(void *opaque, uint8_t *buf, int buf_size);
 	static int64_t _seek(void *opaque, int64_t offset, int whence);
 
-	Mode _mode = Mode::Normal;
+	Mode _mode = Mode::Silent;
 
 	Rotation _rotation = Rotation::None;
 
@@ -90,8 +90,6 @@ private:
 	int _skippedInvalidDataPackets = 0;
 
 	bool _hasAudioStream = false;
-	int _audioStreamId = -1;
-	AudioMsgId _audioMsgId;
 	crl::time _lastReadVideoMs = 0;
 	crl::time _lastReadAudioMs = 0;
 
diff --git a/Telegram/SourceFiles/media/clip/media_clip_implementation.cpp b/Telegram/SourceFiles/media/clip/media_clip_implementation.cpp
index d8999bfed..e9b1f25b2 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_implementation.cpp
+++ b/Telegram/SourceFiles/media/clip/media_clip_implementation.cpp
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/clip/media_clip_implementation.h"
 
+#include "core/file_location.h"
+
 namespace Media {
 namespace Clip {
 namespace internal {
diff --git a/Telegram/SourceFiles/media/clip/media_clip_implementation.h b/Telegram/SourceFiles/media/clip/media_clip_implementation.h
index 72d746cf7..7e709fe60 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_implementation.h
+++ b/Telegram/SourceFiles/media/clip/media_clip_implementation.h
@@ -9,7 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtCore/QBuffer>
 
+namespace Core {
 class FileLocation;
+} // namespace Core
 
 namespace Media {
 namespace Clip {
@@ -17,13 +19,12 @@ namespace internal {
 
 class ReaderImplementation {
 public:
-	ReaderImplementation(FileLocation *location, QByteArray *data)
-		: _location(location)
-		, _data(data) {
+	ReaderImplementation(Core::FileLocation *location, QByteArray *data)
+	: _location(location)
+	, _data(data) {
 	}
 	enum class Mode {
 		Silent,
-		Normal,
 		Inspecting, // Not playing video, but reading data.
 	};
 
@@ -43,7 +44,6 @@ public:
 	virtual bool renderFrame(QImage &to, bool &hasAlpha, const QSize &size) = 0;
 
 	virtual crl::time durationMs() const = 0;
-	virtual bool hasAudio() const = 0;
 
 	virtual bool start(Mode mode, crl::time &positionMs) = 0;
 
@@ -54,8 +54,8 @@ public:
 	}
 
 protected:
-	FileLocation *_location;
-	QByteArray *_data;
+	Core::FileLocation *_location = nullptr;
+	QByteArray *_data = nullptr;
 	QFile _file;
 	QBuffer _buffer;
 	QIODevice *_device = nullptr;
diff --git a/Telegram/SourceFiles/media/clip/media_clip_reader.cpp b/Telegram/SourceFiles/media/clip/media_clip_reader.cpp
index 7cb071529..8c8194e7e 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_reader.cpp
+++ b/Telegram/SourceFiles/media/clip/media_clip_reader.cpp
@@ -7,29 +7,34 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "media/clip/media_clip_reader.h"
 
-#include "data/data_document.h"
-#include "data/data_document_media.h"
-#include "storage/file_download.h"
 #include "media/clip/media_clip_ffmpeg.h"
 #include "media/clip/media_clip_check_streaming.h"
-#include "mainwidget.h"
-#include "mainwindow.h"
+#include "core/file_location.h"
+#include "base/openssl_help.h"
+#include "base/invoke_queued.h"
+#include "logs.h"
 
 #include <QtCore/QBuffer>
 #include <QtCore/QAbstractEventDispatcher>
 #include <QtCore/QCoreApplication>
+#include <QtCore/QThread>
+#include <QtCore/QFileInfo>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavutil/opt.h>
 #include <libswscale/swscale.h>
-}
+} // extern "C"
 
 namespace Media {
 namespace Clip {
 namespace {
 
+constexpr auto kClipThreadsCount = 8;
+constexpr auto kAverageGifSize = 320 * 240;
+constexpr auto kWaitBeforeGifPause = crl::time(200);
+
 QVector<QThread*> threads;
 QVector<Manager*> managers;
 
@@ -85,44 +90,32 @@ QPixmap PrepareFrame(const FrameRequest &request, const QImage &original, bool h
 
 } // namespace
 
-Reader::Reader(const QString &filepath, Callback &&callback, Mode mode, crl::time seekMs)
-: _callback(std::move(callback))
-, _mode(mode)
-, _seekPositionMs(seekMs) {
-	init(FileLocation(filepath), QByteArray());
-}
-
 Reader::Reader(
-	not_null<Data::DocumentMedia*> media,
-	FullMsgId msgId,
-	Callback &&callback,
-	Mode mode,
-	crl::time seekMs)
-: _callback(std::move(callback))
-, _mode(mode)
-, _audioMsgId(
-	media->owner(),
-	msgId,
-	(mode == Mode::Video) ? AudioMsgId::CreateExternalPlayId() : 0)
-, _seekPositionMs(seekMs) {
-	init(media->owner()->location(), media->bytes());
+	const Core::FileLocation &location,
+	const QByteArray &data,
+	Callback &&callback)
+: _callback(std::move(callback)) {
+	init(location, data);
 }
 
-Reader::Reader(const QByteArray &data, Callback &&callback, Mode mode, crl::time seekMs)
-: _callback(std::move(callback))
-, _mode(mode)
-, _seekPositionMs(seekMs) {
-	init(FileLocation(QString()), data);
+Reader::Reader(const QString &filepath, Callback &&callback)
+: _callback(std::move(callback)) {
+	init(Core::FileLocation(filepath), QByteArray());
 }
 
-void Reader::init(const FileLocation &location, const QByteArray &data) {
-	if (threads.size() < ClipThreadsCount) {
+Reader::Reader(const QByteArray &data, Callback &&callback)
+: _callback(std::move(callback)) {
+	init(Core::FileLocation(QString()), data);
+}
+
+void Reader::init(const Core::FileLocation &location, const QByteArray &data) {
+	if (threads.size() < kClipThreadsCount) {
 		_threadIndex = threads.size();
 		threads.push_back(new QThread());
 		managers.push_back(new Manager(threads.back()));
 		threads.back()->start();
 	} else {
-		_threadIndex = int32(rand_value<uint32>() % threads.size());
+		_threadIndex = int32(openssl::RandomValue<uint32>() % threads.size());
 		int32 loadLevel = 0x7FFFFFFF;
 		for (int32 i = 0, l = threads.size(); i < l; ++i) {
 			int32 level = managers.at(i)->loadLevel();
@@ -216,7 +209,7 @@ void Reader::start(int32 framew, int32 frameh, int32 outerw, int32 outerh, Image
 	if (_state == State::Error) return;
 
 	if (_step.loadAcquire() == WaitingForRequestStep) {
-		int factor = cIntRetinaFactor();
+		int factor = style::DevicePixelRatio();
 		FrameRequest request;
 		request.factor = factor;
 		request.framew = framew * factor;
@@ -252,7 +245,7 @@ QPixmap Reader::current(int32 framew, int32 frameh, int32 outerw, int32 outerh,
 		frame->displayed.storeRelease(-1);
 	}
 
-	auto factor = cIntRetinaFactor();
+	auto factor = style::DevicePixelRatio();
 	if (frame->pix.width() == outerw * factor
 		&& frame->pix.height() == outerh * factor
 		&& frame->request.radius == radius
@@ -284,17 +277,6 @@ QPixmap Reader::current(int32 framew, int32 frameh, int32 outerw, int32 outerh,
 	return frame->pix;
 }
 
-QPixmap Reader::current() {
-	Expects(_mode == Mode::Video);
-
-	auto frame = frameToShow();
-	Assert(frame != nullptr);
-
-	frame->displayed.storeRelease(1);
-	moveToNextShow();
-	return frame->pix;
-}
-
 bool Reader::ready() const {
 	if (_width && _height) return true;
 
@@ -307,15 +289,11 @@ bool Reader::ready() const {
 	return false;
 }
 
-bool Reader::hasAudio() const {
-	return ready() ? _hasAudio : false;
-}
-
 crl::time Reader::getPositionMs() const {
 	if (auto frame = frameToShow()) {
 		return frame->positionMs;
 	}
-	return _seekPositionMs;
+	return 0;
 }
 
 crl::time Reader::getDurationMs() const {
@@ -370,13 +348,11 @@ Reader::~Reader() {
 
 class ReaderPrivate {
 public:
-	ReaderPrivate(Reader *reader, const FileLocation &location, const QByteArray &data) : _interface(reader)
-	, _mode(reader->mode())
-	, _audioMsgId(reader->audioMsgId())
-	, _seekPositionMs(reader->seekPositionMs())
+	ReaderPrivate(Reader *reader, const Core::FileLocation &location, const QByteArray &data)
+	: _interface(reader)
 	, _data(data) {
 		if (_data.isEmpty()) {
-			_location = std::make_unique<FileLocation>(location);
+			_location = std::make_unique<Core::FileLocation>(location);
 			if (!_location->accessEnable()) {
 				error();
 				return;
@@ -396,8 +372,8 @@ public:
 				// get the frame size and return a black frame with that size.
 
 				auto firstFramePositionMs = crl::time(0);
-				auto reader = std::make_unique<internal::FFMpegReaderImplementation>(_location.get(), &_data, AudioMsgId());
-				if (reader->start(internal::ReaderImplementation::Mode::Normal, firstFramePositionMs)) {
+				auto reader = std::make_unique<internal::FFMpegReaderImplementation>(_location.get(), &_data);
+				if (reader->start(internal::ReaderImplementation::Mode::Silent, firstFramePositionMs)) {
 					auto firstFrameReadResult = reader->readFramesTill(-1, ms);
 					if (firstFrameReadResult == internal::ReaderImplementation::ReadResult::Success) {
 						if (reader->renderFrame(frame()->original, frame()->alpha, QSize())) {
@@ -408,7 +384,6 @@ public:
 							_width = frame()->original.width();
 							_height = frame()->original.height();
 							_durationMs = _implementation->durationMs();
-							_hasAudio = _implementation->hasAudio();
 							return ProcessResult::Started;
 						}
 					}
@@ -426,7 +401,6 @@ public:
 			_width = frame()->original.width();
 			_height = frame()->original.height();
 			_durationMs = _implementation->durationMs();
-			_hasAudio = _implementation->hasAudio();
 			return ProcessResult::Started;
 		}
 		return ProcessResult::Wait;
@@ -444,9 +418,6 @@ public:
 		}
 		if (!_started) {
 			_started = true;
-			if (!_videoPausedAtMs && _hasAudio) {
-				Player::mixer()->resume(_audioMsgId, true);
-			}
 		}
 
 		if (!_autoPausedGif && !_videoPausedAtMs && ms >= _nextFrameWhen) {
@@ -459,7 +430,7 @@ public:
 		auto frameMs = _seekPositionMs + ms - _animationStarted;
 		auto readResult = _implementation->readFramesTill(frameMs, ms);
 		if (readResult == internal::ReaderImplementation::ReadResult::EndOfFile) {
-			stop(Player::State::StoppedAtEnd);
+			stop();
 			_state = State::Finished;
 			return ProcessResult::Finished;
 		} else if (readResult == internal::ReaderImplementation::ReadResult::Error) {
@@ -494,7 +465,7 @@ public:
 	}
 
 	bool init() {
-		if (_data.isEmpty() && QFileInfo(_location->name()).size() <= Storage::kMaxAnimationInMemory) {
+		if (_data.isEmpty() && QFileInfo(_location->name()).size() <= internal::kMaxInMemory) {
 			QFile f(_location->name());
 			if (f.open(QIODevice::ReadOnly)) {
 				_data = f.readAll();
@@ -504,16 +475,9 @@ public:
 			}
 		}
 
-		_implementation = std::make_unique<internal::FFMpegReaderImplementation>(_location.get(), &_data, _audioMsgId);
+		_implementation = std::make_unique<internal::FFMpegReaderImplementation>(_location.get(), &_data);
 
-		auto implementationMode = [this]() {
-			using ImplementationMode = internal::ReaderImplementation::Mode;
-			if (_mode == Reader::Mode::Gif) {
-				return ImplementationMode::Silent;
-			}
-			return ImplementationMode::Normal;
-		};
-		return _implementation->start(implementationMode(), _seekPositionMs);
+		return _implementation->start(internal::ReaderImplementation::Mode::Silent, _seekPositionMs);
 	}
 
 	void startedAt(crl::time ms) {
@@ -524,9 +488,6 @@ public:
 		if (_videoPausedAtMs) return; // Paused already.
 
 		_videoPausedAtMs = ms;
-		if (_hasAudio) {
-			Player::mixer()->pause(_audioMsgId, true);
-		}
 	}
 
 	void resumeVideo(crl::time ms) {
@@ -537,23 +498,16 @@ public:
 		_nextFrameWhen += delta;
 
 		_videoPausedAtMs = 0;
-		if (_hasAudio) {
-			Player::mixer()->resume(_audioMsgId, true);
-		}
 	}
 
 	ProcessResult error() {
-		stop(Player::State::StoppedAtError);
+		stop();
 		_state = State::Error;
 		return ProcessResult::Error;
 	}
 
-	void stop(Player::State audioState) {
+	void stop() {
 		_implementation = nullptr;
-		if (_hasAudio) {
-			Player::mixer()->stop(_audioMsgId, audioState);
-		}
-
 		if (_location) {
 			if (_accessed) {
 				_location->accessDisable();
@@ -564,19 +518,17 @@ public:
 	}
 
 	~ReaderPrivate() {
-		stop(Player::State::Stopped);
+		stop();
 		_data.clear();
 	}
 
 private:
 	Reader *_interface;
 	State _state = State::Reading;
-	Reader::Mode _mode;
-	AudioMsgId _audioMsgId;
 	crl::time _seekPositionMs = 0;
 
 	QByteArray _data;
-	std::unique_ptr<FileLocation> _location;
+	std::unique_ptr<Core::FileLocation> _location;
 	bool _accessed = false;
 
 	QBuffer _buffer;
@@ -601,7 +553,6 @@ private:
 	int _width = 0;
 	int _height = 0;
 
-	bool _hasAudio = false;
 	crl::time _durationMs = 0;
 	crl::time _animationStarted = 0;
 	crl::time _nextFrameWhen = 0;
@@ -617,24 +568,17 @@ private:
 
 Manager::Manager(QThread *thread) {
 	moveToThread(thread);
-	connect(thread, SIGNAL(started()), this, SLOT(process()));
-	connect(thread, SIGNAL(finished()), this, SLOT(finish()));
-	connect(this, SIGNAL(processDelayed()), this, SLOT(process()), Qt::QueuedConnection);
+	connect(thread, &QThread::started, this, [=] { process(); });
+	connect(thread, &QThread::finished, this, [=] { finish(); });
 
 	_timer.setSingleShot(true);
 	_timer.moveToThread(thread);
-	connect(&_timer, SIGNAL(timeout()), this, SLOT(process()));
-
-	connect(
-		this,
-		&Manager::callback,
-		QCoreApplication::instance(),
-		&Reader::callback);
+	connect(&_timer, &QTimer::timeout, this, [=] { process(); });
 }
 
-void Manager::append(Reader *reader, const FileLocation &location, const QByteArray &data) {
+void Manager::append(Reader *reader, const Core::FileLocation &location, const QByteArray &data) {
 	reader->_private = new ReaderPrivate(reader, location, data);
-	_loadLevel.fetchAndAddRelaxed(AverageGifSize);
+	_loadLevel.fetchAndAddRelaxed(kAverageGifSize);
 	update(reader);
 }
 
@@ -650,7 +594,7 @@ void Manager::update(Reader *reader) {
 	} else {
 		i->storeRelease(1);
 	}
-	emit processDelayed();
+	InvokeQueued(this, [=] { process(); });
 }
 
 void Manager::stop(Reader *reader) {
@@ -658,7 +602,7 @@ void Manager::stop(Reader *reader) {
 
 	QMutexLocker lock(&_readerPointersMutex);
 	_readerPointers.remove(reader);
-	emit processDelayed();
+	InvokeQueued(this, [=] { process(); });
 }
 
 bool Manager::carries(Reader *reader) const {
@@ -680,20 +624,26 @@ Manager::ReaderPointers::const_iterator Manager::constUnsafeFindReaderPointer(Re
 	return (it == _readerPointers.cend() || it.key()->_private == reader) ? it : _readerPointers.cend();
 }
 
+void Manager::callback(Reader *reader, Notification notification) {
+	crl::on_main([=, threadIndex = reader->threadIndex()] {
+		Reader::callback(reader, threadIndex, notification);
+	});
+}
+
 bool Manager::handleProcessResult(ReaderPrivate *reader, ProcessResult result, crl::time ms) {
 	QMutexLocker lock(&_readerPointersMutex);
 	auto it = unsafeFindReaderPointer(reader);
 	if (result == ProcessResult::Error) {
 		if (it != _readerPointers.cend()) {
 			it.key()->error();
-			emit callback(it.key(), it.key()->threadIndex(), NotificationReinit);
+			callback(it.key(), NotificationReinit);
 			_readerPointers.erase(it);
 		}
 		return false;
 	} else if (result == ProcessResult::Finished) {
 		if (it != _readerPointers.cend()) {
 			it.key()->finished();
-			emit callback(it.key(), it.key()->threadIndex(), NotificationReinit);
+			callback(it.key(), NotificationReinit);
 		}
 		return false;
 	}
@@ -702,17 +652,16 @@ bool Manager::handleProcessResult(ReaderPrivate *reader, ProcessResult result, c
 	}
 
 	if (result == ProcessResult::Started) {
-		_loadLevel.fetchAndAddRelaxed(reader->_width * reader->_height - AverageGifSize);
+		_loadLevel.fetchAndAddRelaxed(reader->_width * reader->_height - kAverageGifSize);
 		it.key()->_durationMs = reader->_durationMs;
-		it.key()->_hasAudio = reader->_hasAudio;
 	}
 	// See if we need to pause GIF because it is not displayed right now.
-	if (!reader->_autoPausedGif && reader->_mode == Reader::Mode::Gif && result == ProcessResult::Repaint) {
+	if (!reader->_autoPausedGif && result == ProcessResult::Repaint) {
 		int32 ishowing, iprevious;
 		auto showing = it.key()->frameToShow(&ishowing), previous = it.key()->frameToWriteNext(false, &iprevious);
 		Assert(previous != nullptr && showing != nullptr && ishowing >= 0 && iprevious >= 0);
 		if (reader->_frames[ishowing].when > 0 && showing->displayed.loadAcquire() <= 0) { // current frame was not shown
-			if (reader->_frames[ishowing].when + WaitBeforeGifPause < ms || (reader->_frames[iprevious].when && previous->displayed.loadAcquire() <= 0)) {
+			if (reader->_frames[ishowing].when + kWaitBeforeGifPause < ms || (reader->_frames[iprevious].when && previous->displayed.loadAcquire() <= 0)) {
 				reader->_autoPausedGif = true;
 				it.key()->_autoPausedGif.storeRelease(1);
 				result = ProcessResult::Paused;
@@ -730,21 +679,21 @@ bool Manager::handleProcessResult(ReaderPrivate *reader, ProcessResult result, c
 		if (result == ProcessResult::Started) {
 			reader->startedAt(ms);
 			it.key()->moveToNextWrite();
-			emit callback(it.key(), it.key()->threadIndex(), NotificationReinit);
+			callback(it.key(), NotificationReinit);
 		}
 	} else if (result == ProcessResult::Paused) {
 		it.key()->moveToNextWrite();
-		emit callback(it.key(), it.key()->threadIndex(), NotificationReinit);
+		callback(it.key(), NotificationReinit);
 	} else if (result == ProcessResult::Repaint) {
 		it.key()->moveToNextWrite();
-		emit callback(it.key(), it.key()->threadIndex(), NotificationRepaint);
+		callback(it.key(), NotificationRepaint);
 	}
 	return true;
 }
 
 Manager::ResultHandleState Manager::handleResult(ReaderPrivate *reader, ProcessResult result, crl::time ms) {
 	if (!handleProcessResult(reader, result, ms)) {
-		_loadLevel.fetchAndAddRelaxed(-1 * (reader->_width > 0 ? reader->_width * reader->_height : AverageGifSize));
+		_loadLevel.fetchAndAddRelaxed(-1 * (reader->_width > 0 ? reader->_width * reader->_height : kAverageGifSize));
 		delete reader;
 		return ResultHandleRemove;
 	}
@@ -836,7 +785,7 @@ void Manager::process() {
 			QMutexLocker lock(&_readerPointersMutex);
 			auto it = constUnsafeFindReaderPointer(reader);
 			if (it == _readerPointers.cend()) {
-				_loadLevel.fetchAndAddRelaxed(-1 * (reader->_width > 0 ? reader->_width * reader->_height : AverageGifSize));
+				_loadLevel.fetchAndAddRelaxed(-1 * (reader->_width > 0 ? reader->_width * reader->_height : kAverageGifSize));
 				delete reader;
 				i = _readers.erase(i);
 				continue;
@@ -885,11 +834,11 @@ Manager::~Manager() {
 
 Ui::PreparedFileInformation::Video PrepareForSending(const QString &fname, const QByteArray &data) {
 	auto result = Ui::PreparedFileInformation::Video();
-	auto localLocation = FileLocation(fname);
+	auto localLocation = Core::FileLocation(fname);
 	auto localData = QByteArray(data);
 
 	auto seekPositionMs = crl::time(0);
-	auto reader = std::make_unique<internal::FFMpegReaderImplementation>(&localLocation, &localData, AudioMsgId());
+	auto reader = std::make_unique<internal::FFMpegReaderImplementation>(&localLocation, &localData);
 	if (reader->start(internal::ReaderImplementation::Mode::Inspecting, seekPositionMs)) {
 		auto durationMs = reader->durationMs();
 		if (durationMs > 0) {
@@ -939,7 +888,7 @@ void Finish() {
 	}
 }
 
-Reader *const ReaderPointer::BadPointer = SharedMemoryLocation<Reader, 0>();
+Reader *const ReaderPointer::BadPointer = reinterpret_cast<Reader*>(1);
 
 ReaderPointer::~ReaderPointer() {
 	if (valid()) {
diff --git a/Telegram/SourceFiles/media/clip/media_clip_reader.h b/Telegram/SourceFiles/media/clip/media_clip_reader.h
index cb84dffd9..9a86e68eb 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_reader.h
+++ b/Telegram/SourceFiles/media/clip/media_clip_reader.h
@@ -11,12 +11,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/image/image_prepare.h"
 
 #include <QtCore/QTimer>
+#include <QtCore/QMutex>
 
+namespace Core {
 class FileLocation;
-
-namespace Data {
-class DocumentMedia;
-} // namespace Data
+} // namespace Core
 
 namespace Media {
 namespace Clip {
@@ -60,23 +59,15 @@ public:
 		Video,
 	};
 
-	Reader(not_null<Data::DocumentMedia*> media, FullMsgId msgId, Callback &&callback, Mode mode = Mode::Gif, crl::time seekMs = 0);
-	Reader(const QString &filepath, Callback &&callback, Mode mode = Mode::Gif, crl::time seekMs = 0);
-	Reader(const QByteArray &data, Callback &&callback, Mode mode = Mode::Gif, crl::time seekMs = 0);
+	Reader(const Core::FileLocation &location, const QByteArray &data, Callback &&callback);
+	Reader(const QString &filepath, Callback &&callback);
+	Reader(const QByteArray &data, Callback &&callback);
 
 	// Reader can be already deleted.
 	static void callback(Reader *reader, qint32 threadIndex, qint32 notification);
 
-	AudioMsgId audioMsgId() const {
-		return _audioMsgId;
-	}
-	crl::time seekPositionMs() const {
-		return _seekPositionMs;
-	}
-
 	void start(int framew, int frameh, int outerw, int outerh, ImageRoundRadius radius, RectParts corners);
 	QPixmap current(int framew, int frameh, int outerw, int outerh, ImageRoundRadius radius, RectParts corners, crl::time ms);
-	QPixmap current();
 	QPixmap frameOriginal() const {
 		if (auto frame = frameToShow()) {
 			auto result = QPixmap::fromImage(frame->original);
@@ -107,7 +98,6 @@ public:
 	}
 	bool ready() const;
 
-	bool hasAudio() const;
 	crl::time getPositionMs() const;
 	crl::time getDurationMs() const;
 	void pauseResumeVideo();
@@ -116,24 +106,15 @@ public:
 	void error();
 	void finished();
 
-	Mode mode() const {
-		return _mode;
-	}
-
 	~Reader();
 
 private:
-	void init(const FileLocation &location, const QByteArray &data);
+	void init(const Core::FileLocation &location, const QByteArray &data);
 
 	Callback _callback;
-	Mode _mode;
-
 	State _state = State::Reading;
 
-	AudioMsgId _audioMsgId;
-	bool _hasAudio = false;
 	crl::time _durationMs = 0;
-	crl::time _seekPositionMs = 0;
 
 	mutable int _width = 0;
 	mutable int _height = 0;
@@ -240,32 +221,23 @@ enum class ProcessResult {
 };
 
 class Manager : public QObject {
-	Q_OBJECT
-
 public:
+	explicit Manager(QThread *thread);
+	~Manager();
 
-	Manager(QThread *thread);
-	int32 loadLevel() const {
+	int loadLevel() const {
 		return _loadLevel.load();
 	}
-	void append(Reader *reader, const FileLocation &location, const QByteArray &data);
+	void append(Reader *reader, const Core::FileLocation &location, const QByteArray &data);
 	void start(Reader *reader);
 	void update(Reader *reader);
 	void stop(Reader *reader);
 	bool carries(Reader *reader) const;
-	~Manager();
-
-signals:
-	void processDelayed();
-
-	void callback(Media::Clip::Reader *reader, qint32 threadIndex, qint32 notification);
-
-public slots:
-	void process();
-	void finish();
 
 private:
-
+	void process();
+	void finish();
+	void callback(Reader *reader, Notification notification);
 	void clear();
 
 	QAtomicInt _loadLevel;
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.h b/Telegram/SourceFiles/platform/linux/specific_linux.h
index bc71760f8..ff39fe802 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.h
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.h
@@ -73,33 +73,9 @@ void psNewVersion();
 inline QByteArray psDownloadPathBookmark(const QString &path) {
 	return QByteArray();
 }
-inline QByteArray psPathBookmark(const QString &path) {
-	return QByteArray();
-}
 inline void psDownloadPathEnableAccess() {
 }
 
-class PsFileBookmark {
-public:
-	PsFileBookmark(const QByteArray &bookmark) {
-	}
-	bool check() const {
-		return true;
-	}
-	bool enable() const {
-		return true;
-	}
-	void disable() const {
-	}
-	const QString &name(const QString &original) const {
-		return original;
-	}
-	QByteArray bookmark() const {
-		return QByteArray();
-	}
-
-};
-
 bool linuxMoveFile(const char *from, const char *to);
 
 bool psLaunchMaps(const Data::LocationPoint &point);
diff --git a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.h b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.h
new file mode 100644
index 000000000..a60971184
--- /dev/null
+++ b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.h
@@ -0,0 +1,33 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Platform {
+
+class FileBookmark final {
+public:
+	FileBookmark(const QByteArray &bookmark);
+	~FileBookmark();
+
+	[[nodiscard]] bool check() const;
+	bool enable() const;
+	void disable();
+	[[nodiscard]] const QString &name(const QString &original) const;
+	[[nodiscard]] QByteArray bookmark() const;
+
+private:
+#ifdef OS_MAC_STORE
+	struct Data;
+	Data *data = nullptr;
+#endif // OS_MAC_STORE
+
+};
+
+[[nodiscard]] QByteArray PathBookmark(const QString &path);
+
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm
new file mode 100644
index 000000000..27fd68f93
--- /dev/null
+++ b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm
@@ -0,0 +1,125 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "platform/mac/file_bookmark_mac.h"
+
+namespace Platform {
+namespace {
+
+#ifdef OS_MAC_STORE
+QMutex BookmarksMutex;
+#endif // OS_MAC_STORE
+
+} // namespace
+
+#ifdef OS_MAC_STORE
+struct FileBookmark::Data {
+	~Data() {
+		if (url) [url release];
+	}
+	NSURL *url = nil;
+	QString name;
+	QByteArray bookmark;
+	int counter = 0;
+};
+#endif // OS_MAC_STORE
+
+FileBookmark::FileBookmark(const QByteArray &bookmark) {
+#ifdef OS_MAC_STORE
+	if (bookmark.isEmpty()) return;
+
+	BOOL isStale = NO;
+	NSError *error = nil;
+	NSURL *url = [NSURL URLByResolvingBookmarkData:bookmark.toNSData() options:NSURLBookmarkResolutionWithSecurityScope relativeToURL:nil bookmarkDataIsStale:&isStale error:&error];
+	if (!url) return;
+
+	if ([url startAccessingSecurityScopedResource]) {
+		data = new Data();
+		data->url = [url retain];
+		data->name = NS2QString([url path]);
+		data->bookmark = bookmark;
+		[url stopAccessingSecurityScopedResource];
+	}
+#endif // OS_MAC_STORE
+}
+
+bool FileBookmark::check() const {
+	if (enable()) {
+		disable();
+		return true;
+	}
+	return false;
+}
+
+bool FileBookmark::enable() const {
+#ifndef OS_MAC_STORE
+	return true;
+#else // OS_MAC_STORE
+	if (!data) return false;
+
+	QMutexLocker lock(&_bookmarksMutex);
+	if (data->counter > 0 || [data->url startAccessingSecurityScopedResource] == YES) {
+		++data->counter;
+		return true;
+	}
+	return false;
+#endif // OS_MAC_STORE
+}
+
+void FileBookmark::disable() const {
+#ifdef OS_MAC_STORE
+	if (!data) return;
+
+	QMutexLocker lock(&_bookmarksMutex);
+	if (data->counter > 0) {
+		--data->counter;
+		if (!data->counter) {
+			[data->url stopAccessingSecurityScopedResource];
+		}
+	}
+#endif // OS_MAC_STORE
+}
+
+const QString &FileBookmark::name(const QString &original) const {
+#ifndef OS_MAC_STORE
+	return original;
+#else // OS_MAC_STORE
+	return (data && !data->name.isEmpty()) ? data->name : original;
+#endif // OS_MAC_STORE
+}
+
+QByteArray FileBookmark::bookmark() const {
+#ifndef OS_MAC_STORE
+	return QByteArray();
+#else // OS_MAC_STORE
+	return data ? data->bookmark : QByteArray();
+#endif // OS_MAC_STORE
+}
+
+FileBookmark::~FileBookmark() {
+#ifdef OS_MAC_STORE
+	if (data && data->counter > 0) {
+		LOG(("Did not disable() bookmark, counter: %1").arg(data->counter));
+		[data->url stopAccessingSecurityScopedResource];
+	}
+#endif // OS_MAC_STORE
+}
+
+QByteArray PathBookmark(const QString &path) {
+#ifndef OS_MAC_STORE
+	return QByteArray();
+#else // OS_MAC_STORE
+	NSURL *url = [NSURL fileURLWithPath:[NSString stringWithUTF8String:path.toUtf8().constData()]];
+	if (!url) return QByteArray();
+
+	NSError *error = nil;
+	NSData *data = [url bookmarkDataWithOptions:(NSURLBookmarkCreationWithSecurityScope | NSURLBookmarkCreationSecurityScopeAllowOnlyReadAccess) includingResourceValuesForKeys:nil relativeToURL:nil error:&error];
+	return data ? QByteArray::fromNSData(data) : QByteArray();
+#endif // OS_MAC_STORE
+}
+
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h
index af04f1320..25c3bc933 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.h
@@ -98,31 +98,6 @@ void psDownloadPathEnableAccess();
 QByteArray psDownloadPathBookmark(const QString &path);
 QByteArray psPathBookmark(const QString &path);
 
-class PsFileBookmark {
-public:
-	PsFileBookmark(const QByteArray &bookmark) : _inner(bookmark) {
-	}
-	bool check() const {
-		return _inner.valid();
-	}
-	bool enable() const {
-		return _inner.enable();
-	}
-	void disable() const {
-		return _inner.disable();
-	}
-	const QString &name(const QString &original) const {
-		return _inner.name(original);
-	}
-	QByteArray bookmark() const {
-		return _inner.bookmark();
-	}
-
-private:
-	objc_FileBookmark _inner;
-
-};
-
 QString strNotificationAboutThemeChange();
 QString strNotificationAboutScreenLocked();
 QString strNotificationAboutScreenUnlocked();
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm
index 63d320087..d2becc60d 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm
@@ -253,10 +253,6 @@ QByteArray psDownloadPathBookmark(const QString &path) {
 	return objc_downloadPathBookmark(path);
 }
 
-QByteArray psPathBookmark(const QString &path) {
-	return objc_pathBookmark(path);
-}
-
 bool psLaunchMaps(const Data::LocationPoint &point) {
 	return QDesktopServices::openUrl(qsl("https://maps.apple.com/?q=Point&z=16&ll=%1,%2").arg(point.latAsString()).arg(point.lonAsString()));
 }
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.h b/Telegram/SourceFiles/platform/mac/specific_mac_p.h
index 0a01209d3..35eb05d53 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.h
@@ -25,25 +25,4 @@ double objc_appkitVersion();
 QString objc_documentsPath();
 QString objc_appDataPath();
 QByteArray objc_downloadPathBookmark(const QString &path);
-QByteArray objc_pathBookmark(const QString &path);
 void objc_downloadPathEnableAccess(const QByteArray &bookmark);
-
-class objc_FileBookmark {
-public:
-	objc_FileBookmark(const QByteArray &bookmark);
-	bool valid() const;
-	bool enable() const;
-	void disable() const;
-
-	const QString &name(const QString &original) const;
-	QByteArray bookmark() const;
-
-	~objc_FileBookmark();
-
-private:
-#ifdef OS_MAC_STORE
-	class objc_FileBookmarkData;
-	objc_FileBookmarkData *data = nullptr;
-#endif // OS_MAC_STORE
-
-};
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
index 59b9539ee..6cba7ee3c 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
@@ -373,19 +373,6 @@ QByteArray objc_downloadPathBookmark(const QString &path) {
 #endif // OS_MAC_STORE
 }
 
-QByteArray objc_pathBookmark(const QString &path) {
-#ifndef OS_MAC_STORE
-	return QByteArray();
-#else // OS_MAC_STORE
-	NSURL *url = [NSURL fileURLWithPath:[NSString stringWithUTF8String:path.toUtf8().constData()]];
-	if (!url) return QByteArray();
-
-	NSError *error = nil;
-	NSData *data = [url bookmarkDataWithOptions:(NSURLBookmarkCreationWithSecurityScope | NSURLBookmarkCreationSecurityScopeAllowOnlyReadAccess) includingResourceValuesForKeys:nil relativeToURL:nil error:&error];
-	return data ? QByteArray::fromNSData(data) : QByteArray();
-#endif // OS_MAC_STORE
-}
-
 void objc_downloadPathEnableAccess(const QByteArray &bookmark) {
 #ifdef OS_MAC_STORE
 	if (bookmark.isEmpty()) return;
@@ -412,101 +399,3 @@ void objc_downloadPathEnableAccess(const QByteArray &bookmark) {
 	}
 #endif // OS_MAC_STORE
 }
-
-#ifdef OS_MAC_STORE
-namespace {
-	QMutex _bookmarksMutex;
-}
-
-class objc_FileBookmark::objc_FileBookmarkData {
-public:
-	~objc_FileBookmarkData() {
-		if (url) [url release];
-	}
-	NSURL *url = nil;
-	QString name;
-	QByteArray bookmark;
-	int counter = 0;
-};
-#endif // OS_MAC_STORE
-
-objc_FileBookmark::objc_FileBookmark(const QByteArray &bookmark) {
-#ifdef OS_MAC_STORE
-	if (bookmark.isEmpty()) return;
-
-	BOOL isStale = NO;
-	NSError *error = nil;
-	NSURL *url = [NSURL URLByResolvingBookmarkData:bookmark.toNSData() options:NSURLBookmarkResolutionWithSecurityScope relativeToURL:nil bookmarkDataIsStale:&isStale error:&error];
-	if (!url) return;
-
-	if ([url startAccessingSecurityScopedResource]) {
-		data = new objc_FileBookmarkData();
-		data->url = [url retain];
-		data->name = NS2QString([url path]);
-		data->bookmark = bookmark;
-		[url stopAccessingSecurityScopedResource];
-	}
-#endif // OS_MAC_STORE
-}
-
-bool objc_FileBookmark::valid() const {
-	if (enable()) {
-		disable();
-		return true;
-	}
-	return false;
-}
-
-bool objc_FileBookmark::enable() const {
-#ifndef OS_MAC_STORE
-	return true;
-#else // OS_MAC_STORE
-	if (!data) return false;
-
-	QMutexLocker lock(&_bookmarksMutex);
-	if (data->counter > 0 || [data->url startAccessingSecurityScopedResource] == YES) {
-		++data->counter;
-		return true;
-	}
-	return false;
-#endif // OS_MAC_STORE
-}
-
-void objc_FileBookmark::disable() const {
-#ifdef OS_MAC_STORE
-	if (!data) return;
-
-	QMutexLocker lock(&_bookmarksMutex);
-	if (data->counter > 0) {
-		--data->counter;
-		if (!data->counter) {
-			[data->url stopAccessingSecurityScopedResource];
-		}
-	}
-#endif // OS_MAC_STORE
-}
-
-const QString &objc_FileBookmark::name(const QString &original) const {
-#ifndef OS_MAC_STORE
-	return original;
-#else // OS_MAC_STORE
-	return (data && !data->name.isEmpty()) ? data->name : original;
-#endif // OS_MAC_STORE
-}
-
-QByteArray objc_FileBookmark::bookmark() const {
-#ifndef OS_MAC_STORE
-	return QByteArray();
-#else // OS_MAC_STORE
-	return data ? data->bookmark : QByteArray();
-#endif // OS_MAC_STORE
-}
-
-objc_FileBookmark::~objc_FileBookmark() {
-#ifdef OS_MAC_STORE
-	if (data && data->counter > 0) {
-		LOG(("Did not disable() bookmark, counter: %1").arg(data->counter));
-		[data->url stopAccessingSecurityScopedResource];
-	}
-#endif // OS_MAC_STORE
-}
diff --git a/Telegram/SourceFiles/platform/platform_file_bookmark.h b/Telegram/SourceFiles/platform/platform_file_bookmark.h
new file mode 100644
index 000000000..dffc792b8
--- /dev/null
+++ b/Telegram/SourceFiles/platform/platform_file_bookmark.h
@@ -0,0 +1,43 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#ifdef Q_OS_MAC
+#include "platform/mac/file_bookmark_mac.h"
+#else // Q_OS_MAC
+
+namespace Platform {
+
+class FileBookmark {
+public:
+	FileBookmark(const QByteArray &bookmark) {
+	}
+	bool check() const {
+		return true;
+	}
+	bool enable() const {
+		return true;
+	}
+	void disable() const {
+	}
+	const QString &name(const QString &original) const {
+		return original;
+	}
+	QByteArray bookmark() const {
+		return QByteArray();
+	}
+
+};
+
+[[nodiscard]] inline QByteArray PathBookmark(const QString &path) {
+	return QByteArray();
+}
+
+} // namespace Platform
+
+#endif // Q_OS_MAC
diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h
index 6e4ae4b54..e86df71bb 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.h
+++ b/Telegram/SourceFiles/platform/win/specific_win.h
@@ -89,31 +89,7 @@ void psNewVersion();
 inline QByteArray psDownloadPathBookmark(const QString &path) {
 	return QByteArray();
 }
-inline QByteArray psPathBookmark(const QString &path) {
-	return QByteArray();
-}
 inline void psDownloadPathEnableAccess() {
 }
 
-class PsFileBookmark {
-public:
-	PsFileBookmark(const QByteArray &bookmark) {
-	}
-	bool check() const {
-		return true;
-	}
-	bool enable() const {
-		return true;
-	}
-	void disable() const {
-	}
-	const QString &name(const QString &original) const {
-		return original;
-	}
-	QByteArray bookmark() const {
-		return QByteArray();
-	}
-
-};
-
 bool psLaunchMaps(const Data::LocationPoint &point);
diff --git a/Telegram/SourceFiles/storage/file_download.cpp b/Telegram/SourceFiles/storage/file_download.cpp
index ba0fc2685..629f2922b 100644
--- a/Telegram/SourceFiles/storage/file_download.cpp
+++ b/Telegram/SourceFiles/storage/file_download.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "core/application.h"
+#include "core/file_location.h"
 #include "storage/storage_account.h"
 #include "storage/file_download_mtproto.h"
 #include "storage/file_download_web.h"
@@ -454,7 +455,7 @@ bool FileLoader::finalizeResult() {
 			if (!_filename.isEmpty()) {
 				_session->local().writeFileLocation(
 					*key,
-					FileLocation(_filename));
+					Core::FileLocation(_filename));
 			}
 		}
 		const auto key = cacheKey();
diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp
index 837f73a79..2fd2ce0b2 100644
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/image/image_location_factory.h"
 #include "history/history_item.h"
 #include "history/history.h"
+#include "core/file_location.h"
 #include "core/mime_type.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
@@ -320,7 +321,7 @@ void Uploader::uploadMedia(
 			}
 		}
 		if (!media.file.isEmpty()) {
-			document->setLocation(FileLocation(media.file));
+			document->setLocation(Core::FileLocation(media.file));
 		}
 	}
 	queue.emplace(msgId, File(media));
@@ -368,7 +369,7 @@ void Uploader::upload(
 			document->setDataAndCache(file->content);
 		}
 		if (!file->filepath.isEmpty()) {
-			document->setLocation(FileLocation(file->filepath));
+			document->setLocation(Core::FileLocation(file->filepath));
 		}
 		if (file->type == SendMediaType::ThemeFile) {
 			document->checkWallPaperProperties();
diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp
index 4a869fc0c..1d80e44c1 100644
--- a/Telegram/SourceFiles/storage/localstorage.cpp
+++ b/Telegram/SourceFiles/storage/localstorage.cpp
@@ -17,10 +17,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/platform/base_platform_info.h"
 #include "ui/effects/animation_value.h"
 #include "core/update_checker.h"
+#include "core/file_location.h"
+#include "core/application.h"
 #include "media/audio/media_audio.h"
 #include "mtproto/mtproto_config.h"
 #include "mtproto/mtproto_dc_options.h"
-#include "core/application.h"
 #include "main/main_domain.h"
 #include "main/main_account.h"
 #include "main/main_session.h"
@@ -870,7 +871,7 @@ public:
 
 protected:
 	DocumentData *_doc = nullptr;
-	FileLocation _loc;
+	Core::FileLocation _loc;
 	QByteArray _data;
 	VoiceWaveform _waveform;
 	char _wavemax;
diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp
index 7a0ba37b1..0a541a023 100644
--- a/Telegram/SourceFiles/storage/storage_account.cpp
+++ b/Telegram/SourceFiles/storage/storage_account.cpp
@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/mtp_instance.h"
 #include "history/history.h"
 #include "core/application.h"
+#include "core/file_location.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_session.h"
 #include "data/data_document.h"
@@ -669,7 +670,7 @@ void Account::readLocations() {
 	while (!locations.stream.atEnd()) {
 		quint64 first, second;
 		QByteArray bookmark;
-		FileLocation loc;
+		Core::FileLocation loc;
 		quint32 legacyTypeField = 0;
 		locations.stream >> first >> second >> legacyTypeField >> loc.fname;
 		if (locations.version > 9013) {
@@ -1164,7 +1165,7 @@ bool Account::hasDraft(const PeerId &peer) {
 	return _draftsMap.contains(peer);
 }
 
-void Account::writeFileLocation(MediaKey location, const FileLocation &local) {
+void Account::writeFileLocation(MediaKey location, const Core::FileLocation &local) {
 	if (local.fname.isEmpty()) {
 		return;
 	}
@@ -1217,7 +1218,7 @@ void Account::removeFileLocation(MediaKey location) {
 	writeLocationsQueued();
 }
 
-FileLocation Account::readFileLocation(MediaKey location) {
+Core::FileLocation Account::readFileLocation(MediaKey location) {
 	const auto aliasIt = _fileLocationAliases.constFind(location);
 	if (aliasIt != _fileLocationAliases.cend()) {
 		location = aliasIt.value();
@@ -1232,7 +1233,7 @@ FileLocation Account::readFileLocation(MediaKey location) {
 		}
 		return i.value();
 	}
-	return FileLocation();
+	return Core::FileLocation();
 }
 
 EncryptionKey Account::cacheKey() const {
diff --git a/Telegram/SourceFiles/storage/storage_account.h b/Telegram/SourceFiles/storage/storage_account.h
index c0a7a4a9b..d40e4638b 100644
--- a/Telegram/SourceFiles/storage/storage_account.h
+++ b/Telegram/SourceFiles/storage/storage_account.h
@@ -12,7 +12,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/stickers/data_stickers_set.h"
 
 class History;
+
+namespace Core {
 class FileLocation;
+} // namespace Core
 
 namespace Export {
 struct Settings;
@@ -86,8 +89,8 @@ public:
 	[[nodiscard]] bool hasDraftCursors(const PeerId &peer);
 	[[nodiscard]] bool hasDraft(const PeerId &peer);
 
-	void writeFileLocation(MediaKey location, const FileLocation &local);
-	[[nodiscard]] FileLocation readFileLocation(MediaKey location);
+	void writeFileLocation(MediaKey location, const Core::FileLocation &local);
+	[[nodiscard]] Core::FileLocation readFileLocation(MediaKey location);
 	void removeFileLocation(MediaKey location);
 
 	[[nodiscard]] EncryptionKey cacheKey() const;
@@ -219,8 +222,8 @@ private:
 	base::flat_map<PeerId, FileKey> _draftCursorsMap;
 	base::flat_map<PeerId, bool> _draftsNotReadMap;
 
-	QMultiMap<MediaKey, FileLocation> _fileLocations;
-	QMap<QString, QPair<MediaKey, FileLocation>> _fileLocationPairs;
+	QMultiMap<MediaKey, Core::FileLocation> _fileLocations;
+	QMap<QString, QPair<MediaKey, Core::FileLocation>> _fileLocationPairs;
 	QMap<MediaKey, MediaKey> _fileLocationAliases;
 
 	FileKey _locationsKey = 0;
diff --git a/Telegram/SourceFiles/ui/image/image_location.cpp b/Telegram/SourceFiles/ui/image/image_location.cpp
index dea8c72b5..7b217e72b 100644
--- a/Telegram/SourceFiles/ui/image/image_location.cpp
+++ b/Telegram/SourceFiles/ui/image/image_location.cpp
@@ -25,7 +25,6 @@ constexpr auto kPhotoBaseCacheTag = 0x0000000000020000ULL;
 constexpr auto kPhotoBaseCacheMask = 0x000000000000FF00ULL;
 constexpr auto kSerializeTypeShift = quint8(0x08);
 constexpr auto kNonStorageLocationToken = quint8(0x10);
-const auto kInMediaCacheLocation = QString("*media_cache*");
 
 enum class NonStorageLocationType : quint8 {
 	Web,
@@ -939,102 +938,3 @@ std::optional<ImageLocation> ImageLocation::FromSerialized(
 	}
 	return std::nullopt;
 }
-
-ReadAccessEnabler::ReadAccessEnabler(const PsFileBookmark *bookmark)
-: _bookmark(bookmark)
-, _failed(_bookmark ? !_bookmark->enable() : false) {
-}
-
-ReadAccessEnabler::ReadAccessEnabler(
-	const std::shared_ptr<PsFileBookmark> &bookmark)
-: _bookmark(bookmark.get())
-, _failed(_bookmark ? !_bookmark->enable() : false) {
-}
-
-ReadAccessEnabler::~ReadAccessEnabler() {
-	if (_bookmark && !_failed) _bookmark->disable();
-}
-
-FileLocation::FileLocation(const QString &name) : fname(name) {
-	if (fname.isEmpty() || fname == kInMediaCacheLocation) {
-		size = 0;
-	} else {
-		setBookmark(psPathBookmark(name));
-
-		QFileInfo f(name);
-		if (f.exists()) {
-			qint64 s = f.size();
-			if (s > INT_MAX) {
-				fname = QString();
-				_bookmark = nullptr;
-				size = 0;
-			} else {
-				modified = f.lastModified();
-				size = qint32(s);
-			}
-		} else {
-			fname = QString();
-			_bookmark = nullptr;
-			size = 0;
-		}
-	}
-}
-
-FileLocation FileLocation::InMediaCacheLocation() {
-	return FileLocation(kInMediaCacheLocation);
-}
-
-bool FileLocation::check() const {
-	if (fname.isEmpty() || fname == kInMediaCacheLocation) {
-		return false;
-	}
-
-	ReadAccessEnabler enabler(_bookmark);
-	if (enabler.failed()) {
-		const_cast<FileLocation*>(this)->_bookmark = nullptr;
-	}
-
-	QFileInfo f(name());
-	if (!f.isReadable()) return false;
-
-	quint64 s = f.size();
-	if (s > INT_MAX) {
-		DEBUG_LOG(("File location check: Wrong size %1").arg(s));
-		return false;
-	}
-
-	if (qint32(s) != size) {
-		DEBUG_LOG(("File location check: Wrong size %1 when should be %2").arg(s).arg(size));
-		return false;
-	}
-	auto realModified = f.lastModified();
-	if (realModified != modified) {
-		DEBUG_LOG(("File location check: Wrong last modified time %1 when should be %2").arg(realModified.toMSecsSinceEpoch()).arg(modified.toMSecsSinceEpoch()));
-		return false;
-	}
-	return true;
-}
-
-const QString &FileLocation::name() const {
-	return _bookmark ? _bookmark->name(fname) : fname;
-}
-
-QByteArray FileLocation::bookmark() const {
-	return _bookmark ? _bookmark->bookmark() : QByteArray();
-}
-
-bool FileLocation::inMediaCache() const {
-	return (fname == kInMediaCacheLocation);
-}
-
-void FileLocation::setBookmark(const QByteArray &bm) {
-	_bookmark.reset(bm.isEmpty() ? nullptr : new PsFileBookmark(bm));
-}
-
-bool FileLocation::accessEnable() const {
-	return isEmpty() ? false : (_bookmark ? _bookmark->enable() : true);
-}
-
-void FileLocation::accessDisable() const {
-	return _bookmark ? _bookmark->disable() : (void)0;
-}
diff --git a/Telegram/SourceFiles/ui/image/image_location.h b/Telegram/SourceFiles/ui/image/image_location.h
index 299812205..fb3fb7299 100644
--- a/Telegram/SourceFiles/ui/image/image_location.h
+++ b/Telegram/SourceFiles/ui/image/image_location.h
@@ -644,55 +644,3 @@ inline QSize shrinkToKeepAspect(int32 width, int32 height, int32 towidth, int32
 	}
 	return QSize(qMax(w, 1), qMax(h, 1));
 }
-
-class PsFileBookmark;
-class ReadAccessEnabler {
-public:
-	ReadAccessEnabler(const PsFileBookmark *bookmark);
-	ReadAccessEnabler(const std::shared_ptr<PsFileBookmark> &bookmark);
-	bool failed() const {
-		return _failed;
-	}
-	~ReadAccessEnabler();
-
-private:
-	const PsFileBookmark *_bookmark;
-	bool _failed;
-
-};
-
-class FileLocation {
-public:
-	FileLocation() = default;
-	explicit FileLocation(const QString &name);
-
-	static FileLocation InMediaCacheLocation();
-
-	[[nodiscard]] bool check() const;
-	[[nodiscard]] const QString &name() const;
-	void setBookmark(const QByteArray &bookmark);
-	QByteArray bookmark() const;
-	[[nodiscard]] bool isEmpty() const {
-		return name().isEmpty();
-	}
-	[[nodiscard]] bool inMediaCache() const;
-
-	bool accessEnable() const;
-	void accessDisable() const;
-
-	QString fname;
-	QDateTime modified;
-	qint32 size;
-
-private:
-	std::shared_ptr<PsFileBookmark> _bookmark;
-
-};
-inline bool operator==(const FileLocation &a, const FileLocation &b) {
-	return (a.name() == b.name())
-		&& (a.modified == b.modified)
-		&& (a.size == b.size);
-}
-inline bool operator!=(const FileLocation &a, const FileLocation &b) {
-	return !(a == b);
-}
diff --git a/Telegram/SourceFiles/window/window_media_preview.cpp b/Telegram/SourceFiles/window/window_media_preview.cpp
index ea24e9b5f..bb2c97e1f 100644
--- a/Telegram/SourceFiles/window/window_media_preview.cpp
+++ b/Telegram/SourceFiles/window/window_media_preview.cpp
@@ -375,8 +375,8 @@ void MediaPreviewWidget::validateGifAnimation() {
 	};
 	if (contentLoaded) {
 		_gif = Media::Clip::MakeReader(
-			_documentMedia.get(),
-			FullMsgId(),
+			_documentMedia->owner()->location(),
+			_documentMedia->bytes(),
 			std::move(callback));
 	} else {
 		_gifThumbnail = Media::Clip::MakeReader(
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 12d26d2da..8a19ce621 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -46,9 +46,24 @@ nice_target_sources(td_ui ${src_loc}
 PRIVATE
     ${style_files}
     
+    core/file_location.cpp
+    core/file_location.h
     core/mime_type.cpp
     core/mime_type.h
 
+    media/clip/media_clip_check_streaming.cpp
+    media/clip/media_clip_check_streaming.h
+    media/clip/media_clip_ffmpeg.cpp
+    media/clip/media_clip_ffmpeg.h
+    media/clip/media_clip_implementation.cpp
+    media/clip/media_clip_implementation.h
+    media/clip/media_clip_reader.cpp
+    media/clip/media_clip_reader.h
+
+    platform/mac/file_bookmark_mac.h
+    platform/mac/file_bookmark_mac.mm
+    platform/platform_file_bookmark.h
+
     ui/chat/attach/attach_album_thumbnail.cpp
     ui/chat/attach/attach_album_thumbnail.h
     ui/chat/attach/attach_album_preview.cpp
@@ -91,4 +106,5 @@ target_link_libraries(td_ui
 PUBLIC
     tdesktop::td_lang
     desktop-app::lib_ui
+    desktop-app::lib_ffmpeg
 )

From 64ac6b18bf344014b5ac299a54d9220a2879ac89 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 13 Oct 2020 20:15:52 +0300
Subject: [PATCH 091/190] Move SingleMediaPreview to td_ui.

---
 .../SourceFiles/boxes/edit_caption_box.cpp    |   4 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp | 262 +-----------------
 .../passport/passport_panel_edit_scans.cpp    |   3 +-
 .../SourceFiles/storage/localimageloader.cpp  |   2 +-
 .../storage/storage_media_prepare.cpp         |  15 +-
 .../storage/storage_media_prepare.h           |   1 -
 .../ui/chat/attach/attach_prepare.cpp         |   7 +
 .../ui/chat/attach/attach_prepare.h           |   1 +
 .../attach/attach_single_media_preview.cpp    | 235 ++++++++++++++++
 .../chat/attach/attach_single_media_preview.h |  66 +++++
 Telegram/cmake/td_ui.cmake                    |   3 +
 11 files changed, 327 insertions(+), 272 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index e3f6e530f..1a216e3bd 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -498,7 +498,7 @@ void EditCaptionBox::updateEditPreview() {
 	auto shouldAsDoc = true;
 	auto docPhotoSize = QSize();
 	if (const auto image = std::get_if<Info::Image>(fileMedia)) {
-		shouldAsDoc = !Storage::ValidateThumbDimensions(
+		shouldAsDoc = !Ui::ValidateThumbDimensions(
 			image->data.width(),
 			image->data.height());
 		if (shouldAsDoc) {
@@ -694,7 +694,7 @@ bool EditCaptionBox::fileFromClipboard(not_null<const QMimeData*> data) {
 			using Info = Ui::PreparedFileInformation;
 			const auto fileMedia = &file->information->media;
 			if (const auto image = std::get_if<Info::Image>(fileMedia)) {
-				return !Storage::ValidateThumbDimensions(
+				return !Ui::ValidateThumbDimensions(
 					image->data.width(),
 					image->data.height());
 			}
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index f6ac6012b..16a389809 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -34,6 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/chat/attach/attach_album_preview.h"
 #include "ui/chat/attach/attach_single_file_preview.h"
+#include "ui/chat/attach/attach_single_media_preview.h"
 #include "ui/text/format_values.h"
 #include "ui/grouped_layout.h"
 #include "ui/text/text_options.h"
@@ -56,8 +57,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
-constexpr auto kMinPreviewWidth = 20;
-
 using Ui::SendFilesWay;
 
 inline bool CanAddUrls(const QList<QUrl> &urls) {
@@ -95,259 +94,6 @@ void FileDialogCallback(
 	callback(std::move(*list));
 }
 
-class SingleMediaPreview : public Ui::RpWidget {
-public:
-	static SingleMediaPreview *Create(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		const Ui::PreparedFile &file);
-
-	SingleMediaPreview(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		QImage preview,
-		bool animated,
-		bool sticker,
-		const QString &animatedPreviewPath);
-
-	bool canSendAsPhoto() const {
-		return _canSendAsPhoto;
-	}
-
-	rpl::producer<int> desiredHeightValue() const override;
-
-protected:
-	void paintEvent(QPaintEvent *e) override;
-
-private:
-	void preparePreview(
-		QImage preview,
-		const QString &animatedPreviewPath);
-	void prepareAnimatedPreview(const QString &animatedPreviewPath);
-	void clipCallback(Media::Clip::Notification notification);
-
-	not_null<Window::SessionController*> _controller;
-	bool _animated = false;
-	bool _sticker = false;
-	bool _canSendAsPhoto = false;
-	QPixmap _preview;
-	int _previewLeft = 0;
-	int _previewWidth = 0;
-	int _previewHeight = 0;
-	Media::Clip::ReaderPointer _gifPreview;
-	std::unique_ptr<Lottie::SinglePlayer> _lottiePreview;
-
-};
-
-SingleMediaPreview *SingleMediaPreview::Create(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		const Ui::PreparedFile &file) {
-	auto preview = QImage();
-	bool animated = false;
-	bool animationPreview = false;
-	if (const auto image = std::get_if<Ui::PreparedFileInformation::Image>(
-			&file.information->media)) {
-		preview = image->data;
-		animated = animationPreview = image->animated;
-	} else if (const auto video = std::get_if<Ui::PreparedFileInformation::Video>(
-			&file.information->media)) {
-		preview = video->thumbnail;
-		animated = true;
-		animationPreview = video->isGifv;
-	}
-	if (preview.isNull()) {
-		return nullptr;
-	} else if (!animated && !Storage::ValidateThumbDimensions(
-			preview.width(),
-			preview.height())) {
-		return nullptr;
-	}
-	return Ui::CreateChild<SingleMediaPreview>(
-		parent,
-		controller,
-		preview,
-		animated,
-		Core::IsMimeSticker(file.information->filemime),
-		animationPreview ? file.path : QString());
-}
-
-SingleMediaPreview::SingleMediaPreview(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller,
-	QImage preview,
-	bool animated,
-	bool sticker,
-	const QString &animatedPreviewPath)
-: RpWidget(parent)
-, _controller(controller)
-, _animated(animated)
-, _sticker(sticker) {
-	Expects(!preview.isNull());
-
-	_canSendAsPhoto = !_animated
-		&& !_sticker
-		&& Storage::ValidateThumbDimensions(
-			preview.width(),
-			preview.height());
-
-	preparePreview(preview, animatedPreviewPath);
-}
-
-void SingleMediaPreview::preparePreview(
-		QImage preview,
-		const QString &animatedPreviewPath) {
-	auto maxW = 0;
-	auto maxH = 0;
-	if (_animated && !_sticker) {
-		auto limitW = st::sendMediaPreviewSize;
-		auto limitH = st::confirmMaxHeight;
-		maxW = qMax(preview.width(), 1);
-		maxH = qMax(preview.height(), 1);
-		if (maxW * limitH > maxH * limitW) {
-			if (maxW < limitW) {
-				maxH = maxH * limitW / maxW;
-				maxW = limitW;
-			}
-		} else {
-			if (maxH < limitH) {
-				maxW = maxW * limitH / maxH;
-				maxH = limitH;
-			}
-		}
-		preview = Images::prepare(
-			preview,
-			maxW * cIntRetinaFactor(),
-			maxH * cIntRetinaFactor(),
-			Images::Option::Smooth | Images::Option::Blurred,
-			maxW,
-			maxH);
-	}
-	auto originalWidth = preview.width();
-	auto originalHeight = preview.height();
-	if (!originalWidth || !originalHeight) {
-		originalWidth = originalHeight = 1;
-	}
-	_previewWidth = st::sendMediaPreviewSize;
-	if (preview.width() < _previewWidth) {
-		_previewWidth = qMax(preview.width(), kMinPreviewWidth);
-	}
-	auto maxthumbh = qMin(qRound(1.5 * _previewWidth), st::confirmMaxHeight);
-	_previewHeight = qRound(originalHeight * float64(_previewWidth) / originalWidth);
-	if (_previewHeight > maxthumbh) {
-		_previewWidth = qRound(_previewWidth * float64(maxthumbh) / _previewHeight);
-		accumulate_max(_previewWidth, kMinPreviewWidth);
-		_previewHeight = maxthumbh;
-	}
-	_previewLeft = (st::boxWideWidth - _previewWidth) / 2;
-
-	preview = std::move(preview).scaled(
-		_previewWidth * cIntRetinaFactor(),
-		_previewHeight * cIntRetinaFactor(),
-		Qt::IgnoreAspectRatio,
-		Qt::SmoothTransformation);
-	preview = Images::prepareOpaque(std::move(preview));
-	_preview = App::pixmapFromImageInPlace(std::move(preview));
-	_preview.setDevicePixelRatio(cRetinaFactor());
-
-	prepareAnimatedPreview(animatedPreviewPath);
-}
-
-void SingleMediaPreview::prepareAnimatedPreview(
-		const QString &animatedPreviewPath) {
-	if (_sticker && _animated) {
-		const auto box = QSize(_previewWidth, _previewHeight)
-			* cIntRetinaFactor();
-		_lottiePreview = std::make_unique<Lottie::SinglePlayer>(
-			Lottie::ReadContent(QByteArray(), animatedPreviewPath),
-			Lottie::FrameRequest{ box });
-		_lottiePreview->updates(
-		) | rpl::start_with_next([=] {
-			update();
-		}, lifetime());
-	} else if (!animatedPreviewPath.isEmpty()) {
-		auto callback = [=](Media::Clip::Notification notification) {
-			clipCallback(notification);
-		};
-		_gifPreview = Media::Clip::MakeReader(
-			animatedPreviewPath,
-			std::move(callback));
-	}
-}
-
-void SingleMediaPreview::clipCallback(Media::Clip::Notification notification) {
-	using namespace Media::Clip;
-	switch (notification) {
-	case NotificationReinit: {
-		if (_gifPreview && _gifPreview->state() == State::Error) {
-			_gifPreview.setBad();
-		}
-
-		if (_gifPreview && _gifPreview->ready() && !_gifPreview->started()) {
-			auto s = QSize(_previewWidth, _previewHeight);
-			_gifPreview->start(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None, RectPart::None);
-		}
-
-		update();
-	} break;
-
-	case NotificationRepaint: {
-		if (_gifPreview && !_gifPreview->currentDisplayed()) {
-			update();
-		}
-	} break;
-	}
-}
-
-void SingleMediaPreview::paintEvent(QPaintEvent *e) {
-	Painter p(this);
-
-	if (!_sticker) {
-		if (_previewLeft > st::boxPhotoPadding.left()) {
-			p.fillRect(st::boxPhotoPadding.left(), st::boxPhotoPadding.top(), _previewLeft - st::boxPhotoPadding.left(), _previewHeight, st::confirmBg);
-		}
-		if (_previewLeft + _previewWidth < width() - st::boxPhotoPadding.right()) {
-			p.fillRect(_previewLeft + _previewWidth, st::boxPhotoPadding.top(), width() - st::boxPhotoPadding.right() - _previewLeft - _previewWidth, _previewHeight, st::confirmBg);
-		}
-	}
-	if (_gifPreview && _gifPreview->started()) {
-		auto s = QSize(_previewWidth, _previewHeight);
-		auto paused = _controller->isGifPausedAtLeastFor(Window::GifPauseReason::Layer);
-		auto frame = _gifPreview->current(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None, RectPart::None, paused ? 0 : crl::now());
-		p.drawPixmap(_previewLeft, st::boxPhotoPadding.top(), frame);
-	} else if (_lottiePreview && _lottiePreview->ready()) {
-		const auto frame = _lottiePreview->frame();
-		const auto size = frame.size() / cIntRetinaFactor();
-		p.drawImage(
-			QRect(
-				_previewLeft + (_previewWidth - size.width()) / 2,
-				st::boxPhotoPadding.top() + (_previewHeight - size.height()) / 2,
-				size.width(),
-				size.height()),
-			frame);
-		_lottiePreview->markFrameShown();
-	} else {
-		p.drawPixmap(_previewLeft, st::boxPhotoPadding.top(), _preview);
-	}
-	if (_animated && !_gifPreview && !_lottiePreview) {
-		auto inner = QRect(_previewLeft + (_previewWidth - st::msgFileSize) / 2, st::boxPhotoPadding.top() + (_previewHeight - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
-		p.setPen(Qt::NoPen);
-		p.setBrush(st::msgDateImgBg);
-
-		{
-			PainterHighQualityEnabler hq(p);
-			p.drawEllipse(inner);
-		}
-
-		auto icon = &st::historyFileInPlay;
-		icon->paintInCenter(p, inner);
-	}
-}
-
-rpl::producer<int> SingleMediaPreview::desiredHeightValue() const {
-	return rpl::single(st::boxPhotoPadding.top() + _previewHeight);
-}
-
 rpl::producer<QString> FieldPlaceholder(
 		const Ui::PreparedList &list,
 		SendFilesWay way) {
@@ -410,7 +156,11 @@ void SendFilesBox::prepareSingleFilePreview() {
 	Expects(IsSingleItem(_list));
 
 	const auto &file = _list.files[0];
-	const auto media = SingleMediaPreview::Create(this, _controller, file);
+	const auto controller = _controller;
+	const auto media = Ui::SingleMediaPreview::Create(this, [=] {
+		return controller->isGifPausedAtLeastFor(
+			Window::GifPauseReason::Layer);
+	}, file);
 	if (media) {
 		if (!media->canSendAsPhoto()) {
 			_compressConfirm = CompressConfirm::None;
diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
index 6bdad1c90..85b77c712 100644
--- a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
+#include "ui/chat/attach/attach_prepare.h"
 #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "ui/text/text_options.h"
 #include "core/file_utilities.h"
@@ -41,7 +42,7 @@ std::variant<ReadScanError, QByteArray> ProcessImage(QByteArray &&bytes) {
 	auto image = App::readImage(base::take(bytes));
 	if (image.isNull()) {
 		return ReadScanError::CantReadImage;
-	} else if (!Storage::ValidateThumbDimensions(image.width(), image.height())) {
+	} else if (!Ui::ValidateThumbDimensions(image.width(), image.height())) {
 		return ReadScanError::BadImageSize;
 	}
 	if (std::max(image.width(), image.height()) > kMaxDimensions) {
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 782e73fb3..d9c8a52a7 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -40,7 +40,7 @@ constexpr auto kThumbnailQuality = 87;
 constexpr auto kThumbnailSize = 320;
 constexpr auto kPhotoUploadPartSize = 32 * 1024;
 
-using Storage::ValidateThumbDimensions;
+using Ui::ValidateThumbDimensions;
 
 struct PreparedFileThumbnail {
 	uint64 id = 0;
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index 629ea4766..ebd65091c 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -43,13 +43,13 @@ bool ValidPhotoForAlbum(
 	}
 	const auto width = image.data.width();
 	const auto height = image.data.height();
-	return ValidateThumbDimensions(width, height);
+	return Ui::ValidateThumbDimensions(width, height);
 }
 
 bool ValidVideoForAlbum(const PreparedFileInformation::Video &video) {
 	const auto width = video.thumbnail.width();
 	const auto height = video.thumbnail.height();
-	return ValidateThumbDimensions(width, height);
+	return Ui::ValidateThumbDimensions(width, height);
 }
 
 QSize PrepareShownDimensions(const QImage &preview) {
@@ -163,13 +163,6 @@ bool ValidateDragData(not_null<const QMimeData*> data, bool isAlbum) {
 	return true;
 }
 
-bool ValidateThumbDimensions(int width, int height) {
-	return (width > 0)
-		&& (height > 0)
-		&& (width < 20 * height)
-		&& (height < 20 * width);
-}
-
 MimeDataState ComputeMimeDataState(const QMimeData *data) {
 	if (!data || data->hasFormat(qsl("application/x-td-forward"))) {
 		return MimeDataState::None;
@@ -272,7 +265,7 @@ PreparedList PrepareMediaFromImage(
 		QByteArray &&content,
 		int previewWidth) {
 	auto result = Storage::PreparedList();
-	result.allFilesForCompress = ValidateThumbDimensions(
+	result.allFilesForCompress = Ui::ValidateThumbDimensions(
 		image.width(),
 		image.height());
 	auto file = PreparedFile(QString());
@@ -345,7 +338,7 @@ std::optional<PreparedList> PreparedFileFromFilesDialog(
 
 			const auto media = &file.information->media;
 			const auto valid = v::match(*media, [](const Info::Image &data) {
-				return Storage::ValidateThumbDimensions(
+				return Ui::ValidateThumbDimensions(
 					data.data.width(),
 					data.data.height())
 					&& !data.animated;
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.h b/Telegram/SourceFiles/storage/storage_media_prepare.h
index d07d90abe..98b298a3b 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.h
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.h
@@ -32,7 +32,6 @@ std::optional<Ui::PreparedList> PreparedFileFromFilesDialog(
 	int previewWidth);
 MimeDataState ComputeMimeDataState(const QMimeData *data);
 bool ValidateDragData(not_null<const QMimeData*> data, bool isAlbum);
-bool ValidateThumbDimensions(int width, int height);
 Ui::PreparedList PrepareMediaList(const QList<QUrl> &files, int previewWidth);
 Ui::PreparedList PrepareMediaList(const QStringList &files, int previewWidth);
 Ui::PreparedList PrepareMediaFromImage(
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index 94a03753d..06712deb9 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -88,4 +88,11 @@ int MaxAlbumItems() {
 	return kMaxAlbumCount;
 }
 
+bool ValidateThumbDimensions(int width, int height) {
+	return (width > 0)
+		&& (height > 0)
+		&& (width < 20 * height)
+		&& (height < 20 * width);
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index 2853996cd..05f9e3db0 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -81,5 +81,6 @@ struct PreparedList {
 };
 
 [[nodiscard]] int MaxAlbumItems();
+[[nodiscard]] bool ValidateThumbDimensions(int width, int height);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
new file mode 100644
index 000000000..18b41cbb9
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
@@ -0,0 +1,235 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/attach/attach_single_media_preview.h"
+
+#include "ui/chat/attach/attach_prepare.h"
+#include "core/mime_type.h"
+#include "lottie/lottie_single_player.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat.h"
+#include "styles/style_layers.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kMinPreviewWidth = 20;
+
+} // namespace
+
+SingleMediaPreview *SingleMediaPreview::Create(
+		QWidget *parent,
+		Fn<bool()> gifPaused,
+		const PreparedFile &file) {
+	auto preview = QImage();
+	bool animated = false;
+	bool animationPreview = false;
+	if (const auto image = std::get_if<PreparedFileInformation::Image>(
+			&file.information->media)) {
+		preview = image->data;
+		animated = animationPreview = image->animated;
+	} else if (const auto video = std::get_if<PreparedFileInformation::Video>(
+			&file.information->media)) {
+		preview = video->thumbnail;
+		animated = true;
+		animationPreview = video->isGifv;
+	}
+	if (preview.isNull()) {
+		return nullptr;
+	} else if (!animated && !ValidateThumbDimensions(
+			preview.width(),
+			preview.height())) {
+		return nullptr;
+	}
+	return CreateChild<SingleMediaPreview>(
+		parent,
+		std::move(gifPaused),
+		preview,
+		animated,
+		Core::IsMimeSticker(file.information->filemime),
+		animationPreview ? file.path : QString());
+}
+
+SingleMediaPreview::SingleMediaPreview(
+	QWidget *parent,
+	Fn<bool()> gifPaused,
+	QImage preview,
+	bool animated,
+	bool sticker,
+	const QString &animatedPreviewPath)
+: RpWidget(parent)
+, _gifPaused(std::move(gifPaused))
+, _animated(animated)
+, _sticker(sticker) {
+	Expects(!preview.isNull());
+
+	_canSendAsPhoto = !_animated
+		&& !_sticker
+		&& ValidateThumbDimensions(
+			preview.width(),
+			preview.height());
+
+	preparePreview(preview, animatedPreviewPath);
+}
+
+SingleMediaPreview::~SingleMediaPreview() = default;
+
+void SingleMediaPreview::preparePreview(
+		QImage preview,
+		const QString &animatedPreviewPath) {
+	auto maxW = 0;
+	auto maxH = 0;
+	if (_animated && !_sticker) {
+		auto limitW = st::sendMediaPreviewSize;
+		auto limitH = st::confirmMaxHeight;
+		maxW = qMax(preview.width(), 1);
+		maxH = qMax(preview.height(), 1);
+		if (maxW * limitH > maxH * limitW) {
+			if (maxW < limitW) {
+				maxH = maxH * limitW / maxW;
+				maxW = limitW;
+			}
+		} else {
+			if (maxH < limitH) {
+				maxW = maxW * limitH / maxH;
+				maxH = limitH;
+			}
+		}
+		preview = Images::prepare(
+			preview,
+			maxW * style::DevicePixelRatio(),
+			maxH * style::DevicePixelRatio(),
+			Images::Option::Smooth | Images::Option::Blurred,
+			maxW,
+			maxH);
+	}
+	auto originalWidth = preview.width();
+	auto originalHeight = preview.height();
+	if (!originalWidth || !originalHeight) {
+		originalWidth = originalHeight = 1;
+	}
+	_previewWidth = st::sendMediaPreviewSize;
+	if (preview.width() < _previewWidth) {
+		_previewWidth = qMax(preview.width(), kMinPreviewWidth);
+	}
+	auto maxthumbh = qMin(qRound(1.5 * _previewWidth), st::confirmMaxHeight);
+	_previewHeight = qRound(originalHeight * float64(_previewWidth) / originalWidth);
+	if (_previewHeight > maxthumbh) {
+		_previewWidth = qRound(_previewWidth * float64(maxthumbh) / _previewHeight);
+		accumulate_max(_previewWidth, kMinPreviewWidth);
+		_previewHeight = maxthumbh;
+	}
+	_previewLeft = (st::boxWideWidth - _previewWidth) / 2;
+
+	preview = std::move(preview).scaled(
+		_previewWidth * style::DevicePixelRatio(),
+		_previewHeight * style::DevicePixelRatio(),
+		Qt::IgnoreAspectRatio,
+		Qt::SmoothTransformation);
+	preview = Images::prepareOpaque(std::move(preview));
+	_preview = PixmapFromImage(std::move(preview));
+	_preview.setDevicePixelRatio(style::DevicePixelRatio());
+
+	prepareAnimatedPreview(animatedPreviewPath);
+}
+
+void SingleMediaPreview::prepareAnimatedPreview(
+		const QString &animatedPreviewPath) {
+	if (_sticker && _animated) {
+		const auto box = QSize(_previewWidth, _previewHeight)
+			* style::DevicePixelRatio();
+		_lottiePreview = std::make_unique<Lottie::SinglePlayer>(
+			Lottie::ReadContent(QByteArray(), animatedPreviewPath),
+			Lottie::FrameRequest{ box });
+		_lottiePreview->updates(
+		) | rpl::start_with_next([=] {
+			update();
+		}, lifetime());
+	} else if (!animatedPreviewPath.isEmpty()) {
+		auto callback = [=](Media::Clip::Notification notification) {
+			clipCallback(notification);
+		};
+		_gifPreview = Media::Clip::MakeReader(
+			animatedPreviewPath,
+			std::move(callback));
+	}
+}
+
+void SingleMediaPreview::clipCallback(Media::Clip::Notification notification) {
+	using namespace Media::Clip;
+	switch (notification) {
+	case NotificationReinit: {
+		if (_gifPreview && _gifPreview->state() == State::Error) {
+			_gifPreview.setBad();
+		}
+
+		if (_gifPreview && _gifPreview->ready() && !_gifPreview->started()) {
+			auto s = QSize(_previewWidth, _previewHeight);
+			_gifPreview->start(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None, RectPart::None);
+		}
+
+		update();
+	} break;
+
+	case NotificationRepaint: {
+		if (_gifPreview && !_gifPreview->currentDisplayed()) {
+			update();
+		}
+	} break;
+	}
+}
+
+void SingleMediaPreview::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+
+	if (!_sticker) {
+		if (_previewLeft > st::boxPhotoPadding.left()) {
+			p.fillRect(st::boxPhotoPadding.left(), st::boxPhotoPadding.top(), _previewLeft - st::boxPhotoPadding.left(), _previewHeight, st::confirmBg);
+		}
+		if (_previewLeft + _previewWidth < width() - st::boxPhotoPadding.right()) {
+			p.fillRect(_previewLeft + _previewWidth, st::boxPhotoPadding.top(), width() - st::boxPhotoPadding.right() - _previewLeft - _previewWidth, _previewHeight, st::confirmBg);
+		}
+	}
+	if (_gifPreview && _gifPreview->started()) {
+		auto s = QSize(_previewWidth, _previewHeight);
+		auto paused = _gifPaused();
+		auto frame = _gifPreview->current(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None, RectPart::None, paused ? 0 : crl::now());
+		p.drawPixmap(_previewLeft, st::boxPhotoPadding.top(), frame);
+	} else if (_lottiePreview && _lottiePreview->ready()) {
+		const auto frame = _lottiePreview->frame();
+		const auto size = frame.size() / style::DevicePixelRatio();
+		p.drawImage(
+			QRect(
+				_previewLeft + (_previewWidth - size.width()) / 2,
+				st::boxPhotoPadding.top() + (_previewHeight - size.height()) / 2,
+				size.width(),
+				size.height()),
+			frame);
+		_lottiePreview->markFrameShown();
+	} else {
+		p.drawPixmap(_previewLeft, st::boxPhotoPadding.top(), _preview);
+	}
+	if (_animated && !_gifPreview && !_lottiePreview) {
+		auto inner = QRect(_previewLeft + (_previewWidth - st::msgFileSize) / 2, st::boxPhotoPadding.top() + (_previewHeight - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::msgDateImgBg);
+
+		{
+			PainterHighQualityEnabler hq(p);
+			p.drawEllipse(inner);
+		}
+
+		auto icon = &st::historyFileInPlay;
+		icon->paintInCenter(p, inner);
+	}
+}
+
+rpl::producer<int> SingleMediaPreview::desiredHeightValue() const {
+	return rpl::single(st::boxPhotoPadding.top() + _previewHeight);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
new file mode 100644
index 000000000..17e035e8e
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
@@ -0,0 +1,66 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "media/clip/media_clip_reader.h"
+
+namespace Lottie {
+class SinglePlayer;
+} // namespace Lottie
+
+namespace Ui {
+
+struct PreparedFile;
+
+class SingleMediaPreview : public RpWidget {
+public:
+	static SingleMediaPreview *Create(
+		QWidget *parent,
+		Fn<bool()> gifPaused,
+		const PreparedFile &file);
+
+	SingleMediaPreview(
+		QWidget *parent,
+		Fn<bool()> gifPaused,
+		QImage preview,
+		bool animated,
+		bool sticker,
+		const QString &animatedPreviewPath);
+	~SingleMediaPreview();
+
+	bool canSendAsPhoto() const {
+		return _canSendAsPhoto;
+	}
+
+	rpl::producer<int> desiredHeightValue() const override;
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	void preparePreview(
+		QImage preview,
+		const QString &animatedPreviewPath);
+	void prepareAnimatedPreview(const QString &animatedPreviewPath);
+	void clipCallback(Media::Clip::Notification notification);
+
+	Fn<bool()> _gifPaused;
+	bool _animated = false;
+	bool _sticker = false;
+	bool _canSendAsPhoto = false;
+	QPixmap _preview;
+	int _previewLeft = 0;
+	int _previewWidth = 0;
+	int _previewHeight = 0;
+	Media::Clip::ReaderPointer _gifPreview;
+	std::unique_ptr<Lottie::SinglePlayer> _lottiePreview;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 8a19ce621..ac073df9c 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -75,6 +75,8 @@ PRIVATE
     ui/chat/attach/attach_prepare.h
     ui/chat/attach/attach_single_file_preview.cpp
     ui/chat/attach/attach_single_file_preview.h
+    ui/chat/attach/attach_single_media_preview.cpp
+    ui/chat/attach/attach_single_media_preview.h
     ui/chat/message_bar.cpp
     ui/chat/message_bar.h
     ui/chat/pinned_bar.cpp
@@ -107,4 +109,5 @@ PUBLIC
     tdesktop::td_lang
     desktop-app::lib_ui
     desktop-app::lib_ffmpeg
+    desktop-app::lib_lottie
 )

From 3feea400afc6c770fefbdcb077ec0b5515e0038a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 14 Oct 2020 11:28:17 +0300
Subject: [PATCH 092/190] Fix build on macOS.

---
 Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp | 4 ++--
 Telegram/SourceFiles/history/view/history_view_pinned_bar.h   | 3 +++
 Telegram/SourceFiles/platform/mac/file_bookmark_mac.h         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index a31713bbc..267a9513f 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -27,7 +27,7 @@ namespace {
 	const auto poll = media ? media->poll() : nullptr;
 	return Ui::MessageBarContent{
 		.id = item->id,
-		.text = item->inReplyText(),
+		.text = { item->inReplyText() },
 	};
 }
 
@@ -102,7 +102,7 @@ namespace {
 	}
 	auto load = rpl::make_producer<Ui::MessageBarContent>([=](auto consumer) {
 		consumer.put_next(Ui::MessageBarContent{
-			.text = tr::lng_contacts_loading(tr::now),
+			.text = { tr::lng_contacts_loading(tr::now) },
 		});
 		const auto channel = id.channel
 			? session->data().channel(id.channel).get()
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
index 0995d1cb5..d09394e7e 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
@@ -38,6 +38,9 @@ struct PinnedBarId {
 	bool operator==(const PinnedBarId &other) const {
 		return std::tie(message, type) == std::tie(other.message, other.type);
 	}
+	bool operator!=(const PinnedBarId &other) const {
+		return !(*this == other);
+	}
 };
 [[nodiscard]] rpl::producer<Ui::MessageBarContent> PinnedBarContent(
 	not_null<Main::Session*> session,
diff --git a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.h b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.h
index a60971184..e72a8b2c5 100644
--- a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.h
+++ b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.h
@@ -16,7 +16,7 @@ public:
 
 	[[nodiscard]] bool check() const;
 	bool enable() const;
-	void disable();
+	void disable() const;
 	[[nodiscard]] const QString &name(const QString &original) const;
 	[[nodiscard]] QByteArray bookmark() const;
 

From 7f956d32a6ffc271826493b114c170fd499551d8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 14 Oct 2020 16:01:07 +0300
Subject: [PATCH 093/190] Support slot machine game.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/SourceFiles/api/api_sending.cpp      |   6 +-
 .../chat_helpers/stickers_dice_pack.cpp       |  20 +-
 .../chat_helpers/stickers_dice_pack.h         |  12 +-
 .../SourceFiles/data/data_media_types.cpp     |  63 +++++-
 Telegram/SourceFiles/data/data_media_types.h  |   6 +
 .../history/view/media/history_view_dice.cpp  |  50 +----
 .../view/media/history_view_slot_machine.cpp  | 200 ++++++++++++++++++
 .../view/media/history_view_slot_machine.h    |  79 +++++++
 .../view/media/history_view_sticker.cpp       |   6 +-
 10 files changed, 381 insertions(+), 63 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp
 create mode 100644 Telegram/SourceFiles/history/view/media/history_view_slot_machine.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 94741dda3..f27aeb137 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -508,6 +508,8 @@ PRIVATE
     history/view/media/history_view_photo.cpp
     history/view/media/history_view_poll.h
     history/view/media/history_view_poll.cpp
+    history/view/media/history_view_slot_machine.h
+    history/view/media/history_view_slot_machine.cpp
     history/view/media/history_view_sticker.h
     history/view/media/history_view_sticker.cpp
     history/view/media/history_view_theme_document.h
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index f33429433..becdfceb8 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_message.h" // NewMessageFlags.
 #include "chat_helpers/message_field.h" // ConvertTextTagsToEntities.
+#include "chat_helpers/stickers_dice_pack.h" // DicePacks::kDiceString.
 #include "ui/text/text_entity.h" // TextWithEntities.
 #include "ui/item_text_options.h" // Ui::ItemTextOptions.
 #include "main/main_session.h"
@@ -221,8 +222,9 @@ bool SendDice(Api::MessageToSend &message) {
 	auto &account = message.action.history->session().account();
 	auto &config = account.appConfig();
 	static const auto hardcoded = std::vector<QString>{
-		QString::fromUtf8("\xF0\x9F\x8E\xB2"),
-		QString::fromUtf8("\xF0\x9F\x8E\xAF")
+		Stickers::DicePacks::kDiceString,
+		Stickers::DicePacks::kDartString,
+		Stickers::DicePacks::kSlotString,
 	};
 	const auto list = config.get<std::vector<QString>>(
 		"emojies_send_dice",
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
index 083778c9e..59a5c8ba4 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
@@ -20,6 +20,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Stickers {
 
+const QString DicePacks::kDiceString = QString::fromUtf8("\xF0\x9F\x8E\xB2");
+const QString DicePacks::kDartString = QString::fromUtf8("\xF0\x9F\x8E\xAF");
+const QString DicePacks::kSlotString = QString::fromUtf8("\xF0\x9F\x8E\xB0");
+
 DicePack::DicePack(not_null<Main::Session*> session, const QString &emoji)
 : _session(session)
 , _emoji(emoji) {
@@ -54,13 +58,21 @@ void DicePack::load() {
 void DicePack::applySet(const MTPDmessages_stickerSet &data) {
 	_map.clear();
 	auto documents = base::flat_map<DocumentId, not_null<DocumentData*>>();
+	const auto isSlotMachine = DicePacks::IsSlot(_emoji);
 	for (const auto &sticker : data.vdocuments().v) {
 		const auto document = _session->data().processDocument(
 			sticker);
 		if (document->sticker()) {
-			documents.emplace(document->id, document);
+			if (isSlotMachine) {
+				_map.emplace(_map.size(), document);
+			} else {
+				documents.emplace(document->id, document);
+			}
 		}
 	}
+	if (isSlotMachine) {
+		return;
+	}
 	for (const auto pack : data.vpacks().v) {
 		pack.match([&](const MTPDstickerPack &data) {
 			const auto emoji = qs(data.vemoticon());
@@ -86,11 +98,9 @@ void DicePack::tryGenerateLocalZero() {
 		return;
 	}
 
-	static const auto kDiceString = QString::fromUtf8("\xF0\x9F\x8E\xB2");
-	static const auto kDartString = QString::fromUtf8("\xF0\x9F\x8E\xAF");
-	const auto path = (_emoji == kDiceString)
+	const auto path = (_emoji == DicePacks::kDiceString)
 		? qsl(":/gui/art/dice_idle.tgs")
-		: (_emoji == kDartString)
+		: (_emoji == DicePacks::kDartString)
 		? qsl(":/gui/art/dart_idle.tgs")
 		: QString();
 	if (path.isEmpty()) {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.h b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.h
index 744a6d65e..a1556ee25 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.h
@@ -21,7 +21,7 @@ public:
 	DicePack(not_null<Main::Session*> session, const QString &emoji);
 	~DicePack();
 
-	DocumentData *lookup(int value);
+	[[nodiscard]] DocumentData *lookup(int value);
 
 private:
 	void load();
@@ -39,7 +39,15 @@ class DicePacks final {
 public:
 	explicit DicePacks(not_null<Main::Session*> session);
 
-	DocumentData *lookup(const QString &emoji, int value);
+	static const QString kDiceString;
+	static const QString kDartString;
+	static const QString kSlotString;
+
+	[[nodiscard]] static bool IsSlot(const QString &emoji) {
+		return (emoji == kSlotString);
+	}
+
+	[[nodiscard]] DocumentData *lookup(const QString &emoji, int value);
 
 private:
 	const not_null<Main::Session*> _session;
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index c87b7b733..7a89c6252 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -23,13 +23,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_web_page.h"
 #include "history/view/media/history_view_poll.h"
 #include "history/view/media/history_view_theme_document.h"
+#include "history/view/media/history_view_slot_machine.h"
 #include "history/view/media/history_view_dice.h"
 #include "ui/image/image.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_options.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/emoji_config.h"
+#include "api/api_sending.h"
 #include "storage/storage_shared_media.h"
 #include "storage/localstorage.h"
+#include "chat_helpers/stickers_dice_pack.h" // Stickers::DicePacks::IsSlot.
 #include "data/data_session.h"
 #include "data/data_photo.h"
 #include "data/data_document.h"
@@ -42,6 +47,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "storage/file_upload.h"
 #include "app.h"
+#include "styles/style_chat.h"
 
 namespace Data {
 namespace {
@@ -1339,9 +1345,60 @@ std::unique_ptr<HistoryView::Media> MediaDice::createView(
 		not_null<HistoryView::Element*> message,
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing) {
-	return std::make_unique<HistoryView::UnwrappedMedia>(
-		message,
-		std::make_unique<HistoryView::Dice>(message, this));
+	return ::Stickers::DicePacks::IsSlot(_emoji)
+		? std::make_unique<HistoryView::UnwrappedMedia>(
+			message,
+			std::make_unique<HistoryView::SlotMachine>(message, this))
+		: std::make_unique<HistoryView::UnwrappedMedia>(
+			message,
+			std::make_unique<HistoryView::Dice>(message, this));
+}
+
+ClickHandlerPtr MediaDice::makeHandler() const {
+	return MakeHandler(parent()->history(), _emoji);
+}
+
+ClickHandlerPtr MediaDice::MakeHandler(
+		not_null<History*> history,
+		const QString &emoji) {
+	static auto ShownToast = base::weak_ptr<Ui::Toast::Instance>();
+	static const auto HideExisting = [] {
+		if (const auto toast = ShownToast.get()) {
+			toast->hideAnimated();
+			ShownToast = nullptr;
+		}
+	};
+	return std::make_shared<LambdaClickHandler>([=] {
+		auto config = Ui::Toast::Config{
+			.text = { tr::lng_about_random(tr::now, lt_emoji, emoji) },
+			.st = &st::historyDiceToast,
+			.durationMs = Ui::Toast::kDefaultDuration * 2,
+			.multiline = true,
+		};
+		if (history->peer->canWrite()) {
+			auto link = Ui::Text::Link(
+				tr::lng_about_random_send(tr::now).toUpper());
+			link.entities.push_back(
+				EntityInText(EntityType::Semibold, 0, link.text.size()));
+			config.text.append(' ').append(std::move(link));
+			config.filter = crl::guard(&history->session(), [=](
+					const ClickHandlerPtr &handler,
+					Qt::MouseButton button) {
+				if (button == Qt::LeftButton && !ShownToast.empty()) {
+					auto message = Api::MessageToSend(history);
+					message.action.clearDraft = false;
+					message.textWithTags.text = emoji;
+
+					Api::SendDice(message);
+					HideExisting();
+				}
+				return false;
+			});
+		}
+
+		HideExisting();
+		ShownToast = Ui::Toast::Show(config);
+	});
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index 5037a2592..ed139bbcf 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_location.h"
 
 class Image;
+class History;
 class HistoryItem;
 
 namespace base {
@@ -447,6 +448,11 @@ public:
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing = nullptr) override;
 
+	[[nodiscard]] ClickHandlerPtr makeHandler() const;
+	[[nodiscard]] static ClickHandlerPtr MakeHandler(
+		not_null<History*> history,
+		const QString &emoji);
+
 private:
 	QString _emoji;
 	int _value = 0;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_dice.cpp b/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
index 3a79c6924..9c823b0b9 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
@@ -9,15 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "data/data_session.h"
 #include "chat_helpers/stickers_dice_pack.h"
-#include "api/api_sending.h"
-#include "api/api_common.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_components.h"
 #include "history/view/history_view_element.h"
-#include "ui/toast/toast.h"
-#include "ui/text/text_utilities.h"
-#include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "styles/style_chat.h"
 
@@ -32,49 +27,6 @@ namespace {
 	return session.diceStickersPacks().lookup(emoji, value);
 }
 
-[[nodiscard]] ClickHandlerPtr MakeDiceHandler(
-		not_null<History*> history,
-		const QString &emoji) {
-	static auto ShownToast = base::weak_ptr<Ui::Toast::Instance>();
-	static const auto HideExisting = [] {
-		if (const auto toast = ShownToast.get()) {
-			toast->hideAnimated();
-			ShownToast = nullptr;
-		}
-	};
-	return std::make_shared<LambdaClickHandler>([=] {
-		auto config = Ui::Toast::Config{
-			.text = { tr::lng_about_random(tr::now, lt_emoji, emoji) },
-			.st = &st::historyDiceToast,
-			.durationMs = Ui::Toast::kDefaultDuration * 2,
-			.multiline = true,
-		};
-		if (history->peer->canWrite()) {
-			auto link = Ui::Text::Link(
-				tr::lng_about_random_send(tr::now).toUpper());
-			link.entities.push_back(
-				EntityInText(EntityType::Semibold, 0, link.text.size()));
-			config.text.append(' ').append(std::move(link));
-			config.filter = crl::guard(&history->session(), [=](
-					const ClickHandlerPtr &handler,
-					Qt::MouseButton button) {
-				if (button == Qt::LeftButton && !ShownToast.empty()) {
-					auto message = Api::MessageToSend(history);
-					message.action.clearDraft = false;
-					message.textWithTags.text = emoji;
-
-					Api::SendDice(message);
-					HideExisting();
-				}
-				return false;
-			});
-		}
-
-		HideExisting();
-		ShownToast = Ui::Toast::Show(config);
-	});
-}
-
 } // namespace
 
 Dice::Dice(not_null<Element*> parent, not_null<Data::MediaDice*> dice)
@@ -82,7 +34,7 @@ Dice::Dice(not_null<Element*> parent, not_null<Data::MediaDice*> dice)
 , _dice(dice)
 , _link(_parent->data()->Has<HistoryMessageForwarded>()
 		? nullptr
-		: MakeDiceHandler(_parent->history(), dice->emoji())) {
+		: dice->makeHandler()) {
 	if (const auto document = Lookup(parent, dice->emoji(), 0)) {
 		_start.emplace(parent, document);
 		_start->setDiceIndex(_dice->emoji(), 0);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp b/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp
new file mode 100644
index 000000000..67a2f2743
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp
@@ -0,0 +1,200 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/media/history_view_slot_machine.h"
+
+#include "data/data_session.h"
+#include "chat_helpers/stickers_dice_pack.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_components.h"
+#include "history/view/history_view_element.h"
+#include "main/main_session.h"
+#include "styles/style_chat.h"
+
+namespace HistoryView {
+namespace {
+
+constexpr auto kStartBackIndex = 0;
+constexpr auto kWinBackIndex = 1;
+constexpr auto kPullIndex = 2;
+constexpr auto kShifts = std::array<int, 3>{ 3, 9, 15 };
+constexpr auto kSevenWinIndex = 0;
+constexpr auto kSevenIndex = 1;
+constexpr auto kBarIndex = 2;
+constexpr auto kBerriesIndex = 3;
+constexpr auto kLemonIndex = 4;
+constexpr auto kStartIndex = 5;
+
+constexpr auto kWinValue = 64;
+
+const auto &kEmoji = ::Stickers::DicePacks::kSlotString;
+
+[[nodiscard]] DocumentData *Lookup(
+		not_null<Element*> view,
+		int value) {
+	const auto &session = view->data()->history()->session();
+	return session.diceStickersPacks().lookup(kEmoji, value);
+}
+
+[[nodiscard]] int ComplexIndex(int partIndex, int inPartIndex) {
+	Expects(partIndex >= 0 && partIndex < 3);
+
+	return kShifts[partIndex] + inPartIndex;
+}
+
+[[nodiscard]] int ComputeComplexIndex(int value, int partIndex) {
+	Expects(value > 0 && value <= 64);
+
+	if (value == kWinValue) {
+		return ComplexIndex(partIndex, kSevenWinIndex);
+	}
+	const auto bits = ((value - 1) >> (partIndex * 2)) & 0x03; // 0..3
+	return ComplexIndex(partIndex, [&] {
+		switch (bits) {
+		case 0: return kBarIndex;
+		case 1: return kBerriesIndex;
+		case 2: return kLemonIndex;
+		case 3: return kSevenIndex;
+		}
+		Unexpected("Bits value in ComputeComplexIndex.");
+	}());
+}
+
+} // namespace
+
+SlotMachine::SlotMachine(
+	not_null<Element*> parent,
+	not_null<Data::MediaDice*> dice)
+: _parent(parent)
+, _dice(dice)
+, _link(_parent->data()->Has<HistoryMessageForwarded>()
+		? nullptr
+		: dice->makeHandler()) {
+	resolveStarts();
+	_showLastFrame = _parent->data()->Has<HistoryMessageForwarded>();
+	if (_showLastFrame) {
+		for (auto &drawingEnd : _drawingEnd) {
+			drawingEnd = true;
+		}
+	}
+}
+
+SlotMachine::~SlotMachine() = default;
+
+void SlotMachine::resolve(
+		std::optional<Sticker> &sticker,
+		int singleTimeIndex,
+		int index,
+		bool initSize) const {
+	if (sticker) {
+		return;
+	}
+	const auto document = Lookup(_parent, index);
+	if (!document) {
+		return;
+	}
+	sticker.emplace(_parent, document);
+	sticker->setDiceIndex(kEmoji, singleTimeIndex);
+	if (initSize) {
+		sticker->initSize();
+	}
+}
+
+void SlotMachine::resolveStarts(bool initSize) {
+	resolve(_pull, kPullIndex, kPullIndex, initSize);
+	resolve(_start[0], 0, kStartBackIndex, initSize);
+	for (auto i = 0; i != 3; ++i) {
+		resolve(_start[i + 1], 0, ComplexIndex(i, kStartIndex), initSize);
+	}
+}
+
+void SlotMachine::resolveEnds(int value) {
+	if (value <= 0 || value > 64) {
+		return;
+	}
+	if (value == kWinValue) {
+		resolve(_end[0], kWinBackIndex, kWinBackIndex, true);
+	}
+	for (auto i = 0; i != 3; ++i) {
+		const auto index = ComputeComplexIndex(value, i);
+		resolve(_end[i + 1], index, index, true);
+	}
+}
+
+bool SlotMachine::isEndResolved() const {
+	for (auto i = 0; i != 3; ++i) {
+		if (!_end[i + 1]) {
+			return false;
+		}
+	}
+	return _end[0].has_value() || (_dice->value() != kWinValue);
+}
+
+QSize SlotMachine::size() {
+	return _pull
+		? _pull->size()
+		: Sticker::GetAnimatedEmojiSize(&_parent->history()->session());
+}
+
+ClickHandlerPtr SlotMachine::link() {
+	return _link;
+}
+
+void SlotMachine::draw(Painter &p, const QRect &r, bool selected) {
+	resolveStarts(true);
+	resolveEnds(_dice->value());
+
+	//const auto endResolved = isEndResolved();
+	//if (!endResolved) {
+	//	for (auto &drawingEnd : _drawingEnd) {
+	//		drawingEnd = false;
+	//	}
+	//}
+	auto switchedToEnd = _drawingEnd;
+	const auto pullReady = _pull && _pull->readyToDrawLottie();
+	const auto paintReady = [&] {
+		auto result = pullReady;
+		for (auto i = 1; i != 4; ++i) {
+			if (!_end[i] || !_end[i]->readyToDrawLottie()) {
+				switchedToEnd[i] = false;
+			}
+			if (!switchedToEnd[i]
+				&& (!_start[i] || !_start[i]->readyToDrawLottie())) {
+				result = false;
+			}
+		}
+		if (!_end[0] || !_end[0]->readyToDrawLottie()) {
+			switchedToEnd[0] = false;
+		}
+		if (ranges::contains(switchedToEnd, false)
+			&& (!_start[0] || !_start[0]->readyToDrawLottie())) {
+			result = false;
+		}
+		return result;
+	}();
+
+	if (!paintReady) {
+		return;
+	}
+
+	for (auto i = 0; i != 4; ++i) {
+		if (switchedToEnd[i]) {
+			_end[i]->draw(p, r, selected);
+		} else {
+			_start[i]->draw(p, r, selected);
+			if (_end[i]
+				&& _end[i]->readyToDrawLottie()
+				&& _start[i]->atTheEnd()) {
+				_drawingEnd[i] = true;
+			}
+		}
+	}
+	_pull->draw(p, r, selected);
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_slot_machine.h b/Telegram/SourceFiles/history/view/media/history_view_slot_machine.h
new file mode 100644
index 000000000..fad54f1c3
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_slot_machine.h
@@ -0,0 +1,79 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "history/view/media/history_view_media_unwrapped.h"
+#include "history/view/media/history_view_sticker.h"
+
+namespace Data {
+class MediaDice;
+} // namespace Data
+
+namespace HistoryView {
+
+class SlotMachine final : public UnwrappedMedia::Content {
+public:
+	SlotMachine(not_null<Element*> parent, not_null<Data::MediaDice*> dice);
+	~SlotMachine();
+
+	QSize size() override;
+	void draw(Painter &p, const QRect &r, bool selected) override;
+
+	ClickHandlerPtr link() override;
+
+	bool hasHeavyPart() const override {
+		if (_pull && _pull->hasHeavyPart()) {
+			return true;
+		}
+		for (auto i = 0; i != 4; ++i) {
+			if ((_start[i] && _start[i]->hasHeavyPart())
+				|| (_end[i] && _end[i]->hasHeavyPart())) {
+				return true;
+			}
+		}
+		return false;
+	}
+	void unloadHeavyPart() override {
+		if (_pull) {
+			_pull->unloadHeavyPart();
+		}
+		for (auto i = 0; i != 4; ++i) {
+			if (_start[i]) {
+				_start[i]->unloadHeavyPart();
+			}
+			if (_end[i]) {
+				_end[i]->unloadHeavyPart();
+			}
+		}
+	}
+	bool hidesForwardedInfo() override {
+		return false;
+	}
+
+private:
+	void resolveStarts(bool initSize = false);
+	void resolveEnds(int value);
+	[[nodiscard]] bool isEndResolved() const;
+	void resolve(
+		std::optional<Sticker> &sticker,
+		int singleTimeIndex,
+		int index,
+		bool initSize) const;
+
+	const not_null<Element*> _parent;
+	const not_null<Data::MediaDice*> _dice;
+	ClickHandlerPtr _link;
+	std::optional<Sticker> _pull;
+	std::array<std::optional<Sticker>, 4> _start;
+	std::array<std::optional<Sticker>, 4> _end;
+	mutable bool _showLastFrame = false;
+	mutable std::array<bool, 4> _drawingEnd = { { false } };
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
index 15ee3cb28..6cc2e8cc2 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
@@ -109,7 +109,9 @@ void Sticker::initSize() {
 }
 
 QSize Sticker::size() {
-	initSize();
+	if (_size.isEmpty()) {
+		initSize();
+	}
 	return _size;
 }
 
@@ -301,7 +303,7 @@ void Sticker::setupLottie() {
 		_dataMedia.get(),
 		_replacements,
 		ChatHelpers::StickerLottieSize::MessageHistory,
-		_size * cIntRetinaFactor(),
+		size() * cIntRetinaFactor(),
 		Lottie::Quality::High);
 	lottieCreated();
 }

From c2f0bcf933ed9d4913b10e0e501151eea6619e4d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 14 Oct 2020 18:12:24 +0300
Subject: [PATCH 094/190] Keep first game sticker frames inside the binary.

---
 Telegram/Resources/art/bball_idle.tgs         | Bin 0 -> 23121 bytes
 Telegram/Resources/art/fball_idle.tgs         | Bin 0 -> 42220 bytes
 Telegram/Resources/art/slot_0_idle.tgs        | Bin 0 -> 9745 bytes
 Telegram/Resources/art/slot_1_idle.tgs        | Bin 0 -> 6191 bytes
 Telegram/Resources/art/slot_2_idle.tgs        | Bin 0 -> 9730 bytes
 Telegram/Resources/art/slot_back.tgs          | Bin 0 -> 1945 bytes
 Telegram/Resources/art/slot_pull.tgs          | Bin 0 -> 5484 bytes
 Telegram/Resources/qrc/telegram/telegram.qrc  |   7 +++
 Telegram/SourceFiles/api/api_sending.cpp      |   3 ++
 .../chat_helpers/stickers_dice_pack.cpp       |  48 ++++++++++++------
 .../chat_helpers/stickers_dice_pack.h         |   3 ++
 .../history/view/media/history_view_dice.cpp  |   4 +-
 .../view/media/history_view_slot_machine.cpp  |   4 +-
 .../SourceFiles/storage/localimageloader.cpp  |  15 +++---
 .../SourceFiles/storage/localimageloader.h    |  11 +++-
 15 files changed, 64 insertions(+), 31 deletions(-)
 create mode 100644 Telegram/Resources/art/bball_idle.tgs
 create mode 100644 Telegram/Resources/art/fball_idle.tgs
 create mode 100644 Telegram/Resources/art/slot_0_idle.tgs
 create mode 100644 Telegram/Resources/art/slot_1_idle.tgs
 create mode 100644 Telegram/Resources/art/slot_2_idle.tgs
 create mode 100644 Telegram/Resources/art/slot_back.tgs
 create mode 100644 Telegram/Resources/art/slot_pull.tgs

diff --git a/Telegram/Resources/art/bball_idle.tgs b/Telegram/Resources/art/bball_idle.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..e82b626397930fa0e5b375eaf8143f9f2fb6dea4
GIT binary patch
literal 23121
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

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/art/fball_idle.tgs b/Telegram/Resources/art/fball_idle.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..b1d71e43a5dd15be7ab8b5ac945a270a2b1716ae
GIT binary patch
literal 42220
zcmZ76V~{8?kRaf(%{R7f+qP}nwr$(C%{R7f+n#&7dw08c`O!a8sZ>|0QkAdMcu^1l
z|1p4ouX?oNh&vK!-_$UlIdS0<N2_*bc(Xk;^#iuq1pYiprxkCUt3q$Hn8nf0`RRR5
zojJI~-HjESiHbS~SIj&`+hfL{clo{S>h=B}ztZ{D52gJ+AH(Yn{t<mOd3!kB?foLi
z+@Eag^Lq#WJyrXObNL$jeLaRB=-i*wyY%~gf%ZF}?fd!o-u3%>KgDz9`}(?!<Ma94
z)bs7<^8Gj`dw+=Q`~7+5g1`U!`|}W!=lve1=lA~Ehw;-t%lC75Y4;I!-n9Gkk~H`5
zji>jscX|15wcWqna`b*S+xotqKjDXWzrNYtm;4^mem^I7?`Pv4o_~+hIuOK+w)O;Z
zqacIc7x}=y-rtx^iqk`Lq>RRK^ZLbnQ}}*=R`Gs+R3d;7^?n|(;$E*mzkmr=$veKL
z>5wJ(C_O$fxZifa8W@ma^?nrm4iNpee@7TuKG1(6eh2N!rkbVc-VX7;#RuTH_&7hy
z_T##xBhr87KgRlQ%$Y~vOrweWLKCF1x74A0nWo_C3x3YPzM|T$2${&?O`;Qip2!ML
z<NUTXe6295ag-q6;_+-|f^dplzN&DXoPqno8Sm@dQ}B*@7VC(Gju}dUprpnhTE^)1
z^(Zu9p8M#NTTGtR!L<nGAo3<%o6|F7Y=>_HPEm+{ao=UYlBj&Caq-BF!h3lk_P->G
z56M=TW<C0Du;DS9re64ZzxF@vexIN7x_NZF#d&k-5~I|Mk#cGihpy7|^of60(REQz
zCD1AEcZ%jiz9~nBDCh4f@8Q1&t`6oY?>F67y4B~obV`qq{VL*VgUL+!ZlTdHI)gh*
z27%PQXGG-pJyJ|KXpmd<NYliOJf5xLx@X^vrdG}CDFa?32k!Rjs*BsYnff25h{p(z
z7){^Na*v|GkKZ7BZ5@X>4Tf4YOZiVHhZj#l!yD-XD#9B}g3wQb0bIrMQa)q(q>EM;
z>$|1B9WXU)(&FTj_Cax}RciN?hQl0)Cq80fL>~f5oNaR6SXRKPmFe?|?iudA$(5wT
zTnKmU*Pgp2A6}A8>T^gAjKWP0@C+$B?FsfI9=huqabXfaf#kfo{Q{9)-3ObaN%w_@
zvFLSZm)ubC%B25lGDQfu+b-%K8}>&Zo{^EFg)te9%{Xbbb-LkplmDCv7c&@Zn^rum
zcM(<zJm2k0Zkd=mS7gUbn7g^+laIeX@kV-Uv6Ir>|9$a3k->BTeP>R*!l&=lx5DbR
zH%7i!gqXA*Ry3kv>YLaTH7-aps+F_n%jPX`{|df+oi}Klxi^rwPo9srCM5i=!|VHf
z2A@1Qt)q_n`8u5K^GgvysCfF0@;+Aox;J$kM=_FSL`)lP(YwwoJ#6s{U^&SvgvREX
z{5mqj4ND2k`_+4&?fWJ4Lk9Z2z3uz{$kRg?|ALF~BpsQq-l~=J<MWv~g8BM=o3tbI
zV}MTn{mDbe`~3bJB_{ax`?wkB_xb(rPQOg1`TbPzeyr~Le%JN=%J*KGxpNe~&Lc+S
z#&K%~_SdRKo2*Zu<KKF_wWmE5h542B;2=klMfqfDaH~XM>&QoFL%BNctBv!_EM%7!
z)jisgOI;ch;sy7w+Vvn%M-kq>Cucc(F&6A?9poR-$dbT`NQb%%D<*1JdlLzrtdEs>
z`}OPc<uGL^l?}ZHk?3NnNV&Gl1K(7mChcQQADRZ1r$|MW)FVSmeF0@%8rQq$9#ceR
zMOA3;Or%h&5-~1GohXH;)F&ge%0RJ69D2<`t9fYmRzC?+I}&KlB9DgH708oT4Titj
za*^B|vt_V-_!ZRWw?An0jhfamSmEB{Ubf1%xpdYn+T_??I%}QMYMs*g{V>u|EbFL`
zZ0S`l#vcKjIbviz-qodDXVpJ?9NzIs{2X_|AVCZt=zS|>hno@lpy&H`f*kba{y=^%
z!3UtnpsU8!eyGe2zXtOE{yW;Q^Uc*hpWl5y-_Q5cGDYz#mXIT3$(p6u17ix0oHyzR
z#P^5q)d}RE`^{XQy57V~c4|N<=d=-nSlZ+d)Y7RY%<owawN~FiIlR8q*?H)+`@l56
z<ce>J6GcDX%u_rQ&(FStQ>ENo#;XvzM_Iknr9663-0$;cubWppKA-LHF0CryzAlH^
z7nH0MZ;{5G<AVs6*0ynFVUT%2n%!xQrz7G%BI1L}aEHRpM#q@f2e8MvMh(?U!}tQ$
zdP3D$=QU&HmgA_*qngxPI`gS7S1Q64q)XFr0Z94}Ltlh-!@s};>8F1=38R1x(#lU<
zgfe|2Gu+g6J|nW<>T9{p=RmdA-;}2*uQ<5Svg|rd@`<<@vbx>%4V6XW+w|@V*GoTm
zSL~TOxV}VgCDhzddlnfa;yk50<-djn8#cZ1eoe>iY#-L+)m29b2o4ff)(y>eGnht8
z<J`Z8i82hukS)wPrZF%57P=Xt<Axb9TH)yOKsm@D^=>Q&(>}2w^|nLWTcGccakCv;
zSplgIN$v)KXu)&?k64V0wP|{5<q*ydd^B|NFndrlB+l!(5v~mMLAjR5)sE05t_mr)
zL;?rG^^U)RGMeg9P{$gnZLN8UzF^06wn1HN7RU#D{&u!~%qM-!OI6!CgTF@?ylpTg
zVdV_R$d>eC$qmQ&J_v7}eUkm5#F&hOX{u({!sPw)*XppI6_Gf|m1vV)l?gPgqJ9RM
zIbMA@+#u!eiG|35#F_k`n0##{*)VJP%R_fMFJ0G|<GaB%e;!`b2-jPL4FZJ31(Zwi
z&*OPDt(~3_b!GD}U<C&*{BJ@$8u-F2q~*PPq*mpF9Q+&JgAR%ANro^I>oF-(2g#Ej
zsqkOKTL3;D3N!e#H#ezjc*2vxF35sv)u_X*@dNdBYi_%{JTiUi)FDldyKZsr@APCp
z)q{x8xaFUtqoISfPIkaeJOW(Ole0T~-LY4a-Na0jfin927s}FF=Q|{bV(y%rZar+D
zmcx`O?=MN7<!WQ(KYqr;Xe;^+4CxUPqx-;$2p~@gLLx-+6h;JZxly21=nbIHgN?SH
z_)uTtNy)K!{AO@SGDlHNe|D`MW^5?RuaP)}1fi&|zt)wR@zJqspQ*W0%BD84E$!Fw
zvK@`x#2>=NkxdouqkaI6U+>xW{mnSvS!ZtsE&A1}vqAVozNBN`8rEJh@1<A{)XGJ_
z)NzukCQ{|=2)OU>zaqwRzmY)#co-4hq$f@0!}pKm{>1uF5UQomu+f7+K5CK$A>%h_
zC_>kSlMlcmTO-%XHG22$LNg{5X15{FaKW}D<_LpS;c=Mf1}<Do5)+kAgo|TZir{Lb
z@D&%VERs<^J?7q1uLj?vka4&S!QDuA$3<+<esw5`;xT>KrI_+ghk<5<p@Zqta=guf
z7_f;vu$>AejZTh=FS{od+cYwo6OTp;k<uMuG=j<Yt~<{(uOGkP)d*N3v^#r=cH_cL
z&9-WiaueY-MlRx8g<1_s=+a5`nQxE`=AQdcDjC|0H<@bbzwhigi#rBciX2EMfm8`6
zmZ84!9B3Moa*XF0g_I`G*@}7`M+dHH%gYtSR<F64T|ifzi@xA60$uhxb>6y5HthFu
zDalOjyh$iD{srnW7EL3JdENFEWiiW;OH^U;e8HzVrS4;M;6ZrKa7yj!s_nY${Qp8(
zMc3udU!7GZeb42g@6bsL6M@IfFh@qHTL>5ZX57)7RQszc{7iUe$e@Euens~THC2af
zpL5_PhxEmXD79W2%~H|2qShrDt1gqmC85;xbh!-aP5Onoj27dQzE~}8n_k8@r|Qir
z!ZVz9)XG<4vvkJ}PRp4N&|8#bar9VsRE4OS#VHjnq3r&3`g%CY3CdR4b$2tg$}$L2
zuBxzu<hvHxfIWLtS9B~^rpudyWQ_EQBkgA&V>85NWLotaJ2N5a=>;ZIR0G1N6C!ZY
zTCT_|UojI%X3#|V3$Q`e7=ykd`Ac{_UDzLuAEn_~Lol{2g{Mj!5uoF}wS01i!LbCO
z7xI>~)9wSlF!BO&tYsE-6z3Cjp^^sic5A;kL&OsTp0(2n40l(5-ox@6asyQAmkFws
zC~o9~0LHm!HDB6HBZZT?zoe7YY3?JNT*Uz%1uZ<*c8AS~;&}$BbdBs>l;-`|Rr&M%
zDPzAC-i%+7XH>yqZ==;XYY2>;PV4#T>A2a<_X+#;NPx(}cH)auyQn9ENf4pHyhX~E
zscXZdmJCy5>;jaYfm=NVoa3_?CJ5T#E8&RXC)7m%V)*K06z`rKMoEAH{Bn3sq!CRB
zGq~#=^~yAY@a;GueFJB?j(4!1%Pqv-R)nkoV+mM`CvgK&73FYu;!zu#K4sPnQYg-W
z9_)E+YoK(7?3r%;EW*IMSV+?S&A_GCdn$VAtUzn+vl&9m1~_6B0!GkE0fe3lQgpT5
ziBAtREh#jQI=m;!SCt(A%;EX-AL3LegKA*HkWnfMk@Q(G&iHb3FUG71dLi#EIWbx)
z{g(k(!OaBsKQ$S$g3XP==bFQ9KDnx<3#$kUHtgt>QjqA?_>bRp<g%|bB100?0~MCM
zkeq0O{hk4M7Rsb;SyR=F!%+Fg&IWmBoEcXxv@<)o&{2GG)~vHsNL9XsgSew8DkNg<
zz%fiMz^KlTS<-OSTW6#y(#^z45hOL~(#pYNse`J69&`A{HrSI3m1Tv6GRfX~S2`gF
zXl3vXT2)@8R)vE1RJNr44yaV3S&L)2a+MiU{R-sB+XeV9Vhv<xPm=dHn-{$`{~e@s
z@0W#v=Zj<Ac2@$E!rmeA^hG-t$sTMtb}ArOW!-5{Rpk)R@hRM@W~vwzb<3P>d7`<3
zyze(*n8r!6U&n^75>=iqRpuBGDI5$}2dl7g@w7*ogWsuPcTFr7hf``0#OwCY(v|+?
zh@jwfMiv_J5k<<%vH3{M*j{j7p}zDC_F9B|8!0c8>WXj1O$wnexLPcdxY9MA<0g|)
zG<K9}68k(ECOl?%k3K|@%@lSQ3T9I5M-y{8o2)RD4b1<kt|_3D(2HdGun>dSXog44
zo5p;@@DNuztC8JgqJwz1B1xmTn6xWl>~S{T5eZVEUWgPW;x??5?R<G&!RGOD7I``2
zB4yR#h!{IY;modZPCzw|+Ots6#gbU(&4U)G+EZdQ7#HRtUvwy%N4*HumTR{pfaNpX
zYKa=MrFnLDnsk5kKyZ#}38q7RM*?tHAN5Hdv#8p5j(RipTqMO~Vb5S@?a;cp-$yS@
z;`94{e8oF+0wMd>kVT`4Yi|V6lfqOG+IC1}7d_+Uo=Z1eZ^KQC9Y>bM`Fa+?^aU<}
zrZ5NesfYI{6-CsYPQF9~$wk4hdY_~4Y4al!)<$C6_*3k|B#E^JAi_eSoG%3||MXHQ
zI&7>8Qo{-En;2hDBHzD}hqEVpP$`bF-hm$X6qOo+FR|!2L??5QJ_Sdb$jPDI^|ST^
zb671d>yW?!ygV&&Q4FDu1Qd^BE{8UtW`NVo<xRZY3|njo^tNJvnm+*J^%Km%P-9z}
z&v8M1`^r9bfP~Y;s`3gLDA!dkbi*~i4jXo)hXTwIKnkW>U8)CMoQ_UFG$h|K8Mqw*
zf`ZbPVOD(TMHSWCgn<yyXwztdBdbVdG^rx4raGX8&8j+hkfH)nNkKY~kO*Km2$Q6U
zwlid6fw<>&Z|-C(n63lb>LR`by7O4_(n{uyuQcr{>_|*iM1pP4<TfB4%hJdDu#V~z
z``Q-plXdiT26gC85m*#=e4wx*2ie)MNc+^A3)a6!VZ8^lw`+26NFg=9jzdveE%dID
zy1*b+@L{mN4T$1IhEX6z4LXNoTlKBtIx#=Rs*Sk0q9o#qg0fIJek!V;Y4HBxI4qYF
zP+sMNQue`MCtGGwv2eXTR#qC>*JK8D1sRIDy`})w=xh|#cuP&W(E0aNA^YhD&|2db
z4d@uIJj)sdb$!)ar%IxcP;#bn{!D?>zY$oBlJQM_!e`bCC;l=%zXOUVHJ_rnDiFpO
z@Qp8LN__8XQl9_fn!-eTUYZ*EshCMJ(!HC?G!vm}hmcP)v0cCEz1ZcEAu-PGII@d}
zAU=kRK+XfYeUL_Rn`uS&xx9L{MPPqM$N%_r7?8cmzg1r?9?V)p{F%^x+7m|-f&7q1
z(3;#3=@#K;ir4veD@fbo$z2U|3f7^re5~~#j<tpQDD+;TGE}7n6y&?)&lV0A-b^+o
z9^5r1eRki_hq%{e&>P(S_Q%=EU$HjcJ27bSFvZUM`QbMRMSiI>-A9e+xEnn`pql=^
zj3A%HZ||<V`Fq#?XDdL@zEXAx<!z+mtL~{Z(tEM$ZgtJT{P^FToU6s?thcq-5}hnG
zKpx}B#gdiu_&AH=0AS-1BVaI9F;L%n-8xOHB+M~Va})+#3z8KnV^wU2w3KV=Fnib#
z`{GLiAMU%XxnQDIDHegaeYeN6l1R3=A1Vl+jdDD}Eashd?!AJdbrtuI(+s^=gPy}>
zT-=o~)cIIo4=L3gh-%YBW;F*YPM({&ebHyMR#fkd7yRx&vCkgc$-&xIXZB-!dbhY9
zdJ~;aM?Eu=-u$N!lt>^iCE+eUS}?-=f8G}Xu3#Aupj`{6TLb?1kI>@y7iz5sA9Iwh
z+LXu{QkA&Xr*Lck+Ugf=e>SfubAB&$*C_K5;RZgbr!JsP)76&18$21=2OWPE*wgrt
zdyCo!;qLo&BweGb+o-MJH~1$CR};5HrdjR5Ss{S(;QH!+%i#CpOAa;WEtZVcJtj7L
zHGue^DWa&`gyXn#G(mX0dt*Qo<Qv8rksDMdKeZ}C_VqY>(YRjph4XP*)Yz18?>%V5
zv?$J#M^0M|UQg1;l$=rlaZe-sslx#=<tIo~jAp;>PvcjMk%b1+Si4Q1$0zWTUZ<-8
zntPiAO*VB3i)QTw*KDa35VfVuB1KZ5`1&BXccR6k5sWD)_Hi!0Lk4MtB4ov+1C-7L
zw4;#;JATrrwTicdDM|N%2_d6U{~I1>(uWFjVjcmf1dF6=Y|C*@U=2#A@vyEUR&Aq<
zSRZLle4&(KkE_7~dtkv`o@qUHZ<^Fw!0BYl1nY126b4rR>HBxiuEzE3IZ*Tz*22kH
z<UR-_KDOuPh#29_EF=Y;eVN}tAOY@a7QwvJB(PCikS}eP8G)FFqGox}WB_hB<%Fj2
z_aJb)+~`uaM~Vxez!E|MsZu8-ka?}E)Q~gFr-U^y0!(X*(wmvt)49f#A-nuD;}#j(
zn$LvM7Zc>?Zthg&x5x^ii8e489(srLSy4lQtjRXcJ{S=qAfEXqxkb%F086h7)};x0
zkw(dl=NEwvkEEwLy8>2^h)EY-EHq9NYCQvH74G<{`lFY=4KeP)qxMaR@+L#6WN?je
zE7A+6;gZM|_&I5ofs*kE01~ZDjy_7<{^MDvJFRh8@BIPV^PQv!Ub(%=T*L(YZu(kc
zO_iALO{)%@7<bjRy|xhn2Ozj+=EjLkE_ay=Jc4G%5>qLDF)rUI9uaA7E>q|0=*E~u
z^Qf?>S%s7^9LHgoi_?$=!6U2(4k(Wj%Wdrzyowbtp1-wjtKzKls-Z(gN@AfdWBl%K
z!9AlT`kwo+5gy4lbZ;%YMpsIn!N=Np6DAg0FzV9tJnlgkNW6me9sA6vvCz$w=0Nog
z`R~zqE__Dy>IA<=rYyn~83jo+)d_GqWVoICjUo%OupZ@@T*iqKNN2Wwcgv-R!8BM#
z6%t31we}$;T$A}WeW-gQu?~;xyyP<UE++Hwo9)^=7zYnp=k3zS=?n&eMWs1Zd>s>z
zKg;q4drW|^mRAWGm&=mH;*Tk>QD%+y%4b5#%OC~nn{ob>Ow`fHGi78rGi@pb;!(^o
zSFZtI-aCj<s(0{Lgu?`Ox1FE>a_I<fIkF(H?lj=6%jSEgXS&Q{wne615wS&>|5q(x
zil1Q+v+VmR+et8?&46xMeO}W15JjU_%5XVFw&C&2NsAsOHN3E19GvgT(s}OY+IH>s
z^~V1fcp|p1Kfr8Pb32zOwQt%MXD(DS-98#V9js|QD_H2Rwa`nxqh}_pGT~Wt?(cjr
z#LxaZyA&67-5hA)6^fVBAgwm5*ZB8f9tP)>y~{|wZaqt#L`<gXdip4wj?-uX;WAMi
z%@j-W0bUKsDr6R(Wss<ZZ$p^DF%xRZDzhg3)Odh>qqsu{xO6ASatyZWVXiqZ`)BfF
z6<&GnHmG{9Rphsr+FN2I2{23|1nzaVEWFCC4`8F)gX{olT&o_K7$yy8ZVaeP^M>)x
zUHC@{=ope_XEq9ShBk(WpLW*&sWtHj^(oHNd^$0KO<De{-D5cL7#qCle47Fg?uf__
zuDZE!R0y~u3~}&ozU;x8?WId!X*Nl>9An@u?4*I$oa9tq6EwmoHr}I5mIBQCB&#Ez
z>!0c{j=+n<4d`^#6u5U(1{qs6PU|e%b#v1uz7(+Unz^<Q`jNWlO`*k-&SMr9Gy>cY
zacjC3@Ya+LWk`X&A6i~D^Vl}QA%^`W0B}D=M%{358ErqeOhp(I7!qGKDUvHckHg4u
zfAl69cJ-c_@u<J_{<NnR2mD3lYU|1hb>SKvhD9JrhLZn@hCFjBN?r>%7~xj7iB}%Q
zjki%`s^0;R4#YPwMsH&NAUt?IHfwan|I$PJWLi4er54;eZ^Zj%jkW+QUK|>NR@&5H
z-%zA<6FDxdw114`Nh;IWh%#Rm_^KpNXVRLoee`LUWEp>gPPR#n-c+$4VGPndRwGe~
zl!g)v=G~}V>Yh%ga1>spYk}q}>y?IuoF#Ln{U*oA*${|Ub%`dvB#&t{Zq=$8GU4=I
z&skrn@>Rl##msHS5CW6wy5`a3fnRNbC}^#)7nGe`zR#Y4`fji$B7ERYtVBA(94^v7
zsnC`g2b31v?nL2c?2nHF)*>b>nIV)!Pwyi$DwF(_Is6fv70cuv{eqf8X*eTJmAioW
z=&A75G8!zWguFB6GN-|K$RRF2x4xlu%pngCC`@1Tg1vU8eiRQ~=Y|6!Cxmb|GOZ16
zyoafuRg;=PO1ucr*}IfXo^a+Zg}xw4r#{Ngg1%vw5Nu0qy^&ZVCDgGN%um~LkL_+O
zh#*DRm2e6`pUz?K%)XS95ZMm51h1b`9dy}GsvyDBVYDld91O*F%N@Q`=%x%q(+v&^
zYy9?>TA%Q`mq_Ahz0XVU2r{D{m|sMRe!}iFDZ!pZ!IDAS13peLa=bL?TkzU{AP*1M
z8{SL`;mzAa*juO#&Xbk>fVJ^p(1FufV6XJXu`2*Gw-xDX<`Z&@4=jr^PWs|q;?>?t
zWMhq5s{`G9FIi*q7y!4wp%fhFLa=l$rP5On2Y_pcSx7BAxpZQ3o?z6qk0jsd!R{)u
zNQ$AP=78%&LaSf<^>AI5=lesc1HM{NixOTVqoAgHx5vAfAOl%l#M1#15B>qK6Gie`
z8Ez7+W<`84rRU(!6t^Lu+)Oi%m>=E`b2pcJ&2lSO?KV&0u(<3pJ@7|fnJGQ;qFWp*
zn@A*avFXLbUIR>|v6iB)hOjCuFm>Gwq|OucHGja|@;BG(?S_Xvcr*G<Q7sYY$ggcn
z7~Z4cvDNa8Q@mT9&A~beiD~o-s}~^zaDX-2G5>N+J8y!dJx1)VWVI7jYEj%{vNw-v
zlM?h^-VxpROpyviUO~ErnU$1Ej{MEW)=jzMV`KS{-xxxZK7IlwMKNu-&9j=7PzmxB
zn{S|W`z9CNH_+uhI%lteYV}Ry+Xvh?)m=_4mj?W%&A0FQv*tHaYq#b_lsg3blF2h1
z;~jjSMgA{^kDDmbviHV*Bp90f#S&~{m(?iYI*|AcK80<n>w~vTXSlf<#~(&k38)Y}
z8@Q%rak4?Ukbp5Ui1zOMMSx1u_sZt*DoyQ?#6flyK#dwv(ZC$n7P*B!U;Y7_5i7u8
zbaGC``mmXuFAkc#gG+VibY?I})N8^=oFc7KW$_a`e4b?jPyh!6n*d?r>!CD8sFU}i
ze164m{OLmM%68&s)L2gn5mRU^1^N6Y<&iiE77Pj;1u52fZAcEu8GQ#mbo~sKhNEc=
zl`|18zh#@@&&n0-P#-vV+OU}5`W*a3eEbLm<=kkWZK<)GWOcGVUsXF&2z?76x8@AX
zuXbC~b}Y-*(dG;|dTAFXj^yJ{7X8ya;|HFOrp?l{ECd2xF5?I??7?&5<%w2ZP4Ucl
z_pJ5JnzF9fgG6vBMMaAI1m`#;0PjL+xWRR)z8Vj&FS`9!JOHx2GYFx<LIWO<KMy#^
zjUpmlrEv=4O-()R4evnw^g5htma^vj<KVgYGCucEyZzF<Kj^PX`e_IwQ7t04lFnfx
zAw6{KPLow#eeQ5oTE;?GYH1?IPtER#HTA80Am2Qfw}>%4ZOUB|3!Vi8C_OvsX|O;?
z!XBd6VC;m9l2J|IJ_LF)mbPWKSj(!+L?u<5afP;NFfmF4NEa^&T-4JR*_{FIn<jnL
z4m&L&Hw#SgTI7AA<GvdduUloa37^87#k}+9DW2k9nA9~vWe`lSPtRXOI~!DbI92$=
za%M=4OMQ28W#~CDdjLJHjTDK#o&*IF=02suq^dejo8AQZKOL=g#Wb6|7J+kO{K5D^
zhR((Zk=cS60jZr)j3Eal!Nz;@mLcet-N0LA$6Mz?JGYP`0VYt{m=NqlW9DT*GW}J^
zl$n8sl7m!}K#?l!UF5g2CAj+8@35&hICQ`dXbg&_5Z?5lxlhs^PcEyO01^iT7T;GQ
zvIi0jwY&|Fa>keYS_ik8l$783Au7|A<R6vY)0J<HipdbNJL`q)A+Le8H2_9n^2Ock
zf<USyV$YlnXtX849op64cXi10V{t1*cYo>9gdSESTHMssh6cg3`cU}WhZW5Q5TYrE
zO4;sH<EO$3J8tx8uh(JZSp-Y^pYXdvz+E-Nhc7VD+EWQR1hP)FH1*eX9eD>M9QGCD
zRA!oO)T+F&<!G@}4F~gUdik&m2V!>qMyc3KGuJuHQD#?7`UetaL$OBK-TgR&Dk2gN
zU=qzm++~WOgqL`7g5dDN%;YzctfFvQfdhyn0(DIUIetroGvdG$Q$>)%b}uzd(GFxk
z4{~vdv|xftFhfpsCClM8F-dsJNjeY64Pk-1=s<m6*rT}rmMPM%Rm>f-OWyOk0&Sr+
z84IaGKoHN>@yjls<%@W*IMF2m%=^dUv!}d;zhw6Vn>`1>FCr_C<K*6XDFGgs)Vg^2
zcZ%DRtKMYdI=?}zNUD`~GA^r?P$}tTTudmdmF9|NeEdwNIb9EFv%7zXtOV$Se%+xb
zys6Z@y-dRYIeVQ=NWF3#N_+okwD$$u0>kKh8F-#sdY-EdbLDBiEYN|!_B3A=>cZ{x
zJD`1@JLtsRSe~O<ntLmM>ueV&Y?V;rh?8dLeG*T8Y(u23vjA1_2cJPnHVto%<IPel
z=P65)pw6-BIk1V8yq)%-E{B+csC;B!QPFLtWJ?Jx@yG`zLsCy5?*O8BQ(WUj#HTP6
z4xdqK=<Ds=&=~lFuWptvVNPsL!yK;xNbO11GXJGdR)6G~1u>U9@;&(&x6uItXEGz|
zdX$wqb?O58uyjW6KXn3JyQK9$EYTml0uWzuSAbGe#5LC|aIm2%o~GEKteW>Z)$}Gd
z1K=<3;RG&*IogAX=Ycam<1v~yz#`J2XHCM&*HYO-zoOE=(sUbN-Fq(*|IWoXY<+<=
zt`=@xI4$IjaQ>FCD&wyUczdhVa<_U@OXW;;<C5IcXJh$mylt4C1l2(lp$QJC`-J9{
zQNQexK8A!qj&Bvo?M;$lBH96|sv9e|E|U5_Ut9H5t_L{Np7*zo=Xeeo)u+9b4tVAS
zRM?vP24bU9)Cg3%I@$~NUjZ;If+i1=)RlAYMWlC-W?r`D*1T+$)}IK?#eI5(HY*J$
zj13?pn-3KSr4cVSR&dSiX-fBrtL|tPl+cY7jWb-k?(`!Xa}9hDD@)~wb4MLssgGl4
z%?jiyX-ITBVi^u=S%@?bofV3wk?Kd00~Vm2eSmHRdarzQPij%((|%7XEjM%)NMs3l
zMK8U+7iig$cE%-vfPatI%4yVezjwBs>rf#A<ju4sODjC>9B?EJ5XWL9H3^$+&_>%k
zeZP-wZb7j<=~sX|W=vUuU}V*SVX6!QL-QRkp$f%mgw$0Rb9aKwlGHzKW#A)+;$8)b
z4NmT@hvUxceSs~L&|t1Bl@3(Z)<&IZYhH%jqR;NKIL0BOyc=o-hl!aO@$4rtk0FXO
z-tyOUX9kyRm%VeUE#7y%h~<XYwUORwN*2CdUVw^5F(mY=fVc~tl=FpvLXovm&f^rx
z)udJ~+h7LKNp`@nAPL{(@^1LifZ~fr&V{K!3{Ei>C<&(%bO%wTQ~HdtU^18%S(g@>
zmxw;tD#0pgmwsx!0J{_53aB2spB7+O0)SUd#52t=uQc?FXVP3tJaLFylAl8_9m<?>
z5H_{$tFiLz<LYCCX9ykHlxUG16~yi6^O#|brt%ftSH$wt+z#2rBaY*TU`!;ndFkwl
z_j+Jgx2QY+@`bQv6}6&e-sAnveXFLrQhe=I`Se)juAM3wDLBZcrkPtO)R^c=7f(@S
z+`sVb<VhEWfsjyZLb=Z35@3^}kAvN}Un-fbid@X=TLSBNH9rzSUd6faOLY#iz48)i
zlE-w)#HDJL^7fD2d0+b?GNYHHvIDZH*><WW{qC#dEne~tvE^L~S<UiZuKeA&6@8I|
z(>2_pGT@)UoQl3|%NNySl%=}*2(pp@ypowZg;V0*QtM9gnN55%0}+ed=!v4+149R0
zUYeQD%hlg+J3hb9&DCAMw=};5koKw+4}L9xt^C>c7}MDp5kE1i6oc_Ch0L}B%@NMU
zl2~}i=q1L;vlFk96<Ehak{0mdM19)&grmjyHO#wKj83%Uzh(2Y>yqBZz~)akXffk4
z@<ra)nU*}wc_4G4rNT1=h8)b_!kV~NbjN53iItO`0=eZNR6!Y~tHBfWe<iiju*|dD
z)Hwh^h?GS|4T$GBPsFu>4k<hBQ*C2IV}rO<@5}BJqrpFkt8#XR{Y?&+im!z36s_H^
zSJ@t`Wz@uwB?M#!aIYEG4z0R=-$9SY=BV^`hY;zh8X!c<tr<YD{{4Io-P)=Hf%n2i
zcGdyyHe<XBjr(dvJnJ*hNKzXobqx>%y99~X2{&qTAwoXP>3L@Exe`Ll{9Ob<vXwsv
z%rOCP6(my?beSz=Ne@+?iKKpdcQya@iIUXa@z0m%JvE7b?A8vBH*Ufa+Q{;X4jX<L
z2uPx8RhOSZ;bJmH*VeIrekh><S)GZUPYGzzM6S(IZ>8k<5(n8Wt21fgxUbpw&;8Si
zs$)N@K{gJ_b{4IBZv0ri0QtdR764w4le0quGL3Y=j(~83nUgUJQx_#Lpjhk7$vUx4
zYb|-AXf3Cj6EEhFGDVHg3(5d>Y>H+Zx|KRXQhwBKIp0LfDMfSo-Alg&XQRPEXKa%Z
z-aR0BLZA+rK7y<Yg%r^NUheT6-vOa#?;aGvVhTKZWsi9^lCLvG+ehs@{?;7v^_YlA
zVG{1H<CX(jhu=2*mkV;oe*QKA>wFM+QIqz-_GrM>;NgW@0V7#bC}l#qBKgg5U408*
z^UrdhxYZa8GM$FxLDUGF$#HkHfrOcW(UI0OWy}I^fXQU8a5aB%De=r?W`5Lk=tj)4
ztRUf6@2J2^F}XL$+#Pm8R3hnlCr)<6Brqn7Ijps8bo%qtmHEu{_OWyt6MTY@GLf_T
zfYFn57fL>r8j$l-HehF4lx+7`t8^2yq%tJ^8{3f6nTh%!VnR6Owc;k#cIT@6zclsF
z<&42dkQsX@a-6oFFuy0-(6+otk`_=TiYH{;;T{6-9G*gjc+>6}U`IlpY4lQO5|_(F
zZv1QFlB#-B`g*TbW<2RM>w-4}V5*cy8*kMEwHT`mHyHOAy)x=b7p?9hD;&LC6_@T(
zpdW*2b&@t=H|Qox+)`3si!Wb~h(siIRt`7b3W)={aTjR9Jf2003cF8ihz1FF%%igF
zLY-%JlesbfV5%Wdeg!Mq&iv8bV02c!6=CpqbUq%`vWUkIUKpNFJb~2dUZ{cdOyV-X
zAP#D*P;A43*XuAcErj}(>{~`AezJN4Y;b9H5o7HQR#TF=C=q#%Q_N6wxx=)~oagid
z|Cgz<ZE6o!24&6;i%FReDxXiq7qyqKVhk5?SGsRkvGOFyIhxhiaHe`#bVFn56bZ@e
zXWMRHos-I{A<{lvq=cZxgNjzuQT5C0dBux?YJgByT7WGGZV3=Kj0P4l?19SgtD?2%
zKnNSL14B9bvDI0u(@=vXdE4FRU<yF=F>~-~+?fnlg@iC2vya9(VvpEE<;)HTF-?Va
z=YFCPh69CSu}*g}zz4p^%bD~x{XFj!8g+ijJ$_C^-F)~3>zw)FS@P)KQB){hP%86`
zsK0+3OEQBV8KMI{>3lGQ8d8sU-1~0gU`NV}I5)Pf3ROI<v+N>g7_lDo<1>mBI$QtE
zqy40sTy^53zVjcLTu2luZMYS?>*KUz-+A6dEmz$RA`m{5l(D29%%44}<%Y&#PMKPH
z5?+%4%8Fg>3LYEgBPP5NB3)Oz4d5Ky=8)qW>HbU!HCIPxmXYOX(RdDnNRS^>N&c(u
z!#isxLq0B?x65e~_-b2t7HD-&wVXt>4GO&v28v8Q3?e@!;DWQ<jfrI<!ETTS!mDe<
z&vlQLCS=@~D*zUCe}^17HB|D}Uum@Z4e~!;3rkY+-4p3gT~zS1qCzi=kJV*lyjSOl
z0Ly`E$`foajGPbmJ$RrF@CnWSvKhcXdk;K+&8iqa-#u0ylW<?Z06LbT>Pzm~8m+MP
z6&p%g%80W_IM69Ft9G~PDVqs$R`0k7N2S|Fr#MX~7UKt^g9+9RyRaKSF}$45YUuL6
z%F*Tbg9v?&WI9}j8S#kI9a^IWKE#B#z!e5X3aq`~tBV-`Q9zgldvt{k7e)@l>8K?_
zGJD&Y4H0YUosuc6H!l252wU{HzBfGnT9s*!Zx2A>re%zda4Mw^KzDHMKPqR~CYC=u
zL@~}Jg(tWklSV)iZ&0|9fn{XcN$q=QlF`Qt5OK$|g(rg$J;~RFB#UPS-xkq8RZl<O
zK{u|2MK6d@=Ez5!fJ&N3a|&2$DsktbV}c^%ZrH-yST?FIR4OCC8n0YWUCuRXua>ON
zpIbg(;eNE;OzS|{+)L^Hl~V%)rQBjtTHy|11JEe&^q-*dKX4+HsM?k?ibmy<D~>if
zta)tWCw8^$g~m3{LiCD!GK_S#d}Ew|)jP3q^XBoaar?Y#Xst{}kKWfwSHweyaF&2T
zAt5Pmsv1Kdx7OS1NfcE!2pm0lWj3u4oNchE`Kl%~DNDT3626eMGAU84u<8-&ZYQBK
zW1*<3I@xM&NJW-U*zRbef2Yc5DduYx!A(~wR%f6ffO5>}$;^?HaO8Gtof9sb?L-=3
zDRELwfVxAIz^fKkO9J*bF<TcR-Xe68__1R#Rs+}(1<a>y!ozjb@A_IPRlPq<;IKmR
zq7tam!EJhWQ?U3OTnOGzdK&5zGId!F(yfB24rA$O(W_zsO?jT8Ov)_fze>8wUvRfj
zFFfsPHOV9KD`7n~k!W?t-hJdy$Ow@#&th`S&3VBij1(UHkhL{GilVQwiQwb>!$=9h
z682$bmtawUgp}^uf-g2Eea5sAKlQ}PIKQu;fAHeW=#`RVnwvM-8($sNnT4J|%}K6*
zsZCQph}s^sxiKua4`+eo;<)r+V!*^xGvvi*n)Ol>iI-`q3NL1&na?N&UZ*hg&Y9vr
z8J`_0S(5fXGM7BzF%p@=Sxj2^tk`h^Y!pJNLRq0GA?}2!&dprn=sTiei+VyrHF|Op
z8Fj)^uVC{cEEtnNT0I4w!%^Qcw!M}rL0~&*(39icKobL<|ELja=$m@UtXl7E0U(=_
zWH=Md?&Bg<Gl79IwR>Q!P>fN$rA+Ap>q^pA;`kE0Ssc_5tEqMamNS-5mm;s$7uD(N
zrnccwyBpmmD&zPE#Ao_e3^fL(Dq<q5R@J4Y5`EO>wqc`Kvc_R$21nTPUUw~Z?0p!g
zQIKS^<Wd=oOc^bc5=Nr}C?VoGz1g7|at1oOr3qOmHDQ6D_}7eZVFF!9OP2PHOp0Vd
z23zBXj|f`UOu3QXLh?BAa4@BKCi@aP))vrYjl(<sqBXf@!Fd2(+fp`kqa&-ES+ax~
zLYeV0cE{wWcC$0dn&)Ui?Uu5DccQQ<7MavHu>vcUB`!6YmVG5VcJ%axQ|i*ExoM1i
zqpn-=V)KD{u8JJiwU8O_TA_rQTE6p2d((QU7L2xsiq%`qW9g5%`NmBvxH4Yl%T~9|
zxrfyE(|&ojn!E-BXvSxOZ9)WTucYa}Hk%0KmSRS_;y*!>xL;^&+v1}3hm<LUex(bn
zC62lx#{wn9Lvg%1WeX5Y3KlA9+7-p$U#!Xsw*^Su&K4W#vT9q&rOFFc9vDE5;Md|M
zdv!+i%=NfyjsvI9XV1c#1|-N<lqmwP%#mJLiX3&qb!CahS~v0A*NObKmmNaVEOVon
zPv29)Emu*=oKP9{_exTn=$IJi`o}9eM=8=~!>xRTOd}qQX#{Pf2t>3Nog2$2KKuZU
zwx!2H;MdjcC+|*2XFS<E)_ANQ^wb4L8w>|RI5Z~;nCLd(Xp4&bKHQAxmJ~$`=XMK_
zE=lLYZ#@g=Av4*fb++XXjT<WK=e7wIS1{nNsSNZP18m19fm&#lR@n0So-J>7;C~6)
zDFQSIn79ZQKT5Z>?<Q->lsd+#tCcYekQjE1+hWIeMM&E_qAF<(mXoYyd37zET`$MJ
zzLN`;>y;IKNLUIpJ*`F_;1oS-M&`%(q_shnJC`?7G!)Z#ayMZ&RoZ52I^R=6@&=sq
zPKgL|dq~Pxsg70!Llt0+W5!RbcnBoMqL~xUokF;bTFBmFSe6+_QI>PmYt1~dQa`wH
zGl*QFa!3K(OsrI%;RKsj9QoU1!{9JYAZ%8BbTxY7iUiGt#b49q-(0lUIb-yBN?f8O
z{gxvZh|M5>WlS!W1G&g+s9U_l;gX@`q%0&UXj(W+%t29)(WVO04u{c245;`irYDp@
z`eJrD9|<m4ET^3(sTCs&P31GMfB5flq!W$wGZ|e322_v4xl%8KL(lij(y5ia@JuMM
zDx0W#fWRB)^Ly~$Y*2<$lVv^|sY2rdgx_8BqimK1&BUZ6iQZA=lPwD8Wtl@unP<*}
zS*bKjdmz)sfl}VZy?8N85G9^XjC|~Q5){y|Dud``+a!!B=jVH^tD$AN7E-i?N%xOv
zKO4vsbi+~htyx!qGnh#GyCN^rtadU`l2hoVDKiAdqfMzzjY#ZyGD;K26FX=<l4B@*
z%C#Dk(Bk!-=ND^4UOUg^0VXMO08SXNF8yXyI6abd`y#WoMGE(>(sB@jMM5iJv8?>O
zL5?P1*w)SgQBY9QNZvielXFOBk~)e%ZCH#~zdBD|tM&U&P@vs0pw?&v0RPH?fOeB~
zn%wNA!UocTi@MJJ4P&@(4GEdVL9NZpE(_7!gqkmN*pl9B*{TPp)+Ak|%3v=j+f%Sk
zG4_hHW)5UdD7B**MWgIh%oKepiA{fm=~Y~PK_9v@TTks^Q}S)c|1_0HtvS3BfplR@
z;5Hl)k!TisDDNjH-=csP$9=!ZH@(jHfX6!!JhmQVx+C~rI7=J-3p%;hp3V7cc~M)$
z=fHAH+9FdIZZRFnOF^*(x^%3|Wo-?|RpL-7<)lf8b{EJce2sR<b39(#A_<%5^C@$G
z<|3bUdViWbx@&UHWR_r;t(5L1X~4%Lmu1;zBP)7Cf$@E0omUypqGS-}It$$a)tp>)
zNB8^ispt2vTYmTFA(jK$&I58TkmipLhW{3FZJ-~1n##bI)IG~sQW6e`WJ7SxK#ztF
zXvPm(PB|V}PAn;>0Nxq1Lvg6{$2t_5nSvx>{Y-ML<!Z*-)GQEhvI-XfDY0G7(PrW~
z`dG4xnb0RE*Zza4D;n3w#5DDmaEg=^<s=Y{hjz=E209Nht4%2jS!p8;RgfN~l_H^C
zeWSVoi6=pBJ(5k-h1#lMd>sxW`aU$A9eo4gdk{k+lrbHcPY3?-Hm)~Ag?lRvonH(`
zCrb5rYj+Ml$!5KK=6}=@GaK!)x@|VnUI=^UTh%aK5&hp=dXgZS3K1fXJ|NkA3dvlY
zA-72E)B1IQ?8pM5jE30%W^2<9J?nLW{LCS#JIc;=d>TRSRlSeR=Da=saDwS6Gr*W*
z8`QB4&&Aq!E0Auf7M#6?yD5@mS^bG;<X)qd7J-_qAr1a7{yF>h<`&vO(~$*5{B(s*
z(cdRN!+JNol~!k`ZB{d_;Yax0TcQchEwTFHBT^w$P((Z`a-A7&dRw(vQ8D*hu!~=#
zgv3>YDYcj3ST492ja;7iZ_rHT_oe59U7icLD$;bHvpS`%U6Qy8J_#P+W^6@^N1b2Y
zZtLDOR!=t4PV&Z5U#^^zC72{AtG>q(Pv*`(J*f#EuDxDPynRp4wU-0t5wQQX+V-YF
z=QqoLLF{^W9+%X>$p`o|r^uGk%410>ah?M5doa^8*WxR`S@>)qb22nHo0R9=;>x8I
zQK93eIHkyEvTH7I7fh<>a-PZD09cW)Qnq()yT47~Fda_#(qb()qvTc`Pg=82ZgW~{
zZy(mf>uT@PefqBZ-Aw)<#<csczsBpqzxVKG+Z+*EQctNWNuUN1$SRjA=h!OJShA&>
zRGl-YWSQI^6iJr3$*f!GjmYUy@=fOEDf<kJ&n$M3k5|4X**1*IRY$mps~V)R#2d-s
zs$V)*gAabd?%KWi4!KDkN7%jL;(ET_$=75j^Vk<TGg1$S@oL$Rg=J_Z?6qQ2L#uhg
zHcUL$XvLqwBbZV!-2tXIu86oNZJ3Zw9Z$$(;J};A@9$&&QBcOT!OqFchq@C<65C81
z<v2gkNIWi(E*Fy`1{*jL$?Lp=w^;#8wJjwHaiW6N-s3*Pf|lu=<B++W@<i_qU4FTA
z;_6P>W*C5_gB`5|gBJ}O*vrCJFX+O)>VToZ!z48fE~T5a(*&ijtSpgVW}+Q92lm#N
zW-I-$*|B?+^UYFg3dgov+5f2fX7wxE+=?Oa&fffbhar0nzt7PKXc0me7|3sB>jJE|
zceD^^R>fva)CE{MKF_k+tgvM|VxlU~V$DiCut&oVX-VLAvy%1;ySkv%=Tn%?C+;4P
z5Y&1V#yb{&=8kgfW|<>Oj-$Wk5}?lBJF^tX#E6kw=oIV{FJ@-RSNE{^$GEgXx^5<@
z&BR==-am~w94gPV)f-9IjO}@)v;nKxr2IdB;T<!1CBE(iruChLp6_xvPU}vE@||Fw
zj>+|3ln&Fi)$3wk&#tV*f=zLUS*-2i)<$ln=wN!GBA+;qDrPILKH=3(xm*yp<do3|
zs$@~3G+!OymL4Vc?;MKhCo!BY8H*mzJ^!vUWKBsj?_!Kf;-KtFBl7{S_;nsGteKC|
zhUr~!3gsm+3$H2owu=6{96C_1$jfp|EyyBxcfveLe}0ZP<?zHnwAen><4f`$Vh*uH
zd4+^x3wH}j@uNep{Q26wXJZ<c)4wO&&r=8_bQ9+Mmy*{N_rJ*o|44>~oSjx?4a<4g
z=FU>e;)xS$*`S@zs~v!ifoF<LSh$+Iw?)}bmFqfv-rA-ic9G;vs%ifr`X8DU$C3d#
zpbfjq9FnqY55ADepJ-<WlXOzs+9&!7@-4oE`v!7Pgx+haVh>xi5x)LnNAG{6;CLS*
z=LnfC#B;qDmD`;%LoMLa8r6^Q$E<075+P9`$J(`{vXDNj2gBTl(D{eX?UV3Z;ep2V
z|3+u+65yn;rJ9YdUy}#x6jG;HlGytC)Ht7aAf4y8u$uKp!S7tyPf``rC(-nYG&SDY
z9A6%zQ%xL~>o9}5kG5!4-0HkIFN3_#C*@(<?ubJyFZhS60cC<7e!Ltd#MV9`jHNc(
zJE3B&%@!JfHAxJ=9$3uCtwk^ZhAW5cm7UO`wibaitxEhV)<5A<6*m5-@CLP|RA&xC
zG;~-_OJiDKlmSrub3(|g|COhhHcGdgo#ZV8>b?<39F}xPScnqv%X>>BWb<4|<m<QN
zWeYtxGp4z+MupXyh<r@UMnE(KP7-OGmg8|2o$gI)DUPt_H{WA8kz~@2byD3lc1%3d
zj`3EQ=1n~Q5?rtg)A1AR!ZDYW{PE&vG@I|y_!O%40;dM_Lr-y)?tgP~jqbonG1e6$
zsZ!^Ftp-fj28FT_An8ezOpUS7uVFaO)Wh#)u9j{tc5GE*j>Ju}{U<;XMh!utZNL9R
zK<}b6uW(`n$R56qqJOWP3+o}#smC;h05gEhz8(=$Z-}6yruIla3ggnTt`dTba~I>r
z9au(0tjhn3K#^7ra2GZ@{wx>y+cFksN6;JVv7(4$CU%$1ivXJ?{@rE^XY-HNErwfO
zWB82P9+&GHD?1&p%MGp7o!qgQ)s{B!)g8`W%fD(mWd*ii5bMeUKJ1i>Kq=OWM3&i3
zy|N^j?-Dz<B@2^ZhUSvT-M$l@43e3U8C|P}d(~;Bk|ZjWkR*b@QtPG4Gj;4yzk}Vz
zpM%;u4hs5ViZ9Tzg)s_7sxy^kGh-)&Zbn+9HoX{dm)A#8HWt~dvKo2=@>8>pIit#0
znjiDvmDwm&^uy;>Sd?W`k}xNB4vpsU(#0ui|F0A)_5MSO0QVICDMek;8`}0j?LG{<
zn9L*kdP>aKD~HN8Ll!`yHJ>OQE+4w<W+D%_o|;P=9lJ|Ut<}xWoflqDtyfCdo|@O_
zGajN=7*9JOw%yjL16)GX5I$?EBkO{Z*lPLl#&6D)0mzh)QdPj}^uV#<PW_Gc1)zJm
z|Dt60li>fLWHEcPWN{XIqp-;wXc-fw20mMfBgM<PWfN>?@18gc-O$W_kaAmzbxJ98
zFG7kN<I>FbQHcVjfVS%YmgJ+B*ohHI^VVACe?T(#&woL(rR^Uihfi{1MSsBl(~%=`
z)GmuFFE$>SXDZ2HTnd?SFXf7uXyiJvvv#bOZUMAClcTA0RB>8>M>dOX3b)fw3X3dV
zCmSrQwH>b0EmpNUPCkay&+9q;I!@o@nO3&}YhL)Zi_>jZYb%Nze(aQ|Elw*FLCjhb
zmt)30<CGbYdKkrm#Uv?B8=A_d4|{Fx<87cx8VkZDcX<`fG8NgYvmWw*El)*qs};<H
z(g1raBx;lve0{Lbk6z^<bbyzY%A7h5N|}lhbtfhe{#}jKWKjQ}OG3a@12pK~JK^eb
z#i*(`@-YR<VC(Z|$8+%$9?*t7Da4zOW<-qk+`k<ExXGfDA2S{HnE|O5Ko`hQV>~#J
zpt-=|<tvC&z111jop>J2&Kf%=?T|YqG6~4xfSAUdQ5COM!~h5^JNZ{H-m`gd@f#Z<
zA<m4sz13gsxse*)Jm9EQf~NIV=_fw-u{Ou;y4&hhhwFC3V|Av>b*JS&r@mA+IDGi8
zzcL1a`@BEThl0UatqFD)KHRw(Pp9FrQe^#-WY2!2$s(Dla&*t8EIuwmU%)T>Q*v(5
zGA3s1^~pAWq)qQ+Iy&Nefw>496GkhOyK2uh_Dhp*Av4w?Ggkh&Rq$uVlQAXBK94*_
zv|N}(zfnugcIUrv+GY6PIQ^LZq-Y_HElIqfs<4jzXm3gN1Fz^_NsJ%-r_*CDe64F~
z2B`~2(<#>>SDp`|i+P((PG%LK9uKbNG&l4(YB+wS!R&{w|3%h4MQ0L4X#<Y!bnN7d
zla6iM`eNI5I<{?e+_8<0ZQHipe`e;NHM7=S)T!HAtLmcOefECNKT+%;zu!Ei9eyj1
z{nbQnpS9;<x&j-D0vF};x&jw(hSRyJIK^@Mq=?3iJ_Pk9EE>CCO86s%#Rwy{k<SWk
zFs$02R(Q8vAoHr{0Ye8hBz2c?uo(#y%)W#yBf(2pA48E|IL48gZ;I80gYZZkh$gWs
z)GoM7iMaL7LMlB$GnJpj23iZ4aC%gT{}FaIdj2!)nr<)^DAOu8R}bkZSZ@B7#k{1J
zb4tD0R&A~x=?t11QyvdH5iGxHOfE^DI!<8>qUsYKX|bbR@=j8O%Whs<C#O|V60!JL
zf-F+1QL--4HcL=;d4Mcly+Z!6{TEQ2SwgLXbrCfSS8UuSZ;_7V7dn_~Edg&zy?)w2
zr>nl&g4@XBf)#X!xc%6h61%XFobLa*C9E4(6}yi3M=GDSw1$Wutb^Y*%x>ANgMGbe
zwR+Ocw%NKtH|taM>bQE+58HN0a^ZI0qG9^jZ;EK}^CJAP28;MZ@x%4SSHe(m1n9K~
zhC3ln-N9n2?Yg--n>Z)=MHA!sz=iNXDf$d^Env>V?v{y($Z}eukoEUJp;e%QzJf{e
zV5szQ)VwWPhV;_9@G4Lu&#j2IC0w>|RQJhPiL?uaS~_VJC}2L7?*9Xmm8K07OhHH!
zHmEKUCwXE-D_|AKrLRy@Zc;y_n#MaeWMZeR;x_f?$Vb`rzhm^ocZ{w~YdJWs)SLQH
z{huK1ag~;%m<q)yxCGg<IQ9xNl7eGbJ1@~pC`fU^ppTqT-!Sl9-*LIC3cdI`tWNkP
z8-rh)=@1RVx%|#tSVzeJw_Z?SwrgBh^K#5eL%pMZEoHH~(vQ%zsUxnV{tab}1|)h6
zT3J1B+EeGqY=G$X$=&nmeEXdL<tL>se+2Bmha{T)-^uGmT5UD<UjjX!5A)OdzyAF<
zcd_z$^Xmq?=U<6N$i!>36cV`xl$;$r`~u^6eIGMv1U4O=*$ev1NR5~6$K!C%uTS5t
z{!c&kfmnCDSkDo<RHev1ZcPW?fLU&0w*oThKGW%U9ag7QBz^>+-89w1z6XXkK#|Zr
zNaNL%pibs&(Y*`WC6Y1}ZqQN>unaMv=i+izd-@;W8Q$e9;*#*@U;ltddnw^MWhm$q
z(!9p=m}M$TZSJ=C#>}VLWy%mN)x4Eg$`8F@nc3XH2W`7(AK2YNYE{kW&z65)#dpgZ
zhqmg2ScY9)ZN!kSI_6P*W1N2)8?`xWClSOBT**m5D-sLOlx;}!CtW5Ejrja0!bPdQ
z8wo=M{MztGbaxkt_s^_W1T`>sji`&H_!vTxbOSCZ!HqLpM3ottA^}ML!rttZXefUV
zN}yNid28o|0coZI#{7R@SR{H~o^#?9H44v$LsqrqH3Ao3&^pt_s)PHL4JKO6p#{<Q
zdm}$)8!R#K(I>6(joR7}e8x!S#o)f6t{HeCiP0)|=OZw75dYfmiD)T=iA9)T`(GbX
zFEblhLzgX?e0&MDeFYyTR#@lL!itLModM0#cIH4p1Y!<oUlW99;KS%>SLOZI8_<`7
z60U5IKUg~*@so+$xcsHlJ^!=y2)0onmxZX<gNR3oB!_&Q5e_t9#bEa`^RK?Lo0$W{
zJ))VZt`cp|BN>+ha`qy0J;fbhV4w113*td_cq~Vb+c9lJv2ufr@<PXW!{^`OcpF+s
z)#u|ugge$+5=%(lCn;KwmBhB+D=7Hq)?}Hnb#XC)*diB|ub!U$?rTyDK@RVz5&WcF
zYM92s>F&pg?(!L~!?J$|)CSv5HK;qH2Rh=5)layD7{k^NH7BJPVcAi)uEz6Xyz^qe
zrt!{%r%}=cGfP^b0m{emXMI|cmtlMFtxl~REAELpMQ(NEGh!bGTV^cj;eJt7n%O@}
zfi-}*+0-n@6(`=YpY>qia@LONg(50FMr1^Ua}CbT^9o!KeSH7o({$$3>L7lf5;CW0
zs36{U;nIGT=Jl*Sf|562D~@r1Nhh*By$Va~rg;_obanC^96Qbm%@o+@?*SUk*`Th_
zZ9H?a6z(THA$4maJCh7JKcNe+_FA$ktsu)}=O<zinY~=c6d{H2yb`6;G&M#l_L`}F
zcf*XlZ>WDs0O#h|3haUoI{ipP-T-&yv)3!9un5up=zjJ{C()vXs8Ecf6wsE!CN}8}
zh!;2#2^#}=PRFlk(Bw7^qMVR{AI;_#Aj_5yX&=#=Zyw}Q*rFj__baa;L%jQx>-w6V
z_(Pk+^5ak_4fFR2=+Lk>;;lF{V6tuu9}sisvYo_|2ngz4p_*Ce=;r=x{;V8-6kw1-
z`qATfVFW#tH)S!`Rqt4gkv3Vj6gd^VJof1d3pZ`s?_WW)r*+lcG*?Yc(^967Mb6PK
zW;aw5=qJau=ZZ(A&;oNDmE`PVDstm3rOq^7T*99Z3R{IK?E9^E%U+qKvA&`jF5kqr
z;BitUwg*lBiM3tzybuvBdH=N<oDg>({u*cDL(q*@(p1C9B+x$?t&hhZRlHo)Bo0$7
z=rf{;3qh+;rr{((ezB5RKJ1DYKH=07Epl$9P6ULXXaYz@rR1%ToQwi@T2ln6l_zC(
zpev0MY7DvRWAoCb{0beA`mkDMnKr5z<g6}i_|O(Y0@0Yivj2GS*EXY|d?Nl1&L1!6
z_4uzw*<h+c_G%OQM_3$s5+Kc#YP!z;G&RMNsVh3I7-*M{TGEmp64qsyc@|G6qjNzd
z1-CJpgV{!J2VZibZSd0sM!59TtbF_l5?(}8I-NAh15CHDTV-4-cogf90ArA@>^TSe
zd6d%LokW%t#)u^g$)jN1?Ne3+EY+6>OI>EHUahrJS)TFTB`+RJW*{=(vArC05Mrie
zBW#ttX;=(cll^k}?yl>0jPy-M^^9vsHLZ*8?xst~bOym9`O9(Aj$0OhmK#GnrH2Rp
zmkltDs*#zTn?SGY{=21g^FS}^N_Lp)k>O*$JUkxMf4Gz8)8gOhuc_u`Wvx7_<B`2L
z>$BD*6R+i`6qnD976<TlC@I;g4F@oOA+)3}4yyMI)`oi+z2%AAxhQAio_B<|!8wLh
zN{(0lW5-`90jOgp2H)+fnO@mH9z6_=Hq_@!oo{v*9&C-4uf*!C)ka_M^}qI)^}oLC
zfhT#tK8BaK9|E}$t@CIafBk!Fxfb}E%Dk}uu9+@hCxW-iXC0m&YbxLQUiz|1D;o-?
z2C7Qk$@ZgYS}#8^s8hq;fj40<-RL)^YxphnX#?E27II?6@CHBr(7O-C--8GW`X;!G
z{dAk#n@f0+^Kq2%oFRG~yi?ZrwV1}DpX9?3E*NfX;)yzJvhf8bL9UX_Zd(49iazF@
zP+|n9fV{8b%1-7O;sEoN{;CG`rKeYq@9eub_lh1ltWYVTNsUw`Qu?&=XMr!LCMMx%
zS*avQN5Bxt5{|Uq32Kka+%=2mi!nye%FjGC{9l#zsca(o2(%_FLyO37JOh*SQh;_s
z<CFS%;VZS&WLLsvfjz$_rJ$Hs_y`mBq-GPHuwiOxzwj*$gxEOiom*uR@h>zrQMoS?
z;hpszk5rFD#mcx3l5y>V<Tr@Bw+C4D=bK>5a;e7nv(aX)QWi+4y1?*>A+#JiRfj%9
z?dR4<PTna6CgN_~@KxPvh97o#bPjG3!>}03pv0h^S8GNJ(qo#(l)A8SX6mfCSk+ZY
z{*XJ)@{ygOHME|U?8*JyT%*2XNObW6e|P%A$j|C6?209DxQ-%Wk}k3*00V2HG~+Ed
z0DWGnVTBvlBvYnW6b@~Q<EgX=1%yBsbq%Q>Y<f9my7jU`UakupQ^Xuec;kL4eTFF;
zw=@_*@AO0a^8@yf3*Z%1LRh1B<l*I9Z91CzNkQ4AYPZf&$>gr?(6|S4yD|!MT2fp^
zQGixtDH8QZrwRY=csH9$BHC7=A0BHbRy%b!@{f^?c%qAgK`2vsqTGH)bxVqFj-5s&
z7<JiGH<#F7PR4!hCXq}O8R1d;Yc;en5g((`5qGtSriQ56>77>CWT*UxthL|IW>o1D
zw;gSTWFuYF#Z!~m77k_liA^VuIdfrX7Fk=8o)w@w?KVy)35RXNhmwwX4(q?#!<B|I
zBL?OiaJHxF!Np~eIKgndUfW$UKiNj|)RlLwl#$WGT0T=odz*V~v?N<1I1gFu5v77E
zU9W1Bl$>~GlAVGHQi)X>dUD?&XLD}>i)FKjJZnOV@|4lRmy-^}0^2t}+SIh4ISJg#
z*CJP%nE{~z8>74+nEbh&Qk$kfwsrC^1PuD>&i+$8*Zn#@tRu0*bd&zvPSbt7U3+PB
z<~;Q=NptDf>wTK1=~0VFR>Zf8X7wZBn+5uV{_~^1M^99^kNi;4>?-kN{5d1}qd_!z
z!TD9`H=McFG7@%~O~=1eQg~1e{sx!`*-oCb+e0p03m`oA^0&UUudv<yb@`6`4Khs&
z2&7C|Y~!w0acWAbyLBR7&d$t@Qdua3+;8IxOywX1Iq3!&1+l$`f73Vc?n`kusOE2)
z<UZBRJI$jJ^U5|!QZMf<dEHlEo4(0M7pde)z5F+>*LyxCVUdl*bHnw6qz;relDqB@
zuDU6a@+Mj+lIY{5i%BlBl}kdQm%VGoT#34)Ws=7CAqQ2MkaQkk7DlKk2MMj9GQB5J
zuR;%cgq$Ira)RYY?)NgPx*LKT?{phl7iP~JEZ2?!&+}A!g+t$8KUI+6ZmAWg@%U=p
ziqAYPTumT)Kd?4^M;}uk?Yetsa7gyix9pItrSAAO=eYjF!%v~Tefu>>-p6YOeLJO~
z8o|}Htiy>vf|jzUiE=m;zzGGLfoaJ@Iez9CJ3FJ$!*Xnr!N2#2t^mRP4~j4W1I1cc
zoWQrB_0Ec>{XM$;BwR@5L6sEVLLJgav9TCU%D`H+x!H#X26bnj>w@g~P|`!{EJ<`=
zTzLKMv*&G+n)&Cn;=4+`)em1Tjl~=&%?Q{zVr%@a#;&;Pxik1E074E(8jV3|k&wDc
zs!2ruPDI?X0&6foUqZE*P-2xwmv4hXYgEqdb)N_KGJnB|B#=<b7D={c?iYe!E0QO+
zW<U^da}+aDWK_<>Z-)aUbjF3=+}$v#U5Wd&ZcJ?+R#uJ@rj0pUS&ouQbsiR2AJ5ns
zJSNMF8k+ZgUFQ*#UWM%bZ5UdK-F*$-#T0+~8LPCDmX6ho(0fI0n{))d0}Rtz4O0aN
zF}^M=c|~DsO1TVp#-o5Q<RyTV)ASWH7pjpPiPuTW$H!7hL;f^(lY||0mAmtEz4*dE
zAgOIXw(9%=OFczYg~ZSV5K$yditaxyAf7rU`4LIsonNgiqyZ^QO-dkjZ`-I#N*E66
za0e*fr(6LMLPJz047#nt9M0<_Y*Shq8Vhw04_vDAQW0cNrLpku2(JlQwRj#T$q8<x
zbx=umVD8~u@88P@E+AJ^NZ!x@2QS9dHT+mXGR4sjljD<~q6%xE%GjOPmKizF3@`mR
z{`w@dgp_q;6B056#K6WNGojh@CIZkjhUj)L`k-@Ir=iM@c!sT|{k)W?2xo4uK~iJ&
zkW|F|Br67Y`#mxpP~wXY$PtI5f(2PbHnTIs)O{uc;f!v8`l&2yG`Ni0;1Z=!%@#X+
z_QG=7;V7)C<L<jsNzr-$z=5xH7S}jSKG=PQ-bJT(WO}4m;X;a(6MQ~_Sqhm{O%s}R
z;t#j($OPaZOzTf6<+;R$64B8rw>MFw<uBM!Y4QBNPU6@q>5CK1pqK_IZ^@!GX`NK*
zd^<fSLGZRUm%fotG|{9sO*+Q{t2;I$h$iCp^4?w?YDU3dAXXX%4kg{cK452U@}cE?
z`E(2&*t)-&oiS?t*>@a_E-rrp)J7UWbGEV`7rFW@uf7iC^VcPt@D}a>?4ntB238Kh
zo)x6)xBQ5dG(Ij`+Ki33`P$lDbdh1rh;5o(jS`d=BD1=!8u5$@g$Wx^pel(}m<@Hi
z0WC?UTQR*k_taf-JP!YWWzfc&i&r$T=rT?zUe0{NZysmUWybV~ebXrZb`!qStEf(+
z)ul(teZ@6Q_x~(iZT;1ymk)52SgHoETDkzS0MDR-oELHMSxcOyZoNORf=N0VP;gg6
zoN14GO*@zS$=*$)Vv&gY;<oU!QzVyh^TQM7m4wD^P_N-uM!(1r)z9*w%K{>|;;s5i
zrCv>5X{!5SrvlX0qUD#|w#70BokQy!Q93{=i0g1MBCLdIE4YH(XR7~{r-+UQ*HPOK
z2EdJ!imB`>AC{}))fOoUhGWtkW+USfN+!#vt--v(mCi(DGVa3_l4NuhSfQy0paNIb
zlMbVmaDez=aV`d`5I;i}+9;Jmiv-v>AyGm)d&~X1_va>Ps7eD}MAHU1B_?Ibc(9V{
zdQqh2M0vkip7cR4x~#kjczOcEPg=6V47EEh_1hz~{c6(0iTX%;m6N&;BEui;F7E+2
zW$_?Jvp}BOS*>-?j!J*!&bUY*dpH%!nvQ4lnk)<L;Og=>B-o31a|=J$Ez_F|febja
z<T3t%q?No983P|J-5%l)XbtB@mzW%Tq51b$z&ji}p?rGb7;jWMqK_bMz91(o{3YnV
z61y}1<{&K#V@~;AGM-H@iH3icGk*^GIXDu1fWqMj?-ZLx-UYvgfJ{E+jLX}OTOcys
zh4W(-^Vp&V__n!C7)xGl%i5yLi^e5&$<Nxp>AZcB{BF2w#Z{C)vv6iRFzZ_3u48oA
zqBl+L4vpoc#FptAZCZt#vQzbtQysG7xGRb#@9}bAY%_JGD@d4>ku{J8!4^NK3K8*M
zVZ0t?7$C1a8S<)rtbh%}A!$~~msTPb?P(;JgSGwvwykErq4_G4(0;kMwTtG_JA|lo
zDEj8+MR|0fyfT-Q5|ERG6i<9l+d{gV1Xe+y=Hr#DSvRUigrMP|8uG8Yp%ge0wkzL3
z0Mi^?-B!nK@_Dy%<v=5Ra%x{uDke~=<M0Cin5jgch!hmLtxCF4<3&K?XUV_~9l2V_
zmLy{w&fvZXWv%?tA8qfoF4Ou**fOhM=R`m4Y<%Aul?2A7vB@40bYI@9uJM(t-^8-h
z<>jeG{X7C|<qaIUO;DE`?6d17bX8LrZB^hE`kRmv@j;VZ-2w>?(;Niq!sw3#Ra;;`
zUU!>mz!rM7(Z0L!o2kz*2{r0^s_J}-zBvWva!t<N&h=RRf0i(}Q!Y|uxJ$GIApH@a
zP7dDAgZ$Z#<o)o3L^YWADko9-T|M@3lvhy$HoRiP&O29rHs8(0>T84&vO=2k<2siU
zn$*}!Aa|FrNe5hlV9srg@kcS(dWHuPx_5pHI6f~rp<up5&Ww}clQ;TuA%7QR$M|&h
zr|V^n^{-9zwTeT2(WVU--)f?h*4B#)nY_wQn>}6oui|AtxmwZ)YyEQRNG`<KAp={)
zdYLobN>n8tuka+_+H*Q*aMz7*<cIUmQR~ZW?Unr|&?#e2{X?B*UdCLRBT_t0lLlk*
z`6j%9+cI+Xrx&li6dzARYGotk&%5)V`MKu;X(70PmhFtpa|QKy<-k%k*h7GWu+JI9
zXYlk61Ow_LwtQHIxQ2!C^R&0Zk#zMnkGiT$i-N+_Wv1eCF#B9Ezmc@ZbJ)W~?Id%5
zq)8~Ky-ieb)oEh8anZicpZkd>g~hk?1){sPwBnY(!)>Ww!LS6!0+*>B5w9T#WqCbc
zukXkYIOzE=AClEfNwf~`NRVVU%;7VD^d@i`#S2gXvcGQ=e+YxsIM^J)463{Gjk9D%
z=!bFJkx|tGObG((XQYNF<nH~OIdU*BW@Ii6dx_vJ#$+f*;4+f!Hc?}c?hH;iV`U+y
z8h8D1Kz-l@8jAF7c{%a@MFuIa)^wvNOget?6PA4gjdG4yjBUm5SX%2H+D2-b8_o`>
zFAv1T@I^p=WNlfIyf=ab_N%!yNNG$dXh14s3k(Prc|x7Bi<rh=RQ~w#C5wWhD7Fl=
zjag>wa?_pV;RJ{T*R&O*pu1#<V@0Laj4Dl38eclBIHyc?p+Dm`NR>awtW1f=X>u)i
z05cw@7$Cl9MP-r?4aI6@?@LfpAElD*2vAm<U~{)~%n*89U~?8!4HY|9Ht>#&nh-?!
zTwEdIrcJX_Ig*?|vhx+!V14*AIV=Le{2x3ana|qJ&Kh3nX_EaRrg_N-w(ptdlR!9U
zP5}qW4-TB`m1b9!-6+nCVR&Ge{JEz}`GMzTgHE159R3-cr=2v-Fz!(pchAl$F|INH
zm1T1i;>ONz8X&aeIH3uKlh;ig!1s)UL#g|o#SAan$?v50C-4SBSZrw)M4scnND1E-
zu%Z)-y^?#-{cz)qG<19`%T;AB9EtRsW~e&u9TiXJoSeX&NN38)V>mQ-$LKLeSmv{7
zC!Q$?dO?lUz{z$N+7fF;<gcd%nI4MKflvmz=ZosGY>}0QUiwk`Q%L@~xx}5H`Ev>+
zQ|nW2?7~0~<nC3bR2X$fdB+SX#+j4052+;G$}g+`F0AWt5K-Eh6M8`|AeJa8N)0bd
zpw+-z#U7ybi^fD=6*<)cqyj8MU6Zix$TvrQfJ}<lqmd?3&B2Vem)1Kj{QjY+lYtn=
z+$0B5W8@<oR&ZC{HdF2;)$fnn=b<HG9R=G9sffzN@)oU&wyW;-rneICy=BVn)a!Dq
z&@85gwo<JkuO{Svwlqs)i0c&#Rr(50Xm*ftlLYH}Q`u{JNPNgl-&)X%wD*2gI@wo2
z%<9x^%;YNJl{eVnM2~By0$m3h1Zb&E0C>Xle(k|G5X5FbdtfEkc)h3XJj?$TpMoqk
zOi0|wi{aNtC{;Lnez!!uNJLzac_=768<~LQIpeB}lmAP0M{ubE)WBAGeg$GuAVPw9
z*h}gzzIKBA4dpzcm0N@pjik&D;e+DAYFuqmL9zQ~lh>>KtX!gn2{5_xEd%u!@)v%~
zKx{WqG}Gv}ChDM`sjsfrPdt$)H)UIw;h|+CvrT6?X5$$}1*O`v?A~Ep@n;4GS<`8j
z@O^w&D?jJ?q{?Q48X#Sx*0~k7ec7X8=bwu!dE~awcZS0%11JNI>Gtm0=;ufc5I!x5
zUqU6LAn|6+)&-0H#sCnD3)iKiJSkEqmSY5lAKGR1lUiBl);m~v`&R5m93S{?Pv?O=
zGZ8ZT4>I?JF>g4quzYGz_fJ=07#2~&q6FUjtDHJA>_~ZNwsp0cQTgT5&T67GK05fM
z_8ZDcYH}0c?ZNm$uHY5kD`Ap``**ezcT_|JieUBO3%HTAM2H7`eL!4MxjC=gZ_kCP
zlo>AHFVc9%LfJ5fU78te;gK_<)ZhRNd45<vZ!tfqV3yc}xU|;72*Lk(*C6^bu%`On
zUHj{3YDW%7)`c=?cEE@V1CM}&Gi}cwTZ_|((O(|lW$pL4KffuzP&vR7qv$%)cnr<-
z=$*xaUy%7t5M9V4LQymv%J>PuNzc@|7yEJ%ZUtmmWR2mxUAR)YR>(CyWI<cXUW_g!
z26ZyQfxsaFeQwtz!)m`-?3-@|PwzZ}l$1-Zuw_lBRy1nr%3AH`BN6E(ez9*#!e98;
z`@T8oV1#!N4;`hB-Y)xM8Se&AAzrj1R#WrAhFIAIaDhVFCw1jD8B2)A;yhV!kETdv
zY9zS28*$YKe-S84B=3p^mmNT+d%Tuar+~Zk1k0_C%({-kK*Qo<ChhjA>(YqJfQ6n|
zTLmv>aIZG2<1R{#UicxhQaU2|;N4&(j4iALA+{6Gw)B%S;!#O=fGHbW)7jJ(=nwN}
zUb>*V#0=$I6Q3%N=nHF6YV)n>K}nAwRiVYQn1=t0_MP6K$;485DJqa9QrCuICI5TU
z+>*HO{3^@h7yoonrH0LDX%*B+X`i4^Mbc?TKD9hI<bW4H(K+y%O)kY%R-Qk{L2+?k
z@$y@8BzV-1S`$i+0*c+yviT)+SY4~rCo>I6!fB1L)6h9NR`5U2rpXkkce?b%x&SBu
zUa8l4Ax~m`7Db)&TjiE`vQ@P#)4L8%Zc(GQXo;|03(V;lDS-X4c#U}U)3FWeDt-;M
z_!oC#?*qrF21KbSP#zdKVSqy>HjfqMPpGy=k8Z}PPC{B0B@sV;PcJTcS3B%UVA%Kj
zzF9d!mOP9L1MqoBjXtWh&=IEG>Z7ibT5e$$Hfd?Km4qtN_lTgBs_x<GWw<?_MB;5z
zso^&P=%AD;5*29q!*Q?R^EgCJ|0zBLWq>jV6YEf*qK03rCG^9kE3mL6X4IEID|&lC
z*(a9z@Hh*7QseZ7Kyt(Yw{)Y&J5tMFNlGos0_Z9|vRoB{srg2H{kvu~XqA=Trr_1o
zsBLnMo;hk>rUU|Ap~S?hrcd{FFBOYrTze6bZd_I8-KO1clM&nU08{H_VeIJ&HepD2
z&o5?XKY^w-MBJ4uIJIoV%}R6wN_xUZQI`Cavi>@Hok4jCjEKFW%#MfFG_RAyf(Flu
zrMS^bTIl8kGMuuS${n1SW<&ykR*g-;CO>d5u-vakvPCd3H}Q(P)a!VyFBfYjs=U3T
z;r*<mrkkbpKX3ng$s5u5XVMGF2i=&~WS0y+b{3o({QH#MpID1Bpq&Gcs%KF$DaJul
zah(vtBM;H~T#-Y9n;xG3r`DIG*k8Fs3*B+|!%&98p{o5;dXz{3VeqoqdIQ5IQZ;Lo
z-@HhSJF0asdXd77wlG;7O6{Qo9#n7Pa|g&4UxUHU#(9cFV6E`KOk7t$3V*>^s#;5e
zXyx0lBp@;V#KsX$rs%?yrW2?!ZgKDSwbMH|?{siD0ZAN|;oT3!p^mJO;+2zFp|-ld
z$=2oi=6XC~0gpZ=@Sq_CR!+ewDzv`oY>E@kuBIdCi9_+;JqXre;dsp3<%XcZ)+scI
z#}zn|-W<Jp2pC1>D9;I$rUzb7m7{DT3m|y5igO=QP$}%w=7E3WCMY-=k&iMq_L6Q)
zrWb=83CxmTN59kA$vz?pCrhDPumorLSnmL^DJ9a&1RqadQ?3_#fr@2!Vg3gQ!l?d)
zV<;ul{>Xqa2X$=pt!Ma0id7n9F11c+<8w+rnc{7`6h$?aivrAE-0H|DES{ub2=ghV
zU~fyK3SFy(Inq|;nM`;s*KSwS;Xs!xDwK8ZDI=IqVek8Qg(Tf-fV^*AG$>{c6x74W
zrBy7QEdoc`->n20A=3YE>_Jvte<{-EOaYOX*Ls7X0P#CCS2kcJoNj%l5GQRiQ#6ih
zRW#ySfa9_oA|fJ7^O^4UW{$Q#*w%TCe}~r$y$E=Rx-ngM!mBtAy8+WcDhKJuMj9cN
zNS%ZL<8*&BczCY!ThOl0QbU@DDwZ*8tuOj9oR8cVTz$Y4Uq&y;O^GBuV@9W#5JMB|
zB&!@MD)6ri0ovG_En_D1^$2@Zrj^wNB@XDQi}jofpcftkcgv6_$#^xbEb3cnkIaF$
zG&meeZ*}z|iGZ>u8Blf897yxXweFStU7kMqt!Lwe*PuugT(Je};Xyg6>{Q56=$+Lv
z5Ihz4cXz^c$wQFckqfi!`6P>C1&FIBS=Br6Wi@O53=aBvj-u8_esugn#3bmJvZsIg
zZ$yw(+%1sauu!y8Vd6Wmp<BuKVwfD@3hYCo#j6%F4uk4Ymdp9f<1x)l^9qfUyzeeB
zJqatshqUo=zNE~F=jO|#_BLZ`#J{;t0nsF~4*Z@DVts{_n3*>^S*X0CatE0jZ=ejl
znXire_noc~NrSkUm#r@~go6pusn`JYYlyUIA&rmJ(Tkj}QCoO@u$MqjG?UXr%8=J^
zgk<(9;<#iyBghrIV+3hn?uba0BUJf3bcIYsju1Pydj4q0vUgA*<xOExYYIo1h=nUm
zRWAQ5Nh5$w+Kt{eO`z^mGORIFMYZY(T<+Oo7}9$?IkeRht&dj!7_aAN7iDfH&*fGp
zOerST&Vt|T)4amBLrPKwrAk{n&km{T{WmBL=j$mX_q&gDw~b5MJl&ClMBaMGc=Du@
z)JirHE+c2yy~azEmb~;~)&-Tu_B6-B*mOUUoxLblGRr*)N;Mg|q}f&rfLIqm+BTq>
zwZ`>eGg}f^GDC1BYzh@Apsd%A$n>udmcyWARoqXIXXKyV>kFY0Yf<V=(uAq{HQpFK
zdqyb|L0v>^fN=zFH_D;avgtsn)3M$8r0;66-L9)h%-n8Ct&OqNP~c{%2?5=xGVK`M
zdPX@I^MJ{rR7BRsrM<*nRE-CS&C8ndg`hEv7HHa$MY0xJ_nPrz3u6r9*(<F4GQr@#
zJ$5$bW5+SV+6mo#dDjd4R*}EYJU!d5pHud3#~q7TNu}{dzT(JCWd9U1p-8b$j>nJc
zn!QrCQXC8vQXUNR$TDt0ivr?@A|cM9L6HWA?@XY}<3(s%2IT!yS)c(9q%VrHKg$J>
z>T&JGUJGlq0zCG~#cAs5b?#d$F)iP~>tk`idw=7@$<|<uZPi@*NV9L&IKtk6M+vg8
zNF@;YD4Np52nh%BF8cSu=SHRgI9FOm=-fw!!6}>enF}~mG4IWfRtsmOl~E|W$_X3<
z0oDYLKIP<Q-b9A@#LjAnQQvS7mzmOEl$miHSYDu`j5V0V$XTLb59&*>r9I<58-`#@
zC{9$oqI;;ZxaKDIPtr&gq$$)aK-NSYd)Q+K=?<DhX-6O+$YKp6_vwaozM3&5`m-8l
zL<)wltrf3iJoNOor*)@jCy$CSM5tW2Et=X&9iQfEa3}G{*0`;YqcbQG)9E5b2kr|u
z)aCxGRk+uTnSFi9)8%m1sm$cT{x8_HM-W9w2?<GDb`Y$fJTgetpNN887BuW3tURkx
z@M+gP2SXQd+m4yn*oqQClw~a1odFu@>y+gfkPbAOq+!R_rWGD#G9f8W8X8u=><QH)
zSvgF#sK4x85vI2a`Lyp7<hq`f+GRr7%fp#a`X#}J)McI50K_zqUKH=9woW;T4`>8)
zWz6G5qxOYXzmSexAiZ+}<&-VJv@2$2V|znKSm2tkpmC!b!Y<=$)SVhtDv>)1O5nQH
z>#j1ii1a^ZtkIg3>(#QqH(E6y55Et9IptM?ho0zR&Y+&qnRoBvp4$4ioK*L66TH}_
z6jV%}kL5dyekk08;Fte{lw*<;4WG9KW?~L-EqNcf1(!b9quAzLD5WHpPfSYz`j!^i
z9^@N1kC2fv=ULKuT!RkB8VLq+=lzoVq#|@&Gkhy%Yvf-a-AXlmWTFi=U`VJKfEohQ
z{0I^P3y^v=(o_}I@)HcS1K|$bY1$)$<Bf%$Is+#vp&U`>=iPlS0XtaMxi0}7Pux&c
zB)ns0>^F$BC$H^Yi^7<R_8i6y>NCeR_>c<^d?z1C@I3bI1cDCZo1ZgUyatK6Qs$fd
z9><dL2ly>eG(<XWqx~R312&3#K=N>s9^$X`E2ZTF^mK#fl5|x3Ybik1G)x3M6{`hc
zzqe)sB3l9eeD-@N7#po>w-CR^@)ilDy5bjvy^@f|dyj>ZtyPEa;6}8*=bl4mziA@K
zH61{sWNX_G<p42WdyTA6phX1jGMSc;YZLo&k$0Kz#CHq6`6wEdRu$xD;=<=&0Z^_?
zMKCtL5xd=hH_ZaorNy$-FL|$|o0L^2u8%gjn8{ovP)hb6a0oxX#FAAjMTKpbESggB
zb~r(iP7;4Ek+CEdL=G1|#>+;ILpnN*-Xi{%%)7B}XrK5~r`to7yX`MF%kuYvMHwF+
z!aM~0QI;#x?8lm<^W)5C0Z4<l7R3G;I?q1{ZrUq>m=RgmPCvyLe>HLGV+R(bXaD}7
zHJbmg1%2B=Ddj)UI+!1M#}=OTyR)r{j{3UJ85)rue(r?zgb&nM4Yqurh9uY{;3Hgb
zohYiqr&l1=UE|$<p!2@tWpVajR?yo2;)6B?9Milk9CZ;dtxhnlEPMcLF2WlPf$c;u
zcFK%kJ6Mu=vk4n;RJ$^th`oCv5o{6XvI#z@_2+USc9~HLdIb>-Jle-c<g4&pX0#xx
z3>YMoXI6X1zumLTO(qrH8Pp1kaq4&_l`OlN(!|(EV}%StrXMoQ(mRgEM2U+YnkC>!
zuHj9v-_#m3lM(9{R`H|CA6*x(Wi+Sv{Ho_h)7l|GAWs&_i8HF8)BLf8dygwZ<Db$8
z5M7ll6ExTMrYbC882Lf)tv1`#VQzq5REedOCjM1?;5g4_&4DJmd7|xK2fjMsPwmz_
zD-?$ni%7l7F<3H6-{4Rl(07t5WoXHQtYYXTN8HjK&4uzW85b-PZC%2n*Rc_AoO8Z&
zbBId5hM<qnBE1c`+PO&iuL2u|M%Gl`xfycd9_zSM?sDR9JV=?Y`aDc~i8>2ixC04A
zlQn~$(IM`8(h`vWQOlN9xRXnV5dT$!?Ci3e>t|ZMwx9eoT=r@a!jd)nE1#OZaup3v
z-I}$!pg%L^r1q4X+vfD7_TBiYd!&~3Dxm#-FH6}2Jh<sGJP#$#UTX%4@>x%k9vPJA
zZ4BPPTDWH4*^bSj2Z_7gWZ39}<qhH_kwEh<CGZBF$$BW^O^RZ>0=L8I%P{~_zjXgs
z@@w^9OdsHzx6xQ>AlAphOkmAiQ*MSBJnquGeA{q5Pvn-h(TG{3+MNP}#H@^;@acVv
zo`9|-?bfeQH_E&(fP;HWb_5Zu^c8s`zHeEgTY9tn+e}(GO}@dVW1F$0lfwJ>!d&`c
zs6ta+`|&%(VENFjDSzPu6;YMra|+M5@@63z=apDQsSZ>^4UugFSSB;}B_K<~wZ?FR
z^W+zHG_~<NmfWCY%E4X1DFvAn^rPnu0bjIpON+{zKvE&@$dU;3ib%3aQ1Yx{avs;~
z{3zG}15rMDVAiXI%)-{VzM&p55{Iq-etB=#?@K1yJk!RkBH`RT8&iWO=7*?jAwgle
zmj3C0|8r%f_9)pN_3FOL^bC`jaZ4O^mGM`$-{21mnbc50N64z9dxLQ{%tQ{WuLnQq
z$wkQbCft30h8HF%508L~-Q|xZuGwv%-Q_DQ3{Gyyu;Ref!NsXH>f|4(MNk}f5;arr
z{ZPpXe|;sEvQ3oanrobKF;1Kpmk@pqPuZeFLbs1awci}nT7+j6${58ypU~sWrqfrG
z)Cp2_sX#grhB~0pEnf8CwbIC+eyevq`WJFYP%>e4VdLPTks0_HR9rGvahLeu!A^UE
zBA!2Zb30rhsWU<PO6e>owx4OoBqKA(xyFig%7keJH(_(Xmtg-E`b1r>c%c=K5sF>;
z{a}{j++8}LxmQc%RRBXPgYd<XRH>s_G_~jyqCH_7tOt<E-0hqyDVC82gH&}He5q9<
zK!c?)-#pMf>SPUJsD-06j|hB7iDDYT9SS`J&6XVF`uiZhXQS`ObwUB#?r6ptGJ>y?
z943Vk2<&$KEb043_0r&(Y&GW#<RKG#T`)}Avm?vEF^#8&Y5s*SMrCM63!TGw0=eSq
z<=eONw<GCLT^9mUF)el0it?9h8i5HB#H+r6CW(?%My&1tv^C!5{o=f%0Sg4a@#V1r
zQ5KqY&a`8DXPndO?qL?g6eYm1Qn1=ni;7?Y>+0ZAi_a-}u-Z+|REk=xp^`Sau2sdy
z+v&g0^|bE;uin1q_5Y16B2@IzpiGFQL8kToFw1j`slLxFX8GMNq<J`e@}eedV&^K!
zgkX8|1Gj0OR+$+0^*D?ygnrs9I@64oCz+Vk=GaW;ye*{(imbLXc?(P`p*IZH$RJ!X
z!ub;OUjxmQ=oy_=9s=ZLC#d62AO-0_dA?{3k`cBji1zPnJV_@b-gTGpTDJIfTbrkK
zR6r>6L5Yav1pWy3I=f8(pie4!SqQdGo&$=xy&3x+-biPy|J136Xgl+kt1LbHId)NG
z$<Oyx?t$X%U%{^V>Bdcev?X?f#5iVE;??4;0Df+rqwqLhm~Uon$wF}#308s7uP{|H
zf9j$cbdQPotPZggW0T~S!EMn~M<e-8>a<Tk<ioaprr;9dV{Lk%DwcLj#GH_%CJ~)j
zM<jD{0pMSS*6(Zr8JjW!*)`D!24UmV`}sOiOfiw<2BkG4-sn|UncqDK%<>{q6oSNT
z@JLTFb6t!-#ZG@dCsENWY5jhPDnr;nEhZV89#s;0Z88@S5=0L91M3TO7FreJPpGwF
zarhp3TH%Oh?oUX!#+ZEP94S$L_7M_Fg{4iZmhNTDNq|i0sl2}d;QEbhSG($tG=E|Q
z67S|bg&t=*l+gDId|SXY)e^*Ultel+R##dhF)UOO3L;*tV;wWRTtPdc%j(_D?zS2d
z$#9gT-J4}*iKEEPE8)EF)T5Yw#gz8y#3@!Ilg5LW&d(8P`#rO|AKOQx7pR84eb*lh
z)2V8B5QiSX8N4&iF^H9`fsA9z`l<rt+V_;J?p$o%?9N8i&HcLK!tg;Se*-h@0WytX
zV*|WI**5O;C_#U)u?f!6FVaX}c}kE7NTAR}8oxOGZ4Tj7D3#4%xg5%(H++ajEk`Gl
z>}2ZregPu1Ml^zNRii(#o9Z!4CJ>aJxh1affl-g=F_*U2aN;~jMK#z}8APKPpdU}q
zN%=HFk5#78dTw;PyKnc&$M+Yid^OpB)}NjKT#Y&Eu5s76+3h@?4lJGv(S8PlcaVkq
z$kbTxi}boYF?~lYRXBN2L4je{?8Y1O>@wG~;q&f2Ra?ubmggM=Nb@IiE+Pb$we{b&
zd4MDi9J_UwiAZ{t4x6wdmVXO+o!MO1W~k?mAQ7oK+QUVMAc>u+8B^J|R1)z+9DLL{
zi2B|T+;})oFfQz@I*31VR6tn|$`2WhfHXX~4V-E2oIJ&xl0F_8FY#LH_|_4~?*f;N
zK0x&5DZtDTL0C@aixJ=DLqV>a+2RAfBR~HI%E<*7^r1EgZVey*(#C31fR+l9nQN@v
zblfp`29pnd6W4Ff3zPhToyDY}tBt38Z~k~qH3?OH*BQju3fL3Q-y?47965`R(%|um
zPs|0fQV*-2sM>s;_1eQY)w#6^9n_RIBn!qh8_f$wmbUdQ>Gui8Yv3|z<4VMRvVU=G
z`931sPa_U}cG}(y)MECzax~YtbEjAbPp@$m?9V+yEqRRx%P&4U8A5a9!=}(&04EnG
zFmOSBO6#ZhbJWS|GQ)~jpV>kL;9jiGWXCba=uwfP9E;JOE@Y9=+w7==(?2P(e{YWD
z8t_s6k}N*_2tf9_>Be5ebn7M_Fs&<jYDsDg9<2Nqns<m73UNtJYj|A>u-HmP(#~2+
z<uspy4)1B78^NOewUFOb>6huOgA_3rRz<`7un6!u4Q9Ao_fhe2^!rfeJ|L;u@BiyT
zQE@Nw2ZW#}uFOWnzhTiB$B9)7*^t0+2X%oPp@fw6LtM<Tkz`=?#H4OAw7u?8)6F!M
zZG4we{CL$%u9trS5yOt}it^Ty2`N35h(gHpp9C!?bgdZMf@YT&uJm*w$&kbWpIQb3
z7W%l)qPrVl@YCQY+P-{CvK-Pa7IG(!9jO2Y=3JEHVF64DMSX=(-5RfYeC`$wnd*sm
zO@ViTj-I%CTOlXBBW6u?rw?>n?^S%i(GTfN+6RJwITr2ZIvBrWk{KR!RSyw+J4bqH
ziv&}o^Ie+c@rB>x1cRF44Xr8>k8C-RUe69a<okOx>q{ca5#Gd*OFE$+ie{EqyaRVz
zv0J~1CdAxlPgD082J}0<urhfPg=b3uWV_@gF~fbxOe!-78=N4o@QsZvZ~g-53+sk1
z18vz@E2p`8%mb#KUhk6~jr2iFVaCBzGve))1s#K|qF3pT4_39*_w`-fP5QB5s-*#Q
zwgu6U<O2PWW{e_Wviq5R3k)&Nt97pJrTDN?V}1MF8;vSq)^vPM+0N3)eQWz;3bdtI
zo_5XF%zQ@y%k(tQt}Pk(JVFTjF{voRR|u20wb<YT`Lv=uel330Ptwt>KG<Sa&ICjB
z(c_2r1Xq+l)paiR+gCcP)cX5Fl(c?S1YE87WY+$Yu<UD=v^l9wp|rUxfN90Djb-ds
z3MpBm;T8ZJ^Q>YU&zPr^%KQakYDd?Ed3@hD3yo@BwlhgjEb{6$%duEi_w+M<Np&`_
zTtn`L{C1OL$aC9Z4d{?a@W+xDr&LPLk(;HaWaOE9QIK98Jo#1>uMdtT)w1OiBe_<o
z<UHQS0-a0VUm!36Grdf>f6HqfNo;FUfxB=b%NR#VvtStTX_bC8bR?h)$7OQvP=VoZ
zwF;LHn}N?)tQvXQLf31IIyC89s5?pSkiFu!;Hf<0SPt`PGT-bg;{%i4!0K;cMg%m_
zsKFFn9l<#cj$CT*rk!fr6;1j+;)~6Ab-<}k5J%po>PLF_7)404Zl;;0KVfmv5Z%Y)
zpOoKQN`^;Z^9Nr}nz0?b_@9{4YKmqYfuhh>UdC4IGFGYJIuWx2fvCL2Msy`ci?%eH
zm*X+Ppmb1|sfU|rjYI_(qy>C%TsM<zU@;nmz;cF6t;>+JK(du)IK;H922SU{r_ed<
zR>ZP@BWT!FDu|;&<x8O|@a&e$-u=<=L1NJ55$JZK4JF%K`~{Txjj3s1wK?e{rC*{j
zvfFoppL(vkYh1wPp|cIc%j@Cu5zKt_hkeQ6lsNbKC^9))wm=w+rt0S7&n*28BBeOA
zWU?qFHzN|SgvrXGQ)u!U1ub3X>$11M+6fQmjY^GDCzZsh!M*cJ4bwgjw~(z@J9d>r
zB;XdFGWJtiv*DmQnsTj9MFsj6F)U?{>C=odgh?IzV*;b97o>;bRP8}0)x@GCjlcE$
z=il9%15+DgRBi!wg^jiY5vmbzDj4Y*{w<<7>J(cqw|e9EdciXr5c8N=3ZXM-N5cDm
znJHL<@Cr2_)-3ogt#b@AoVOc&oN|G)*k`iX)c)m*M&f4hVcDfx;^U38&5&Hv6(bJ`
zZP7@pp0-heFRG%0#Zy5!isI2lwo!9G7eY!5YK0P&wQAtiFb+AlW2=~13CF1(>-+u$
zt4Wbx+rF!Xp34`k<Lqa)JZ8$M$8j4!T1{K2b2X4<c9SY}K>WGJQ%(~vvXfMZZy%EE
zmu_QzHrJEDrBODyNKXL6EE*WrCe>YOX2vLA&GhXZJM<`zEnhtBD!+_hEB00Uu1-&A
z(}O;DgRosqNC&9IZPy;Vja!&y^`FWVv=f{!R2{j``7~B;yUTc|Kpuv=I%!FZyN!`c
zZmXLZ@XwZMVNE`JjrMRLFz1QSF^#Oabsx`1+s#;0wL^SKcZI&Epx7yg$0rRHPg{A;
zq(4h5_|6A=Q9iglub~0~PzMrgi&L8?tzes8A+~TDaJny4Y!ynFjoW^C3^YiMz1#7Q
z`I0s9>xG;@7{~6Wux~`nwQ!*)#USh)9A#_+9ZA7ybaq&~>8Bis<j4PDOB{5jX(~Wc
zB9-CwWt$hZAeSl!O=3?OF;Z#RQdu$g?7H(w7bTEnNovHGtu#RIz0;>?RCZwjLgxmQ
zpaww*+Qv6rs4h1}U^_%7bug?!xvw6!&<=Uckq%KA%~Vu|Zh%fT47vjr*v0d5=03Ts
zJiPf1=eOLucyHVorgSW^I&q;?$C?dPV3(O3^Q3VMn|Z}8+T9hw*WC=4WKlp=q%u7%
zda(U$(&;R+hoJqGdnVzZdTH4XSYG#|zQTy^!jD0t)jyUG;TG%c(2f^dg4=6nJy{lZ
zN`zuC%436OyO0I#g(JZ?d0&2uh9p92w=+m=zC%1frDsAXCqco<_j5Mk4K{P%vF|mi
zt&H2icxNzYegQ60a7x_e*rqYZXhZ@|*&l~{1z{;{>ig)Xl_KRNoO9bESl2tsYHZ#N
z`@qDe>=@{3EecLa-WQW?^Q7%s<io3s$B9o?XUUy9e?CyCzk^$0Hj4p?;xR|<2rNa}
z2+0Q9Hh`}vbVPpW`lC7HmUR`DL1w#w^yIv7eY|BO)0IJ)XZhUoE{exE#F@#%itJhH
zV$!jii?8kvReLLh2!DKsv$K%Scwsw1%c~@t_(aBnr2pAQxa30X#r=36MPNICEvGg9
z^Vh_i$Y(py#pmPmK^CK^yY8%{<Co;Eq^2tc^4MD9n21+7!AxsBr(V*p(33d~b=-^a
zq}+<%0XP!S?)27|h1oPkt_kL$sgHxwqC#6KHx#JYwgi6+moe}O9&mh=*29seD;()|
zB{ll;ea($p1=1TDXVOWH;kZ;<Xwa;HfaF)}spxrhIe2oidg>`irT9P=yNHZHv^QZ`
z+9}0hbY}GLAYOE<N~ld-7NEIq6D4MlEVH>uE+4X%JmquamEFBpl#qAC2V$-$7v`Lb
z5KGfRVK3)RH=nx^K8KMEye^v(RV*c?so+R)6Ty+i{p3DQRYG&Oq;BMq0jq(|@T9r~
z04pQ!=p$d9%)u;NZZjd~+G$y%_F<Ic{*3t%9-zISlkL-OD70?lX+Rv!QiDyy2lkpt
zp>T#1-&9Cldfoq~N=w@B*iibo+A9c45J67pu-T*M?$dF?>awH$68;z@qrId~EebDe
zUEkC5T&(HO74f8UTGW;)FW*@M>sTR}XjQa^4at_8wde92#K`s=;2K>P6R2rukqz>)
zB#$)jm}=O3H`K$7c~6@h6Z-?JrEqSgS};agEEO~M@<;qoMTL#Vo)F4XN9<3H817}!
zjT&3IVjnZDbd!(jx*UkyNAZgc>cDEvR5S-etV>3tYe$6#iDn#st!ltg;Ax=*&e57N
z6Q_Bk>R+IaeWZ{7F!aL_kOw?NAMK#t%n&&R*3q0n<j-B8edXa_<u#h(Dh`&4YQ?m2
zwVw4z7Bo9@NF{n1qf{r@H&9(E$`corTiiW1fJS%2^a+gfsPRL4@eBMd*7Ko;QT7x%
zT^w+Wz6iKh{A0Z5>+$`2rr7W6GfhLbX`{bQpAlz|T<A5Xk3S6HP_$d2*b%%^CX-q4
z)820Ht527c<t?=xoO{}Am~lQHWd8KF$`&s3LD)SFPQ@Ofbbt3DVaW;7>}b{{XtLXx
zi(jiL<M&b*DDy3FF1|ggPW015CfO3ybb^YoH{pOrng@^r++xCLhb!>%f-_$Kt8;QJ
zGJaEG#+!_@JS3l*;mLaY!8+Jht3Br29fBsjUjCq6PBq&OMHS$Nba*G^lE(AJ=}F9T
z_p>5B2R`h$C-jHxgBE#?zFuK1tTzn3fNV!<o|)FwVdjSs-6{5rL6w`Xnjgho;XqAi
zUvy2pk1PqkFlVp>%&y0FFd5!ugj$h>GJoYinqUzai30TOjLezv_kx!ptFD!G`9(ih
zX^b!w-cp=ptLb9dbRZrqZ6o24Job0SY_A*m{>8X^a9<K%6(1d)nJF=jXJV9eT5dK>
zxaQ3v{VL!)mJeIRC(>tb-i#+Jqh<p0X){<CMt}#a=QRf=R3aBK5ClKM0=Ck1RpRdf
zkQWfdpGziK(ecjI#KvavYpo^ZoA*D8fdcKlr;pu^#gLbr@!dv^W_|!HSn0U;QNQq+
zq_jdxRA_G>Kze0H#5M{4YsW>1<W6cYeSkKYd#W!a>_!b{YY=_FDxdO>pLZ6Voi=N9
zjFB4agsoX4<Dq8{7k#SxNdJ;J<AQ<;eMhx~tSIsrs*1WCvb~KDO1_<X-}aCE+cg%R
z<m3vlWFvhVLF0Lm4$me};}--2XHmz#0YP2-0Qu6Ww#(DsE%06prlOB(rBNFe1`yn_
z79;n9X~>dZIbGeOa^VytTg?}(S3cu9D&BvireyX2aeJV5RDcnw_$1<I6d}7|csE!l
zCpQN3=Nhb`^P~37H9OZw2>%Z^E>L1&wdO-qJUl|s3FzC+zuCyU%Y<dEI*`kE9{Fgt
zo7r*S32@8@qUUW#;y)5#`O5!EfTQ)aZ=o-nr;4(vWoTW87TSB618fo2Xv-#QZ+3f`
z*&kP52Uw|IRoMahoF6Gk+x^@4PpHUVHb(VD(~_tZ$3Zb7Zep7-cmdFN)m&^p_H+8f
zA}d937r6N&>4F(@Zp8eu>?0Yb;`F7%c>k#W+`Zorgqo~Q;%PeNM>+m~0WKra+)xbx
z&Lw`?JQ$i_jfRkG2m_Cx)?qMi6tKb@RT^|dh<a|4Eq2`xI&RFeE3*ux^*YVYv-O&Q
zZRzWYMVI?YR{3($R?81-$ttve!78<((D%|pYG$W<d;$3gC97qLTN1Y<ZtXg5)%C75
z^udSqUnOomeB3gF_m2~|-rj21Jj?+tnx%6)CB4~xjy#fyhiHc?nrpfFoHl8EXFuoN
z5$3X<aGzVsLERo4C6st5>}HC(Y0giMe+R`AdM`fYt@w}~)4)gdAv7pMw2$IMBpL4Y
z{G^HO4eZpMbHNz|Qwwd?pj_m}m8G#~jAPHsj&8CW%H_sWUG6AEYX?p;Cz>jIAWxX|
zj2o$cruC}TLbJquyb1Rq9ILhaKr6%WAnxOxq;~9cGb;?*IUFGwv)a)Giz?51?3(+=
zjXil&rbSrjy$-z=W#-nwSOSKtP%bY+yWCL-)*d`0`Mw;v@Hoz{LZ=sKnnEiiOI*mC
za3Mmnn!6ApQ|56z$lK#t{$Y3)#b~q`SA%hJbyHgpNhMlwkuy-5tJfh)AL$BO>BY`o
zvLDPvH`(cyLbdj=;g5c?@er`j;AYF;pZr~jmiQ3yA>u>MeT02LAM%!{)^DFbJ`By$
zW^f^+d^e^IPv8f791kflg-11}AC%Px{K2H&KC&auWf`PS_Y^O=2QSGP;emo+9#o!{
z8k%0=2cJbwPh81cawW34C9dS{?Qg}$Azpq6S|5%PZ7(-877g7krXd=`X`5=W5R|ZL
zd~3I=HLU+MP`WLYv7lu4RbU1)B)~MTDNOy+IG25Tr+W%L+=EY#&?|zFsfmNPan7lq
zUP3>Vmk2==mnSao1zn!d*d8uV@iOIcT;AIwvguKXtg-Z5v%VXxY}R}Ny99qoYVZo>
zM<$am34D;Ca$ldGDS8mZFy3ehA-bA-a#}bY0mPsyL_2=Be*XMQj5K^0MXhrk#x0CX
zzP!u*gu3p)kGnMJ80d+#4r(1Ue(v-N3X$a%LR`hgiHqy%;)JTUcX6~h5BY&y+}k6n
zdAl7W8wTuQxgTR#m*jlMf}9@S3F6a3w5v(c9PCema!`3nP<bj+J-S`GxQPz|)7p8M
z*#|CV(5n*CmK_UFS=Kq~h;wc@b>@2+GYY>g%bk_s1m`F)y@x0mkrmw(rkm?^O^hg)
zUOa9cX3^a%ZL})PTwoGMQY~T5iK;upF#Q%vRZwO(f<%rKnh}MjL+Ra*W2At`7(pp3
z#$qa{IMp{)TeKHUl*QkoZd^+lb^EgYxJ0E?g1H293FZ>aC78=L$J+?zBHb#|tyh++
zC$MpfU7Om18m~l9a6>dzcN^-0NA1&~LT(pgXL06&(+@grXds$`6MEvNsvw%uR$UEN
zx5KH`eL$UJpmD;9fhC+V45=l|FbgvdCKgf2u!Yk?RFc0~!Kn*Qw5e~1)0lg4I^YaL
zOqEyxWiaFW`myOFMQ0?#93fD)nl+>8>(HDNd#E54gVf56*3#w)Qg@=HyU<ALL8VHi
zEl?WWbS!5n{|zXgik%j-Y>qOD4D37I)M?qxu4$Ko(DKv9$50frA5CRQsGCqXp>9Im
zgt`fJlPx@<Zqleg8WrrQ{xz{KHj-+qF!oZ)YDByM84ZK;mNm6aVPeS8gaTw&eyU>y
zs<(jV+I60ocb<Tj_oCCDiJb|mQ5;9yhDP~_6S=?@rYbNq0dI*itW3P|<Gq&W-Scp|
z38pP^k_@3G%z1ih%9zj$Zj7d7m_84_3ci;)_f2*1=h-QZq0WSnSb$nprDw`@$axZ_
zx6Hk5TafeQluRFj78YsPYp0V$N+YE6bsp@5GGZicTa<P|;6DX}v(c2&y1>7xD98DB
zY?Yz$SVn1lAiIh}O{G1|t}6J2v<Ybw(k7%$NSly0*-sSGCQZ4dDc2s(x()Y#Ia+im
zT8md+bL*I+&N%t9XT4*HsuDpp?MmR|qX5<S4Jj(E3sN_vCrDjmq+z9P(9ulYf0mGj
ziZuFhOeyjeq_m=GiFDz}+f<}xYxV&vmx78qrdF5trnW<BmvS;p?f7L^TQPZGfEssZ
zrNF7jZ`kvwb~Lli;q;|plpXs;(O}}8G#@SdXt||4hk|m$I=y3%^q)(RzHPIw*_xVT
zwJw_P_10V7FvxrwNyi{#+xea?s=1|aTImnwuk4$4e@C*LI<?8}=c0s2%i0<mgbw7l
z&8Iot^wXU5f_&60O<}IWT!py`a~0+)%=Ha3*EcVIC(QLhn5(oPmKMa<adVuG1vK@s
zYE@lkP|6dLP&l7;MR$~|r!w8TrMAo*Mqe6v>b%v-lW2~D2#w-6$SBJ@W55rcIe8p3
zi!Zvt#jS>;j1y8l;R2`eZE=SCa9VDRdemW@^;B@8CaodNc{+aka4JRK4Z~Rs23;5$
z_O+eQbhsWR^o}5Vqbo=VDBA-qc3L*yonJ8A0un<B#o5vc*8m;)&)jq<?cGBOyM%;s
z?bi!*2PC+(L^;1;2;~tlX0xrZ;jzqdM5zi&r<>0B{EETh0fk$S*Y!T8uTxRRGUF)k
zY>0Ax$skRk-~M)YZn<VK`&~1PJ}oy{GN=b#fRM*|yuRGK-8dI=F63OuxsY=q=R(ef
zoC`S@axUcj9&&CUket7z!-3yEe|(&DbHwdH!G{9B+0t9`e1uLvI6hxJMhd`57nOGx
zdUN}ILJfC9^@GWPs=|;fRP>|OMJc}})P;1Io1q3b4Qi}NbsUWDT_SfAQk48*lLF~5
zM>HV-PBa77y=&xdfT?*vxvaF{G>j7oiK#b-ruBsj5bUStVuM4M(ez=288gH5ZhUJ;
z60JjlISt90q#{NWHd$eo=P1RdqdCu_(P^TL<`zs{Ml+p8(=$x`VRkr|JD7L6r|{^-
z8pNg_wqqjwxZIbli|)+JZk7EU`<-6l2VY(xo6|xNg&+z+6oM!OQ3zsBg81guGlU=t
zL6i;B>%LKZoK4a}Yp|Fh`&G4fpNcHJPGA<P_Mfnc8(~t|aiKS@+#gW0aDp2cC~@s|
zq!H~W87YdJ#-<6uas?r=wcNRXED|tm05zl`Q|nNPg7Bb1;I0m8s)OoG(?Ol*zd8>g
zhH@^RSH<_Us`KyYTh&p8@)(+o=B9%>Pl0bhYAaH0&yez<(tlebooB(<BSq>9Lk)RC
z>dKg+4k!1n9=rwV`1t$jnJP%pEm^tVRQRSL#Uo|WfyC5aB*3W^A#VvZE+}u-3hE)c
zbcK}$JL070ig98Q<=riu-51Xox4aFC8tIlXoed2h3v6jTpF`Qx-O`n7L$cL=DZ6i4
z?dbi>QFg4;5rXkFc^l_A`{^ZE(?{9W6-FzJRv4`?T4A)pXob<fuT5xSw2#AR6`##K
z4x@d0+tBGzwxNkyYU^+;p|V?7Sj)+yv<+1f@T6oyn&>rM2?KezzLb4`FlPxn#p;wG
z180Zi)^HMEcZ`$bQ_hUj6M+sz!mcUKxtLAdqTq}h<H=;*7qVV)hB}_a)wAl%)oDDH
z$6+%XmaL^UM372fI&!;9oC=LZIy3d_ar%mrMt++20GvTJ9nM*r4zo-}PjO?~W105k
zMwG6g#7b0krsx{0L06h6t)mQOFlqGboLfdotkUPs^!$2|nTHa|Vcb)if-~$=qw`Yk
zOwElhUXwuDb$6859mNqO`3DAR{XEDeUOpNa-Oz813Z^biqcYww&)iV<nT3@<Dl3O#
zC06l}({wJ+u-4NnC<2sM$S$)GRw1lHScR|(VHLvqo(QXKBMV{O31Nj+P<|l7`t~-F
z^V~P0mwf(%uYLWa+QFavtn(}Jg+G2Qgq(>vbk{Kgu72|W`26wXmrvh+{qXVg@4x(X
z{OLc_J-&Y{&Vs-5lR+{lz)|RIoGFm{*&)kB1S4~^Oum#}ftP$Oj^o!4e|-8rzter^
zO2U<3qi<V8AoeOgR&|5*o;*32gC^%{__v9@$C!D?z)ly-zYd*W4+f^s)o2hSO9x_|
z`KinvxJPvUKsQX`$*0W!d&Xv5NPH|B7=X7F7wrMr9m;VtjxZ#x>4F`+&b4iFOywmh
zjTekA7n~oj_;7xOJ~u-8$j~FLWBKCfp`0~M=@`}i{PxcqLOmSce-!KHn#v(+{cHxZ
zcg#Ia_AEZ9Y$(!A;d}~Gps{l<JevVSBTfO>hg^%b6fH#Z5KMYD1w<%9KG4_n?zSn&
z3{o46I6$I%2Yr&xG&ebvDaes#R}n^=YH=IpBtvu2O&9X|6?(q#b#S9>b@}36g+n-3
zX1i?)X1iF^lwWdJjK4y0YH74RO+!S-YT$rjhcXvL`O$(sr2K3yAf1KNd%Zao$V{P`
zu*%e|0qyP8^AU7u#Y{BTWS~Wgg8~6_LyARe(FV(etc)X?$mD2QJuaH@LNW^%G{47d
z`cs*WkS>JsRLkjbPn;5_haUJut|%6l<PEu~fpFBBh**PB+)ZUV$R=q%G>^pPd?Xs=
zl1Foz4|=pzd_EzDog8_PQdg_7w)XU9r>~zBN1uR6DbEBApW=KD%@ux_6c<bP6jxHc
zXvkBx+-lshneil0fGJn>{1y6KWO1OElP&KuL$HoNIQnO^@|^9<2sa$zYnC^E{`Qxr
zBnlzn)5R5Mp0OvRGF|(PBYtH^pMU!aH~Rio7E+we>02xd>SBu9wcNinb1gs3zTAps
z_dMSA*-94zECg5xun=G&z(UW20Pl?euO_5etAjs0|CJL`2y~2EXsOWBzO>X`y<vV+
z9*6U}{>3JJVPO<!HFuo=cO@);eysySKYpIZ=Ew6e^u=ug#cVv<SKKCFN2HBCzd=By
zTZgZ4&Q!{sK!dH#?Qi8SCI$@*)^Bt6yj;HJUo)0|iTwv{zPXQUb5w{Eu%@5r)Vg1~
zTRZ&Ymrwfo<0Q3soRl_>lQ?heF%Oi+M`ytg%r2&pmqZl%=*ZZ?sA)+Qz;8VNHZ9~l
z7TlJ--UZXKM6$VQMdYLcl+YQ6Wj7Slo^UBzQzRyA%G|b)BVt3IOFJ}j2i0+zxgPhs
z;H5Jt4>!PILWkrOTEn722C=Ss#VC}_AqB|RD;C`7bj9Jc7$So7m3XB|-#V0pjF9{f
zEgS6km->hV8TywR`ni0aC&N$t+j15Ft(qAtt$|ab@e5}g4ZQo|Fv>nWpMZ>3?x;xP
zwE^Ou1q;s3&uk<)#VOnV#*HLTsLB#JGXkRdS<!$88a`b&k^&YO+_|FeXGJ2N{EF!7
zl|Y`Vyho2$uorT=LZ6#FCejXSoCK9TcUV&Tsuh}S%>CfToSa9zeqxtvnb@_M?li7Z
z<piN=GQKb#VLZZkgz*UDc|(ln;WnU!hrHJ<W1G{sWt`L8mN7+yt2c9_8TX%^%k#In
zG?lCG@of8Z+{%8G?a%!^VHC-ez1&H?c+6gC`xD>keE;(pmUlq&`VQ!SdaL`N%Lzr0
z8!`t1>pA)nPm3C|X_LMi0x~F3;`9mPdfDRZ5q}7!7SU?@ooH1)5z%rEdpL%{gt!@{
zId8!Q&Z!A}d`oOCMS8!}l?S10CHn&(4;Lvg^cUBLUP1seANiu53=Es1Gy0-06UjO#
zdX2tE8K#(Kh6#-sPNVdsj20X&qa>1svydt0X#hOZay-*lbeiQx3YviO5`*611J^K{
zoJu9FPiSyM3xt`HzO~`GRCjz{luPuF))>U%nX{I*CeM1S&o=&9CBo?HjVi>-C`a3%
zfmilq8l~WNvJ6w1I95!=B+<qCWEPQyzTBXbzuqd4Qe@4gRaj1J8m)p>T;941t5D;D
zV6+OTd4_H&!!z{8dD)`7rpb1XJ~D06GF;On4<97S<Ar2AgewSF5UwCx;ib94``p};
z2>uQuxV~r44W?cqGW~SvS?##zMn7Gc>JjG`(8j(m-_Xy*x0^mX%m&UCB_{rKY^Gnc
zgNGMu>u2}w#t(W!yLPeRXC=7Ors<E|Xu~Y-12)_RG!2p<joR1(d}m3J?~$!uagscL
zi2r^DYwp1JeSCS@?P?J4WZz~d8DHYw#l4Gre;*qZvefQT5vj%{EB*B2OYP{!rM%nv
z_|Yp}@%c}d#Qf@avL<$+f6<-!v8<E7<27GC{Kuzn#lK#rpp<BD>y7^X!<R4rpl9*R
z@!!Ax^Y?#zdb;-f`V8`l6<c@HxsLJiV6!b|RW0no#%|a!3gKd}|LhLN_#5tU?N<oh
zzeB$9J79~~JVW)bnP-l$hx*i=wgt}iFv`cQZem;-(f9xT&kx^!g(<<yefak2_o6C#
zr6o;Hf_Lq-f8x{^p8mtxzvoYHy{?};#g_jv{X4#+4&P;&@8RT?F78UkG5u3NfMV^l
zTftn;{yldd<MnY*9#!D=wptzX>|F!DZTk228=rkgq#KXB?JHlj$M6OPrT>>7<A9^3
zJUhtP+Ke-Ze)zetm(Rs-AHM(j>D!a%!rb~?s3P>wV>|OS6B&gn${kO$yF~r%>z^O~
zq-ez8&w$5UfnyUAOj&c&%z2`w2St-R{%7esZ0@T1@)bsQ`SaJWe`46b|MB_vpN>EM
z{O#-SfBqEI*_Wa3{O!}v|DE3Ymw$Zy?T>#`PXphFXPd4E{Qm;s|AkaH&F8Q6zn?4A
zi(y~R1`VsA|NX;1{?|HY-3s%yqx?h;`t$F<fBN?G=L_q$>wDLVD@U?+i@VmP+{d7j
zW6s#~A?K%t(rQP$+~Y#xKN48fkCgSLr;r*hdsK5>m2rni3r3b>JH}GK@pNgaBZ^>9
zXGF_bTNSr_Rop7;NDp~0eZY;(WmkY7UNic#73X~pC^lOAb#u*FuBFRm9ZmFaU&`U~
z9+!9iB^GyLUi&hy=bPi@PM<c6McueJ{*v1iG--`Y*^4PZvMJ~I%#!URS+Z$o$>F_Q
z@|=0NXXX*^HV@$zbCzsd?Hot($Pew2^|MDVKaxkb%}BDa<cBuol%5%~HjiY<uGv|h
z5=(w)OZLw#**}ye`<`v!-Z@83=DBqwA;~+>uSmDHXoRj45{kl*f}Qzp&;I_p-}0Al
zA3lC>|Fj-6ni(U3s{BwN!0GC7x_l~NoB88m{-dU+IAJiuc-S-h7zbU-=bpUeh#nwl
zAaRx^^}_**Ce(V9gVIofTK-L*weAU|Gj?dWwMhBlWQXPIak_kAhfn`_nE$9#G(l66
zc{{8h1v@m}&)cE8)eL|6`7iU+@a@!B_3)Qp>QR`jV{&e?+8g9d$MED|uMeZd+v#7n
z<Lu7=<&&@{Msu`WN^1W8EYP91xpMiCDK0xbR`c<3;1dg3u$lixZtC-=-~asSzkdGm
z<;}}e{eAu@{g@ZeNS|n&qp)Wqsml20N9QJ>2F|54%-8p5x^9RU`R!DhW(gHX&Ox|3
zS!O$j<QT^f{Cb}4a+v;^$s!puySzI17s?+|9nxhszGa^MmggB>i}@;RhvBF6zrTF?
z@{AV$&8ToN;qU)idUn~M|I3#zpa1y&>8BN+`16;U(2Q@l9Ck0fCEw>p_cA>Ydv!A7
zxak|*%%YQdA|v+8*AHJdiv~R;?G73)1;V3qS-RwNpr@)%uXr+MXZCoV#oe~5R2R|z
zS#mzGtBBt5j@yZ`46Pf`g>AglWS1jZZ6gg>R*_?HR5TvOS*5UMONB<dq|r(0Iv(jH
z7rw==!<Ky*&w{`g2BO1YViXH``zwrv!k(|IfBipIo!Ji&{SZCH{#2H$*`gI9uN-`4
z@#zH3Y;$&nRX??v-qysnT(vFBi&j@{$)L?8dRykCZ1yUqD5lj<@BYHHG?&|BE{g0p
z1yY*xDt8V2Xo$HEj;qvWjBfBQqHN6-!E9Q6I)}HrCst?_g*SsfiWa&)MIJ|!uYq6>
z+KuK?kcL$%t`MwZg=qGgvEU>B2leOMR<N^dZGg?uXJr#T)}Fr9^up2cvQy_kCK!Cu
z9XZ`&D;ocZrID4e-V)6uOTNQWU^tW40!6Fcetn5=Lq^0?=sx>Qwwxv7@!D{vF<%x(
zfsK(^bMh?WpHF5;5fg=$+9h&#Tv@4Y>AVRy$8L}Q0vmQ{2s&QziEB58G+Jqj@Qn0j
zf^A}w4IJa!H_1-fedcT%xNgGHOzU(qOmct@OJ`f!N}~#dyAzDM`{W;=HHskH@bThP
z?T~yvvsG7IXZcVCfquTP8zIyWoeVdjiLndhAtPHMbji@`Ar8Thu9DawUg9UqH8$}}
zd_I2(S`?UE&7W<X951(?#f<{=_Z<-dZ|aqD>o{2Pzb|F%p@aX;!A_yxkgrTrq(8C%
z-CC%JcQ)Y^>meK%=0g3EEwe03##m3+pl6=XgFRg%PN33xxIe<!vXyxM^7a;cEn1E&
zvBoZrr35I>a-(epcgSY}&-Epti=gM1Gdg?T!bE$O6pD6aMpN$6=BCOh(wq|8(A*m*
z)hn^IC#f&GaXlkpyU*eF4_OwP;!I5PXvtCJODYMg@+T$<or^F}B&!6*C6B~9rZg}b
zmo?tFCsguCvs@O)6PG0Kl?R1g#!4o6?Tw}PL?+oeMt#O6*$pNegigM+UFNRaG(%4L
zl2oDt*uvJ$`QJ(~_IhDI2m3Nf7dqy+iPCt5VrIY_EAvwZ@!VwMp?S1C&275QuX$Qt
zr}MW?*Tx$(O0K&*1i$lL=Pp^B=XQ9;-)M~y>Rt`4AKF*|CYan(P{F`i2l7B<1KAiG
zp8hH(@S-W`v{dyvt}TG|V6#4)ma5j6jpZ-;*SVF|@3DO3@oY_PLS9(_mv9@;SHN^h
zmA#vB30#&B=q@#_f!XcZWKN6V(~G86FbD3K!`V8R@8_aBTL_;)kd^RD+I`pa6wS-p
zCxJR8y&S1ee=J)=Aufe#Y!pKKf#@H3zH#eN)wt}Ht9vrarm`{~drE33=DR1?h(pHn
zcaE3Fk8k6qS!vCi<Q4V`=tr<c@0`jv3$dLgr@t#dZC~Yt7`)A}@AEWIVO#}Ag;PC9
z<LuQy-d!Ab-M3m0SB*REwIHr?PUUTzEl5f+{%orS7qoF_J1siF9of@Hi_R3vbC7+O
zm$xhb8h!_>Pp!_~4oo7sC|+k@))97=l@f_@8>ZLVhbb$Co@ls|z@6AjR*FBn0s_TL
zM6^%$ai^OTTE92riam{s!x%ASPm9V~E7JqIoew^QC1Xot7D+<4b|%lt57vQW<9xq%
zcUQFL3+8Yn-lXG1p_DEr=v|OBsD0R5>brNVon0|EtN~Zd4L&M!V$)=8I%AJNo*Nqu
zt@uQAvNgm_TJVXf?aS2K9}^5tGdHh>fQEaAqa9p1z#24HqttWEA&^B_2%GY+6#Wv>
zZ=zcM)Ta&t@Wk#DU95RiJ|=EkcfN(E5=5*A@1N)9dAjP0z3R+|`<WbJuI9>{ZJ_l5
zFUqXzI=%)S`ZT>?m%R*y53uEvT-HtY$XZapw@?0!+O<bS<CIWN6co2#L|jd<6k0yi
zl_b%>WD$JR<PamyczGe=jc~o4SeovU8Jg3{BXSz?nM=gMJ=ojm70JJaJUK<A5tA!;
z;u8ZO#E&jf^9jeLN90DKX5J+pk(?ZyKKF@41v5EObM6&6tHkPb<`&D#IMsRbi)SfO
z;uv4rT+PmxCgcZ^7Ikusv<$HWd&|i;(j{b1r!(hxR>UFRaYyF%Dx3e7TqUP_Oy@;b
za{>z4kV9=`t6jLJ3KaIe*@k-!+X!)pXxMbJjbO=JrD7Y=da;c?*v6}D-lHSCx;T5z
zwk$`*Hg;qi;Z<zImIk|L#-WWRqp*eAN>tg2b;MV(ju3{-H6C_MvUV9MVd6S=WgO{M
zjDwfJrdUTPyM-}wizId(VjVlNj{GW%6+=r{-bS$;L=Jy5X)wAZ3}ms4UFZy`S6QlH
z-=kUve8k~zo)#}q_Q8=@6uz+w(|8pD99oySviIt$X(R_R8ZwPEC@ZG13)3*K!Zr-n
zC*ic$g);$-0tWFLdoqq!*%{?hOdrl22Rw#H1s(m@MJL9w2jh5^tx+sWEUOaKMF|-P
zagcxnLkTPUF%I85b#*CebvmZAZqVVfNQZuk_9E&WX&n=jmUYaIOeeg$=>&>4=E8Ew
z#iWuTFfMbB=z*-Q@RdE8PJDIKfq^6wFN`Nc<J_O~nPb9cyqA!*C*w)4Z#?8nqP<88
zIN|_@6&>sO4U5Q{!6q%PXHV9XU*CE{9PFj%!BQ$-Y{48M7pr2BrPQ8;JJstO57f6*
zDAr?2w;imtvf|^xFquzqgY4k#%6MK!-5mMlm(HeKfoa%~#5DF`8l5(GwTgo?$mg~y
zuNE4+Ds!b16yHi-wJCh2UJ^Umft_^P=S7{IJ{Y1P>sAs5$6I>HRZ8~4O6n!Ck{wuy
zdmWJ!g-YOj=|pHTlrU4y48aPC-GzDhSJKeI`j|_1732wu_t4}~AaG&9NyI$%U>=>e
zbx~6TF?fT*o3${5(nP1+L2HjDhrF0U_bKG6)JtL~JFt^Zd$_3ZkEM1nt#)n7e#o$r
zfaXo-nr((w$Vp<&E{r7gawd9EK_48Hs?Dl1Aud8MOk@+f)cGfJK(zj?SHwzoU?sWN
z@^`Q~Z!~{n9X~RVh-UGl8*wV2)vc8U%`TeLblP^!afomtD2|V-P9$?aqz^;Y3L&HM
z!PX06B0DgVPMfQl3p_VGNF1^!>xhHWcJv^I=&C12;$>B{3;XD_!<sS0_TcmoHx@O;
zg&3&qnR6dfuZWTCz(_i6uc8-|KcFR}Uw0%4QjD;OJnpVq?wDtAiYF$r2NQAK{7A+@
z4f-Lj`VnHKCO}|L$C6_L`8yx$1u>Bwn27J?MIdJ5xUa&h7s*2ikeD$lj{V`#a_Oj1
z8z?5S2NUVF$Ewtzygyh4De)`Z2-2#9zi=euC9#to*h%c>N?baSTPPy(%O`rYGA4El
zlgKRZHZ5(A)<bGjtYi;X(rc4d;n0@&sDmEfsyA`ucF1+mg4bI+imJgAjhDnuc3>x+
zwprtl(7DMBR;6`!q6dqVd!Gjz&l~SVLk>xck?f&2a<9EsGoWbLY-FNMt_1t>(TuLd
zqq$<eBv!HmE9tb|8is)OnA~%C%asHoCMlt7+(i#BbnLXU>ADLm>9y(VS%uvWDaX}(
zMKxrWR6~+t-I`Z^2<GgX*vSs;<VEBQoE_}cCiBdbkh9?;QmqHC{6t>44|*O#yY7Et
zBlp<I3naB-`y|?Ya6`^%k-ehGriiD5tR(I)Sucs9?7&c7sa2byb*?{8e#S<uHCA$;
z_hcO5b&LbaMHi{h2s`K)FPYCfGLBBWtw&_OXSbQsiW~uS130C$mY&8|Qd;+9C8?K{
zaAWv&Q6+Bw8BWQHTz+M|<SOpRJaRwt&>?JS18WK<>6D4aEj@#lM6~_bN9?q}iVjY+
zI@wAxf{7%1N-;wBBzP3bFxriQblO@yX7(Rj`6I{-$acyeL4{t?4VL7Qy%>n;W*~+Z
zDO*_q+)MBxDPW8;k`u5aBeC7W43W_7!(MES1)oo6z2j0w&U$xbB%StDk7zA_#W5a?
zBu964j5k?{9OLcCO#G`I&mbw$mm|FKbO!Oqx+I4)d$N$(ZB=^B=Rf$`SNe}m^aG7P
ze&?6sD}Vf042BIySIcqrvw!(YAM@*nkDo9iAHIG1o!*@3GfHFCVp*5p$oYRgAH2bP
z2#|oAnAssSG-PHRHjMLE{uAB$k5Av(u7B9j-4Oi&HOjDDM+UCZiZ@1XXgc`PBR8s|
z;>I$yM6Tj#0e3_@L6C17x$w{qNbC;$arhulujjtL_!+sogDEEsrLlt_poMG4H)!s3
zN>@q|qb39gSKf~kEL0;oe(h~7bbtBzFIRNH{RJ<exv_P8E)2Q+4_}V|rw{6Iah3kh
z58w02Q}~MHBrva^X8v@<7~qe8GMH+#A3lC2bNcD+H01rCFxH>+6_25L`WXKGU;iIz
KMRL?v!UzD|5zg=c

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/art/slot_0_idle.tgs b/Telegram/Resources/art/slot_0_idle.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..1d8a0955f1751a40a3a983f77b5f9757a2a76939
GIT binary patch
literal 9745
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

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/art/slot_1_idle.tgs b/Telegram/Resources/art/slot_1_idle.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..b6549225f778c0bc7f253fc6d49d38fc782d1665
GIT binary patch
literal 6191
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

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/art/slot_2_idle.tgs b/Telegram/Resources/art/slot_2_idle.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..c13193e81aef1e989a3931f7ba45b22c265562b9
GIT binary patch
literal 9730
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

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/art/slot_back.tgs b/Telegram/Resources/art/slot_back.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..5eaa214a3ad0d8c58a4646aa1173ffeaf53745f0
GIT binary patch
literal 1945
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

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/art/slot_pull.tgs b/Telegram/Resources/art/slot_pull.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..478b690679a1a0e6d6a339a9cef85749bacb18d2
GIT binary patch
literal 5484
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

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/qrc/telegram/telegram.qrc b/Telegram/Resources/qrc/telegram/telegram.qrc
index 86befe36e..291058f37 100644
--- a/Telegram/Resources/qrc/telegram/telegram.qrc
+++ b/Telegram/Resources/qrc/telegram/telegram.qrc
@@ -49,6 +49,13 @@
     <file alias="art/sunrise.jpg">../../art/sunrise.jpg</file>
     <file alias="art/dice_idle.tgs">../../art/dice_idle.tgs</file>
     <file alias="art/dart_idle.tgs">../../art/dart_idle.tgs</file>
+    <file alias="art/bball_idle.tgs">../../art/bball_idle.tgs</file>
+    <file alias="art/fball_idle.tgs">../../art/fball_idle.tgs</file>
+    <file alias="art/slot_0_idle.tgs">../../art/slot_0_idle.tgs</file>
+    <file alias="art/slot_1_idle.tgs">../../art/slot_1_idle.tgs</file>
+    <file alias="art/slot_2_idle.tgs">../../art/slot_2_idle.tgs</file>
+    <file alias="art/slot_back.tgs">../../art/slot_back.tgs</file>
+    <file alias="art/slot_pull.tgs">../../art/slot_pull.tgs</file>
     <file alias="day-blue.tdesktop-theme">../../day-blue.tdesktop-theme</file>
     <file alias="night.tdesktop-theme">../../night.tdesktop-theme</file>
     <file alias="night-green.tdesktop-theme">../../night-green.tdesktop-theme</file>
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index becdfceb8..3ee6026f6 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -225,6 +225,9 @@ bool SendDice(Api::MessageToSend &message) {
 		Stickers::DicePacks::kDiceString,
 		Stickers::DicePacks::kDartString,
 		Stickers::DicePacks::kSlotString,
+		Stickers::DicePacks::kFballString,
+		Stickers::DicePacks::kFballString + QChar(0xFE0F),
+		Stickers::DicePacks::kBballString,
 	};
 	const auto list = config.get<std::vector<QString>>(
 		"emojies_send_dice",
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
index 59a5c8ba4..631cc8df0 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.cpp
@@ -23,6 +23,8 @@ namespace Stickers {
 const QString DicePacks::kDiceString = QString::fromUtf8("\xF0\x9F\x8E\xB2");
 const QString DicePacks::kDartString = QString::fromUtf8("\xF0\x9F\x8E\xAF");
 const QString DicePacks::kSlotString = QString::fromUtf8("\xF0\x9F\x8E\xB0");
+const QString DicePacks::kFballString = QString::fromUtf8("\xE2\x9A\xBD");
+const QString DicePacks::kBballString = QString::fromUtf8("\xF0\x9F\x8F\x80");
 
 DicePack::DicePack(not_null<Main::Session*> session, const QString &emoji)
 : _session(session)
@@ -56,15 +58,15 @@ void DicePack::load() {
 }
 
 void DicePack::applySet(const MTPDmessages_stickerSet &data) {
-	_map.clear();
-	auto documents = base::flat_map<DocumentId, not_null<DocumentData*>>();
 	const auto isSlotMachine = DicePacks::IsSlot(_emoji);
+	auto index = 0;
+	auto documents = base::flat_map<DocumentId, not_null<DocumentData*>>();
 	for (const auto &sticker : data.vdocuments().v) {
 		const auto document = _session->data().processDocument(
 			sticker);
 		if (document->sticker()) {
 			if (isSlotMachine) {
-				_map.emplace(_map.size(), document);
+				_map.emplace(index++, document);
 			} else {
 				documents.emplace(document->id, document);
 			}
@@ -98,14 +100,25 @@ void DicePack::tryGenerateLocalZero() {
 		return;
 	}
 
-	const auto path = (_emoji == DicePacks::kDiceString)
-		? qsl(":/gui/art/dice_idle.tgs")
-		: (_emoji == DicePacks::kDartString)
-		? qsl(":/gui/art/dart_idle.tgs")
-		: QString();
-	if (path.isEmpty()) {
-		return;
+	if (_emoji == DicePacks::kDiceString) {
+		generateLocal(0, u"dice_idle"_q);
+	} else if (_emoji == DicePacks::kDartString) {
+		generateLocal(0, u"dart_idle"_q);
+	} else if (_emoji == DicePacks::kBballString) {
+		generateLocal(0, u"bball_idle"_q);
+	} else if (_emoji == DicePacks::kFballString) {
+		generateLocal(0, u"fball_idle"_q);
+	} else if (_emoji == DicePacks::kSlotString) {
+		generateLocal(0, u"slot_back"_q);
+		generateLocal(2, u"slot_pull"_q);
+		generateLocal(8, u"slot_0_idle"_q);
+		generateLocal(14, u"slot_1_idle"_q);
+		generateLocal(20, u"slot_2_idle"_q);
 	}
+}
+
+void DicePack::generateLocal(int index, const QString &name) {
+	const auto path = u":/gui/art/"_q + name + u".tgs"_q;
 	auto task = FileLoadTask(
 		_session,
 		path,
@@ -114,15 +127,15 @@ void DicePack::tryGenerateLocalZero() {
 		SendMediaType::File,
 		FileLoadTo(0, {}, 0),
 		{});
-	task.process();
+	task.process({ .generateGoodThumbnail = false });
 	const auto result = task.peekResult();
 	Assert(result != nullptr);
 	const auto document = _session->data().processDocument(
 		result->document,
-		Images::FromImageInMemory(result->thumb, "PNG"));
+		Images::FromImageInMemory(result->thumb, "WEBP", result->thumbbytes));
 	document->setLocation(Core::FileLocation(path));
 
-	_map.emplace(0, document);
+	_map.emplace(index, document);
 
 	Ensures(document->sticker());
 	Ensures(document->sticker()->animated);
@@ -132,13 +145,16 @@ DicePacks::DicePacks(not_null<Main::Session*> session) : _session(session) {
 }
 
 DocumentData *DicePacks::lookup(const QString &emoji, int value) {
-	const auto i = _packs.find(emoji);
+	const auto key = emoji.endsWith(QChar(0xFE0F))
+		? emoji.mid(0, emoji.size() - 1)
+		: emoji;
+	const auto i = _packs.find(key);
 	if (i != end(_packs)) {
 		return i->second->lookup(value);
 	}
 	return _packs.emplace(
-		emoji,
-		std::make_unique<DicePack>(_session, emoji)
+		key,
+		std::make_unique<DicePack>(_session, key)
 	).first->second->lookup(value);
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.h b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.h
index a1556ee25..e8752b84f 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_dice_pack.h
@@ -27,6 +27,7 @@ private:
 	void load();
 	void applySet(const MTPDmessages_stickerSet &data);
 	void tryGenerateLocalZero();
+	void generateLocal(int index, const QString &name);
 
 	const not_null<Main::Session*> _session;
 	QString _emoji;
@@ -42,6 +43,8 @@ public:
 	static const QString kDiceString;
 	static const QString kDartString;
 	static const QString kSlotString;
+	static const QString kFballString;
+	static const QString kBballString;
 
 	[[nodiscard]] static bool IsSlot(const QString &emoji) {
 		return (emoji == kSlotString);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_dice.cpp b/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
index 9c823b0b9..4afa66425 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_dice.cpp
@@ -32,9 +32,7 @@ namespace {
 Dice::Dice(not_null<Element*> parent, not_null<Data::MediaDice*> dice)
 : _parent(parent)
 , _dice(dice)
-, _link(_parent->data()->Has<HistoryMessageForwarded>()
-		? nullptr
-		: dice->makeHandler()) {
+, _link(dice->makeHandler()) {
 	if (const auto document = Lookup(parent, dice->emoji(), 0)) {
 		_start.emplace(parent, document);
 		_start->setDiceIndex(_dice->emoji(), 0);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp b/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp
index 67a2f2743..ddd1ef733 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp
@@ -72,9 +72,7 @@ SlotMachine::SlotMachine(
 	not_null<Data::MediaDice*> dice)
 : _parent(parent)
 , _dice(dice)
-, _link(_parent->data()->Has<HistoryMessageForwarded>()
-		? nullptr
-		: dice->makeHandler()) {
+, _link(dice->makeHandler()) {
 	resolveStarts();
 	_showLastFrame = _parent->data()->Has<HistoryMessageForwarded>();
 	if (_showLastFrame) {
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index d9c8a52a7..e1e67bf84 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -680,7 +680,7 @@ bool FileLoadTask::FillImageInformation(
 	return true;
 }
 
-void FileLoadTask::process() {
+void FileLoadTask::process(Args &&args) {
 	_result = std::make_shared<FileLoadResult>(
 		id(),
 		_id,
@@ -829,12 +829,13 @@ void FileLoadTask::process() {
 			}
 			attributes.push_back(MTP_documentAttributeVideo(MTP_flags(flags), MTP_int(video->duration), MTP_int(coverWidth), MTP_int(coverHeight)));
 
-			goodThumbnail = video->thumbnail;
-			{
-				QBuffer buffer(&goodThumbnailBytes);
-				goodThumbnail.save(&buffer, "JPG", kThumbnailQuality);
+			if (args.generateGoodThumbnail) {
+				goodThumbnail = video->thumbnail;
+				{
+					QBuffer buffer(&goodThumbnailBytes);
+					goodThumbnail.save(&buffer, "JPG", kThumbnailQuality);
+				}
 			}
-
 			thumbnail = PrepareFileThumbnail(std::move(video->thumbnail));
 		} else if (filemime == qstr("application/x-tdesktop-theme")
 			|| filemime == qstr("application/x-tgtheme-tdesktop")) {
@@ -863,7 +864,7 @@ void FileLoadTask::process() {
 					MTP_string(),
 					MTP_inputStickerSetEmpty(),
 					MTPMaskCoords()));
-				if (isAnimation) {
+				if (isAnimation && args.generateGoodThumbnail) {
 					goodThumbnail = fullimage;
 					{
 						QBuffer buffer(&goodThumbnailBytes);
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index e80058430..d744b5b4c 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -274,8 +274,15 @@ public:
 		return _id;
 	}
 
-	void process();
-	void finish();
+	struct Args {
+		bool generateGoodThumbnail = true;
+	};
+	void process(Args &&args);
+
+	void process() override {
+		process({});
+	}
+	void finish() override;
 
 	FileLoadResult *peekResult() const;
 

From 8d2fa313b7276c3e69ef1bb07ed0e6fea7378534 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 15 Oct 2020 17:27:16 +0300
Subject: [PATCH 095/190] Add setting for grouping files.

---
 Telegram/SourceFiles/apiwrap.cpp              |   3 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp | 278 ++++++++----------
 Telegram/SourceFiles/boxes/send_files_box.h   |  26 +-
 Telegram/SourceFiles/core/core_settings.cpp   |  17 +-
 Telegram/SourceFiles/core/core_settings.h     |   2 +-
 .../SourceFiles/history/history_widget.cpp    |  66 ++---
 Telegram/SourceFiles/history/history_widget.h |   9 +-
 .../view/history_view_replies_section.cpp     |  64 ++--
 .../view/history_view_replies_section.h       |   6 +-
 .../view/history_view_scheduled_section.cpp   |  62 ++--
 .../view/history_view_scheduled_section.h     |   6 +-
 .../main/main_session_settings.cpp            |  11 +-
 .../details/storage_settings_scheme.cpp       |   9 +-
 .../SourceFiles/storage/localimageloader.h    |   7 -
 .../storage/storage_media_prepare.cpp         |  24 +-
 .../ui/chat/attach/attach_album_preview.cpp   |  33 ++-
 .../ui/chat/attach/attach_album_preview.h     |   4 +-
 .../ui/chat/attach/attach_album_thumbnail.cpp |   4 +-
 .../ui/chat/attach/attach_album_thumbnail.h   |   2 +-
 .../ui/chat/attach/attach_common.h            |  24 --
 .../ui/chat/attach/attach_prepare.cpp         |  10 +-
 .../ui/chat/attach/attach_prepare.h           |  11 +-
 .../ui/chat/attach/attach_send_files_way.cpp  |  76 +++++
 .../ui/chat/attach/attach_send_files_way.h    |  72 +++++
 Telegram/cmake/td_ui.cmake                    |   3 +-
 25 files changed, 409 insertions(+), 420 deletions(-)
 delete mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_common.h
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.cpp
 create mode 100644 Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 686d8924a..1830eee54 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -4213,8 +4213,7 @@ void ApiWrap::sendFiles(
 		const SendAction &action) {
 	const auto haveCaption = !caption.text.isEmpty();
 	const auto isAlbum = (album != nullptr);
-	const auto compressImages = (type == SendMediaType::Photo);
-	if (haveCaption && !list.canAddCaption(isAlbum, compressImages)) {
+	if (haveCaption && !list.canAddCaption(isAlbum)) {
 		auto message = MessageToSend(action.history);
 		message.textWithTags = std::move(caption);
 		message.action = action;
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 16a389809..01d323c81 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -32,6 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/scroll_area.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/chat/attach/attach_prepare.h"
+#include "ui/chat/attach/attach_send_files_way.h"
 #include "ui/chat/attach/attach_album_preview.h"
 #include "ui/chat/attach/attach_single_file_preview.h"
 #include "ui/chat/attach/attach_single_media_preview.h"
@@ -97,9 +98,9 @@ void FileDialogCallback(
 rpl::producer<QString> FieldPlaceholder(
 		const Ui::PreparedList &list,
 		SendFilesWay way) {
-	const auto isAlbum = (way == SendFilesWay::Album);
-	const auto compressImages = (way != SendFilesWay::Files);
-	return list.canAddCaption(isAlbum, compressImages)
+	const auto isAlbum = list.singleAlbumIsPossible
+		&& way.groupMediaInAlbums();
+	return list.canAddCaption(isAlbum)
 		? tr::lng_photo_caption()
 		: tr::lng_photos_comment();
 }
@@ -111,15 +112,12 @@ SendFilesBox::SendFilesBox(
 	not_null<Window::SessionController*> controller,
 	Ui::PreparedList &&list,
 	const TextWithTags &caption,
-	CompressConfirm compressed,
 	SendLimit limit,
 	Api::SendType sendType,
 	SendMenu::Type sendMenuType)
 : _controller(controller)
 , _sendType(sendType)
 , _list(std::move(list))
-, _compressConfirmInitial(compressed)
-, _compressConfirm(compressed)
 , _sendLimit(limit)
 , _sendMenuType(sendMenuType)
 , _caption(
@@ -131,11 +129,13 @@ SendFilesBox::SendFilesBox(
 }
 
 void SendFilesBox::initPreview(rpl::producer<int> desiredPreviewHeight) {
+	using namespace rpl::mappers;
+
 	setupControls();
 
 	updateBoxSize();
 
-	using namespace rpl::mappers;
+	_dimensionsLifetime.destroy();
 	rpl::combine(
 		std::move(desiredPreviewHeight),
 		_footerHeight.value(),
@@ -145,7 +145,7 @@ void SendFilesBox::initPreview(rpl::producer<int> desiredPreviewHeight) {
 			st::boxWideWidth,
 			std::min(st::sendMediaPreviewHeightMax, height),
 			true);
-	}, lifetime());
+	}, _dimensionsLifetime);
 
 	if (_preview) {
 		_preview->show();
@@ -162,29 +162,23 @@ void SendFilesBox::prepareSingleFilePreview() {
 			Window::GifPauseReason::Layer);
 	}, file);
 	if (media) {
-		if (!media->canSendAsPhoto()) {
-			_compressConfirm = CompressConfirm::None;
-		}
 		_preview = media;
 		initPreview(media->desiredHeightValue());
 	} else {
 		const auto preview = Ui::CreateChild<Ui::SingleFilePreview>(this, file);
-		_compressConfirm = CompressConfirm::None;
 		_preview = preview;
 		initPreview(preview->desiredHeightValue());
 	}
 }
 
 void SendFilesBox::prepareAlbumPreview() {
-	Expects(_sendWay != nullptr);
-
 	const auto wrap = Ui::CreateChild<Ui::ScrollArea>(
 		this,
 		st::boxScroll);
 	_albumPreview = wrap->setOwnedWidget(object_ptr<Ui::AlbumPreview>(
 		this,
 		_list,
-		_sendWay->value()));
+		_sendWay.current()));
 
 	addThumbButtonHandlers(wrap);
 
@@ -214,15 +208,10 @@ void SendFilesBox::addThumbButtonHandlers(not_null<Ui::ScrollArea*> wrap) {
 		_albumPreview = nullptr;
 
 		if (IsSingleItem(_list)) {
-			_list.albumIsPossible = false;
-			if (_sendWay->value() == SendFilesWay::Album) {
-				_sendWay->setValue(SendFilesWay::Photos);
-			}
+			_list.singleAlbumIsPossible = false;
 		}
 
-		_compressConfirm = _compressConfirmInitial;
 		refreshAllAfterAlbumChanges();
-
 	}, _albumPreview->lifetime());
 
 	_albumPreview->thumbChanged(
@@ -297,20 +286,20 @@ void SendFilesBox::prepare() {
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
 	initSendWay();
 	setupCaption();
+	setupSendWayControls();
 	preparePreview();
+
 	boxClosing() | rpl::start_with_next([=] {
 		if (!_confirmed && _cancelledCallback) {
 			_cancelledCallback();
 		}
 	}, lifetime());
 
-	_addFileToAlbum = addLeftButton(
+	_addFile = addLeftButton(
 		tr::lng_stickers_featured_add(),
 		App::LambdaDelayed(st::historyAttach.ripple.hideDuration, this, [=] {
 			openDialogToAddFileToAlbum();
 		}));
-
-	updateLeftButtonVisibility();
 	setupDragArea();
 }
 
@@ -348,21 +337,9 @@ void SendFilesBox::setupDragArea() {
 	}, lifetime());
 }
 
-void SendFilesBox::updateLeftButtonVisibility() {
-	const auto isAlbum = _list.albumIsPossible
-		&& (_list.files.size() < Ui::MaxAlbumItems());
-	if (isAlbum || (IsSingleItem(_list) && IsFirstAlbumItem(_list))) {
-		_addFileToAlbum->show();
-	} else {
-		_addFileToAlbum->hide();
-	}
-}
-
 void SendFilesBox::refreshAllAfterAlbumChanges() {
-	refreshAlbumMediaCount();
 	preparePreview();
 	captionResized();
-	updateLeftButtonVisibility();
 	_albumChanged.fire({});
 }
 
@@ -384,36 +361,23 @@ void SendFilesBox::openDialogToAddFileToAlbum() {
 }
 
 void SendFilesBox::initSendWay() {
-	refreshAlbumMediaCount();
-	const auto value = [&] {
-		if (_sendLimit == SendLimit::One
-			&& _list.albumIsPossible
-			&& _list.files.size() > 1) {
-			return SendFilesWay::Album;
+	_sendWay = [&] {
+		auto result = Core::App().settings().sendFilesWay();
+		if (_sendLimit == SendLimit::One) {
+			result.setGroupMediaInAlbums(true);
+			result.setGroupFiles(true);
+			return result;
+		} else if (_list.overrideSendImagesAsPhotos == false) {
+			result.setSendImagesAsPhotos(false);
+			return result;
+		} else if (_list.overrideSendImagesAsPhotos == true) {
+			result.setSendImagesAsPhotos(true);
+			return result;
 		}
-		if (_compressConfirm == CompressConfirm::None) {
-			return SendFilesWay::Files;
-		} else if (_compressConfirm == CompressConfirm::No) {
-			return SendFilesWay::Files;
-		} else if (_compressConfirm == CompressConfirm::Yes) {
-			return _list.albumIsPossible
-				? SendFilesWay::Album
-				: SendFilesWay::Photos;
-		}
-		const auto way = Core::App().settings().sendFilesWay();
-		if (way == SendFilesWay::Files) {
-			return way;
-		} else if (way == SendFilesWay::Album) {
-			return _list.albumIsPossible
-				? SendFilesWay::Album
-				: SendFilesWay::Photos;
-		}
-		return (_list.albumIsPossible && !_albumPhotosCount)
-			? SendFilesWay::Album
-			: SendFilesWay::Photos;
+		return result;
 	}();
-	_sendWay = std::make_shared<Ui::RadioenumGroup<SendFilesWay>>(value);
-	_sendWay->setChangedCallback([=](SendFilesWay value) {
+	_sendWay.changes(
+	) | rpl::start_with_next([=](SendFilesWay value) {
 		updateCaptionPlaceholder();
 		applyAlbumOrder();
 		if (_albumPreview) {
@@ -421,18 +385,17 @@ void SendFilesBox::initSendWay() {
 		}
 		updateEmojiPanelGeometry();
 		setInnerFocus();
-	});
+	}, lifetime());
 }
 
 void SendFilesBox::updateCaptionPlaceholder() {
 	if (!_caption) {
 		return;
 	}
-	const auto sendWay = _sendWay->value();
-	const auto isAlbum = (sendWay == SendFilesWay::Album);
-	const auto compressImages = (sendWay != SendFilesWay::Files);
-	if (!_list.canAddCaption(isAlbum, compressImages)
-		&& _sendLimit == SendLimit::One) {
+	const auto sendWay = _sendWay.current();
+	const auto isAlbum = _list.singleAlbumIsPossible
+		&& sendWay.groupMediaInAlbums();
+	if (!_list.canAddCaption(isAlbum) && _sendLimit == SendLimit::One) {
 		_caption->hide();
 		if (_emojiToggle) {
 			_emojiToggle->hide();
@@ -446,67 +409,74 @@ void SendFilesBox::updateCaptionPlaceholder() {
 	}
 }
 
-void SendFilesBox::refreshAlbumMediaCount() {
-	_albumVideosCount = _list.albumIsPossible
-		? ranges::count(
-			_list.files,
-			Ui::PreparedFile::AlbumType::Video,
-			[](const Ui::PreparedFile &file) { return file.type; })
-		: 0;
-	_albumPhotosCount = _list.albumIsPossible
-		? (_list.files.size() - _albumVideosCount)
-		: 0;
-}
-
 void SendFilesBox::preparePreview() {
 	if (IsSingleItem(_list)) {
 		prepareSingleFilePreview();
 	} else {
-		if (_list.albumIsPossible) {
-			prepareAlbumPreview();
-		} else {
-			auto desiredPreviewHeight = rpl::single(0);
-			initPreview(std::move(desiredPreviewHeight));
-		}
+		prepareAlbumPreview(); // #TODO files many albums
 	}
 }
 
 void SendFilesBox::setupControls() {
 	setupTitleText();
-	setupSendWayControls();
+	updateSendWayControlsVisibility();
 }
 
 void SendFilesBox::setupSendWayControls() {
-	_sendAlbum.destroy();
-	_sendPhotos.destroy();
-	_sendFiles.destroy();
-	if (_compressConfirm == CompressConfirm::None
-		|| _sendLimit == SendLimit::One) {
+	// #TODO files
+	_groupMediaInAlbums.create(
+		this,
+		"Group media in albums",
+		_sendWay.current().groupMediaInAlbums(),
+		st::defaultBoxCheckbox);
+	_sendImagesAsPhotos.create(
+		this,
+		"Send images as photos",
+		_sendWay.current().sendImagesAsPhotos(),
+		st::defaultBoxCheckbox);
+	_groupFiles.create(
+		this,
+		"Group files",
+		_sendWay.current().groupFiles(),
+		st::defaultBoxCheckbox);
+
+	_sendWay.changes(
+	) | rpl::start_with_next([=](SendFilesWay value) {
+		_groupMediaInAlbums->setChecked(value.groupMediaInAlbums());
+		_sendImagesAsPhotos->setChecked(value.sendImagesAsPhotos());
+		_groupFiles->setChecked(value.groupFiles());
+	}, lifetime());
+
+	_groupMediaInAlbums->checkedChanges(
+	) | rpl::start_with_next([=] {
+		auto sendWay = _sendWay.current();
+		sendWay.setGroupMediaInAlbums(_groupMediaInAlbums->checked());
+		_sendWay = sendWay;
+	}, lifetime());
+
+	_sendImagesAsPhotos->checkedChanges(
+	) | rpl::start_with_next([=] {
+		auto sendWay = _sendWay.current();
+		sendWay.setSendImagesAsPhotos(_sendImagesAsPhotos->checked());
+		_sendWay = sendWay;
+	}, lifetime());
+
+	_groupFiles->checkedChanges(
+	) | rpl::start_with_next([=] {
+		auto sendWay = _sendWay.current();
+		sendWay.setGroupFiles(_groupFiles->checked());
+		_sendWay = sendWay;
+	}, lifetime());
+}
+
+void SendFilesBox::updateSendWayControlsVisibility() {
+	if (_sendLimit == SendLimit::One) {
 		return;
 	}
-	const auto addRadio = [&](
-			object_ptr<Ui::Radioenum<SendFilesWay>> &button,
-			SendFilesWay value,
-			const QString &text) {
-		const auto &style = st::defaultBoxCheckbox;
-		button.create(this, _sendWay, value, text, style);
-		button->show();
-	};
-	if (_list.albumIsPossible) {
-		addRadio(_sendAlbum, SendFilesWay::Album, tr::lng_send_album(tr::now));
-	}
-	if (!_list.albumIsPossible || _albumPhotosCount > 0) {
-		addRadio(_sendPhotos, SendFilesWay::Photos, IsSingleItem(_list)
-			? tr::lng_send_photo(tr::now)
-			: (_albumVideosCount > 0)
-			? tr::lng_send_separate_photos_videos(tr::now)
-			: (_list.albumIsPossible
-				? tr::lng_send_separate_photos(tr::now)
-				: tr::lng_send_photos(tr::now, lt_count, _list.files.size())));
-	}
-	addRadio(_sendFiles, SendFilesWay::Files, (IsSingleItem(_list))
-		? tr::lng_send_file(tr::now)
-		: tr::lng_send_files(tr::now, lt_count, _list.files.size()));
+	const auto onlyOne = (_sendLimit == SendLimit::One);
+	_groupMediaInAlbums->setVisible(!onlyOne);
+	_sendImagesAsPhotos->setVisible(/*_list.hasImagesForCompression()*/true); // #TODO files
+	_groupFiles->setVisible(!onlyOne);
 }
 
 void SendFilesBox::applyAlbumOrder() {
@@ -682,34 +652,29 @@ bool SendFilesBox::addFiles(Ui::PreparedList list) {
 	const auto cutToAlbumSize = (sumFiles > Ui::MaxAlbumItems());
 	if (list.error != Ui::PreparedList::Error::None) {
 		return false;
-	} else if (!IsSingleItem(list) && !list.albumIsPossible) {
-		return false;
-	} else if (!IsFirstAlbumItem(list)) {
-		return false;
-	} else if (_list.files.size() > 1 && !_albumPreview) {
-		return false;
-	} else if (!IsFirstAlbumItem(_list)) {
-		return false;
+	//} else if (!IsSingleItem(list) && !list.albumIsPossible) { // #TODO files
+	//	return false;
+	//} else if (!IsFirstAlbumItem(list)) {
+	//	return false;
+	//} else if (_list.files.size() > 1 && !_albumPreview) {
+	//	return false;
+	//} else if (!IsFirstAlbumItem(_list)) {
+	//	return false;
 	}
 	applyAlbumOrder();
 	delete base::take(_preview);
 	_albumPreview = nullptr;
 
-	if (IsSingleItem(_list)
-		&& _sendWay->value() == SendFilesWay::Photos) {
-		_sendWay->setValue(SendFilesWay::Album);
-	}
 	_list.mergeToEnd(std::move(list), cutToAlbumSize);
 
-	_compressConfirm = _compressConfirmInitial;
 	refreshAllAfterAlbumChanges();
 	return true;
 }
 
 void SendFilesBox::setupTitleText() {
 	if (_list.files.size() > 1) {
-		const auto onlyImages = (_compressConfirm != CompressConfirm::None)
-			&& (_albumVideosCount == 0);
+		const auto onlyImages = false;/* #TODO files (_compressConfirm != CompressConfirm::None)
+			&& (_albumVideosCount == 0);*/
 		_titleText = onlyImages
 			? tr::lng_send_images_selected(tr::now, lt_count, _list.files.size())
 			: tr::lng_send_files_selected(tr::now, lt_count, _list.files.size());
@@ -726,12 +691,12 @@ void SendFilesBox::updateBoxSize() {
 		footerHeight += st::boxPhotoCaptionSkip + _caption->height();
 	}
 	const auto pointers = {
-		_sendAlbum.data(),
-		_sendPhotos.data(),
-		_sendFiles.data()
+		_groupMediaInAlbums.data(),
+		_sendImagesAsPhotos.data(),
+		_groupFiles.data()
 	};
 	for (auto pointer : pointers) {
-		if (pointer) {
+		if (pointer && !pointer->isHidden()) {
 			footerHeight += st::boxPhotoCompressedSkip
 				+ pointer->heightNoMargins();
 		}
@@ -740,7 +705,7 @@ void SendFilesBox::updateBoxSize() {
 }
 
 void SendFilesBox::keyPressEvent(QKeyEvent *e) {
-	if (e->matches(QKeySequence::Open) && !_addFileToAlbum->isHidden()) {
+	if (e->matches(QKeySequence::Open)) {
 		openDialogToAddFileToAlbum();
 	} else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
 		const auto modifiers = e->modifiers();
@@ -792,12 +757,12 @@ void SendFilesBox::updateControlsGeometry() {
 		}
 	}
 	const auto pointers = {
-		_sendAlbum.data(),
-		_sendPhotos.data(),
-		_sendFiles.data()
+		_groupMediaInAlbums.data(),
+		_sendImagesAsPhotos.data(),
+		_groupFiles.data()
 	};
 	for (const auto pointer : ranges::view::reverse(pointers)) {
-		if (pointer) {
+		if (pointer && !pointer->isHidden()) {
 			pointer->moveToLeft(
 				st::boxPhotoPadding.left(),
 				bottom - pointer->heightNoMargins());
@@ -827,22 +792,21 @@ void SendFilesBox::send(
 		return sendScheduled();
 	}
 
-	using Way = SendFilesWay;
-	const auto way = _sendWay ? _sendWay->value() : Way::Files;
-
-	if (_compressConfirm == CompressConfirm::Auto) {
-		const auto oldWay = Core::App().settings().sendFilesWay();
-		if (way != oldWay) {
-			// Check if the user _could_ use the old value, but didn't.
-			if ((oldWay == Way::Album && _sendAlbum)
-				|| (oldWay == Way::Photos && _sendPhotos)
-				|| (oldWay == Way::Files && _sendFiles)
-				|| (way == Way::Files && (_sendAlbum || _sendPhotos))) {
-				// And in that case save it to settings.
-				Core::App().settings().setSendFilesWay(way);
-				Core::App().saveSettingsDelayed();
-			}
-		}
+	auto way = _sendWay.current();
+	auto oldWay = Core::App().settings().sendFilesWay();
+	if (_list.overrideSendImagesAsPhotos == way.sendImagesAsPhotos()
+		|| _sendImagesAsPhotos->isHidden()) {
+		way.setSendImagesAsPhotos(oldWay.sendImagesAsPhotos());
+	}
+	if (_groupMediaInAlbums->isHidden()) {
+		way.setGroupMediaInAlbums(oldWay.groupMediaInAlbums());
+	}
+	if (_groupFiles->isHidden()) {
+		way.setGroupFiles(oldWay.groupFiles());
+	}
+	if (way != oldWay) {
+		Core::App().settings().setSendFilesWay(way);
+		Core::App().saveSettingsDelayed();
 	}
 
 	applyAlbumOrder();
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index 4b99028d7..46ffe34b5 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <rpl/variable.h>
 #include "boxes/abstract_box.h"
 #include "ui/chat/attach/attach_prepare.h"
+#include "ui/chat/attach/attach_send_files_way.h"
 #include "storage/localimageloader.h"
 #include "storage/storage_media_prepare.h"
 
@@ -27,16 +28,12 @@ class TabbedPanel;
 } // namespace ChatHelpers
 
 namespace Ui {
-template <typename Enum>
-class Radioenum;
-template <typename Enum>
-class RadioenumGroup;
+class Checkbox;
 class RoundButton;
 class InputField;
 struct GroupMediaLayout;
 class EmojiButton;
 class AlbumPreview;
-enum class SendFilesWay;
 } // namespace Ui
 
 namespace Window {
@@ -58,7 +55,6 @@ public:
 		not_null<Window::SessionController*> controller,
 		Ui::PreparedList &&list,
 		const TextWithTags &caption,
-		CompressConfirm compressed,
 		SendLimit limit,
 		Api::SendType sendType,
 		SendMenu::Type sendMenuType);
@@ -98,10 +94,10 @@ private:
 		not_null<Ui::AlbumPreview*> content);
 
 	void setupEmojiPanel();
+	void updateSendWayControlsVisibility();
 	void updateEmojiPanelGeometry();
 	void emojiFilterForGeometry(not_null<QEvent*> event);
 
-	void refreshAlbumMediaCount();
 	void preparePreview();
 	void prepareSingleFilePreview();
 	void prepareAlbumPreview();
@@ -125,7 +121,6 @@ private:
 	bool addFiles(Ui::PreparedList list);
 
 	void openDialogToAddFileToAlbum();
-	void updateLeftButtonVisibility();
 	void refreshAllAfterAlbumChanges();
 
 	const not_null<Window::SessionController*> _controller;
@@ -136,8 +131,6 @@ private:
 
 	Ui::PreparedList _list;
 
-	CompressConfirm _compressConfirmInitial = CompressConfirm::None;
-	CompressConfirm _compressConfirm = CompressConfirm::None;
 	SendLimit _sendLimit = SendLimit::Many;
 	SendMenu::Type _sendMenuType = SendMenu::Type();
 
@@ -155,22 +148,21 @@ private:
 	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
 	base::unique_qptr<QObject> _emojiFilter;
 
-	object_ptr<Ui::Radioenum<Ui::SendFilesWay>> _sendAlbum = { nullptr };
-	object_ptr<Ui::Radioenum<Ui::SendFilesWay>> _sendPhotos = { nullptr };
-	object_ptr<Ui::Radioenum<Ui::SendFilesWay>> _sendFiles = { nullptr };
-	std::shared_ptr<Ui::RadioenumGroup<Ui::SendFilesWay>> _sendWay;
+	object_ptr<Ui::Checkbox> _groupMediaInAlbums = { nullptr };
+	object_ptr<Ui::Checkbox> _sendImagesAsPhotos = { nullptr };
+	object_ptr<Ui::Checkbox> _groupFiles = { nullptr };
+	rpl::variable<Ui::SendFilesWay> _sendWay = Ui::SendFilesWay();
 
 	rpl::variable<int> _footerHeight = 0;
 	rpl::event_stream<> _albumChanged;
+	rpl::lifetime _dimensionsLifetime;
 
 	QWidget *_preview = nullptr;
 	Ui::AlbumPreview *_albumPreview = nullptr;
-	int _albumVideosCount = 0;
-	int _albumPhotosCount = 0;
 
 	int _lastScrollTop = 0;
 
 	QPointer<Ui::RoundButton> _send;
-	QPointer<Ui::RoundButton> _addFileToAlbum;
+	QPointer<Ui::RoundButton> _addFile;
 
 };
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 41d138ebf..c6ea4b8dc 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "boxes/send_files_box.h"
 #include "ui/widgets/input_fields.h"
-#include "ui/chat/attach/attach_common.h"
 #include "storage/serialize_common.h"
 #include "window/themes/window_theme.h"
 #include "window/section_widget.h"
@@ -19,8 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Core {
 
 Settings::Settings()
-: _sendFilesWay(Ui::SendFilesWay::Album)
-, _sendSubmitWay(Ui::InputSubmitSettings::Enter)
+: _sendSubmitWay(Ui::InputSubmitSettings::Enter)
 , _floatPlayerColumn(Window::Column::Second)
 , _floatPlayerCorner(RectPart::TopRight)
 , _dialogsWidthRatio(DefaultDialogsWidthRatio()) {
@@ -76,7 +74,7 @@ QByteArray Settings::serialize() const {
 			stream << key << value;
 		}
 		stream
-			<< qint32(_sendFilesWay)
+			<< qint32(_sendFilesWay.serialize())
 			<< qint32(_sendSubmitWay)
 			<< qint32(_includeMutedCounter ? 1 : 0)
 			<< qint32(_countUnreadMessages ? 1 : 0)
@@ -150,7 +148,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 lastSeenWarningSeen = _lastSeenWarningSeen ? 1 : 0;
 	qint32 soundOverridesCount = 0;
 	base::flat_map<QString, QString> soundOverrides;
-	qint32 sendFilesWay = static_cast<qint32>(_sendFilesWay);
+	qint32 sendFilesWay = _sendFilesWay.serialize();
 	qint32 sendSubmitWay = static_cast<qint32>(_sendSubmitWay);
 	qint32 includeMutedCounter = _includeMutedCounter ? 1 : 0;
 	qint32 countUnreadMessages = _countUnreadMessages ? 1 : 0;
@@ -310,12 +308,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_callAudioDuckingEnabled = (callAudioDuckingEnabled == 1);
 	_lastSeenWarningSeen = (lastSeenWarningSeen == 1);
 	_soundOverrides = std::move(soundOverrides);
-	auto uncheckedSendFilesWay = static_cast<Ui::SendFilesWay>(sendFilesWay);
-	switch (uncheckedSendFilesWay) {
-	case Ui::SendFilesWay::Album:
-	case Ui::SendFilesWay::Photos:
-	case Ui::SendFilesWay::Files: _sendFilesWay = uncheckedSendFilesWay; break;
-	}
+	_sendFilesWay = Ui::SendFilesWay::FromSerialized(sendFilesWay).value_or(_sendFilesWay);
 	auto uncheckedSendSubmitWay = static_cast<Ui::InputSubmitSettings>(sendSubmitWay);
 	switch (uncheckedSendSubmitWay) {
 	case Ui::InputSubmitSettings::Enter:
@@ -470,7 +463,7 @@ void Settings::resetOnLastLogout() {
 	//_themesAccentColors = Window::Theme::AccentColors();
 
 	_lastSeenWarningSeen = false;
-	_sendFilesWay = Ui::SendFilesWay::Album;
+	_sendFilesWay = Ui::SendFilesWay();
 	//_sendSubmitWay = Ui::InputSubmitSettings::Enter;
 	_soundOverrides = {};
 
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index bab3bd920..dbb3a8933 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -9,12 +9,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "window/themes/window_themes_embedded.h"
 #include "window/window_controls_layout.h"
+#include "ui/chat/attach/attach_send_files_way.h"
 
 enum class RectPart;
 
 namespace Ui {
 enum class InputSubmitSettings;
-enum class SendFilesWay;
 } // namespace Ui
 
 namespace Window {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 8bd28b1dc..4a50804bd 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -31,7 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h" // Ui::Text::ToUpper
 #include "ui/text/format_values.h"
 #include "ui/chat/message_bar.h"
-#include "ui/chat/attach/attach_common.h"
+#include "ui/chat/attach/attach_send_files_way.h"
 #include "ui/image/image.h"
 #include "ui/special_buttons.h"
 #include "ui/controls/emoji_button.h"
@@ -327,10 +327,7 @@ HistoryWidget::HistoryWidget(
 		if (action == Ui::InputField::MimeAction::Check) {
 			return canSendFiles(data);
 		} else if (action == Ui::InputField::MimeAction::Insert) {
-			return confirmSendingFiles(
-				data,
-				CompressConfirm::Auto,
-				data->text());
+			return confirmSendingFiles(data, std::nullopt, data->text());
 		}
 		Unexpected("action in MimeData hook.");
 	});
@@ -375,11 +372,11 @@ HistoryWidget::HistoryWidget(
 		crl::guard(this, [=](bool f) { _field->setAcceptDrops(f); }),
 		crl::guard(this, [=] { updateControlsGeometry(); }));
 	_attachDragAreas.document->setDroppedCallback([=](const QMimeData *data) {
-		confirmSendingFiles(data, CompressConfirm::No);
+		confirmSendingFiles(data, false);
 		Window::ActivateWindow(controller);
 	});
 	_attachDragAreas.photo->setDroppedCallback([=](const QMimeData *data) {
-		confirmSendingFiles(data, CompressConfirm::Yes);
+		confirmSendingFiles(data, true);
 		Window::ActivateWindow(controller);
 	});
 
@@ -3298,8 +3295,7 @@ void HistoryWidget::chooseAttach() {
 			if (!image.isNull() && !animated) {
 				confirmSendingFiles(
 					std::move(image),
-					std::move(result.remoteContent),
-					CompressConfirm::Auto);
+					std::move(result.remoteContent));
 			} else {
 				uploadFile(result.remoteContent, SendMediaType::File);
 			}
@@ -3307,11 +3303,7 @@ void HistoryWidget::chooseAttach() {
 			auto list = Storage::PrepareMediaList(
 				result.paths,
 				st::sendMediaPreviewSize);
-			if (list.allFilesForCompress || list.albumIsPossible) {
-				confirmSendingFiles(std::move(list), CompressConfirm::Auto);
-			} else if (!showSendingFilesError(list)) {
-				confirmSendingFiles(std::move(list), CompressConfirm::No);
-			}
+			confirmSendingFiles(std::move(list));
 		}
 	}), nullptr);
 }
@@ -4107,7 +4099,7 @@ bool HistoryWidget::showSendingFilesError(
 		}
 		if (list.files.size() > 1
 			&& _peer->slowmodeApplied()
-			&& !list.albumIsPossible) {
+			&& !list.singleAlbumIsPossible) {
 			return tr::lng_slowmode_no_many(tr::now);
 		} else if (const auto left = _peer->slowmodeSecondsLeft()) {
 			return tr::lng_slowmode_enabled(
@@ -4142,26 +4134,23 @@ bool HistoryWidget::showSendingFilesError(
 }
 
 bool HistoryWidget::confirmSendingFiles(const QStringList &files) {
-	return confirmSendingFiles(files, CompressConfirm::Auto);
+	return confirmSendingFiles(files, QString());
 }
 
 bool HistoryWidget::confirmSendingFiles(not_null<const QMimeData*> data) {
-	return confirmSendingFiles(data, CompressConfirm::Auto);
+	return confirmSendingFiles(data, std::nullopt);
 }
 
 bool HistoryWidget::confirmSendingFiles(
 		const QStringList &files,
-		CompressConfirm compressed,
 		const QString &insertTextOnCancel) {
 	return confirmSendingFiles(
 		Storage::PrepareMediaList(files, st::sendMediaPreviewSize),
-		compressed,
 		insertTextOnCancel);
 }
 
 bool HistoryWidget::confirmSendingFiles(
 		Ui::PreparedList &&list,
-		CompressConfirm compressed,
 		const QString &insertTextOnCancel) {
 	if (showSendingFilesError(list)) {
 		return false;
@@ -4171,13 +4160,6 @@ bool HistoryWidget::confirmSendingFiles(
 		return false;
 	}
 
-	const auto noCompressOption = (list.files.size() > 1)
-		&& !list.allFilesForCompress
-		&& !list.albumIsPossible;
-	const auto boxCompressConfirm = noCompressOption
-		? CompressConfirm::None
-		: compressed;
-
 	const auto cursor = _field->textCursor();
 	const auto position = cursor.position();
 	const auto anchor = cursor.anchor();
@@ -4187,7 +4169,6 @@ bool HistoryWidget::confirmSendingFiles(
 		controller(),
 		std::move(list),
 		text,
-		boxCompressConfirm,
 		_peer->slowmodeApplied() ? SendLimit::One : SendLimit::Many,
 		Api::SendType::Normal,
 		sendMenuType());
@@ -4201,10 +4182,10 @@ bool HistoryWidget::confirmSendingFiles(
 		if (showSendingFilesError(list)) {
 			return;
 		}
-		const auto type = (way == Ui::SendFilesWay::Files)
-			? SendMediaType::File
-			: SendMediaType::Photo;
-		const auto album = (way == Ui::SendFilesWay::Album)
+		const auto type = way.sendImagesAsPhotos()
+			? SendMediaType::Photo
+			: SendMediaType::File;
+		const auto album = way.groupMediaInAlbums() // #TODO files
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
 		uploadFilesAfterConfirmation(
@@ -4238,7 +4219,7 @@ bool HistoryWidget::confirmSendingFiles(
 bool HistoryWidget::confirmSendingFiles(
 		QImage &&image,
 		QByteArray &&content,
-		CompressConfirm compressed,
+		std::optional<bool> overrideSendImagesAsPhotos,
 		const QString &insertTextOnCancel) {
 	if (image.isNull()) {
 		return false;
@@ -4248,10 +4229,8 @@ bool HistoryWidget::confirmSendingFiles(
 		std::move(image),
 		std::move(content),
 		st::sendMediaPreviewSize);
-	return confirmSendingFiles(
-		std::move(list),
-		compressed,
-		insertTextOnCancel);
+	list.overrideSendImagesAsPhotos = overrideSendImagesAsPhotos;
+	return confirmSendingFiles(std::move(list), insertTextOnCancel);
 }
 
 bool HistoryWidget::canSendFiles(not_null<const QMimeData*> data) const {
@@ -4269,7 +4248,7 @@ bool HistoryWidget::canSendFiles(not_null<const QMimeData*> data) const {
 
 bool HistoryWidget::confirmSendingFiles(
 		not_null<const QMimeData*> data,
-		CompressConfirm compressed,
+		std::optional<bool> overrideSendImagesAsPhotos,
 		const QString &insertTextOnCancel) {
 	if (!canWriteMessage()) {
 		return false;
@@ -4285,10 +4264,8 @@ bool HistoryWidget::confirmSendingFiles(
 			if (list.error == Ui::PreparedList::Error::None
 				|| !hasImage) {
 				const auto emptyTextOnCancel = QString();
-				confirmSendingFiles(
-					std::move(list),
-					compressed,
-					emptyTextOnCancel);
+				list.overrideSendImagesAsPhotos = overrideSendImagesAsPhotos;
+				confirmSendingFiles(std::move(list), emptyTextOnCancel);
 				return true;
 			}
 		}
@@ -4303,7 +4280,7 @@ bool HistoryWidget::confirmSendingFiles(
 			confirmSendingFiles(
 				std::move(image),
 				QByteArray(),
-				compressed,
+				overrideSendImagesAsPhotos,
 				insertTextOnCancel);
 			return true;
 		}
@@ -4321,12 +4298,11 @@ void HistoryWidget::uploadFilesAfterConfirmation(
 	Assert(canWriteMessage());
 
 	const auto isAlbum = (album != nullptr);
-	const auto compressImages = (type == SendMediaType::Photo);
 	if (_peer->slowmodeApplied()
 		&& ((list.files.size() > 1 && !album)
 			|| (!list.files.empty()
 				&& !caption.text.isEmpty()
-				&& !list.canAddCaption(isAlbum, compressImages)))) {
+				&& !list.canAddCaption(isAlbum)))) {
 		Ui::ShowMultilineToast({
 			.text = { tr::lng_slowmode_no_many(tr::now) },
 		});
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 2e5f034c8..377bb4ede 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -23,7 +23,6 @@ class RPCError;
 struct FileLoadResult;
 struct SendingAlbum;
 enum class SendMediaType;
-enum class CompressConfirm;
 class MessageLinksParser;
 
 namespace SendMenu {
@@ -411,20 +410,18 @@ private:
 	bool canSendFiles(not_null<const QMimeData*> data) const;
 	bool confirmSendingFiles(
 		const QStringList &files,
-		CompressConfirm compressed,
-		const QString &insertTextOnCancel = QString());
+		const QString &insertTextOnCancel);
 	bool confirmSendingFiles(
 		QImage &&image,
 		QByteArray &&content,
-		CompressConfirm compressed,
+		std::optional<bool> overrideSendImagesAsPhotos = std::nullopt,
 		const QString &insertTextOnCancel = QString());
 	bool confirmSendingFiles(
 		not_null<const QMimeData*> data,
-		CompressConfirm compressed,
+		std::optional<bool> overrideSendImagesAsPhotos,
 		const QString &insertTextOnCancel = QString());
 	bool confirmSendingFiles(
 		Ui::PreparedList &&list,
-		CompressConfirm compressed,
 		const QString &insertTextOnCancel = QString());
 	bool showSendingFilesError(const Ui::PreparedList &list) const;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 37d256a6b..6415cd87a 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/chat/attach/attach_prepare.h"
-#include "ui/chat/attach/attach_common.h"
+#include "ui/chat/attach/attach_send_files_way.h"
 #include "ui/special_buttons.h"
 #include "ui/ui_utility.h"
 #include "ui/toasts/common_toasts.h"
@@ -505,10 +505,7 @@ void RepliesWidget::setupComposeControls() {
 		if (action == Ui::InputField::MimeAction::Check) {
 			return CanSendFiles(data);
 		} else if (action == Ui::InputField::MimeAction::Insert) {
-			return confirmSendingFiles(
-				data,
-				CompressConfirm::Auto,
-				data->text());
+			return confirmSendingFiles(data, std::nullopt, data->text());
 		}
 		Unexpected("action in MimeData hook.");
 	});
@@ -545,8 +542,7 @@ void RepliesWidget::chooseAttach() {
 			if (!image.isNull() && !animated) {
 				confirmSendingFiles(
 					std::move(image),
-					std::move(result.remoteContent),
-					CompressConfirm::Auto);
+					std::move(result.remoteContent));
 			} else {
 				uploadFile(result.remoteContent, SendMediaType::File);
 			}
@@ -554,18 +550,14 @@ void RepliesWidget::chooseAttach() {
 			auto list = Storage::PrepareMediaList(
 				result.paths,
 				st::sendMediaPreviewSize);
-			if (list.allFilesForCompress || list.albumIsPossible) {
-				confirmSendingFiles(std::move(list), CompressConfirm::Auto);
-			} else if (!showSendingFilesError(list)) {
-				confirmSendingFiles(std::move(list), CompressConfirm::No);
-			}
+			confirmSendingFiles(std::move(list));
 		}
 	}), nullptr);
 }
 
 bool RepliesWidget::confirmSendingFiles(
 		not_null<const QMimeData*> data,
-		CompressConfirm compressed,
+		std::optional<bool> overrideSendImagesAsPhotos,
 		const QString &insertTextOnCancel) {
 	const auto hasImage = data->hasImage();
 
@@ -577,10 +569,8 @@ bool RepliesWidget::confirmSendingFiles(
 			if (list.error == Ui::PreparedList::Error::None
 				|| !hasImage) {
 				const auto emptyTextOnCancel = QString();
-				confirmSendingFiles(
-					std::move(list),
-					compressed,
-					emptyTextOnCancel);
+				list.overrideSendImagesAsPhotos = overrideSendImagesAsPhotos;
+				confirmSendingFiles(std::move(list), emptyTextOnCancel);
 				return true;
 			}
 		}
@@ -595,7 +585,7 @@ bool RepliesWidget::confirmSendingFiles(
 			confirmSendingFiles(
 				std::move(image),
 				QByteArray(),
-				compressed,
+				overrideSendImagesAsPhotos,
 				insertTextOnCancel);
 			return true;
 		}
@@ -605,19 +595,11 @@ bool RepliesWidget::confirmSendingFiles(
 
 bool RepliesWidget::confirmSendingFiles(
 		Ui::PreparedList &&list,
-		CompressConfirm compressed,
 		const QString &insertTextOnCancel) {
 	if (showSendingFilesError(list)) {
 		return false;
 	}
 
-	const auto noCompressOption = (list.files.size() > 1)
-		&& !list.allFilesForCompress
-		&& !list.albumIsPossible;
-	const auto boxCompressConfirm = noCompressOption
-		? CompressConfirm::None
-		: compressed;
-
 	//const auto cursor = _field->textCursor();
 	//const auto position = cursor.position();
 	//const auto anchor = cursor.anchor();
@@ -627,7 +609,6 @@ bool RepliesWidget::confirmSendingFiles(
 		controller(),
 		std::move(list),
 		text,
-		boxCompressConfirm,
 		_history->peer->slowmodeApplied() ? SendLimit::One : SendLimit::Many,
 		Api::SendType::Normal,
 		SendMenu::Type::Disabled); // #TODO replies schedule
@@ -643,10 +624,10 @@ bool RepliesWidget::confirmSendingFiles(
 		if (showSendingFilesError(list)) {
 			return;
 		}
-		const auto type = (way == Ui::SendFilesWay::Files)
-			? SendMediaType::File
-			: SendMediaType::Photo;
-		const auto album = (way == Ui::SendFilesWay::Album)
+		const auto type = way.sendImagesAsPhotos()
+			? SendMediaType::Photo
+			: SendMediaType::File;
+		const auto album = way.groupMediaInAlbums() // #TODO files
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
 		uploadFilesAfterConfirmation(
@@ -683,7 +664,7 @@ bool RepliesWidget::confirmSendingFiles(
 bool RepliesWidget::confirmSendingFiles(
 		QImage &&image,
 		QByteArray &&content,
-		CompressConfirm compressed,
+		std::optional<bool> overrideSendImagesAsPhotos,
 		const QString &insertTextOnCancel) {
 	if (image.isNull()) {
 		return false;
@@ -693,10 +674,8 @@ bool RepliesWidget::confirmSendingFiles(
 		std::move(image),
 		std::move(content),
 		st::sendMediaPreviewSize);
-	return confirmSendingFiles(
-		std::move(list),
-		compressed,
-		insertTextOnCancel);
+	list.overrideSendImagesAsPhotos = overrideSendImagesAsPhotos;
+	return confirmSendingFiles(std::move(list), insertTextOnCancel);
 }
 
 bool RepliesWidget::showSlowmodeError() {
@@ -737,12 +716,11 @@ void RepliesWidget::uploadFilesAfterConfirmation(
 		Api::SendOptions options,
 		std::shared_ptr<SendingAlbum> album) {
 	const auto isAlbum = (album != nullptr);
-	const auto compressImages = (type == SendMediaType::Photo);
 	if (_history->peer->slowmodeApplied()
 		&& ((list.files.size() > 1 && !album)
 			|| (!list.files.empty()
 				&& !caption.text.isEmpty()
-				&& !list.canAddCaption(isAlbum, compressImages)))) {
+				&& !list.canAddCaption(isAlbum)))) {
 		Ui::ShowMultilineToast({
 			.text = { tr::lng_slowmode_no_many(tr::now) }
 		});
@@ -830,7 +808,7 @@ bool RepliesWidget::showSendingFilesError(
 		}
 		if (list.files.size() > 1
 			&& _history->peer->slowmodeApplied()
-			&& !list.albumIsPossible) {
+			&& !list.singleAlbumIsPossible) {
 			return tr::lng_slowmode_no_many(tr::now);
 		} else if (const auto left = _history->peer->slowmodeSecondsLeft()) {
 			return tr::lng_slowmode_enabled(
@@ -1808,14 +1786,14 @@ void RepliesWidget::setupDragArea() {
 		nullptr,
 		[=] { updateControlsGeometry(); });
 
-	const auto droppedCallback = [=](CompressConfirm compressed) {
+	const auto droppedCallback = [=](bool overrideSendImagesAsPhotos) {
 		return [=](const QMimeData *data) {
-			confirmSendingFiles(data, compressed);
+			confirmSendingFiles(data, overrideSendImagesAsPhotos);
 			Window::ActivateWindow(controller());
 		};
 	};
-	areas.document->setDroppedCallback(droppedCallback(CompressConfirm::No));
-	areas.photo->setDroppedCallback(droppedCallback(CompressConfirm::Yes));
+	areas.document->setDroppedCallback(droppedCallback(false));
+	areas.photo->setDroppedCallback(droppedCallback(true));
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 97e061a55..f7a664740 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -14,7 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 
 class History;
-enum class CompressConfirm;
 enum class SendMediaType;
 struct SendingAlbum;
 
@@ -198,15 +197,14 @@ private:
 	bool confirmSendingFiles(
 		QImage &&image,
 		QByteArray &&content,
-		CompressConfirm compressed,
+		std::optional<bool> overrideSendImagesAsPhotos = std::nullopt,
 		const QString &insertTextOnCancel = QString());
 	bool confirmSendingFiles(
 		Ui::PreparedList &&list,
-		CompressConfirm compressed,
 		const QString &insertTextOnCancel = QString());
 	bool confirmSendingFiles(
 		not_null<const QMimeData*> data,
-		CompressConfirm compressed,
+		std::optional<bool> overrideSendImagesAsPhotos = std::nullopt,
 		const QString &insertTextOnCancel = QString());
 	bool showSendingFilesError(const Ui::PreparedList &list) const;
 	void uploadFilesAfterConfirmation(
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 94015efa2..d16daf465 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/item_text_options.h"
 #include "ui/toast/toast.h"
 #include "ui/chat/attach/attach_prepare.h"
-#include "ui/chat/attach/attach_common.h"
+#include "ui/chat/attach/attach_send_files_way.h"
 #include "ui/special_buttons.h"
 #include "ui/ui_utility.h"
 #include "ui/toasts/common_toasts.h"
@@ -249,10 +249,7 @@ void ScheduledWidget::setupComposeControls() {
 		if (action == Ui::InputField::MimeAction::Check) {
 			return CanSendFiles(data);
 		} else if (action == Ui::InputField::MimeAction::Insert) {
-			return confirmSendingFiles(
-				data,
-				CompressConfirm::Auto,
-				data->text());
+			return confirmSendingFiles(data, std::nullopt, data->text());
 		}
 		Unexpected("action in MimeData hook.");
 	});
@@ -285,8 +282,7 @@ void ScheduledWidget::chooseAttach() {
 			if (!image.isNull() && !animated) {
 				confirmSendingFiles(
 					std::move(image),
-					std::move(result.remoteContent),
-					CompressConfirm::Auto);
+					std::move(result.remoteContent));
 			} else {
 				uploadFile(result.remoteContent, SendMediaType::File);
 			}
@@ -294,18 +290,14 @@ void ScheduledWidget::chooseAttach() {
 			auto list = Storage::PrepareMediaList(
 				result.paths,
 				st::sendMediaPreviewSize);
-			if (list.allFilesForCompress || list.albumIsPossible) {
-				confirmSendingFiles(std::move(list), CompressConfirm::Auto);
-			} else if (!showSendingFilesError(list)) {
-				confirmSendingFiles(std::move(list), CompressConfirm::No);
-			}
+			confirmSendingFiles(std::move(list));
 		}
 	}), nullptr);
 }
 
 bool ScheduledWidget::confirmSendingFiles(
 		not_null<const QMimeData*> data,
-		CompressConfirm compressed,
+		std::optional<bool> overrideSendImagesAsPhotos,
 		const QString &insertTextOnCancel) {
 	const auto hasImage = data->hasImage();
 
@@ -317,10 +309,8 @@ bool ScheduledWidget::confirmSendingFiles(
 			if (list.error == Ui::PreparedList::Error::None
 				|| !hasImage) {
 				const auto emptyTextOnCancel = QString();
-				confirmSendingFiles(
-					std::move(list),
-					compressed,
-					emptyTextOnCancel);
+				list.overrideSendImagesAsPhotos = overrideSendImagesAsPhotos;
+				confirmSendingFiles(std::move(list), emptyTextOnCancel);
 				return true;
 			}
 		}
@@ -335,7 +325,7 @@ bool ScheduledWidget::confirmSendingFiles(
 			confirmSendingFiles(
 				std::move(image),
 				QByteArray(),
-				compressed,
+				overrideSendImagesAsPhotos,
 				insertTextOnCancel);
 			return true;
 		}
@@ -345,19 +335,11 @@ bool ScheduledWidget::confirmSendingFiles(
 
 bool ScheduledWidget::confirmSendingFiles(
 		Ui::PreparedList &&list,
-		CompressConfirm compressed,
 		const QString &insertTextOnCancel) {
 	if (showSendingFilesError(list)) {
 		return false;
 	}
 
-	const auto noCompressOption = (list.files.size() > 1)
-		&& !list.allFilesForCompress
-		&& !list.albumIsPossible;
-	const auto boxCompressConfirm = noCompressOption
-		? CompressConfirm::None
-		: compressed;
-
 	//const auto cursor = _field->textCursor();
 	//const auto position = cursor.position();
 	//const auto anchor = cursor.anchor();
@@ -367,7 +349,6 @@ bool ScheduledWidget::confirmSendingFiles(
 		controller(),
 		std::move(list),
 		text,
-		boxCompressConfirm,
 		_history->peer->slowmodeApplied() ? SendLimit::One : SendLimit::Many,
 		CanScheduleUntilOnline(_history->peer)
 			? Api::SendType::ScheduledToUser
@@ -384,10 +365,10 @@ bool ScheduledWidget::confirmSendingFiles(
 		if (showSendingFilesError(list)) {
 			return;
 		}
-		const auto type = (way == Ui::SendFilesWay::Files)
-			? SendMediaType::File
-			: SendMediaType::Photo;
-		const auto album = (way == Ui::SendFilesWay::Album)
+		const auto type = way.sendImagesAsPhotos()
+			? SendMediaType::Photo
+			: SendMediaType::File;
+		const auto album = way.groupMediaInAlbums() // #TODO files
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
 		uploadFilesAfterConfirmation(
@@ -421,7 +402,7 @@ bool ScheduledWidget::confirmSendingFiles(
 bool ScheduledWidget::confirmSendingFiles(
 		QImage &&image,
 		QByteArray &&content,
-		CompressConfirm compressed,
+		std::optional<bool> overrideSendImagesAsPhotos,
 		const QString &insertTextOnCancel) {
 	if (image.isNull()) {
 		return false;
@@ -431,10 +412,8 @@ bool ScheduledWidget::confirmSendingFiles(
 		std::move(image),
 		std::move(content),
 		st::sendMediaPreviewSize);
-	return confirmSendingFiles(
-		std::move(list),
-		compressed,
-		insertTextOnCancel);
+	list.overrideSendImagesAsPhotos = overrideSendImagesAsPhotos;
+	return confirmSendingFiles(std::move(list), insertTextOnCancel);
 }
 
 void ScheduledWidget::uploadFilesAfterConfirmation(
@@ -445,12 +424,11 @@ void ScheduledWidget::uploadFilesAfterConfirmation(
 		Api::SendOptions options,
 		std::shared_ptr<SendingAlbum> album) {
 	const auto isAlbum = (album != nullptr);
-	const auto compressImages = (type == SendMediaType::Photo);
 	if (_history->peer->slowmodeApplied()
 		&& ((list.files.size() > 1 && !album)
 			|| (!list.files.empty()
 				&& !caption.text.isEmpty()
-				&& !list.canAddCaption(isAlbum, compressImages)))) {
+				&& !list.canAddCaption(isAlbum)))) {
 		Ui::ShowMultilineToast({
 			.text = { tr::lng_slowmode_no_many(tr::now) },
 		});
@@ -1228,14 +1206,14 @@ void ScheduledWidget::setupDragArea() {
 		nullptr,
 		[=] { updateControlsGeometry(); });
 
-	const auto droppedCallback = [=](CompressConfirm compressed) {
+	const auto droppedCallback = [=](bool overrideSendImagesAsPhotos) {
 		return [=](const QMimeData *data) {
-			confirmSendingFiles(data, compressed);
+			confirmSendingFiles(data, overrideSendImagesAsPhotos);
 			Window::ActivateWindow(controller());
 		};
 	};
-	areas.document->setDroppedCallback(droppedCallback(CompressConfirm::No));
-	areas.photo->setDroppedCallback(droppedCallback(CompressConfirm::Yes));
+	areas.document->setDroppedCallback(droppedCallback(false));
+	areas.photo->setDroppedCallback(droppedCallback(true));
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 57af2c5c3..56c2377f4 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -13,7 +13,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_messages.h"
 
 class History;
-enum class CompressConfirm;
 enum class SendMediaType;
 struct SendingAlbum;
 
@@ -164,15 +163,14 @@ private:
 	bool confirmSendingFiles(
 		QImage &&image,
 		QByteArray &&content,
-		CompressConfirm compressed,
+		std::optional<bool> overrideSendImagesAsPhotos = std::nullopt,
 		const QString &insertTextOnCancel = QString());
 	bool confirmSendingFiles(
 		Ui::PreparedList &&list,
-		CompressConfirm compressed,
 		const QString &insertTextOnCancel = QString());
 	bool confirmSendingFiles(
 		not_null<const QMimeData*> data,
-		CompressConfirm compressed,
+		std::optional<bool> overrideSendImagesAsPhotos = std::nullopt,
 		const QString &insertTextOnCancel = QString());
 	bool showSendingFilesError(const Ui::PreparedList &list) const;
 	void uploadFilesAfterConfirmation(
diff --git a/Telegram/SourceFiles/main/main_session_settings.cpp b/Telegram/SourceFiles/main/main_session_settings.cpp
index 6b178cd01..e97770cbf 100644
--- a/Telegram/SourceFiles/main/main_session_settings.cpp
+++ b/Telegram/SourceFiles/main/main_session_settings.cpp
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "chat_helpers/tabbed_selector.h"
 #include "ui/widgets/input_fields.h"
-#include "ui/chat/attach/attach_common.h"
+#include "ui/chat/attach/attach_send_files_way.h"
 #include "window/section_widget.h"
 #include "support/support_common.h"
 #include "storage/serialize_common.h"
@@ -97,7 +97,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	float64 appDialogsWidthRatio = app.dialogsWidthRatio();
 	int appThirdColumnWidth = app.thirdColumnWidth();
 	int appThirdSectionExtendedBy = app.thirdSectionExtendedBy();
-	qint32 appSendFilesWay = static_cast<qint32>(app.sendFilesWay());
+	qint32 appSendFilesWay = app.sendFilesWay().serialize();
 	qint32 legacyCallsPeerToPeer = qint32(0);
 	qint32 appSendSubmitWay = static_cast<qint32>(app.sendSubmitWay());
 	qint32 supportSwitch = static_cast<qint32>(_supportSwitch);
@@ -368,11 +368,8 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 		for (const auto &[key, value] : appSoundOverrides) {
 			app.setSoundOverride(key, value);
 		}
-		auto uncheckedSendFilesWay = static_cast<Ui::SendFilesWay>(appSendFilesWay);
-		switch (uncheckedSendFilesWay) {
-		case Ui::SendFilesWay::Album:
-		case Ui::SendFilesWay::Photos:
-		case Ui::SendFilesWay::Files: app.setSendFilesWay(uncheckedSendFilesWay); break;
+		if (const auto sendFilesWay = Ui::SendFilesWay::FromSerialized(appSendFilesWay)) {
+			app.setSendFilesWay(*sendFilesWay);
 		}
 		auto uncheckedSendSubmitWay = static_cast<Ui::InputSubmitSettings>(
 			appSendSubmitWay);
diff --git a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
index 2bed620ff..6550150a8 100644
--- a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
+++ b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
@@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/mtproto_config.h"
 #include "ui/effects/animation_value.h"
 #include "ui/widgets/input_fields.h"
-#include "ui/chat/attach/attach_common.h"
+#include "ui/chat/attach/attach_send_files_way.h"
 #include "window/themes/window_theme.h"
 #include "core/update_checker.h"
 #include "platform/platform_specific.h"
@@ -918,9 +918,10 @@ bool ReadSetting(
 		stream >> v;
 		if (!CheckStreamStatus(stream)) return false;
 
-		Core::App().settings().setSendFilesWay((v == 1)
-			? Ui::SendFilesWay::Album
-			: Ui::SendFilesWay::Files);
+		auto way = Ui::SendFilesWay();
+		way.setGroupMediaInAlbums(v == 1);
+		way.setSendImagesAsPhotos(v == 1);
+		Core::App().settings().setSendFilesWay(way);
 		context.legacyRead = true;
 	} break;
 
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index d744b5b4c..b550bb082 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -13,13 +13,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 constexpr auto kFileSizeLimit = 2000 * 1024 * 1024; // Load files up to 1500mb
 
-enum class CompressConfirm {
-	Auto,
-	Yes,
-	No,
-	None,
-};
-
 enum class SendMediaType {
 	Photo,
 	Audio,
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index ebd65091c..a7c79875e 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -122,7 +122,7 @@ void PrepareAlbum(PreparedList &result, int previewWidth) {
 		return;
 	}
 
-	result.albumIsPossible = (count > 1);
+	//result.albumIsPossible = (count > 1);
 	auto waiting = 0;
 	QSemaphore semaphore;
 	for (auto &file : result.files) {
@@ -132,13 +132,13 @@ void PrepareAlbum(PreparedList &result, int previewWidth) {
 	}
 	if (waiting > 0) {
 		semaphore.acquire(waiting);
-		if (result.albumIsPossible) {
-			const auto badIt = ranges::find(
-				result.files,
-				PreparedFile::AlbumType::None,
-				[](const PreparedFile &file) { return file.type; });
-			result.albumIsPossible = (badIt == result.files.end());
-		}
+		//if (result.albumIsPossible) {
+		//	const auto badIt = ranges::find(
+		//		result.files,
+		//		PreparedFile::AlbumType::None,
+		//		[](const PreparedFile &file) { return file.type; });
+		//	result.albumIsPossible = (badIt == result.files.end());
+		//}
 	}
 }
 
@@ -252,7 +252,7 @@ PreparedList PrepareMediaList(const QStringList &files, int previewWidth) {
 		}
 		const auto toCompress = HasExtensionFrom(file, extensionsToCompress);
 		if (filesize > App::kImageSizeLimit || !toCompress) {
-			result.allFilesForCompress = false;
+//			result.allFilesForCompress = false;
 		}
 		result.files.emplace_back(file);
 	}
@@ -265,9 +265,6 @@ PreparedList PrepareMediaFromImage(
 		QByteArray &&content,
 		int previewWidth) {
 	auto result = Storage::PreparedList();
-	result.allFilesForCompress = Ui::ValidateThumbDimensions(
-		image.width(),
-		image.height());
 	auto file = PreparedFile(QString());
 	file.content = content;
 	if (file.content.isEmpty()) {
@@ -364,8 +361,7 @@ std::optional<PreparedList> PreparedFileFromFilesDialog(
 		}
 
 		auto list = PreparedList(temp.error, temp.errorData);
-		list.albumIsPossible = isAlbum;
-		list.allFilesForCompress = temp.allFilesForCompress;
+		//list.albumIsPossible = isAlbum;
 		list.files = std::move(filteredFiles);
 
 		return list;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
index f7086ccd6..e57e5ab48 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
@@ -47,7 +47,8 @@ void AlbumPreview::setSendWay(SendFilesWay way) {
 
 void AlbumPreview::updateFileRows() {
 	Expects(_order.size() == _thumbs.size());
-	const auto isFile = (_sendWay == SendFilesWay::Files);
+
+	const auto isFile = !_sendWay.sendImagesAsPhotos();
 	for (auto i = 0; i < _order.size(); i++) {
 		_thumbs[i]->updateFileRow(isFile ? _order[i] : -1);
 	}
@@ -122,14 +123,14 @@ AlbumThumbnail *AlbumPreview::findThumb(QPoint position) const {
 	position -= QPoint(contentLeft(), contentTop());
 
 	auto top = 0;
-	const auto isPhotosWay = (_sendWay == SendFilesWay::Photos);
+	const auto isPhotosWay = _sendWay.sendImagesAsPhotos();
 	const auto skip = isPhotosWay
 		? st::sendMediaPreviewPhotoSkip
 		: st::sendMediaFileThumbSkip;
 	auto find = [&](const auto &thumb) {
-		if (_sendWay == SendFilesWay::Album) {
+		if (_sendWay.groupMediaInAlbums()) {
 			return thumb->containsPoint(position);
-		} else if (isPhotosWay || _sendWay == SendFilesWay::Files) {
+		} else {
 			const auto bottom = top + (isPhotosWay
 				? thumb->photoHeight()
 				: st::sendMediaFileThumbSize);
@@ -248,14 +249,14 @@ void AlbumPreview::updateSizeAnimated(
 
 void AlbumPreview::updateSize() {
 	const auto newHeight = [&] {
-		switch (_sendWay) {
-		case SendFilesWay::Album:
+		if (_sendWay.groupMediaInAlbums()) {
 			return int(std::round(_thumbsHeightAnimation.value(
 				_thumbsHeight)));
-		case SendFilesWay::Photos: return _photosHeight;
-		case SendFilesWay::Files: return _filesHeight;
+		} else if (_sendWay.sendImagesAsPhotos()) {
+			return _photosHeight;
+		} else {
+			return _filesHeight;
 		}
-		Unexpected("Send way in AlbumPreview::updateSize");
 	}();
 	if (height() != newHeight) {
 		resize(st::boxWideWidth, newHeight);
@@ -265,10 +266,12 @@ void AlbumPreview::updateSize() {
 void AlbumPreview::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
-	switch (_sendWay) {
-	case SendFilesWay::Album: paintAlbum(p); break;
-	case SendFilesWay::Photos: paintPhotos(p, e->rect()); break;
-	case SendFilesWay::Files: paintFiles(p, e->rect()); break;
+	if (_sendWay.groupMediaInAlbums()) {
+		paintAlbum(p);
+	} else if (_sendWay.sendImagesAsPhotos()) {
+		paintPhotos(p, e->rect());
+	} else {
+		paintFiles(p, e->rect());
 	}
 }
 
@@ -393,11 +396,11 @@ void AlbumPreview::mousePressEvent(QMouseEvent *e) {
 }
 
 void AlbumPreview::mouseMoveEvent(QMouseEvent *e) {
-	if (_sendWay == SendFilesWay::Files) {
+	if (!_sendWay.sendImagesAsPhotos()) {
 		applyCursor(style::cur_default);
 		return;
 	}
-	const auto isAlbum = (_sendWay == SendFilesWay::Album);
+	const auto isAlbum = _sendWay.groupMediaInAlbums();
 	if (isAlbum && _draggedThumb) {
 		const auto position = e->pos();
 		_draggedThumb->moveInAlbum(position - _draggedStartPosition);
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
index 752cc2af7..fe9a2d160 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "ui/rp_widget.h"
-#include "ui/chat/attach/attach_common.h"
+#include "ui/chat/attach/attach_send_files_way.h"
 
 namespace Ui {
 
@@ -74,7 +74,7 @@ private:
 	void finishDrag();
 
 	const PreparedList &_list;
-	SendFilesWay _sendWay = SendFilesWay::Files;
+	SendFilesWay _sendWay;
 	style::cursor _cursor = style::cur_default;
 	std::vector<int> _order;
 	std::vector<std::unique_ptr<AlbumThumbnail>> _thumbs;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
index 7664a2168..6b2618140 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
@@ -107,9 +107,7 @@ AlbumThumbnail::AlbumThumbnail(
 	_editMedia->setClickedCallback([=] {
 		base::call_delayed(duration, parent, editCallback);
 	});
-	_deleteMedia->setClickedCallback([=] {
-		base::call_delayed(duration, parent, deleteCallback);
-	});
+	_deleteMedia->setClickedCallback(deleteCallback);
 
 	_editMedia->setIconOverride(&st::editMediaButtonIconFile);
 	_deleteMedia->setIconOverride(&st::sendBoxAlbumGroupDeleteButtonIconFile);
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
index 13683d356..c492d4eeb 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "ui/chat/attach/attach_common.h"
+#include "ui/chat/attach/attach_send_files_way.h"
 #include "ui/effects/animations.h"
 #include "ui/grouped_layout.h"
 #include "ui/round_rect.h"
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_common.h b/Telegram/SourceFiles/ui/chat/attach/attach_common.h
deleted file mode 100644
index 89226df88..000000000
--- a/Telegram/SourceFiles/ui/chat/attach/attach_common.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-namespace Ui {
-
-enum class AttachButtonType {
-	Edit,
-	Delete,
-	None,
-};
-
-enum class SendFilesWay {
-	Album,
-	Photos,
-	Files,
-};
-
-} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index 06712deb9..1698eb5bb 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -32,8 +32,7 @@ PreparedList PreparedList::Reordered(
 	Expects(list.files.size() == order.size());
 
 	auto result = PreparedList(list.error, list.errorData);
-	result.albumIsPossible = list.albumIsPossible;
-	result.allFilesForCompress = list.allFilesForCompress;
+	result.singleAlbumIsPossible = list.singleAlbumIsPossible;
 	result.files.reserve(list.files.size());
 	for (auto index : order) {
 		result.files.push_back(std::move(list.files[index]));
@@ -50,7 +49,6 @@ void PreparedList::mergeToEnd(PreparedList &&other, bool cutToAlbumSize) {
 		errorData = other.errorData;
 		return;
 	}
-	allFilesForCompress = allFilesForCompress && other.allFilesForCompress;
 	files.reserve(std::min(
 		size_t(cutToAlbumSize ? kMaxAlbumCount : INT_MAX),
 		files.size() + other.files.size()));
@@ -65,13 +63,13 @@ void PreparedList::mergeToEnd(PreparedList &&other, bool cutToAlbumSize) {
 			files,
 			PreparedFile::AlbumType::None,
 			[](const PreparedFile &file) { return file.type; });
-		albumIsPossible = (badIt == files.end());
+		singleAlbumIsPossible = (badIt == files.end());
 	} else {
-		albumIsPossible = false;
+		singleAlbumIsPossible = false;
 	}
 }
 
-bool PreparedList::canAddCaption(bool isAlbum, bool compressImages) const {
+bool PreparedList::canAddCaption(bool isAlbum) const {
 	const auto isSticker = [&] {
 		if (files.empty()) {
 			return false;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index 05f9e3db0..56e9781ec 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include <deque>
+
 namespace Ui {
 
 struct PreparedFileInformation {
@@ -71,13 +73,16 @@ struct PreparedList {
 		std::vector<int> order);
 	void mergeToEnd(PreparedList &&other, bool cutToAlbumSize = false);
 
-	[[nodiscard]] bool canAddCaption(bool isAlbum, bool compressImages) const;
+	[[nodiscard]] bool canAddCaption(bool isAlbum) const;
 
 	Error error = Error::None;
 	QString errorData;
 	std::vector<PreparedFile> files;
-	bool allFilesForCompress = true;
-	bool albumIsPossible = false;
+	std::deque<PreparedFile> filesToProcess;
+	std::optional<bool> overrideSendImagesAsPhotos;
+	//bool someFilesForCompress = false;
+	//bool someAlbumIsPossible = false;
+	bool singleAlbumIsPossible = false;
 };
 
 [[nodiscard]] int MaxAlbumItems();
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.cpp
new file mode 100644
index 000000000..00fea6cd3
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.cpp
@@ -0,0 +1,76 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/chat/attach/attach_send_files_way.h"
+
+namespace Ui {
+
+void SendFilesWay::setGroupMediaInAlbums(bool value) {
+	if (value) {
+		_flags |= (Flag::GroupMediaInAlbums | Flag::SendImagesAsPhotos);
+	} else {
+		_flags &= ~Flag::GroupMediaInAlbums;
+	}
+}
+
+void SendFilesWay::setSendImagesAsPhotos(bool value) {
+	if (value) {
+		_flags |= Flag::SendImagesAsPhotos;
+	} else {
+		_flags &= ~(Flag::SendImagesAsPhotos | Flag::GroupMediaInAlbums);
+	}
+}
+
+void SendFilesWay::setGroupFiles(bool value) {
+	if (value) {
+		_flags |= Flag::GroupFiles;
+	} else {
+		_flags &= ~Flag::GroupFiles;
+	}
+}
+
+//enum class SendFilesWay { // Old way. Serialize should be compatible.
+//	Album,
+//	Photos,
+//	Files,
+//};
+
+int32 SendFilesWay::serialize() const {
+	auto result = groupMediaInAlbums()
+		? int32(0)
+		: sendImagesAsPhotos()
+		? int32(1)
+		: int32(2);
+	if (!groupFiles()) {
+		result |= 0x04;
+	}
+	return result;
+}
+
+std::optional<SendFilesWay> SendFilesWay::FromSerialized(int32 value) {
+	auto result = SendFilesWay();
+	result.setGroupFiles(!(value & 0x04));
+	value &= ~0x04;
+	switch (value) {
+	case 0:
+		result.setGroupMediaInAlbums(true);
+		result.setSendImagesAsPhotos(true);
+		break;
+	case 1:
+		result.setGroupMediaInAlbums(false);
+		result.setSendImagesAsPhotos(true);
+		break;
+	case 2:
+		result.setGroupMediaInAlbums(false);
+		result.setSendImagesAsPhotos(false);
+		break;
+	default: return std::nullopt;
+	}
+	return result;
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h
new file mode 100644
index 000000000..53cb646c8
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h
@@ -0,0 +1,72 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/flags.h"
+
+namespace Ui {
+
+enum class AttachButtonType {
+	Edit,
+	Delete,
+	None,
+};
+
+class SendFilesWay final {
+public:
+	[[nodiscard]] bool groupMediaInAlbums() const {
+		return (_flags & Flag::GroupMediaInAlbums) != 0;
+	}
+	[[nodiscard]] bool sendImagesAsPhotos() const {
+		return (_flags & Flag::SendImagesAsPhotos) != 0;
+	}
+	[[nodiscard]] bool groupFiles() const {
+		return (_flags & Flag::GroupFiles);
+	}
+	void setGroupMediaInAlbums(bool value);
+	void setSendImagesAsPhotos(bool value);
+	void setGroupFiles(bool value);
+
+	[[nodiscard]] inline bool operator<(const SendFilesWay &other) const {
+		return _flags < other._flags;
+	}
+	[[nodiscard]] inline bool operator>(const SendFilesWay &other) const {
+		return other < *this;
+	}
+	[[nodiscard]] inline bool operator<=(const SendFilesWay &other) const {
+		return !(other < *this);
+	}
+	[[nodiscard]] inline bool operator>=(const SendFilesWay &other) const {
+		return !(*this < other);
+	}
+	[[nodiscard]] inline bool operator==(const SendFilesWay &other) const {
+		return _flags == other._flags;
+	}
+	[[nodiscard]] inline bool operator!=(const SendFilesWay &other) const {
+		return !(*this == other);
+	}
+
+	[[nodiscard]] int32 serialize() const;
+	[[nodiscard]] static std::optional<SendFilesWay> FromSerialized(
+		int32 value);
+
+private:
+	enum class Flag : uchar {
+		GroupMediaInAlbums = (1 << 0),
+		SendImagesAsPhotos = (1 << 1),
+		GroupFiles = (1 << 2),
+
+		Default = GroupMediaInAlbums | SendImagesAsPhotos | GroupFiles,
+	};
+	friend inline constexpr bool is_flag_type(Flag) { return true; };
+
+	base::flags<Flag> _flags = Flag::Default;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index ac073df9c..1c7d0888c 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -68,11 +68,12 @@ PRIVATE
     ui/chat/attach/attach_album_thumbnail.h
     ui/chat/attach/attach_album_preview.cpp
     ui/chat/attach/attach_album_preview.h
-    ui/chat/attach/attach_common.h
     ui/chat/attach/attach_extensions.cpp
     ui/chat/attach/attach_extensions.h
     ui/chat/attach/attach_prepare.cpp
     ui/chat/attach/attach_prepare.h
+    ui/chat/attach/attach_send_files_way.cpp
+    ui/chat/attach/attach_send_files_way.h
     ui/chat/attach/attach_single_file_preview.cpp
     ui/chat/attach/attach_single_file_preview.h
     ui/chat/attach/attach_single_media_preview.cpp

From 202534575b6855c6d5a033d8d577cb3ecb9c8851 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 16 Oct 2020 10:52:55 +0300
Subject: [PATCH 096/190] Allow many previews in SendFilesBox.

---
 .../SourceFiles/boxes/edit_caption_box.cpp    |   2 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp | 313 ++++++++++--------
 Telegram/SourceFiles/boxes/send_files_box.h   |  17 +-
 .../SourceFiles/history/history_widget.cpp    |   4 +-
 .../view/history_view_replies_section.cpp     |   7 +-
 .../SourceFiles/storage/localimageloader.cpp  |   9 +-
 .../SourceFiles/storage/localimageloader.h    |   2 +-
 .../storage/storage_media_prepare.cpp         |  40 +--
 .../ui/chat/attach/attach_album_preview.cpp   |  10 +-
 .../ui/chat/attach/attach_album_preview.h     |  10 +-
 .../ui/chat/attach/attach_prepare.cpp         |  57 +++-
 .../ui/chat/attach/attach_prepare.h           |  19 +-
 .../attach/attach_single_file_preview.cpp     |  12 +-
 .../chat/attach/attach_single_file_preview.h  |   2 -
 .../attach/attach_single_media_preview.cpp    |   6 +-
 .../chat/attach/attach_single_media_preview.h |   2 -
 16 files changed, 286 insertions(+), 226 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 1a216e3bd..659151e98 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -689,7 +689,7 @@ bool EditCaptionBox::fileFromClipboard(not_null<const QMimeData*> data) {
 	}
 
 	const auto file = &list.files.front();
-	if (_isAlbum && (file->type == AlbumType::None)) {
+	if (_isAlbum && (file->type == AlbumType::File)) {
 		const auto imageAsDoc = [&] {
 			using Info = Ui::PreparedFileInformation;
 			const auto fileMedia = &file->information->media;
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 01d323c81..f0accfe2e 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -31,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/vertical_layout.h"
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/chat/attach/attach_send_files_way.h"
 #include "ui/chat/attach/attach_album_preview.h"
@@ -64,12 +65,6 @@ inline bool CanAddUrls(const QList<QUrl> &urls) {
 	return !urls.isEmpty() && ranges::all_of(urls, &QUrl::isLocalFile);
 }
 
-inline bool IsFirstAlbumItem(const Ui::PreparedList &list) {
-	using AlbumType = Ui::PreparedFile::AlbumType;
-	return (list.files.size() > 0)
-		&& (list.files.front().type != AlbumType::None);
-}
-
 inline bool IsSingleItem(const Ui::PreparedList &list) {
 	return list.files.size() == 1;
 }
@@ -98,9 +93,7 @@ void FileDialogCallback(
 rpl::producer<QString> FieldPlaceholder(
 		const Ui::PreparedList &list,
 		SendFilesWay way) {
-	const auto isAlbum = list.singleAlbumIsPossible
-		&& way.groupMediaInAlbums();
-	return list.canAddCaption(isAlbum)
+	return list.canAddCaption(way.groupMediaInAlbums())
 		? tr::lng_photo_caption()
 		: tr::lng_photos_comment();
 }
@@ -125,10 +118,14 @@ SendFilesBox::SendFilesBox(
 	st::confirmCaptionArea,
 	Ui::InputField::Mode::MultiLine,
 	nullptr,
-	caption) {
+	caption)
+, _scroll(this, st::boxScroll)
+, _inner(
+	_scroll->setOwnedWidget(
+		object_ptr<Ui::VerticalLayout>(_scroll.data()))) {
 }
 
-void SendFilesBox::initPreview(rpl::producer<int> desiredPreviewHeight) {
+void SendFilesBox::initPreview() {
 	using namespace rpl::mappers;
 
 	setupControls();
@@ -136,8 +133,10 @@ void SendFilesBox::initPreview(rpl::producer<int> desiredPreviewHeight) {
 	updateBoxSize();
 
 	_dimensionsLifetime.destroy();
+	_inner->resizeToWidth(st::boxWideWidth);
+
 	rpl::combine(
-		std::move(desiredPreviewHeight),
+		_inner->heightValue(),
 		_footerHeight.value(),
 		_titleHeight + _1 + _2
 	) | rpl::start_with_next([=](int height) {
@@ -146,102 +145,83 @@ void SendFilesBox::initPreview(rpl::producer<int> desiredPreviewHeight) {
 			std::min(st::sendMediaPreviewHeightMax, height),
 			true);
 	}, _dimensionsLifetime);
-
-	if (_preview) {
-		_preview->show();
-	}
 }
 
-void SendFilesBox::prepareSingleFilePreview() {
-	Expects(IsSingleItem(_list));
+//void SendFilesBox::prepareSingleFilePreview() {
+//	const auto &file = _list.files[0];
+//	const auto controller = _controller;
+//	const auto media = Ui::SingleMediaPreview::Create(this, [=] {
+//		return controller->isGifPausedAtLeastFor(
+//			Window::GifPauseReason::Layer);
+//	}, file);
+//	if (media) {
+//		_preview = media;
+//		initPreview(media->desiredHeightValue());
+//	} else {
+//		const auto preview = Ui::CreateChild<Ui::SingleFilePreview>(this, file);
+//		_preview = preview;
+//		initPreview(preview->desiredHeightValue());
+//	}
+//}
 
-	const auto &file = _list.files[0];
-	const auto controller = _controller;
-	const auto media = Ui::SingleMediaPreview::Create(this, [=] {
-		return controller->isGifPausedAtLeastFor(
-			Window::GifPauseReason::Layer);
-	}, file);
-	if (media) {
-		_preview = media;
-		initPreview(media->desiredHeightValue());
-	} else {
-		const auto preview = Ui::CreateChild<Ui::SingleFilePreview>(this, file);
-		_preview = preview;
-		initPreview(preview->desiredHeightValue());
-	}
-}
-
-void SendFilesBox::prepareAlbumPreview() {
-	const auto wrap = Ui::CreateChild<Ui::ScrollArea>(
-		this,
-		st::boxScroll);
-	_albumPreview = wrap->setOwnedWidget(object_ptr<Ui::AlbumPreview>(
-		this,
-		_list,
-		_sendWay.current()));
-
-	addThumbButtonHandlers(wrap);
-
-	_preview = wrap;
-	_albumPreview->show();
-	setupShadows(wrap, _albumPreview);
-
-	initPreview(_albumPreview->desiredHeightValue());
-
-	crl::on_main([=] {
-		wrap->scrollToY(_lastScrollTop);
-		_lastScrollTop = 0;
-	});
-}
+//void SendFilesBox::prepareAlbumPreview() {
+//	addThumbButtonHandlers(wrap); // #TODO files
+//
+//	setupShadows(wrap, _albumPreview);
+//
+//	initPreview(_albumPreview->desiredHeightValue());
+//
+//	crl::on_main([=] {
+//		wrap->scrollToY(_lastScrollTop);
+//		_lastScrollTop = 0;
+//	});
+//}
 
 void SendFilesBox::addThumbButtonHandlers(not_null<Ui::ScrollArea*> wrap) {
-	_albumPreview->thumbDeleted(
-	) | rpl::start_with_next([=](auto index) {
-		_lastScrollTop = wrap->scrollTop();
+	// #TODO files
+	//_albumPreview->thumbDeleted(
+	//) | rpl::start_with_next([=](auto index) {
+	//	_lastScrollTop = wrap->scrollTop();
 
-		_list.files.erase(_list.files.begin() + index);
-		applyAlbumOrder();
+	//	_list.files.erase(_list.files.begin() + index);
+	//	applyAlbumOrder();
 
-		if (_preview) {
-			_preview->deleteLater();
-		}
-		_albumPreview = nullptr;
+	//	if (_preview) {
+	//		_preview->deleteLater();
+	//	}
+	//	_albumPreview = nullptr;
 
-		if (IsSingleItem(_list)) {
-			_list.singleAlbumIsPossible = false;
-		}
+	//	refreshAllAfterAlbumChanges();
+	//}, _albumPreview->lifetime());
 
-		refreshAllAfterAlbumChanges();
-	}, _albumPreview->lifetime());
+	//_albumPreview->thumbChanged(
+	//) | rpl::start_with_next([=](auto index) {
+	//	_lastScrollTop = wrap->scrollTop();
 
-	_albumPreview->thumbChanged(
-	) | rpl::start_with_next([=](auto index) {
-		_lastScrollTop = wrap->scrollTop();
+	//	const auto callback = [=](FileDialog::OpenResult &&result) {
+	//		FileDialogCallback(
+	//			std::move(result),
+	//			true,
+	//			[=] (auto list) {
+	//				_list.files[index] = std::move(list.files.front());
+	//				applyAlbumOrder();
 
-		const auto callback = [=](FileDialog::OpenResult &&result) {
-			FileDialogCallback(
-				std::move(result),
-				true,
-				[=] (auto list) {
-					_list.files[index] = std::move(list.files.front());
-					applyAlbumOrder();
+	//				if (_preview) {
+	//					_preview->deleteLater();
+	//				}
+	//				_albumPreview = nullptr;
 
-					if (_preview) {
-						_preview->deleteLater();
-					}
-					_albumPreview = nullptr;
+	//				refreshAllAfterAlbumChanges();
+	//			});
+	//	};
 
-					refreshAllAfterAlbumChanges();
-				});
-		};
+	//	FileDialog::GetOpenPath(
+	//		this,
+	//		tr::lng_choose_file(tr::now),
+	//		FileDialog::AlbumFilesFilter(),
+	//		crl::guard(this, callback));
 
-		FileDialog::GetOpenPath(
-			this,
-			tr::lng_choose_file(tr::now),
-			FileDialog::AlbumFilesFilter(),
-			crl::guard(this, callback));
-
-	}, _albumPreview->lifetime());
+	//}, _albumPreview->lifetime());
 }
 
 void SendFilesBox::setupShadows(
@@ -288,6 +268,10 @@ void SendFilesBox::prepare() {
 	setupCaption();
 	setupSendWayControls();
 	preparePreview();
+	initPreview();
+
+	_scroll->show();
+	_inner->show();
 
 	boxClosing() | rpl::start_with_next([=] {
 		if (!_confirmed && _cancelledCallback) {
@@ -379,10 +363,6 @@ void SendFilesBox::initSendWay() {
 	_sendWay.changes(
 	) | rpl::start_with_next([=](SendFilesWay value) {
 		updateCaptionPlaceholder();
-		applyAlbumOrder();
-		if (_albumPreview) {
-			_albumPreview->setSendWay(value);
-		}
 		updateEmojiPanelGeometry();
 		setInnerFocus();
 	}, lifetime());
@@ -393,9 +373,8 @@ void SendFilesBox::updateCaptionPlaceholder() {
 		return;
 	}
 	const auto sendWay = _sendWay.current();
-	const auto isAlbum = _list.singleAlbumIsPossible
-		&& sendWay.groupMediaInAlbums();
-	if (!_list.canAddCaption(isAlbum) && _sendLimit == SendLimit::One) {
+	if (!_list.canAddCaption(sendWay.groupMediaInAlbums())
+		&& _sendLimit == SendLimit::One) {
 		_caption->hide();
 		if (_emojiToggle) {
 			_emojiToggle->hide();
@@ -410,11 +389,73 @@ void SendFilesBox::updateCaptionPlaceholder() {
 }
 
 void SendFilesBox::preparePreview() {
-	if (IsSingleItem(_list)) {
-		prepareSingleFilePreview();
-	} else {
-		prepareAlbumPreview(); // #TODO files many albums
+	using Type = Ui::PreparedFile::AlbumType;
+
+	_blocks.clear();
+	auto albumStart = -1;
+	const auto finishAlbum = [&](int till) {
+		if (albumStart < 0) {
+			return;
+		}
+		const auto count = (till - albumStart);
+		const auto preview = _inner->add(object_ptr<Ui::AlbumPreview>(
+			this,
+			gsl::make_span(_list.files).subspan(albumStart, count),
+			_sendWay.current()));
+
+		auto &block = _blocks.emplace_back();
+		block.fromIndex = albumStart;
+		block.tillIndex = albumStart + count;
+		block.preview.reset(preview);
+		block.preview->show();
+
+		_sendWay.changes(
+		) | rpl::start_with_next([=](SendFilesWay value) {
+			applyAlbumOrder(preview, albumStart);
+			preview->setSendWay(value);
+		}, preview->lifetime());
+
+		albumStart = -1;
+	};
+	const auto finishSingle = [&](int index) {
+		const auto &file = _list.files[index];
+		const auto controller = _controller;
+		auto &block = _blocks.emplace_back();
+		block.fromIndex = index;
+		block.tillIndex = index + 1;
+		const auto media = Ui::SingleMediaPreview::Create(this, [=] {
+			return controller->isGifPausedAtLeastFor(
+				Window::GifPauseReason::Layer);
+		}, file);
+		if (media) {
+			block.preview.reset(
+				_inner->add(object_ptr<Ui::SingleMediaPreview>::fromRaw(
+					media)));
+		} else {
+			block.preview.reset(
+				_inner->add(object_ptr<Ui::SingleFilePreview>(this, file)));
+		}
+		block.preview->show();
+	};
+	for (auto i = 0, count = int(_list.files.size()); i != count; ++i) {
+		const auto type = _list.files[i].type;
+		if (albumStart >= 0) {
+			const auto albumCount = (i - albumStart);
+			if (type == Type::File || (albumCount == Ui::MaxAlbumItems())) {
+				finishAlbum(i);
+			} else {
+				continue;
+			}
+		}
+		if (type != Type::File) {
+			if (albumStart < 0) {
+				albumStart = i;
+			}
+			continue;
+		}
+		finishSingle(i);
 	}
+	finishAlbum(_list.files.size());
 }
 
 void SendFilesBox::setupControls() {
@@ -479,12 +520,10 @@ void SendFilesBox::updateSendWayControlsVisibility() {
 	_groupFiles->setVisible(!onlyOne);
 }
 
-void SendFilesBox::applyAlbumOrder() {
-	if (!_albumPreview) {
-		return;
-	}
-
-	const auto order = _albumPreview->takeOrder();
+void SendFilesBox::applyAlbumOrder(
+		not_null<Ui::AlbumPreview*> preview,
+		int from) {
+	const auto order = preview->takeOrder();
 	const auto isDefault = [&] {
 		for (auto i = 0, count = int(order.size()); i != count; ++i) {
 			if (order[i] != i) {
@@ -497,7 +536,14 @@ void SendFilesBox::applyAlbumOrder() {
 		return;
 	}
 
-	_list = Ui::PreparedList::Reordered(std::move(_list), order);
+	auto elements = std::vector<Ui::PreparedFile>();
+	elements.reserve(order.size());
+	for (const auto index : order) {
+		elements.push_back(std::move(_list.files[from + index]));
+	}
+	for (auto i = 0, count = int(order.size()); i != count; ++i) {
+		_list.files[from + i] = std::move(elements[i]);
+	}
 }
 
 void SendFilesBox::setupCaption() {
@@ -604,20 +650,21 @@ void SendFilesBox::captionResized() {
 }
 
 bool SendFilesBox::canAddFiles(not_null<const QMimeData*> data) const {
-	const auto urls = data->hasUrls() ? data->urls() : QList<QUrl>();
-	auto filesCount = CanAddUrls(urls) ? urls.size() : 0;
-	if (!filesCount && data->hasImage()) {
-		++filesCount;
-	}
+	return (data->hasUrls() && CanAddUrls(data->urls())) || data->hasImage();
+	//const auto urls = data->hasUrls() ? data->urls() : QList<QUrl>();
+	//auto filesCount = CanAddUrls(urls) ? urls.size() : 0;
+	//if (!filesCount && data->hasImage()) {
+	//	++filesCount;
+	//}
 
-	if (_list.files.size() + filesCount > Ui::MaxAlbumItems()) {
-		return false;
-	} else if (_list.files.size() > 1 && !_albumPreview) {
-		return false;
-	} else if (!IsFirstAlbumItem(_list)) {
-		return false;
-	}
-	return true;
+	//if (_list.files.size() + filesCount > Ui::MaxAlbumItems()) { // #TODO files
+	//	return false;
+	//} else if (_list.files.size() > 1 && !_albumPreview) {
+	//	return false;
+	//} else if (!IsFirstAlbumItem(_list)) {
+	//	return false;
+	//}
+	//return true;
 }
 
 bool SendFilesBox::addFiles(not_null<const QMimeData*> data) {
@@ -661,10 +708,10 @@ bool SendFilesBox::addFiles(Ui::PreparedList list) {
 	//} else if (!IsFirstAlbumItem(_list)) {
 	//	return false;
 	}
-	applyAlbumOrder();
-	delete base::take(_preview);
-	_albumPreview = nullptr;
-
+	//applyAlbumOrder();
+	//delete base::take(_preview);
+	//_albumPreview = nullptr;
+	return false;
 	_list.mergeToEnd(std::move(list), cutToAlbumSize);
 
 	refreshAllAfterAlbumChanges();
@@ -769,10 +816,8 @@ void SendFilesBox::updateControlsGeometry() {
 			bottom -= st::boxPhotoCompressedSkip + pointer->heightNoMargins();
 		}
 	}
-	if (_preview) {
-		_preview->resize(width(), bottom - _titleHeight);
-		_preview->move(0, _titleHeight);
-	}
+	_scroll->resize(width(), bottom - _titleHeight);
+	_scroll->move(0, _titleHeight);
 }
 
 void SendFilesBox::setInnerFocus() {
@@ -809,7 +854,7 @@ void SendFilesBox::send(
 		Core::App().saveSettingsDelayed();
 	}
 
-	applyAlbumOrder();
+	//applyAlbumOrder(); // #TODO files
 	_confirmed = true;
 	if (_confirmedCallback) {
 		auto caption = (_caption && !_caption->isHidden())
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index 46ffe34b5..00f0626e8 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -34,6 +34,7 @@ class InputField;
 struct GroupMediaLayout;
 class EmojiButton;
 class AlbumPreview;
+class VerticalLayout;
 } // namespace Ui
 
 namespace Window {
@@ -83,8 +84,13 @@ protected:
 	void resizeEvent(QResizeEvent *e) override;
 
 private:
+	struct Block {
+		base::unique_qptr<Ui::RpWidget> preview;
+		int fromIndex = 0;
+		int tillIndex = 0;
+	};
 	void initSendWay();
-	void initPreview(rpl::producer<int> desiredPreviewHeight);
+	void initPreview();
 
 	void setupControls();
 	void setupSendWayControls();
@@ -99,9 +105,7 @@ private:
 	void emojiFilterForGeometry(not_null<QEvent*> event);
 
 	void preparePreview();
-	void prepareSingleFilePreview();
-	void prepareAlbumPreview();
-	void applyAlbumOrder();
+	void applyAlbumOrder(not_null<Ui::AlbumPreview*> preview, int from);
 
 	void send(Api::SendOptions options, bool ctrlShiftEnter = false);
 	void sendSilent();
@@ -157,8 +161,9 @@ private:
 	rpl::event_stream<> _albumChanged;
 	rpl::lifetime _dimensionsLifetime;
 
-	QWidget *_preview = nullptr;
-	Ui::AlbumPreview *_albumPreview = nullptr;
+	object_ptr<Ui::ScrollArea> _scroll;
+	QPointer<Ui::VerticalLayout> _inner;
+	std::vector<Block> _blocks;
 
 	int _lastScrollTop = 0;
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 4a50804bd..f73155795 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4097,9 +4097,7 @@ bool HistoryWidget::showSendingFilesError(
 		} else if (!canWriteMessage()) {
 			return tr::lng_forward_send_files_cant(tr::now);
 		}
-		if (list.files.size() > 1
-			&& _peer->slowmodeApplied()
-			&& !list.singleAlbumIsPossible) {
+		if (_peer->slowmodeApplied() && !list.canBeSentInSlowmode()) {
 			return tr::lng_slowmode_no_many(tr::now);
 		} else if (const auto left = _peer->slowmodeSecondsLeft()) {
 			return tr::lng_slowmode_enabled(
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 6415cd87a..46a0ed4f6 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -800,15 +800,14 @@ void RepliesWidget::uploadFile(
 bool RepliesWidget::showSendingFilesError(
 		const Ui::PreparedList &list) const {
 	const auto text = [&] {
+		const auto peer = _history->peer;
 		const auto error = Data::RestrictionError(
-			_history->peer,
+			peer,
 			ChatRestriction::f_send_media);
 		if (error) {
 			return *error;
 		}
-		if (list.files.size() > 1
-			&& _history->peer->slowmodeApplied()
-			&& !list.singleAlbumIsPossible) {
+		if (peer->slowmodeApplied() && !list.canBeSentInSlowmode()) {
 			return tr::lng_slowmode_no_many(tr::now);
 		} else if (const auto left = _history->peer->slowmodeSecondsLeft()) {
 			return tr::lng_slowmode_enabled(
diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index e1e67bf84..6865d5200 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -530,10 +530,11 @@ FileLoadTask::FileLoadTask(
 
 FileLoadTask::~FileLoadTask() = default;
 
-std::unique_ptr<Ui::PreparedFileInformation> FileLoadTask::ReadMediaInformation(
-		const QString &filepath,
-		const QByteArray &content,
-		const QString &filemime) {
+auto FileLoadTask::ReadMediaInformation(
+	const QString &filepath,
+	const QByteArray &content,
+	const QString &filemime)
+-> std::unique_ptr<Ui::PreparedFileInformation> {
 	auto result = std::make_unique<Ui::PreparedFileInformation>();
 	result->filemime = filemime;
 
diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h
index b550bb082..02a403d9b 100644
--- a/Telegram/SourceFiles/storage/localimageloader.h
+++ b/Telegram/SourceFiles/storage/localimageloader.h
@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_common.h"
 #include "ui/chat/attach/attach_prepare.h"
 
-constexpr auto kFileSizeLimit = 2000 * 1024 * 1024; // Load files up to 1500mb
+constexpr auto kFileSizeLimit = 2000 * 1024 * 1024; // Load files up to 2000MB
 
 enum class SendMediaType {
 	Photo,
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index a7c79875e..aa9535964 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -62,11 +62,10 @@ QSize PrepareShownDimensions(const QImage &preview) {
 		: result;
 }
 
-bool PrepareAlbumMediaIsWaiting(
+bool PrepareDetailsIsWaiting(
 		QSemaphore &semaphore,
 		PreparedFile &file,
 		int previewWidth) {
-	// TODO: Use some special thread queue, like a separate QThreadPool.
 	crl::async([=, &semaphore, &file] {
 		const auto guard = gsl::finally([&] { semaphore.release(); });
 		if (!file.path.isEmpty()) {
@@ -116,29 +115,21 @@ bool PrepareAlbumMediaIsWaiting(
 	return true;
 }
 
-void PrepareAlbum(PreparedList &result, int previewWidth) {
-	const auto count = int(result.files.size());
-	if (count > Ui::MaxAlbumItems()) {
-		return;
-	}
+void PrepareDetailsInParallel(PreparedList &result, int previewWidth) {
+	Expects(result.files.size() <= Ui::MaxAlbumItems());
 
-	//result.albumIsPossible = (count > 1);
 	auto waiting = 0;
 	QSemaphore semaphore;
 	for (auto &file : result.files) {
-		if (PrepareAlbumMediaIsWaiting(semaphore, file, previewWidth)) {
+		if (PrepareDetailsIsWaiting(
+				semaphore,
+				file,
+				previewWidth)) {
 			++waiting;
 		}
 	}
 	if (waiting > 0) {
 		semaphore.acquire(waiting);
-		//if (result.albumIsPossible) {
-		//	const auto badIt = ranges::find(
-		//		result.files,
-		//		PreparedFile::AlbumType::None,
-		//		[](const PreparedFile &file) { return file.type; });
-		//	result.albumIsPossible = (badIt == result.files.end());
-		//}
 	}
 }
 
@@ -250,13 +241,15 @@ PreparedList PrepareMediaList(const QStringList &files, int previewWidth) {
 				file
 			};
 		}
-		const auto toCompress = HasExtensionFrom(file, extensionsToCompress);
-		if (filesize > App::kImageSizeLimit || !toCompress) {
-//			result.allFilesForCompress = false;
+		if (result.files.size() < Ui::MaxAlbumItems()) {
+			result.files.emplace_back(file);
+			result.files.back().size = filesize;
+		} else {
+			result.filesToProcess.emplace_back(file);
+			result.files.back().size = filesize;
 		}
-		result.files.emplace_back(file);
 	}
-	PrepareAlbum(result, previewWidth);
+	PrepareDetailsInParallel(result, previewWidth);
 	return result;
 }
 
@@ -276,7 +269,7 @@ PreparedList PrepareMediaFromImage(
 			file.information);
 	}
 	result.files.push_back(std::move(file));
-	PrepareAlbum(result, previewWidth);
+	PrepareDetailsInParallel(result, previewWidth);
 	return result;
 }
 
@@ -304,7 +297,7 @@ std::optional<PreparedList> PreparedFileFromFilesDialog(
 		if (isAlbum) {
 			const auto file = &list.files.front();
 			if (!Core::IsMimeAcceptedForAlbum(mimeFile)
-				|| file->type == Storage::PreparedFile::AlbumType::None) {
+				|| file->type == Storage::PreparedFile::AlbumType::File) {
 				errorCallback(tr::lng_edit_media_album_error);
 				return std::nullopt;
 			}
@@ -361,7 +354,6 @@ std::optional<PreparedList> PreparedFileFromFilesDialog(
 		}
 
 		auto list = PreparedList(temp.error, temp.errorData);
-		//list.albumIsPossible = isAlbum;
 		list.files = std::move(filteredFiles);
 
 		return list;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
index e57e5ab48..af6b66526 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
@@ -22,7 +22,7 @@ constexpr auto kDragDuration = crl::time(200);
 
 AlbumPreview::AlbumPreview(
 	QWidget *parent,
-	const PreparedList &list,
+	gsl::span<PreparedFile> list,
 	SendFilesWay way)
 : RpWidget(parent)
 , _list(list)
@@ -69,7 +69,7 @@ auto AlbumPreview::generateOrderedLayout() const
 	auto sizes = ranges::view::all(
 		_order
 	) | ranges::view::transform([&](int index) {
-		return _list.files[index].shownDimensions;
+		return _list[index].shownDimensions;
 	}) | ranges::to_vector;
 
 	auto layout = LayoutMediaGroup(
@@ -82,19 +82,19 @@ auto AlbumPreview::generateOrderedLayout() const
 }
 
 std::vector<int> AlbumPreview::defaultOrder() const {
-	const auto count = int(_list.files.size());
+	const auto count = int(_list.size());
 	return ranges::view::ints(0, count) | ranges::to_vector;
 }
 
 void AlbumPreview::prepareThumbs() {
 	_order = defaultOrder();
 
-	const auto count = int(_list.files.size());
+	const auto count = int(_list.size());
 	const auto layout = generateOrderedLayout();
 	_thumbs.reserve(count);
 	for (auto i = 0; i != count; ++i) {
 		_thumbs.push_back(std::make_unique<AlbumThumbnail>(
-			_list.files[i],
+			_list[i],
 			layout[i],
 			this,
 			[=] { changeThumbByIndex(thumbIndex(thumbUnderCursor())); },
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
index fe9a2d160..fad5a80db 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 
-struct PreparedList;
+struct PreparedFile;
 struct GroupMediaLayout;
 class AlbumThumbnail;
 
@@ -20,18 +20,18 @@ class AlbumPreview final : public RpWidget {
 public:
 	AlbumPreview(
 		QWidget *parent,
-		const PreparedList &list,
+		gsl::span<PreparedFile> list,
 		SendFilesWay way);
 	~AlbumPreview();
 
 	void setSendWay(SendFilesWay way);
 	std::vector<int> takeOrder();
 
-	auto thumbDeleted() {
+	[[nodiscard]] rpl::producer<int> thumbDeleted() const {
 		return _thumbDeleted.events();
 	}
 
-	auto thumbChanged() {
+	[[nodiscard]] rpl::producer<int> thumbChanged() const {
 		return _thumbChanged.events();
 	}
 
@@ -73,7 +73,7 @@ private:
 	void cancelDrag();
 	void finishDrag();
 
-	const PreparedList &_list;
+	gsl::span<PreparedFile> _list;
 	SendFilesWay _sendWay;
 	style::cursor _cursor = style::cur_default;
 	std::vector<int> _order;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index 1698eb5bb..07d23def1 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -32,7 +32,6 @@ PreparedList PreparedList::Reordered(
 	Expects(list.files.size() == order.size());
 
 	auto result = PreparedList(list.error, list.errorData);
-	result.singleAlbumIsPossible = list.singleAlbumIsPossible;
 	result.files.reserve(list.files.size());
 	for (auto index : order) {
 		result.files.push_back(std::move(list.files[index]));
@@ -58,28 +57,50 @@ void PreparedList::mergeToEnd(PreparedList &&other, bool cutToAlbumSize) {
 		}
 		files.push_back(std::move(file));
 	}
-	if (files.size() > 1 && files.size() <= kMaxAlbumCount) {
-		const auto badIt = ranges::find(
-			files,
-			PreparedFile::AlbumType::None,
-			[](const PreparedFile &file) { return file.type; });
-		singleAlbumIsPossible = (badIt == files.end());
-	} else {
-		singleAlbumIsPossible = false;
-	}
 }
 
-bool PreparedList::canAddCaption(bool isAlbum) const {
-	const auto isSticker = [&] {
-		if (files.empty()) {
-			return false;
-		}
-		return Core::IsMimeSticker(files.front().mime)
+bool PreparedList::canBeSentInSlowmode() const {
+	if (!filesToProcess.empty()) {
+		return false;
+	} else if (files.size() < 2) {
+		return true;
+	} else if (files.size() > kMaxAlbumCount) {
+		return false;
+	}
+
+	const auto hasFiles = ranges::contains(
+		files,
+		PreparedFile::AlbumType::File,
+		&PreparedFile::type);
+	const auto hasVideos = ranges::contains(
+		files,
+		PreparedFile::AlbumType::Video,
+		&PreparedFile::type);
+
+	// File-s and Video-s never can be grouped.
+	return !hasFiles || !hasVideos;
+}
+
+bool PreparedList::canAddCaption(bool groupMediaInAlbums) const {
+	if (!filesToProcess.empty()
+		|| files.empty()
+		|| files.size() > kMaxAlbumCount) {
+		return false;
+	}
+	if (files.size() == 1) {
+		const auto isSticker = Core::IsMimeSticker(files.front().mime)
 			|| files.front().path.endsWith(
 				qstr(".tgs"),
 				Qt::CaseInsensitive);
-	};
-	return isAlbum || (files.size() == 1 && !isSticker());
+		return !isSticker;
+	} else if (!groupMediaInAlbums) {
+		return false;
+	}
+	const auto hasFiles = ranges::contains(
+		files,
+		PreparedFile::AlbumType::File,
+		&PreparedFile::type);
+	return !hasFiles;
 }
 
 int MaxAlbumItems() {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index 56e9781ec..a7a64dd51 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include <QtCore/QSemaphore>
 #include <deque>
 
 namespace Ui {
@@ -34,8 +35,15 @@ struct PreparedFileInformation {
 };
 
 struct PreparedFile {
+	// File-s can be grouped if 'groupFiles'.
+	// File-s + Photo-s can be grouped if 'groupFiles && !sendImagesAsPhotos'.
+	// Photo-s can be grouped if '(groupFiles && !sendImagesAsPhotos)
+	//   || (groupMediaInAlbums && sendImagesAsPhotos)'.
+	// Photo-s + Video-s can be grouped if 'groupMediaInAlbums
+	//   && sendImagesAsPhotos'.
+	// Video-s can be grouped if 'groupMediaInAlbums'.
 	enum class AlbumType {
-		None,
+		File,
 		Photo,
 		Video,
 	};
@@ -48,10 +56,11 @@ struct PreparedFile {
 	QString path;
 	QByteArray content;
 	QString mime;
+	int size = 0;
 	std::unique_ptr<Ui::PreparedFileInformation> information;
 	QImage preview;
 	QSize shownDimensions;
-	AlbumType type = AlbumType::None;
+	AlbumType type = AlbumType::File;
 };
 
 struct PreparedList {
@@ -73,16 +82,14 @@ struct PreparedList {
 		std::vector<int> order);
 	void mergeToEnd(PreparedList &&other, bool cutToAlbumSize = false);
 
-	[[nodiscard]] bool canAddCaption(bool isAlbum) const;
+	[[nodiscard]] bool canAddCaption(bool groupMediaInAlbums) const;
+	[[nodiscard]] bool canBeSentInSlowmode() const;
 
 	Error error = Error::None;
 	QString errorData;
 	std::vector<PreparedFile> files;
 	std::deque<PreparedFile> filesToProcess;
 	std::optional<bool> overrideSendImagesAsPhotos;
-	//bool someFilesForCompress = false;
-	//bool someAlbumIsPossible = false;
-	bool singleAlbumIsPossible = false;
 };
 
 [[nodiscard]] int MaxAlbumItems();
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
index 43f0e0911..1e837150e 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
@@ -25,6 +25,11 @@ SingleFilePreview::SingleFilePreview(
 	const PreparedFile &file)
 : RpWidget(parent) {
 	preparePreview(file);
+
+	auto h = _fileThumb.isNull()
+		? (st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom())
+		: (st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom());
+	resize(width(), st::boxPhotoPadding.top() + h + st::msgShadow);
 }
 
 void SingleFilePreview::prepareThumb(const QImage &preview) {
@@ -163,11 +168,4 @@ void SingleFilePreview::paintEvent(QPaintEvent *e) {
 	p.drawTextLeft(x + nameleft, y + statustop, width(), _statusText);
 }
 
-rpl::producer<int> SingleFilePreview::desiredHeightValue() const {
-	auto h = _fileThumb.isNull()
-		? (st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom())
-		: (st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom());
-	return rpl::single(st::boxPhotoPadding.top() + h + st::msgShadow);
-}
-
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
index 442106148..bb06249dd 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
@@ -19,8 +19,6 @@ public:
 		QWidget *parent,
 		const PreparedFile &file);
 
-	rpl::producer<int> desiredHeightValue() const override;
-
 protected:
 	void paintEvent(QPaintEvent *e) override;
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
index 18b41cbb9..3d88cbb35 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
@@ -135,6 +135,8 @@ void SingleMediaPreview::preparePreview(
 	_preview.setDevicePixelRatio(style::DevicePixelRatio());
 
 	prepareAnimatedPreview(animatedPreviewPath);
+
+	resize(width(), st::boxPhotoPadding.top() + _previewHeight);
 }
 
 void SingleMediaPreview::prepareAnimatedPreview(
@@ -228,8 +230,4 @@ void SingleMediaPreview::paintEvent(QPaintEvent *e) {
 	}
 }
 
-rpl::producer<int> SingleMediaPreview::desiredHeightValue() const {
-	return rpl::single(st::boxPhotoPadding.top() + _previewHeight);
-}
-
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
index 17e035e8e..8f61787d6 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
@@ -38,8 +38,6 @@ public:
 		return _canSendAsPhoto;
 	}
 
-	rpl::producer<int> desiredHeightValue() const override;
-
 protected:
 	void paintEvent(QPaintEvent *e) override;
 

From 0539cc9448c18bfd4cd7a829c0ef9d48eac13738 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 16 Oct 2020 13:38:12 +0300
Subject: [PATCH 097/190] Add a way to recreate SendFilesBox content.

---
 Telegram/SourceFiles/apiwrap.cpp              |   1 +
 Telegram/SourceFiles/boxes/boxes.style        |   6 +-
 .../SourceFiles/boxes/edit_caption_box.cpp    |   2 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp | 254 ++++++++++--------
 Telegram/SourceFiles/boxes/send_files_box.h   |  36 ++-
 .../storage/storage_media_prepare.cpp         |  11 +-
 .../ui/chat/attach/attach_album_preview.cpp   |  41 +--
 .../ui/chat/attach/attach_album_preview.h     |   8 +-
 .../ui/chat/attach/attach_album_thumbnail.cpp |   6 +-
 .../ui/chat/attach/attach_prepare.cpp         |   6 +-
 .../ui/chat/attach/attach_prepare.h           |   1 +
 11 files changed, 217 insertions(+), 155 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 1830eee54..7de96c1ad 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -4235,6 +4235,7 @@ void ApiWrap::sendFiles(
 				type = SendMediaType::Photo;
 				break;
 			case Ui::PreparedFile::AlbumType::Video:
+			case Ui::PreparedFile::AlbumType::File:
 				type = SendMediaType::File;
 				break;
 			default: Unexpected("AlbumType in uploadFilesAfterConfirmation");
diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index ac791872f..528cd1f70 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -489,7 +489,7 @@ backgroundScroll: ScrollArea(boxScroll) {
 	deltab: 10px;
 }
 
-editMediaButtonSize: 29px;
+editMediaButtonSize: 28px;
 editMediaButtonSkip: 8px;
 editMediaButtonFileSkipRight: 1px;
 editMediaButtonFileSkipTop: 7px;
@@ -514,6 +514,10 @@ sendBoxAlbumGroupSkipTop: 6px;
 sendBoxAlbumGroupRadius: 12px;
 sendBoxAlbumGroupHeight: 25px;
 
+sendBoxFileGroupSkipTop: 2px;
+sendBoxFileGroupSkipRight: 0px;
+sendBoxFileGroupEditInternalSkip: 4px;
+
 sendBoxAlbumGroupEditButtonIcon: editMediaButtonIconPhoto;
 sendBoxAlbumGroupEditButtonIconPosition: point(4px, -1px);
 
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 659151e98..03e2f9e47 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -689,7 +689,7 @@ bool EditCaptionBox::fileFromClipboard(not_null<const QMimeData*> data) {
 	}
 
 	const auto file = &list.files.front();
-	if (_isAlbum && (file->type == AlbumType::File)) {
+	if (_isAlbum && (file->type == AlbumType::File || file->type == AlbumType::None)) {
 		const auto imageAsDoc = [&] {
 			using Info = Ui::PreparedFileInformation;
 			const auto fileMedia = &file->information->media;
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index f0accfe2e..f405c48a1 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -100,6 +100,95 @@ rpl::producer<QString> FieldPlaceholder(
 
 } // namespace
 
+SendFilesBox::Block::Block(
+	not_null<QWidget*> parent,
+	not_null<std::vector<Ui::PreparedFile>*> items,
+	int from,
+	int till,
+	Fn<bool()> gifPaused,
+	SendFilesWay way)
+: _items(items)
+, _from(from)
+, _till(till) {
+	Expects(from >= 0);
+	Expects(till > from);
+	Expects(till <= items->size());
+
+	const auto count = till - from;
+	const auto my = gsl::make_span(*items).subspan(from, count);
+	const auto &first = my.front();
+	_isAlbum = (my.size() > 1)
+		|| (first.type == Ui::PreparedFile::AlbumType::Photo);
+	if (_isAlbum) {
+		const auto preview = Ui::CreateChild<Ui::AlbumPreview>(
+			parent.get(),
+			my,
+			way);
+		_preview.reset(preview);
+	} else {
+		const auto media = Ui::SingleMediaPreview::Create(
+			parent,
+			gifPaused,
+			first);
+		if (media) {
+			_preview.reset(media);
+		} else {
+			_preview.reset(
+				Ui::CreateChild<Ui::SingleFilePreview>(parent.get(), first));
+		}
+	}
+	_preview->show();
+}
+
+int SendFilesBox::Block::fromIndex() const {
+	return _from;
+}
+
+int SendFilesBox::Block::tillIndex() const {
+	return _till;
+}
+
+object_ptr<Ui::RpWidget> SendFilesBox::Block::takeWidget() {
+	return object_ptr<Ui::RpWidget>::fromRaw(_preview.get());
+}
+
+void SendFilesBox::Block::setSendWay(Ui::SendFilesWay way) {
+	if (!_isAlbum) {
+		return;
+	}
+	applyAlbumOrder();
+	const auto album = static_cast<Ui::AlbumPreview*>(_preview.get());
+	album->setSendWay(way);
+}
+
+void SendFilesBox::Block::applyAlbumOrder() {
+	if (!_isAlbum) {
+		return;
+	}
+	const auto album = static_cast<Ui::AlbumPreview*>(_preview.get());
+	const auto order = album->takeOrder();
+	const auto isIdentity = [&] {
+		for (auto i = 0, count = int(order.size()); i != count; ++i) {
+			if (order[i] != i) {
+				return false;
+			}
+		}
+		return true;
+	}();
+	if (isIdentity) {
+		return;
+	}
+
+	auto elements = std::vector<Ui::PreparedFile>();
+	elements.reserve(order.size());
+	for (const auto index : order) {
+		elements.push_back(std::move((*_items)[_from + index]));
+	}
+	for (auto i = 0, count = int(order.size()); i != count; ++i) {
+		(*_items)[_from + i] = std::move(elements[i]);
+	}
+}
+
 SendFilesBox::SendFilesBox(
 	QWidget*,
 	not_null<Window::SessionController*> controller,
@@ -147,36 +236,6 @@ void SendFilesBox::initPreview() {
 	}, _dimensionsLifetime);
 }
 
-//void SendFilesBox::prepareSingleFilePreview() {
-//	const auto &file = _list.files[0];
-//	const auto controller = _controller;
-//	const auto media = Ui::SingleMediaPreview::Create(this, [=] {
-//		return controller->isGifPausedAtLeastFor(
-//			Window::GifPauseReason::Layer);
-//	}, file);
-//	if (media) {
-//		_preview = media;
-//		initPreview(media->desiredHeightValue());
-//	} else {
-//		const auto preview = Ui::CreateChild<Ui::SingleFilePreview>(this, file);
-//		_preview = preview;
-//		initPreview(preview->desiredHeightValue());
-//	}
-//}
-
-//void SendFilesBox::prepareAlbumPreview() {
-//	addThumbButtonHandlers(wrap); // #TODO files
-//
-//	setupShadows(wrap, _albumPreview);
-//
-//	initPreview(_albumPreview->desiredHeightValue());
-//
-//	crl::on_main([=] {
-//		wrap->scrollToY(_lastScrollTop);
-//		_lastScrollTop = 0;
-//	});
-//}
-
 void SendFilesBox::addThumbButtonHandlers(not_null<Ui::ScrollArea*> wrap) {
 	// #TODO files
 	//_albumPreview->thumbDeleted(
@@ -224,14 +283,12 @@ void SendFilesBox::addThumbButtonHandlers(not_null<Ui::ScrollArea*> wrap) {
 	//}, _albumPreview->lifetime());
 }
 
-void SendFilesBox::setupShadows(
-		not_null<Ui::ScrollArea*> wrap,
-		not_null<Ui::AlbumPreview*> content) {
+void SendFilesBox::setupShadows() {
 	using namespace rpl::mappers;
 
 	const auto topShadow = Ui::CreateChild<Ui::FadeShadow>(this);
 	const auto bottomShadow = Ui::CreateChild<Ui::FadeShadow>(this);
-	wrap->geometryValue(
+	_scroll->geometryValue(
 	) | rpl::start_with_next_done([=](const QRect &geometry) {
 		topShadow->resizeToWidth(geometry.width());
 		topShadow->move(
@@ -246,11 +303,11 @@ void SendFilesBox::setupShadows(
 		Ui::DestroyChild(b.data());
 	}, topShadow->lifetime());
 
-	topShadow->toggleOn(wrap->scrollTopValue() | rpl::map(_1 > 0));
+	topShadow->toggleOn(_scroll->scrollTopValue() | rpl::map(_1 > 0));
 	bottomShadow->toggleOn(rpl::combine(
-		wrap->scrollTopValue(),
-		wrap->heightValue(),
-		content->heightValue(),
+		_scroll->scrollTopValue(),
+		_scroll->heightValue(),
+		_inner->heightValue(),
 		_1 + _2 < _3));
 }
 
@@ -269,9 +326,7 @@ void SendFilesBox::prepare() {
 	setupSendWayControls();
 	preparePreview();
 	initPreview();
-
-	_scroll->show();
-	_inner->show();
+	setupShadows();
 
 	boxClosing() | rpl::start_with_next([=] {
 		if (!_confirmed && _cancelledCallback) {
@@ -364,6 +419,9 @@ void SendFilesBox::initSendWay() {
 	) | rpl::start_with_next([=](SendFilesWay value) {
 		updateCaptionPlaceholder();
 		updateEmojiPanelGeometry();
+		for (auto &block : _blocks) {
+			block.setSendWay(value);
+		}
 		setInnerFocus();
 	}, lifetime());
 }
@@ -389,73 +447,59 @@ void SendFilesBox::updateCaptionPlaceholder() {
 }
 
 void SendFilesBox::preparePreview() {
+	generatePreviewFrom(0);
+}
+
+void SendFilesBox::generatePreviewFrom(int fromBlock) {
+	Expects(fromBlock <= _blocks.size());
+
 	using Type = Ui::PreparedFile::AlbumType;
 
-	_blocks.clear();
+	_blocks.erase(_blocks.begin() + fromBlock, _blocks.end());
+
+	const auto fromItem = _blocks.empty() ? 0 : _blocks.back().tillIndex();
+	Assert(fromItem <= _list.files.size());
+
 	auto albumStart = -1;
-	const auto finishAlbum = [&](int till) {
-		if (albumStart < 0) {
-			return;
-		}
-		const auto count = (till - albumStart);
-		const auto preview = _inner->add(object_ptr<Ui::AlbumPreview>(
-			this,
-			gsl::make_span(_list.files).subspan(albumStart, count),
-			_sendWay.current()));
-
-		auto &block = _blocks.emplace_back();
-		block.fromIndex = albumStart;
-		block.tillIndex = albumStart + count;
-		block.preview.reset(preview);
-		block.preview->show();
-
-		_sendWay.changes(
-		) | rpl::start_with_next([=](SendFilesWay value) {
-			applyAlbumOrder(preview, albumStart);
-			preview->setSendWay(value);
-		}, preview->lifetime());
-
-		albumStart = -1;
+	const auto gifPaused = [controller = _controller] {
+		return controller->isGifPausedAtLeastFor(
+			Window::GifPauseReason::Layer);
 	};
-	const auto finishSingle = [&](int index) {
-		const auto &file = _list.files[index];
-		const auto controller = _controller;
-		auto &block = _blocks.emplace_back();
-		block.fromIndex = index;
-		block.tillIndex = index + 1;
-		const auto media = Ui::SingleMediaPreview::Create(this, [=] {
-			return controller->isGifPausedAtLeastFor(
-				Window::GifPauseReason::Layer);
-		}, file);
-		if (media) {
-			block.preview.reset(
-				_inner->add(object_ptr<Ui::SingleMediaPreview>::fromRaw(
-					media)));
-		} else {
-			block.preview.reset(
-				_inner->add(object_ptr<Ui::SingleFilePreview>(this, file)));
-		}
-		block.preview->show();
+	const auto pushBlock = [&](int from, int till) {
+		_blocks.emplace_back(
+			_inner.data(),
+			&_list.files,
+			from,
+			till,
+			gifPaused,
+			_sendWay.current());
+		_inner->add(_blocks.back().takeWidget());
 	};
-	for (auto i = 0, count = int(_list.files.size()); i != count; ++i) {
+	for (auto i = fromItem, till = int(_list.files.size()); i != till; ++i) {
 		const auto type = _list.files[i].type;
 		if (albumStart >= 0) {
 			const auto albumCount = (i - albumStart);
-			if (type == Type::File || (albumCount == Ui::MaxAlbumItems())) {
-				finishAlbum(i);
+			if ((type == Type::File)
+				|| (type == Type::None)
+				|| (albumCount == Ui::MaxAlbumItems())) {
+				pushBlock(std::exchange(albumStart, -1), i);
 			} else {
 				continue;
 			}
 		}
-		if (type != Type::File) {
+		if (type != Type::File && type != Type::None) {
 			if (albumStart < 0) {
 				albumStart = i;
 			}
 			continue;
 		}
-		finishSingle(i);
+		pushBlock(i, i + 1);
 	}
-	finishAlbum(_list.files.size());
+	if (albumStart >= 0) {
+		pushBlock(albumStart, _list.files.size());
+	}
+
+	_scroll->scrollToY(0);
 }
 
 void SendFilesBox::setupControls() {
@@ -520,32 +564,6 @@ void SendFilesBox::updateSendWayControlsVisibility() {
 	_groupFiles->setVisible(!onlyOne);
 }
 
-void SendFilesBox::applyAlbumOrder(
-		not_null<Ui::AlbumPreview*> preview,
-		int from) {
-	const auto order = preview->takeOrder();
-	const auto isDefault = [&] {
-		for (auto i = 0, count = int(order.size()); i != count; ++i) {
-			if (order[i] != i) {
-				return false;
-			}
-		}
-		return true;
-	}();
-	if (isDefault) {
-		return;
-	}
-
-	auto elements = std::vector<Ui::PreparedFile>();
-	elements.reserve(order.size());
-	for (const auto index : order) {
-		elements.push_back(std::move(_list.files[from + index]));
-	}
-	for (auto i = 0, count = int(order.size()); i != count; ++i) {
-		_list.files[from + i] = std::move(elements[i]);
-	}
-}
-
 void SendFilesBox::setupCaption() {
 	_caption->setMaxLength(
 		_controller->session().serverConfig().captionLengthMax);
@@ -854,7 +872,9 @@ void SendFilesBox::send(
 		Core::App().saveSettingsDelayed();
 	}
 
-	//applyAlbumOrder(); // #TODO files
+	for (auto &block : _blocks) {
+		block.applyAlbumOrder();
+	}
 	_confirmed = true;
 	if (_confirmedCallback) {
 		auto caption = (_caption && !_caption->isHidden())
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index 00f0626e8..b2df78752 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -84,10 +84,32 @@ protected:
 	void resizeEvent(QResizeEvent *e) override;
 
 private:
-	struct Block {
-		base::unique_qptr<Ui::RpWidget> preview;
-		int fromIndex = 0;
-		int tillIndex = 0;
+	class Block final {
+	public:
+		Block(
+			not_null<QWidget*> parent,
+			not_null<std::vector<Ui::PreparedFile>*> items,
+			int from,
+			int till,
+			Fn<bool()> gifPaused,
+			Ui::SendFilesWay way);
+		Block(Block &&other) = default;
+		Block &operator=(Block &&other) = default;
+
+		[[nodiscard]] int fromIndex() const;
+		[[nodiscard]] int tillIndex() const;
+		[[nodiscard]] object_ptr<Ui::RpWidget> takeWidget();
+
+		void setSendWay(Ui::SendFilesWay way);
+		void applyAlbumOrder();
+
+	private:
+		base::unique_qptr<Ui::RpWidget> _preview;
+		not_null<std::vector<Ui::PreparedFile>*> _items;
+		int _from = 0;
+		int _till = 0;
+		bool _isAlbum = false;
+
 	};
 	void initSendWay();
 	void initPreview();
@@ -95,9 +117,7 @@ private:
 	void setupControls();
 	void setupSendWayControls();
 	void setupCaption();
-	void setupShadows(
-		not_null<Ui::ScrollArea*> wrap,
-		not_null<Ui::AlbumPreview*> content);
+	void setupShadows();
 
 	void setupEmojiPanel();
 	void updateSendWayControlsVisibility();
@@ -105,7 +125,7 @@ private:
 	void emojiFilterForGeometry(not_null<QEvent*> event);
 
 	void preparePreview();
-	void applyAlbumOrder(not_null<Ui::AlbumPreview*> preview, int from);
+	void generatePreviewFrom(int fromBlock);
 
 	void send(Api::SendOptions options, bool ctrlShiftEnter = false);
 	void sendSilent();
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index aa9535964..b0cc66abf 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -97,6 +97,8 @@ bool PrepareDetailsIsWaiting(
 				Assert(!file.preview.isNull());
 				file.preview.setDevicePixelRatio(cRetinaFactor());
 				file.type = PreparedFile::AlbumType::Photo;
+			} else if (Core::IsMimeSticker(file.mime)) {
+				file.type = PreparedFile::AlbumType::None;
 			}
 		} else if (const auto video = std::get_if<Video>(
 				&file.information->media)) {
@@ -257,7 +259,7 @@ PreparedList PrepareMediaFromImage(
 		QImage &&image,
 		QByteArray &&content,
 		int previewWidth) {
-	auto result = Storage::PreparedList();
+	auto result = PreparedList();
 	auto file = PreparedFile(QString());
 	file.content = content;
 	if (file.content.isEmpty()) {
@@ -283,7 +285,7 @@ std::optional<PreparedList> PreparedFileFromFilesDialog(
 	}
 
 	if (!result.remoteContent.isEmpty()) {
-		auto list = Storage::PrepareMediaFromImage(
+		auto list = PrepareMediaFromImage(
 			QImage(),
 			std::move(result.remoteContent),
 			previewWidth);
@@ -297,7 +299,8 @@ std::optional<PreparedList> PreparedFileFromFilesDialog(
 		if (isAlbum) {
 			const auto file = &list.files.front();
 			if (!Core::IsMimeAcceptedForAlbum(mimeFile)
-				|| file->type == Storage::PreparedFile::AlbumType::File) {
+				|| file->type == PreparedFile::AlbumType::File
+				|| file->type == PreparedFile::AlbumType::File) {
 				errorCallback(tr::lng_edit_media_album_error);
 				return std::nullopt;
 			}
@@ -306,7 +309,7 @@ std::optional<PreparedList> PreparedFileFromFilesDialog(
 		return list;
 	} else if (!result.paths.isEmpty()) {
 		const auto isSingleFile = (result.paths.size() == 1);
-		auto temp = Storage::PrepareMediaList(result.paths, previewWidth);
+		auto temp = PrepareMediaList(result.paths, previewWidth);
 		if (temp.error != PreparedList::Error::None) {
 			errorCallback(tr::lng_send_media_invalid_files);
 			return std::nullopt;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
index af6b66526..fb67a6d15 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
@@ -22,13 +22,12 @@ constexpr auto kDragDuration = crl::time(200);
 
 AlbumPreview::AlbumPreview(
 	QWidget *parent,
-	gsl::span<PreparedFile> list,
+	gsl::span<Ui::PreparedFile> items,
 	SendFilesWay way)
 : RpWidget(parent)
-, _list(list)
 , _sendWay(way) {
 	setMouseTracking(true);
-	prepareThumbs();
+	prepareThumbs(items);
 	updateSize();
 	updateFileRows();
 }
@@ -55,25 +54,26 @@ void AlbumPreview::updateFileRows() {
 }
 
 std::vector<int> AlbumPreview::takeOrder() {
+	Expects(_thumbs.size() == _order.size());
+	Expects(_itemsShownDimensions.size() == _order.size());
+
 	auto reordered = std::vector<std::unique_ptr<AlbumThumbnail>>();
+	auto reorderedShownDimensions = std::vector<QSize>();
 	reordered.reserve(_thumbs.size());
+	reorderedShownDimensions.reserve(_itemsShownDimensions.size());
 	for (auto index : _order) {
 		reordered.push_back(std::move(_thumbs[index]));
+		reorderedShownDimensions.push_back(_itemsShownDimensions[index]);
 	}
 	_thumbs = std::move(reordered);
+	_itemsShownDimensions = std::move(reorderedShownDimensions);
 	return std::exchange(_order, defaultOrder());
 }
 
 auto AlbumPreview::generateOrderedLayout() const
 -> std::vector<GroupMediaLayout> {
-	auto sizes = ranges::view::all(
-		_order
-	) | ranges::view::transform([&](int index) {
-		return _list[index].shownDimensions;
-	}) | ranges::to_vector;
-
 	auto layout = LayoutMediaGroup(
-		sizes,
+		_itemsShownDimensions,
 		st::sendMediaPreviewSize,
 		st::historyGroupWidthMin / 2,
 		st::historyGroupSkip / 2);
@@ -81,20 +81,29 @@ auto AlbumPreview::generateOrderedLayout() const
 	return layout;
 }
 
-std::vector<int> AlbumPreview::defaultOrder() const {
-	const auto count = int(_list.size());
+std::vector<int> AlbumPreview::defaultOrder(int count) const {
+	Expects(count > 0 || !_order.empty());
+
+	if (count < 0) {
+		count = _order.size();
+	}
 	return ranges::view::ints(0, count) | ranges::to_vector;
 }
 
-void AlbumPreview::prepareThumbs() {
-	_order = defaultOrder();
+void AlbumPreview::prepareThumbs(gsl::span<Ui::PreparedFile> items) {
+	_order = defaultOrder(items.size());
+	_itemsShownDimensions = ranges::view::all(
+		_order
+	) | ranges::view::transform([&](int index) {
+		return items[index].shownDimensions;
+	}) | ranges::to_vector;
 
-	const auto count = int(_list.size());
+	const auto count = int(_order.size());
 	const auto layout = generateOrderedLayout();
 	_thumbs.reserve(count);
 	for (auto i = 0; i != count; ++i) {
 		_thumbs.push_back(std::make_unique<AlbumThumbnail>(
-			_list[i],
+			items[i],
 			layout[i],
 			this,
 			[=] { changeThumbByIndex(thumbIndex(thumbUnderCursor())); },
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
index fad5a80db..6918c2ef6 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h
@@ -20,7 +20,7 @@ class AlbumPreview final : public RpWidget {
 public:
 	AlbumPreview(
 		QWidget *parent,
-		gsl::span<PreparedFile> list,
+		gsl::span<Ui::PreparedFile> items,
 		SendFilesWay way);
 	~AlbumPreview();
 
@@ -45,8 +45,8 @@ private:
 	int countLayoutHeight(
 		const std::vector<GroupMediaLayout> &layout) const;
 	std::vector<GroupMediaLayout> generateOrderedLayout() const;
-	std::vector<int> defaultOrder() const;
-	void prepareThumbs();
+	std::vector<int> defaultOrder(int count = -1) const;
+	void prepareThumbs(gsl::span<Ui::PreparedFile> items);
 	void updateSizeAnimated(const std::vector<GroupMediaLayout> &layout);
 	void updateSize();
 	void updateFileRows();
@@ -73,10 +73,10 @@ private:
 	void cancelDrag();
 	void finishDrag();
 
-	gsl::span<PreparedFile> _list;
 	SendFilesWay _sendWay;
 	style::cursor _cursor = style::cur_default;
 	std::vector<int> _order;
+	std::vector<QSize> _itemsShownDimensions;
 	std::vector<std::unique_ptr<AlbumThumbnail>> _thumbs;
 	int _thumbsHeight = 0;
 	int _photosHeight = 0;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
index 6b2618140..6f7d80381 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
@@ -127,12 +127,12 @@ void AlbumThumbnail::updateFileRow(int row) {
 	const auto fileHeight = st::sendMediaFileThumbSize
 		+ st::sendMediaFileThumbSkip;
 
-	const auto top = row * fileHeight + st::sendBoxAlbumGroupSkipTop;
+	const auto top = row * fileHeight + st::sendBoxFileGroupSkipTop;
 	const auto size = st::editMediaButtonSize;
 
-	auto right = st::sendBoxAlbumGroupSkipRight + size;
+	auto right = st::sendBoxFileGroupSkipRight + size;
 	_deleteMedia->moveToRight(right, top);
-	right += st::sendBoxAlbumGroupEditInternalSkip + size;
+	right += st::sendBoxFileGroupEditInternalSkip + size;
 	_editMedia->moveToRight(right, top);
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index 07d23def1..6dd18d735 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -68,6 +68,10 @@ bool PreparedList::canBeSentInSlowmode() const {
 		return false;
 	}
 
+	const auto hasNonGrouping = ranges::contains(
+		files,
+		PreparedFile::AlbumType::None,
+		&PreparedFile::type);
 	const auto hasFiles = ranges::contains(
 		files,
 		PreparedFile::AlbumType::File,
@@ -78,7 +82,7 @@ bool PreparedList::canBeSentInSlowmode() const {
 		&PreparedFile::type);
 
 	// File-s and Video-s never can be grouped.
-	return !hasFiles || !hasVideos;
+	return !hasNonGrouping && (!hasFiles || !hasVideos);
 }
 
 bool PreparedList::canAddCaption(bool groupMediaInAlbums) const {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index a7a64dd51..d73c5fd8d 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -46,6 +46,7 @@ struct PreparedFile {
 		File,
 		Photo,
 		Video,
+		None,
 	};
 
 	PreparedFile(const QString &path);

From 843fba61eeed1f067168a11cf03d8b86647855b1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 16 Oct 2020 17:11:23 +0300
Subject: [PATCH 098/190] Allow adding any amount of files in SendFilesBox.

---
 .../SourceFiles/boxes/edit_caption_box.cpp    |  33 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp | 174 +++++++----
 Telegram/SourceFiles/boxes/send_files_box.h   |  12 +-
 .../storage/storage_media_prepare.cpp         | 282 +++++++++---------
 .../storage/storage_media_prepare.h           |   3 +-
 .../ui/chat/attach/attach_prepare.cpp         |  21 +-
 .../ui/chat/attach/attach_prepare.h           |   7 +-
 7 files changed, 306 insertions(+), 226 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 03e2f9e47..b3a853eaf 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -50,6 +50,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_options.h"
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/controls/emoji_button.h"
+#include "ui/toast/toast.h"
 #include "ui/cached_round_corners.h"
 #include "window/window_session_controller.h"
 #include "confirm_box.h"
@@ -485,7 +486,8 @@ void EditCaptionBox::updateEditPreview() {
 	const auto fileinfo = QFileInfo(file->path);
 	const auto filename = fileinfo.fileName();
 
-	_isImage = Core::FileIsImage(filename, file->mime);
+	const auto mime = file->information->filemime;
+	_isImage = Core::FileIsImage(filename, mime);
 	_isAudio = false;
 	_animated = false;
 	_photo = false;
@@ -525,7 +527,7 @@ void EditCaptionBox::updateEditPreview() {
 		}
 
 		const auto getExt = [&] {
-			auto patterns = Core::MimeTypeForName(file->mime).globPatterns();
+			auto patterns = Core::MimeTypeForName(mime).globPatterns();
 			if (!patterns.isEmpty()) {
 				return patterns.front().replace('*', QString());
 			}
@@ -588,14 +590,33 @@ void EditCaptionBox::updateEditMediaButton() {
 
 void EditCaptionBox::createEditMediaButton() {
 	const auto callback = [=](FileDialog::OpenResult &&result) {
-		auto showBoxErrorCallback = [](tr::phrase<> t) {
-			Ui::show(Box<InformBox>(t(tr::now)), Ui::LayerOption::KeepOther);
+		auto showError = [](tr::phrase<> t) {
+			Ui::Toast::Show(t(tr::now));
 		};
 
+		const auto checkResult = [=](const Ui::PreparedList &list) {
+			if (list.files.size() != 1) {
+				return false;
+			}
+			const auto &file = list.files.front();
+			const auto mime = file.information->filemime;
+			if (Core::IsMimeSticker(mime)) {
+				showError(tr::lng_edit_media_invalid_file);
+				return false;
+			} else if (_isAlbum) { // #TODO edit in file-albums
+				if (!Core::IsMimeAcceptedForAlbum(mime)
+					|| file.type == Ui::PreparedFile::AlbumType::File
+					|| file.type == Ui::PreparedFile::AlbumType::None) {
+					showError(tr::lng_edit_media_album_error);
+					return false;
+				}
+			}
+			return true;
+		};
 		auto list = Storage::PreparedFileFromFilesDialog(
 			std::move(result),
-			_isAlbum,
-			std::move(showBoxErrorCallback),
+			checkResult,
+			showError,
 			st::sendMediaPreviewSize);
 
 		if (list) {
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index f405c48a1..fc01e8808 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -40,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/format_values.h"
 #include "ui/grouped_layout.h"
 #include "ui/text/text_options.h"
+#include "ui/toast/toast.h"
 #include "ui/controls/emoji_button.h"
 #include "lottie/lottie_single_player.h"
 #include "data/data_document.h"
@@ -70,17 +71,17 @@ inline bool IsSingleItem(const Ui::PreparedList &list) {
 }
 
 void FileDialogCallback(
-	FileDialog::OpenResult &&result,
-	bool isAlbum,
-	Fn<void(Ui::PreparedList)> callback) {
-	auto showBoxErrorCallback = [](tr::phrase<> text) {
-		Ui::show(Box<InformBox>(text(tr::now)), Ui::LayerOption::KeepOther);
+		FileDialog::OpenResult &&result,
+		Fn<bool(const Ui::PreparedList&)> checkResult,
+		Fn<void(Ui::PreparedList)> callback) {
+	auto showError = [](tr::phrase<> text) {
+		Ui::Toast::Show(text(tr::now));
 	};
 
 	auto list = Storage::PreparedFileFromFilesDialog(
 		std::move(result),
-		isAlbum,
-		std::move(showBoxErrorCallback),
+		checkResult,
+		showError,
 		st::sendMediaPreviewSize);
 
 	if (!list) {
@@ -212,12 +213,13 @@ SendFilesBox::SendFilesBox(
 , _inner(
 	_scroll->setOwnedWidget(
 		object_ptr<Ui::VerticalLayout>(_scroll.data()))) {
+	enqueueNextPrepare();
 }
 
 void SendFilesBox::initPreview() {
 	using namespace rpl::mappers;
 
-	setupControls();
+	refreshControls();
 
 	updateBoxSize();
 
@@ -260,7 +262,6 @@ void SendFilesBox::addThumbButtonHandlers(not_null<Ui::ScrollArea*> wrap) {
 	//	const auto callback = [=](FileDialog::OpenResult &&result) {
 	//		FileDialogCallback(
 	//			std::move(result),
-	//			true,
 	//			[=] (auto list) {
 	//				_list.files[index] = std::move(list.files.front());
 	//				applyAlbumOrder();
@@ -277,12 +278,38 @@ void SendFilesBox::addThumbButtonHandlers(not_null<Ui::ScrollArea*> wrap) {
 	//	FileDialog::GetOpenPath(
 	//		this,
 	//		tr::lng_choose_file(tr::now),
-	//		FileDialog::AlbumFilesFilter(),
+	//		FileDialog::AllOrImagesFilter(),
 	//		crl::guard(this, callback));
 
 	//}, _albumPreview->lifetime());
 }
 
+void SendFilesBox::enqueueNextPrepare() {
+	if (_preparing) {
+		return;
+	}
+	while (!_list.filesToProcess.empty()
+		&& _list.filesToProcess.front().information) {
+		addFile(std::move(_list.filesToProcess.front()));
+		_list.filesToProcess.pop_front();
+	}
+	if (_list.filesToProcess.empty()) {
+		return;
+	}
+	auto file = std::move(_list.filesToProcess.front());
+	_list.filesToProcess.pop_front();
+	const auto weak = Ui::MakeWeak(this);
+	_preparing = true;
+	crl::async([weak, file = std::move(file)]() mutable {
+		Storage::PrepareDetails(file, st::sendMediaPreviewSize);
+		crl::on_main([weak, file = std::move(file)]() mutable {
+			if (weak) {
+				weak->addPreparedAsyncFile(std::move(file));
+			}
+		});
+	});
+}
+
 void SendFilesBox::setupShadows() {
 	using namespace rpl::mappers;
 
@@ -369,33 +396,42 @@ void SendFilesBox::setupDragArea() {
 	};
 	areas.document->setDroppedCallback(droppedCallback(false));
 	areas.photo->setDroppedCallback(droppedCallback(true));
-	_albumChanged.events(
-	) | rpl::start_with_next([=] {
-		areas.document->raise();
-		areas.photo->raise();
-	}, lifetime());
 }
 
-void SendFilesBox::refreshAllAfterAlbumChanges() {
-	preparePreview();
+void SendFilesBox::refreshAllAfterChanges(int fromItem) {
+	auto fromBlock = 0;
+	for (auto count = int(_blocks.size()); fromBlock != count; ++fromBlock) {
+		if (_blocks[fromBlock].tillIndex() >= fromItem) {
+			break;
+		}
+	}
+	generatePreviewFrom(fromBlock);
+	_inner->resizeToWidth(st::boxWideWidth);
+	refreshControls();
 	captionResized();
-	_albumChanged.fire({});
 }
 
 void SendFilesBox::openDialogToAddFileToAlbum() {
+	const auto checkResult = [=](const Ui::PreparedList &list) {
+		if (_sendLimit != SendLimit::One) {
+			return true;
+		} else if (!_list.canBeSentInSlowmodeWith(list)) {
+			Ui::Toast::Show(tr::lng_slowmode_no_many(tr::now));
+			return false;
+		}
+		return true;
+	};
 	const auto callback = [=](FileDialog::OpenResult &&result) {
 		FileDialogCallback(
 			std::move(result),
-			true,
-			[=] (auto list) {
-				addFiles(std::move(list));
-			});
+			checkResult,
+			[=](Ui::PreparedList list) { addFiles(std::move(list)); });
 	};
 
 	FileDialog::GetOpenPaths(
 		this,
 		tr::lng_choose_file(tr::now),
-		FileDialog::AlbumFilesFilter(),
+		FileDialog::AllOrImagesFilter(),
 		crl::guard(this, callback));
 }
 
@@ -455,7 +491,11 @@ void SendFilesBox::generatePreviewFrom(int fromBlock) {
 
 	using Type = Ui::PreparedFile::AlbumType;
 
-	_blocks.erase(_blocks.begin() + fromBlock, _blocks.end());
+	const auto eraseFrom = _blocks.begin() + fromBlock;
+	for (auto i = eraseFrom; i != _blocks.end(); ++i) {
+		i->applyAlbumOrder();
+	}
+	_blocks.erase(eraseFrom, _blocks.end());
 
 	const auto fromItem = _blocks.empty() ? 0 : _blocks.back().tillIndex();
 	Assert(fromItem <= _list.files.size());
@@ -498,12 +538,10 @@ void SendFilesBox::generatePreviewFrom(int fromBlock) {
 	if (albumStart >= 0) {
 		pushBlock(albumStart, _list.files.size());
 	}
-
-	_scroll->scrollToY(0);
 }
 
-void SendFilesBox::setupControls() {
-	setupTitleText();
+void SendFilesBox::refreshControls() {
+	refreshTitleText();
 	updateSendWayControlsVisibility();
 }
 
@@ -669,20 +707,6 @@ void SendFilesBox::captionResized() {
 
 bool SendFilesBox::canAddFiles(not_null<const QMimeData*> data) const {
 	return (data->hasUrls() && CanAddUrls(data->urls())) || data->hasImage();
-	//const auto urls = data->hasUrls() ? data->urls() : QList<QUrl>();
-	//auto filesCount = CanAddUrls(urls) ? urls.size() : 0;
-	//if (!filesCount && data->hasImage()) {
-	//	++filesCount;
-	//}
-
-	//if (_list.files.size() + filesCount > Ui::MaxAlbumItems()) { // #TODO files
-	//	return false;
-	//} else if (_list.files.size() > 1 && !_albumPreview) {
-	//	return false;
-	//} else if (!IsFirstAlbumItem(_list)) {
-	//	return false;
-	//}
-	//return true;
 }
 
 bool SendFilesBox::addFiles(not_null<const QMimeData*> data) {
@@ -713,36 +737,54 @@ bool SendFilesBox::addFiles(not_null<const QMimeData*> data) {
 }
 
 bool SendFilesBox::addFiles(Ui::PreparedList list) {
-	const auto sumFiles = _list.files.size() + list.files.size();
-	const auto cutToAlbumSize = (sumFiles > Ui::MaxAlbumItems());
 	if (list.error != Ui::PreparedList::Error::None) {
 		return false;
-	//} else if (!IsSingleItem(list) && !list.albumIsPossible) { // #TODO files
-	//	return false;
-	//} else if (!IsFirstAlbumItem(list)) {
-	//	return false;
-	//} else if (_list.files.size() > 1 && !_albumPreview) {
-	//	return false;
-	//} else if (!IsFirstAlbumItem(_list)) {
-	//	return false;
 	}
-	//applyAlbumOrder();
-	//delete base::take(_preview);
-	//_albumPreview = nullptr;
-	return false;
-	_list.mergeToEnd(std::move(list), cutToAlbumSize);
-
-	refreshAllAfterAlbumChanges();
+	const auto count = int(_list.files.size());
+	_list.filesToProcess.insert(
+		_list.filesToProcess.end(),
+		std::make_move_iterator(list.files.begin()),
+		std::make_move_iterator(list.files.end()));
+	_list.filesToProcess.insert(
+		_list.filesToProcess.end(),
+		std::make_move_iterator(list.filesToProcess.begin()),
+		std::make_move_iterator(list.filesToProcess.end()));
+	enqueueNextPrepare();
+	if (_list.files.size() > count) {
+		refreshAllAfterChanges(count);
+	}
 	return true;
 }
 
-void SendFilesBox::setupTitleText() {
-	if (_list.files.size() > 1) {
-		const auto onlyImages = false;/* #TODO files (_compressConfirm != CompressConfirm::None)
-			&& (_albumVideosCount == 0);*/
-		_titleText = onlyImages
-			? tr::lng_send_images_selected(tr::now, lt_count, _list.files.size())
-			: tr::lng_send_files_selected(tr::now, lt_count, _list.files.size());
+void SendFilesBox::addPreparedAsyncFile(Ui::PreparedFile &&file) {
+	Expects(file.information != nullptr);
+
+	_preparing = false;
+	const auto count = int(_list.files.size());
+	addFile(std::move(file));
+	enqueueNextPrepare();
+	if (_list.files.size() > count) {
+		refreshAllAfterChanges(count);
+	}
+}
+
+void SendFilesBox::addFile(Ui::PreparedFile &&file) {
+	_list.files.push_back(std::move(file));
+	if (_sendLimit == SendLimit::One && !_list.canBeSentInSlowmode()) {
+		_list.files.pop_back();
+	}
+}
+
+void SendFilesBox::refreshTitleText() {
+	const auto count = int(_list.files.size());
+	if (count > 1) {
+		const auto imagesCount = ranges::count(
+			_list.files,
+			Ui::PreparedFile::AlbumType::Photo,
+			&Ui::PreparedFile::type);
+		_titleText = (imagesCount == count)
+			? tr::lng_send_images_selected(tr::now, lt_count, count)
+			: tr::lng_send_files_selected(tr::now, lt_count, count);
 		_titleHeight = st::boxTitleHeight;
 	} else {
 		_titleText = QString();
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index b2df78752..d9e8d5719 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -114,7 +114,7 @@ private:
 	void initSendWay();
 	void initPreview();
 
-	void setupControls();
+	void refreshControls();
 	void setupSendWayControls();
 	void setupCaption();
 	void setupShadows();
@@ -133,7 +133,7 @@ private:
 	void captionResized();
 
 	void setupDragArea();
-	void setupTitleText();
+	void refreshTitleText();
 	void updateBoxSize();
 	void updateControlsGeometry();
 	void updateCaptionPlaceholder();
@@ -143,9 +143,13 @@ private:
 	bool canAddFiles(not_null<const QMimeData*> data) const;
 	bool addFiles(not_null<const QMimeData*> data);
 	bool addFiles(Ui::PreparedList list);
+	void addFile(Ui::PreparedFile &&file);
 
 	void openDialogToAddFileToAlbum();
-	void refreshAllAfterAlbumChanges();
+	void refreshAllAfterChanges(int fromItem);
+
+	void enqueueNextPrepare();
+	void addPreparedAsyncFile(Ui::PreparedFile &&file);
 
 	const not_null<Window::SessionController*> _controller;
 	const Api::SendType _sendType = Api::SendType();
@@ -178,12 +182,12 @@ private:
 	rpl::variable<Ui::SendFilesWay> _sendWay = Ui::SendFilesWay();
 
 	rpl::variable<int> _footerHeight = 0;
-	rpl::event_stream<> _albumChanged;
 	rpl::lifetime _dimensionsLifetime;
 
 	object_ptr<Ui::ScrollArea> _scroll;
 	QPointer<Ui::VerticalLayout> _inner;
 	std::vector<Block> _blocks;
+	bool _preparing = false;
 
 	int _lastScrollTop = 0;
 
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index b0cc66abf..b156e7d8b 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -62,77 +62,20 @@ QSize PrepareShownDimensions(const QImage &preview) {
 		: result;
 }
 
-bool PrepareDetailsIsWaiting(
-		QSemaphore &semaphore,
-		PreparedFile &file,
-		int previewWidth) {
-	crl::async([=, &semaphore, &file] {
-		const auto guard = gsl::finally([&] { semaphore.release(); });
-		if (!file.path.isEmpty()) {
-			file.mime = Core::MimeTypeForFile(QFileInfo(file.path)).name();
-			file.information = FileLoadTask::ReadMediaInformation(
-				file.path,
-				QByteArray(),
-				file.mime);
-		} else if (!file.content.isEmpty()) {
-			file.mime = Core::MimeTypeForData(file.content).name();
-			file.information = FileLoadTask::ReadMediaInformation(
-				QString(),
-				file.content,
-				file.mime);
-		} else {
-			Assert(file.information != nullptr);
-		}
-
-		using Image = PreparedFileInformation::Image;
-		using Video = PreparedFileInformation::Video;
-		if (const auto image = std::get_if<Image>(
-				&file.information->media)) {
-			if (ValidPhotoForAlbum(*image, file.mime)) {
-				file.shownDimensions = PrepareShownDimensions(image->data);
-				file.preview = Images::prepareOpaque(image->data.scaledToWidth(
-					std::min(previewWidth, style::ConvertScale(image->data.width()))
-						* cIntRetinaFactor(),
-					Qt::SmoothTransformation));
-				Assert(!file.preview.isNull());
-				file.preview.setDevicePixelRatio(cRetinaFactor());
-				file.type = PreparedFile::AlbumType::Photo;
-			} else if (Core::IsMimeSticker(file.mime)) {
-				file.type = PreparedFile::AlbumType::None;
-			}
-		} else if (const auto video = std::get_if<Video>(
-				&file.information->media)) {
-			if (ValidVideoForAlbum(*video)) {
-				auto blurred = Images::prepareBlur(Images::prepareOpaque(video->thumbnail));
-				file.shownDimensions = PrepareShownDimensions(video->thumbnail);
-				file.preview = std::move(blurred).scaledToWidth(
-					previewWidth * cIntRetinaFactor(),
-					Qt::SmoothTransformation);
-				Assert(!file.preview.isNull());
-				file.preview.setDevicePixelRatio(cRetinaFactor());
-				file.type = PreparedFile::AlbumType::Video;
-			}
-		}
-	});
-	return true;
-}
-
 void PrepareDetailsInParallel(PreparedList &result, int previewWidth) {
 	Expects(result.files.size() <= Ui::MaxAlbumItems());
 
-	auto waiting = 0;
+	if (result.files.empty()) {
+		return;
+	}
 	QSemaphore semaphore;
 	for (auto &file : result.files) {
-		if (PrepareDetailsIsWaiting(
-				semaphore,
-				file,
-				previewWidth)) {
-			++waiting;
-		}
-	}
-	if (waiting > 0) {
-		semaphore.acquire(waiting);
+		crl::async([=, &semaphore, &file] {
+			PrepareDetails(file, previewWidth);
+			semaphore.release();
+		});
 	}
+	semaphore.acquire(result.files.size());
 }
 
 } // namespace
@@ -277,91 +220,152 @@ PreparedList PrepareMediaFromImage(
 
 std::optional<PreparedList> PreparedFileFromFilesDialog(
 		FileDialog::OpenResult &&result,
-		bool isAlbum,
+		Fn<bool(const Ui::PreparedList&)> checkResult,
 		Fn<void(tr::phrase<>)> errorCallback,
 		int previewWidth) {
 	if (result.paths.isEmpty() && result.remoteContent.isEmpty()) {
 		return std::nullopt;
 	}
 
-	if (!result.remoteContent.isEmpty()) {
-		auto list = PrepareMediaFromImage(
+	auto list = result.remoteContent.isEmpty()
+		? PrepareMediaList(result.paths, previewWidth)
+		: PrepareMediaFromImage(
 			QImage(),
 			std::move(result.remoteContent),
 			previewWidth);
-
-		const auto mimeFile = list.files.front().mime;
-		if (Core::IsMimeSticker(mimeFile)) {
-			errorCallback(tr::lng_edit_media_invalid_file);
-			return std::nullopt;
-		}
-
-		if (isAlbum) {
-			const auto file = &list.files.front();
-			if (!Core::IsMimeAcceptedForAlbum(mimeFile)
-				|| file->type == PreparedFile::AlbumType::File
-				|| file->type == PreparedFile::AlbumType::File) {
-				errorCallback(tr::lng_edit_media_album_error);
-				return std::nullopt;
-			}
-		}
-		Expects(list.files.size() == 1);
-		return list;
-	} else if (!result.paths.isEmpty()) {
-		const auto isSingleFile = (result.paths.size() == 1);
-		auto temp = PrepareMediaList(result.paths, previewWidth);
-		if (temp.error != PreparedList::Error::None) {
-			errorCallback(tr::lng_send_media_invalid_files);
-			return std::nullopt;
-		}
-		auto filteredFiles = ranges::view::all(
-			temp.files
-		) | ranges::view::filter([&](const auto &file) {
-			const auto info = QFileInfo(file.path);
-			if (Core::IsMimeSticker(Core::MimeTypeForFile(info).name())) {
-				if (isSingleFile) {
-					errorCallback(tr::lng_edit_media_invalid_file);
-				}
-				return false;
-			}
-			if (!isAlbum) {
-				return true;
-			}
-			using Info = PreparedFileInformation;
-
-			const auto media = &file.information->media;
-			const auto valid = v::match(*media, [](const Info::Image &data) {
-				return Ui::ValidateThumbDimensions(
-					data.data.width(),
-					data.data.height())
-					&& !data.animated;
-			}, [](Info::Video &data) {
-				data.isGifv = false;
-				return true;
-			}, [](auto &&other) {
-				return false;
-			});
-			if (!valid && isSingleFile) {
-				errorCallback(tr::lng_edit_media_album_error);
-			}
-			return valid;
-		}) | ranges::view::transform([](auto &file) {
-			return std::move(file);
-		}) | ranges::to_vector;
-
-		if (!filteredFiles.size()) {
-			if (!isSingleFile) {
-				errorCallback(tr::lng_send_media_invalid_files);
-			}
-			return std::nullopt;
-		}
-
-		auto list = PreparedList(temp.error, temp.errorData);
-		list.files = std::move(filteredFiles);
-
+	if (list.error != PreparedList::Error::None) {
+		errorCallback(tr::lng_send_media_invalid_files);
+		return std::nullopt;
+	} else if (!checkResult(list)) {
+		return std::nullopt;
+	} else {
 		return list;
 	}
-	return std::nullopt;
+	//if (!result.remoteContent.isEmpty()) {
+	//	auto list = PrepareMediaFromImage(
+	//		QImage(),
+	//		std::move(result.remoteContent),
+	//		previewWidth);
+
+	//	const auto mimeFile = list.files.front().information->filemime;
+	//	if (Core::IsMimeSticker(mimeFile)) {
+	//		errorCallback(tr::lng_edit_media_invalid_file);
+	//		return std::nullopt;
+	//	}
+
+	//	if (isAlbum) {
+	//		const auto file = &list.files.front();
+	//		if (!Core::IsMimeAcceptedForAlbum(mimeFile)
+	//			|| file->type == PreparedFile::AlbumType::File
+	//			|| file->type == PreparedFile::AlbumType::None) {
+	//			errorCallback(tr::lng_edit_media_album_error);
+	//			return std::nullopt;
+	//		}
+	//	}
+
+	//	Ensures(list.files.size() == 1);
+	//	return list;
+	//} else if (!result.paths.isEmpty()) {
+	//	auto temp = PrepareMediaList(result.paths, previewWidth);
+	//	const auto isSingleFile = (temp.files.size() == 1);
+	//	if (temp.error != PreparedList::Error::None) {
+	//		errorCallback(tr::lng_send_media_invalid_files);
+	//		return std::nullopt;
+	//	}
+	//	auto filteredFiles = ranges::view::all(
+	//		temp.files
+	//	) | ranges::view::filter([&](const auto &file) {
+	//		const auto info = QFileInfo(file.path);
+	//		if (Core::IsMimeSticker(Core::MimeTypeForFile(info).name())) {
+	//			if (isSingleFile) {
+	//				errorCallback(tr::lng_edit_media_invalid_file);
+	//			}
+	//			return false;
+	//		}
+	//		if (!isAlbum) {
+	//			return true;
+	//		}
+	//		using Info = PreparedFileInformation;
+
+	//		const auto media = &file.information->media;
+	//		const auto valid = v::match(*media, [](const Info::Image &data) {
+	//			return Ui::ValidateThumbDimensions(
+	//				data.data.width(),
+	//				data.data.height())
+	//				&& !data.animated;
+	//		}, [](Info::Video &data) {
+	//			data.isGifv = false;
+	//			return true;
+	//		}, [](auto &&other) {
+	//			return false;
+	//		});
+	//		if (!valid && isSingleFile) {
+	//			errorCallback(tr::lng_edit_media_album_error);
+	//		}
+	//		return valid;
+	//	}) | ranges::view::transform([](auto &file) {
+	//		return std::move(file);
+	//	}) | ranges::to_vector;
+
+	//	if (!filteredFiles.size()) {
+	//		if (!isSingleFile) {
+	//			errorCallback(tr::lng_send_media_invalid_files);
+	//		}
+	//		return std::nullopt;
+	//	}
+
+	//	auto list = PreparedList(temp.error, temp.errorData);
+	//	list.files = std::move(filteredFiles);
+
+	//	return list;
+	//}
+	//return std::nullopt;
+}
+
+void PrepareDetails(PreparedFile &file, int previewWidth) {
+	if (!file.path.isEmpty()) {
+		file.information = FileLoadTask::ReadMediaInformation(
+			file.path,
+			QByteArray(),
+			Core::MimeTypeForFile(QFileInfo(file.path)).name());
+	} else if (!file.content.isEmpty()) {
+		file.information = FileLoadTask::ReadMediaInformation(
+			QString(),
+			file.content,
+			Core::MimeTypeForData(file.content).name());
+	} else {
+		Assert(file.information != nullptr);
+	}
+
+	using Image = PreparedFileInformation::Image;
+	using Video = PreparedFileInformation::Video;
+	if (const auto image = std::get_if<Image>(
+			&file.information->media)) {
+		if (ValidPhotoForAlbum(*image, file.information->filemime)) {
+			file.shownDimensions = PrepareShownDimensions(image->data);
+			file.preview = Images::prepareOpaque(image->data.scaledToWidth(
+				std::min(previewWidth, style::ConvertScale(image->data.width()))
+					* cIntRetinaFactor(),
+				Qt::SmoothTransformation));
+			Assert(!file.preview.isNull());
+			file.preview.setDevicePixelRatio(cRetinaFactor());
+			file.type = PreparedFile::AlbumType::Photo;
+		} else if (Core::IsMimeSticker(file.information->filemime)) {
+			file.type = PreparedFile::AlbumType::None;
+		}
+	} else if (const auto video = std::get_if<Video>(
+			&file.information->media)) {
+		if (ValidVideoForAlbum(*video)) {
+			auto blurred = Images::prepareBlur(Images::prepareOpaque(video->thumbnail));
+			file.shownDimensions = PrepareShownDimensions(video->thumbnail);
+			file.preview = std::move(blurred).scaledToWidth(
+				previewWidth * cIntRetinaFactor(),
+				Qt::SmoothTransformation);
+			Assert(!file.preview.isNull());
+			file.preview.setDevicePixelRatio(cRetinaFactor());
+			file.type = PreparedFile::AlbumType::Video;
+		}
+	}
 }
 
 } // namespace Storage
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.h b/Telegram/SourceFiles/storage/storage_media_prepare.h
index 98b298a3b..b4dd55ad8 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.h
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.h
@@ -27,7 +27,7 @@ enum class MimeDataState {
 
 std::optional<Ui::PreparedList> PreparedFileFromFilesDialog(
 	FileDialog::OpenResult &&result,
-	bool isAlbum,
+	Fn<bool(const Ui::PreparedList&)> checkResult,
 	Fn<void(tr::phrase<>)> errorCallback,
 	int previewWidth);
 MimeDataState ComputeMimeDataState(const QMimeData *data);
@@ -38,5 +38,6 @@ Ui::PreparedList PrepareMediaFromImage(
 	QImage &&image,
 	QByteArray &&content,
 	int previewWidth);
+void PrepareDetails(Ui::PreparedFile &file, int previewWidth);
 
 } // namespace Storage
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index 6dd18d735..33edeb0ba 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -60,24 +60,29 @@ void PreparedList::mergeToEnd(PreparedList &&other, bool cutToAlbumSize) {
 }
 
 bool PreparedList::canBeSentInSlowmode() const {
-	if (!filesToProcess.empty()) {
+	return canBeSentInSlowmodeWith(PreparedList());
+}
+
+bool PreparedList::canBeSentInSlowmodeWith(const PreparedList &other) const {
+	if (!filesToProcess.empty() || !other.filesToProcess.empty()) {
 		return false;
-	} else if (files.size() < 2) {
+	} else if (files.size() + other.files.size() < 2) {
 		return true;
-	} else if (files.size() > kMaxAlbumCount) {
+	} else if (files.size() + other.files.size() > kMaxAlbumCount) {
 		return false;
 	}
 
+	auto &&all = ranges::view::concat(files, other.files);
 	const auto hasNonGrouping = ranges::contains(
-		files,
+		all,
 		PreparedFile::AlbumType::None,
 		&PreparedFile::type);
 	const auto hasFiles = ranges::contains(
-		files,
+		all,
 		PreparedFile::AlbumType::File,
 		&PreparedFile::type);
 	const auto hasVideos = ranges::contains(
-		files,
+		all,
 		PreparedFile::AlbumType::Video,
 		&PreparedFile::type);
 
@@ -92,7 +97,9 @@ bool PreparedList::canAddCaption(bool groupMediaInAlbums) const {
 		return false;
 	}
 	if (files.size() == 1) {
-		const auto isSticker = Core::IsMimeSticker(files.front().mime)
+		Assert(files.front().information != nullptr);
+		const auto isSticker = Core::IsMimeSticker(
+			files.front().information->filemime)
 			|| files.front().path.endsWith(
 				qstr(".tgs"),
 				Qt::CaseInsensitive);
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index d73c5fd8d..6e6419d9c 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -56,7 +56,6 @@ struct PreparedFile {
 
 	QString path;
 	QByteArray content;
-	QString mime;
 	int size = 0;
 	std::unique_ptr<Ui::PreparedFileInformation> information;
 	QImage preview;
@@ -75,8 +74,8 @@ struct PreparedList {
 
 	PreparedList() = default;
 	PreparedList(Error error, QString errorData)
-		: error(error)
-		, errorData(errorData) {
+	: error(error)
+	, errorData(errorData) {
 	}
 	[[nodiscard]] static PreparedList Reordered(
 		PreparedList &&list,
@@ -85,6 +84,8 @@ struct PreparedList {
 
 	[[nodiscard]] bool canAddCaption(bool groupMediaInAlbums) const;
 	[[nodiscard]] bool canBeSentInSlowmode() const;
+	[[nodiscard]] bool canBeSentInSlowmodeWith(
+		const PreparedList &other) const;
 
 	Error error = Error::None;
 	QString errorData;

From 86612f0a677d1fe9e9bfb06bd819f8cc13779545 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 16 Oct 2020 17:23:06 +0300
Subject: [PATCH 099/190] Allow dropping any amount of any files.

---
 Telegram/SourceFiles/boxes/send_files_box.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index fc01e8808..912623036 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -376,9 +376,6 @@ void SendFilesBox::setupDragArea() {
 		const auto state = Storage::ComputeMimeDataState(data);
 		return (state == DragState::PhotoFiles)
 			? DragState::Image
-			: (state == DragState::Files
-				&& !Storage::ValidateDragData(data, true))
-			? DragState::None
 			: state;
 	};
 	const auto areas = DragArea::SetupDragAreaToContainer(

From 85d08c8f52d071670620221ad906304181382c3f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 16 Oct 2020 20:48:27 +0300
Subject: [PATCH 100/190] Send files grouped in albums, show captions.

---
 Telegram/SourceFiles/apiwrap.cpp              |   4 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp |   9 ++
 Telegram/SourceFiles/boxes/send_files_box.h   |   1 +
 .../SourceFiles/data/data_media_types.cpp     |  14 +-
 .../SourceFiles/history/history_widget.cpp    |  83 ++++++++++--
 Telegram/SourceFiles/history/history_widget.h |   8 ++
 .../history/view/history_view_pinned_bar.cpp  |   2 +-
 .../view/media/history_view_document.cpp      |  73 +++++++++--
 .../view/media/history_view_document.h        |  11 +-
 .../history/view/media/history_view_gif.cpp   |  12 +-
 .../history/view/media/history_view_gif.h     |   9 +-
 .../history/view/media/history_view_media.cpp |   3 +-
 .../history/view/media/history_view_media.h   |  13 +-
 .../view/media/history_view_media_common.cpp  |   2 +-
 .../view/media/history_view_media_grouped.cpp | 120 +++++++++++-------
 .../view/media/history_view_media_grouped.h   |   4 +-
 .../history/view/media/history_view_photo.cpp |  12 +-
 .../history/view/media/history_view_photo.h   |  11 +-
 18 files changed, 292 insertions(+), 99 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 7de96c1ad..9f82ba51c 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -4232,7 +4232,9 @@ void ApiWrap::sendFiles(
 		if (album) {
 			switch (file.type) {
 			case Ui::PreparedFile::AlbumType::Photo:
-				type = SendMediaType::Photo;
+				type = (type == SendMediaType::File)
+					? type
+					: SendMediaType::Photo;
 				break;
 			case Ui::PreparedFile::AlbumType::Video:
 			case Ui::PreparedFile::AlbumType::File:
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 912623036..649d414d3 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -763,6 +763,9 @@ void SendFilesBox::addPreparedAsyncFile(Ui::PreparedFile &&file) {
 	if (_list.files.size() > count) {
 		refreshAllAfterChanges(count);
 	}
+	if (!_preparing && _whenReadySend) {
+		_whenReadySend();
+	}
 }
 
 void SendFilesBox::addFile(Ui::PreparedFile &&file) {
@@ -893,6 +896,12 @@ void SendFilesBox::send(
 		&& !options.scheduled) {
 		return sendScheduled();
 	}
+	if (_preparing) {
+		_whenReadySend = [=] {
+			send(options, ctrlShiftEnter);
+		};
+		return;
+	}
 
 	auto way = _sendWay.current();
 	auto oldWay = Core::App().settings().sendFilesWay();
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index d9e8d5719..25384cdf6 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -187,6 +187,7 @@ private:
 	object_ptr<Ui::ScrollArea> _scroll;
 	QPointer<Ui::VerticalLayout> _inner;
 	std::vector<Block> _blocks;
+	Fn<void()> _whenReadySend;
 	bool _preparing = false;
 
 	int _lastScrollTop = 0;
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 7a89c6252..d32e043cb 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -479,7 +479,14 @@ Storage::SharedMediaTypesMask MediaFile::sharedMediaTypes() const {
 }
 
 bool MediaFile::canBeGrouped() const {
-	return _document->isVideoFile() || _document->isSong();
+	if (_document->sticker() || _document->isAnimation()) {
+		return false;
+	} else if (_document->isVideoFile()) {
+		return true;
+	} else if (_document->isTheme() && _document->hasThumbnail()) {
+		return false;
+	}
+	return true;
 }
 
 bool MediaFile::hasReplyPreview() const {
@@ -704,7 +711,10 @@ std::unique_ptr<HistoryView::Media> MediaFile::createView(
 			message,
 			_document);
 	}
-	return std::make_unique<HistoryView::Document>(message, _document);
+	return std::make_unique<HistoryView::Document>(
+		message,
+		realParent,
+		_document);
 }
 
 MediaContact::MediaContact(
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index f73155795..c6f3e5d55 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4177,22 +4177,12 @@ bool HistoryWidget::confirmSendingFiles(
 			TextWithTags &&caption,
 			Api::SendOptions options,
 			bool ctrlShiftEnter) {
-		if (showSendingFilesError(list)) {
-			return;
-		}
-		const auto type = way.sendImagesAsPhotos()
-			? SendMediaType::Photo
-			: SendMediaType::File;
-		const auto album = way.groupMediaInAlbums() // #TODO files
-			? std::make_shared<SendingAlbum>()
-			: nullptr;
-		uploadFilesAfterConfirmation(
+		sendingFilesConfirmed(
 			std::move(list),
-			type,
+			way,
 			std::move(caption),
-			replyToId(),
 			options,
-			album);
+			ctrlShiftEnter);
 	}));
 	box->setCancelledCallback(crl::guard(this, [=] {
 		_field->setTextWithTags(text);
@@ -4214,6 +4204,73 @@ bool HistoryWidget::confirmSendingFiles(
 	return true;
 }
 
+void HistoryWidget::sendingFilesConfirmed(
+		Ui::PreparedList &&list,
+		Ui::SendFilesWay way,
+		TextWithTags &&caption,
+		Api::SendOptions options,
+		bool ctrlShiftEnter) {
+	Expects(list.filesToProcess.empty());
+
+	if (showSendingFilesError(list)) {
+		return;
+	}
+	const auto slowmode = _peer->slowmodeApplied();
+	const auto sendImagesAsPhotos = way.sendImagesAsPhotos();
+	const auto sendType = sendImagesAsPhotos
+		? SendMediaType::Photo
+		: SendMediaType::File;
+	const auto groupMedia = way.groupMediaInAlbums() || slowmode;
+	const auto groupFiles = way.groupFiles() || slowmode;
+
+	auto group = Ui::PreparedList();
+
+	// For groupType Type::Video means media album,
+	// Type::File means file album,
+	// Type::None means no grouping.
+	using Type = Ui::PreparedFile::AlbumType;
+	auto groupType = Type::None;
+
+	const auto reply = replyToId();
+	auto sendGroup = [&] {
+		if (group.files.empty()) {
+			return;
+		}
+		const auto album = (groupType == Type::None)
+			? nullptr
+			: std::make_shared<SendingAlbum>();
+		uploadFilesAfterConfirmation(
+			base::take(group),
+			sendType,
+			base::take(caption),
+			reply,
+			options,
+			std::move(album));
+	};
+	for (auto i = 0; i != list.files.size(); ++i) {
+		auto &file = list.files[i];
+		const auto fileGroupType = (file.type == Type::Video)
+			? (groupMedia ? Type::Video : Type::None)
+			: (file.type == Type::Photo)
+			? ((groupMedia && sendImagesAsPhotos)
+				? Type::Video
+				: (groupFiles && !sendImagesAsPhotos)
+				? Type::File
+				: Type::None)
+			: (file.type == Type::File)
+			? (groupFiles ? Type::File : Type::None)
+			: Type::None;
+		if ((!group.files.empty() && groupType != fileGroupType)
+			|| ((groupType != Type::None)
+				&& (group.files.size() == Ui::MaxAlbumItems()))) {
+			sendGroup();
+		}
+		group.files.push_back(std::move(file));
+		groupType = fileGroupType;
+	}
+	sendGroup();
+}
+
 bool HistoryWidget::confirmSendingFiles(
 		QImage &&image,
 		QByteArray &&content,
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 377bb4ede..76b698785 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -66,6 +66,7 @@ class LinkButton;
 class RoundButton;
 class PinnedBar;
 struct PreparedList;
+class SendFilesWay;
 namespace Toast {
 class Instance;
 } // namespace Toast
@@ -425,6 +426,13 @@ private:
 		const QString &insertTextOnCancel = QString());
 	bool showSendingFilesError(const Ui::PreparedList &list) const;
 
+	void sendingFilesConfirmed(
+		Ui::PreparedList &&list,
+		Ui::SendFilesWay way,
+		TextWithTags &&caption,
+		Api::SendOptions options,
+		bool ctrlShiftEnter);
+
 	void uploadFile(const QByteArray &fileContent, SendMediaType type);
 
 	void uploadFilesAfterConfirmation(
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index 267a9513f..a73c9e4cf 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item.h"
 #include "history/history.h"
 #include "apiwrap.h"
-#include "styles/style_history.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 0aa633d6e..9d3b47582 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -65,8 +65,9 @@ constexpr auto kAudioVoiceMsgUpdateView = crl::time(100);
 
 Document::Document(
 	not_null<Element*> parent,
+	not_null<HistoryItem*> realParent,
 	not_null<DocumentData*> document)
-: File(parent, parent->data())
+: File(parent, realParent)
 , _data(document) {
 	const auto item = parent->data();
 	auto caption = createCaption();
@@ -152,7 +153,7 @@ QSize Document::countOptimalSize() {
 	const auto item = _parent->data();
 
 	auto captioned = Get<HistoryDocumentCaptioned>();
-	if (_parent->media() != this) {
+	if (_parent->media() != this && !_realParent->groupId()) {
 		if (captioned) {
 			RemoveComponents(HistoryDocumentCaptioned::Bit());
 			captioned = nullptr;
@@ -508,7 +509,7 @@ void Document::draw(
 		}
 	}
 
-	if (mode == LayoutMode::Full) {
+	if (mode != LayoutMode::GroupedLast) {
 		if (auto captioned = Get<HistoryDocumentCaptioned>()) {
 			p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
 			captioned->_caption.draw(p, st::msgPadding.left(), bottom, captionw, style::al_left, 0, -1, selection);
@@ -682,7 +683,7 @@ TextState Document::textState(
 	}
 
 	auto painth = layout.height();
-	if (mode == LayoutMode::Full) {
+	if (mode != LayoutMode::GroupedLast) {
 		if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
 			if (point.y() >= bottom) {
 				result = TextState(_parent, captioned->_caption.getState(
@@ -859,10 +860,43 @@ bool Document::hideForwardedFrom() const {
 	return _data->isSong();
 }
 
-QSize Document::sizeForGrouping() const {
-	const auto height = st::msgFilePadding.top()
-		+ st::msgFileSize
-		+ st::msgFilePadding.bottom();
+QSize Document::sizeForGroupingOptimal(int maxWidth, bool last) const {
+	auto height = Has<HistoryDocumentThumbed>()
+		? (st::msgFileThumbPadding.top()
+			+ st::msgFileThumbSize
+			+ st::msgFileThumbPadding.bottom())
+		: (st::msgFilePadding.top()
+			+ st::msgFileSize
+			+ st::msgFilePadding.bottom());
+	if (!last) {
+		if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
+			auto captionw = maxWidth
+				- st::msgPadding.left()
+				- st::msgPadding.right();
+			height += captioned->_caption.countHeight(captionw);
+		}
+	}
+
+	return { maxWidth, height };
+}
+
+QSize Document::sizeForGrouping(int width, bool last) const {
+	auto height = Has<HistoryDocumentThumbed>()
+		? (st::msgFileThumbPadding.top()
+			+ st::msgFileThumbSize
+			+ st::msgFileThumbPadding.bottom())
+		: (st::msgFilePadding.top()
+			+ st::msgFileSize
+			+ st::msgFilePadding.bottom());
+	if (!last) {
+		if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
+			auto captionw = width
+				- st::msgPadding.left()
+				- st::msgPadding.right();
+			height += captioned->_caption.countHeight(captionw);
+		}
+	}
+
 	return { maxWidth(), height };
 }
 
@@ -875,9 +909,15 @@ void Document::drawGrouped(
 		RectParts sides,
 		RectParts corners,
 		not_null<uint64*> cacheKey,
-		not_null<QPixmap*> cache) const {
+		not_null<QPixmap*> cache,
+		bool last) const {
 	p.translate(geometry.topLeft());
-	draw(p, geometry.width(), selection, ms, LayoutMode::Grouped);
+	draw(
+		p,
+		geometry.width(),
+		selection,
+		ms,
+		last ? LayoutMode::GroupedLast : LayoutMode::Grouped);
 	p.translate(-geometry.topLeft());
 }
 
@@ -885,9 +925,14 @@ TextState Document::getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request) const {
+		StateRequest request,
+		bool last) const {
 	point -= geometry.topLeft();
-	return textState(point, geometry.size(), request, LayoutMode::Grouped);
+	return textState(
+		point,
+		geometry.size(),
+		request,
+		last ? LayoutMode::GroupedLast : LayoutMode::Grouped);
 }
 
 bool Document::voiceProgressAnimationCallback(crl::time now) {
@@ -952,7 +997,7 @@ void Document::refreshParentId(not_null<HistoryItem*> realParent) {
 }
 
 void Document::parentTextUpdated() {
-	auto caption = (_parent->media() == this)
+	auto caption = (_parent->media() == this || _realParent->groupId())
 		? createCaption()
 		: Ui::Text::String();
 	if (!caption.isEmpty()) {
@@ -980,7 +1025,7 @@ Ui::Text::String Document::createCaption() {
 		? DocumentTimestampLinkBase(_data, _realParent->fullId())
 		: QString();
 	return File::createCaption(
-		_parent->data(),
+		_realParent,
 		timestampLinksDuration,
 		timestampLinkBase);
 }
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.h b/Telegram/SourceFiles/history/view/media/history_view_document.h
index 5f7dc99ec..c3f8b03c1 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.h
@@ -30,6 +30,7 @@ class Document final
 public:
 	Document(
 		not_null<Element*> parent,
+		not_null<HistoryItem*> realParent,
 		not_null<DocumentData*> document);
 	~Document();
 
@@ -61,7 +62,8 @@ public:
 	QMargins bubbleMargins() const override;
 	bool hideForwardedFrom() const override;
 
-	QSize sizeForGrouping() const override;
+	QSize sizeForGroupingOptimal(int maxWidth, bool last) const override;
+	QSize sizeForGrouping(int width, bool last) const override;
 	void drawGrouped(
 		Painter &p,
 		const QRect &clip,
@@ -71,12 +73,14 @@ public:
 		RectParts sides,
 		RectParts corners,
 		not_null<uint64*> cacheKey,
-		not_null<QPixmap*> cache) const override;
+		not_null<QPixmap*> cache,
+		bool last) const override;
 	TextState getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request) const override;
+		StateRequest request,
+		bool last) const override;
 
 	bool voiceProgressAnimationCallback(crl::time now);
 
@@ -102,6 +106,7 @@ private:
 	enum class LayoutMode {
 		Full,
 		Grouped,
+		GroupedLast,
 	};
 
 	void draw(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 43916d11d..fed2eb912 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -884,7 +884,11 @@ bool Gif::fullFeaturedGrouped(RectParts sides) const {
 	return (sides & RectPart::Left) && (sides & RectPart::Right);
 }
 
-QSize Gif::sizeForGrouping() const {
+QSize Gif::sizeForGroupingOptimal(int maxWidth, bool last) const {
+	return sizeForAspectRatio();
+}
+
+QSize Gif::sizeForGrouping(int width, bool last) const {
 	return sizeForAspectRatio();
 }
 
@@ -897,7 +901,8 @@ void Gif::drawGrouped(
 		RectParts sides,
 		RectParts corners,
 		not_null<uint64*> cacheKey,
-		not_null<QPixmap*> cache) const {
+		not_null<QPixmap*> cache,
+		bool last) const {
 	ensureDataMediaCreated();
 	const auto item = _parent->data();
 	const auto loaded = dataLoaded();
@@ -1085,7 +1090,8 @@ TextState Gif::getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request) const {
+		StateRequest request,
+		bool last) const {
 	if (!geometry.contains(point)) {
 		return {};
 	}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.h b/Telegram/SourceFiles/history/view/media/history_view_gif.h
index e11bf0dbc..1a1f77f7f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.h
@@ -69,7 +69,8 @@ public:
 	}
 
 	bool fullFeaturedGrouped(RectParts sides) const;
-	QSize sizeForGrouping() const override;
+	QSize sizeForGroupingOptimal(int maxWidth, bool last) const override;
+	QSize sizeForGrouping(int width, bool last) const override;
 	void drawGrouped(
 		Painter &p,
 		const QRect &clip,
@@ -79,12 +80,14 @@ public:
 		RectParts sides,
 		RectParts corners,
 		not_null<uint64*> cacheKey,
-		not_null<QPixmap*> cache) const override;
+		not_null<QPixmap*> cache,
+		bool last) const override;
 	TextState getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request) const override;
+		StateRequest request,
+		bool last) const override;
 
 	void stopAnimation() override;
 	void checkAnimation() override;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.cpp b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
index 64eb1ff5d..5b243babe 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
@@ -182,7 +182,8 @@ TextState Media::getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request) const {
+		StateRequest request,
+		bool last) const {
 	Unexpected("Grouping method call.");
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.h b/Telegram/SourceFiles/history/view/media/history_view_media.h
index e0a227430..7d52ec3d5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.h
@@ -163,7 +163,12 @@ public:
 	virtual void checkAnimation() {
 	}
 
-	[[nodiscard]] virtual QSize sizeForGrouping() const {
+	[[nodiscard]] virtual QSize sizeForGroupingOptimal(
+			int maxWidth,
+			bool last) const {
+		Unexpected("Grouping method call.");
+	}
+	[[nodiscard]] virtual QSize sizeForGrouping(int width, bool last) const {
 		Unexpected("Grouping method call.");
 	}
 	virtual void drawGrouped(
@@ -175,14 +180,16 @@ public:
 			RectParts sides,
 			RectParts corners,
 			not_null<uint64*> cacheKey,
-			not_null<QPixmap*> cache) const {
+			not_null<QPixmap*> cache,
+			bool last) const {
 		Unexpected("Grouping method call.");
 	}
 	[[nodiscard]] virtual TextState getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request) const;
+		StateRequest request,
+		bool last) const;
 
 	[[nodiscard]] virtual bool animating() const {
 		return false;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
index 200325885..5ab2ea3b5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
@@ -80,7 +80,7 @@ std::unique_ptr<Media> CreateAttach(
 				document,
 				webpageUrl);
 		}
-		return std::make_unique<Document>(parent, document);
+		return std::make_unique<Document>(parent, parent->data(), document);
 	} else if (photo) {
 		return std::make_unique<Photo>(
 			parent,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
index a756931aa..b4b449273 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -94,8 +94,8 @@ GroupedMedia::~GroupedMedia() {
 
 GroupedMedia::Mode GroupedMedia::DetectMode(not_null<Data::Media*> media) {
 	const auto document = media->document();
-	return (document && document->isSong())
-		? Mode::Playlist
+	return (document && !document->isVideoFile())
+		? Mode::Column
 		: Mode::Grid;
 }
 
@@ -107,11 +107,20 @@ QSize GroupedMedia::countOptimalSize() {
 	}
 
 	std::vector<QSize> sizes;
-	sizes.reserve(_parts.size());
+	const auto partsCount = _parts.size();
+	sizes.reserve(partsCount);
+	auto maxWidth = 0;
+	if (_mode == Mode::Column) {
+		for (const auto &part : _parts) {
+			const auto &media = part.content;
+			media->initDimensions();
+			accumulate_max(maxWidth, media->maxWidth());
+		}
+	}
+	auto index = 0;
 	for (const auto &part : _parts) {
-		const auto &media = part.content;
-		media->initDimensions();
-		sizes.push_back(media->sizeForGrouping());
+		const auto last = (++index == partsCount);
+		sizes.push_back(part.content->sizeForGroupingOptimal(maxWidth, last));
 	}
 
 	const auto layout = (_mode == Mode::Grid)
@@ -123,7 +132,6 @@ QSize GroupedMedia::countOptimalSize() {
 		: LayoutPlaylist(sizes);
 	Assert(layout.size() == _parts.size());
 
-	auto maxWidth = 0;
 	auto minHeight = 0;
 	for (auto i = 0, count = int(layout.size()); i != count; ++i) {
 		const auto &item = layout[i];
@@ -146,42 +154,51 @@ QSize GroupedMedia::countOptimalSize() {
 QSize GroupedMedia::countCurrentSize(int newWidth) {
 	accumulate_min(newWidth, maxWidth());
 	auto newHeight = 0;
-	if (newWidth < st::historyGroupWidthMin) {
+	if (_mode == Mode::Grid && newWidth < st::historyGroupWidthMin) {
 		return { newWidth, newHeight };
+	} else if (_mode == Mode::Column) {
+		auto index = 0;
+		auto top = 0;
+		for (auto &part : _parts) {
+			const auto last = (++index == _parts.size());
+			const auto size = part.content->sizeForGrouping(newWidth, last);
+			part.geometry = QRect(0, top, newWidth, size.height());
+			top += size.height();
+		}
+		newHeight = top;
+	} else {
+		const auto initialSpacing = st::historyGroupSkip;
+		const auto factor = newWidth / float64(maxWidth());
+		const auto scale = [&](int value) {
+			return int(std::round(value * factor));
+		};
+		const auto spacing = scale(initialSpacing);
+		for (auto &part : _parts) {
+			const auto sides = part.sides;
+			const auto initialGeometry = part.initialGeometry;
+			const auto needRightSkip = !(sides & RectPart::Right);
+			const auto needBottomSkip = !(sides & RectPart::Bottom);
+			const auto initialLeft = initialGeometry.x();
+			const auto initialTop = initialGeometry.y();
+			const auto initialRight = initialLeft
+				+ initialGeometry.width()
+				+ (needRightSkip ? initialSpacing : 0);
+			const auto initialBottom = initialTop
+				+ initialGeometry.height()
+				+ (needBottomSkip ? initialSpacing : 0);
+			const auto left = scale(initialLeft);
+			const auto top = scale(initialTop);
+			const auto width = scale(initialRight)
+				- left
+				- (needRightSkip ? spacing : 0);
+			const auto height = scale(initialBottom)
+				- top
+				- (needBottomSkip ? spacing : 0);
+			part.geometry = QRect(left, top, width, height);
+
+			accumulate_max(newHeight, top + height);
+		}
 	}
-
-	const auto initialSpacing = st::historyGroupSkip;
-	const auto factor = newWidth / float64(maxWidth());
-	const auto scale = [&](int value) {
-		return int(std::round(value * factor));
-	};
-	const auto spacing = scale(initialSpacing);
-	for (auto &part : _parts) {
-		const auto sides = part.sides;
-		const auto initialGeometry = part.initialGeometry;
-		const auto needRightSkip = !(sides & RectPart::Right);
-		const auto needBottomSkip = !(sides & RectPart::Bottom);
-		const auto initialLeft = initialGeometry.x();
-		const auto initialTop = initialGeometry.y();
-		const auto initialRight = initialLeft
-			+ initialGeometry.width()
-			+ (needRightSkip ? initialSpacing : 0);
-		const auto initialBottom = initialTop
-			+ initialGeometry.height()
-			+ (needBottomSkip ? initialSpacing : 0);
-		const auto left = scale(initialLeft);
-		const auto top = scale(initialTop);
-		const auto width = scale(initialRight)
-			- left
-			- (needRightSkip ? spacing : 0);
-		const auto height = scale(initialBottom)
-			- top
-			- (needBottomSkip ? spacing : 0);
-		part.geometry = QRect(left, top, width, height);
-
-		accumulate_max(newHeight, top + height);
-	}
-
 	if (!_caption.isEmpty()) {
 		const auto captionw = newWidth - st::msgPadding.left() - st::msgPadding.right();
 		newHeight += st::mediaCaptionSkip + _caption.countHeight(captionw);
@@ -223,6 +240,7 @@ void GroupedMedia::draw(
 			: IsGroupItemSelection(selection, i)
 			? FullSelection
 			: TextSelection();
+		const auto last = (i + 1 == count);
 		part.content->drawGrouped(
 			p,
 			clip,
@@ -232,7 +250,8 @@ void GroupedMedia::draw(
 			part.sides,
 			cornersFromSides(part.sides),
 			&part.cacheKey,
-			&part.cache);
+			&part.cache,
+			last);
 	}
 
 	// date
@@ -262,13 +281,17 @@ void GroupedMedia::draw(
 TextState GroupedMedia::getPartState(
 		QPoint point,
 		StateRequest request) const {
+	auto index = 0;
 	for (const auto &part : _parts) {
+		++index;
 		if (part.geometry.contains(point)) {
+			const auto last = (index == _parts.size());
 			auto result = part.content->getStateGrouped(
 				part.geometry,
 				part.sides,
 				point,
-				request);
+				request,
+				last);
 			result.itemId = part.item->fullId();
 			return result;
 		}
@@ -372,6 +395,9 @@ auto GroupedMedia::getBubbleSelectionIntervals(
 			last = BubbleSelectionInterval{ newTop, newHeight };
 		}
 	}
+	if (IsGroupItemSelection(selection, _parts.size() - 1)) {
+		result.back().height = height() - result.back().top;
+	}
 	return result;
 }
 
@@ -465,6 +491,10 @@ HistoryMessageEdited *GroupedMedia::displayedEditBadge() const {
 
 void GroupedMedia::updateNeedBubbleState() {
 	const auto captionItem = [&]() -> HistoryItem* {
+		if (_mode == Mode::Column) {
+			const auto last = _parts.back().item.get();
+			return last->emptyText() ? nullptr : last;
+		}
 		auto result = (HistoryItem*)nullptr;
 		for (const auto &part : _parts) {
 			if (!part.item->emptyText()) {
@@ -519,7 +549,7 @@ bool GroupedMedia::needsBubble() const {
 }
 
 bool GroupedMedia::computeNeedBubble() const {
-	if (!_caption.isEmpty() || _mode == Mode::Playlist) {
+	if (!_caption.isEmpty() || _mode == Mode::Column) {
 		return true;
 	}
 	if (const auto item = _parent->data()) {
@@ -537,7 +567,7 @@ bool GroupedMedia::computeNeedBubble() const {
 }
 
 bool GroupedMedia::needInfoDisplay() const {
-	return (_mode != Mode::Playlist)
+	return (_mode != Mode::Column)
 		&& (_parent->data()->id < 0
 			|| _parent->isUnderCursor()
 			|| _parent->isLastAndSelfMessage());
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
index 3e1185c42..29b1eaedf 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
@@ -86,7 +86,7 @@ public:
 	void updateNeedBubbleState() override;
 	bool needsBubble() const override;
 	bool customInfoLayout() const override {
-		return _caption.isEmpty() && (_mode != Mode::Playlist);
+		return _caption.isEmpty() && (_mode != Mode::Column);
 	}
 	bool allowsFastShare() const override {
 		return true;
@@ -102,7 +102,7 @@ public:
 private:
 	enum class Mode : char {
 		Grid,
-		Playlist,
+		Column,
 	};
 	struct Part {
 		Part(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index 87f7e7bf9..7025dea4e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -465,12 +465,16 @@ TextState Photo::textState(QPoint point, StateRequest request) const {
 	return result;
 }
 
-QSize Photo::sizeForGrouping() const {
+QSize Photo::sizeForGroupingOptimal(int maxWidth, bool last) const {
 	const auto width = _data->width();
 	const auto height = _data->height();
 	return { std::max(width, 1), std::max(height, 1) };
 }
 
+QSize Photo::sizeForGrouping(int width, bool last) const {
+	return sizeForGroupingOptimal(width, last);
+}
+
 void Photo::drawGrouped(
 		Painter &p,
 		const QRect &clip,
@@ -480,7 +484,8 @@ void Photo::drawGrouped(
 		RectParts sides,
 		RectParts corners,
 		not_null<uint64*> cacheKey,
-		not_null<QPixmap*> cache) const {
+		not_null<QPixmap*> cache,
+		bool last) const {
 	ensureDataMediaCreated();
 	_dataMedia->automaticLoad(_realParent->fullId(), _parent->data());
 
@@ -580,7 +585,8 @@ TextState Photo::getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request) const {
+		StateRequest request,
+		bool last) const {
 	if (!geometry.contains(point)) {
 		return {};
 	}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.h b/Telegram/SourceFiles/history/view/media/history_view_photo.h
index b35880df0..418c19284 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.h
@@ -24,7 +24,7 @@ struct Information;
 
 namespace HistoryView {
 
-class Photo : public File {
+class Photo final : public File {
 public:
 	Photo(
 		not_null<Element*> parent,
@@ -58,7 +58,8 @@ public:
 		return _data;
 	}
 
-	QSize sizeForGrouping() const override;
+	QSize sizeForGroupingOptimal(int maxWidth, bool last) const override;
+	QSize sizeForGrouping(int width, bool last) const override;
 	void drawGrouped(
 		Painter &p,
 		const QRect &clip,
@@ -68,12 +69,14 @@ public:
 		RectParts sides,
 		RectParts corners,
 		not_null<uint64*> cacheKey,
-		not_null<QPixmap*> cache) const override;
+		not_null<QPixmap*> cache,
+		bool last) const override;
 	TextState getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request) const override;
+		StateRequest request,
+		bool last) const override;
 
 	TextWithEntities getCaption() const override {
 		return _caption.toTextWithEntities();

From bb4fdde616b825221ea9f364fdc0be347e985d9c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 17 Oct 2020 12:51:55 +0300
Subject: [PATCH 101/190] Fix sending many files with a comment.

---
 Telegram/SourceFiles/apiwrap.cpp              |   8 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp |  54 +++------
 Telegram/SourceFiles/boxes/send_files_box.h   |   5 +-
 .../SourceFiles/history/history_widget.cpp    | 108 ++++--------------
 Telegram/SourceFiles/history/history_widget.h |   9 --
 .../view/history_view_replies_section.cpp     |  93 +++++++--------
 .../view/history_view_replies_section.h       |   8 +-
 .../view/history_view_scheduled_section.cpp   |  82 +++++++------
 .../view/history_view_scheduled_section.h     |   8 +-
 .../details/storage_settings_scheme.cpp       |   2 +-
 .../ui/chat/attach/attach_album_preview.cpp   |  23 ++--
 .../ui/chat/attach/attach_prepare.cpp         |  62 +++++++++-
 .../ui/chat/attach/attach_prepare.h           |  25 +++-
 .../ui/chat/attach/attach_send_files_way.cpp  |  39 ++-----
 .../ui/chat/attach/attach_send_files_way.h    |  15 +--
 15 files changed, 246 insertions(+), 295 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 9f82ba51c..bf038ffe0 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -4212,14 +4212,12 @@ void ApiWrap::sendFiles(
 		std::shared_ptr<SendingAlbum> album,
 		const SendAction &action) {
 	const auto haveCaption = !caption.text.isEmpty();
-	const auto isAlbum = (album != nullptr);
-	if (haveCaption && !list.canAddCaption(isAlbum)) {
+	if (haveCaption && !list.canAddCaption(album != nullptr)) {
 		auto message = MessageToSend(action.history);
-		message.textWithTags = std::move(caption);
+		message.textWithTags = base::take(caption);
 		message.action = action;
 		message.action.clearDraft = false;
 		sendMessage(std::move(message));
-		caption = TextWithTags();
 	}
 
 	const auto to = fileLoadTaskOptions(action);
@@ -4240,7 +4238,7 @@ void ApiWrap::sendFiles(
 			case Ui::PreparedFile::AlbumType::File:
 				type = SendMediaType::File;
 				break;
-			default: Unexpected("AlbumType in uploadFilesAfterConfirmation");
+			default: Unexpected("AlbumType in ApiWrap::sendFiles.");
 			}
 		}
 		tasks.push_back(std::make_unique<FileLoadTask>(
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 649d414d3..b0d070127 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -94,7 +94,7 @@ void FileDialogCallback(
 rpl::producer<QString> FieldPlaceholder(
 		const Ui::PreparedList &list,
 		SendFilesWay way) {
-	return list.canAddCaption(way.groupMediaInAlbums())
+	return list.canAddCaption(way.groupFiles() && way.sendImagesAsPhotos())
 		? tr::lng_photo_caption()
 		: tr::lng_photos_comment();
 }
@@ -436,7 +436,6 @@ void SendFilesBox::initSendWay() {
 	_sendWay = [&] {
 		auto result = Core::App().settings().sendFilesWay();
 		if (_sendLimit == SendLimit::One) {
-			result.setGroupMediaInAlbums(true);
 			result.setGroupFiles(true);
 			return result;
 		} else if (_list.overrideSendImagesAsPhotos == false) {
@@ -463,15 +462,15 @@ void SendFilesBox::updateCaptionPlaceholder() {
 	if (!_caption) {
 		return;
 	}
-	const auto sendWay = _sendWay.current();
-	if (!_list.canAddCaption(sendWay.groupMediaInAlbums())
+	const auto way = _sendWay.current();
+	if (!_list.canAddCaption(way.groupFiles() && way.sendImagesAsPhotos())
 		&& _sendLimit == SendLimit::One) {
 		_caption->hide();
 		if (_emojiToggle) {
 			_emojiToggle->hide();
 		}
 	} else {
-		_caption->setPlaceholder(FieldPlaceholder(_list, sendWay));
+		_caption->setPlaceholder(FieldPlaceholder(_list, way));
 		_caption->show();
 		if (_emojiToggle) {
 			_emojiToggle->show();
@@ -544,33 +543,27 @@ void SendFilesBox::refreshControls() {
 
 void SendFilesBox::setupSendWayControls() {
 	// #TODO files
-	_groupMediaInAlbums.create(
+	_groupFiles.create(
 		this,
-		"Group media in albums",
-		_sendWay.current().groupMediaInAlbums(),
+		"Group items",
+		_sendWay.current().groupFiles(),
 		st::defaultBoxCheckbox);
 	_sendImagesAsPhotos.create(
 		this,
-		"Send images as photos",
+		"Compress images",
 		_sendWay.current().sendImagesAsPhotos(),
 		st::defaultBoxCheckbox);
-	_groupFiles.create(
-		this,
-		"Group files",
-		_sendWay.current().groupFiles(),
-		st::defaultBoxCheckbox);
 
 	_sendWay.changes(
 	) | rpl::start_with_next([=](SendFilesWay value) {
-		_groupMediaInAlbums->setChecked(value.groupMediaInAlbums());
-		_sendImagesAsPhotos->setChecked(value.sendImagesAsPhotos());
 		_groupFiles->setChecked(value.groupFiles());
+		_sendImagesAsPhotos->setChecked(value.sendImagesAsPhotos());
 	}, lifetime());
 
-	_groupMediaInAlbums->checkedChanges(
+	_groupFiles->checkedChanges(
 	) | rpl::start_with_next([=] {
 		auto sendWay = _sendWay.current();
-		sendWay.setGroupMediaInAlbums(_groupMediaInAlbums->checked());
+		sendWay.setGroupFiles(_groupFiles->checked());
 		_sendWay = sendWay;
 	}, lifetime());
 
@@ -580,13 +573,6 @@ void SendFilesBox::setupSendWayControls() {
 		sendWay.setSendImagesAsPhotos(_sendImagesAsPhotos->checked());
 		_sendWay = sendWay;
 	}, lifetime());
-
-	_groupFiles->checkedChanges(
-	) | rpl::start_with_next([=] {
-		auto sendWay = _sendWay.current();
-		sendWay.setGroupFiles(_groupFiles->checked());
-		_sendWay = sendWay;
-	}, lifetime());
 }
 
 void SendFilesBox::updateSendWayControlsVisibility() {
@@ -594,9 +580,8 @@ void SendFilesBox::updateSendWayControlsVisibility() {
 		return;
 	}
 	const auto onlyOne = (_sendLimit == SendLimit::One);
-	_groupMediaInAlbums->setVisible(!onlyOne);
-	_sendImagesAsPhotos->setVisible(/*_list.hasImagesForCompression()*/true); // #TODO files
 	_groupFiles->setVisible(!onlyOne);
+	_sendImagesAsPhotos->setVisible(/*_list.hasImagesForCompression()*/true); // #TODO files
 }
 
 void SendFilesBox::setupCaption() {
@@ -798,9 +783,8 @@ void SendFilesBox::updateBoxSize() {
 		footerHeight += st::boxPhotoCaptionSkip + _caption->height();
 	}
 	const auto pointers = {
-		_groupMediaInAlbums.data(),
+		_groupFiles.data(),
 		_sendImagesAsPhotos.data(),
-		_groupFiles.data()
 	};
 	for (auto pointer : pointers) {
 		if (pointer && !pointer->isHidden()) {
@@ -864,9 +848,8 @@ void SendFilesBox::updateControlsGeometry() {
 		}
 	}
 	const auto pointers = {
-		_groupMediaInAlbums.data(),
+		_groupFiles.data(),
 		_sendImagesAsPhotos.data(),
-		_groupFiles.data()
 	};
 	for (const auto pointer : ranges::view::reverse(pointers)) {
 		if (pointer && !pointer->isHidden()) {
@@ -905,16 +888,13 @@ void SendFilesBox::send(
 
 	auto way = _sendWay.current();
 	auto oldWay = Core::App().settings().sendFilesWay();
+	if (_groupFiles->isHidden()) {
+		way.setGroupFiles(oldWay.groupFiles());
+	}
 	if (_list.overrideSendImagesAsPhotos == way.sendImagesAsPhotos()
 		|| _sendImagesAsPhotos->isHidden()) {
 		way.setSendImagesAsPhotos(oldWay.sendImagesAsPhotos());
 	}
-	if (_groupMediaInAlbums->isHidden()) {
-		way.setGroupMediaInAlbums(oldWay.groupMediaInAlbums());
-	}
-	if (_groupFiles->isHidden()) {
-		way.setGroupFiles(oldWay.groupFiles());
-	}
 	if (way != oldWay) {
 		Core::App().settings().setSendFilesWay(way);
 		Core::App().saveSettingsDelayed();
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index 25384cdf6..238485279 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -176,9 +176,8 @@ private:
 	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
 	base::unique_qptr<QObject> _emojiFilter;
 
-	object_ptr<Ui::Checkbox> _groupMediaInAlbums = { nullptr };
-	object_ptr<Ui::Checkbox> _sendImagesAsPhotos = { nullptr };
 	object_ptr<Ui::Checkbox> _groupFiles = { nullptr };
+	object_ptr<Ui::Checkbox> _sendImagesAsPhotos = { nullptr };
 	rpl::variable<Ui::SendFilesWay> _sendWay = Ui::SendFilesWay();
 
 	rpl::variable<int> _footerHeight = 0;
@@ -190,8 +189,6 @@ private:
 	Fn<void()> _whenReadySend;
 	bool _preparing = false;
 
-	int _lastScrollTop = 0;
-
 	QPointer<Ui::RoundButton> _send;
 	QPointer<Ui::RoundButton> _addFile;
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index c6f3e5d55..c77a230b0 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4215,60 +4215,34 @@ void HistoryWidget::sendingFilesConfirmed(
 	if (showSendingFilesError(list)) {
 		return;
 	}
-	const auto slowmode = _peer->slowmodeApplied();
-	const auto sendImagesAsPhotos = way.sendImagesAsPhotos();
-	const auto sendType = sendImagesAsPhotos
+	auto groups = DivideByGroups(
+		std::move(list),
+		way,
+		_peer->slowmodeApplied());
+	const auto type = way.sendImagesAsPhotos()
 		? SendMediaType::Photo
 		: SendMediaType::File;
-	const auto groupMedia = way.groupMediaInAlbums() || slowmode;
-	const auto groupFiles = way.groupFiles() || slowmode;
-
-	auto group = Ui::PreparedList();
-
-	// For groupType Type::Video means media album,
-	// Type::File means file album,
-	// Type::None means no grouping.
-	using Type = Ui::PreparedFile::AlbumType;
-	auto groupType = Type::None;
-
-	const auto reply = replyToId();
-	auto sendGroup = [&] {
-		if (group.files.empty()) {
-			return;
-		}
-		const auto album = (groupType == Type::None)
-			? nullptr
-			: std::make_shared<SendingAlbum>();
-		uploadFilesAfterConfirmation(
-			base::take(group),
-			sendType,
-			base::take(caption),
-			reply,
-			options,
-			std::move(album));
-	};
-	for (auto i = 0; i != list.files.size(); ++i) {
-		auto &file = list.files[i];
-		const auto fileGroupType = (file.type == Type::Video)
-			? (groupMedia ? Type::Video : Type::None)
-			: (file.type == Type::Photo)
-			? ((groupMedia && sendImagesAsPhotos)
-				? Type::Video
-				: (groupFiles && !sendImagesAsPhotos)
-				? Type::File
-				: Type::None)
-			: (file.type == Type::File)
-			? (groupFiles ? Type::File : Type::None)
-			: Type::None;
-		if ((!group.files.empty() && groupType != fileGroupType)
-			|| ((groupType != Type::None)
-				&& (group.files.size() == Ui::MaxAlbumItems()))) {
-			sendGroup();
-		}
-		group.files.push_back(std::move(file));
-		groupType = fileGroupType;
+	auto action = Api::SendAction(_history);
+	action.replyTo = replyToId();
+	action.options = options;
+	action.clearDraft = false;
+	if (groups.size() > 1 && !caption.text.isEmpty()) {
+		auto message = Api::MessageToSend(_history);
+		message.textWithTags = base::take(caption);
+		message.action = action;
+		session().api().sendMessage(std::move(message));
 	}
-	sendGroup();
+	for (auto &group : groups) {
+		const auto album = group.grouped
+			? std::make_shared<SendingAlbum>()
+			: nullptr;
+		session().api().sendFiles(
+			std::move(group.list),
+			type,
+			base::take(caption),
+			album,
+			action);
+	};
 }
 
 bool HistoryWidget::confirmSendingFiles(
@@ -4343,38 +4317,6 @@ bool HistoryWidget::confirmSendingFiles(
 	return false;
 }
 
-void HistoryWidget::uploadFilesAfterConfirmation(
-		Ui::PreparedList &&list,
-		SendMediaType type,
-		TextWithTags &&caption,
-		MsgId replyTo,
-		Api::SendOptions options,
-		std::shared_ptr<SendingAlbum> album) {
-	Assert(canWriteMessage());
-
-	const auto isAlbum = (album != nullptr);
-	if (_peer->slowmodeApplied()
-		&& ((list.files.size() > 1 && !album)
-			|| (!list.files.empty()
-				&& !caption.text.isEmpty()
-				&& !list.canAddCaption(isAlbum)))) {
-		Ui::ShowMultilineToast({
-			.text = { tr::lng_slowmode_no_many(tr::now) },
-		});
-		return;
-	}
-
-	auto action = Api::SendAction(_history);
-	action.replyTo = replyTo;
-	action.options = options;
-	session().api().sendFiles(
-		std::move(list),
-		type,
-		std::move(caption),
-		album,
-		action);
-}
-
 void HistoryWidget::uploadFile(
 		const QByteArray &fileContent,
 		SendMediaType type) {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 76b698785..1a56edba1 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -434,15 +434,6 @@ private:
 		bool ctrlShiftEnter);
 
 	void uploadFile(const QByteArray &fileContent, SendMediaType type);
-
-	void uploadFilesAfterConfirmation(
-		Ui::PreparedList &&list,
-		SendMediaType type,
-		TextWithTags &&caption,
-		MsgId replyTo,
-		Api::SendOptions options,
-		std::shared_ptr<SendingAlbum> album = nullptr);
-
 	void itemRemoved(not_null<const HistoryItem*> item);
 
 	// Updates position of controls around the message field,
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 46a0ed4f6..7c534f7b9 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -621,25 +621,12 @@ bool RepliesWidget::confirmSendingFiles(
 			TextWithTags &&caption,
 			Api::SendOptions options,
 			bool ctrlShiftEnter) {
-		if (showSendingFilesError(list)) {
-			return;
-		}
-		const auto type = way.sendImagesAsPhotos()
-			? SendMediaType::Photo
-			: SendMediaType::File;
-		const auto album = way.groupMediaInAlbums() // #TODO files
-			? std::make_shared<SendingAlbum>()
-			: nullptr;
-		uploadFilesAfterConfirmation(
+		sendingFilesConfirmed(
 			std::move(list),
-			type,
+			way,
 			std::move(caption),
-			replyTo,
 			options,
-			album);
-		if (_composeControls->replyingToMessage().msg == replyTo) {
-			_composeControls->cancelReplyMessage();
-		}
+			ctrlShiftEnter);
 	}));
 	box->setCancelledCallback(crl::guard(this, [=] {
 		_composeControls->setText(text);
@@ -661,6 +648,51 @@ bool RepliesWidget::confirmSendingFiles(
 	return true;
 }
 
+void RepliesWidget::sendingFilesConfirmed(
+		Ui::PreparedList &&list,
+		Ui::SendFilesWay way,
+		TextWithTags &&caption,
+		Api::SendOptions options,
+		bool ctrlShiftEnter) {
+	Expects(list.filesToProcess.empty());
+
+	if (showSendingFilesError(list)) {
+		return;
+	}
+	auto groups = DivideByGroups(
+		std::move(list),
+		way,
+		_history->peer->slowmodeApplied());
+	const auto replyTo = replyToId();
+	const auto type = way.sendImagesAsPhotos()
+		? SendMediaType::Photo
+		: SendMediaType::File;
+	auto action = Api::SendAction(_history);
+	action.replyTo = replyTo ? replyTo : _rootId;
+	action.options = options;
+	action.clearDraft = false;
+	if (groups.size() > 1 && !caption.text.isEmpty()) {
+		auto message = Api::MessageToSend(_history);
+		message.textWithTags = base::take(caption);
+		message.action = action;
+		session().api().sendMessage(std::move(message));
+	}
+	for (auto &group : groups) {
+		const auto album = group.grouped
+			? std::make_shared<SendingAlbum>()
+			: nullptr;
+		session().api().sendFiles(
+			std::move(group.list),
+			type,
+			base::take(caption),
+			album,
+			action);
+	};
+	if (_composeControls->replyingToMessage().msg == replyTo) {
+		_composeControls->cancelReplyMessage();
+	}
+}
+
 bool RepliesWidget::confirmSendingFiles(
 		QImage &&image,
 		QByteArray &&content,
@@ -708,35 +740,6 @@ std::optional<QString> RepliesWidget::writeRestriction() const {
 		ChatRestriction::f_send_messages);
 }
 
-void RepliesWidget::uploadFilesAfterConfirmation(
-		Ui::PreparedList &&list,
-		SendMediaType type,
-		TextWithTags &&caption,
-		MsgId replyTo,
-		Api::SendOptions options,
-		std::shared_ptr<SendingAlbum> album) {
-	const auto isAlbum = (album != nullptr);
-	if (_history->peer->slowmodeApplied()
-		&& ((list.files.size() > 1 && !album)
-			|| (!list.files.empty()
-				&& !caption.text.isEmpty()
-				&& !list.canAddCaption(isAlbum)))) {
-		Ui::ShowMultilineToast({
-			.text = { tr::lng_slowmode_no_many(tr::now) }
-		});
-		return;
-	}
-	auto action = Api::SendAction(_history);
-	action.replyTo = replyTo ? replyTo : _rootId;
-	action.options = options;
-	session().api().sendFiles(
-		std::move(list),
-		type,
-		std::move(caption),
-		album,
-		action);
-}
-
 void RepliesWidget::pushReplyReturn(not_null<HistoryItem*> item) {
 	if (item->history() == _history && item->replyToTop() == _rootId) {
 		_replyReturns.push_back(item->id);
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index f7a664740..cde6be8f2 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -35,6 +35,7 @@ class FlatButton;
 class HistoryDownButton;
 class PinnedBar;
 struct PreparedList;
+class SendFilesWay;
 } // namespace Ui
 
 namespace Profile {
@@ -207,13 +208,12 @@ private:
 		std::optional<bool> overrideSendImagesAsPhotos = std::nullopt,
 		const QString &insertTextOnCancel = QString());
 	bool showSendingFilesError(const Ui::PreparedList &list) const;
-	void uploadFilesAfterConfirmation(
+	void sendingFilesConfirmed(
 		Ui::PreparedList &&list,
-		SendMediaType type,
+		Ui::SendFilesWay way,
 		TextWithTags &&caption,
-		MsgId replyTo,
 		Api::SendOptions options,
-		std::shared_ptr<SendingAlbum> album);
+		bool ctrlShiftEnter);
 
 	void sendExistingDocument(not_null<DocumentData*> document);
 	bool sendExistingDocument(
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index d16daf465..8afba643f 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -362,22 +362,12 @@ bool ScheduledWidget::confirmSendingFiles(
 			TextWithTags &&caption,
 			Api::SendOptions options,
 			bool ctrlShiftEnter) {
-		if (showSendingFilesError(list)) {
-			return;
-		}
-		const auto type = way.sendImagesAsPhotos()
-			? SendMediaType::Photo
-			: SendMediaType::File;
-		const auto album = way.groupMediaInAlbums() // #TODO files
-			? std::make_shared<SendingAlbum>()
-			: nullptr;
-		uploadFilesAfterConfirmation(
+		sendingFilesConfirmed(
 			std::move(list),
-			type,
+			way,
 			std::move(caption),
-			MsgId(0),//replyToId(),
 			options,
-			album);
+			ctrlShiftEnter);
 	}));
 	//box->setCancelledCallback(crl::guard(this, [=] {
 	//	_field->setTextWithTags(text);
@@ -399,6 +389,43 @@ bool ScheduledWidget::confirmSendingFiles(
 	return true;
 }
 
+void ScheduledWidget::sendingFilesConfirmed(
+		Ui::PreparedList &&list,
+		Ui::SendFilesWay way,
+		TextWithTags &&caption,
+		Api::SendOptions options,
+		bool ctrlShiftEnter) {
+	Expects(list.filesToProcess.empty());
+
+	if (showSendingFilesError(list)) {
+		return;
+	}
+	auto groups = DivideByGroups(std::move(list), way, false);
+	const auto type = way.sendImagesAsPhotos()
+		? SendMediaType::Photo
+		: SendMediaType::File;
+	auto action = Api::SendAction(_history);
+	action.options = options;
+	action.clearDraft = false;
+	if (groups.size() > 1 && !caption.text.isEmpty()) {
+		auto message = Api::MessageToSend(_history);
+		message.textWithTags = base::take(caption);
+		message.action = action;
+		session().api().sendMessage(std::move(message));
+	}
+	for (auto &group : groups) {
+		const auto album = group.grouped
+			? std::make_shared<SendingAlbum>()
+			: nullptr;
+		session().api().sendFiles(
+			std::move(list),
+			type,
+			base::take(caption),
+			album,
+			action);
+	};
+}
+
 bool ScheduledWidget::confirmSendingFiles(
 		QImage &&image,
 		QByteArray &&content,
@@ -416,35 +443,6 @@ bool ScheduledWidget::confirmSendingFiles(
 	return confirmSendingFiles(std::move(list), insertTextOnCancel);
 }
 
-void ScheduledWidget::uploadFilesAfterConfirmation(
-		Ui::PreparedList &&list,
-		SendMediaType type,
-		TextWithTags &&caption,
-		MsgId replyTo,
-		Api::SendOptions options,
-		std::shared_ptr<SendingAlbum> album) {
-	const auto isAlbum = (album != nullptr);
-	if (_history->peer->slowmodeApplied()
-		&& ((list.files.size() > 1 && !album)
-			|| (!list.files.empty()
-				&& !caption.text.isEmpty()
-				&& !list.canAddCaption(isAlbum)))) {
-		Ui::ShowMultilineToast({
-			.text = { tr::lng_slowmode_no_many(tr::now) },
-		});
-		return;
-	}
-	auto action = Api::SendAction(_history);
-	action.replyTo = replyTo;
-	action.options = options;
-	session().api().sendFiles(
-		std::move(list),
-		type,
-		std::move(caption),
-		album,
-		action);
-}
-
 void ScheduledWidget::uploadFile(
 		const QByteArray &fileContent,
 		SendMediaType type) {
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 56c2377f4..ad7b55a56 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -30,6 +30,7 @@ class PlainShadow;
 class FlatButton;
 class HistoryDownButton;
 struct PreparedList;
+class SendFilesWay;
 } // namespace Ui
 
 namespace Profile {
@@ -173,13 +174,12 @@ private:
 		std::optional<bool> overrideSendImagesAsPhotos = std::nullopt,
 		const QString &insertTextOnCancel = QString());
 	bool showSendingFilesError(const Ui::PreparedList &list) const;
-	void uploadFilesAfterConfirmation(
+	void sendingFilesConfirmed(
 		Ui::PreparedList &&list,
-		SendMediaType type,
+		Ui::SendFilesWay way,
 		TextWithTags &&caption,
-		MsgId replyTo,
 		Api::SendOptions options,
-		std::shared_ptr<SendingAlbum> album);
+		bool ctrlShiftEnter);
 
 	void sendExistingDocument(not_null<DocumentData*> document);
 	bool sendExistingDocument(
diff --git a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
index 6550150a8..535deee66 100644
--- a/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
+++ b/Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
@@ -919,7 +919,7 @@ bool ReadSetting(
 		if (!CheckStreamStatus(stream)) return false;
 
 		auto way = Ui::SendFilesWay();
-		way.setGroupMediaInAlbums(v == 1);
+		way.setGroupFiles(v == 1);
 		way.setSendImagesAsPhotos(v == 1);
 		Core::App().settings().setSendFilesWay(way);
 		context.legacyRead = true;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
index fb67a6d15..b90cd2609 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
@@ -137,7 +137,7 @@ AlbumThumbnail *AlbumPreview::findThumb(QPoint position) const {
 		? st::sendMediaPreviewPhotoSkip
 		: st::sendMediaFileThumbSkip;
 	auto find = [&](const auto &thumb) {
-		if (_sendWay.groupMediaInAlbums()) {
+		if (_sendWay.groupFiles() && _sendWay.sendImagesAsPhotos()) {
 			return thumb->containsPoint(position);
 		} else {
 			const auto bottom = top + (isPhotosWay
@@ -258,13 +258,13 @@ void AlbumPreview::updateSizeAnimated(
 
 void AlbumPreview::updateSize() {
 	const auto newHeight = [&] {
-		if (_sendWay.groupMediaInAlbums()) {
-			return int(std::round(_thumbsHeightAnimation.value(
-				_thumbsHeight)));
-		} else if (_sendWay.sendImagesAsPhotos()) {
+		if (!_sendWay.sendImagesAsPhotos()) {
+			return _filesHeight;
+		} else if (!_sendWay.groupFiles()) {
 			return _photosHeight;
 		} else {
-			return _filesHeight;
+			return int(std::round(_thumbsHeightAnimation.value(
+				_thumbsHeight)));
 		}
 	}();
 	if (height() != newHeight) {
@@ -275,12 +275,12 @@ void AlbumPreview::updateSize() {
 void AlbumPreview::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
-	if (_sendWay.groupMediaInAlbums()) {
-		paintAlbum(p);
-	} else if (_sendWay.sendImagesAsPhotos()) {
+	if (!_sendWay.sendImagesAsPhotos()) {
+		paintFiles(p, e->rect());
+	} else if (!_sendWay.groupFiles()) {
 		paintPhotos(p, e->rect());
 	} else {
-		paintFiles(p, e->rect());
+		paintAlbum(p);
 	}
 }
 
@@ -409,7 +409,8 @@ void AlbumPreview::mouseMoveEvent(QMouseEvent *e) {
 		applyCursor(style::cur_default);
 		return;
 	}
-	const auto isAlbum = _sendWay.groupMediaInAlbums();
+	const auto isAlbum = _sendWay.sendImagesAsPhotos()
+		&& _sendWay.groupFiles();
 	if (isAlbum && _draggedThumb) {
 		const auto position = e->pos();
 		_draggedThumb->moveInAlbum(position - _draggedStartPosition);
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index 33edeb0ba..d79be2777 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/chat/attach/attach_prepare.h"
 
+#include "ui/chat/attach/attach_send_files_way.h"
 #include "core/mime_type.h"
 
 namespace Ui {
@@ -21,7 +22,7 @@ PreparedFile::PreparedFile(const QString &path) : path(path) {
 
 PreparedFile::PreparedFile(PreparedFile &&other) = default;
 
-PreparedFile &PreparedFile::operator=(PreparedFile && other) = default;
+PreparedFile &PreparedFile::operator=(PreparedFile &&other) = default;
 
 PreparedFile::~PreparedFile() = default;
 
@@ -90,7 +91,7 @@ bool PreparedList::canBeSentInSlowmodeWith(const PreparedList &other) const {
 	return !hasNonGrouping && (!hasFiles || !hasVideos);
 }
 
-bool PreparedList::canAddCaption(bool groupMediaInAlbums) const {
+bool PreparedList::canAddCaption(bool sendingAlbum) const {
 	if (!filesToProcess.empty()
 		|| files.empty()
 		|| files.size() > kMaxAlbumCount) {
@@ -104,14 +105,18 @@ bool PreparedList::canAddCaption(bool groupMediaInAlbums) const {
 				qstr(".tgs"),
 				Qt::CaseInsensitive);
 		return !isSticker;
-	} else if (!groupMediaInAlbums) {
+	} else if (!sendingAlbum) {
 		return false;
 	}
 	const auto hasFiles = ranges::contains(
 		files,
 		PreparedFile::AlbumType::File,
 		&PreparedFile::type);
-	return !hasFiles;
+	const auto hasNotGrouped = ranges::contains(
+		files,
+		PreparedFile::AlbumType::None,
+		&PreparedFile::type);
+	return !hasFiles && !hasNotGrouped;
 }
 
 int MaxAlbumItems() {
@@ -125,4 +130,53 @@ bool ValidateThumbDimensions(int width, int height) {
 		&& (height < 20 * width);
 }
 
+std::vector<PreparedGroup> DivideByGroups(
+		PreparedList &&list,
+		SendFilesWay way,
+		bool slowmode) {
+	const auto sendImagesAsPhotos = way.sendImagesAsPhotos();
+	const auto groupFiles = way.groupFiles() || slowmode;
+
+	auto group = Ui::PreparedList();
+
+	// For groupType Type::Video means media album,
+	// Type::File means file album,
+	// Type::None means no grouping.
+	using Type = Ui::PreparedFile::AlbumType;
+	auto groupType = Type::None;
+
+	auto result = std::vector<PreparedGroup>();
+	auto pushGroup = [&] {
+		result.push_back(PreparedGroup{
+			.list = base::take(group),
+			.grouped = (groupType != Type::None)
+		});
+	};
+	for (auto i = 0; i != list.files.size(); ++i) {
+		auto &file = list.files[i];
+		const auto fileGroupType = (file.type == Type::Video)
+			? (groupFiles ? Type::Video : Type::None)
+			: (file.type == Type::Photo)
+			? ((groupFiles && sendImagesAsPhotos)
+				? Type::Video
+				: (groupFiles && !sendImagesAsPhotos)
+				? Type::File
+				: Type::None)
+			: (file.type == Type::File)
+			? (groupFiles ? Type::File : Type::None)
+			: Type::None;
+		if ((!group.files.empty() && groupType != fileGroupType)
+			|| ((groupType != Type::None)
+				&& (group.files.size() == Ui::MaxAlbumItems()))) {
+			pushGroup();
+		}
+		group.files.push_back(std::move(file));
+		groupType = fileGroupType;
+	}
+	if (!group.files.empty()) {
+		pushGroup();
+	}
+	return result;
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index 6e6419d9c..b4f5bc494 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -12,6 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 
+class SendFilesWay;
+
 struct PreparedFileInformation {
 	struct Image {
 		QImage data;
@@ -37,11 +39,9 @@ struct PreparedFileInformation {
 struct PreparedFile {
 	// File-s can be grouped if 'groupFiles'.
 	// File-s + Photo-s can be grouped if 'groupFiles && !sendImagesAsPhotos'.
-	// Photo-s can be grouped if '(groupFiles && !sendImagesAsPhotos)
-	//   || (groupMediaInAlbums && sendImagesAsPhotos)'.
-	// Photo-s + Video-s can be grouped if 'groupMediaInAlbums
-	//   && sendImagesAsPhotos'.
-	// Video-s can be grouped if 'groupMediaInAlbums'.
+	// Photo-s can be grouped if 'groupFiles'.
+	// Photo-s + Video-s can be grouped if 'groupFiles && sendImagesAsPhotos'.
+	// Video-s can be grouped if 'groupFiles'.
 	enum class AlbumType {
 		File,
 		Photo,
@@ -77,12 +77,15 @@ struct PreparedList {
 	: error(error)
 	, errorData(errorData) {
 	}
+	PreparedList(PreparedList &&other) = default;
+	PreparedList &operator=(PreparedList &&other) = default;
+
 	[[nodiscard]] static PreparedList Reordered(
 		PreparedList &&list,
 		std::vector<int> order);
 	void mergeToEnd(PreparedList &&other, bool cutToAlbumSize = false);
 
-	[[nodiscard]] bool canAddCaption(bool groupMediaInAlbums) const;
+	[[nodiscard]] bool canAddCaption(bool sendingAlbum) const;
 	[[nodiscard]] bool canBeSentInSlowmode() const;
 	[[nodiscard]] bool canBeSentInSlowmodeWith(
 		const PreparedList &other) const;
@@ -94,6 +97,16 @@ struct PreparedList {
 	std::optional<bool> overrideSendImagesAsPhotos;
 };
 
+struct PreparedGroup {
+	PreparedList list;
+	bool grouped = false;
+};
+
+[[nodiscard]] std::vector<PreparedGroup> DivideByGroups(
+	PreparedList &&list,
+	SendFilesWay way,
+	bool slowmode);
+
 [[nodiscard]] int MaxAlbumItems();
 [[nodiscard]] bool ValidateThumbDimensions(int width, int height);
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.cpp
index 00fea6cd3..159fe396c 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.cpp
@@ -9,19 +9,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 
-void SendFilesWay::setGroupMediaInAlbums(bool value) {
-	if (value) {
-		_flags |= (Flag::GroupMediaInAlbums | Flag::SendImagesAsPhotos);
-	} else {
-		_flags &= ~Flag::GroupMediaInAlbums;
-	}
-}
-
 void SendFilesWay::setSendImagesAsPhotos(bool value) {
 	if (value) {
 		_flags |= Flag::SendImagesAsPhotos;
 	} else {
-		_flags &= ~(Flag::SendImagesAsPhotos | Flag::GroupMediaInAlbums);
+		_flags &= ~Flag::SendImagesAsPhotos;
 	}
 }
 
@@ -40,36 +32,23 @@ void SendFilesWay::setGroupFiles(bool value) {
 //};
 
 int32 SendFilesWay::serialize() const {
-	auto result = groupMediaInAlbums()
+	auto result = (sendImagesAsPhotos() && groupFiles())
 		? int32(0)
 		: sendImagesAsPhotos()
 		? int32(1)
+		: groupFiles()
+		? int32(3)
 		: int32(2);
-	if (!groupFiles()) {
-		result |= 0x04;
-	}
 	return result;
 }
 
 std::optional<SendFilesWay> SendFilesWay::FromSerialized(int32 value) {
-	auto result = SendFilesWay();
-	result.setGroupFiles(!(value & 0x04));
-	value &= ~0x04;
-	switch (value) {
-	case 0:
-		result.setGroupMediaInAlbums(true);
-		result.setSendImagesAsPhotos(true);
-		break;
-	case 1:
-		result.setGroupMediaInAlbums(false);
-		result.setSendImagesAsPhotos(true);
-		break;
-	case 2:
-		result.setGroupMediaInAlbums(false);
-		result.setSendImagesAsPhotos(false);
-		break;
-	default: return std::nullopt;
+	if (value < 0 || value > 3) {
+		return std::nullopt;
 	}
+	auto result = SendFilesWay();
+	result.setGroupFiles((value == 0) || (value == 3));
+	result.setSendImagesAsPhotos((value == 0) || (value == 1));
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h
index 53cb646c8..d155b14bf 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h
@@ -19,18 +19,14 @@ enum class AttachButtonType {
 
 class SendFilesWay final {
 public:
-	[[nodiscard]] bool groupMediaInAlbums() const {
-		return (_flags & Flag::GroupMediaInAlbums) != 0;
+	[[nodiscard]] bool groupFiles() const {
+		return (_flags & Flag::GroupFiles) != 0;
 	}
 	[[nodiscard]] bool sendImagesAsPhotos() const {
 		return (_flags & Flag::SendImagesAsPhotos) != 0;
 	}
-	[[nodiscard]] bool groupFiles() const {
-		return (_flags & Flag::GroupFiles);
-	}
-	void setGroupMediaInAlbums(bool value);
-	void setSendImagesAsPhotos(bool value);
 	void setGroupFiles(bool value);
+	void setSendImagesAsPhotos(bool value);
 
 	[[nodiscard]] inline bool operator<(const SendFilesWay &other) const {
 		return _flags < other._flags;
@@ -57,11 +53,10 @@ public:
 
 private:
 	enum class Flag : uchar {
-		GroupMediaInAlbums = (1 << 0),
+		GroupFiles = (1 << 0),
 		SendImagesAsPhotos = (1 << 1),
-		GroupFiles = (1 << 2),
 
-		Default = GroupMediaInAlbums | SendImagesAsPhotos | GroupFiles,
+		Default = GroupFiles | SendImagesAsPhotos,
 	};
 	friend inline constexpr bool is_flag_type(Flag) { return true; };
 

From 5589f5136959a689d990fa60f0a96418dcaa1622 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 17 Oct 2020 20:09:06 +0300
Subject: [PATCH 102/190] Allow delete / replace items in SendFilesBox.

---
 Telegram/SourceFiles/boxes/send_files_box.cpp | 147 +++++++++++-------
 Telegram/SourceFiles/boxes/send_files_box.h   |   7 +-
 .../ui/chat/attach/attach_album_preview.cpp   |   6 +-
 3 files changed, 94 insertions(+), 66 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index b0d070127..1541aca0c 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -153,6 +153,22 @@ object_ptr<Ui::RpWidget> SendFilesBox::Block::takeWidget() {
 	return object_ptr<Ui::RpWidget>::fromRaw(_preview.get());
 }
 
+rpl::producer<int> SendFilesBox::Block::itemDeleteRequest() const {
+	if (!_isAlbum) {
+		return rpl::never<int>();
+	}
+	const auto album = static_cast<Ui::AlbumPreview*>(_preview.get());
+	return album->thumbDeleted();
+}
+
+rpl::producer<int> SendFilesBox::Block::itemReplaceRequest() const {
+	if (!_isAlbum) {
+		return rpl::never<int>();
+	}
+	const auto album = static_cast<Ui::AlbumPreview*>(_preview.get());
+	return album->thumbChanged();
+}
+
 void SendFilesBox::Block::setSendWay(Ui::SendFilesWay way) {
 	if (!_isAlbum) {
 		return;
@@ -238,52 +254,6 @@ void SendFilesBox::initPreview() {
 	}, _dimensionsLifetime);
 }
 
-void SendFilesBox::addThumbButtonHandlers(not_null<Ui::ScrollArea*> wrap) {
-	// #TODO files
-	//_albumPreview->thumbDeleted(
-	//) | rpl::start_with_next([=](auto index) {
-	//	_lastScrollTop = wrap->scrollTop();
-
-	//	_list.files.erase(_list.files.begin() + index);
-	//	applyAlbumOrder();
-
-	//	if (_preview) {
-	//		_preview->deleteLater();
-	//	}
-	//	_albumPreview = nullptr;
-
-	//	refreshAllAfterAlbumChanges();
-	//}, _albumPreview->lifetime());
-
-	//_albumPreview->thumbChanged(
-	//) | rpl::start_with_next([=](auto index) {
-	//	_lastScrollTop = wrap->scrollTop();
-
-	//	const auto callback = [=](FileDialog::OpenResult &&result) {
-	//		FileDialogCallback(
-	//			std::move(result),
-	//			[=] (auto list) {
-	//				_list.files[index] = std::move(list.files.front());
-	//				applyAlbumOrder();
-
-	//				if (_preview) {
-	//					_preview->deleteLater();
-	//				}
-	//				_albumPreview = nullptr;
-
-	//				refreshAllAfterAlbumChanges();
-	//			});
-	//	};
-
-	//	FileDialog::GetOpenPath(
-	//		this,
-	//		tr::lng_choose_file(tr::now),
-	//		FileDialog::AllOrImagesFilter(),
-	//		crl::guard(this, callback));
-
-	//}, _albumPreview->lifetime());
-}
-
 void SendFilesBox::enqueueNextPrepare() {
 	if (_preparing) {
 		return;
@@ -497,20 +467,6 @@ void SendFilesBox::generatePreviewFrom(int fromBlock) {
 	Assert(fromItem <= _list.files.size());
 
 	auto albumStart = -1;
-	const auto gifPaused = [controller = _controller] {
-		return controller->isGifPausedAtLeastFor(
-			Window::GifPauseReason::Layer);
-	};
-	const auto pushBlock = [&](int from, int till) {
-		_blocks.emplace_back(
-			_inner.data(),
-			&_list.files,
-			from,
-			till,
-			gifPaused,
-			_sendWay.current());
-		_inner->add(_blocks.back().takeWidget());
-	};
 	for (auto i = fromItem, till = int(_list.files.size()); i != till; ++i) {
 		const auto type = _list.files[i].type;
 		if (albumStart >= 0) {
@@ -536,6 +492,77 @@ void SendFilesBox::generatePreviewFrom(int fromBlock) {
 	}
 }
 
+void SendFilesBox::pushBlock(int from, int till) {
+	const auto gifPaused = [controller = _controller] {
+		return controller->isGifPausedAtLeastFor(
+			Window::GifPauseReason::Layer);
+	};
+	const auto index = int(_blocks.size());
+	_blocks.emplace_back(
+		_inner.data(),
+		&_list.files,
+		from,
+		till,
+		gifPaused,
+		_sendWay.current());
+	auto &block = _blocks.back();
+	const auto widget = _inner->add(block.takeWidget());
+
+	block.itemDeleteRequest(
+	) | rpl::filter([=] {
+		return !_removingIndex;
+	}) | rpl::start_with_next([=](int index) {
+		_removingIndex = from + index;
+		crl::on_main(this, [=] {
+			const auto index = base::take(_removingIndex).value_or(-1);
+			if (index < 0 || index >= _list.files.size()) {
+				return;
+			}
+			_list.files.erase(_list.files.begin() + index);
+			refreshAllAfterChanges(from);
+		});
+	}, widget->lifetime());
+
+	block.itemReplaceRequest(
+	) | rpl::start_with_next([=](int index) {
+		const auto replace = [=](Ui::PreparedList list) {
+			if (list.files.empty()) {
+				return;
+			}
+			_list.files[from + index] = std::move(list.files.front());
+			refreshAllAfterChanges(from);
+		};
+		const auto checkResult = [=](const Ui::PreparedList &list) {
+			if (_sendLimit != SendLimit::One) {
+				return true;
+			}
+			auto removing = std::move(_list.files[from + index]);
+			std::swap(_list.files[from + index], _list.files.back());
+			_list.files.pop_back();
+			const auto result = _list.canBeSentInSlowmodeWith(list);
+			_list.files.push_back(std::move(removing));
+			std::swap(_list.files[from + index], _list.files.back());
+			if (!result) {
+				Ui::Toast::Show(tr::lng_slowmode_no_many(tr::now));
+				return false;
+			}
+			return true;
+		};
+		const auto callback = [=](FileDialog::OpenResult &&result) {
+			FileDialogCallback(
+				std::move(result),
+				checkResult,
+				replace);
+		};
+
+		FileDialog::GetOpenPath(
+			this,
+			tr::lng_choose_file(tr::now),
+			FileDialog::AllOrImagesFilter(),
+			crl::guard(this, callback));
+	}, widget->lifetime());
+}
+
 void SendFilesBox::refreshControls() {
 	refreshTitleText();
 	updateSendWayControlsVisibility();
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index 238485279..bde7ee244 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -100,6 +100,9 @@ private:
 		[[nodiscard]] int tillIndex() const;
 		[[nodiscard]] object_ptr<Ui::RpWidget> takeWidget();
 
+		[[nodiscard]] rpl::producer<int> itemDeleteRequest() const;
+		[[nodiscard]] rpl::producer<int> itemReplaceRequest() const;
+
 		void setSendWay(Ui::SendFilesWay way);
 		void applyAlbumOrder();
 
@@ -138,12 +141,11 @@ private:
 	void updateControlsGeometry();
 	void updateCaptionPlaceholder();
 
-	void addThumbButtonHandlers(not_null<Ui::ScrollArea*> wrap);
-
 	bool canAddFiles(not_null<const QMimeData*> data) const;
 	bool addFiles(not_null<const QMimeData*> data);
 	bool addFiles(Ui::PreparedList list);
 	void addFile(Ui::PreparedFile &&file);
+	void pushBlock(int from, int till);
 
 	void openDialogToAddFileToAlbum();
 	void refreshAllAfterChanges(int fromItem);
@@ -158,6 +160,7 @@ private:
 	int _titleHeight = 0;
 
 	Ui::PreparedList _list;
+	std::optional<int> _removingIndex;
 
 	SendLimit _sendLimit = SendLimit::Many;
 	SendMenu::Type _sendMenuType = SendMenu::Type();
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
index b90cd2609..98b93813d 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
@@ -54,8 +54,8 @@ void AlbumPreview::updateFileRows() {
 }
 
 std::vector<int> AlbumPreview::takeOrder() {
-	Expects(_thumbs.size() == _order.size());
-	Expects(_itemsShownDimensions.size() == _order.size());
+	//Expects(_thumbs.size() == _order.size());
+	//Expects(_itemsShownDimensions.size() == _order.size());
 
 	auto reordered = std::vector<std::unique_ptr<AlbumThumbnail>>();
 	auto reorderedShownDimensions = std::vector<QSize>();
@@ -82,8 +82,6 @@ auto AlbumPreview::generateOrderedLayout() const
 }
 
 std::vector<int> AlbumPreview::defaultOrder(int count) const {
-	Expects(count > 0 || !_order.empty());
-
 	if (count < 0) {
 		count = _order.size();
 	}

From d7fe2948ac48227bf7e721017f917b930b97a2c5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 19 Oct 2020 11:49:31 +0300
Subject: [PATCH 103/190] Add edit/remove buttons to Single[File|Media]Preview.

---
 Telegram/SourceFiles/boxes/boxes.style        | 22 ++++---
 Telegram/SourceFiles/boxes/send_files_box.cpp | 43 +++++++++----
 Telegram/SourceFiles/boxes/send_files_box.h   |  1 +
 .../ui/chat/attach/attach_album_thumbnail.cpp | 21 +++----
 .../ui/chat/attach/attach_album_thumbnail.h   |  4 +-
 .../attach/attach_single_file_preview.cpp     | 38 +++++++++--
 .../chat/attach/attach_single_file_preview.h  | 13 +++-
 .../attach/attach_single_media_preview.cpp    | 63 +++++++++++++++----
 .../chat/attach/attach_single_media_preview.h | 22 ++++---
 9 files changed, 162 insertions(+), 65 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 528cd1f70..6cd18ef63 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -508,29 +508,33 @@ editMediaButton: IconButton {
 
 // SendFilesBox
 
-sendBoxAlbumGroupEditInternalSkip: 9px;
+sendBoxAlbumGroupEditInternalSkip: 8px;
 sendBoxAlbumGroupSkipRight: 6px;
 sendBoxAlbumGroupSkipTop: 6px;
-sendBoxAlbumGroupRadius: 12px;
-sendBoxAlbumGroupHeight: 25px;
+sendBoxAlbumGroupRadius: 13px;
+sendBoxAlbumGroupHeight: 26px;
 
 sendBoxFileGroupSkipTop: 2px;
 sendBoxFileGroupSkipRight: 0px;
 sendBoxFileGroupEditInternalSkip: 4px;
 
-sendBoxAlbumGroupEditButtonIcon: editMediaButtonIconPhoto;
-sendBoxAlbumGroupEditButtonIconPosition: point(4px, -1px);
-
 sendBoxAlbumGroupButtonFile: IconButton(editMediaButton) {
 	ripple: RippleAnimation(defaultRippleAnimation) {
 		color: windowBgRipple;
 	}
 }
-
-sendBoxAlbumGroupDeleteButtonIconPosition: point(-3px, 0px);
-sendBoxAlbumGroupDeleteButtonIcon: icon {{ "history_file_cancel", msgServiceFg}};
+sendBoxAlbumGroupEditButtonIconFile: editMediaButtonIconFile;
 sendBoxAlbumGroupDeleteButtonIconFile: icon {{ "history_file_cancel", menuIconFg, point(6px, 6px) }};
 
+sendBoxAlbumGroupButtonMediaEdit: icon {{ "settings_edit", msgServiceFg, point(3px, -2px) }};
+sendBoxAlbumGroupButtonMediaDelete: icon {{ "history_file_cancel", msgServiceFg, point(2px, 5px) }};
+sendBoxAlbumGroupButtonMedia: IconButton {
+	width: sendBoxAlbumGroupHeight;
+	height: sendBoxAlbumGroupHeight;
+
+	icon: sendBoxAlbumGroupButtonMediaEdit;
+}
+
 // End of SendFilesBox
 
 calendarTitleHeight: boxTitleHeight;
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 1541aca0c..bc1fcfdb9 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -132,6 +132,7 @@ SendFilesBox::Block::Block(
 			gifPaused,
 			first);
 		if (media) {
+			_isSingleMedia = true;
 			_preview.reset(media);
 		} else {
 			_preview.reset(
@@ -154,19 +155,35 @@ object_ptr<Ui::RpWidget> SendFilesBox::Block::takeWidget() {
 }
 
 rpl::producer<int> SendFilesBox::Block::itemDeleteRequest() const {
-	if (!_isAlbum) {
-		return rpl::never<int>();
+	using namespace rpl::mappers;
+
+	const auto preview = _preview.get();
+	if (_isAlbum) {
+		const auto album = static_cast<Ui::AlbumPreview*>(_preview.get());
+		return album->thumbDeleted() | rpl::map(_1 + _from);
+	} else if (_isSingleMedia) {
+		const auto media = static_cast<Ui::SingleMediaPreview*>(preview);
+		return media->deleteRequests() | rpl::map([=] { return _from; });
+	} else {
+		const auto single = static_cast<Ui::SingleFilePreview*>(preview);
+		return single->deleteRequests() | rpl::map([=] { return _from; });
 	}
-	const auto album = static_cast<Ui::AlbumPreview*>(_preview.get());
-	return album->thumbDeleted();
 }
 
 rpl::producer<int> SendFilesBox::Block::itemReplaceRequest() const {
-	if (!_isAlbum) {
-		return rpl::never<int>();
+	using namespace rpl::mappers;
+
+	const auto preview = _preview.get();
+	if (_isAlbum) {
+		const auto album = static_cast<Ui::AlbumPreview*>(preview);
+		return album->thumbChanged() | rpl::map(_1 + _from);
+	} else if (_isSingleMedia) {
+		const auto media = static_cast<Ui::SingleMediaPreview*>(preview);
+		return media->editRequests() | rpl::map([=] { return _from; });
+	} else {
+		const auto single = static_cast<Ui::SingleFilePreview*>(preview);
+		return single->editRequests() | rpl::map([=] { return _from; });
 	}
-	const auto album = static_cast<Ui::AlbumPreview*>(_preview.get());
-	return album->thumbChanged();
 }
 
 void SendFilesBox::Block::setSendWay(Ui::SendFilesWay way) {
@@ -512,7 +529,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 	) | rpl::filter([=] {
 		return !_removingIndex;
 	}) | rpl::start_with_next([=](int index) {
-		_removingIndex = from + index;
+		_removingIndex = index;
 		crl::on_main(this, [=] {
 			const auto index = base::take(_removingIndex).value_or(-1);
 			if (index < 0 || index >= _list.files.size()) {
@@ -529,19 +546,19 @@ void SendFilesBox::pushBlock(int from, int till) {
 			if (list.files.empty()) {
 				return;
 			}
-			_list.files[from + index] = std::move(list.files.front());
+			_list.files[index] = std::move(list.files.front());
 			refreshAllAfterChanges(from);
 		};
 		const auto checkResult = [=](const Ui::PreparedList &list) {
 			if (_sendLimit != SendLimit::One) {
 				return true;
 			}
-			auto removing = std::move(_list.files[from + index]);
-			std::swap(_list.files[from + index], _list.files.back());
+			auto removing = std::move(_list.files[index]);
+			std::swap(_list.files[index], _list.files.back());
 			_list.files.pop_back();
 			const auto result = _list.canBeSentInSlowmodeWith(list);
 			_list.files.push_back(std::move(removing));
-			std::swap(_list.files[from + index], _list.files.back());
+			std::swap(_list.files[index], _list.files.back());
 			if (!result) {
 				Ui::Toast::Show(tr::lng_slowmode_no_many(tr::now));
 				return false;
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index bde7ee244..762f8c82a 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -112,6 +112,7 @@ private:
 		int _from = 0;
 		int _till = 0;
 		bool _isAlbum = false;
+		bool _isSingleMedia = false;
 
 	};
 	void initSendWay();
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
index 6f7d80381..136a1db7e 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
@@ -109,7 +109,7 @@ AlbumThumbnail::AlbumThumbnail(
 	});
 	_deleteMedia->setClickedCallback(deleteCallback);
 
-	_editMedia->setIconOverride(&st::editMediaButtonIconFile);
+	_editMedia->setIconOverride(&st::sendBoxAlbumGroupEditButtonIconFile);
 	_deleteMedia->setIconOverride(&st::sendBoxAlbumGroupDeleteButtonIconFile);
 
 	updateFileRow(-1);
@@ -520,19 +520,16 @@ QRect AlbumThumbnail::paintButtons(
 	QRect groupRect(groupX, groupY, groupWidth, size);
 	_buttonsRect.paint(p, groupRect);
 
-	const auto editP = st::sendBoxAlbumGroupEditButtonIconPosition;
-	const auto deleteP = st::sendBoxAlbumGroupDeleteButtonIconPosition;
-
-	st::sendBoxAlbumGroupEditButtonIcon.paintInCenter(
+	st::sendBoxAlbumGroupButtonMediaEdit.paint(
 		p,
-		QRect(groupX + editP.x(), groupY + editP.y(), size, size));
-	st::sendBoxAlbumGroupDeleteButtonIcon.paintInCenter(
+		groupX,
+		groupY,
+		outerWidth);
+	st::sendBoxAlbumGroupButtonMediaDelete.paint(
 		p,
-		QRect(
-			groupX + deleteLeft + deleteP.x(),
-			groupY + deleteP.y(),
-			size,
-			size));
+		groupX + size + skipInternal,
+		groupY,
+		outerWidth);
 	p.setOpacity(1);
 
 	return groupRect;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
index c492d4eeb..8341f4e8c 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.h
@@ -89,8 +89,8 @@ private:
 
 	QRect _lastRectOfButtons;
 
-	object_ptr<IconButton> _editMedia = nullptr;
-	object_ptr<IconButton> _deleteMedia = nullptr;
+	object_ptr<IconButton> _editMedia = { nullptr };
+	object_ptr<IconButton> _deleteMedia = { nullptr };
 
 };
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
index 1e837150e..167a46960 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
@@ -10,8 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/attach/attach_prepare.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_options.h"
+#include "ui/widgets/buttons.h"
 #include "ui/image/image_prepare.h"
-#include "ui/cached_round_corners.h"
+#include "base/timer_rpl.h"
 #include "core/mime_type.h"
 #include "styles/style_chat.h"
 #include "styles/style_boxes.h"
@@ -23,13 +24,30 @@ namespace Ui {
 SingleFilePreview::SingleFilePreview(
 	QWidget *parent,
 	const PreparedFile &file)
-: RpWidget(parent) {
+: RpWidget(parent)
+, _editMedia(this, st::sendBoxAlbumGroupButtonFile)
+, _deleteMedia(this, st::sendBoxAlbumGroupButtonFile) {
 	preparePreview(file);
 
+	_editMedia->setIconOverride(&st::sendBoxAlbumGroupEditButtonIconFile);
+	_deleteMedia->setIconOverride(&st::sendBoxAlbumGroupDeleteButtonIconFile);
+
 	auto h = _fileThumb.isNull()
 		? (st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom())
 		: (st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom());
-	resize(width(), st::boxPhotoPadding.top() + h + st::msgShadow);
+	resize(width(), h);
+}
+
+SingleFilePreview::~SingleFilePreview() = default;
+
+rpl::producer<> SingleFilePreview::editRequests() const {
+	return _editMedia->clicks() | rpl::map([] {
+		return base::timer_once(st::historyAttach.ripple.hideDuration);
+	}) | rpl::flatten_latest();
+}
+
+rpl::producer<> SingleFilePreview::deleteRequests() const {
+	return _deleteMedia->clicks() | rpl::to_empty;
 }
 
 void SingleFilePreview::prepareThumb(const QImage &preview) {
@@ -134,9 +152,7 @@ void SingleFilePreview::paintEvent(QPaintEvent *e) {
 		linktop = st::msgFileThumbLinkTop;
 	}
 	auto namewidth = w - nameleft - (_fileThumb.isNull() ? st::msgFilePadding.left() : st::msgFileThumbPadding.left());
-	int32 x = (width() - w) / 2, y = st::boxPhotoPadding.top();
-
-	FillRoundRect(p, x, y, w, h, st::msgOutBg, MessageOutCorners, &st::msgOutShadow);
+	int32 x = (width() - w) / 2, y = 0;
 
 	if (_fileThumb.isNull()) {
 		QRect inner(style::rtlrect(x + st::msgFilePadding.left(), y + st::msgFilePadding.top(), st::msgFileSize, st::msgFileSize, width()));
@@ -168,4 +184,14 @@ void SingleFilePreview::paintEvent(QPaintEvent *e) {
 	p.drawTextLeft(x + nameleft, y + statustop, width(), _statusText);
 }
 
+void SingleFilePreview::resizeEvent(QResizeEvent *e) {
+	const auto w = width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right();
+	const auto x = (width() - w) / 2;
+	const auto top = st::sendBoxFileGroupSkipTop;
+	auto right = st::sendBoxFileGroupSkipRight + x;
+	_deleteMedia->moveToRight(right, top);
+	right += st::sendBoxFileGroupEditInternalSkip + _deleteMedia->width();
+	_editMedia->moveToRight(right, top);
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
index bb06249dd..2be57bec8 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
@@ -8,21 +8,27 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "ui/rp_widget.h"
+#include "base/object_ptr.h"
 
 namespace Ui {
 
 struct PreparedFile;
+class IconButton;
 
 class SingleFilePreview final : public RpWidget {
 public:
 	SingleFilePreview(
 		QWidget *parent,
 		const PreparedFile &file);
+	~SingleFilePreview();
 
-protected:
-	void paintEvent(QPaintEvent *e) override;
+	[[nodiscard]] rpl::producer<> deleteRequests() const;
+	[[nodiscard]] rpl::producer<> editRequests() const;
 
 private:
+	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+
 	void preparePreview(const PreparedFile &file);
 	void prepareThumb(const QImage &preview);
 
@@ -33,6 +39,9 @@ private:
 	QString _statusText;
 	int _statusWidth = 0;
 
+	object_ptr<IconButton> _editMedia = { nullptr };
+	object_ptr<IconButton> _deleteMedia = { nullptr };
+
 };
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
index 3d88cbb35..f6fe54b10 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
@@ -8,11 +8,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/attach/attach_single_media_preview.h"
 
 #include "ui/chat/attach/attach_prepare.h"
+#include "ui/widgets/buttons.h"
 #include "core/mime_type.h"
 #include "lottie/lottie_single_player.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
 #include "styles/style_layers.h"
+#include "styles/palette.h"
 
 namespace Ui {
 namespace {
@@ -64,20 +66,27 @@ SingleMediaPreview::SingleMediaPreview(
 : RpWidget(parent)
 , _gifPaused(std::move(gifPaused))
 , _animated(animated)
-, _sticker(sticker) {
+, _sticker(sticker)
+, _editMedia(this, st::sendBoxAlbumGroupButtonMedia)
+, _deleteMedia(this, st::sendBoxAlbumGroupButtonMedia)
+, _buttonsRect(st::sendBoxAlbumGroupRadius, st::callFingerprintBg) {
 	Expects(!preview.isNull());
 
-	_canSendAsPhoto = !_animated
-		&& !_sticker
-		&& ValidateThumbDimensions(
-			preview.width(),
-			preview.height());
+	_deleteMedia->setIconOverride(&st::sendBoxAlbumGroupButtonMediaDelete);
 
 	preparePreview(preview, animatedPreviewPath);
 }
 
 SingleMediaPreview::~SingleMediaPreview() = default;
 
+rpl::producer<> SingleMediaPreview::deleteRequests() const {
+	return _deleteMedia->clicks() | rpl::to_empty;
+}
+
+rpl::producer<> SingleMediaPreview::editRequests() const {
+	return _editMedia->clicks() | rpl::to_empty;
+}
+
 void SingleMediaPreview::preparePreview(
 		QImage preview,
 		const QString &animatedPreviewPath) {
@@ -136,7 +145,20 @@ void SingleMediaPreview::preparePreview(
 
 	prepareAnimatedPreview(animatedPreviewPath);
 
-	resize(width(), st::boxPhotoPadding.top() + _previewHeight);
+	resize(width(), _previewHeight);
+}
+
+void SingleMediaPreview::resizeEvent(QResizeEvent *e) {
+	const auto skipInternal = st::sendBoxAlbumGroupEditInternalSkip;
+	const auto size = st::sendBoxAlbumGroupHeight;
+	const auto skipRight = st::sendBoxAlbumGroupSkipRight;
+	const auto skipTop = st::sendBoxAlbumGroupSkipTop;
+	const auto groupWidth = size * 2 + skipInternal;
+
+	const auto left = _previewLeft + _previewWidth - groupWidth - skipRight;
+	const auto top = skipTop;
+	_editMedia->move(left, top);
+	_deleteMedia->move(left + size + skipInternal, top);
 }
 
 void SingleMediaPreview::prepareAnimatedPreview(
@@ -190,33 +212,33 @@ void SingleMediaPreview::paintEvent(QPaintEvent *e) {
 
 	if (!_sticker) {
 		if (_previewLeft > st::boxPhotoPadding.left()) {
-			p.fillRect(st::boxPhotoPadding.left(), st::boxPhotoPadding.top(), _previewLeft - st::boxPhotoPadding.left(), _previewHeight, st::confirmBg);
+			p.fillRect(st::boxPhotoPadding.left(), 0, _previewLeft - st::boxPhotoPadding.left(), _previewHeight, st::confirmBg);
 		}
 		if (_previewLeft + _previewWidth < width() - st::boxPhotoPadding.right()) {
-			p.fillRect(_previewLeft + _previewWidth, st::boxPhotoPadding.top(), width() - st::boxPhotoPadding.right() - _previewLeft - _previewWidth, _previewHeight, st::confirmBg);
+			p.fillRect(_previewLeft + _previewWidth, 0, width() - st::boxPhotoPadding.right() - _previewLeft - _previewWidth, _previewHeight, st::confirmBg);
 		}
 	}
 	if (_gifPreview && _gifPreview->started()) {
 		auto s = QSize(_previewWidth, _previewHeight);
 		auto paused = _gifPaused();
 		auto frame = _gifPreview->current(s.width(), s.height(), s.width(), s.height(), ImageRoundRadius::None, RectPart::None, paused ? 0 : crl::now());
-		p.drawPixmap(_previewLeft, st::boxPhotoPadding.top(), frame);
+		p.drawPixmap(_previewLeft, 0, frame);
 	} else if (_lottiePreview && _lottiePreview->ready()) {
 		const auto frame = _lottiePreview->frame();
 		const auto size = frame.size() / style::DevicePixelRatio();
 		p.drawImage(
 			QRect(
 				_previewLeft + (_previewWidth - size.width()) / 2,
-				st::boxPhotoPadding.top() + (_previewHeight - size.height()) / 2,
+				(_previewHeight - size.height()) / 2,
 				size.width(),
 				size.height()),
 			frame);
 		_lottiePreview->markFrameShown();
 	} else {
-		p.drawPixmap(_previewLeft, st::boxPhotoPadding.top(), _preview);
+		p.drawPixmap(_previewLeft, 0, _preview);
 	}
 	if (_animated && !_gifPreview && !_lottiePreview) {
-		auto inner = QRect(_previewLeft + (_previewWidth - st::msgFileSize) / 2, st::boxPhotoPadding.top() + (_previewHeight - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+		auto inner = QRect(_previewLeft + (_previewWidth - st::msgFileSize) / 2, (_previewHeight - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::msgDateImgBg);
 
@@ -228,6 +250,21 @@ void SingleMediaPreview::paintEvent(QPaintEvent *e) {
 		auto icon = &st::historyFileInPlay;
 		icon->paintInCenter(p, inner);
 	}
+	paintButtonsBackground(p);
+}
+
+void SingleMediaPreview::paintButtonsBackground(QPainter &p) {
+	const auto skipInternal = st::sendBoxAlbumGroupEditInternalSkip;
+	const auto size = st::sendBoxAlbumGroupHeight;
+	const auto skipRight = st::sendBoxAlbumGroupSkipRight;
+	const auto skipTop = st::sendBoxAlbumGroupSkipTop;
+	const auto groupWidth = size * 2 + skipInternal;
+
+	const auto left = _previewLeft + _previewWidth - groupWidth - skipRight;
+	const auto top = skipTop;
+
+	QRect groupRect(left, top, groupWidth, size);
+	_buttonsRect.paint(p, groupRect);
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
index 8f61787d6..cd79c74ca 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h
@@ -8,7 +8,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "ui/rp_widget.h"
+#include "ui/round_rect.h"
 #include "media/clip/media_clip_reader.h"
+#include "base/object_ptr.h"
 
 namespace Lottie {
 class SinglePlayer;
@@ -17,8 +19,9 @@ class SinglePlayer;
 namespace Ui {
 
 struct PreparedFile;
+class IconButton;
 
-class SingleMediaPreview : public RpWidget {
+class SingleMediaPreview final : public RpWidget {
 public:
 	static SingleMediaPreview *Create(
 		QWidget *parent,
@@ -34,24 +37,23 @@ public:
 		const QString &animatedPreviewPath);
 	~SingleMediaPreview();
 
-	bool canSendAsPhoto() const {
-		return _canSendAsPhoto;
-	}
-
-protected:
-	void paintEvent(QPaintEvent *e) override;
+	[[nodiscard]] rpl::producer<> deleteRequests() const;
+	[[nodiscard]] rpl::producer<> editRequests() const;
 
 private:
+	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+
 	void preparePreview(
 		QImage preview,
 		const QString &animatedPreviewPath);
 	void prepareAnimatedPreview(const QString &animatedPreviewPath);
+	void paintButtonsBackground(QPainter &p);
 	void clipCallback(Media::Clip::Notification notification);
 
 	Fn<bool()> _gifPaused;
 	bool _animated = false;
 	bool _sticker = false;
-	bool _canSendAsPhoto = false;
 	QPixmap _preview;
 	int _previewLeft = 0;
 	int _previewWidth = 0;
@@ -59,6 +61,10 @@ private:
 	Media::Clip::ReaderPointer _gifPreview;
 	std::unique_ptr<Lottie::SinglePlayer> _lottiePreview;
 
+	object_ptr<IconButton> _editMedia = { nullptr };
+	object_ptr<IconButton> _deleteMedia = { nullptr };
+	RoundRect _buttonsRect;
+
 };
 
 } // namespace Ui

From 0d37949e74148863a0c836a610681893b254d0bf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 19 Oct 2020 13:02:39 +0300
Subject: [PATCH 104/190] Improve SendFilesBox previews layout.

---
 Telegram/SourceFiles/boxes/boxes.style        |  4 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp | 19 ++--
 Telegram/SourceFiles/boxes/send_files_box.h   |  2 +-
 .../attach/attach_single_file_preview.cpp     | 91 +++++++++----------
 .../chat/attach/attach_single_file_preview.h  |  7 +-
 .../attach/attach_single_media_preview.cpp    |  9 +-
 6 files changed, 69 insertions(+), 63 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 6cd18ef63..87929ede4 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -515,8 +515,8 @@ sendBoxAlbumGroupRadius: 13px;
 sendBoxAlbumGroupHeight: 26px;
 
 sendBoxFileGroupSkipTop: 2px;
-sendBoxFileGroupSkipRight: 0px;
-sendBoxFileGroupEditInternalSkip: 4px;
+sendBoxFileGroupSkipRight: 8px;
+sendBoxFileGroupEditInternalSkip: -1px;
 
 sendBoxAlbumGroupButtonFile: IconButton(editMediaButton) {
 	ripple: RippleAnimation(defaultRippleAnimation) {
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index bc1fcfdb9..91f158b76 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -233,6 +233,7 @@ SendFilesBox::SendFilesBox(
 	SendMenu::Type sendMenuType)
 : _controller(controller)
 , _sendType(sendType)
+, _titleHeight(st::boxTitleHeight)
 , _list(std::move(list))
 , _sendLimit(limit)
 , _sendMenuType(sendMenuType)
@@ -262,7 +263,8 @@ void SendFilesBox::initPreview() {
 	rpl::combine(
 		_inner->heightValue(),
 		_footerHeight.value(),
-		_titleHeight + _1 + _2
+		_titleHeight.value(),
+		_1 + _2 + _3
 	) | rpl::start_with_next([=](int height) {
 		setDimensions(
 			st::boxWideWidth,
@@ -523,7 +525,9 @@ void SendFilesBox::pushBlock(int from, int till) {
 		gifPaused,
 		_sendWay.current());
 	auto &block = _blocks.back();
-	const auto widget = _inner->add(block.takeWidget());
+	const auto widget = _inner->add(
+		block.takeWidget(),
+		QMargins(0, _inner->count() ? st::sendMediaFileThumbSkip : 0, 0, 0));
 
 	block.itemDeleteRequest(
 	) | rpl::filter([=] {
@@ -817,7 +821,7 @@ void SendFilesBox::refreshTitleText() {
 		_titleHeight = st::boxTitleHeight;
 	} else {
 		_titleText = QString();
-		_titleHeight = 0;
+		_titleHeight = st::boxPhotoPadding.top();
 	}
 }
 
@@ -859,11 +863,11 @@ void SendFilesBox::paintEvent(QPaintEvent *e) {
 	if (!_titleText.isEmpty()) {
 		Painter p(this);
 
-		p.setFont(st::boxPhotoTitleFont);
+		p.setFont(st::boxTitleFont);
 		p.setPen(st::boxTitleFg);
 		p.drawTextLeft(
 			st::boxPhotoTitlePosition.x(),
-			st::boxPhotoTitlePosition.y(),
+			st::boxTitlePosition.y(),
 			width(),
 			_titleText);
 	}
@@ -889,6 +893,7 @@ void SendFilesBox::updateControlsGeometry() {
 					+ st::sendMediaPreviewSize
 					- _emojiToggle->width()),
 				_caption->y() + st::boxAttachEmojiTop);
+			_emojiToggle->update();
 		}
 	}
 	const auto pointers = {
@@ -903,8 +908,8 @@ void SendFilesBox::updateControlsGeometry() {
 			bottom -= st::boxPhotoCompressedSkip + pointer->heightNoMargins();
 		}
 	}
-	_scroll->resize(width(), bottom - _titleHeight);
-	_scroll->move(0, _titleHeight);
+	_scroll->resize(width(), bottom - _titleHeight.current());
+	_scroll->move(0, _titleHeight.current());
 }
 
 void SendFilesBox::setInnerFocus() {
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index 762f8c82a..78f4c3624 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -158,7 +158,7 @@ private:
 	const Api::SendType _sendType = Api::SendType();
 
 	QString _titleText;
-	int _titleHeight = 0;
+	rpl::variable<int> _titleHeight = 0;
 
 	Ui::PreparedList _list;
 	std::optional<int> _removingIndex;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
index 167a46960..ab8baddfa 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
@@ -32,9 +32,9 @@ SingleFilePreview::SingleFilePreview(
 	_editMedia->setIconOverride(&st::sendBoxAlbumGroupEditButtonIconFile);
 	_deleteMedia->setIconOverride(&st::sendBoxAlbumGroupDeleteButtonIconFile);
 
-	auto h = _fileThumb.isNull()
-		? (st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom())
-		: (st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom());
+	const auto h = _fileThumb.isNull()
+		? st::msgFileSize
+		: st::sendMediaFileThumbSize;
 	resize(width(), h);
 }
 
@@ -57,9 +57,9 @@ void SingleFilePreview::prepareThumb(const QImage &preview) {
 
 	auto originalWidth = preview.width();
 	auto originalHeight = preview.height();
-	auto thumbWidth = st::msgFileThumbSize;
+	auto thumbWidth = st::sendMediaFileThumbSize;
 	if (originalWidth > originalHeight) {
-		thumbWidth = (originalWidth * st::msgFileThumbSize)
+		thumbWidth = (originalWidth * st::sendMediaFileThumbSize)
 			/ originalHeight;
 	}
 	auto options = Images::Option::Smooth
@@ -73,8 +73,8 @@ void SingleFilePreview::prepareThumb(const QImage &preview) {
 		thumbWidth * style::DevicePixelRatio(),
 		0,
 		options,
-		st::msgFileThumbSize,
-		st::msgFileThumbSize));
+		st::sendMediaFileThumbSize,
+		st::sendMediaFileThumbSize));
 }
 
 void SingleFilePreview::preparePreview(const PreparedFile &file) {
@@ -95,12 +95,8 @@ void SingleFilePreview::preparePreview(const PreparedFile &file) {
 		//	QString(),
 		//	true); // #TODO files
 		auto filename = "image.png";
-		_nameText.setText(
-			st::semiboldTextStyle,
-			filename,
-			NameTextOptions());
+		_name = filename;
 		_statusText = u"%1x%2"_q.arg(preview.width()).arg(preview.height());
-		_statusWidth = qMax(_nameText.maxWidth(), st::normalFont->width(_statusText));
 		_fileIsImage = true;
 	} else {
 		auto fileinfo = QFileInfo(filepath);
@@ -118,46 +114,48 @@ void SingleFilePreview::preparePreview(const PreparedFile &file) {
 			}
 		}
 
-		const auto nameString = ComposeNameString(
-			filename,
-			songTitle,
-			songPerformer);
-		_nameText.setText(
-			st::semiboldTextStyle,
-			nameString,
-			NameTextOptions());
+		_name = ComposeNameString(filename, songTitle, songPerformer);
 		_statusText = FormatSizeText(fileinfo.size());
-		_statusWidth = qMax(
-			_nameText.maxWidth(),
-			st::normalFont->width(_statusText));
 	}
+	const auto availableFileWidth = st::sendMediaPreviewSize
+		- st::sendMediaFileThumbSkip
+		- st::sendMediaFileThumbSize
+		// Right buttons.
+		- st::sendBoxAlbumGroupButtonFile.width * 2
+		- st::sendBoxAlbumGroupEditInternalSkip * 2
+		- st::sendBoxAlbumGroupSkipRight;
+	_nameWidth = st::semiboldFont->width(_name);
+	if (_nameWidth > availableFileWidth) {
+		_name = st::semiboldFont->elided(
+			_name,
+			availableFileWidth,
+			Qt::ElideMiddle);
+		_nameWidth = st::semiboldFont->width(_name);
+	}
+	_statusWidth = st::normalFont->width(_statusText);
 }
 
 void SingleFilePreview::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
 	auto w = width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right();
-	auto h = _fileThumb.isNull() ? (st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom()) : (st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom());
-	auto nameleft = 0, nametop = 0, nameright = 0, statustop = 0, linktop = 0;
+	auto h = _fileThumb.isNull() ? st::msgFileSize : st::sendMediaFileThumbSize;
+	auto nameleft = 0, nametop = 0, statustop = 0;
 	if (_fileThumb.isNull()) {
-		nameleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
-		nametop = st::msgFileNameTop;
-		nameright = st::msgFilePadding.left();
-		statustop = st::msgFileStatusTop;
+		nameleft = st::msgFileSize + st::msgFilePadding.right();
+		nametop = st::msgFileNameTop - st::msgFilePadding.top();
+		statustop = st::msgFileStatusTop - st::msgFilePadding.top();
 	} else {
-		nameleft = st::msgFileThumbPadding.left() + st::msgFileThumbSize + st::msgFileThumbPadding.right();
-		nametop = st::msgFileThumbNameTop;
-		nameright = st::msgFileThumbPadding.left();
-		statustop = st::msgFileThumbStatusTop;
-		linktop = st::msgFileThumbLinkTop;
+		nameleft = st::sendMediaFileThumbSize + st::sendMediaFileThumbSkip;
+		nametop = st::sendMediaFileNameTop;
+		statustop = st::sendMediaFileStatusTop;
 	}
-	auto namewidth = w - nameleft - (_fileThumb.isNull() ? st::msgFilePadding.left() : st::msgFileThumbPadding.left());
-	int32 x = (width() - w) / 2, y = 0;
+	const auto x = (width() - w) / 2, y = 0;
 
 	if (_fileThumb.isNull()) {
-		QRect inner(style::rtlrect(x + st::msgFilePadding.left(), y + st::msgFilePadding.top(), st::msgFileSize, st::msgFileSize, width()));
+		QRect inner(style::rtlrect(x, y, st::msgFileSize, st::msgFileSize, width()));
 		p.setPen(Qt::NoPen);
-		p.setBrush(st::msgFileOutBg);
+		p.setBrush(st::msgFileInBg);
 
 		{
 			PainterHighQualityEnabler hq(p);
@@ -165,23 +163,22 @@ void SingleFilePreview::paintEvent(QPaintEvent *e) {
 		}
 
 		auto &icon = _fileIsAudio
-			? st::historyFileOutPlay
+			? st::historyFileInPlay
 			: _fileIsImage
-			? st::historyFileOutImage
-			: st::historyFileOutDocument;
+			? st::historyFileInImage
+			: st::historyFileInDocument;
 		icon.paintInCenter(p, inner);
 	} else {
-		QRect rthumb(style::rtlrect(x + st::msgFileThumbPadding.left(), y + st::msgFileThumbPadding.top(), st::msgFileThumbSize, st::msgFileThumbSize, width()));
+		QRect rthumb(style::rtlrect(x, y, st::sendMediaFileThumbSize, st::sendMediaFileThumbSize, width()));
 		p.drawPixmap(rthumb.topLeft(), _fileThumb);
 	}
 	p.setFont(st::semiboldFont);
-	p.setPen(st::historyFileNameOutFg);
-	_nameText.drawLeftElided(p, x + nameleft, y + nametop, namewidth, width());
+	p.setPen(st::historyFileNameInFg);
+	p.drawTextLeft(x + nameleft, y + nametop, width(), _name, _nameWidth);
 
-	auto &status = st::mediaOutFg;
 	p.setFont(st::normalFont);
-	p.setPen(status);
-	p.drawTextLeft(x + nameleft, y + statustop, width(), _statusText);
+	p.setPen(st::mediaInFg);
+	p.drawTextLeft(x + nameleft, y + statustop, width(), _statusText, _statusWidth);
 }
 
 void SingleFilePreview::resizeEvent(QResizeEvent *e) {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
index 2be57bec8..e549cf3f0 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.h
@@ -33,11 +33,12 @@ private:
 	void prepareThumb(const QImage &preview);
 
 	QPixmap _fileThumb;
-	Text::String _nameText;
+	QString _name;
+	QString _statusText;
+	int _nameWidth = 0;
+	int _statusWidth = 0;
 	bool _fileIsAudio = false;
 	bool _fileIsImage = false;
-	QString _statusText;
-	int _statusWidth = 0;
 
 	object_ptr<IconButton> _editMedia = { nullptr };
 	object_ptr<IconButton> _deleteMedia = { nullptr };
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
index f6fe54b10..5af943389 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
@@ -155,7 +155,9 @@ void SingleMediaPreview::resizeEvent(QResizeEvent *e) {
 	const auto skipTop = st::sendBoxAlbumGroupSkipTop;
 	const auto groupWidth = size * 2 + skipInternal;
 
-	const auto left = _previewLeft + _previewWidth - groupWidth - skipRight;
+	const auto right = (st::boxWideWidth - st::sendMediaPreviewSize) / 2
+		+ st::sendMediaPreviewSize;
+	const auto left = right - groupWidth - skipRight;
 	const auto top = skipTop;
 	_editMedia->move(left, top);
 	_deleteMedia->move(left + size + skipInternal, top);
@@ -259,8 +261,9 @@ void SingleMediaPreview::paintButtonsBackground(QPainter &p) {
 	const auto skipRight = st::sendBoxAlbumGroupSkipRight;
 	const auto skipTop = st::sendBoxAlbumGroupSkipTop;
 	const auto groupWidth = size * 2 + skipInternal;
-
-	const auto left = _previewLeft + _previewWidth - groupWidth - skipRight;
+	const auto right = (st::boxWideWidth - st::sendMediaPreviewSize) / 2
+		+ st::sendMediaPreviewSize;
+	const auto left = right - groupWidth - skipRight;
 	const auto top = skipTop;
 
 	QRect groupRect(left, top, groupWidth, size);

From 012ebdd15ee84e940cee95e5ba1ce2fe7ca1b5f8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 19 Oct 2020 13:25:28 +0300
Subject: [PATCH 105/190] Fix grouping of music files / just files.

---
 Telegram/SourceFiles/apiwrap.cpp              |  1 +
 .../SourceFiles/boxes/edit_caption_box.cpp    |  7 ++-
 Telegram/SourceFiles/boxes/send_files_box.cpp |  4 +-
 Telegram/SourceFiles/data/data_document.cpp   |  5 +-
 .../storage/storage_media_prepare.cpp         |  4 ++
 .../ui/chat/attach/attach_prepare.cpp         | 59 ++++++++++++-------
 .../ui/chat/attach/attach_prepare.h           |  2 +
 7 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index bf038ffe0..afe7639d3 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -4234,6 +4234,7 @@ void ApiWrap::sendFiles(
 					? type
 					: SendMediaType::Photo;
 				break;
+			case Ui::PreparedFile::AlbumType::Music:
 			case Ui::PreparedFile::AlbumType::Video:
 			case Ui::PreparedFile::AlbumType::File:
 				type = SendMediaType::File;
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index b3a853eaf..99cf59946 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -603,9 +603,10 @@ void EditCaptionBox::createEditMediaButton() {
 			if (Core::IsMimeSticker(mime)) {
 				showError(tr::lng_edit_media_invalid_file);
 				return false;
-			} else if (_isAlbum) { // #TODO edit in file-albums
+			} else if (_isAlbum) { // #TODO files edit in file-albums
 				if (!Core::IsMimeAcceptedForAlbum(mime)
 					|| file.type == Ui::PreparedFile::AlbumType::File
+					|| file.type == Ui::PreparedFile::AlbumType::Music
 					|| file.type == Ui::PreparedFile::AlbumType::None) {
 					showError(tr::lng_edit_media_album_error);
 					return false;
@@ -710,7 +711,9 @@ bool EditCaptionBox::fileFromClipboard(not_null<const QMimeData*> data) {
 	}
 
 	const auto file = &list.files.front();
-	if (_isAlbum && (file->type == AlbumType::File || file->type == AlbumType::None)) {
+	if (_isAlbum && (file->type == AlbumType::File
+		|| file->type == AlbumType::None
+		|| file->type == AlbumType::Music)) {
 		const auto imageAsDoc = [&] {
 			using Info = Ui::PreparedFileInformation;
 			const auto fileMedia = &file->information->media;
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 91f158b76..6ce610629 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -118,8 +118,7 @@ SendFilesBox::Block::Block(
 	const auto count = till - from;
 	const auto my = gsl::make_span(*items).subspan(from, count);
 	const auto &first = my.front();
-	_isAlbum = (my.size() > 1)
-		|| (first.type == Ui::PreparedFile::AlbumType::Photo);
+	_isAlbum = (my.size() > 1);
 	if (_isAlbum) {
 		const auto preview = Ui::CreateChild<Ui::AlbumPreview>(
 			parent.get(),
@@ -492,6 +491,7 @@ void SendFilesBox::generatePreviewFrom(int fromBlock) {
 			const auto albumCount = (i - albumStart);
 			if ((type == Type::File)
 				|| (type == Type::None)
+				|| (type == Type::Music)
 				|| (albumCount == Ui::MaxAlbumItems())) {
 				pushBlock(std::exchange(albumStart, -1), i);
 			} else {
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index a4784561b..cd236d62f 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -1508,10 +1508,7 @@ bool DocumentData::isAudioFile() const {
 }
 
 bool DocumentData::isSharedMediaMusic() const {
-	if (const auto songData = song()) {
-		return (songData->duration > 0);
-	}
-	return false;
+	return isSong();
 }
 
 bool DocumentData::isVideoFile() const {
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index b156e7d8b..6251c5409 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -257,6 +257,7 @@ std::optional<PreparedList> PreparedFileFromFilesDialog(
 	//		const auto file = &list.files.front();
 	//		if (!Core::IsMimeAcceptedForAlbum(mimeFile)
 	//			|| file->type == PreparedFile::AlbumType::File
+	//			|| file->type == PreparedFile::AlbumType::Music
 	//			|| file->type == PreparedFile::AlbumType::None) {
 	//			errorCallback(tr::lng_edit_media_album_error);
 	//			return std::nullopt;
@@ -339,6 +340,7 @@ void PrepareDetails(PreparedFile &file, int previewWidth) {
 
 	using Image = PreparedFileInformation::Image;
 	using Video = PreparedFileInformation::Video;
+	using Song = PreparedFileInformation::Song;
 	if (const auto image = std::get_if<Image>(
 			&file.information->media)) {
 		if (ValidPhotoForAlbum(*image, file.information->filemime)) {
@@ -365,6 +367,8 @@ void PrepareDetails(PreparedFile &file, int previewWidth) {
 			file.preview.setDevicePixelRatio(cRetinaFactor());
 			file.type = PreparedFile::AlbumType::Video;
 		}
+	} else if (const auto song = std::get_if<Song>(&file.information->media)) {
+		file.type = PreparedFile::AlbumType::Music;
 	}
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index d79be2777..220d65c1a 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -73,21 +73,28 @@ bool PreparedList::canBeSentInSlowmodeWith(const PreparedList &other) const {
 		return false;
 	}
 
+	using Type = PreparedFile::AlbumType;
 	auto &&all = ranges::view::concat(files, other.files);
-	const auto hasNonGrouping = ranges::contains(
-		all,
-		PreparedFile::AlbumType::None,
-		&PreparedFile::type);
-	const auto hasFiles = ranges::contains(
-		all,
-		PreparedFile::AlbumType::File,
-		&PreparedFile::type);
-	const auto hasVideos = ranges::contains(
-		all,
-		PreparedFile::AlbumType::Video,
-		&PreparedFile::type);
+	const auto has = [&](Type type) {
+		return ranges::contains(all, type, &PreparedFile::type);
+	};
+	const auto hasNonGrouping = has(Type::None);
+	const auto hasPhotos = has(Type::Photo);
+	const auto hasFiles = has(Type::File);
+	const auto hasVideos = has(Type::Video);
+	const auto hasMusic = has(Type::Music);
 
 	// File-s and Video-s never can be grouped.
+	// Music-s can be grouped only with themselves.
+	if (hasNonGrouping) {
+		return false;
+	} else if (hasFiles) {
+		return !hasMusic && !hasVideos;
+	} else if (hasVideos) {
+		return !hasMusic && !hasFiles;
+	} else if (hasMusic) {
+		return !hasVideos && !hasFiles && !hasPhotos;
+	}
 	return !hasNonGrouping && (!hasFiles || !hasVideos);
 }
 
@@ -139,34 +146,42 @@ std::vector<PreparedGroup> DivideByGroups(
 
 	auto group = Ui::PreparedList();
 
+	enum class GroupType {
+		PhotoVideo,
+		File,
+		Music,
+		None,
+	};
 	// For groupType Type::Video means media album,
 	// Type::File means file album,
 	// Type::None means no grouping.
 	using Type = Ui::PreparedFile::AlbumType;
-	auto groupType = Type::None;
+	auto groupType = GroupType::None;
 
 	auto result = std::vector<PreparedGroup>();
 	auto pushGroup = [&] {
 		result.push_back(PreparedGroup{
 			.list = base::take(group),
-			.grouped = (groupType != Type::None)
+			.grouped = (groupType != GroupType::None)
 		});
 	};
 	for (auto i = 0; i != list.files.size(); ++i) {
 		auto &file = list.files[i];
-		const auto fileGroupType = (file.type == Type::Video)
-			? (groupFiles ? Type::Video : Type::None)
+		const auto fileGroupType = (file.type == Type::Music)
+			? (groupFiles ? GroupType::Music : GroupType::None)
+			: (file.type == Type::Video)
+			? (groupFiles ? GroupType::PhotoVideo : GroupType::None)
 			: (file.type == Type::Photo)
 			? ((groupFiles && sendImagesAsPhotos)
-				? Type::Video
+				? GroupType::PhotoVideo
 				: (groupFiles && !sendImagesAsPhotos)
-				? Type::File
-				: Type::None)
+				? GroupType::File
+				: GroupType::None)
 			: (file.type == Type::File)
-			? (groupFiles ? Type::File : Type::None)
-			: Type::None;
+			? (groupFiles ? GroupType::File : GroupType::None)
+			: GroupType::None;
 		if ((!group.files.empty() && groupType != fileGroupType)
-			|| ((groupType != Type::None)
+			|| ((groupType != GroupType::None)
 				&& (group.files.size() == Ui::MaxAlbumItems()))) {
 			pushGroup();
 		}
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index b4f5bc494..94146796d 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -42,10 +42,12 @@ struct PreparedFile {
 	// Photo-s can be grouped if 'groupFiles'.
 	// Photo-s + Video-s can be grouped if 'groupFiles && sendImagesAsPhotos'.
 	// Video-s can be grouped if 'groupFiles'.
+	// Music-s can be grouped if 'groupFiles'.
 	enum class AlbumType {
 		File,
 		Photo,
 		Video,
+		Music,
 		None,
 	};
 

From 263d6a30f28803a4560282df9ca93c4eb55c0ba7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 19 Oct 2020 18:37:59 +0300
Subject: [PATCH 106/190] Improve grouped files layout in chat.

---
 Telegram/Resources/langs/lang.strings         |   5 +-
 Telegram/SourceFiles/boxes/boxes.style        |   6 +-
 .../SourceFiles/boxes/edit_caption_box.cpp    |  51 +++---
 Telegram/SourceFiles/boxes/send_files_box.cpp |  14 +-
 .../chat_helpers/chat_helpers.style           |   3 +
 .../SourceFiles/history/history_widget.cpp    |   2 +-
 .../view/history_view_replies_section.cpp     |   2 +-
 .../view/history_view_scheduled_section.cpp   |   2 +-
 .../history/view/media/history_view_call.cpp  |   2 +-
 .../view/media/history_view_contact.cpp       |  53 +++---
 .../view/media/history_view_document.cpp      | 163 ++++++++----------
 .../view/media/history_view_document.h        |   5 +-
 .../history/view/media/history_view_gif.cpp   |   3 +-
 .../view/media/history_view_media_grouped.cpp |  39 ++++-
 .../view/media/history_view_media_grouped.h   |   1 +
 .../history/view/media/history_view_photo.cpp |   6 +-
 .../media/history_view_theme_document.cpp     |   3 +-
 .../inline_bot_layout_internal.cpp            |  33 ++--
 .../ui/chat/attach/attach_album_preview.cpp   |  19 +-
 .../ui/chat/attach/attach_album_thumbnail.cpp |  33 ++--
 .../ui/chat/attach/attach_prepare.cpp         |  28 +++
 .../ui/chat/attach/attach_prepare.h           |   3 +
 .../attach/attach_single_file_preview.cpp     |  50 +++---
 .../attach/attach_single_media_preview.cpp    |   3 +-
 Telegram/SourceFiles/ui/chat/chat.style       |  56 ++++--
 .../window/themes/window_theme_preview.cpp    |  22 +--
 26 files changed, 343 insertions(+), 264 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 556f2fd35..6a939ec7e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1525,9 +1525,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_send_files_selected#other" = "{count} files selected";
 "lng_send_files#one" = "Send {count} file";
 "lng_send_files#other" = "Send {count} files";
-"lng_send_album" = "Send as an album";
-"lng_send_photo" = "Send as a photo";
-"lng_send_file" = "Send as a file";
+"lng_send_grouped" = "Group items";
+"lng_send_compressed" = "Compress images";
 "lng_send_media_invalid_files" = "Sorry, no valid files found.";
 
 "lng_forward_choose" = "Choose recipient...";
diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 87929ede4..2269c450d 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -713,11 +713,7 @@ groupStickersSubTitleHeight: 36px;
 
 sendMediaPreviewSize: 308px;
 sendMediaPreviewHeightMax: 1280;
-sendMediaPreviewPhotoSkip: 10px;
-sendMediaFileThumbSize: 64px;
-sendMediaFileThumbSkip: 10px;
-sendMediaFileNameTop: 7px;
-sendMediaFileStatusTop: 37px;
+sendMediaRowSkip: 10px;
 
 proxyUsePadding: margins(22px, 6px, 22px, 5px);
 proxyTryIPv6Padding: margins(22px, 8px, 22px, 5px);
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 99cf59946..19e044b44 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -158,11 +158,12 @@ EditCaptionBox::EditCaptionBox(
 			_thumbw = 0;
 			_thumbnailImageLoaded = true;
 		} else {
+			const auto thumbSize = st::msgFileThumbLayout.thumbSize;
 			const auto tw = dimensions.width(), th = dimensions.height();
 			if (tw > th) {
-				_thumbw = (tw * st::msgFileThumbSize) / th;
+				_thumbw = (tw * thumbSize) / th;
 			} else {
-				_thumbw = st::msgFileThumbSize;
+				_thumbw = thumbSize;
 			}
 			_refreshThumbnail = [=] {
 				const auto image = computeImage();
@@ -180,8 +181,8 @@ EditCaptionBox::EditCaptionBox(
 					_thumbw * cIntRetinaFactor(),
 					0,
 					options,
-					st::msgFileThumbSize,
-					st::msgFileThumbSize));
+					thumbSize,
+					thumbSize));
 				_thumbnailImageLoaded = true;
 			};
 			_refreshThumbnail();
@@ -355,8 +356,8 @@ EditCaptionBox::EditCaptionBox(
 		this,
 		object_ptr<Ui::Checkbox>(
 			this,
-			tr::lng_send_file(tr::now),
-			false,
+			tr::lng_send_compressed(tr::now),
+			true,
 			st::defaultBoxCheckbox),
 		st::editMediaCheckboxMargins);
 	_wayWrap = r.data();
@@ -364,7 +365,7 @@ EditCaptionBox::EditCaptionBox(
 
 	r->entity()->checkedChanges(
 	) | rpl::start_with_next([&](bool checked) {
-		_asFile = checked;
+		_asFile = !checked;
 	}, _wayWrap->lifetime());
 
 	_controller->session().data().itemRemoved(
@@ -813,12 +814,11 @@ void EditCaptionBox::updateBoxSize() {
 	if (_photo) {
 		newHeight += _wayWrap->height() / 2;
 	}
+	const auto &st = _thumbw ? st::msgFileThumbLayout : st::msgFileLayout;
 	if (_photo || _animated) {
 		newHeight += std::max(_thumbh, _gifh);
-	} else if (_thumbw) {
-		newHeight += 0 + st::msgFileThumbSize + 0;
-	} else if (_doc) {
-		newHeight += 0 + st::msgFileSize + 0;
+	} else if (_thumbw || _doc) {
+		newHeight += 0 + st.thumbSize + 0;
 	} else {
 		newHeight += st::boxTitleFont->height;
 	}
@@ -887,7 +887,8 @@ void EditCaptionBox::paintEvent(QPaintEvent *e) {
 			p.drawPixmap(_thumbx, st::boxPhotoPadding.top() + offset, _thumb);
 		}
 		if (_animated && !_streamed) {
-			QRect inner(_thumbx + (_thumbw - st::msgFileSize) / 2, st::boxPhotoPadding.top() + (th - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+			const auto &st = st::msgFileLayout;
+			QRect inner(_thumbx + (_thumbw - st.thumbSize) / 2, st::boxPhotoPadding.top() + (th - st.thumbSize) / 2, st.thumbSize, st.thumbSize);
 			p.setPen(Qt::NoPen);
 			p.setBrush(st::msgDateImgBg);
 
@@ -900,20 +901,13 @@ void EditCaptionBox::paintEvent(QPaintEvent *e) {
 			icon->paintInCenter(p, inner);
 		}
 	} else if (_doc) {
+		const auto &st = _thumbw ? st::msgFileThumbLayout : st::msgFileLayout;
 		const auto w = width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right();
-		const auto h = _thumbw ? (0 + st::msgFileThumbSize + 0) : (0 + st::msgFileSize + 0);
-		auto nameleft = 0, nametop = 0, nameright = 0, statustop = 0;
-		if (_thumbw) {
-			nameleft = 0 + st::msgFileThumbSize + st::msgFileThumbPadding.right();
-			nametop = st::msgFileThumbNameTop - st::msgFileThumbPadding.top();
-			nameright = 0;
-			statustop = st::msgFileThumbStatusTop - st::msgFileThumbPadding.top();
-		} else {
-			nameleft = 0 + st::msgFileSize + st::msgFilePadding.right();
-			nametop = st::msgFileNameTop - st::msgFilePadding.top();
-			nameright = 0;
-			statustop = st::msgFileStatusTop - st::msgFilePadding.top();
-		}
+		const auto h = 0 + st.thumbSize + 0;
+		const auto nameleft = 0 + st.thumbSize + st.padding.right();
+		const auto nametop = st.nameTop - st.padding.top();
+		const auto nameright = 0;
+		const auto statustop = st.statusTop - st.padding.top();
 		const auto editButton = _isAllowedEditMedia
 			? _editMedia->width() + st::editMediaButtonSkip
 			: 0;
@@ -922,21 +916,20 @@ void EditCaptionBox::paintEvent(QPaintEvent *e) {
 
 //		Ui::FillRoundCorner(p, x, y, w, h, st::msgInBg, Ui::MessageInCorners, &st::msgInShadow);
 
+		const auto rthumb = style::rtlrect(x + 0, y + 0, st.thumbSize, st.thumbSize, width());
 		if (_thumbw) {
-			QRect rthumb(style::rtlrect(x + 0, y + 0, st::msgFileThumbSize, st::msgFileThumbSize, width()));
 			p.drawPixmap(rthumb.topLeft(), _thumb);
 		} else {
-			const QRect inner(style::rtlrect(x + 0, y + 0, st::msgFileSize, st::msgFileSize, width()));
 			p.setPen(Qt::NoPen);
 			p.setBrush(st::msgFileInBg);
 
 			{
 				PainterHighQualityEnabler hq(p);
-				p.drawEllipse(inner);
+				p.drawEllipse(rthumb);
 			}
 
 			const auto icon = &(_isAudio ? st::historyFileInPlay : _isImage ? st::historyFileInImage : st::historyFileInDocument);
-			icon->paintInCenter(p, inner);
+			icon->paintInCenter(p, rthumb);
 		}
 		p.setFont(st::semiboldFont);
 		p.setPen(st::historyFileNameInFg);
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 6ce610629..bca75480a 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -527,7 +527,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 	auto &block = _blocks.back();
 	const auto widget = _inner->add(
 		block.takeWidget(),
-		QMargins(0, _inner->count() ? st::sendMediaFileThumbSkip : 0, 0, 0));
+		QMargins(0, _inner->count() ? st::sendMediaRowSkip : 0, 0, 0));
 
 	block.itemDeleteRequest(
 	) | rpl::filter([=] {
@@ -590,15 +590,14 @@ void SendFilesBox::refreshControls() {
 }
 
 void SendFilesBox::setupSendWayControls() {
-	// #TODO files
 	_groupFiles.create(
 		this,
-		"Group items",
+		tr::lng_send_grouped(tr::now),
 		_sendWay.current().groupFiles(),
 		st::defaultBoxCheckbox);
 	_sendImagesAsPhotos.create(
 		this,
-		"Compress images",
+		tr::lng_send_compressed(tr::now),
 		_sendWay.current().sendImagesAsPhotos(),
 		st::defaultBoxCheckbox);
 
@@ -628,8 +627,9 @@ void SendFilesBox::updateSendWayControlsVisibility() {
 		return;
 	}
 	const auto onlyOne = (_sendLimit == SendLimit::One);
-	_groupFiles->setVisible(!onlyOne);
-	_sendImagesAsPhotos->setVisible(/*_list.hasImagesForCompression()*/true); // #TODO files
+	_groupFiles->setVisible(_list.hasGroupOption(onlyOne));
+	_sendImagesAsPhotos->setVisible(
+		_list.hasSendImagesAsPhotosOption(onlyOne));
 }
 
 void SendFilesBox::setupCaption() {
@@ -821,7 +821,7 @@ void SendFilesBox::refreshTitleText() {
 		_titleHeight = st::boxTitleHeight;
 	} else {
 		_titleText = QString();
-		_titleHeight = st::boxPhotoPadding.top();
+		_titleHeight = count ? st::boxPhotoPadding.top() : 0;
 	}
 }
 
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index ac5b74139..7c3cf0494 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -278,3 +278,6 @@ manageEmojiPreviewPadding: margins(22px, 9px, 19px, 9px);
 manageEmojiMarginRight: 21px;
 manageEmojiNameTop: 3px;
 manageEmojiStatusTop: 25px;
+
+inlineRadialSize: 44px;
+inlineFileSize: 44px;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index c77a230b0..161b13678 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4226,7 +4226,7 @@ void HistoryWidget::sendingFilesConfirmed(
 	action.replyTo = replyToId();
 	action.options = options;
 	action.clearDraft = false;
-	if (groups.size() > 1 && !caption.text.isEmpty()) {
+	if ((groups.empty() || groups.size() > 1) && !caption.text.isEmpty()) {
 		auto message = Api::MessageToSend(_history);
 		message.textWithTags = base::take(caption);
 		message.action = action;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 7c534f7b9..cd58947de 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -671,7 +671,7 @@ void RepliesWidget::sendingFilesConfirmed(
 	action.replyTo = replyTo ? replyTo : _rootId;
 	action.options = options;
 	action.clearDraft = false;
-	if (groups.size() > 1 && !caption.text.isEmpty()) {
+	if ((groups.empty() || groups.size() > 1) && !caption.text.isEmpty()) {
 		auto message = Api::MessageToSend(_history);
 		message.textWithTags = base::take(caption);
 		message.action = action;
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 8afba643f..37843d188 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -407,7 +407,7 @@ void ScheduledWidget::sendingFilesConfirmed(
 	auto action = Api::SendAction(_history);
 	action.options = options;
 	action.clearDraft = false;
-	if (groups.size() > 1 && !caption.text.isEmpty()) {
+	if ((groups.empty() || groups.size() > 1) && !caption.text.isEmpty()) {
 		auto message = Api::MessageToSend(_history);
 		message.textWithTags = base::take(caption);
 		message.action = action;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_call.cpp b/Telegram/SourceFiles/history/view/media/history_view_call.cpp
index 982e7c459..aa2881aeb 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_call.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_call.cpp
@@ -86,7 +86,7 @@ void Call::draw(Painter &p, const QRect &r, TextSelection selection, crl::time m
 
 	nameleft = st::historyCallLeft;
 	nametop = st::historyCallTop - topMinus;
-	nameright = st::msgFilePadding.left();
+	nameright = st::msgFileLayout.padding.left();
 	statustop = st::historyCallStatusTop - topMinus;
 
 	auto namewidth = paintw - nameleft - nameright;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_contact.cpp b/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
index eb8a5ca37..ff87a9b05 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
@@ -120,30 +120,25 @@ QSize Contact::countOptimalSize() {
 	}
 	_linkw = _link.isEmpty() ? 0 : st::semiboldFont->width(_link);
 
-	auto tleft = 0;
-	auto tright = 0;
+	const auto &st = _userId ? st::msgFileThumbLayout : st::msgFileLayout;
+
+	const auto tleft = st.padding.left() + st.thumbSize + st.padding.right();
+	const auto tright = st.padding.left();
 	if (_userId) {
-		tleft = st::msgFileThumbPadding.left() + st::msgFileThumbSize + st::msgFileThumbPadding.right();
-		tright = st::msgFileThumbPadding.left();
 		accumulate_max(maxWidth, tleft + _phonew + tright);
 	} else {
-		tleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
-		tright = st::msgFileThumbPadding.left();
 		accumulate_max(maxWidth, tleft + _phonew + _parent->skipBlockWidth() + st::msgPadding.right());
 	}
 
 	accumulate_max(maxWidth, tleft + _name.maxWidth() + tright);
 	accumulate_min(maxWidth, st::msgMaxWidth);
-	auto minHeight = 0;
+	auto minHeight = st.padding.top() + st.thumbSize + st.padding.bottom();
 	if (_userId) {
-		minHeight = st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom();
 		const auto msgsigned = item->Get<HistoryMessageSigned>();
 		if ((msgsigned && !msgsigned->isAnonymousRank)
 			|| item->Has<HistoryMessageViews>()) {
 			minHeight += st::msgDateFont->height - st::msgDateDelta.y();
 		}
-	} else {
-		minHeight = st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom();
 	}
 	if (!isBubbleTop()) {
 		minHeight -= st::msgFileTopMinus;
@@ -160,24 +155,23 @@ void Contact::draw(Painter &p, const QRect &r, TextSelection selection, crl::tim
 
 	accumulate_min(paintw, maxWidth());
 
-	auto nameleft = 0, nametop = 0, nameright = 0, statustop = 0, linktop = 0;
-	auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
+	const auto &st = _userId ? st::msgFileThumbLayout : st::msgFileLayout;
+	const auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
+	const auto nameleft = st.padding.left() + st.thumbSize + st.padding.right();
+	const auto nametop = st.nameTop - topMinus;
+	const auto nameright = st.padding.left();
+	const auto statustop = st.statusTop - topMinus;
+	const auto linktop = st.linkTop - topMinus;
 	if (_userId) {
-		nameleft = st::msgFileThumbPadding.left() + st::msgFileThumbSize + st::msgFileThumbPadding.right();
-		nametop = st::msgFileThumbNameTop - topMinus;
-		nameright = st::msgFileThumbPadding.left();
-		statustop = st::msgFileThumbStatusTop - topMinus;
-		linktop = st::msgFileThumbLinkTop - topMinus;
-
-		QRect rthumb(style::rtlrect(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus, st::msgFileThumbSize, st::msgFileThumbSize, paintw));
+		QRect rthumb(style::rtlrect(st.padding.left(), st.padding.top() - topMinus, st.thumbSize, st.thumbSize, paintw));
 		if (_contact) {
 			const auto was = (_userpic != nullptr);
-			_contact->paintUserpic(p, _userpic, rthumb.x(), rthumb.y(), st::msgFileThumbSize);
+			_contact->paintUserpic(p, _userpic, rthumb.x(), rthumb.y(), st.thumbSize);
 			if (!was && _userpic) {
 				history()->owner().registerHeavyViewPart(_parent);
 			}
 		} else {
-			_photoEmpty->paint(p, st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus, paintw, st::msgFileThumbSize);
+			_photoEmpty->paint(p, st.padding.left(), st.padding.top() - topMinus, paintw, st.thumbSize);
 		}
 		if (selected) {
 			PainterHighQualityEnabler hq(p);
@@ -191,14 +185,9 @@ void Contact::draw(Painter &p, const QRect &r, TextSelection selection, crl::tim
 		p.setPen(outbg ? (selected ? st::msgFileThumbLinkOutFgSelected : st::msgFileThumbLinkOutFg) : (selected ? st::msgFileThumbLinkInFgSelected : st::msgFileThumbLinkInFg));
 		p.drawTextLeft(nameleft, linktop, paintw, _link, _linkw);
 	} else {
-		nameleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
-		nametop = st::msgFileNameTop - topMinus;
-		nameright = st::msgFilePadding.left();
-		statustop = st::msgFileStatusTop - topMinus;
-
-		_photoEmpty->paint(p, st::msgFilePadding.left(), st::msgFilePadding.top() - topMinus, paintw, st::msgFileSize);
+		_photoEmpty->paint(p, st.padding.left(), st.padding.top() - topMinus, paintw, st.thumbSize);
 	}
-	auto namewidth = paintw - nameleft - nameright;
+	const auto namewidth = paintw - nameleft - nameright;
 
 	p.setFont(st::semiboldFont);
 	p.setPen(outbg ? (selected ? st::historyFileNameOutFgSelected : st::historyFileNameOutFg) : (selected ? st::historyFileNameInFgSelected : st::historyFileNameInFg));
@@ -213,11 +202,11 @@ void Contact::draw(Painter &p, const QRect &r, TextSelection selection, crl::tim
 TextState Contact::textState(QPoint point, StateRequest request) const {
 	auto result = TextState(_parent);
 
-	auto nameleft = 0, nametop = 0, nameright = 0, statustop = 0, linktop = 0;
-	auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
 	if (_userId) {
-		nameleft = st::msgFileThumbPadding.left() + st::msgFileThumbSize + st::msgFileThumbPadding.right();
-		linktop = st::msgFileThumbLinkTop - topMinus;
+		const auto &st = _userId ? st::msgFileThumbLayout : st::msgFileLayout;
+		const auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
+		const auto nameleft = st.padding.left() + st.thumbSize + st.padding.right();
+		const auto linktop = st.linkTop - topMinus;
 		if (style::rtlrect(nameleft, linktop, _linkw, st::semiboldFont->height, width()).contains(point)) {
 			result.link = _linkl;
 			return result;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 9d3b47582..da0c222f3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -164,28 +164,25 @@ QSize Document::countOptimalSize() {
 			_parent->skipBlockHeight());
 	}
 	auto thumbed = Get<HistoryDocumentThumbed>();
+	const auto &st = thumbed ? st::msgFileThumbLayout : st::msgFileLayout;
 	if (thumbed) {
 		const auto &location = _data->thumbnailLocation();
 		auto tw = style::ConvertScale(location.width());
 		auto th = style::ConvertScale(location.height());
 		if (tw > th) {
-			thumbed->_thumbw = (tw * st::msgFileThumbSize) / th;
+			thumbed->_thumbw = (tw * st.thumbSize) / th;
 		} else {
-			thumbed->_thumbw = st::msgFileThumbSize;
+			thumbed->_thumbw = st.thumbSize;
 		}
 	}
 
 	auto maxWidth = st::msgFileMinWidth;
 
-	auto tleft = 0;
-	auto tright = 0;
+	const auto tleft = st.padding.left() + st.thumbSize + st.padding.right();
+	const auto tright = st.padding.left();
 	if (thumbed) {
-		tleft = st::msgFileThumbPadding.left() + st::msgFileThumbSize + st::msgFileThumbPadding.right();
-		tright = st::msgFileThumbPadding.left();
 		accumulate_max(maxWidth, tleft + documentMaxStatusWidth(_data) + tright);
 	} else {
-		tleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
-		tright = st::msgFileThumbPadding.left();
 		auto unread = _data->isVoiceMessage() ? (st::mediaUnreadSkip + st::mediaUnreadSize) : 0;
 		accumulate_max(maxWidth, tleft + documentMaxStatusWidth(_data) + unread + _parent->skipBlockWidth() + st::msgPadding.right());
 	}
@@ -195,12 +192,7 @@ QSize Document::countOptimalSize() {
 		accumulate_min(maxWidth, st::msgMaxWidth);
 	}
 
-	auto minHeight = 0;
-	if (thumbed) {
-		minHeight = st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom();
-	} else {
-		minHeight = st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom();
-	}
+	auto minHeight = st.padding.top() + st.thumbSize + st.padding.bottom();
 	const auto msgsigned = item->Get<HistoryMessageSigned>();
 	if (!captioned && ((msgsigned && !msgsigned->isAnonymousRank)
 		|| item->Has<HistoryMessageViews>()
@@ -224,18 +216,15 @@ QSize Document::countOptimalSize() {
 }
 
 QSize Document::countCurrentSize(int newWidth) {
-	auto captioned = Get<HistoryDocumentCaptioned>();
+	const auto captioned = Get<HistoryDocumentCaptioned>();
 	if (!captioned) {
 		return File::countCurrentSize(newWidth);
 	}
 
 	accumulate_min(newWidth, maxWidth());
-	auto newHeight = 0;
-	if (Get<HistoryDocumentThumbed>()) {
-		newHeight = st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom();
-	} else {
-		newHeight = st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom();
-	}
+	const auto thumbed = Get<HistoryDocumentThumbed>();
+	const auto &st = thumbed ? st::msgFileThumbLayout : st::msgFileLayout;
+	auto newHeight = st.padding.top() + st.thumbSize + st.padding.bottom();
 	if (!isBubbleTop()) {
 		newHeight -= st::msgFileTopMinus;
 	}
@@ -286,24 +275,28 @@ void Document::draw(
 	const auto showPause = updateStatusText();
 	const auto radial = isRadialAnimation();
 
-	auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
-	int nameleft = 0, nametop = 0, nameright = 0, statustop = 0, linktop = 0, bottom = 0;
-	if (auto thumbed = Get<HistoryDocumentThumbed>()) {
-		nameleft = st::msgFileThumbPadding.left() + st::msgFileThumbSize + st::msgFileThumbPadding.right();
-		nametop = st::msgFileThumbNameTop - topMinus;
-		nameright = st::msgFileThumbPadding.left();
-		statustop = st::msgFileThumbStatusTop - topMinus;
-		linktop = st::msgFileThumbLinkTop - topMinus;
-		bottom = st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom() - topMinus;
-
+	const auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
+	const auto thumbed = Get<HistoryDocumentThumbed>();
+	const auto &st = (mode == LayoutMode::Full)
+		? (thumbed ? st::msgFileThumbLayout : st::msgFileLayout)
+		: (thumbed ? st::msgFileThumbLayoutGrouped : st::msgFileLayoutGrouped);
+	const auto nameleft = st.padding.left() + st.thumbSize + st.padding.right();
+	const auto nametop = st.nameTop - topMinus;
+	const auto nameright = st.padding.left();
+	const auto statustop = st.statusTop - topMinus;
+	const auto linktop = st.linkTop - topMinus;
+	const auto bottom = st.padding.top() + st.thumbSize + st.padding.bottom() - topMinus;
+	const auto rthumb = style::rtlrect(st.padding.left(), st.padding.top() - topMinus, st.thumbSize, st.thumbSize, width);
+	const auto innerSize = st::msgFileLayout.thumbSize;
+	const auto inner = QRect(rthumb.x() + (rthumb.width() - innerSize) / 2, rthumb.y() + (rthumb.height() - innerSize) / 2, innerSize, innerSize);
+	if (thumbed) {
 		auto inWebPage = (_parent->media() != this);
 		auto roundRadius = inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
-		QRect rthumb(style::rtlrect(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus, st::msgFileThumbSize, st::msgFileThumbSize, width));
 		QPixmap thumb;
 		if (const auto normal = _dataMedia->thumbnail()) {
-			thumb = normal->pixSingle(thumbed->_thumbw, 0, st::msgFileThumbSize, st::msgFileThumbSize, roundRadius);
+			thumb = normal->pixSingle(thumbed->_thumbw, 0, st.thumbSize, st.thumbSize, roundRadius);
 		} else if (const auto blurred = _dataMedia->thumbnailInline()) {
-			thumb = blurred->pixBlurredSingle(thumbed->_thumbw, 0, st::msgFileThumbSize, st::msgFileThumbSize, roundRadius);
+			thumb = blurred->pixBlurredSingle(thumbed->_thumbw, 0, st.thumbSize, st.thumbSize, roundRadius);
 		}
 		p.drawPixmap(rthumb.topLeft(), thumb);
 		if (selected) {
@@ -313,7 +306,6 @@ void Document::draw(
 
 		if (radial || (!loaded && !_data->loading())) {
 			float64 radialOpacity = (radial && loaded && !_data->uploading()) ? _animation->radial.opacity() : 1;
-			QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
 			p.setPen(Qt::NoPen);
 			if (selected) {
 				p.setBrush(st::msgDateImgBgSelected);
@@ -356,13 +348,6 @@ void Document::draw(
 			p.drawTextLeft(nameleft, linktop, width, thumbed->_link, thumbed->_linkw);
 		}
 	} else {
-		nameleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
-		nametop = st::msgFileNameTop - topMinus;
-		nameright = st::msgFilePadding.left();
-		statustop = st::msgFileStatusTop - topMinus;
-		bottom = st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom() - topMinus;
-
-		QRect inner(style::rtlrect(st::msgFilePadding.left(), st::msgFilePadding.top() - topMinus, st::msgFileSize, st::msgFileSize, width));
 		p.setPen(Qt::NoPen);
 		if (selected) {
 			p.setBrush(outbg ? st::msgFileOutBgSelected : st::msgFileInBgSelected);
@@ -398,7 +383,7 @@ void Document::draw(
 			_animation->radial.draw(p, rinner, st::msgFileRadialLine, fg);
 		}
 
-		drawCornerDownload(p, selected);
+		drawCornerDownload(p, selected, mode);
 	}
 	auto namewidth = width - nameleft - nameright;
 	auto statuswidth = namewidth;
@@ -448,7 +433,7 @@ void Document::draw(
 		auto bar_count = qMin(availw / (st::msgWaveformBar + st::msgWaveformSkip), wf_size);
 		auto max_value = 0;
 		auto max_delta = st::msgWaveformMax - st::msgWaveformMin;
-		auto bottom = st::msgFilePadding.top() - topMinus + st::msgWaveformMax;
+		auto bottom = st.padding.top() - topMinus + st::msgWaveformMax;
 		p.setPen(Qt::NoPen);
 		for (auto i = 0, bar_x = 0, sum_i = 0; i < wf_size; ++i) {
 			auto value = wf ? wf->at(i) : 0;
@@ -543,7 +528,7 @@ bool Document::downloadInCorner() const {
 		&& IsServerMsgId(_parent->data()->id);
 }
 
-void Document::drawCornerDownload(Painter &p, bool selected) const {
+void Document::drawCornerDownload(Painter &p, bool selected, LayoutMode mode) const {
 	if (dataLoaded()
 		|| _data->loadedInMediaCache()
 		|| !downloadInCorner()) {
@@ -551,9 +536,13 @@ void Document::drawCornerDownload(Painter &p, bool selected) const {
 	}
 	auto outbg = _parent->hasOutLayout();
 	auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
+	const auto thumbed = false;
+	const auto &st = (mode == LayoutMode::Full)
+		? (thumbed ? st::msgFileThumbLayout : st::msgFileLayout)
+		: (thumbed ? st::msgFileThumbLayoutGrouped : st::msgFileLayoutGrouped);
 	const auto shift = st::historyAudioDownloadShift;
 	const auto size = st::historyAudioDownloadSize;
-	const auto inner = style::rtlrect(st::msgFilePadding.left() + shift, st::msgFilePadding.top() - topMinus + shift, size, size, width());
+	const auto inner = style::rtlrect(st.padding.left() + shift, st.padding.top() - topMinus + shift, size, size, width());
 	auto pen = (selected
 		? (outbg ? st::msgOutBgSelected : st::msgInBgSelected)
 		: (outbg ? st::msgOutBg : st::msgInBg))->p;
@@ -584,7 +573,8 @@ void Document::drawCornerDownload(Painter &p, bool selected) const {
 
 TextState Document::cornerDownloadTextState(
 		QPoint point,
-		StateRequest request) const {
+		StateRequest request,
+		LayoutMode mode) const {
 	auto result = TextState(_parent);
 	if (dataLoaded()
 		|| _data->loadedInMediaCache()
@@ -592,14 +582,17 @@ TextState Document::cornerDownloadTextState(
 		return result;
 	}
 	auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
+	const auto thumbed = false;
+	const auto &st = (mode == LayoutMode::Full)
+		? (thumbed ? st::msgFileThumbLayout : st::msgFileLayout)
+		: (thumbed ? st::msgFileThumbLayoutGrouped : st::msgFileLayoutGrouped);
 	const auto shift = st::historyAudioDownloadShift;
 	const auto size = st::historyAudioDownloadSize;
-	const auto inner = style::rtlrect(st::msgFilePadding.left() + shift, st::msgFilePadding.top() - topMinus + shift, size, size, width());
+	const auto inner = style::rtlrect(st.padding.left() + shift, st.padding.top() - topMinus + shift, size, size, width());
 	if (inner.contains(point)) {
 		result.link = _data->loading() ? _cancell : _savel;
 	}
 	return result;
-
 }
 
 TextState Document::textState(QPoint point, StateRequest request) const {
@@ -625,16 +618,21 @@ TextState Document::textState(
 
 	bool showPause = updateStatusText();
 
-	auto nameleft = 0, nametop = 0, nameright = 0, statustop = 0, linktop = 0, bottom = 0;
-	auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
+	const auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
+	const auto thumbed = Get<HistoryDocumentThumbed>();
+	const auto &st = (mode == LayoutMode::Full)
+		? (thumbed ? st::msgFileThumbLayout : st::msgFileLayout)
+		: (thumbed ? st::msgFileThumbLayoutGrouped : st::msgFileLayoutGrouped);
+	const auto nameleft = st.padding.left() + st.thumbSize + st.padding.right();
+	const auto nametop = st.nameTop - topMinus;
+	const auto nameright = st.padding.left();
+	const auto statustop = st.statusTop - topMinus;
+	const auto linktop = st.linkTop - topMinus;
+	const auto bottom = st.padding.top() + st.thumbSize + st.padding.bottom() - topMinus;
+	const auto rthumb = style::rtlrect(st.padding.left(), st.padding.top() - topMinus, st.thumbSize, st.thumbSize, width);
+	const auto innerSize = st::msgFileLayout.thumbSize;
+	const auto inner = QRect(rthumb.x() + (rthumb.width() - innerSize) / 2, rthumb.y() + (rthumb.height() - innerSize) / 2, innerSize, innerSize);
 	if (const auto thumbed = Get<HistoryDocumentThumbed>()) {
-		nameleft = st::msgFileThumbPadding.left() + st::msgFileThumbSize + st::msgFileThumbPadding.right();
-		nameright = st::msgFileThumbPadding.left();
-		nametop = st::msgFileThumbNameTop - topMinus;
-		linktop = st::msgFileThumbLinkTop - topMinus;
-		bottom = st::msgFileThumbPadding.top() + st::msgFileThumbSize + st::msgFileThumbPadding.bottom() - topMinus;
-
-		QRect rthumb(style::rtlrect(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top() - topMinus, st::msgFileThumbSize, st::msgFileThumbSize, width));
 		if ((_data->loading() || _data->uploading()) && rthumb.contains(point)) {
 			result.link = _cancell;
 			return result;
@@ -651,15 +649,9 @@ TextState Document::textState(
 			}
 		}
 	} else {
-		nameleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
-		nameright = st::msgFilePadding.left();
-		nametop = st::msgFileNameTop - topMinus;
-		bottom = st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom() - topMinus;
-
-		if (const auto state = cornerDownloadTextState(point, request); state.link) {
+		if (const auto state = cornerDownloadTextState(point, request, mode); state.link) {
 			return state;
 		}
-		QRect inner(style::rtlrect(st::msgFilePadding.left(), st::msgFilePadding.top() - topMinus, st::msgFileSize, st::msgFileSize, width));
 		if ((_data->loading() || _data->uploading()) && inner.contains(point) && !downloadInCorner()) {
 			result.link = _cancell;
 			return result;
@@ -668,7 +660,7 @@ TextState Document::textState(
 
 	if (const auto voice = Get<HistoryDocumentVoice>()) {
 		auto namewidth = width - nameleft - nameright;
-		auto waveformbottom = st::msgFilePadding.top() - topMinus + st::msgWaveformMax + st::msgWaveformMin;
+		auto waveformbottom = st.padding.top() - topMinus + st::msgWaveformMax + st::msgWaveformMin;
 		if (QRect(nameleft, nametop, namewidth, waveformbottom - nametop).contains(point)) {
 			const auto state = ::Media::Player::instance()->getState(AudioMsgId::Type::Voice);
 			if (state.id == AudioMsgId(_data, _parent->data()->fullId(), state.id.externalPlayId())
@@ -714,16 +706,13 @@ TextState Document::textState(
 }
 
 void Document::updatePressed(QPoint point) {
+	// LayoutMode should be passed here.
 	if (auto voice = Get<HistoryDocumentVoice>()) {
 		if (voice->seeking()) {
-			auto nameleft = 0, nameright = 0;
-			if (auto thumbed = Get<HistoryDocumentThumbed>()) {
-				nameleft = st::msgFileThumbPadding.left() + st::msgFileThumbSize + st::msgFileThumbPadding.right();
-				nameright = st::msgFileThumbPadding.left();
-			} else {
-				nameleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
-				nameright = st::msgFilePadding.left();
-			}
+			const auto thumbed = Get<HistoryDocumentThumbed>();
+			const auto &st = thumbed ? st::msgFileThumbLayout : st::msgFileLayout;
+			const auto nameleft = st.padding.left() + st.thumbSize + st.padding.right();
+			const auto nameright = st.padding.left();
 			voice->setSeekingCurrent(snap((point.x() - nameleft) / float64(width() - nameleft - nameright), 0., 1.));
 			history()->owner().requestViewRepaint(_parent);
 		}
@@ -853,7 +842,11 @@ bool Document::updateStatusText() const {
 }
 
 QMargins Document::bubbleMargins() const {
-	return Get<HistoryDocumentThumbed>() ? QMargins(st::msgFileThumbPadding.left(), st::msgFileThumbPadding.top(), st::msgFileThumbPadding.left(), st::msgFileThumbPadding.bottom()) : st::msgPadding;
+	if (!Has<HistoryDocumentThumbed>()) {
+		return st::msgPadding;
+	}
+	const auto padding = st::msgFileThumbLayout.padding;
+	return QMargins(padding.left(), padding.top(), padding.left(), padding.bottom());
 }
 
 bool Document::hideForwardedFrom() const {
@@ -861,13 +854,9 @@ bool Document::hideForwardedFrom() const {
 }
 
 QSize Document::sizeForGroupingOptimal(int maxWidth, bool last) const {
-	auto height = Has<HistoryDocumentThumbed>()
-		? (st::msgFileThumbPadding.top()
-			+ st::msgFileThumbSize
-			+ st::msgFileThumbPadding.bottom())
-		: (st::msgFilePadding.top()
-			+ st::msgFileSize
-			+ st::msgFilePadding.bottom());
+	const auto thumbed = Get<HistoryDocumentThumbed>();
+	const auto &st = (thumbed ? st::msgFileThumbLayoutGrouped : st::msgFileLayoutGrouped);
+	auto height = st.padding.top() + st.thumbSize + st.padding.bottom();
 	if (!last) {
 		if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
 			auto captionw = maxWidth
@@ -881,13 +870,9 @@ QSize Document::sizeForGroupingOptimal(int maxWidth, bool last) const {
 }
 
 QSize Document::sizeForGrouping(int width, bool last) const {
-	auto height = Has<HistoryDocumentThumbed>()
-		? (st::msgFileThumbPadding.top()
-			+ st::msgFileThumbSize
-			+ st::msgFileThumbPadding.bottom())
-		: (st::msgFilePadding.top()
-			+ st::msgFileSize
-			+ st::msgFilePadding.bottom());
+	const auto thumbed = Get<HistoryDocumentThumbed>();
+	const auto &st = (thumbed ? st::msgFileThumbLayoutGrouped : st::msgFileLayoutGrouped);
+	auto height = st.padding.top() + st.thumbSize + st.padding.bottom();
 	if (!last) {
 		if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
 			auto captionw = width
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.h b/Telegram/SourceFiles/history/view/media/history_view_document.h
index c3f8b03c1..3b70a2c5b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.h
@@ -134,10 +134,11 @@ private:
 	bool updateStatusText() const; // returns showPause
 
 	[[nodiscard]] bool downloadInCorner() const;
-	void drawCornerDownload(Painter &p, bool selected) const;
+	void drawCornerDownload(Painter &p, bool selected, LayoutMode mode) const;
 	[[nodiscard]] TextState cornerDownloadTextState(
 		QPoint point,
-		StateRequest request) const;
+		StateRequest request,
+		LayoutMode mode) const;
 
 	not_null<DocumentData*> _data;
 	mutable std::shared_ptr<Data::DocumentMedia> _dataMedia;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index fed2eb912..c3475a97f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -471,7 +471,8 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 			: (radial && loaded)
 			? _animation->radial.opacity()
 			: 1.;
-		auto inner = QRect(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+		const auto innerSize = st::msgFileLayout.thumbSize;
+		auto inner = QRect(rthumb.x() + (rthumb.width() - innerSize) / 2, rthumb.y() + (rthumb.height() - innerSize) / 2, innerSize, innerSize);
 		p.setPen(Qt::NoPen);
 		if (selected) {
 			p.setBrush(st::msgDateImgBgSelected);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
index b4b449273..fb6939045 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -148,6 +148,10 @@ QSize GroupedMedia::countOptimalSize() {
 			minHeight += st::msgPadding.bottom();
 		}
 	}
+
+	const auto groupPadding = groupedPadding();
+	minHeight += groupPadding.top() + groupPadding.bottom();
+
 	return { maxWidth, minHeight };
 }
 
@@ -207,6 +211,9 @@ QSize GroupedMedia::countCurrentSize(int newWidth) {
 		}
 	}
 
+	const auto groupPadding = groupedPadding();
+	newHeight += groupPadding.top() + groupPadding.bottom();
+
 	return { newWidth, newHeight };
 }
 
@@ -228,11 +235,26 @@ RectParts GroupedMedia::cornersFromSides(RectParts sides) const {
 	return result;
 }
 
+QMargins GroupedMedia::groupedPadding() const {
+	if (_mode != Mode::Column) {
+		return QMargins();
+	}
+	const auto normal = st::msgFileLayout.padding;
+	const auto grouped = st::msgFileLayoutGrouped.padding;
+	const auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
+	return QMargins(
+		0,
+		(normal.top() - grouped.top()) - topMinus,
+		0,
+		(normal.bottom() - grouped.bottom()));
+}
+
 void GroupedMedia::draw(
 		Painter &p,
 		const QRect &clip,
 		TextSelection selection,
 		crl::time ms) const {
+	const auto groupPadding = groupedPadding();
 	for (auto i = 0, count = int(_parts.size()); i != count; ++i) {
 		const auto &part = _parts[i];
 		const auto partSelection = (selection == FullSelection)
@@ -246,7 +268,7 @@ void GroupedMedia::draw(
 			clip,
 			partSelection,
 			ms,
-			part.geometry,
+			part.geometry.translated(0, groupPadding.top()),
 			part.sides,
 			cornersFromSides(part.sides),
 			&part.cacheKey,
@@ -260,6 +282,7 @@ void GroupedMedia::draw(
 		const auto captionw = width() - st::msgPadding.left() - st::msgPadding.right();
 		const auto outbg = _parent->hasOutLayout();
 		const auto captiony = height()
+			- groupPadding.bottom()
 			- (isBubbleBottom() ? st::msgPadding.bottom() : 0)
 			- _caption.countHeight(captionw);
 		p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
@@ -303,6 +326,8 @@ PointState GroupedMedia::pointState(QPoint point) const {
 	if (!QRect(0, 0, width(), height()).contains(point)) {
 		return PointState::Outside;
 	}
+	const auto groupPadding = groupedPadding();
+	point -=  QPoint(0, groupPadding.top());
 	for (const auto &part : _parts) {
 		if (part.geometry.contains(point)) {
 			return PointState::GroupPart;
@@ -312,10 +337,12 @@ PointState GroupedMedia::pointState(QPoint point) const {
 }
 
 TextState GroupedMedia::textState(QPoint point, StateRequest request) const {
-	auto result = getPartState(point, request);
+	const auto groupPadding = groupedPadding();
+	auto result = getPartState(point - QPoint(0, groupPadding.top()), request);
 	if (!result.link && !_caption.isEmpty()) {
 		const auto captionw = width() - st::msgPadding.left() - st::msgPadding.right();
 		const auto captiony = height()
+			- groupPadding.bottom()
 			- (isBubbleBottom() ? st::msgPadding.bottom() : 0)
 			- _caption.countHeight(captionw);
 		if (QRect(st::msgPadding.left(), captiony, captionw, height() - captiony).contains(point)) {
@@ -395,6 +422,14 @@ auto GroupedMedia::getBubbleSelectionIntervals(
 			last = BubbleSelectionInterval{ newTop, newHeight };
 		}
 	}
+	const auto groupPadding = groupedPadding();
+	for (auto &part : result) {
+		part.top += groupPadding.top();
+	}
+	if (IsGroupItemSelection(selection, 0)) {
+		result.front().top -= groupPadding.top();
+		result.front().height += groupPadding.top();
+	}
 	if (IsGroupItemSelection(selection, _parts.size() - 1)) {
 		result.back().height = height() - result.back().top;
 	}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
index 29b1eaedf..615c03772 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
@@ -139,6 +139,7 @@ private:
 		StateRequest request) const;
 
 	[[nodiscard]] RectParts cornersFromSides(RectParts sides) const;
+	[[nodiscard]] QMargins groupedPadding() const;
 
 	Ui::Text::String _caption;
 	std::vector<Part> _parts;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index 7025dea4e..6d04b23f5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -279,7 +279,8 @@ void Photo::draw(Painter &p, const QRect &r, TextSelection selection, crl::time
 		const auto radialOpacity = (radial && loaded && !_data->uploading())
 			? _animation->radial.opacity() :
 			1.;
-		QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+		const auto innerSize = st::msgFileLayout.thumbSize;
+		QRect inner(rthumb.x() + (rthumb.width() - innerSize) / 2, rthumb.y() + (rthumb.height() - innerSize) / 2, innerSize, innerSize);
 		p.setPen(Qt::NoPen);
 		if (selected) {
 			p.setBrush(st::msgDateImgBgSelected);
@@ -389,7 +390,8 @@ void Photo::paintUserpicFrame(
 	p.drawPixmap(rect, pix);
 
 	if (_data->videoCanBePlayed() && !_streamed) {
-		auto inner = QRect(rect.x() + (rect.width() - st::msgFileSize) / 2, rect.y() + (rect.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+		const auto innerSize = st::msgFileLayout.thumbSize;
+		auto inner = QRect(rect.x() + (rect.width() - innerSize) / 2, rect.y() + (rect.height() - innerSize) / 2, innerSize, innerSize);
 		p.setPen(Qt::NoPen);
 		if (selected) {
 			p.setBrush(st::msgDateImgBgSelected);
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index f6055a7fb..43938b0c4 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -156,7 +156,8 @@ void ThemeDocument::draw(Painter &p, const QRect &r, TextSelection selection, cr
 		const auto radialOpacity = (radial && loaded && !_data->uploading())
 			? _animation->radial.opacity() :
 			1.;
-		QRect inner(rthumb.x() + (rthumb.width() - st::msgFileSize) / 2, rthumb.y() + (rthumb.height() - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+		const auto innerSize = st::msgFileLayout.thumbSize;
+		QRect inner(rthumb.x() + (rthumb.width() - innerSize) / 2, rthumb.y() + (rthumb.height() - innerSize) / 2, innerSize, innerSize);
 		p.setPen(Qt::NoPen);
 		if (selected) {
 			p.setBrush(st::msgDateImgBgSelected);
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
index c36ac5937..df750a65e 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@@ -207,7 +207,8 @@ void Gif::paint(Painter &p, const QRect &clip, const PaintContext *context) cons
 			}
 			return &st::historyFileInDownload;
 		}();
-		QRect inner((_width - st::msgFileSize) / 2, (height - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+		const auto size = st::inlineRadialSize;
+		QRect inner((_width - size) / 2, (height - size) / 2, size, size);
 		icon->paintInCenter(p, inner);
 		if (radial) {
 			p.setOpacity(1);
@@ -818,8 +819,8 @@ void CancelFileClickHandler::onClickImpl() const {
 
 File::File(not_null<Context*> context, not_null<Result*> result)
 : FileBase(context, result)
-, _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::msgFileSize - st::inlineThumbSkip)
-, _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::msgFileSize - st::inlineThumbSkip)
+, _title(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineFileSize - st::inlineThumbSkip)
+, _description(st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft - st::inlineFileSize - st::inlineThumbSkip)
 , _open(std::make_shared<OpenFileClickHandler>(result))
 , _cancel(std::make_shared<CancelFileClickHandler>(result))
 , _document(getShownDocument()) {
@@ -835,7 +836,7 @@ File::File(not_null<Context*> context, not_null<Result*> result)
 
 void File::initDimensions() {
 	_maxw = st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft;
-	int textWidth = _maxw - (st::msgFileSize + st::inlineThumbSkip);
+	int textWidth = _maxw - (st::inlineFileSize + st::inlineThumbSkip);
 
 	TextParseOptions titleOpts = { 0, _maxw, st::semiboldFont->height, Qt::LayoutDirectionAuto };
 	_title.setText(st::semiboldTextStyle, TextUtilities::SingleLine(_result->getLayoutTitle()), titleOpts);
@@ -843,12 +844,12 @@ void File::initDimensions() {
 	TextParseOptions descriptionOpts = { TextParseMultiline, _maxw, st::normalFont->height, Qt::LayoutDirectionAuto };
 	_description.setText(st::defaultTextStyle, _result->getLayoutDescription(), descriptionOpts);
 
-	_minh = st::msgFileSize;
+	_minh = st::inlineFileSize;
 	_minh += st::inlineRowMargin * 2 + st::inlineRowBorder;
 }
 
 void File::paint(Painter &p, const QRect &clip, const PaintContext *context) const {
-	const auto left = st::msgFileSize + st::inlineThumbSkip;
+	const auto left = st::inlineFileSize + st::inlineThumbSkip;
 
 	ensureDataMediaCreated();
 	const auto loaded = _documentMedia->loaded();
@@ -862,7 +863,7 @@ void File::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 	const auto showPause = updateStatusText();
 	const auto radial = isRadialAnimation();
 
-	auto inner = style::rtlrect(0, st::inlineRowMargin, st::msgFileSize, st::msgFileSize, _width);
+	auto inner = style::rtlrect(0, st::inlineRowMargin, st::inlineFileSize, st::inlineFileSize, _width);
 	p.setPen(Qt::NoPen);
 	if (isThumbAnimation()) {
 		auto over = _animation->a_thumbOver.value(1.);
@@ -926,10 +927,10 @@ void File::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 TextState File::getState(
 		QPoint point,
 		StateRequest request) const {
-	if (QRect(0, st::inlineRowMargin, st::msgFileSize, st::msgFileSize).contains(point)) {
+	if (QRect(0, st::inlineRowMargin, st::inlineFileSize, st::inlineFileSize).contains(point)) {
 		return { nullptr, _document->loading() ? _cancel : _open };
 	} else {
-		auto left = st::msgFileSize + st::inlineThumbSkip;
+		auto left = st::inlineFileSize + st::inlineThumbSkip;
 		if (QRect(left, 0, _width - left, _height).contains(point)) {
 			return { nullptr, _send };
 		}
@@ -1070,16 +1071,16 @@ void Contact::initDimensions() {
 	_description.setText(st::defaultTextStyle, _result->getLayoutDescription(), descriptionOpts);
 	int32 descriptionHeight = qMin(_description.countHeight(_maxw), st::normalFont->height);
 
-	_minh = st::msgFileSize;
+	_minh = st::inlineFileSize;
 	_minh += st::inlineRowMargin * 2 + st::inlineRowBorder;
 }
 
 void Contact::paint(Painter &p, const QRect &clip, const PaintContext *context) const {
 	int32 left = st::emojiPanHeaderLeft - st::inlineResultsLeft;
 
-	left = st::msgFileSize + st::inlineThumbSkip;
-	prepareThumbnail(st::msgFileSize, st::msgFileSize);
-	QRect rthumb(style::rtlrect(0, st::inlineRowMargin, st::msgFileSize, st::msgFileSize, _width));
+	left = st::inlineFileSize + st::inlineThumbSkip;
+	prepareThumbnail(st::inlineFileSize, st::inlineFileSize);
+	QRect rthumb(style::rtlrect(0, st::inlineRowMargin, st::inlineFileSize, st::inlineFileSize, _width));
 	p.drawPixmapLeft(rthumb.topLeft(), _width, _thumb);
 
 	int titleTop = st::inlineRowMargin + st::inlineRowFileNameTop;
@@ -1099,8 +1100,8 @@ void Contact::paint(Painter &p, const QRect &clip, const PaintContext *context)
 TextState Contact::getState(
 		QPoint point,
 		StateRequest request) const {
-	if (!QRect(0, st::inlineRowMargin, st::msgFileSize, st::inlineThumbSize).contains(point)) {
-		auto left = (st::msgFileSize + st::inlineThumbSkip);
+	if (!QRect(0, st::inlineRowMargin, st::inlineFileSize, st::inlineThumbSize).contains(point)) {
+		auto left = (st::inlineFileSize + st::inlineThumbSkip);
 		if (QRect(left, 0, _width - left, _height).contains(point)) {
 			return { nullptr, _send };
 		}
@@ -1414,7 +1415,7 @@ void Game::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 
 	if (radial) {
 		p.fillRect(rthumb, st::msgDateImgBg);
-		QRect inner((st::inlineThumbSize - st::msgFileSize) / 2, (st::inlineThumbSize - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+		QRect inner((st::inlineThumbSize - st::inlineRadialSize) / 2, (st::inlineThumbSize - st::inlineRadialSize) / 2, st::inlineRadialSize, st::inlineRadialSize);
 		if (radial) {
 			p.setOpacity(1);
 			QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
index 98b93813d..3154bc41b 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp
@@ -112,10 +112,11 @@ void AlbumPreview::prepareThumbs(gsl::span<Ui::PreparedFile> items) {
 		_thumbs
 	) | ranges::view::transform([](const auto &thumb) {
 		return thumb->photoHeight();
-	}), 0) + (count - 1) * st::sendMediaPreviewPhotoSkip;
+	}), 0) + (count - 1) * st::sendMediaRowSkip;
 
-	_filesHeight = count * st::sendMediaFileThumbSize
-		+ (count - 1) * st::sendMediaFileThumbSkip;
+	const auto &st = st::attachPreviewThumbLayout;
+	_filesHeight = count * st.thumbSize
+		+ (count - 1) * st::sendMediaRowSkip;
 }
 
 int AlbumPreview::contentLeft() const {
@@ -131,16 +132,14 @@ AlbumThumbnail *AlbumPreview::findThumb(QPoint position) const {
 
 	auto top = 0;
 	const auto isPhotosWay = _sendWay.sendImagesAsPhotos();
-	const auto skip = isPhotosWay
-		? st::sendMediaPreviewPhotoSkip
-		: st::sendMediaFileThumbSkip;
+	const auto skip = st::sendMediaRowSkip;
 	auto find = [&](const auto &thumb) {
 		if (_sendWay.groupFiles() && _sendWay.sendImagesAsPhotos()) {
 			return thumb->containsPoint(position);
 		} else {
 			const auto bottom = top + (isPhotosWay
 				? thumb->photoHeight()
-				: st::sendMediaFileThumbSize);
+				: st::attachPreviewThumbLayout.thumbSize);
 			const auto isUnderTop = (position.y() > top);
 			top = bottom + skip;
 			return isUnderTop && (position.y() < bottom);
@@ -304,7 +303,7 @@ void AlbumPreview::paintPhotos(Painter &p, QRect clip) const {
 	for (const auto &thumb : _thumbs) {
 		const auto bottom = top + thumb->photoHeight();
 		const auto guard = gsl::finally([&] {
-			top = bottom + st::sendMediaPreviewPhotoSkip;
+			top = bottom + st::sendMediaRowSkip;
 		});
 		if (top >= clip.y() + clip.height()) {
 			break;
@@ -316,8 +315,8 @@ void AlbumPreview::paintPhotos(Painter &p, QRect clip) const {
 }
 
 void AlbumPreview::paintFiles(Painter &p, QRect clip) const {
-	const auto fileHeight = st::sendMediaFileThumbSize
-		+ st::sendMediaFileThumbSkip;
+	const auto fileHeight = st::attachPreviewThumbLayout.thumbSize
+		+ st::sendMediaRowSkip;
 	const auto bottom = clip.y() + clip.height();
 	const auto from = std::clamp(clip.y() / fileHeight, 0, int(_thumbs.size()));
 	const auto till = std::clamp((bottom + fileHeight - 1) / fileHeight, 0, int(_thumbs.size()));
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
index 136a1db7e..fdbc47c77 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
@@ -52,7 +52,8 @@ AlbumThumbnail::AlbumThumbnail(
 		imageWidth,
 		imageHeight));
 
-	const auto idealSize = st::sendMediaFileThumbSize * style::DevicePixelRatio();
+	const auto &st = st::attachPreviewThumbLayout;
+	const auto idealSize = st.thumbSize * style::DevicePixelRatio();
 	const auto fileThumbSize = (previewWidth > previewHeight)
 		? QSize(previewWidth * idealSize / previewHeight, idealSize)
 		: QSize(idealSize, previewHeight * idealSize / previewWidth);
@@ -61,13 +62,13 @@ AlbumThumbnail::AlbumThumbnail(
 		fileThumbSize.width(),
 		fileThumbSize.height(),
 		Option::RoundedSmall | Option::RoundedAll,
-		st::sendMediaFileThumbSize,
-		st::sendMediaFileThumbSize
+		st.thumbSize,
+		st.thumbSize
 	));
 
 	const auto availableFileWidth = st::sendMediaPreviewSize
-		- st::sendMediaFileThumbSkip
-		- st::sendMediaFileThumbSize
+		- st.thumbSize
+		- st.padding.right()
 		// Right buttons.
 		- st::sendBoxAlbumGroupButtonFile.width * 2
 		- st::sendBoxAlbumGroupEditInternalSkip * 2
@@ -124,8 +125,8 @@ void AlbumThumbnail::updateFileRow(int row) {
 	_editMedia->show();
 	_deleteMedia->show();
 
-	const auto fileHeight = st::sendMediaFileThumbSize
-		+ st::sendMediaFileThumbSkip;
+	const auto fileHeight = st::attachPreviewThumbLayout.thumbSize
+		+ st::sendMediaRowSkip;
 
 	const auto top = row * fileHeight + st::sendBoxFileGroupSkipTop;
 	const auto size = st::editMediaButtonSize;
@@ -213,11 +214,12 @@ void AlbumThumbnail::paintInAlbum(
 		p.drawPixmap(x, y, _albumImage);
 	}
 	if (_isVideo) {
+		const auto innerSize = st::msgFileLayout.thumbSize;
 		const auto inner = QRect(
-			x + (geometry.width() - st::msgFileSize) / 2,
-			y + (geometry.height() - st::msgFileSize) / 2,
-			st::msgFileSize,
-			st::msgFileSize);
+			x + (geometry.width() - innerSize) / 2,
+			y + (geometry.height() - innerSize) / 2,
+			innerSize,
+			innerSize);
 		{
 			PainterHighQualityEnabler hq(p);
 			p.setPen(Qt::NoPen);
@@ -394,16 +396,15 @@ void AlbumThumbnail::paintPhoto(Painter &p, int left, int top, int outerWidth) {
 }
 
 void AlbumThumbnail::paintFile(Painter &p, int left, int top, int outerWidth) {
-	const auto textLeft = left
-		+ st::sendMediaFileThumbSize
-		+ st::sendMediaFileThumbSkip;
+	const auto &st = st::attachPreviewThumbLayout;
+	const auto textLeft = left + st.thumbSize + st.padding.right();
 
 	p.drawPixmap(left, top, _fileThumb);
 	p.setFont(st::semiboldFont);
 	p.setPen(st::historyFileNameInFg);
 	p.drawTextLeft(
 		textLeft,
-		top + st::sendMediaFileNameTop,
+		top + st.nameTop,
 		outerWidth,
 		_name,
 		_nameWidth);
@@ -411,7 +412,7 @@ void AlbumThumbnail::paintFile(Painter &p, int left, int top, int outerWidth) {
 	p.setPen(st::mediaInFg);
 	p.drawTextLeft(
 		textLeft,
-		top + st::sendMediaFileStatusTop,
+		top + st.statusTop,
 		outerWidth,
 		_status,
 		_statusWidth);
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index 220d65c1a..83cfc5ec5 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -126,6 +126,34 @@ bool PreparedList::canAddCaption(bool sendingAlbum) const {
 	return !hasFiles && !hasNotGrouped;
 }
 
+bool PreparedList::hasGroupOption(bool slowmode) const {
+	if (slowmode || files.size() < 2) {
+		return false;
+	}
+	using Type = PreparedFile::AlbumType;
+	auto lastType = Type::None;
+	for (const auto &file : files) {
+		if ((file.type == lastType)
+			|| (file.type == Type::Video && lastType == Type::Photo)
+			|| (file.type == Type::Photo && lastType == Type::Video)
+			|| (file.type == Type::File && lastType == Type::Photo)
+			|| (file.type == Type::Photo && lastType == Type::File)) {
+			if (lastType != Type::None) {
+				return true;
+			}
+		}
+		lastType = file.type;
+	}
+	return false;
+}
+
+bool PreparedList::hasSendImagesAsPhotosOption(bool slowmode) const {
+	using Type = PreparedFile::AlbumType;
+	return slowmode
+		? ((files.size() == 1) && (files.front().type == Type::Photo))
+		: ranges::contains(files, Type::Photo, &PreparedFile::type);
+}
+
 int MaxAlbumItems() {
 	return kMaxAlbumCount;
 }
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index 94146796d..ceceb9d71 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -92,6 +92,9 @@ struct PreparedList {
 	[[nodiscard]] bool canBeSentInSlowmodeWith(
 		const PreparedList &other) const;
 
+	[[nodiscard]] bool hasGroupOption(bool slowmode) const;
+	[[nodiscard]] bool hasSendImagesAsPhotosOption(bool slowmode) const;
+
 	Error error = Error::None;
 	QString errorData;
 	std::vector<PreparedFile> files;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
index ab8baddfa..480044c6e 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
@@ -32,10 +32,10 @@ SingleFilePreview::SingleFilePreview(
 	_editMedia->setIconOverride(&st::sendBoxAlbumGroupEditButtonIconFile);
 	_deleteMedia->setIconOverride(&st::sendBoxAlbumGroupDeleteButtonIconFile);
 
-	const auto h = _fileThumb.isNull()
-		? st::msgFileSize
-		: st::sendMediaFileThumbSize;
-	resize(width(), h);
+	const auto &st = _fileThumb.isNull()
+		? st::attachPreviewLayout
+		: st::attachPreviewThumbLayout;
+	resize(width(), st.thumbSize);
 }
 
 SingleFilePreview::~SingleFilePreview() = default;
@@ -57,10 +57,10 @@ void SingleFilePreview::prepareThumb(const QImage &preview) {
 
 	auto originalWidth = preview.width();
 	auto originalHeight = preview.height();
-	auto thumbWidth = st::sendMediaFileThumbSize;
+	const auto &st = st::attachPreviewThumbLayout;
+	auto thumbWidth = st.thumbSize;
 	if (originalWidth > originalHeight) {
-		thumbWidth = (originalWidth * st::sendMediaFileThumbSize)
-			/ originalHeight;
+		thumbWidth = (originalWidth * st.thumbSize) / originalHeight;
 	}
 	auto options = Images::Option::Smooth
 		| Images::Option::RoundedSmall
@@ -73,8 +73,8 @@ void SingleFilePreview::prepareThumb(const QImage &preview) {
 		thumbWidth * style::DevicePixelRatio(),
 		0,
 		options,
-		st::sendMediaFileThumbSize,
-		st::sendMediaFileThumbSize));
+		st.thumbSize,
+		st.thumbSize));
 }
 
 void SingleFilePreview::preparePreview(const PreparedFile &file) {
@@ -117,9 +117,15 @@ void SingleFilePreview::preparePreview(const PreparedFile &file) {
 		_name = ComposeNameString(filename, songTitle, songPerformer);
 		_statusText = FormatSizeText(fileinfo.size());
 	}
+	const auto &st = _fileThumb.isNull()
+		? st::attachPreviewLayout
+		: st::attachPreviewThumbLayout;
+	const auto nameleft = st.thumbSize + st.padding.right();
+	const auto nametop = st.nameTop;
+	const auto statustop = st.statusTop;
 	const auto availableFileWidth = st::sendMediaPreviewSize
-		- st::sendMediaFileThumbSkip
-		- st::sendMediaFileThumbSize
+		- st.thumbSize
+		- st.padding.right()
 		// Right buttons.
 		- st::sendBoxAlbumGroupButtonFile.width * 2
 		- st::sendBoxAlbumGroupEditInternalSkip * 2
@@ -139,21 +145,17 @@ void SingleFilePreview::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
 	auto w = width() - st::boxPhotoPadding.left() - st::boxPhotoPadding.right();
-	auto h = _fileThumb.isNull() ? st::msgFileSize : st::sendMediaFileThumbSize;
-	auto nameleft = 0, nametop = 0, statustop = 0;
-	if (_fileThumb.isNull()) {
-		nameleft = st::msgFileSize + st::msgFilePadding.right();
-		nametop = st::msgFileNameTop - st::msgFilePadding.top();
-		statustop = st::msgFileStatusTop - st::msgFilePadding.top();
-	} else {
-		nameleft = st::sendMediaFileThumbSize + st::sendMediaFileThumbSkip;
-		nametop = st::sendMediaFileNameTop;
-		statustop = st::sendMediaFileStatusTop;
-	}
+	auto h = height();
+	const auto &st = _fileThumb.isNull()
+		? st::attachPreviewLayout
+		: st::attachPreviewThumbLayout;
+	const auto nameleft = st.thumbSize + st.padding.right();
+	const auto nametop = st.nameTop;
+	const auto statustop = st.statusTop;
 	const auto x = (width() - w) / 2, y = 0;
 
 	if (_fileThumb.isNull()) {
-		QRect inner(style::rtlrect(x, y, st::msgFileSize, st::msgFileSize, width()));
+		QRect inner(style::rtlrect(x, y, st.thumbSize, st.thumbSize, width()));
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::msgFileInBg);
 
@@ -169,7 +171,7 @@ void SingleFilePreview::paintEvent(QPaintEvent *e) {
 			: st::historyFileInDocument;
 		icon.paintInCenter(p, inner);
 	} else {
-		QRect rthumb(style::rtlrect(x, y, st::sendMediaFileThumbSize, st::sendMediaFileThumbSize, width()));
+		QRect rthumb(style::rtlrect(x, y, st.thumbSize, st.thumbSize, width()));
 		p.drawPixmap(rthumb.topLeft(), _fileThumb);
 	}
 	p.setFont(st::semiboldFont);
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
index 5af943389..199ca9844 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
@@ -240,7 +240,8 @@ void SingleMediaPreview::paintEvent(QPaintEvent *e) {
 		p.drawPixmap(_previewLeft, 0, _preview);
 	}
 	if (_animated && !_gifPreview && !_lottiePreview) {
-		auto inner = QRect(_previewLeft + (_previewWidth - st::msgFileSize) / 2, (_previewHeight - st::msgFileSize) / 2, st::msgFileSize, st::msgFileSize);
+		const auto innerSize = st::msgFileLayout.thumbSize;
+		auto inner = QRect(_previewLeft + (_previewWidth - innerSize) / 2, (_previewHeight - innerSize) / 2, innerSize, innerSize);
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::msgDateImgBg);
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 4364fca61..8bc2f2200 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -472,16 +472,52 @@ historyCallStatusTop: 29px;
 historyCallStatusSkip: 4px;
 historyCallArrowPosition: point(-1px, 1px);
 
+HistoryFileLayout {
+	padding: margins;
+	nameTop: pixels;
+	statusTop: pixels;
+	linkTop: pixels;
+	thumbSize: pixels;
+}
+
+msgFileLayout: HistoryFileLayout {
+	padding: margins(14px, 10px, 11px, 10px);
+	nameTop: 16px;
+	statusTop: 37px;
+	thumbSize: 44px;
+}
+msgFileThumbLayout: HistoryFileLayout {
+	padding: margins(10px, 10px, 14px, 10px);
+	nameTop: 12px;
+	statusTop: 32px;
+	linkTop: 60px;
+	thumbSize: 72px;
+}
+msgFileLayoutGrouped: HistoryFileLayout(msgFileLayout) {
+	padding: margins(14px, 7px, 11px, 7px);
+	nameTop: 13px;
+	statusTop: 34px;
+}
+msgFileThumbLayoutGrouped: HistoryFileLayout(msgFileThumbLayout) {
+	padding: margins(10px, 7px, 14px, 7px);
+	nameTop: 9px;
+	statusTop: 29px;
+	linkTop: 57px;
+}
+attachPreviewLayout: HistoryFileLayout {
+	padding: margins(0px, 0px, 11px, 0px);
+	nameTop: 6px;
+	statusTop: 27px;
+	thumbSize: 44px;
+}
+attachPreviewThumbLayout: HistoryFileLayout {
+	padding: margins(0px, 0px, 10px, 0px);
+	nameTop: 7px;
+	statusTop: 37px;
+	thumbSize: 64px;
+}
+
 msgFileMenuSize: size(36px, 36px);
-msgFileSize: 44px;
-msgFilePadding: margins(14px, 12px, 11px, 12px);
-msgFileThumbSize: 72px;
-msgFileThumbPadding: margins(10px, 10px, 14px, 10px);
-msgFileThumbNameTop: 12px;
-msgFileThumbStatusTop: 32px;
-msgFileThumbLinkTop: 60px;
-msgFileNameTop: 16px;
-msgFileStatusTop: 37px;
 msgFileMinWidth: 268px;
 msgFileTopMinus: 6px;
 
@@ -653,7 +689,7 @@ historyGroupAboutHeaderSkip: 10px;
 historyGroupAboutTextSkip: 10px;
 historyGroupAboutSkip: 8px;
 
-historyVideoDownloadSize: msgFileSize;
+historyVideoDownloadSize: 44px;
 historyVideoMuteSize: 22px;
 historyVideoCancel: icon {{ "playlist_cancel", historyFileThumbIconFg }};
 historyVideoCancelSelected: icon {{ "playlist_cancel", historyFileThumbIconFgSelected }};
diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
index c8737cd2f..6743916ea 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
@@ -245,12 +245,13 @@ void Generator::addAudioBubble(QVector<int> waveform, int waveactive, QString wa
 
 	auto width = st::msgFileMinWidth;
 	auto tleft = 0, tright = 0;
-	tleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
-	tright = st::msgFileThumbPadding.left();
+	const auto &st = st::msgFileLayout;
+	tleft = st.padding.left() + st.thumbSize + st.padding.right();
+	tright = st.padding.left();
 	accumulate_max(width, tleft + st::normalFont->width(wavestatus) + skipBlock.width() + st::msgPadding.right());
 	accumulate_min(width, st::msgMaxWidth);
 
-	auto height = st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom();
+	auto height = st.padding.top() + st.thumbSize + st.padding.bottom();
 	addBubble(std::move(bubble), width, height, date, status);
 }
 
@@ -763,13 +764,14 @@ void Generator::paintBubble(const Bubble &bubble) {
 		_p->setFont(st::msgFont);
 		bubble.text.draw(*_p, trect.x(), trect.y(), trect.width());
 	} else if (!bubble.waveform.isEmpty()) {
-		auto nameleft = x + st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
-		auto nametop = y + st::msgFileNameTop;
-		auto nameright = st::msgFilePadding.left();
-		auto statustop = y + st::msgFileStatusTop;
-		auto bottom = y + st::msgFilePadding.top() + st::msgFileSize + st::msgFilePadding.bottom();
+		const auto &st = st::msgFileLayout;
+		auto nameleft = x + st.padding.left() + st.thumbSize + st.padding.right();
+		auto nametop = y + st.nameTop;
+		auto nameright = st.padding.left();
+		auto statustop = y + st.statusTop;
+		auto bottom = y + st.padding.top() + st.thumbSize + st.padding.bottom();
 
-		auto inner = style::rtlrect(x + st::msgFilePadding.left(), y + st::msgFilePadding.top(), st::msgFileSize, st::msgFileSize, _rect.width());
+		auto inner = style::rtlrect(x + st.padding.left(), y + st.padding.top(), st.thumbSize, st.thumbSize, _rect.width());
 		_p->setPen(Qt::NoPen);
 		_p->setBrush(bubble.outbg ? st::msgFileOutBg[_palette] : st::msgFileInBg[_palette]);
 
@@ -790,7 +792,7 @@ void Generator::paintBubble(const Bubble &bubble) {
 		auto bar_count = qMin(availw / (st::msgWaveformBar + st::msgWaveformSkip), wf_size);
 		auto max_value = 0;
 		auto max_delta = st::msgWaveformMax - st::msgWaveformMin;
-		auto wave_bottom = y + st::msgFilePadding.top() + st::msgWaveformMax;
+		auto wave_bottom = y + st::msgFileLayout.padding.top() + st::msgWaveformMax;
 		_p->setPen(Qt::NoPen);
 		auto norm_value = uchar(31);
 		for (auto i = 0, bar_x = 0, sum_i = 0; i < wf_size; ++i) {

From c4af731b194d2cfe889fc6faf080475ee102a9ab Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 20 Oct 2020 09:55:22 +0300
Subject: [PATCH 107/190] Wrap messageActionGeoProximityReached service
 message.

---
 Telegram/Resources/langs/lang.strings         |  7 +++
 .../export/data/export_data_types.cpp         |  6 ++
 .../export/data/export_data_types.h           |  2 +
 .../export/output/export_output_html.cpp      | 20 ++++++-
 .../export/output/export_output_json.cpp      | 14 ++++-
 .../SourceFiles/history/history_service.cpp   | 57 ++++++++++++++++++-
 .../ui/chat/attach/attach_album_thumbnail.cpp |  5 --
 .../attach/attach_single_file_preview.cpp     |  5 --
 8 files changed, 101 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 6a939ec7e..55fe15cf6 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1105,6 +1105,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_secure_proof_of_address" = "proof of address";
 "lng_action_secure_phone" = "phone number";
 "lng_action_secure_email" = "email address";
+"lng_action_proximity_reached" = "{from} is now within {distance} from {user}";
+"lng_action_proximity_reached_you" = "{from} is now within {distance} from you";
+"lng_action_you_proximity_reached" = "You are now within {distance} from {user}";
+"lng_action_proximity_distance_m#one" = "{count} meter";
+"lng_action_proximity_distance_m#other" = "{count} metres";
+"lng_action_proximity_distance_km#one" = "{count} km";
+"lng_action_proximity_distance_km#other" = "{count} km";
 
 "lng_ttl_photo_received" = "{from} sent you a self-destructing photo. Please view it on your mobile.";
 "lng_ttl_photo_sent" = "You sent a self-destructing photo.";
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index 3819cbec1..bbe8522cb 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -1097,7 +1097,13 @@ ServiceAction ParseServiceAction(
 	}, [&](const MTPDmessageActionGeoProximityReached &data) {
 		auto content = ActionGeoProximityReached();
 		content.fromId = ParsePeerId(data.vfrom_id());
+		if (content.fromId == context.selfPeerId) {
+			content.fromSelf = true;
+		}
 		content.toId = ParsePeerId(data.vto_id());
+		if (content.toId == context.selfPeerId) {
+			content.toSelf = true;
+		}
 		content.distance = data.vdistance().v;
 		result.content = content;
 	}, [](const MTPDmessageActionEmpty &data) {});
diff --git a/Telegram/SourceFiles/export/data/export_data_types.h b/Telegram/SourceFiles/export/data/export_data_types.h
index 70fbf56af..8454d58c5 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.h
+++ b/Telegram/SourceFiles/export/data/export_data_types.h
@@ -454,6 +454,8 @@ struct ActionGeoProximityReached {
 	PeerId fromId = 0;
 	PeerId toId = 0;
 	int distance = 0;
+	bool fromSelf = false;
+	bool toSelf = false;
 };
 
 struct ServiceAction {
diff --git a/Telegram/SourceFiles/export/output/export_output_html.cpp b/Telegram/SourceFiles/export/output/export_output_html.cpp
index c527decca..6684724f9 100644
--- a/Telegram/SourceFiles/export/output/export_output_html.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_html.cpp
@@ -1093,7 +1093,25 @@ auto HtmlWriter::Wrap::pushMessage(
 	}, [&](const ActionContactSignUp &data) {
 		return serviceFrom + " joined Telegram";
 	}, [&](const ActionGeoProximityReached &data) {
-		return serviceFrom + " reached"; // #TODO files distance from to
+		const auto fromName = peers.wrapPeerName(data.fromId);
+		const auto toName = peers.wrapPeerName(data.toId);
+		const auto distance = [&]() -> QString {
+			if (data.distance >= 1000) {
+				const auto km = (10 * (data.distance / 10)) / 1000.;
+				return QString::number(km) + " km";
+			} else if (data.distance == 1) {
+				return "1 meter";
+			} else {
+				return QString::number(data.distance) + " meters";
+			}
+		}().toUtf8();
+		if (data.fromSelf) {
+			return "You are now within " + distance + " from " + toName;
+		} else if (data.toSelf) {
+			return fromName + " is now within " + distance + " from you";
+		} else {
+			return fromName + " is now within " + distance + " from " + toName;
+		}
 	}, [&](const ActionPhoneNumberRequest &data) {
 		return serviceFrom + " requested your phone number";
 	}, [](v::null_t) { return QByteArray(); });
diff --git a/Telegram/SourceFiles/export/output/export_output_json.cpp b/Telegram/SourceFiles/export/output/export_output_json.cpp
index 20d6169b5..f079b017d 100644
--- a/Telegram/SourceFiles/export/output/export_output_json.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_json.cpp
@@ -296,7 +296,7 @@ QByteArray SerializeMessage(
 	const auto pushFrom = [&](const QByteArray &label = "from") {
 		if (message.fromId) {
 			pushBare(label, wrapPeerName(message.fromId));
-			push(label+"_id", message.fromId);
+			push(label + "_id", message.fromId);
 		}
 	};
 	const auto pushReplyToMsgId = [&](
@@ -474,8 +474,16 @@ QByteArray SerializeMessage(
 		pushActor();
 		pushAction("joined_telegram");
 	}, [&](const ActionGeoProximityReached &data) {
-		pushActor();
-		pushAction("proximity_reached"); // #TODO files distance from to
+		pushAction("proximity_reached");
+		if (data.fromId) {
+			pushBare("from", wrapPeerName(data.fromId));
+			push("from_id", data.fromId);
+		}
+		if (data.toId) {
+			pushBare("to", wrapPeerName(data.toId));
+			push("to_id", data.toId);
+		}
+		push("distance", data.distance);
 	}, [&](const ActionPhoneNumberRequest &data) {
 		pushActor();
 		pushAction("requested_phone_number");
diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index 70b50a101..b21206af7 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -219,6 +219,61 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 		return result;
 	};
 
+	auto prepareProximityReached = [this](const MTPDmessageActionGeoProximityReached &action) {
+		auto result = PreparedText{};
+		const auto fromId = peerFromMTP(action.vfrom_id());
+		const auto fromPeer = history()->owner().peer(fromId);
+		const auto toId = peerFromMTP(action.vto_id());
+		const auto toPeer = history()->owner().peer(toId);
+		const auto selfId = _from->session().userPeerId();
+		const auto distanceMeters = action.vdistance().v;
+		const auto distance = [&] {
+			if (distanceMeters >= 1000) {
+				const auto km = (10 * (distanceMeters / 10)) / 1000.;
+				return tr::lng_action_proximity_distance_km(
+					tr::now,
+					lt_count,
+					km);
+			} else {
+				return tr::lng_action_proximity_distance_m(
+					tr::now,
+					lt_count,
+					distanceMeters);
+			}
+		}();
+		result.text = [&] {
+			if (fromId == selfId) {
+				result.links.push_back(toPeer->createOpenLink());
+				return tr::lng_action_you_proximity_reached(
+					tr::now,
+					lt_distance,
+					distance,
+					lt_user,
+					textcmdLink(1, toPeer->name));
+			} else if (toId == selfId) {
+				result.links.push_back(fromPeer->createOpenLink());
+				return tr::lng_action_proximity_reached_you(
+					tr::now,
+					lt_from,
+					textcmdLink(1, fromPeer->name),
+					lt_distance,
+					distance);
+			} else {
+				result.links.push_back(fromPeer->createOpenLink());
+				result.links.push_back(toPeer->createOpenLink());
+				return tr::lng_action_proximity_reached(
+					tr::now,
+					lt_from,
+					textcmdLink(1, fromPeer->name),
+					lt_distance,
+					distance,
+					lt_user,
+					textcmdLink(2, toPeer->name));
+			}
+		}();
+		return result;
+	};
+
 	const auto messageText = action.match([&](
 		const MTPDmessageActionChatAddUser &data) {
 		return prepareChatAddUserText(data);
@@ -261,7 +316,7 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 	}, [&](const MTPDmessageActionContactSignUp &data) {
 		return prepareContactSignUp();
 	}, [&](const MTPDmessageActionGeoProximityReached &data) {
-		return PreparedText{ tr::lng_message_empty(tr::now) }; // #TODO files
+		return prepareProximityReached(data);
 	}, [](const MTPDmessageActionPaymentSentMe &) {
 		LOG(("API Error: messageActionPaymentSentMe received."));
 		return PreparedText{ tr::lng_message_empty(tr::now) };
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
index fdbc47c77..cefa697ba 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
@@ -75,11 +75,6 @@ AlbumThumbnail::AlbumThumbnail(
 		- st::sendBoxAlbumGroupSkipRight;
 	const auto filepath = file.path;
 	if (filepath.isEmpty()) {
-		//_name = filedialogDefaultName( // #TODO files
-		//	u"image"_q,
-		//	u".png"_q,
-		//	QString(),
-		//	true);
 		_name = "image.png";
 		_status = u"%1x%2"_q.arg(
 			_fullPreview.width()
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
index 480044c6e..61119b362 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_file_preview.cpp
@@ -89,11 +89,6 @@ void SingleFilePreview::preparePreview(const PreparedFile &file) {
 	prepareThumb(preview);
 	const auto filepath = file.path;
 	if (filepath.isEmpty()) {
-		//auto filename = filedialogDefaultName(
-		//	qsl("image"),
-		//	qsl(".png"),
-		//	QString(),
-		//	true); // #TODO files
 		auto filename = "image.png";
 		_name = filename;
 		_statusText = u"%1x%2"_q.arg(preview.width()).arg(preview.height());

From a614ccad97ea06e7da13b03d59b054554b913586 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 20 Oct 2020 11:19:48 +0300
Subject: [PATCH 108/190] Correctly check media when editing files.

---
 Telegram/SourceFiles/apiwrap.cpp              | 15 +--
 .../SourceFiles/boxes/edit_caption_box.cpp    | 85 ++++++++--------
 Telegram/SourceFiles/boxes/edit_caption_box.h |  4 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp |  4 +-
 Telegram/SourceFiles/core/file_utilities.cpp  |  5 +-
 Telegram/SourceFiles/core/file_utilities.h    |  2 +-
 Telegram/SourceFiles/core/mime_type.cpp       |  2 +-
 Telegram/SourceFiles/core/mime_type.h         |  2 +-
 .../SourceFiles/history/history_widget.cpp    |  5 +-
 .../view/history_view_replies_section.cpp     |  5 +-
 .../view/history_view_scheduled_section.cpp   |  5 +-
 .../storage/storage_media_prepare.cpp         | 98 ++-----------------
 .../storage/storage_media_prepare.h           |  5 +-
 .../ui/chat/attach/attach_album_thumbnail.cpp |  2 +-
 .../ui/chat/attach/attach_prepare.cpp         | 76 +++++++++-----
 .../ui/chat/attach/attach_prepare.h           | 27 ++++-
 16 files changed, 155 insertions(+), 187 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index afe7639d3..0d5a88a9b 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -4228,18 +4228,11 @@ void ApiWrap::sendFiles(
 	tasks.reserve(list.files.size());
 	for (auto &file : list.files) {
 		if (album) {
-			switch (file.type) {
-			case Ui::PreparedFile::AlbumType::Photo:
-				type = (type == SendMediaType::File)
-					? type
-					: SendMediaType::Photo;
-				break;
-			case Ui::PreparedFile::AlbumType::Music:
-			case Ui::PreparedFile::AlbumType::Video:
-			case Ui::PreparedFile::AlbumType::File:
+			if (file.type == Ui::PreparedFile::Type::Photo
+				&& type != SendMediaType::File) {
+				type = SendMediaType::Photo;
+			} else {
 				type = SendMediaType::File;
-				break;
-			default: Unexpected("AlbumType in ApiWrap::sendFiles.");
 			}
 		}
 		tasks.push_back(std::make_unique<FileLoadTask>(
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index 19e044b44..edcb57b56 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -106,10 +106,23 @@ EditCaptionBox::EditCaptionBox(
 	Expects(item->media()->allowsEditCaption());
 
 	_isAllowedEditMedia = item->media()->allowsEditMedia();
-	_isAlbum = !item->groupId().empty();
-
 	auto dimensions = QSize();
 	const auto media = item->media();
+
+	if (!item->groupId().empty()) {
+		if (media->photo()) {
+			_albumType = Ui::AlbumType::PhotoVideo;
+		} else if (const auto document = media->document()) {
+			if (document->isVideoFile()) {
+				_albumType = Ui::AlbumType::PhotoVideo;
+			} else if (document->isSong()) {
+				_albumType = Ui::AlbumType::Music;
+			} else {
+				_albumType = Ui::AlbumType::File;
+			}
+		}
+	}
+
 	if (const auto photo = media->photo()) {
 		_photoMedia = photo->createMediaView();
 		_photoMedia->wanted(PhotoSize::Large, _msgId);
@@ -503,7 +516,8 @@ void EditCaptionBox::updateEditPreview() {
 	if (const auto image = std::get_if<Info::Image>(fileMedia)) {
 		shouldAsDoc = !Ui::ValidateThumbDimensions(
 			image->data.width(),
-			image->data.height());
+			image->data.height()
+		) || (_albumType == Ui::AlbumType::File);
 		if (shouldAsDoc) {
 			docPhotoSize.setWidth(image->data.width());
 			docPhotoSize.setHeight(image->data.height());
@@ -554,7 +568,7 @@ void EditCaptionBox::updateEditPreview() {
 		_doc = true;
 	}
 
-	const auto showCheckbox = _photo && !_isAlbum;
+	const auto showCheckbox = _photo && (_albumType == Ui::AlbumType::None);
 	_wayWrap->toggle(showCheckbox, anim::type::instant);
 
 	if (!_doc) {
@@ -604,14 +618,10 @@ void EditCaptionBox::createEditMediaButton() {
 			if (Core::IsMimeSticker(mime)) {
 				showError(tr::lng_edit_media_invalid_file);
 				return false;
-			} else if (_isAlbum) { // #TODO files edit in file-albums
-				if (!Core::IsMimeAcceptedForAlbum(mime)
-					|| file.type == Ui::PreparedFile::AlbumType::File
-					|| file.type == Ui::PreparedFile::AlbumType::Music
-					|| file.type == Ui::PreparedFile::AlbumType::None) {
-					showError(tr::lng_edit_media_album_error);
-					return false;
-				}
+			} else if (_albumType != Ui::AlbumType::None
+				&& !file.canBeInAlbumType(_albumType)) {
+				showError(tr::lng_edit_media_album_error);
+				return false;
 			}
 			return true;
 		};
@@ -622,14 +632,13 @@ void EditCaptionBox::createEditMediaButton() {
 			st::sendMediaPreviewSize);
 
 		if (list) {
-			_preparedList = std::move(*list);
-			updateEditPreview();
+			setPreparedList(std::move(*list));
 		}
 	};
 
 	const auto buttonCallback = [=] {
-		const auto filters = _isAlbum
-			? FileDialog::AlbumFilesFilter()
+		const auto filters = (_albumType == Ui::AlbumType::PhotoVideo)
+			? FileDialog::PhotoVideoFilesFilter()
 			: FileDialog::AllFilesFilter();
 		FileDialog::GetOpenPath(
 			this,
@@ -676,7 +685,7 @@ void EditCaptionBox::prepare() {
 		if (action == Ui::InputField::MimeAction::Check) {
 			if (!data->hasText() && !_isAllowedEditMedia) {
 				return false;
-			} else if (Storage::ValidateDragData(data, _isAlbum)) {
+			} else if (Storage::ValidateEditMediaDragData(data, _albumType)) {
 				return true;
 			}
 			return data->hasText();
@@ -700,40 +709,32 @@ void EditCaptionBox::prepare() {
 }
 
 bool EditCaptionBox::fileFromClipboard(not_null<const QMimeData*> data) {
+	return setPreparedList(ListFromMimeData(data));
+}
+
+bool EditCaptionBox::setPreparedList(Ui::PreparedList &&list) {
 	if (!_isAllowedEditMedia) {
 		return false;
 	}
 	using Error = Ui::PreparedList::Error;
-	using AlbumType = Ui::PreparedFile::AlbumType;
-	auto list = ListFromMimeData(data);
-
+	using Type = Ui::PreparedFile::Type;
 	if (list.error != Error::None || list.files.empty()) {
 		return false;
 	}
-
-	const auto file = &list.files.front();
-	if (_isAlbum && (file->type == AlbumType::File
-		|| file->type == AlbumType::None
-		|| file->type == AlbumType::Music)) {
-		const auto imageAsDoc = [&] {
-			using Info = Ui::PreparedFileInformation;
-			const auto fileMedia = &file->information->media;
-			if (const auto image = std::get_if<Info::Image>(fileMedia)) {
-				return !Ui::ValidateThumbDimensions(
-					image->data.width(),
-					image->data.height());
-			}
-			return false;
-		}();
-
-		if (!data->hasText() || imageAsDoc) {
-			Ui::show(
-				Box<InformBox>(tr::lng_edit_media_album_error(tr::now)),
-				Ui::LayerOption::KeepOther);
+	auto file = &list.files.front();
+	const auto invalidForAlbum = (_albumType != Ui::AlbumType::None)
+		&& !file->canBeInAlbumType(_albumType);
+	if (_albumType == Ui::AlbumType::PhotoVideo) {
+		using Video = Ui::PreparedFileInformation::Video;
+		if (const auto video = std::get_if<Video>(&file->information->media)) {
+			video->isGifv = false;
 		}
+	}
+	if (invalidForAlbum) {
+		Ui::Toast::Show(tr::lng_edit_media_album_error(tr::now));
 		return false;
 	}
-	_photo = _isImage = (file->type == AlbumType::Photo);
+	_photo = _isImage = (file->type == Type::Photo);
 	_preparedList = std::move(list);
 	updateEditPreview();
 	return true;
@@ -783,7 +784,7 @@ void EditCaptionBox::setupDragArea() {
 	auto enterFilter = [=](not_null<const QMimeData*> data) {
 		return !_isAllowedEditMedia
 			? false
-			: Storage::ValidateDragData(data, _isAlbum);
+			: Storage::ValidateEditMediaDragData(data, _albumType);
 	};
 	// Avoid both drag areas appearing at one time.
 	auto computeState = [=](const QMimeData *data) {
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.h b/Telegram/SourceFiles/boxes/edit_caption_box.h
index a91e35e9e..048d260ad 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.h
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.h
@@ -33,6 +33,7 @@ class InputField;
 class EmojiButton;
 class IconButton;
 class Checkbox;
+enum class AlbumType;
 } // namespace Ui
 
 namespace Window {
@@ -93,6 +94,7 @@ private:
 	int errorTopSkip() const;
 
 	void createEditMediaButton();
+	bool setPreparedList(Ui::PreparedList &&list);
 
 	inline QString getNewMediaPath() {
 		return _preparedList.files.empty()
@@ -138,8 +140,8 @@ private:
 	object_ptr<Ui::IconButton> _editMedia = nullptr;
 	Ui::SlideWrap<Ui::RpWidget> *_wayWrap = nullptr;
 	QString _newMediaPath;
+	Ui::AlbumType _albumType = Ui::AlbumType();
 	bool _isAllowedEditMedia = false;
-	bool _isAlbum = false;
 	bool _asFile = false;
 	rpl::event_stream<> _editMediaClicks;
 
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index bca75480a..4695078f8 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -473,7 +473,7 @@ void SendFilesBox::preparePreview() {
 void SendFilesBox::generatePreviewFrom(int fromBlock) {
 	Expects(fromBlock <= _blocks.size());
 
-	using Type = Ui::PreparedFile::AlbumType;
+	using Type = Ui::PreparedFile::Type;
 
 	const auto eraseFrom = _blocks.begin() + fromBlock;
 	for (auto i = eraseFrom; i != _blocks.end(); ++i) {
@@ -813,7 +813,7 @@ void SendFilesBox::refreshTitleText() {
 	if (count > 1) {
 		const auto imagesCount = ranges::count(
 			_list.files,
-			Ui::PreparedFile::AlbumType::Photo,
+			Ui::PreparedFile::Type::Photo,
 			&Ui::PreparedFile::type);
 		_titleText = (imagesCount == count)
 			? tr::lng_send_images_selected(tr::now, lt_count, count)
diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp
index 90560e7a6..5621242a6 100644
--- a/Telegram/SourceFiles/core/file_utilities.cpp
+++ b/Telegram/SourceFiles/core/file_utilities.cpp
@@ -329,8 +329,9 @@ QString ImagesOrAllFilter() {
 	return ImagesFilter() + u";;"_q + AllFilesFilter();
 }
 
-QString AlbumFilesFilter() {
-	return u"Image and Video Files (*.png *.jpg *.jpeg *.mp4 *.mov)"_q;
+QString PhotoVideoFilesFilter() {
+	return u"Image and Video Files (*.png *.jpg *.jpeg *.mp4 *.mov);;"_q
+		+ AllFilesFilter();
 }
 
 namespace internal {
diff --git a/Telegram/SourceFiles/core/file_utilities.h b/Telegram/SourceFiles/core/file_utilities.h
index d44072bb1..419c2183f 100644
--- a/Telegram/SourceFiles/core/file_utilities.h
+++ b/Telegram/SourceFiles/core/file_utilities.h
@@ -93,7 +93,7 @@ void GetFolder(
 [[nodiscard]] QString ImagesFilter();
 [[nodiscard]] QString AllOrImagesFilter();
 [[nodiscard]] QString ImagesOrAllFilter();
-[[nodiscard]] QString AlbumFilesFilter();
+[[nodiscard]] QString PhotoVideoFilesFilter();
 
 namespace internal {
 
diff --git a/Telegram/SourceFiles/core/mime_type.cpp b/Telegram/SourceFiles/core/mime_type.cpp
index 71e7ae065..66d8e45b7 100644
--- a/Telegram/SourceFiles/core/mime_type.cpp
+++ b/Telegram/SourceFiles/core/mime_type.cpp
@@ -111,7 +111,7 @@ bool IsMimeSticker(const QString &mime) {
 		|| IsMimeStickerAnimated(mime);
 }
 
-bool IsMimeAcceptedForAlbum(const QString &mime) {
+bool IsMimeAcceptedForPhotoVideoAlbum(const QString &mime) {
 	return (mime == u"image/jpeg"_q)
 		|| (mime == u"image/png"_q)
 		|| (mime == u"video/mp4"_q)
diff --git a/Telegram/SourceFiles/core/mime_type.h b/Telegram/SourceFiles/core/mime_type.h
index 73b2dcc9b..7fc123c46 100644
--- a/Telegram/SourceFiles/core/mime_type.h
+++ b/Telegram/SourceFiles/core/mime_type.h
@@ -42,7 +42,7 @@ private:
 
 [[nodiscard]] bool IsMimeStickerAnimated(const QString &mime);
 [[nodiscard]] bool IsMimeSticker(const QString &mime);
-[[nodiscard]] bool IsMimeAcceptedForAlbum(const QString &mime);
+[[nodiscard]] bool IsMimeAcceptedForPhotoVideoAlbum(const QString &mime);
 
 [[nodiscard]] bool FileIsImage(const QString &name, const QString &mime);
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 161b13678..768efb557 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4226,14 +4226,15 @@ void HistoryWidget::sendingFilesConfirmed(
 	action.replyTo = replyToId();
 	action.options = options;
 	action.clearDraft = false;
-	if ((groups.empty() || groups.size() > 1) && !caption.text.isEmpty()) {
+	if ((groups.size() != 1 || !groups.front().sentWithCaption())
+		&& !caption.text.isEmpty()) {
 		auto message = Api::MessageToSend(_history);
 		message.textWithTags = base::take(caption);
 		message.action = action;
 		session().api().sendMessage(std::move(message));
 	}
 	for (auto &group : groups) {
-		const auto album = group.grouped
+		const auto album = (group.type != Ui::AlbumType::None)
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
 		session().api().sendFiles(
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index cd58947de..430225ba6 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -671,14 +671,15 @@ void RepliesWidget::sendingFilesConfirmed(
 	action.replyTo = replyTo ? replyTo : _rootId;
 	action.options = options;
 	action.clearDraft = false;
-	if ((groups.empty() || groups.size() > 1) && !caption.text.isEmpty()) {
+	if ((groups.size() != 1 || !groups.front().sentWithCaption())
+		&& !caption.text.isEmpty()) {
 		auto message = Api::MessageToSend(_history);
 		message.textWithTags = base::take(caption);
 		message.action = action;
 		session().api().sendMessage(std::move(message));
 	}
 	for (auto &group : groups) {
-		const auto album = group.grouped
+		const auto album = (group.type != Ui::AlbumType::None)
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
 		session().api().sendFiles(
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 37843d188..d18fdc0c9 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -407,14 +407,15 @@ void ScheduledWidget::sendingFilesConfirmed(
 	auto action = Api::SendAction(_history);
 	action.options = options;
 	action.clearDraft = false;
-	if ((groups.empty() || groups.size() > 1) && !caption.text.isEmpty()) {
+	if ((groups.size() != 1 || !groups.front().sentWithCaption())
+		&& !caption.text.isEmpty()) {
 		auto message = Api::MessageToSend(_history);
 		message.textWithTags = base::take(caption);
 		message.action = action;
 		session().api().sendMessage(std::move(message));
 	}
 	for (auto &group : groups) {
-		const auto album = group.grouped
+		const auto album = (group.type != Ui::AlbumType::None)
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
 		session().api().sendFiles(
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
index 6251c5409..92e55e6f8 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp
@@ -80,19 +80,21 @@ void PrepareDetailsInParallel(PreparedList &result, int previewWidth) {
 
 } // namespace
 
-bool ValidateDragData(not_null<const QMimeData*> data, bool isAlbum) {
+bool ValidateEditMediaDragData(
+		not_null<const QMimeData*> data,
+		Ui::AlbumType albumType) {
 	if (data->urls().size() > 1) {
 		return false;
 	} else if (data->hasImage()) {
-		return true;
+		return (albumType != Ui::AlbumType::Music);
 	}
 
-	if (isAlbum && data->hasUrls()) {
+	if (albumType == Ui::AlbumType::PhotoVideo && data->hasUrls()) {
 		const auto url = data->urls().front();
 		if (url.isLocalFile()) {
 			using namespace Core;
 			const auto info = QFileInfo(Platform::File::UrlToLocal(url));
-			return IsMimeAcceptedForAlbum(MimeTypeForFile(info).name());
+			return IsMimeAcceptedForPhotoVideoAlbum(MimeTypeForFile(info).name());
 		}
 	}
 
@@ -241,86 +243,6 @@ std::optional<PreparedList> PreparedFileFromFilesDialog(
 	} else {
 		return list;
 	}
-	//if (!result.remoteContent.isEmpty()) {
-	//	auto list = PrepareMediaFromImage(
-	//		QImage(),
-	//		std::move(result.remoteContent),
-	//		previewWidth);
-
-	//	const auto mimeFile = list.files.front().information->filemime;
-	//	if (Core::IsMimeSticker(mimeFile)) {
-	//		errorCallback(tr::lng_edit_media_invalid_file);
-	//		return std::nullopt;
-	//	}
-
-	//	if (isAlbum) {
-	//		const auto file = &list.files.front();
-	//		if (!Core::IsMimeAcceptedForAlbum(mimeFile)
-	//			|| file->type == PreparedFile::AlbumType::File
-	//			|| file->type == PreparedFile::AlbumType::Music
-	//			|| file->type == PreparedFile::AlbumType::None) {
-	//			errorCallback(tr::lng_edit_media_album_error);
-	//			return std::nullopt;
-	//		}
-	//	}
-
-	//	Ensures(list.files.size() == 1);
-	//	return list;
-	//} else if (!result.paths.isEmpty()) {
-	//	auto temp = PrepareMediaList(result.paths, previewWidth);
-	//	const auto isSingleFile = (temp.files.size() == 1);
-	//	if (temp.error != PreparedList::Error::None) {
-	//		errorCallback(tr::lng_send_media_invalid_files);
-	//		return std::nullopt;
-	//	}
-	//	auto filteredFiles = ranges::view::all(
-	//		temp.files
-	//	) | ranges::view::filter([&](const auto &file) {
-	//		const auto info = QFileInfo(file.path);
-	//		if (Core::IsMimeSticker(Core::MimeTypeForFile(info).name())) {
-	//			if (isSingleFile) {
-	//				errorCallback(tr::lng_edit_media_invalid_file);
-	//			}
-	//			return false;
-	//		}
-	//		if (!isAlbum) {
-	//			return true;
-	//		}
-	//		using Info = PreparedFileInformation;
-
-	//		const auto media = &file.information->media;
-	//		const auto valid = v::match(*media, [](const Info::Image &data) {
-	//			return Ui::ValidateThumbDimensions(
-	//				data.data.width(),
-	//				data.data.height())
-	//				&& !data.animated;
-	//		}, [](Info::Video &data) {
-	//			data.isGifv = false;
-	//			return true;
-	//		}, [](auto &&other) {
-	//			return false;
-	//		});
-	//		if (!valid && isSingleFile) {
-	//			errorCallback(tr::lng_edit_media_album_error);
-	//		}
-	//		return valid;
-	//	}) | ranges::view::transform([](auto &file) {
-	//		return std::move(file);
-	//	}) | ranges::to_vector;
-
-	//	if (!filteredFiles.size()) {
-	//		if (!isSingleFile) {
-	//			errorCallback(tr::lng_send_media_invalid_files);
-	//		}
-	//		return std::nullopt;
-	//	}
-
-	//	auto list = PreparedList(temp.error, temp.errorData);
-	//	list.files = std::move(filteredFiles);
-
-	//	return list;
-	//}
-	//return std::nullopt;
 }
 
 void PrepareDetails(PreparedFile &file, int previewWidth) {
@@ -351,9 +273,9 @@ void PrepareDetails(PreparedFile &file, int previewWidth) {
 				Qt::SmoothTransformation));
 			Assert(!file.preview.isNull());
 			file.preview.setDevicePixelRatio(cRetinaFactor());
-			file.type = PreparedFile::AlbumType::Photo;
+			file.type = PreparedFile::Type::Photo;
 		} else if (Core::IsMimeSticker(file.information->filemime)) {
-			file.type = PreparedFile::AlbumType::None;
+			file.type = PreparedFile::Type::None;
 		}
 	} else if (const auto video = std::get_if<Video>(
 			&file.information->media)) {
@@ -365,10 +287,10 @@ void PrepareDetails(PreparedFile &file, int previewWidth) {
 				Qt::SmoothTransformation);
 			Assert(!file.preview.isNull());
 			file.preview.setDevicePixelRatio(cRetinaFactor());
-			file.type = PreparedFile::AlbumType::Video;
+			file.type = PreparedFile::Type::Video;
 		}
 	} else if (const auto song = std::get_if<Song>(&file.information->media)) {
-		file.type = PreparedFile::AlbumType::Music;
+		file.type = PreparedFile::Type::Music;
 	}
 }
 
diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.h b/Telegram/SourceFiles/storage/storage_media_prepare.h
index b4dd55ad8..e2c02553f 100644
--- a/Telegram/SourceFiles/storage/storage_media_prepare.h
+++ b/Telegram/SourceFiles/storage/storage_media_prepare.h
@@ -14,6 +14,7 @@ namespace Ui {
 struct PreparedFileInformation;
 struct PreparedFile;
 struct PreparedList;
+enum class AlbumType;
 } // namespace Ui
 
 namespace Storage {
@@ -31,7 +32,9 @@ std::optional<Ui::PreparedList> PreparedFileFromFilesDialog(
 	Fn<void(tr::phrase<>)> errorCallback,
 	int previewWidth);
 MimeDataState ComputeMimeDataState(const QMimeData *data);
-bool ValidateDragData(not_null<const QMimeData*> data, bool isAlbum);
+bool ValidateEditMediaDragData(
+	not_null<const QMimeData*> data,
+	Ui::AlbumType albumType);
 Ui::PreparedList PrepareMediaList(const QList<QUrl> &files, int previewWidth);
 Ui::PreparedList PrepareMediaList(const QStringList &files, int previewWidth);
 Ui::PreparedList PrepareMediaFromImage(
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
index cefa697ba..56f3b1780 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp
@@ -29,7 +29,7 @@ AlbumThumbnail::AlbumThumbnail(
 : _layout(layout)
 , _fullPreview(file.preview)
 , _shrinkSize(int(std::ceil(st::historyMessageRadius / 1.4)))
-, _isVideo(file.type == PreparedFile::AlbumType::Video)
+, _isVideo(file.type == PreparedFile::Type::Video)
 , _buttonsRect(st::sendBoxAlbumGroupRadius, st::callFingerprintBg) {
 	Expects(!_fullPreview.isNull());
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index 83cfc5ec5..15339973a 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -26,6 +26,41 @@ PreparedFile &PreparedFile::operator=(PreparedFile &&other) = default;
 
 PreparedFile::~PreparedFile() = default;
 
+bool PreparedFile::canBeInAlbumType(AlbumType album) const {
+	return CanBeInAlbumType(type, album);
+}
+
+AlbumType PreparedFile::albumType(bool sendImagesAsPhotos) const {
+	switch (type) {
+	case Type::Photo:
+		return sendImagesAsPhotos ? AlbumType::PhotoVideo : AlbumType::File;
+	case Type::Video:
+		return AlbumType::PhotoVideo;
+	case Type::Music:
+		return AlbumType::Music;
+	case Type::File:
+		return AlbumType::File;
+	case Type::None:
+		return AlbumType::None;
+	}
+	Unexpected("PreparedFile::type in PreparedFile::albumType().");
+}
+
+bool CanBeInAlbumType(PreparedFile::Type type, AlbumType album) {
+	Expects(album != AlbumType::None);
+
+	using Type = PreparedFile::Type;
+	switch (album) {
+	case AlbumType::PhotoVideo:
+		return (type == Type::Photo) || (type == Type::Video);
+	case AlbumType::Music:
+		return (type == Type::Music);
+	case AlbumType::File:
+		return (type == Type::Photo) || (type == Type::File);
+	}
+	Unexpected("AlbumType in CanBeInAlbumType.");
+}
+
 PreparedList PreparedList::Reordered(
 		PreparedList &&list,
 		std::vector<int> order) {
@@ -73,7 +108,7 @@ bool PreparedList::canBeSentInSlowmodeWith(const PreparedList &other) const {
 		return false;
 	}
 
-	using Type = PreparedFile::AlbumType;
+	using Type = PreparedFile::Type;
 	auto &&all = ranges::view::concat(files, other.files);
 	const auto has = [&](Type type) {
 		return ranges::contains(all, type, &PreparedFile::type);
@@ -117,11 +152,11 @@ bool PreparedList::canAddCaption(bool sendingAlbum) const {
 	}
 	const auto hasFiles = ranges::contains(
 		files,
-		PreparedFile::AlbumType::File,
+		PreparedFile::Type::File,
 		&PreparedFile::type);
 	const auto hasNotGrouped = ranges::contains(
 		files,
-		PreparedFile::AlbumType::None,
+		PreparedFile::Type::None,
 		&PreparedFile::type);
 	return !hasFiles && !hasNotGrouped;
 }
@@ -130,7 +165,7 @@ bool PreparedList::hasGroupOption(bool slowmode) const {
 	if (slowmode || files.size() < 2) {
 		return false;
 	}
-	using Type = PreparedFile::AlbumType;
+	using Type = PreparedFile::Type;
 	auto lastType = Type::None;
 	for (const auto &file : files) {
 		if ((file.type == lastType)
@@ -148,7 +183,7 @@ bool PreparedList::hasGroupOption(bool slowmode) const {
 }
 
 bool PreparedList::hasSendImagesAsPhotosOption(bool slowmode) const {
-	using Type = PreparedFile::AlbumType;
+	using Type = PreparedFile::Type;
 	return slowmode
 		? ((files.size() == 1) && (files.front().type == Type::Photo))
 		: ranges::contains(files, Type::Photo, &PreparedFile::type);
@@ -174,42 +209,33 @@ std::vector<PreparedGroup> DivideByGroups(
 
 	auto group = Ui::PreparedList();
 
-	enum class GroupType {
-		PhotoVideo,
-		File,
-		Music,
-		None,
-	};
-	// For groupType Type::Video means media album,
-	// Type::File means file album,
-	// Type::None means no grouping.
-	using Type = Ui::PreparedFile::AlbumType;
-	auto groupType = GroupType::None;
+	using Type = Ui::PreparedFile::Type;
+	auto groupType = AlbumType::None;
 
 	auto result = std::vector<PreparedGroup>();
 	auto pushGroup = [&] {
 		result.push_back(PreparedGroup{
 			.list = base::take(group),
-			.grouped = (groupType != GroupType::None)
+			.type = groupType,
 		});
 	};
 	for (auto i = 0; i != list.files.size(); ++i) {
 		auto &file = list.files[i];
 		const auto fileGroupType = (file.type == Type::Music)
-			? (groupFiles ? GroupType::Music : GroupType::None)
+			? (groupFiles ? AlbumType::Music : AlbumType::None)
 			: (file.type == Type::Video)
-			? (groupFiles ? GroupType::PhotoVideo : GroupType::None)
+			? (groupFiles ? AlbumType::PhotoVideo : AlbumType::None)
 			: (file.type == Type::Photo)
 			? ((groupFiles && sendImagesAsPhotos)
-				? GroupType::PhotoVideo
+				? AlbumType::PhotoVideo
 				: (groupFiles && !sendImagesAsPhotos)
-				? GroupType::File
-				: GroupType::None)
+				? AlbumType::File
+				: AlbumType::None)
 			: (file.type == Type::File)
-			? (groupFiles ? GroupType::File : GroupType::None)
-			: GroupType::None;
+			? (groupFiles ? AlbumType::File : AlbumType::None)
+			: AlbumType::None;
 		if ((!group.files.empty() && groupType != fileGroupType)
-			|| ((groupType != GroupType::None)
+			|| ((groupType != AlbumType::None)
 				&& (group.files.size() == Ui::MaxAlbumItems()))) {
 			pushGroup();
 		}
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
index ceceb9d71..630b01aea 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
@@ -36,6 +36,13 @@ struct PreparedFileInformation {
 	std::variant<v::null_t, Image, Song, Video> media;
 };
 
+enum class AlbumType {
+	None,
+	PhotoVideo,
+	Music,
+	File,
+};
+
 struct PreparedFile {
 	// File-s can be grouped if 'groupFiles'.
 	// File-s + Photo-s can be grouped if 'groupFiles && !sendImagesAsPhotos'.
@@ -43,12 +50,12 @@ struct PreparedFile {
 	// Photo-s + Video-s can be grouped if 'groupFiles && sendImagesAsPhotos'.
 	// Video-s can be grouped if 'groupFiles'.
 	// Music-s can be grouped if 'groupFiles'.
-	enum class AlbumType {
-		File,
+	enum class Type {
+		None,
 		Photo,
 		Video,
 		Music,
-		None,
+		File,
 	};
 
 	PreparedFile(const QString &path);
@@ -56,15 +63,20 @@ struct PreparedFile {
 	PreparedFile &operator=(PreparedFile &&other);
 	~PreparedFile();
 
+	[[nodiscard]] bool canBeInAlbumType(AlbumType album) const;
+	[[nodiscard]] AlbumType albumType(bool sendImagesAsPhotos) const;
+
 	QString path;
 	QByteArray content;
 	int size = 0;
 	std::unique_ptr<Ui::PreparedFileInformation> information;
 	QImage preview;
 	QSize shownDimensions;
-	AlbumType type = AlbumType::File;
+	Type type = Type::File;
 };
 
+[[nodiscard]] bool CanBeInAlbumType(PreparedFile::Type type, AlbumType album);
+
 struct PreparedList {
 	enum class Error {
 		None,
@@ -104,7 +116,12 @@ struct PreparedList {
 
 struct PreparedGroup {
 	PreparedList list;
-	bool grouped = false;
+	AlbumType type = AlbumType::None;
+
+	[[nodiscard]] bool sentWithCaption() const {
+		return (list.files.size() == 1)
+			|| (type == AlbumType::PhotoVideo);
+	}
 };
 
 [[nodiscard]] std::vector<PreparedGroup> DivideByGroups(

From aefef948cdedeb4d4dbacce28fe5d9417bd57c06 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 20 Oct 2020 14:37:03 +0300
Subject: [PATCH 109/190] Improve multi-pinned message bar.

---
 Telegram/SourceFiles/data/data_peer.cpp       |   2 +-
 .../SourceFiles/history/history_widget.cpp    |   3 +-
 .../history/view/history_view_pinned_bar.cpp  |  19 +-
 .../history/view/history_view_pinned_bar.h    |   9 +-
 .../view/history_view_pinned_tracker.cpp      |  17 +-
 .../view/history_view_pinned_tracker.h        |  14 +-
 Telegram/SourceFiles/ui/chat/message_bar.cpp  | 189 +++++++++++++++++-
 Telegram/SourceFiles/ui/chat/message_bar.h    |  18 +-
 8 files changed, 226 insertions(+), 45 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 3e1490909..c8cea7dcc 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -543,7 +543,7 @@ void PeerData::addPinnedSlice(
 		return;
 	}
 	ensurePinnedMessagesCreated();
-	_pinnedMessages->add(std::move(ids), noSkipRange, std::nullopt);
+	_pinnedMessages->add(std::move(ids), noSkipRange, count);
 	session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 }
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 768efb557..233a027af 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5225,7 +5225,8 @@ void HistoryWidget::checkPinnedBarState() {
 	) | rpl::map([=](HistoryView::PinnedId messageId) {
 		return HistoryView::PinnedBarId{
 			FullMsgId{ peerToChannel(_peer->id), messageId.message },
-			messageId.type
+			messageId.index,
+			messageId.count
 		};
 	});
 	_pinnedBar = std::make_unique<Ui::PinnedBar>(
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index a73c9e4cf..96aa406de 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -23,10 +23,7 @@ namespace {
 
 [[nodiscard]] Ui::MessageBarContent ContentWithoutPreview(
 		not_null<HistoryItem*> item) {
-	const auto media = item->media();
-	const auto poll = media ? media->poll() : nullptr;
 	return Ui::MessageBarContent{
-		.id = item->id,
 		.text = { item->inReplyText() },
 	};
 }
@@ -126,17 +123,13 @@ auto WithPinnedTitle(not_null<Main::Session*> session, PinnedBarId id) {
 		if (!item) {
 			return std::move(content);
 		}
-		const auto media = item->media();
-		const auto poll = media ? media->poll() : nullptr;
-		content.title = (id.type == PinnedIdType::First)
-			? tr::lng_pinned_previous(tr::now) // #TODO pinned first?
-			: (id.type == PinnedIdType::Middle)
-			? tr::lng_pinned_previous(tr::now)
-			: !poll
+		content.title = (id.index + 1 >= id.count)
 			? tr::lng_pinned_message(tr::now)
-			: poll->quiz()
-			? tr::lng_pinned_quiz(tr::now)
-			: tr::lng_pinned_poll(tr::now);
+			: (tr::lng_pinned_message(tr::now) // #TODO pinned
+				+ " #"
+				+ QString::number(id.count - id.index));
+		content.count = std::max(id.count, 1);
+		content.index = std::clamp(id.index, 0, content.count - 1);
 		return std::move(content);
 	};
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
index d09394e7e..41c20d30e 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
@@ -30,13 +30,16 @@ namespace HistoryView {
 enum class PinnedIdType;
 struct PinnedBarId {
 	FullMsgId message;
-	PinnedIdType type = PinnedIdType();
+	int index = 0;
+	int count = 1;
 
 	bool operator<(const PinnedBarId &other) const {
-		return std::tie(message, type) < std::tie(other.message, other.type);
+		return std::tie(message, index, count)
+			< std::tie(other.message, other.index, other.count);
 	}
 	bool operator==(const PinnedBarId &other) const {
-		return std::tie(message, type) == std::tie(other.message, other.type);
+		return std::tie(message, index, count)
+			== std::tie(other.message, other.index, other.count);
 	}
 	bool operator!=(const PinnedBarId &other) const {
 		return !(*this == other);
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
index bb18c8356..6962a4903 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
@@ -102,15 +102,18 @@ void PinnedTracker::setupViewer(not_null<Data::PinnedMessages*> data) {
 			_current = PinnedId();
 			return;
 		}
-		const auto type = (!after && (snapshot.skippedAfter == 0))
-			? PinnedIdType::Last
-			: (before < 2 && (snapshot.skippedBefore == 0))
-			? PinnedIdType::First
-			: PinnedIdType::Middle;
+		const auto count = std::max(
+			snapshot.fullCount.value_or(1),
+			int(snapshot.ids.size()));
+		const auto index = snapshot.skippedBefore.has_value()
+			? (*snapshot.skippedBefore + before)
+			: snapshot.skippedAfter.has_value()
+			? (count - *snapshot.skippedAfter - after)
+			: 1;
 		if (i != begin(snapshot.ids)) {
-			_current = PinnedId{ *(i - 1), type };
+			_current = PinnedId{ *(i - 1), index - 1, count };
 		} else if (snapshot.skippedBefore == 0) {
-			_current = PinnedId{ snapshot.ids.front(), type };
+			_current = PinnedId{ snapshot.ids.front(), 0, count };
 		}
 	}, _dataLifetime);
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
index 1fbf061b4..ac762d996 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
@@ -16,20 +16,18 @@ enum class LoadDirection : char;
 
 namespace HistoryView {
 
-enum class PinnedIdType {
-	First,
-	Middle,
-	Last,
-};
 struct PinnedId {
 	MsgId message = 0;
-	PinnedIdType type = PinnedIdType::Middle;
+	int index = 0;
+	int count = 1;
 
 	bool operator<(const PinnedId &other) const {
-		return std::tie(message, type) < std::tie(other.message, other.type);
+		return std::tie(message, index, count)
+			< std::tie(other.message, other.index, other.count);
 	}
 	bool operator==(const PinnedId &other) const {
-		return std::tie(message, type) == std::tie(other.message, other.type);
+		return std::tie(message, index, count)
+			== std::tie(other.message, other.index, other.count);
 	}
 };
 
diff --git a/Telegram/SourceFiles/ui/chat/message_bar.cpp b/Telegram/SourceFiles/ui/chat/message_bar.cpp
index 1cb11a7ae..42ccc6f1c 100644
--- a/Telegram/SourceFiles/ui/chat/message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/message_bar.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/message_bar.h"
 
 #include "ui/text/text_options.h"
+#include "ui/image/image_prepare.h"
 #include "styles/style_chat.h"
 #include "styles/palette.h"
 
@@ -50,7 +51,8 @@ MessageBar::BodyAnimation MessageBar::DetectBodyAnimationType(
 		? currentAnimation->bodyAnimation
 		: BodyAnimation::None;
 	const auto somethingChanged = (currentContent.text != nextContent.text)
-		|| (currentContent.id != nextContent.id);
+		|| (currentContent.index != nextContent.index)
+		|| (currentContent.count != nextContent.count);
 	return (now == BodyAnimation::Full
 		|| currentContent.title != nextContent.title
 		|| (currentContent.title.isEmpty() && somethingChanged))
@@ -61,6 +63,9 @@ MessageBar::BodyAnimation MessageBar::DetectBodyAnimationType(
 }
 
 void MessageBar::tweenTo(MessageBarContent &&content) {
+	Expects(content.count > 0);
+	Expects(content.index >= 0 && content.index < content.count);
+
 	_widget.update();
 	if (!_st.duration || anim::Disabled() || _widget.size().isEmpty()) {
 		updateFromContent(std::move(content));
@@ -68,18 +73,22 @@ void MessageBar::tweenTo(MessageBarContent &&content) {
 	}
 	const auto hasImageChanged = (_content.preview.isNull()
 		!= content.preview.isNull());
-	const auto bodyChanged = (_content.id != content.id
+	const auto bodyChanged = (_content.index != content.index
+		|| _content.count != content.count
 		|| _content.title != content.title
 		|| _content.text != content.text
 		|| _content.preview.constBits() != content.preview.constBits());
+	const auto barCountChanged = (_content.count != content.count);
+	const auto barFrom = _content.index;
+	const auto barTo = content.index;
 	auto animation = Animation();
 	animation.bodyAnimation = DetectBodyAnimationType(
 		_animation.get(),
 		_content,
 		content);
-	animation.movingTo = (content.id > _content.id)
+	animation.movingTo = (content.index > _content.index)
 		? RectPart::Top
-		: (content.id < _content.id)
+		: (content.index < _content.index)
 		? RectPart::Bottom
 		: RectPart::None;
 	animation.imageFrom = grabImagePart();
@@ -92,6 +101,8 @@ void MessageBar::tweenTo(MessageBarContent &&content) {
 		_animation = std::move(was);
 		std::swap(*_animation, animation);
 		_animation->imageShown = std::move(animation.imageShown);
+		_animation->barScroll = std::move(animation.barScroll);
+		_animation->barTop = std::move(animation.barTop);
 	} else {
 		_animation = std::make_unique<Animation>(std::move(animation));
 	}
@@ -110,6 +121,23 @@ void MessageBar::tweenTo(MessageBarContent &&content) {
 			1.,
 			_st.duration);
 	}
+	if (barCountChanged) {
+		_animation->barScroll.stop();
+		_animation->barTop.stop();
+	} else if (barFrom != barTo) {
+		const auto wasState = countBarState(barFrom);
+		const auto nowState = countBarState(barTo);
+		_animation->barScroll.start(
+			[=] { _widget.update(); },
+			wasState.scroll,
+			nowState.scroll,
+			_st.duration);
+		_animation->barTop.start(
+			[] {},
+			wasState.offset,
+			nowState.offset,
+			_st.duration);
+	}
 }
 
 void MessageBar::updateFromContent(MessageBarContent &&content) {
@@ -239,12 +267,7 @@ void MessageBar::paint(Painter &p) {
 		? (shiftTo - shiftFull)
 		: (shiftTo + shiftFull);
 
-	const auto bar = QRect(
-		st::msgReplyBarSkip + st::msgReplyBarPos.x(),
-		st::msgReplyPadding.top() + st::msgReplyBarPos.y(),
-		st::msgReplyBarSize.width(),
-		st::msgReplyBarSize.height());
-	p.fillRect(bar, st::msgInReplyBarColor);
+	paintLeftBar(p);
 
 	if (!_animation) {
 		if (!_image.isNull()) {
@@ -315,4 +338,150 @@ void MessageBar::paint(Painter &p) {
 	}
 }
 
+auto MessageBar::countBarState(int index) const -> BarState {
+	Expects(index >= 0 && index < _content.count);
+
+	auto result = BarState();
+	const auto line = st::msgReplyBarSize.width();
+	const auto height = st::msgReplyBarSize.height();
+	const auto count = _content.count;
+	const auto shownCount = std::min(count, 4);
+	const auto dividers = (shownCount - 1) * line;
+	const auto size = float64(st::msgReplyBarSize.height() - dividers)
+		/ shownCount;
+	const auto fullHeight = count * size + (count - 1) * line;
+	const auto topByIndex = [&](int index) {
+		return index * (size + line);
+	};
+	result.scroll = (count < 5 || index < 2)
+		? 0
+		: (index >= count - 2)
+		? (fullHeight - height)
+		: (topByIndex(index) - (height - size) / 2);
+	result.size = size;
+	result.skip = line;
+	result.offset = topByIndex(index);
+	return result;
+}
+
+auto MessageBar::countBarState() const -> BarState {
+	return countBarState(_content.index);
+}
+
+void MessageBar::ensureGradientsCreated(int size) {
+	if (!_topBarGradient.isNull()) {
+		return;
+	}
+	const auto rows = size * style::DevicePixelRatio() - 2;
+	auto bottomMask = QImage(
+		QSize(1, size) * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	const auto step = ((1ULL << 24) - 1) / rows;
+	const auto limit = step * rows;
+	auto bits = bottomMask.bits();
+	const auto perLine = bottomMask.bytesPerLine();
+	for (auto counter = uint32(0); counter != limit; counter += step) {
+		const auto value = (counter >> 16);
+		memset(bits, int(value), perLine);
+		bits += perLine;
+	}
+	memset(bits, 255, perLine * 2);
+	auto bottom = style::colorizeImage(bottomMask, st::historyPinnedBg);
+	bottom.setDevicePixelRatio(style::DevicePixelRatio());
+	auto top = bottom.mirrored();
+	_bottomBarGradient = Images::PixmapFast(std::move(bottom));
+	_topBarGradient = Images::PixmapFast(std::move(top));
+}
+
+void MessageBar::paintLeftBar(Painter &p) {
+	const auto state = countBarState();
+	const auto gradientSize = int(std::ceil(state.size * 2.5));
+	if (_content.count > 4) {
+		ensureGradientsCreated(gradientSize);
+	}
+
+	const auto scroll = _animation
+		? _animation->barScroll.value(state.scroll)
+		: state.scroll;
+	const auto offset = _animation
+		? _animation->barTop.value(state.offset)
+		: state.offset;
+	const auto line = st::msgReplyBarSize.width();
+	const auto height = st::msgReplyBarSize.height();
+	const auto activeFrom = offset - scroll;
+	const auto activeTill = activeFrom + state.size;
+	const auto single = state.size + state.skip;
+
+	const auto barSkip = st::msgReplyPadding.top() + st::msgReplyBarPos.y();
+	const auto fullHeight = barSkip + height + barSkip;
+	const auto bar = QRect(
+		st::msgReplyBarSkip + st::msgReplyBarPos.x(),
+		barSkip,
+		line,
+		state.size);
+	const auto paintFromScroll = std::max(scroll - barSkip, 0.);
+	const auto paintFrom = int(std::floor(paintFromScroll / single));
+	const auto paintTillScroll = (scroll + height + barSkip);
+	const auto paintTill = std::min(
+		int(std::floor(paintTillScroll / single)) + 1,
+		_content.count);
+
+	p.setPen(Qt::NoPen);
+	const auto activeBrush = QBrush(st::msgInReplyBarColor);
+	const auto inactiveBrush = QBrush(QColor(
+		st::msgInReplyBarColor->c.red(),
+		st::msgInReplyBarColor->c.green(),
+		st::msgInReplyBarColor->c.blue(),
+		st::msgInReplyBarColor->c.alpha() / 3));
+	const auto radius = line / 2.;
+	auto hq = PainterHighQualityEnabler(p);
+	for (auto i = paintFrom; i != paintTill; ++i) {
+		const auto top = i * single - scroll;
+		const auto bottom = top + state.size;
+		const auto active = (top == activeFrom);
+		p.setBrush(active ? activeBrush : inactiveBrush);
+		p.drawRoundedRect(bar.translated(0, top), radius, radius);
+		if (active
+			|| bottom - line <= activeFrom
+			|| top + line >= activeTill) {
+			continue;
+		}
+		const auto partFrom = std::max(top, activeFrom);
+		const auto partTill = std::min(bottom, activeTill);
+		p.setBrush(activeBrush);
+		p.drawRoundedRect(
+			QRect(bar.x(), bar.y() + partFrom, line, partTill - partFrom),
+			radius,
+			radius);
+	}
+	if (_content.count > 4) {
+		const auto firstScroll = countBarState(2).scroll;
+		const auto gradientTop = (scroll >= firstScroll)
+			? 0
+			: anim::interpolate(-gradientSize, 0, scroll / firstScroll);
+		const auto lastScroll = countBarState(_content.count - 3).scroll;
+		const auto largestScroll = countBarState(_content.count - 1).scroll;
+		const auto gradientBottom = (scroll <= lastScroll)
+			? fullHeight
+			: anim::interpolate(
+				fullHeight,
+				fullHeight + gradientSize,
+				(scroll - lastScroll) / (largestScroll - lastScroll));
+		if (gradientTop > -gradientSize) {
+			p.drawPixmap(
+				QRect(bar.x(), gradientTop, bar.width(), gradientSize),
+				_topBarGradient);
+		}
+		if (gradientBottom < fullHeight + gradientSize) {
+			p.drawPixmap(
+				QRect(
+					bar.x(),
+					gradientBottom - gradientSize,
+					bar.width(),
+					gradientSize),
+				_bottomBarGradient);
+		}
+	}
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/message_bar.h b/Telegram/SourceFiles/ui/chat/message_bar.h
index 1c82d5672..bf15d219a 100644
--- a/Telegram/SourceFiles/ui/chat/message_bar.h
+++ b/Telegram/SourceFiles/ui/chat/message_bar.h
@@ -19,7 +19,8 @@ struct MessageBar;
 namespace Ui {
 
 struct MessageBarContent {
-	int id = 0;
+	int index = 0;
+	int count = 1;
 	QString title;
 	TextWithEntities text;
 	QImage preview;
@@ -47,6 +48,8 @@ private:
 	struct Animation {
 		Ui::Animations::Simple bodyMoved;
 		Ui::Animations::Simple imageShown;
+		Ui::Animations::Simple barScroll;
+		Ui::Animations::Simple barTop;
 		QPixmap bodyOrTextFrom;
 		QPixmap bodyOrTextTo;
 		QPixmap imageFrom;
@@ -54,8 +57,15 @@ private:
 		BodyAnimation bodyAnimation = BodyAnimation::None;
 		RectPart movingTo = RectPart::None;
 	};
+	struct BarState {
+		float64 scroll = 0.;
+		float64 size = 0.;
+		float64 skip = 0.;
+		float64 offset = 0.;
+	};
 	void setup();
 	void paint(Painter &p);
+	void paintLeftBar(Painter &p);
 	void tweenTo(MessageBarContent &&content);
 	void updateFromContent(MessageBarContent &&content);
 	[[nodiscard]] QPixmap prepareImage(const QImage &preview);
@@ -71,6 +81,10 @@ private:
 	[[nodiscard]] QPixmap grabBodyPart();
 	[[nodiscard]] QPixmap grabTextPart();
 
+	[[nodiscard]] BarState countBarState(int index) const;
+	[[nodiscard]] BarState countBarState() const;
+	void ensureGradientsCreated(int size);
+
 	[[nodiscard]] static BodyAnimation DetectBodyAnimationType(
 		Animation *currentAnimation,
 		const MessageBarContent &currentContent,
@@ -81,7 +95,7 @@ private:
 	MessageBarContent _content;
 	rpl::lifetime _contentLifetime;
 	Ui::Text::String _title, _text;
-	QPixmap _image;
+	QPixmap _image, _topBarGradient, _bottomBarGradient;
 	std::unique_ptr<Animation> _animation;
 
 };

From fc92e3fadd30f8940b0981937a460ec99d7fede6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 20 Oct 2020 19:29:24 +0300
Subject: [PATCH 110/190] Add pinned messages section.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/SourceFiles/data/data_channel.cpp    |   1 -
 Telegram/SourceFiles/data/data_peer.cpp       |  66 +-
 Telegram/SourceFiles/data/data_peer.h         |   8 +-
 .../SourceFiles/data/data_pinned_messages.cpp |  98 ++-
 .../SourceFiles/data/data_pinned_messages.h   |  22 +-
 .../data/data_search_controller.cpp           |   2 +
 .../SourceFiles/data/data_shared_media.cpp    |   3 +-
 Telegram/SourceFiles/history/history.cpp      |  21 +-
 Telegram/SourceFiles/history/history_item.cpp |  11 +-
 .../SourceFiles/history/history_message.cpp   |   3 +
 .../SourceFiles/history/history_widget.cpp    |  22 +-
 .../view/history_view_pinned_section.cpp      | 594 ++++++++++++++++++
 .../view/history_view_pinned_section.h        | 182 ++++++
 .../view/history_view_pinned_tracker.cpp      | 319 +++++-----
 .../view/history_view_pinned_tracker.h        |  14 +-
 .../view/history_view_replies_section.cpp     |  17 -
 .../view/history_view_replies_section.h       |   1 -
 .../view/history_view_top_bar_widget.cpp      |   5 +-
 .../view/history_view_top_bar_widget.h        |   1 +
 .../SourceFiles/storage/storage_facade.cpp    |  18 +
 Telegram/SourceFiles/storage/storage_facade.h |   3 +
 .../storage/storage_shared_media.cpp          |  31 +-
 .../storage/storage_shared_media.h            |  10 +-
 .../storage/storage_sparse_ids_list.cpp       |  29 +
 .../storage/storage_sparse_ids_list.h         |   2 +
 26 files changed, 1142 insertions(+), 343 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
 create mode 100644 Telegram/SourceFiles/history/view/history_view_pinned_section.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index f27aeb137..a04fd853a 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -533,6 +533,8 @@ PRIVATE
     history/view/history_view_object.h
     history/view/history_view_pinned_bar.cpp
     history/view/history_view_pinned_bar.h
+    history/view/history_view_pinned_section.cpp
+    history/view/history_view_pinned_section.h
     history/view/history_view_pinned_tracker.cpp
     history/view/history_view_pinned_tracker.h
     history/view/history_view_replies_section.cpp
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index 1af259a67..e2b6b8c9b 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -383,7 +383,6 @@ void ChannelData::setUnavailableReasons(
 void ChannelData::setAvailableMinId(MsgId availableMinId) {
 	if (_availableMinId != availableMinId) {
 		_availableMinId = availableMinId;
-		clearPinnedMessages(_availableMinId + 1);
 	}
 }
 
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index c8cea7dcc..25227cc24 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -38,6 +38,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_element.h"
 #include "history/history_item.h"
 #include "storage/file_download.h"
+#include "storage/storage_facade.h"
+#include "storage/storage_shared_media.h"
 #include "facades.h" // Ui::showPeerProfile
 #include "app.h"
 
@@ -468,14 +470,15 @@ MsgId PeerData::topPinnedMessageId() const {
 
 void PeerData::ensurePinnedMessagesCreated() {
 	if (!_pinnedMessages) {
-		_pinnedMessages = std::make_unique<Data::PinnedMessages>(
-			peerToChannel(id));
+		_pinnedMessages = std::make_unique<Data::PinnedMessages>(this);
+		session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 	}
 }
 
 void PeerData::removeEmptyPinnedMessages() {
 	if (_pinnedMessages && _pinnedMessages->empty()) {
 		_pinnedMessages = nullptr;
+		session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 	}
 }
 
@@ -491,69 +494,24 @@ void PeerData::setTopPinnedMessageId(MsgId messageId) {
 		clearPinnedMessages();
 		return;
 	}
-	if (session().settings().hiddenPinnedMessageId(id) != messageId) {
+	const auto hiddenId = session().settings().hiddenPinnedMessageId(id);
+	if (hiddenId != 0 && hiddenId != messageId) {
 		session().settings().setHiddenPinnedMessageId(id, 0);
 		session().saveSettingsDelayed();
 	}
 	ensurePinnedMessagesCreated();
 	_pinnedMessages->setTopId(messageId);
-	session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 }
 
-void PeerData::clearPinnedMessages(MsgId lessThanId) {
-	if (lessThanId == ServerMaxMsgId
-		&& session().settings().hiddenPinnedMessageId(id) != 0) {
+void PeerData::clearPinnedMessages() {
+	if (session().settings().hiddenPinnedMessageId(id) != 0) {
 		session().settings().setHiddenPinnedMessageId(id, 0);
 		session().saveSettingsDelayed();
 	}
-	if (!_pinnedMessages) {
-		return;
-	}
-	_pinnedMessages->clearLessThanId(lessThanId);
+	session().storage().remove(Storage::SharedMediaRemoveAll(
+		id,
+		Storage::SharedMediaType::Pinned));
 	removeEmptyPinnedMessages();
-	session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
-}
-
-void PeerData::addPinnedMessage(MsgId messageId) {
-	if (messageIdTooSmall(messageId)) {
-		return;
-	}
-	ensurePinnedMessagesCreated();
-	_pinnedMessages->add(messageId);
-	session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
-}
-
-void PeerData::addPinnedSlice(
-		std::vector<MsgId> &&ids,
-		MsgRange noSkipRange,
-		std::optional<int> count) {
-	const auto min = [&] {
-		if (const auto channel = asChannel()) {
-			return channel->availableMinId();
-		}
-		return 0;
-	}();
-	ids.erase(
-		ranges::remove_if(ids, [&](MsgId id) { return id <= min; }),
-		end(ids));
-	if (noSkipRange.from <= min) {
-		noSkipRange.from = 0;
-	}
-	if (ids.empty() && !_pinnedMessages) {
-		return;
-	}
-	ensurePinnedMessagesCreated();
-	_pinnedMessages->add(std::move(ids), noSkipRange, count);
-	session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
-}
-
-void PeerData::removePinnedMessage(MsgId messageId) {
-	if (!_pinnedMessages) {
-		return;
-	}
-	_pinnedMessages->remove(messageId);
-	removeEmptyPinnedMessages();
-	session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
 }
 
 bool PeerData::canExportChatHistory() const {
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index c8bf6eac1..dbdf8d094 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -330,13 +330,7 @@ public:
 	[[nodiscard]] bool canEditMessagesIndefinitely() const;
 	[[nodiscard]] MsgId topPinnedMessageId() const;
 	void setTopPinnedMessageId(MsgId messageId);
-	void clearPinnedMessages(MsgId lessThanId = ServerMaxMsgId);
-	void addPinnedMessage(MsgId messageId);
-	void addPinnedSlice(
-		std::vector<MsgId> &&ids,
-		MsgRange noSkipRange,
-		std::optional<int> count);
-	void removePinnedMessage(MsgId messageId);
+	void clearPinnedMessages();
 	Data::PinnedMessages *currentPinnedMessages() const {
 		return _pinnedMessages.get();
 	}
diff --git a/Telegram/SourceFiles/data/data_pinned_messages.cpp b/Telegram/SourceFiles/data/data_pinned_messages.cpp
index e9fc9a110..c1121df8a 100644
--- a/Telegram/SourceFiles/data/data_pinned_messages.cpp
+++ b/Telegram/SourceFiles/data/data_pinned_messages.cpp
@@ -7,94 +7,76 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_pinned_messages.h"
 
-namespace Data {
+#include "data/data_peer.h"
+#include "main/main_session.h"
+#include "storage/storage_facade.h"
+#include "storage/storage_shared_media.h"
 
-PinnedMessages::PinnedMessages(ChannelId channelId) : _channelId(channelId) {
+namespace Data {
+namespace {
+
+constexpr auto PinnedType = Storage::SharedMediaType::Pinned;
+
+using Storage::SharedMediaQuery;
+using Storage::SharedMediaKey;
+using Storage::SharedMediaResult;
+
+} // namespace
+
+PinnedMessages::PinnedMessages(not_null<PeerData*> peer)
+: _peer(peer)
+, _storage(_peer->session().storage()) {
 }
 
 bool PinnedMessages::empty() const {
-	return _list.empty();
+	return _storage.empty(SharedMediaKey(_peer->id, PinnedType, 0));
 }
 
 MsgId PinnedMessages::topId() const {
-	const auto slice = _list.snapshot(MessagesQuery{
-		.aroundId = MaxMessagePosition,
-		.limitBefore = 1,
-		.limitAfter = 1
-	});
-	return slice.messageIds.empty() ? 0 : slice.messageIds.back().fullId.msg;
+	const auto slice = _storage.snapshot(
+		SharedMediaQuery(
+			SharedMediaKey(_peer->id, PinnedType, ServerMaxMsgId),
+			1,
+			1));
+	return slice.messageIds.empty() ? 0 : slice.messageIds.back();
 }
 
 rpl::producer<PinnedAroundId> PinnedMessages::viewer(
 		MsgId aroundId,
 		int limit) const {
-	return _list.viewer(MessagesQuery{
-		.aroundId = position(aroundId),
-		.limitBefore = limit,
-		.limitAfter = limit
-	}) | rpl::map([](const MessagesResult &result) {
+	return _storage.query(
+		SharedMediaQuery(
+			SharedMediaKey(_peer->id, PinnedType, aroundId),
+			limit,
+			limit)
+	) | rpl::map([](const SharedMediaResult &result) {
 		auto data = PinnedAroundId();
 		data.fullCount = result.count;
 		data.skippedBefore = result.skippedBefore;
 		data.skippedAfter = result.skippedAfter;
-		data.ids = result.messageIds | ranges::view::transform(
-			[](MessagePosition position) { return position.fullId.msg; }
-		) | ranges::to_vector;
+		data.ids = result.messageIds | ranges::to_vector;
 		return data;
 	});
 }
 
-MessagePosition PinnedMessages::position(MsgId id) const {
-	return MessagePosition{
-	   .fullId = FullMsgId(_channelId, id),
-	};
-}
-
-void PinnedMessages::add(MsgId messageId) {
-	_list.addOne(position(messageId));
-}
-
-void PinnedMessages::add(
-		std::vector<MsgId> &&ids,
-		MsgRange range,
-		std::optional<int> count) {
-	auto positions = ids | ranges::view::transform([&](MsgId id) {
-		return position(id);
-	}) | ranges::to_vector;
-
-	_list.addSlice(
-		std::move(positions),
-		MessagesRange{
-			.from = range.from ? position(range.from) : MinMessagePosition,
-			.till = position(range.till)
-		},
-		count);
-}
-
-void PinnedMessages::remove(MsgId messageId) {
-	_list.removeOne(position(messageId));
-}
-
 void PinnedMessages::setTopId(MsgId messageId) {
 	while (true) {
 		auto top = topId();
 		if (top > messageId) {
-			remove(top);
+			_storage.remove(Storage::SharedMediaRemoveOne(
+				_peer->id,
+				PinnedType,
+				top));
 		} else if (top == messageId) {
 			return;
 		} else {
 			break;
 		}
 	}
-	const auto wrapped = position(messageId);
-	_list.addSlice(
-		{ wrapped },
-		{ .from = wrapped, .till = MaxMessagePosition },
-		std::nullopt);
-}
-
-void PinnedMessages::clearLessThanId(MsgId messageId) {
-	_list.removeLessThan(position(messageId));
+	_storage.add(Storage::SharedMediaAddNew(
+		_peer->id,
+		PinnedType,
+		messageId));
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_pinned_messages.h b/Telegram/SourceFiles/data/data_pinned_messages.h
index 33cf120e5..5edcd29ec 100644
--- a/Telegram/SourceFiles/data/data_pinned_messages.h
+++ b/Telegram/SourceFiles/data/data_pinned_messages.h
@@ -10,6 +10,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_messages.h"
 #include "base/weak_ptr.h"
 
+namespace Storage {
+class Facade;
+} // namespace Storage
+
 namespace Data {
 
 struct PinnedAroundId {
@@ -21,30 +25,18 @@ struct PinnedAroundId {
 
 class PinnedMessages final : public base::has_weak_ptr {
 public:
-	explicit PinnedMessages(ChannelId channelId);
+	explicit PinnedMessages(not_null<PeerData*> peer);
 
 	[[nodiscard]] bool empty() const;
 	[[nodiscard]] MsgId topId() const;
 	[[nodiscard]] rpl::producer<PinnedAroundId> viewer(
 		MsgId aroundId,
 		int limit) const;
-
-	void add(MsgId messageId);
-	void add(
-		std::vector<MsgId> &&ids,
-		MsgRange range,
-		std::optional<int> count);
-	void remove(MsgId messageId);
-
 	void setTopId(MsgId messageId);
 
-	void clearLessThanId(MsgId messageId);
-
 private:
-	[[nodiscard]] MessagePosition position(MsgId id) const;
-
-	MessagesList _list;
-	ChannelId _channelId = 0;
+	const not_null<PeerData*> _peer;
+	Storage::Facade &_storage;
 
 };
 
diff --git a/Telegram/SourceFiles/data/data_search_controller.cpp b/Telegram/SourceFiles/data/data_search_controller.cpp
index 367ed2e97..b12f7fbc5 100644
--- a/Telegram/SourceFiles/data/data_search_controller.cpp
+++ b/Telegram/SourceFiles/data/data_search_controller.cpp
@@ -55,6 +55,8 @@ std::optional<MTPmessages_Search> PrepareSearchRequest(
 			return MTP_inputMessagesFilterUrl();
 		case Type::ChatPhoto:
 			return MTP_inputMessagesFilterChatPhotos();
+		case Type::Pinned:
+			return MTP_inputMessagesFilterPinned();
 		}
 		return MTP_inputMessagesFilterEmpty();
 	}();
diff --git a/Telegram/SourceFiles/data/data_shared_media.cpp b/Telegram/SourceFiles/data/data_shared_media.cpp
index 849fac0e3..8497ce8f7 100644
--- a/Telegram/SourceFiles/data/data_shared_media.cpp
+++ b/Telegram/SourceFiles/data/data_shared_media.cpp
@@ -123,7 +123,8 @@ rpl::producer<SparseIdsSlice> SharedMediaViewer(
 		using AllRemoved = Storage::SharedMediaRemoveAll;
 		session->storage().sharedMediaAllRemoved(
 		) | rpl::filter([=](const AllRemoved &update) {
-			return (update.peerId == key.peerId);
+			return (update.peerId == key.peerId)
+				&& (update.types.test(key.type));
 		}) | rpl::filter([=] {
 			return builder->removeAll();
 		}) | rpl::start_with_next(pushNextSnapshot, lifetime);
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 847d512a9..1459ce95f 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -177,7 +177,6 @@ void History::itemVanished(not_null<HistoryItem*> item) {
 		&& unreadCount() > 0) {
 		setUnreadCount(unreadCount() - 1);
 	}
-	peer->removePinnedMessage(item->id);
 }
 
 void History::setLocalDraft(std::unique_ptr<Data::Draft> &&draft) {
@@ -707,9 +706,6 @@ not_null<HistoryItem*> History::addNewToBack(
 				item->id,
 				{ from, till }));
 		}
-		if (item->isPinned()) {
-			item->history()->peer->addPinnedMessage(item->id);
-		}
 	}
 	if (item->from()->id) {
 		if (auto user = item->from()->asUser()) {
@@ -1007,10 +1003,11 @@ void History::applyServiceChanges(
 			replyTo->match([&](const MTPDmessageReplyHeader &data) {
 				const auto id = data.vreply_to_msg_id().v;
 				if (item) {
-					item->history()->peer->addPinnedSlice(
+					session().storage().add(Storage::SharedMediaAddSlice(
+						peer->id,
+						Storage::SharedMediaType::Pinned,
 						{ id },
-						{ id, ServerMaxMsgId },
-						std::nullopt);
+						{ id, ServerMaxMsgId }));
 				}
 			});
 		}
@@ -1164,7 +1161,6 @@ void History::addEdgesToSharedMedia() {
 			{},
 			{ from, till }));
 	}
-	peer->addPinnedSlice({}, { from, till }, std::nullopt);
 }
 
 void History::addOlderSlice(const QVector<MTPMessage> &slice) {
@@ -1328,7 +1324,6 @@ void History::checkAddAllToUnreadMentions() {
 
 void History::addToSharedMedia(
 		const std::vector<not_null<HistoryItem*>> &items) {
-	auto pinned = std::vector<MsgId>();
 	std::vector<MsgId> medias[Storage::kSharedMediaTypeCount];
 	for (const auto item : items) {
 		if (const auto types = item->sharedMediaTypes()) {
@@ -1342,12 +1337,6 @@ void History::addToSharedMedia(
 				}
 			}
 		}
-		if (item->isPinned()) {
-			if (pinned.empty()) {
-				pinned.reserve(items.size());
-			}
-			pinned.push_back(item->id);
-		}
 	}
 	const auto from = loadedAtTop() ? 0 : minMsgId();
 	const auto till = loadedAtBottom() ? ServerMaxMsgId : maxMsgId();
@@ -1361,7 +1350,6 @@ void History::addToSharedMedia(
 				{ from, till }));
 		}
 	}
-	peer->addPinnedSlice(std::move(pinned), { from, till }, std::nullopt);
 }
 
 void History::calculateFirstUnreadMessage() {
@@ -3029,7 +3017,6 @@ void History::clear(ClearType type) {
 		clearSharedMedia();
 		clearLastKeyboard();
 		if (const auto channel = peer->asChannel()) {
-			channel->clearPinnedMessages();
 			//if (const auto feed = channel->feed()) { // #feed
 			//	// Should be after resetting the _lastMessage.
 			//	feed->historyCleared(this);
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 0bae6ffd7..71d4acb53 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -350,10 +350,17 @@ void HistoryItem::markMediaRead() {
 void HistoryItem::setIsPinned(bool pinned) {
 	if (pinned) {
 		_flags |= MTPDmessage::Flag::f_pinned;
-		history()->peer->addPinnedMessage(id);
+		history()->session().storage().add(Storage::SharedMediaAddExisting(
+			history()->peer->id,
+			Storage::SharedMediaType::Pinned,
+			id,
+			{ id, id }));
 	} else {
 		_flags &= ~MTPDmessage::Flag::f_pinned;
-		history()->peer->removePinnedMessage(id);
+		history()->session().storage().remove(Storage::SharedMediaRemoveOne(
+			history()->peer->id,
+			Storage::SharedMediaType::Pinned,
+			id));
 	}
 }
 
diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp
index dba278fe5..f11299973 100644
--- a/Telegram/SourceFiles/history/history_message.cpp
+++ b/Telegram/SourceFiles/history/history_message.cpp
@@ -1409,6 +1409,9 @@ Storage::SharedMediaTypesMask HistoryMessage::sharedMediaTypes() const {
 	if (hasTextLinks()) {
 		result.set(Storage::SharedMediaType::Link);
 	}
+	if (isPinned()) {
+		result.set(Storage::SharedMediaType::Pinned);
+	}
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 233a027af..44d0fe991 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -70,6 +70,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_top_bar_widget.h"
 #include "history/view/history_view_contact_status.h"
 #include "history/view/history_view_pinned_tracker.h"
+#include "history/view/history_view_pinned_section.h"
 #include "history/view/history_view_pinned_bar.h"
 #include "history/view/media/history_view_media.h"
 #include "profile/profile_block_group_members.h"
@@ -108,6 +109,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_slide_animation.h"
 #include "window/window_peer_menu.h"
 #include "inline_bots/inline_results_widget.h"
+#include "info/profile/info_profile_values.h" // SharedMediaCountValue.
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "core/crash_reports.h"
 #include "core/shortcuts.h"
@@ -3219,6 +3221,9 @@ void HistoryWidget::doneShow() {
 	}
 	preloadHistoryIfNeeded();
 	updatePinnedViewer();
+	if (_pinnedBar) {
+		_pinnedBar->finishAnimating();
+	}
 	checkHistoryActivation();
 	App::wnd()->setInnerFocus();
 }
@@ -5177,10 +5182,9 @@ void HistoryWidget::updatePinnedViewer() {
 		}
 		return std::pair(item, offset);
 	}();
-	const auto last = _history->peer->topPinnedMessageId();
 	const auto lessThanId = item
 		? (item->data()->id + (offset > 0 ? 1 : 0))
-		: (last + 1);
+		: (_history->peer->topPinnedMessageId() + 1);
 	_pinnedTracker->trackAround(lessThanId);
 }
 
@@ -5189,7 +5193,13 @@ void HistoryWidget::setupPinnedTracker() {
 
 	_pinnedTracker = std::make_unique<HistoryView::PinnedTracker>(_history);
 	_pinnedBar = nullptr;
-	checkPinnedBarState();
+	Info::Profile::SharedMediaCountValue(
+		_history->peer,
+		_migrated ? _migrated->peer.get() : nullptr,
+		Storage::SharedMediaType::Pinned
+	) | rpl::start_with_next([=] {
+		checkPinnedBarState();
+	}, _pinnedTracker->lifetime());
 }
 
 void HistoryWidget::checkPinnedBarState() {
@@ -5258,7 +5268,9 @@ void HistoryWidget::checkPinnedBarState() {
 	) | rpl::start_with_next([=] {
 		const auto id = _pinnedTracker->currentMessageId();
 		if (id.message) {
-			Ui::showPeerHistory(_peer, id.message);
+			controller()->showSection(
+				HistoryView::PinnedMemento(_history, id.message));
+			//Ui::showPeerHistory(_peer, id.message);
 		}
 	}, _pinnedBar->lifetime());
 
@@ -5543,8 +5555,6 @@ void HistoryWidget::UnpinMessage(not_null<PeerData*> peer, MsgId msgId) {
 
 	const auto session = &peer->session();
 	Ui::show(Box<ConfirmBox>(tr::lng_pinned_unpin_sure(tr::now), tr::lng_pinned_unpin(tr::now), crl::guard(session, [=] {
-		peer->removePinnedMessage(msgId);
-
 		Ui::hideLayer();
 		session->api().request(MTPmessages_UpdatePinnedMessage(
 			MTP_flags(MTPmessages_UpdatePinnedMessage::Flag::f_unpin),
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
new file mode 100644
index 000000000..5c9e86e6e
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -0,0 +1,594 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/history_view_pinned_section.h"
+
+#include "history/view/history_view_top_bar_widget.h"
+#include "history/view/history_view_list_widget.h"
+#include "history/history.h"
+#include "history/history_item_components.h"
+#include "history/history_item.h"
+#include "boxes/confirm_box.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/widgets/shadow.h"
+#include "ui/layers/generic_box.h"
+#include "ui/item_text_options.h"
+#include "ui/toast/toast.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
+#include "ui/special_buttons.h"
+#include "ui/ui_utility.h"
+#include "ui/toasts/common_toasts.h"
+#include "base/timer_rpl.h"
+#include "apiwrap.h"
+#include "window/window_session_controller.h"
+#include "window/window_peer_menu.h"
+#include "base/event_filter.h"
+#include "base/call_delayed.h"
+#include "core/file_utilities.h"
+#include "main/main_session.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "data/data_channel.h"
+#include "data/data_pinned_messages.h"
+#include "data/data_changes.h"
+#include "data/data_sparse_ids.h"
+#include "data/data_shared_media.h"
+#include "storage/storage_account.h"
+#include "platform/platform_specific.h"
+#include "lang/lang_keys.h"
+#include "facades.h"
+#include "app.h"
+#include "styles/style_chat.h"
+#include "styles/style_window.h"
+#include "styles/style_info.h"
+#include "styles/style_boxes.h"
+
+#include <QtCore/QMimeData>
+#include <QtGui/QGuiApplication>
+
+namespace HistoryView {
+namespace {
+
+} // namespace
+
+object_ptr<Window::SectionWidget> PinnedMemento::createWidget(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller,
+		Window::Column column,
+		const QRect &geometry) {
+	if (column == Window::Column::Third) {
+		return nullptr;
+	}
+	auto result = object_ptr<PinnedWidget>(
+		parent,
+		controller,
+		_history);
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+PinnedWidget::PinnedWidget(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller,
+	not_null<History*> history)
+: Window::SectionWidget(parent, controller)
+, _history(history)
+, _topBar(this, controller)
+, _topBarShadow(this)
+, _scroll(std::make_unique<Ui::ScrollArea>(this, st::historyScroll, false))
+, _scrollDown(_scroll.get(), st::historyToDown) {
+	_topBar->setActiveChat(
+		_history,
+		TopBarWidget::Section::Pinned,
+		nullptr);
+
+	_topBar->move(0, 0);
+	_topBar->resizeToWidth(width());
+	_topBar->show();
+
+	_topBar->deleteSelectionRequest(
+	) | rpl::start_with_next([=] {
+		confirmDeleteSelected();
+	}, _topBar->lifetime());
+	_topBar->forwardSelectionRequest(
+	) | rpl::start_with_next([=] {
+		confirmForwardSelected();
+	}, _topBar->lifetime());
+	_topBar->clearSelectionRequest(
+	) | rpl::start_with_next([=] {
+		clearSelected();
+	}, _topBar->lifetime());
+
+	_topBarShadow->raise();
+	updateAdaptiveLayout();
+	subscribe(Adaptive::Changed(), [=] { updateAdaptiveLayout(); });
+
+	_inner = _scroll->setOwnedWidget(object_ptr<ListWidget>(
+		this,
+		controller,
+		static_cast<ListDelegate*>(this)));
+	_scroll->move(0, _topBar->height());
+	_scroll->show();
+	connect(_scroll.get(), &Ui::ScrollArea::scrolled, [=] { onScroll(); });
+
+	setupScrollDownButton();
+}
+
+PinnedWidget::~PinnedWidget() = default;
+
+void PinnedWidget::setupScrollDownButton() {
+	_scrollDown->setClickedCallback([=] {
+		scrollDownClicked();
+	});
+	base::install_event_filter(_scrollDown, [=](not_null<QEvent*> event) {
+		if (event->type() != QEvent::Wheel) {
+			return base::EventFilterResult::Continue;
+		}
+		return _scroll->viewportEvent(event)
+			? base::EventFilterResult::Cancel
+			: base::EventFilterResult::Continue;
+	});
+	updateScrollDownVisibility();
+}
+
+void PinnedWidget::scrollDownClicked() {
+	if (QGuiApplication::keyboardModifiers() == Qt::ControlModifier) {
+		showAtEnd();
+	//} else if (_replyReturn) {
+	//	showAtPosition(_replyReturn->position());
+	} else {
+		showAtEnd();
+	}
+}
+
+void PinnedWidget::showAtStart() {
+	showAtPosition(Data::MinMessagePosition);
+}
+
+void PinnedWidget::showAtEnd() {
+	showAtPosition(Data::MaxMessagePosition);
+}
+
+void PinnedWidget::showAtPosition(
+		Data::MessagePosition position,
+		HistoryItem *originItem) {
+	if (!showAtPositionNow(position, originItem)) {
+		_inner->showAroundPosition(position, [=] {
+			return showAtPositionNow(position, originItem);
+		});
+	}
+}
+
+bool PinnedWidget::showAtPositionNow(
+		Data::MessagePosition position,
+		HistoryItem *originItem) {
+	const auto item = position.fullId
+		? _history->owner().message(position.fullId)
+		: nullptr;
+	const auto use = item ? item->position() : position;
+	if (const auto scrollTop = _inner->scrollTopForPosition(use)) {
+		const auto currentScrollTop = _scroll->scrollTop();
+		const auto wanted = snap(*scrollTop, 0, _scroll->scrollTopMax());
+		const auto fullDelta = (wanted - currentScrollTop);
+		const auto limit = _scroll->height();
+		const auto scrollDelta = snap(fullDelta, -limit, limit);
+		_inner->animatedScrollTo(
+			wanted,
+			use,
+			scrollDelta,
+			(std::abs(fullDelta) > limit
+				? HistoryView::ListWidget::AnimatedScroll::Part
+				: HistoryView::ListWidget::AnimatedScroll::Full));
+		if (use != Data::MaxMessagePosition
+			&& use != Data::UnreadMessagePosition) {
+			_inner->highlightMessage(use.fullId);
+		}
+		return true;
+	}
+	return false;
+}
+
+void PinnedWidget::updateScrollDownVisibility() {
+	if (animating()) {
+		return;
+	}
+
+	const auto scrollDownIsVisible = [&]() -> std::optional<bool> {
+		const auto top = _scroll->scrollTop() + st::historyToDownShownAfter;
+		if (top < _scroll->scrollTopMax()) {
+			return true;
+		} else if (_inner->loadedAtBottomKnown()) {
+			return !_inner->loadedAtBottom();
+		}
+		return std::nullopt;
+	};
+	const auto scrollDownIsShown = scrollDownIsVisible();
+	if (!scrollDownIsShown) {
+		return;
+	}
+	if (_scrollDownIsShown != *scrollDownIsShown) {
+		_scrollDownIsShown = *scrollDownIsShown;
+		_scrollDownShown.start(
+			[=] { updateScrollDownPosition(); },
+			_scrollDownIsShown ? 0. : 1.,
+			_scrollDownIsShown ? 1. : 0.,
+			st::historyToDownDuration);
+	}
+}
+
+void PinnedWidget::updateScrollDownPosition() {
+	// _scrollDown is a child widget of _scroll, not me.
+	auto top = anim::interpolate(
+		0,
+		_scrollDown->height() + st::historyToDownPosition.y(),
+		_scrollDownShown.value(_scrollDownIsShown ? 1. : 0.));
+	_scrollDown->moveToRight(
+		st::historyToDownPosition.x(),
+		_scroll->height() - top);
+	auto shouldBeHidden = !_scrollDownIsShown && !_scrollDownShown.animating();
+	if (shouldBeHidden != _scrollDown->isHidden()) {
+		_scrollDown->setVisible(!shouldBeHidden);
+	}
+}
+
+void PinnedWidget::scrollDownAnimationFinish() {
+	_scrollDownShown.stop();
+	updateScrollDownPosition();
+}
+
+void PinnedWidget::updateAdaptiveLayout() {
+	_topBarShadow->moveToLeft(
+		Adaptive::OneColumn() ? 0 : st::lineWidth,
+		_topBar->height());
+}
+
+not_null<History*> PinnedWidget::history() const {
+	return _history;
+}
+
+Dialogs::RowDescriptor PinnedWidget::activeChat() const {
+	return {
+		_history,
+		FullMsgId(_history->channelId(), ShowAtUnreadMsgId)
+	};
+}
+
+QPixmap PinnedWidget::grabForShowAnimation(const Window::SectionSlideParams &params) {
+	_topBar->updateControlsVisibility();
+	if (params.withTopBarShadow) _topBarShadow->hide();
+	auto result = Ui::GrabWidget(this);
+	if (params.withTopBarShadow) _topBarShadow->show();
+	return result;
+}
+
+void PinnedWidget::doSetInnerFocus() {
+	if (!_inner->getSelectedText().rich.text.isEmpty()
+		|| !_inner->getSelectedItems().empty()) {
+		_inner->setFocus();
+	}
+}
+
+bool PinnedWidget::showInternal(
+		not_null<Window::SectionMemento*> memento,
+		const Window::SectionShow &params) {
+	if (auto logMemento = dynamic_cast<PinnedMemento*>(memento.get())) {
+		if (logMemento->getHistory() == history()) {
+			restoreState(logMemento);
+			return true;
+		}
+	}
+	return false;
+}
+
+void PinnedWidget::setInternalState(
+		const QRect &geometry,
+		not_null<PinnedMemento*> memento) {
+	setGeometry(geometry);
+	Ui::SendPendingMoveResizeEvents(this);
+	restoreState(memento);
+}
+
+std::unique_ptr<Window::SectionMemento> PinnedWidget::createMemento() {
+	auto result = std::make_unique<PinnedMemento>(history());
+	saveState(result.get());
+	return result;
+}
+
+bool PinnedWidget::showMessage(
+		PeerId peerId,
+		const Window::SectionShow &params,
+		MsgId messageId) {
+	if (peerId != _history->peer->id) {
+		return false;
+	}
+	const auto id = FullMsgId{
+		_history->channelId(),
+		messageId
+	};
+	const auto message = _history->owner().message(id);
+	if (!message || !message->isPinned()) {
+		return false;
+	}
+
+	const auto originItem = [&]() -> HistoryItem* {
+		using OriginMessage = Window::SectionShow::OriginMessage;
+		if (const auto origin = std::get_if<OriginMessage>(&params.origin)) {
+			if (const auto returnTo = session().data().message(origin->id)) {
+				if (returnTo->history() == _history && returnTo->isPinned()) {
+					return returnTo;
+				}
+			}
+		}
+		return nullptr;
+	}();
+	showAtPosition(
+		Data::MessagePosition{ .fullId = id, .date = message->date() },
+		originItem);
+	return true;
+}
+
+void PinnedWidget::saveState(not_null<PinnedMemento*> memento) {
+	_inner->saveState(memento->list());
+}
+
+void PinnedWidget::restoreState(not_null<PinnedMemento*> memento) {
+	_inner->restoreState(memento->list());
+	if (const auto highlight = memento->getHighlightId()) {
+		const auto position = Data::MessagePosition{
+			.fullId = FullMsgId(_history->channelId(), highlight),
+			.date = TimeId(0),
+		};
+		_inner->showAroundPosition(position, [=] {
+			return showAtPositionNow(position, nullptr);
+		});
+	}
+}
+
+void PinnedWidget::resizeEvent(QResizeEvent *e) {
+	if (!width() || !height()) {
+		return;
+	}
+	recountChatWidth();
+	updateControlsGeometry();
+}
+
+void PinnedWidget::recountChatWidth() {
+	auto layout = (width() < st::adaptiveChatWideWidth)
+		? Adaptive::ChatLayout::Normal
+		: Adaptive::ChatLayout::Wide;
+	if (layout != Global::AdaptiveChatLayout()) {
+		Global::SetAdaptiveChatLayout(layout);
+		Adaptive::Changed().notify(true);
+	}
+}
+
+void PinnedWidget::updateControlsGeometry() {
+	const auto contentWidth = width();
+
+	const auto newScrollTop = _scroll->isHidden()
+		? std::nullopt
+		: base::make_optional(_scroll->scrollTop() + topDelta());
+	_topBar->resizeToWidth(contentWidth);
+	_topBarShadow->resize(contentWidth, st::lineWidth);
+
+	const auto bottom = height();
+	const auto controlsHeight = 0;
+	const auto scrollY = _topBar->height();
+	const auto scrollHeight = bottom - scrollY - controlsHeight;
+	const auto scrollSize = QSize(contentWidth, scrollHeight);
+	if (_scroll->size() != scrollSize) {
+		_skipScrollEvent = true;
+		_scroll->resize(scrollSize);
+		_inner->resizeToWidth(scrollSize.width(), _scroll->height());
+		_skipScrollEvent = false;
+	}
+	_scroll->move(0, scrollY);
+	if (!_scroll->isHidden()) {
+		if (newScrollTop) {
+			_scroll->scrollToY(*newScrollTop);
+		}
+		updateInnerVisibleArea();
+	}
+	updateScrollDownPosition();
+}
+
+void PinnedWidget::paintEvent(QPaintEvent *e) {
+	if (animating()) {
+		SectionWidget::paintEvent(e);
+		return;
+	} else if (Ui::skipPaintEvent(this, e)) {
+		return;
+	}
+
+	const auto aboveHeight = _topBar->height();
+	const auto bg = e->rect().intersected(
+		QRect(0, aboveHeight, width(), height() - aboveHeight));
+	SectionWidget::PaintBackground(controller(), this, bg);
+}
+
+void PinnedWidget::onScroll() {
+	if (_skipScrollEvent) {
+		return;
+	}
+	updateInnerVisibleArea();
+}
+
+void PinnedWidget::updateInnerVisibleArea() {
+	const auto scrollTop = _scroll->scrollTop();
+	_inner->setVisibleTopBottom(scrollTop, scrollTop + _scroll->height());
+	updateScrollDownVisibility();
+}
+
+void PinnedWidget::showAnimatedHook(
+		const Window::SectionSlideParams &params) {
+	_topBar->setAnimatingMode(true);
+	if (params.withTopBarShadow) {
+		_topBarShadow->show();
+	}
+}
+
+void PinnedWidget::showFinishedHook() {
+	_topBar->setAnimatingMode(false);
+}
+
+bool PinnedWidget::floatPlayerHandleWheelEvent(QEvent *e) {
+	return _scroll->viewportEvent(e);
+}
+
+QRect PinnedWidget::floatPlayerAvailableRect() {
+	return mapToGlobal(_scroll->geometry());
+}
+
+Context PinnedWidget::listContext() {
+	return Context::Replies;
+}
+
+void PinnedWidget::listScrollTo(int top) {
+	if (_scroll->scrollTop() != top) {
+		_scroll->scrollToY(top);
+	} else {
+		updateInnerVisibleArea();
+	}
+}
+
+void PinnedWidget::listCancelRequest() {
+	if (_inner && !_inner->getSelectedItems().empty()) {
+		clearSelected();
+		return;
+	}
+	controller()->showBackFromStack();
+}
+
+void PinnedWidget::listDeleteRequest() {
+	confirmDeleteSelected();
+}
+
+rpl::producer<Data::MessagesSlice> PinnedWidget::listSource(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) {
+	const auto channelId = peerToChannel(_history->peer->id);
+	const auto messageId = aroundId.fullId.msg
+		? aroundId.fullId.msg
+		: (ServerMaxMsgId - 1);
+	return SharedMediaViewer(
+		&_history->session(),
+		Storage::SharedMediaKey(
+			_history->peer->id,
+			Storage::SharedMediaType::Pinned,
+			messageId),
+		limitBefore,
+		limitAfter
+	) | rpl::map([=](SparseIdsSlice &&slice) {
+		auto result = Data::MessagesSlice();
+		result.fullCount = slice.fullCount();
+		result.skippedAfter = slice.skippedAfter();
+		result.skippedBefore = slice.skippedBefore();
+		const auto count = slice.size();
+		result.ids.reserve(count);
+		if (const auto msgId = slice.nearest(messageId)) {
+			result.nearestToAround = FullMsgId(channelId, *msgId);
+		}
+		for (auto i = 0; i != count; ++i) {
+			result.ids.emplace_back(channelId, slice[i]);
+		}
+		return result;
+	});
+}
+
+bool PinnedWidget::listAllowsMultiSelect() {
+	return true;
+}
+
+bool PinnedWidget::listIsItemGoodForSelection(
+		not_null<HistoryItem*> item) {
+	return !item->isSending() && !item->hasFailed();
+}
+
+bool PinnedWidget::listIsLessInOrder(
+		not_null<HistoryItem*> first,
+		not_null<HistoryItem*> second) {
+	return first->position() < second->position();
+}
+
+void PinnedWidget::listSelectionChanged(SelectedItems &&items) {
+	HistoryView::TopBarWidget::SelectedState state;
+	state.count = items.size();
+	for (const auto item : items) {
+		if (item.canDelete) {
+			++state.canDeleteCount;
+		}
+		if (item.canForward) {
+			++state.canForwardCount;
+		}
+	}
+	_topBar->showSelected(state);
+}
+
+void PinnedWidget::listVisibleItemsChanged(HistoryItemsList &&items) {
+}
+
+MessagesBarData PinnedWidget::listMessagesBar(
+		const std::vector<not_null<Element*>> &elements) {
+	return {};
+}
+
+void PinnedWidget::listContentRefreshed() {
+}
+
+ClickHandlerPtr PinnedWidget::listDateLink(not_null<Element*> view) {
+	return nullptr;
+}
+
+bool PinnedWidget::listElementHideReply(not_null<const Element*> view) {
+	return false;
+}
+
+bool PinnedWidget::listElementShownUnread(not_null<const Element*> view) {
+	return view->data()->unread();
+}
+
+bool PinnedWidget::listIsGoodForAroundPosition(
+		not_null<const Element*> view) {
+	return IsServerMsgId(view->data()->id);
+}
+
+void PinnedWidget::confirmDeleteSelected() {
+	auto items = _inner->getSelectedItems();
+	if (items.empty()) {
+		return;
+	}
+	const auto weak = Ui::MakeWeak(this);
+	const auto box = Ui::show(Box<DeleteMessagesBox>(
+		&_history->session(),
+		std::move(items)));
+	box->setDeleteConfirmedCallback([=] {
+		if (const auto strong = weak.data()) {
+			strong->clearSelected();
+		}
+	});
+}
+
+void PinnedWidget::confirmForwardSelected() {
+	auto items = _inner->getSelectedItems();
+	if (items.empty()) {
+		return;
+	}
+	const auto weak = Ui::MakeWeak(this);
+	Window::ShowForwardMessagesBox(controller(), std::move(items), [=] {
+		if (const auto strong = weak.data()) {
+			strong->clearSelected();
+		}
+	});
+}
+
+void PinnedWidget::clearSelected() {
+	_inner->cancelSelection();
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.h b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
new file mode 100644
index 000000000..b355e7788
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -0,0 +1,182 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "window/section_widget.h"
+#include "window/section_memento.h"
+#include "history/view/history_view_list_widget.h"
+#include "data/data_messages.h"
+#include "base/weak_ptr.h"
+#include "base/timer.h"
+
+class History;
+
+namespace Ui {
+class ScrollArea;
+class PlainShadow;
+class FlatButton;
+class HistoryDownButton;
+} // namespace Ui
+
+namespace Profile {
+class BackButton;
+} // namespace Profile
+
+namespace HistoryView {
+
+class Element;
+class TopBarWidget;
+class PinnedMemento;
+
+class PinnedWidget final
+	: public Window::SectionWidget
+	, private ListDelegate {
+public:
+	PinnedWidget(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller,
+		not_null<History*> history);
+	~PinnedWidget();
+
+	[[nodiscard]] not_null<History*> history() const;
+	Dialogs::RowDescriptor activeChat() const override;
+
+	bool hasTopBarShadow() const override {
+		return true;
+	}
+
+	QPixmap grabForShowAnimation(
+		const Window::SectionSlideParams &params) override;
+
+	bool showInternal(
+		not_null<Window::SectionMemento*> memento,
+		const Window::SectionShow &params) override;
+	std::unique_ptr<Window::SectionMemento> createMemento() override;
+	bool showMessage(
+		PeerId peerId,
+		const Window::SectionShow &params,
+		MsgId messageId) override;
+
+	void setInternalState(
+		const QRect &geometry,
+		not_null<PinnedMemento*> memento);
+
+	// Float player interface.
+	bool floatPlayerHandleWheelEvent(QEvent *e) override;
+	QRect floatPlayerAvailableRect() override;
+
+	// ListDelegate interface.
+	Context listContext() override;
+	void listScrollTo(int top) override;
+	void listCancelRequest() override;
+	void listDeleteRequest() override;
+	rpl::producer<Data::MessagesSlice> listSource(
+		Data::MessagePosition aroundId,
+		int limitBefore,
+		int limitAfter) override;
+	bool listAllowsMultiSelect() override;
+	bool listIsItemGoodForSelection(not_null<HistoryItem*> item) override;
+	bool listIsLessInOrder(
+		not_null<HistoryItem*> first,
+		not_null<HistoryItem*> second) override;
+	void listSelectionChanged(SelectedItems &&items) override;
+	void listVisibleItemsChanged(HistoryItemsList &&items) override;
+	MessagesBarData listMessagesBar(
+		const std::vector<not_null<Element*>> &elements) override;
+	void listContentRefreshed() override;
+	ClickHandlerPtr listDateLink(not_null<Element*> view) override;
+	bool listElementHideReply(not_null<const Element*> view) override;
+	bool listElementShownUnread(not_null<const Element*> view) override;
+	bool listIsGoodForAroundPosition(not_null<const Element*> view) override;
+
+protected:
+	void resizeEvent(QResizeEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+
+	void showAnimatedHook(
+		const Window::SectionSlideParams &params) override;
+	void showFinishedHook() override;
+	void doSetInnerFocus() override;
+
+private:
+	void onScroll();
+	void updateInnerVisibleArea();
+	void updateControlsGeometry();
+	void updateAdaptiveLayout();
+	void saveState(not_null<PinnedMemento*> memento);
+	void restoreState(not_null<PinnedMemento*> memento);
+	void showAtStart();
+	void showAtEnd();
+	void showAtPosition(
+		Data::MessagePosition position,
+		HistoryItem *originItem = nullptr);
+	bool showAtPositionNow(
+		Data::MessagePosition position,
+		HistoryItem *originItem);
+
+	void setupScrollDownButton();
+	void scrollDownClicked();
+	void scrollDownAnimationFinish();
+	void updateScrollDownVisibility();
+	void updateScrollDownPosition();
+
+	void confirmDeleteSelected();
+	void confirmForwardSelected();
+	void clearSelected();
+	void recountChatWidth();
+
+	const not_null<History*> _history;
+	QPointer<ListWidget> _inner;
+	object_ptr<TopBarWidget> _topBar;
+	object_ptr<Ui::PlainShadow> _topBarShadow;
+
+	bool _skipScrollEvent = false;
+	std::unique_ptr<Ui::ScrollArea> _scroll;
+
+	Ui::Animations::Simple _scrollDownShown;
+	bool _scrollDownIsShown = false;
+	object_ptr<Ui::HistoryDownButton> _scrollDown;
+
+	Data::MessagesSlice _lastSlice;
+
+};
+
+class PinnedMemento : public Window::SectionMemento {
+public:
+	PinnedMemento(
+		not_null<History*> history,
+		MsgId highlightId = 0)
+	: _history(history)
+	, _highlightId(highlightId) {
+	}
+
+	object_ptr<Window::SectionWidget> createWidget(
+		QWidget *parent,
+		not_null<Window::SessionController*> controller,
+		Window::Column column,
+		const QRect &geometry) override;
+
+	[[nodiscard]] not_null<History*> getHistory() const {
+		return _history;
+	}
+
+	[[nodiscard]] not_null<ListMemento*> list() {
+		return &_list;
+	}
+	[[nodiscard]] MsgId getHighlightId() const {
+		return _highlightId;
+	}
+
+private:
+	const not_null<History*> _history;
+	const MsgId _highlightId = 0;
+	ListMemento _list;
+
+};
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
index 6962a4903..7600c5bfd 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
@@ -14,6 +14,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_histories.h"
 #include "main/main_session.h"
+#include "storage/storage_facade.h"
+#include "storage/storage_shared_media.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "apiwrap.h"
@@ -88,16 +90,16 @@ void PinnedTracker::setupViewer(not_null<Data::PinnedMessages*> data) {
 		const auto empty = snapshot.ids.empty();
 		const auto before = (i - begin(snapshot.ids));
 		const auto after = (end(snapshot.ids) - i);
-		if (before < kLoadedLimit && !snapshot.skippedBefore) {
-			load(
-				Data::LoadDirection::Before,
-				empty ? _aroundId : snapshot.ids.front());
-		}
-		if (after < kLoadedLimit && !snapshot.skippedAfter) {
-			load(
-				Data::LoadDirection::After,
-				empty ? _aroundId : snapshot.ids.back());
-		}
+		//if (before < kLoadedLimit && !snapshot.skippedBefore) {
+		//	load(
+		//		Data::LoadDirection::Before,
+		//		empty ? _aroundId : snapshot.ids.front());
+		//}
+		//if (after < kLoadedLimit && !snapshot.skippedAfter) {
+		//	load(
+		//		Data::LoadDirection::After,
+		//		empty ? _aroundId : snapshot.ids.back());
+		//}
 		if (snapshot.ids.empty()) {
 			_current = PinnedId();
 			return;
@@ -117,151 +119,156 @@ void PinnedTracker::setupViewer(not_null<Data::PinnedMessages*> data) {
 		}
 	}, _dataLifetime);
 }
-
-void PinnedTracker::load(Data::LoadDirection direction, MsgId id) {
-	const auto requestId = (direction == Data::LoadDirection::Before)
-		? &_beforeRequestId
-		: &_afterRequestId;
-	const auto aroundId = (direction == Data::LoadDirection::Before)
-		? &_beforeId
-		: &_afterId;
-	if (*requestId) {
-		if (*aroundId == id) {
-			return;
-		}
-		_history->owner().histories().cancelRequest(*requestId);
-	}
-	*aroundId = id;
-	const auto send = [=](Fn<void()> finish) {
-		const auto offsetId = [&] {
-			switch (direction) {
-			case Data::LoadDirection::Before: return id;
-			case Data::LoadDirection::After: return id + 1;
-			}
-			Unexpected("Direction in PinnedTracker::load");
-		}();
-		const auto addOffset = [&] {
-			switch (direction) {
-			case Data::LoadDirection::Before: return 0;
-			case Data::LoadDirection::After: return -kPerPage;
-			}
-			Unexpected("Direction in PinnedTracker::load");
-		}();
-		return _history->session().api().request(MTPmessages_Search(
-			MTP_flags(0),
-			_history->peer->input,
-			MTP_string(QString()),
-			MTP_inputPeerEmpty(),
-			MTPint(), // top_msg_id
-			MTP_inputMessagesFilterPinned(),
-			MTP_int(0),
-			MTP_int(0),
-			MTP_int(offsetId),
-			MTP_int(addOffset),
-			MTP_int(kPerPage),
-			MTP_int(0), // max_id
-			MTP_int(0), // min_id
-			MTP_int(0) // hash
-		)).done([=](const MTPmessages_Messages &result) {
-			*aroundId = 0;
-			*requestId = 0;
-			finish();
-
-			apply(direction, id, result);
-		}).fail([=](const RPCError &error) {
-			*aroundId = 0;
-			*requestId = 0;
-			finish();
-		}).send();
-	};
-	_beforeRequestId = _history->owner().histories().sendRequest(
-		_history,
-		Data::Histories::RequestType::History,
-		send);
-}
-
-void PinnedTracker::apply(
-		Data::LoadDirection direction,
-		MsgId aroundId,
-		const MTPmessages_Messages &result) {
-	auto noSkipRange = MsgRange{ aroundId, aroundId };
-	auto fullCount = std::optional<int>();
-	auto messages = [&] {
-		switch (result.type()) {
-		case mtpc_messages_messages: {
-			auto &d = result.c_messages_messages();
-			_history->owner().processUsers(d.vusers());
-			_history->owner().processChats(d.vchats());
-			fullCount = d.vmessages().v.size();
-			return &d.vmessages().v;
-		} break;
-
-		case mtpc_messages_messagesSlice: {
-			auto &d = result.c_messages_messagesSlice();
-			_history->owner().processUsers(d.vusers());
-			_history->owner().processChats(d.vchats());
-			fullCount = d.vcount().v;
-			return &d.vmessages().v;
-		} break;
-
-		case mtpc_messages_channelMessages: {
-			auto &d = result.c_messages_channelMessages();
-			if (auto channel = _history->peer->asChannel()) {
-				channel->ptsReceived(d.vpts().v);
-			} else {
-				LOG(("API Error: received messages.channelMessages when "
-					"no channel was passed! (PinnedTracker::apply)"));
-			}
-			_history->owner().processUsers(d.vusers());
-			_history->owner().processChats(d.vchats());
-			fullCount = d.vcount().v;
-			return &d.vmessages().v;
-		} break;
-
-		case mtpc_messages_messagesNotModified: {
-			LOG(("API Error: received messages.messagesNotModified! "
-				"(PinnedTracker::apply)"));
-			return (const QVector<MTPMessage>*)nullptr;
-		} break;
-		}
-		Unexpected("messages.Messages type in PinnedTracker::apply.");
-	}();
-
-	if (!messages) {
-		return;
-	}
-
-	const auto addType = NewMessageType::Existing;
-	auto list = std::vector<MsgId>();
-	list.reserve(messages->size());
-	for (const auto &message : *messages) {
-		const auto item = _history->owner().addNewMessage(
-			message,
-			MTPDmessage_ClientFlags(),
-			addType);
-		if (item) {
-			const auto itemId = item->id;
-			if (item->isPinned()) {
-				list.push_back(itemId);
-			}
-			accumulate_min(noSkipRange.from, itemId);
-			accumulate_max(noSkipRange.till, itemId);
-		}
-	}
-	if (aroundId && list.empty()) {
-		noSkipRange = [&]() -> MsgRange {
-			switch (direction) {
-			case Data::LoadDirection::Before: // All old loaded.
-				return { 0, noSkipRange.till };
-			case Data::LoadDirection::Around: // All loaded.
-				return { 0, ServerMaxMsgId };
-			case Data::LoadDirection::After: // All new loaded.
-				return { noSkipRange.from, ServerMaxMsgId };
-			}
-			Unexpected("Direction in PinnedTracker::apply.");
-		}();
-	}
-	_history->peer->addPinnedSlice(std::move(list), noSkipRange, fullCount);
-}
+//
+//void PinnedTracker::load(Data::LoadDirection direction, MsgId id) {
+//	const auto requestId = (direction == Data::LoadDirection::Before)
+//		? &_beforeRequestId
+//		: &_afterRequestId;
+//	const auto aroundId = (direction == Data::LoadDirection::Before)
+//		? &_beforeId
+//		: &_afterId;
+//	if (*requestId) {
+//		if (*aroundId == id) {
+//			return;
+//		}
+//		_history->owner().histories().cancelRequest(*requestId);
+//	}
+//	*aroundId = id;
+//	const auto send = [=](Fn<void()> finish) {
+//		const auto offsetId = [&] {
+//			switch (direction) {
+//			case Data::LoadDirection::Before: return id;
+//			case Data::LoadDirection::After: return id + 1;
+//			}
+//			Unexpected("Direction in PinnedTracker::load");
+//		}();
+//		const auto addOffset = [&] {
+//			switch (direction) {
+//			case Data::LoadDirection::Before: return 0;
+//			case Data::LoadDirection::After: return -kPerPage;
+//			}
+//			Unexpected("Direction in PinnedTracker::load");
+//		}();
+//		return _history->session().api().request(MTPmessages_Search(
+//			MTP_flags(0),
+//			_history->peer->input,
+//			MTP_string(QString()),
+//			MTP_inputPeerEmpty(),
+//			MTPint(), // top_msg_id
+//			MTP_inputMessagesFilterPinned(),
+//			MTP_int(0),
+//			MTP_int(0),
+//			MTP_int(offsetId),
+//			MTP_int(addOffset),
+//			MTP_int(kPerPage),
+//			MTP_int(0), // max_id
+//			MTP_int(0), // min_id
+//			MTP_int(0) // hash
+//		)).done([=](const MTPmessages_Messages &result) {
+//			*aroundId = 0;
+//			*requestId = 0;
+//			finish();
+//
+//			apply(direction, id, result);
+//		}).fail([=](const RPCError &error) {
+//			*aroundId = 0;
+//			*requestId = 0;
+//			finish();
+//		}).send();
+//	};
+//	_beforeRequestId = _history->owner().histories().sendRequest(
+//		_history,
+//		Data::Histories::RequestType::History,
+//		send);
+//}
+//
+//void PinnedTracker::apply(
+//		Data::LoadDirection direction,
+//		MsgId aroundId,
+//		const MTPmessages_Messages &result) {
+//	auto noSkipRange = MsgRange{ aroundId, aroundId };
+//	auto fullCount = std::optional<int>();
+//	auto messages = [&] {
+//		switch (result.type()) {
+//		case mtpc_messages_messages: {
+//			auto &d = result.c_messages_messages();
+//			_history->owner().processUsers(d.vusers());
+//			_history->owner().processChats(d.vchats());
+//			fullCount = d.vmessages().v.size();
+//			return &d.vmessages().v;
+//		} break;
+//
+//		case mtpc_messages_messagesSlice: {
+//			auto &d = result.c_messages_messagesSlice();
+//			_history->owner().processUsers(d.vusers());
+//			_history->owner().processChats(d.vchats());
+//			fullCount = d.vcount().v;
+//			return &d.vmessages().v;
+//		} break;
+//
+//		case mtpc_messages_channelMessages: {
+//			auto &d = result.c_messages_channelMessages();
+//			if (auto channel = _history->peer->asChannel()) {
+//				channel->ptsReceived(d.vpts().v);
+//			} else {
+//				LOG(("API Error: received messages.channelMessages when "
+//					"no channel was passed! (PinnedTracker::apply)"));
+//			}
+//			_history->owner().processUsers(d.vusers());
+//			_history->owner().processChats(d.vchats());
+//			fullCount = d.vcount().v;
+//			return &d.vmessages().v;
+//		} break;
+//
+//		case mtpc_messages_messagesNotModified: {
+//			LOG(("API Error: received messages.messagesNotModified! "
+//				"(PinnedTracker::apply)"));
+//			return (const QVector<MTPMessage>*)nullptr;
+//		} break;
+//		}
+//		Unexpected("messages.Messages type in PinnedTracker::apply.");
+//	}();
+//
+//	if (!messages) {
+//		return;
+//	}
+//
+//	const auto addType = NewMessageType::Existing;
+//	auto list = std::vector<MsgId>();
+//	list.reserve(messages->size());
+//	for (const auto &message : *messages) {
+//		const auto item = _history->owner().addNewMessage(
+//			message,
+//			MTPDmessage_ClientFlags(),
+//			addType);
+//		if (item) {
+//			const auto itemId = item->id;
+//			if (item->isPinned()) {
+//				list.push_back(itemId);
+//			}
+//			accumulate_min(noSkipRange.from, itemId);
+//			accumulate_max(noSkipRange.till, itemId);
+//		}
+//	}
+//	if (aroundId && list.empty()) {
+//		noSkipRange = [&]() -> MsgRange {
+//			switch (direction) {
+//			case Data::LoadDirection::Before: // All old loaded.
+//				return { 0, noSkipRange.till };
+//			case Data::LoadDirection::Around: // All loaded.
+//				return { 0, ServerMaxMsgId };
+//			case Data::LoadDirection::After: // All new loaded.
+//				return { noSkipRange.from, ServerMaxMsgId };
+//			}
+//			Unexpected("Direction in PinnedTracker::apply.");
+//		}();
+//	}
+//	_history->session().storage().add(Storage::SharedMediaAddSlice(
+//		_history->peer->id,
+//		Storage::SharedMediaType::Pinned,
+//		std::move(list),
+//		noSkipRange,
+//		fullCount));
+//}
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
index ac762d996..916d9ada7 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
@@ -41,14 +41,18 @@ public:
 	void trackAround(MsgId messageId);
 	void reset();
 
+	[[nodiscard]] rpl::lifetime &lifetime() {
+		return _lifetime;
+	}
+
 private:
 	void refreshData();
 	void setupViewer(not_null<Data::PinnedMessages*> data);
-	void load(Data::LoadDirection direction, MsgId id);
-	void apply(
-		Data::LoadDirection direction,
-		MsgId aroundId,
-		const MTPmessages_Messages &result);
+	//void load(Data::LoadDirection direction, MsgId id);
+	//void apply(
+	//	Data::LoadDirection direction,
+	//	MsgId aroundId,
+	//	const MTPmessages_Messages &result);
 
 	const not_null<History*> _history;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 430225ba6..d2d4a9b9b 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -176,10 +176,6 @@ RepliesWidget::RepliesWidget(
 
 	_rootView->move(0, _topBar->height());
 
-	_topBar->sendNowSelectionRequest(
-	) | rpl::start_with_next([=] {
-		confirmSendNowSelected();
-	}, _topBar->lifetime());
 	_topBar->deleteSelectionRequest(
 	) | rpl::start_with_next([=] {
 		confirmDeleteSelected();
@@ -1736,19 +1732,6 @@ bool RepliesWidget::listIsGoodForAroundPosition(
 	return IsServerMsgId(view->data()->id);
 }
 
-void RepliesWidget::confirmSendNowSelected() {
-	auto items = _inner->getSelectedItems();
-	if (items.empty()) {
-		return;
-	}
-	const auto navigation = controller();
-	Window::ShowSendNowMessagesBox(
-		navigation,
-		_history,
-		std::move(items),
-		[=] { navigation->showBackFromStack(); });
-}
-
 void RepliesWidget::confirmDeleteSelected() {
 	auto items = _inner->getSelectedItems();
 	if (items.empty()) {
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index cde6be8f2..127c18dc4 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -168,7 +168,6 @@ private:
 	void updateScrollDownPosition();
 	void updatePinnedVisibility();
 
-	void confirmSendNowSelected();
 	void confirmDeleteSelected();
 	void confirmForwardSelected();
 	void clearSelected();
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
index 289eca0e3..d6bb60e7d 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -335,12 +335,15 @@ void TopBarWidget::paintTopBar(Painter &p) {
 	const auto folder = _activeChat.folder();
 	if (folder
 		|| history->peer->sharedMediaInfo()
-		|| (_section == Section::Scheduled)) {
+		|| (_section == Section::Scheduled)
+		|| (_section == Section::Pinned)) {
 		// #TODO feed name emoji.
 		auto text = (_section == Section::Scheduled)
 			? ((history && history->peer->isSelf())
 				? tr::lng_reminder_messages(tr::now)
 				: tr::lng_scheduled_messages(tr::now))
+			: (_section == Section::Pinned)
+			? "Pinned messages" // #TODO pinned
 			: folder
 			? folder->chatListName()
 			: history->peer->isSelf()
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
index cd77fbf16..770929d0e 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
@@ -46,6 +46,7 @@ public:
 	enum class Section {
 		History,
 		Scheduled,
+		Pinned,
 		Replies,
 	};
 
diff --git a/Telegram/SourceFiles/storage/storage_facade.cpp b/Telegram/SourceFiles/storage/storage_facade.cpp
index d6360d11d..5f87aa46e 100644
--- a/Telegram/SourceFiles/storage/storage_facade.cpp
+++ b/Telegram/SourceFiles/storage/storage_facade.cpp
@@ -22,6 +22,8 @@ public:
 	void remove(SharedMediaRemoveAll &&query);
 	void invalidate(SharedMediaInvalidateBottom &&query);
 	rpl::producer<SharedMediaResult> query(SharedMediaQuery &&query) const;
+	SharedMediaResult snapshot(const SharedMediaQuery &query) const;
+	bool empty(const SharedMediaKey &key) const;
 	rpl::producer<SharedMediaSliceUpdate> sharedMediaSliceUpdated() const;
 	rpl::producer<SharedMediaRemoveOne> sharedMediaOneRemoved() const;
 	rpl::producer<SharedMediaRemoveAll> sharedMediaAllRemoved() const;
@@ -83,6 +85,14 @@ rpl::producer<SharedMediaResult> Facade::Impl::query(SharedMediaQuery &&query) c
 	return _sharedMedia.query(std::move(query));
 }
 
+SharedMediaResult Facade::Impl::snapshot(const SharedMediaQuery &query) const {
+	return _sharedMedia.snapshot(query);
+}
+
+bool Facade::Impl::empty(const SharedMediaKey &key) const {
+	return _sharedMedia.empty(key);
+}
+
 rpl::producer<SharedMediaSliceUpdate> Facade::Impl::sharedMediaSliceUpdated() const {
 	return _sharedMedia.sliceUpdated();
 }
@@ -203,6 +213,14 @@ rpl::producer<SharedMediaResult> Facade::query(SharedMediaQuery &&query) const {
 	return _impl->query(std::move(query));
 }
 
+SharedMediaResult Facade::snapshot(const SharedMediaQuery &query) const {
+	return _impl->snapshot(query);
+}
+
+bool Facade::empty(const SharedMediaKey &key) const {
+	return _impl->empty(key);
+}
+
 rpl::producer<SharedMediaSliceUpdate> Facade::sharedMediaSliceUpdated() const {
 	return _impl->sharedMediaSliceUpdated();
 }
diff --git a/Telegram/SourceFiles/storage/storage_facade.h b/Telegram/SourceFiles/storage/storage_facade.h
index 02ac610df..6b176c7d8 100644
--- a/Telegram/SourceFiles/storage/storage_facade.h
+++ b/Telegram/SourceFiles/storage/storage_facade.h
@@ -25,6 +25,7 @@ struct SharedMediaRemoveOne;
 struct SharedMediaRemoveAll;
 struct SharedMediaInvalidateBottom;
 struct SharedMediaQuery;
+struct SharedMediaKey;
 using SharedMediaResult = SparseIdsListResult;
 struct SharedMediaSliceUpdate;
 
@@ -58,6 +59,8 @@ public:
 	void invalidate(SharedMediaInvalidateBottom &&query);
 
 	rpl::producer<SharedMediaResult> query(SharedMediaQuery &&query) const;
+	SharedMediaResult snapshot(const SharedMediaQuery &query) const;
+	bool empty(const SharedMediaKey &key) const;
 	rpl::producer<SharedMediaSliceUpdate> sharedMediaSliceUpdated() const;
 	rpl::producer<SharedMediaRemoveOne> sharedMediaOneRemoved() const;
 	rpl::producer<SharedMediaRemoveAll> sharedMediaAllRemoved() const;
diff --git a/Telegram/SourceFiles/storage/storage_shared_media.cpp b/Telegram/SourceFiles/storage/storage_shared_media.cpp
index 14d9d5c19..225af5e39 100644
--- a/Telegram/SourceFiles/storage/storage_shared_media.cpp
+++ b/Telegram/SourceFiles/storage/storage_shared_media.cpp
@@ -82,7 +82,10 @@ void SharedMedia::remove(SharedMediaRemoveAll &&query) {
 	auto peerIt = _lists.find(query.peerId);
 	if (peerIt != _lists.end()) {
 		for (auto index = 0; index != kSharedMediaTypeCount; ++index) {
-			peerIt->second[index].removeAll();
+			auto type = static_cast<SharedMediaType>(index);
+			if (query.types.test(type)) {
+				peerIt->second[index].removeAll();
+			}
 		}
 		_allRemoved.fire(std::move(query));
 	}
@@ -100,6 +103,7 @@ void SharedMedia::invalidate(SharedMediaInvalidateBottom &&query) {
 
 rpl::producer<SharedMediaResult> SharedMedia::query(SharedMediaQuery &&query) const {
 	Expects(IsValidSharedMediaType(query.key.type));
+
 	auto peerIt = _lists.find(query.key.peerId);
 	if (peerIt != _lists.end()) {
 		auto index = static_cast<int>(query.key.type);
@@ -114,6 +118,31 @@ rpl::producer<SharedMediaResult> SharedMedia::query(SharedMediaQuery &&query) co
 	};
 }
 
+SharedMediaResult SharedMedia::snapshot(const SharedMediaQuery &query) const {
+	Expects(IsValidSharedMediaType(query.key.type));
+
+	auto peerIt = _lists.find(query.key.peerId);
+	if (peerIt != _lists.end()) {
+		auto index = static_cast<int>(query.key.type);
+		return peerIt->second[index].snapshot(SparseIdsListQuery(
+			query.key.messageId,
+			query.limitBefore,
+			query.limitAfter));
+	}
+	return {};
+}
+
+bool SharedMedia::empty(const SharedMediaKey &key) const {
+	Expects(IsValidSharedMediaType(key.type));
+
+	auto peerIt = _lists.find(key.peerId);
+	if (peerIt != _lists.end()) {
+		auto index = static_cast<int>(key.type);
+		return peerIt->second[index].empty();
+	}
+	return true;
+}
+
 rpl::producer<SharedMediaSliceUpdate> SharedMedia::sliceUpdated() const {
 	return _sliceUpdated.events();
 }
diff --git a/Telegram/SourceFiles/storage/storage_shared_media.h b/Telegram/SourceFiles/storage/storage_shared_media.h
index e7bd5cbf9..b2cd80929 100644
--- a/Telegram/SourceFiles/storage/storage_shared_media.h
+++ b/Telegram/SourceFiles/storage/storage_shared_media.h
@@ -26,6 +26,7 @@ enum class SharedMediaType : signed char {
 	RoundVoiceFile,
 	GIF,
 	RoundFile,
+	Pinned,
 
 	kCount,
 };
@@ -106,10 +107,15 @@ struct SharedMediaRemoveOne {
 };
 
 struct SharedMediaRemoveAll {
-	SharedMediaRemoveAll(PeerId peerId) : peerId(peerId) {
+	SharedMediaRemoveAll(
+		PeerId peerId,
+		SharedMediaTypesMask types = SharedMediaTypesMask::All())
+	: peerId(peerId)
+	, types(types) {
 	}
 
 	PeerId peerId = 0;
+	SharedMediaTypesMask types;
 
 };
 
@@ -191,6 +197,8 @@ public:
 	void invalidate(SharedMediaInvalidateBottom &&query);
 
 	rpl::producer<SharedMediaResult> query(SharedMediaQuery &&query) const;
+	SharedMediaResult snapshot(const SharedMediaQuery &query) const;
+	bool empty(const SharedMediaKey &key) const;
 	rpl::producer<SharedMediaSliceUpdate> sliceUpdated() const;
 	rpl::producer<SharedMediaRemoveOne> oneRemoved() const;
 	rpl::producer<SharedMediaRemoveAll> allRemoved() const;
diff --git a/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp b/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp
index dce3846e5..9cc01c70c 100644
--- a/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp
+++ b/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp
@@ -200,6 +200,35 @@ rpl::producer<SparseIdsListResult> SparseIdsList::query(
 	};
 }
 
+SparseIdsListResult SparseIdsList::snapshot(
+		const SparseIdsListQuery &query) const {
+	auto slice = query.aroundId
+		? ranges::lower_bound(
+			_slices,
+			query.aroundId,
+			std::less<>(),
+			[](const Slice &slice) { return slice.range.till; })
+		: _slices.end();
+	if (slice != _slices.end()
+		&& slice->range.from <= query.aroundId) {
+		return queryFromSlice(query, *slice);
+	} else if (_count) {
+		auto result = SparseIdsListResult{};
+		result.count = _count;
+		return result;
+	}
+	return {};
+}
+
+bool SparseIdsList::empty() const {
+	for (const auto &slice : _slices) {
+		if (!slice.messages.empty()) {
+			return false;
+		}
+	}
+	return true;
+}
+
 rpl::producer<SparseIdsSliceUpdate> SparseIdsList::sliceUpdated() const {
 	return _sliceUpdated.events();
 }
diff --git a/Telegram/SourceFiles/storage/storage_sparse_ids_list.h b/Telegram/SourceFiles/storage/storage_sparse_ids_list.h
index 1081c48c7..88635f71a 100644
--- a/Telegram/SourceFiles/storage/storage_sparse_ids_list.h
+++ b/Telegram/SourceFiles/storage/storage_sparse_ids_list.h
@@ -51,6 +51,8 @@ public:
 	void invalidateBottom();
 	rpl::producer<SparseIdsListResult> query(SparseIdsListQuery &&query) const;
 	rpl::producer<SparseIdsSliceUpdate> sliceUpdated() const;
+	SparseIdsListResult snapshot(const SparseIdsListQuery &query) const;
+	bool empty() const;
 
 private:
 	struct Slice {

From 6b38b94db4aedd32c5e0c6868669853e36959262 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 20 Oct 2020 21:20:56 +0300
Subject: [PATCH 111/190] Don't capture 'this' in SendFilesBox::Block.

---
 Telegram/SourceFiles/boxes/send_files_box.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 4695078f8..3da6299bd 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -157,15 +157,16 @@ rpl::producer<int> SendFilesBox::Block::itemDeleteRequest() const {
 	using namespace rpl::mappers;
 
 	const auto preview = _preview.get();
+	const auto from = _from;
 	if (_isAlbum) {
 		const auto album = static_cast<Ui::AlbumPreview*>(_preview.get());
-		return album->thumbDeleted() | rpl::map(_1 + _from);
+		return album->thumbDeleted() | rpl::map(_1 + from);
 	} else if (_isSingleMedia) {
 		const auto media = static_cast<Ui::SingleMediaPreview*>(preview);
-		return media->deleteRequests() | rpl::map([=] { return _from; });
+		return media->deleteRequests() | rpl::map([from] { return from; });
 	} else {
 		const auto single = static_cast<Ui::SingleFilePreview*>(preview);
-		return single->deleteRequests() | rpl::map([=] { return _from; });
+		return single->deleteRequests() | rpl::map([from] { return from; });
 	}
 }
 
@@ -173,15 +174,16 @@ rpl::producer<int> SendFilesBox::Block::itemReplaceRequest() const {
 	using namespace rpl::mappers;
 
 	const auto preview = _preview.get();
+	const auto from = _from;
 	if (_isAlbum) {
 		const auto album = static_cast<Ui::AlbumPreview*>(preview);
-		return album->thumbChanged() | rpl::map(_1 + _from);
+		return album->thumbChanged() | rpl::map(_1 + from);
 	} else if (_isSingleMedia) {
 		const auto media = static_cast<Ui::SingleMediaPreview*>(preview);
-		return media->editRequests() | rpl::map([=] { return _from; });
+		return media->editRequests() | rpl::map([from] { return from; });
 	} else {
 		const auto single = static_cast<Ui::SingleFilePreview*>(preview);
-		return single->editRequests() | rpl::map([=] { return _from; });
+		return single->editRequests() | rpl::map([from] { return from; });
 	}
 }
 

From d742fa32dec86f07b2b87d5731a1ba5d8a80b3fb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 20 Oct 2020 21:31:47 +0300
Subject: [PATCH 112/190] Add button to show all pinned messages.

---
 Telegram/Resources/icons/pinned_show_all.png  | Bin 0 -> 642 bytes
 .../Resources/icons/pinned_show_all@2x.png    | Bin 0 -> 1233 bytes
 .../Resources/icons/pinned_show_all@3x.png    | Bin 0 -> 1253 bytes
 .../SourceFiles/history/history_widget.cpp    |  45 ++++-
 Telegram/SourceFiles/history/history_widget.h |   1 +
 .../view/history_view_pinned_section.cpp      |  13 ++
 .../view/history_view_pinned_section.h        |   7 +-
 .../view/history_view_pinned_tracker.cpp      | 171 +-----------------
 .../view/history_view_pinned_tracker.h        |   9 -
 .../view/history_view_replies_section.cpp     |   5 +-
 Telegram/SourceFiles/ui/chat/chat.style       |   4 +
 Telegram/SourceFiles/ui/chat/pinned_bar.cpp   |  56 +++---
 Telegram/SourceFiles/ui/chat/pinned_bar.h     |  12 +-
 13 files changed, 99 insertions(+), 224 deletions(-)
 create mode 100644 Telegram/Resources/icons/pinned_show_all.png
 create mode 100644 Telegram/Resources/icons/pinned_show_all@2x.png
 create mode 100644 Telegram/Resources/icons/pinned_show_all@3x.png

diff --git a/Telegram/Resources/icons/pinned_show_all.png b/Telegram/Resources/icons/pinned_show_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..af6e182adbc89d7803d27f915832f2dedf1f23cf
GIT binary patch
literal 642
zcmV-|0)737P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006>Nkl<ZScUCY
zIjizO6uoK`1VOa7u&~iTpn{F17J`L>U@fj_DeeKSMGNgL`~xmvV;74QE{!5~;(|+Q
zE9yKlABGp>k`IK}<iKT^o0~Z&bI%Ns004qNg!C`T8HfTz0ipone~RUDIYgsTP%4$s
zY&K!NUVlXd5)xXi7R~2#^cxn7MbNt+;&Ty0zFaObbubu2PN$QVVK$q2^=h^HWjtA*
zPpDF<kkM#FZnqmHlSy<soiJG}7GrB{HXF{J&u665>2Qu92(;O3&^wgNWeyj|0~(D6
zYPA}8y<T3QVzC%ht5tSB7!1JSa6qru1Ha!7rBVqHLeS}Sz+f=E?Du3c;mkP#;_)~p
z9}b5=Q4}l|3s|jIFq_R_zu)r~vs$fq+-|pcyk4&m4u=Js?+$i5JRT3;yl%Jq(HF&H
z5!X@_g}44|Cd_8Dc;U%pf)onH)0fieG_Ij(8cC&6LFT)MAQR?tIZQAd4tXLNLI%g<
zkweayO9<YY@Qy;E0Efc?>h(I%Gz}Ju1<vO)eyZ2&@!0Kl;dZ-m%+>GrKlc04gim*X
ziBKrSe$VfAxLhuri$o&dxP+d!fFwyw(r&j=DwSeIFwcBGAD-Lo_OA%wwSXi^$Ye4w
z9*@E0a^W075RlL3q19@EL?XdC=7`>*R;vXcxzp+Nx&?_u0)O3TG~yktyD=F|r&FAh
z$z&gIzDK+@;cmBsMxz0NKmab63r8hm%;j<kCX)#&mC8Tm0&c!XJepAaEf)od0z?6S
cD*ym~03#oHw*Z_ZVgLXD07*qoM6N<$f{r8?TL1t6

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/pinned_show_all@2x.png b/Telegram/Resources/icons/pinned_show_all@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f00311c0cbb5bb43f408c118c24b2c6ed1221562
GIT binary patch
literal 1233
zcmV;?1TOoDP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000D-Nkl<Zc%1E8
zOGq+N6uzYpVG>l*gBI<2w~&IMu!k+$7(|<(ASjBW+(bdp1B!$&YFC@u)*=dtAcR^}
zv}h63CLg&n%cKa4qNjC!?ttPrGmSZ8bN~OJ4-SmZx%Zy)o#UO)s|g4pK>slk|L5c}
zWC93?K~l&B5D<f;kO?3l21y|kKtK$VLMDKK7$k*E00A*b3Yh=`VvrQSLV#MWMp;=|
z#F7B<vYMJ2*x1+rm&*lSuNMvv4`FC%C~oV;Xz`i2qoV`9zP^ABo12@UQmOu30{Z*=
zSrZS((a{m4q@?_N1ax(EF_N90o`$}@KCs*EwD)&*c1Y-i_*TBHtu1svH8mCX_xBl{
zz()ce7pwgW0hyVZFfcH{NWQhTmEoI~mIkM%r!+r{#R3Tl39NJX_V&Wv-5uQD-^XNY
zYioQ&M3-bzQW9u18mO$SgwD=Rn3<V@_4RdXXTQ3-`nK|H6+JjOp!xUo^f3IAlaqP(
zl4#J}+#EXrrKP2?u&@AUXJ_#6@Bp8mpS(-5RX)-(GBUv7aD>L}?(Q;tlu9K<vJl|z
zDJUr5jN{uMM)Z0;vRbW3sZ>TKDExjuG8&C&Wo0EQ|KZ_bWHy_rYn#o6N=ix)06iSM
zw!vUPiHWgkw&UYt<aWC`?{j8`7o41&WKI6|_7+`UULudjLrreC+mX}hq>}LYd{GCd
z)9FIjPft&b<S_z)0J2ytQO_9*SX)D_R)f#y3pL-~-X7G})<Si4HRR^z3f?$pXJ=`R
zZ8Dhz&l#h!55%88o6Qyq@Z#bE^78UTS#*AWo|gRe^)+N?XOl$$w)XaRTA*)lZ_w1#
zBxpgi*-V?$@ApGlS(#MHe@_6m(a}*_z#ktUpx5g~sXTtF;E$Dr$@3F{ZDL|Va3>57
z4$|hpB1Nm!a{3EVf8izy0b+Clmb^jS+}v<h9tVxpTdc}2(nM2&LOKC!eZ0{Hf#ofi
zFIH`0Ly!`TrV|<(8onJ<R8$0kKp-?mr_*uzV%3J#n^@peg3(F5Fqljx^z!n8=H}+8
zH?dIK-rhznEiGtkYm0SEad9zHC=}E+9_#gbIp=pc97wCxqVn=`QA7@(5=1}k0Bj>8
zBaHgIzrRC$eLbuH`1p9p51$F(FIKUv8z=kO#8XpKoXv^%1cSlA7_+*%8uGDPtt2J?
zGXk(&4F^8xTv}S<?F9UlIf%u@#lMq)$jU!IKSM=D1$A$1Y>cxL@FOVvyufHQ{(S^Q
zRvstc*w{$(iF`WXPRP&Cr%r&vPlx%Q7{n34R{5%`Dpub}o#1x6VR?Bu^!oMn6>@TN
z7~{lJeWEMD$f~kco^MPz&d<+5p-|BLg`WAvO$nx_r$=3RzD@|DyStm_C)SxCA7WC1
zSiT1J`{UyyZ{;HmC+l=Nsqr3<huSD3eZ)BP<Ab0xL5)U(>gwvy$;k<Fxm-V1VJejh
z6&4m!N(>*Pu|epWA0POXp!{!f0%DL9G64j{ASq-52#7&a$OI4&gQSoNARq=wArnAA
v43a`7fPfezg-ieeF-QuT00Lr=4hW$?fibTNy8tCx00000NkvXXu0mjf#wJ8;

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/pinned_show_all@3x.png b/Telegram/Resources/icons/pinned_show_all@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..09e63eb9aa2404b8172ecce4aec9bbd1c348a1e3
GIT binary patch
literal 1253
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U|Hko;uumf=j~j7jhsN4<L7tV
z`UX!vo1&bpdDbmx*4j%`S||19<fxchdwP0$1znnwvN&hyn<XmJIVsJ8vli)G*&wL+
zXiwdCbN%=KW*5Jk|9SWKbMJ$fyBU8!^YQPU>hpK*+n&)sCXvn}CFR=B&FRp_qTtLl
zL6Pyq1cnq31|t;)NudTF;)Q44Pn4dpEK_Ip*-bubhl5s%R993aw70jv`Sr_+WidCK
z+_Y)upa1;(*LM4(7cV-}H{ZO_bM<(eeMgAa(e2x}>o)&CdHuS$ytK43V_kcFK|z4&
zpZPxi{*xKje9%7P;q>EBd+^z7*Tmu@A|9x#s~1ieSoa}5KE6_K`tR>izL$Sox)d}=
zwMF~Sx^;S|--?NgKh{$G^RU~ap?`x?az<9xquslA|M~m(?l%4H4)ZUV?{U{)QJL&{
z@7lFv?Ck76-@MVWx3w*mtuy76mzTGhd@|&&921vR1^-f}OE0(7O*FBwS;M|%^X9|(
z`T4DNzB50p_H5|feQTS)zkefl!*`Al2XAlg`Lky~{{8#+o*2E|aw}$k(9W%_ym>`_
z4$}h@@z=@=0yKUYdFVfMUcGwt<MQ(IWp&op*0S5XzsMNa+rK~Uu(vHfvtX6+rOTHe
z?~I@7yF+T0-||Si`O{ai)z#H)nmt>(tg`Z?o}OOB#)vEO&efHbA44L2RD`OIUh&u&
z^X<y|tQOWMMV8Zi)O6=pS63%54SKnM!b8I;6C9lcM7UV5-MEn<b^PYd$dXI{yDuo3
z8yO{8-RbY|uPiR!T(@=Arwv<YH8l42_Ik{%Tk@=7-#)w3@luC4oPQWFZrir)SU5vW
z$j#ceFx7*4H4N(<l_d7<V8~!*X5PlgqI*#D&&Q7+SG4J?Gu(ReWJwXH-$Q>N9~aA-
zO2$>HM=H*j>pM(sxp?uS#rvQ4SXNBfuy5bH%=7%4-XySkSz38;hHY0~zHC{`_VB=p
z%}$k;RverKh3uxv$^pN`-a5O!yxDc&^hGU|1ESjmHEK_P2{d+Z=xDimHFV{^s_JUr
z+Ba|CdVUQQE^g>y*)jdWQu&#07hkH0m*wTodfQNB7GmhSLCbXh{Q19a?*u%!eUE9o
zrmMis$=yd6tyGVi^V<1`(sJP+EG(;Kdahi*KAGX>hlj`Zu3^#8mTvsL-;n42ZieL_
z9$G$2N_zMHz4>0gcmF3bh(8RU)zdO_rsU=91YH5n0?B=ATF##Jz5LnP*;(a)_YWhX
zb?esooZq^A`(%dopv0%0_TzWM`~&B&hV8l9!Vr=0+O$TH)6Hw?q+I(|r+NKYqPkwZ
zd$+AN`{svKRSVw(5v=CwOq$1T>Ux(*?_1Gw{J8tQ3l|c0+lHOI+39fV;)Y}QJFb7w
z=AAYrf|YY}p}Twg<87wJEDq6;kr%yL&YwTO@Bd!CIpz=T^w;D?M@L_N&#o@Sx$x~G
z8+MQSb{?Is*01yK-@pG+%TviQ{!uf}-|ZsgWOHnVf?Cf;`&sScCEMq5t^yWc44$rj
JF6*2UngGhBHyHo`

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 44d0fe991..c066a84c9 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5239,10 +5239,22 @@ void HistoryWidget::checkPinnedBarState() {
 			messageId.count
 		};
 	});
+	auto barContent = HistoryView::PinnedBarContent(
+		&session(),
+		std::move(shown));
 	_pinnedBar = std::make_unique<Ui::PinnedBar>(
 		this,
-		HistoryView::PinnedBarContent(&session(), std::move(shown)),
-		true);
+		std::move(barContent));
+	Info::Profile::SharedMediaCountValue(
+		_peer,
+		nullptr,
+		Storage::SharedMediaType::Pinned
+	) | rpl::map([=](int count) {
+		return (count > 1);
+	}) | rpl::distinct_until_changed(
+	) | rpl::start_with_next([=](bool many) {
+		refreshPinnedBarButton(many);
+	}, _pinnedBar->lifetime());
 
 	rpl::single(
 		rpl::empty_value()
@@ -5259,18 +5271,11 @@ void HistoryWidget::checkPinnedBarState() {
 		});
 	}, _pinnedBar->lifetime());
 
-	_pinnedBar->closeClicks(
-	) | rpl::start_with_next([=] {
-		hidePinnedMessage();
-	}, _pinnedBar->lifetime());
-
 	_pinnedBar->barClicks(
 	) | rpl::start_with_next([=] {
 		const auto id = _pinnedTracker->currentMessageId();
 		if (id.message) {
-			controller()->showSection(
-				HistoryView::PinnedMemento(_history, id.message));
-			//Ui::showPeerHistory(_peer, id.message);
+			Ui::showPeerHistory(_peer, id.message);
 		}
 	}, _pinnedBar->lifetime());
 
@@ -5291,6 +5296,26 @@ void HistoryWidget::checkPinnedBarState() {
 	}
 }
 
+void HistoryWidget::refreshPinnedBarButton(bool many) {
+	const auto close = !many;
+	auto button = object_ptr<Ui::IconButton>(
+		this,
+		close ? st::historyReplyCancel : st::historyPinnedShowAll);
+	button->clicks(
+	) | rpl::start_with_next([=] {
+		if (close) {
+			hidePinnedMessage();
+		} else {
+			const auto id = _pinnedTracker->currentMessageId();
+			if (id.message) {
+				controller()->showSection(
+					HistoryView::PinnedMemento(_history, id.message));
+			}
+		}
+	}, button->lifetime());
+	_pinnedBar->setRightButton(std::move(button));
+}
+
 void HistoryWidget::requestMessageData(MsgId msgId) {
 	const auto callback = [=](ChannelData *channel, MsgId msgId) {
 		messageDataReceived(channel, msgId);
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 1a56edba1..4d72f0f32 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -481,6 +481,7 @@ private:
 	void updatePinnedViewer();
 	void setupPinnedTracker();
 	void checkPinnedBarState();
+	void refreshPinnedBarButton(bool many);
 
 	void sendInlineResult(
 		not_null<InlineBots::Result*> result,
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 5c9e86e6e..92f63e34c 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -56,6 +56,19 @@ namespace {
 
 } // namespace
 
+PinnedMemento::PinnedMemento(
+	not_null<History*> history,
+	MsgId highlightId)
+: _history(history)
+, _highlightId(highlightId) {
+	_list.setAroundPosition({
+		.fullId = FullMsgId(
+			history->channelId(),
+			highlightId),
+		.date = TimeId(0),
+	});
+}
+
 object_ptr<Window::SectionWidget> PinnedMemento::createWidget(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller,
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.h b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
index b355e7788..09935471c 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -148,12 +148,9 @@ private:
 
 class PinnedMemento : public Window::SectionMemento {
 public:
-	PinnedMemento(
+	explicit PinnedMemento(
 		not_null<History*> history,
-		MsgId highlightId = 0)
-	: _history(history)
-	, _highlightId(highlightId) {
-	}
+		MsgId highlightId = 0);
 
 	object_ptr<Window::SectionWidget> createWidget(
 		QWidget *parent,
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
index 7600c5bfd..5a3673181 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
@@ -12,19 +12,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_peer.h"
 #include "data/data_channel.h"
 #include "data/data_session.h"
-#include "data/data_histories.h"
 #include "main/main_session.h"
 #include "storage/storage_facade.h"
 #include "storage/storage_shared_media.h"
 #include "history/history.h"
 #include "history/history_item.h"
-#include "apiwrap.h"
 
 namespace HistoryView {
-namespace {
+namespace{
 
 constexpr auto kLoadedLimit = 4;
-constexpr auto kPerPage = 40;
 
 } // namespace
 
@@ -37,10 +34,7 @@ PinnedTracker::PinnedTracker(not_null<History*> history) : _history(history) {
 	}, _lifetime);
 }
 
-PinnedTracker::~PinnedTracker() {
-	_history->owner().histories().cancelRequest(_beforeRequestId);
-	_history->owner().histories().cancelRequest(_afterRequestId);
-}
+PinnedTracker::~PinnedTracker() = default;
 
 rpl::producer<PinnedId> PinnedTracker::shownMessageId() const {
 	return _current.value();
@@ -90,16 +84,6 @@ void PinnedTracker::setupViewer(not_null<Data::PinnedMessages*> data) {
 		const auto empty = snapshot.ids.empty();
 		const auto before = (i - begin(snapshot.ids));
 		const auto after = (end(snapshot.ids) - i);
-		//if (before < kLoadedLimit && !snapshot.skippedBefore) {
-		//	load(
-		//		Data::LoadDirection::Before,
-		//		empty ? _aroundId : snapshot.ids.front());
-		//}
-		//if (after < kLoadedLimit && !snapshot.skippedAfter) {
-		//	load(
-		//		Data::LoadDirection::After,
-		//		empty ? _aroundId : snapshot.ids.back());
-		//}
 		if (snapshot.ids.empty()) {
 			_current = PinnedId();
 			return;
@@ -119,156 +103,5 @@ void PinnedTracker::setupViewer(not_null<Data::PinnedMessages*> data) {
 		}
 	}, _dataLifetime);
 }
-//
-//void PinnedTracker::load(Data::LoadDirection direction, MsgId id) {
-//	const auto requestId = (direction == Data::LoadDirection::Before)
-//		? &_beforeRequestId
-//		: &_afterRequestId;
-//	const auto aroundId = (direction == Data::LoadDirection::Before)
-//		? &_beforeId
-//		: &_afterId;
-//	if (*requestId) {
-//		if (*aroundId == id) {
-//			return;
-//		}
-//		_history->owner().histories().cancelRequest(*requestId);
-//	}
-//	*aroundId = id;
-//	const auto send = [=](Fn<void()> finish) {
-//		const auto offsetId = [&] {
-//			switch (direction) {
-//			case Data::LoadDirection::Before: return id;
-//			case Data::LoadDirection::After: return id + 1;
-//			}
-//			Unexpected("Direction in PinnedTracker::load");
-//		}();
-//		const auto addOffset = [&] {
-//			switch (direction) {
-//			case Data::LoadDirection::Before: return 0;
-//			case Data::LoadDirection::After: return -kPerPage;
-//			}
-//			Unexpected("Direction in PinnedTracker::load");
-//		}();
-//		return _history->session().api().request(MTPmessages_Search(
-//			MTP_flags(0),
-//			_history->peer->input,
-//			MTP_string(QString()),
-//			MTP_inputPeerEmpty(),
-//			MTPint(), // top_msg_id
-//			MTP_inputMessagesFilterPinned(),
-//			MTP_int(0),
-//			MTP_int(0),
-//			MTP_int(offsetId),
-//			MTP_int(addOffset),
-//			MTP_int(kPerPage),
-//			MTP_int(0), // max_id
-//			MTP_int(0), // min_id
-//			MTP_int(0) // hash
-//		)).done([=](const MTPmessages_Messages &result) {
-//			*aroundId = 0;
-//			*requestId = 0;
-//			finish();
-//
-//			apply(direction, id, result);
-//		}).fail([=](const RPCError &error) {
-//			*aroundId = 0;
-//			*requestId = 0;
-//			finish();
-//		}).send();
-//	};
-//	_beforeRequestId = _history->owner().histories().sendRequest(
-//		_history,
-//		Data::Histories::RequestType::History,
-//		send);
-//}
-//
-//void PinnedTracker::apply(
-//		Data::LoadDirection direction,
-//		MsgId aroundId,
-//		const MTPmessages_Messages &result) {
-//	auto noSkipRange = MsgRange{ aroundId, aroundId };
-//	auto fullCount = std::optional<int>();
-//	auto messages = [&] {
-//		switch (result.type()) {
-//		case mtpc_messages_messages: {
-//			auto &d = result.c_messages_messages();
-//			_history->owner().processUsers(d.vusers());
-//			_history->owner().processChats(d.vchats());
-//			fullCount = d.vmessages().v.size();
-//			return &d.vmessages().v;
-//		} break;
-//
-//		case mtpc_messages_messagesSlice: {
-//			auto &d = result.c_messages_messagesSlice();
-//			_history->owner().processUsers(d.vusers());
-//			_history->owner().processChats(d.vchats());
-//			fullCount = d.vcount().v;
-//			return &d.vmessages().v;
-//		} break;
-//
-//		case mtpc_messages_channelMessages: {
-//			auto &d = result.c_messages_channelMessages();
-//			if (auto channel = _history->peer->asChannel()) {
-//				channel->ptsReceived(d.vpts().v);
-//			} else {
-//				LOG(("API Error: received messages.channelMessages when "
-//					"no channel was passed! (PinnedTracker::apply)"));
-//			}
-//			_history->owner().processUsers(d.vusers());
-//			_history->owner().processChats(d.vchats());
-//			fullCount = d.vcount().v;
-//			return &d.vmessages().v;
-//		} break;
-//
-//		case mtpc_messages_messagesNotModified: {
-//			LOG(("API Error: received messages.messagesNotModified! "
-//				"(PinnedTracker::apply)"));
-//			return (const QVector<MTPMessage>*)nullptr;
-//		} break;
-//		}
-//		Unexpected("messages.Messages type in PinnedTracker::apply.");
-//	}();
-//
-//	if (!messages) {
-//		return;
-//	}
-//
-//	const auto addType = NewMessageType::Existing;
-//	auto list = std::vector<MsgId>();
-//	list.reserve(messages->size());
-//	for (const auto &message : *messages) {
-//		const auto item = _history->owner().addNewMessage(
-//			message,
-//			MTPDmessage_ClientFlags(),
-//			addType);
-//		if (item) {
-//			const auto itemId = item->id;
-//			if (item->isPinned()) {
-//				list.push_back(itemId);
-//			}
-//			accumulate_min(noSkipRange.from, itemId);
-//			accumulate_max(noSkipRange.till, itemId);
-//		}
-//	}
-//	if (aroundId && list.empty()) {
-//		noSkipRange = [&]() -> MsgRange {
-//			switch (direction) {
-//			case Data::LoadDirection::Before: // All old loaded.
-//				return { 0, noSkipRange.till };
-//			case Data::LoadDirection::Around: // All loaded.
-//				return { 0, ServerMaxMsgId };
-//			case Data::LoadDirection::After: // All new loaded.
-//				return { noSkipRange.from, ServerMaxMsgId };
-//			}
-//			Unexpected("Direction in PinnedTracker::apply.");
-//		}();
-//	}
-//	_history->session().storage().add(Storage::SharedMediaAddSlice(
-//		_history->peer->id,
-//		Storage::SharedMediaType::Pinned,
-//		std::move(list),
-//		noSkipRange,
-//		fullCount));
-//}
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
index 916d9ada7..21f18bb4e 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
@@ -48,11 +48,6 @@ public:
 private:
 	void refreshData();
 	void setupViewer(not_null<Data::PinnedMessages*> data);
-	//void load(Data::LoadDirection direction, MsgId id);
-	//void apply(
-	//	Data::LoadDirection direction,
-	//	MsgId aroundId,
-	//	const MTPmessages_Messages &result);
 
 	const not_null<History*> _history;
 
@@ -61,10 +56,6 @@ private:
 	rpl::lifetime _dataLifetime;
 
 	MsgId _aroundId = 0;
-	MsgId _beforeId = 0;
-	MsgId _afterId = 0;
-	MsgId _beforeRequestId = 0;
-	MsgId _afterRequestId = 0;
 
 	rpl::lifetime _lifetime;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index d2d4a9b9b..7763d2acb 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -111,9 +111,10 @@ RepliesMemento::RepliesMemento(
 : RepliesMemento(commentsItem->history(), commentsItem->id, commentId) {
 	if (commentId) {
 		_list.setAroundPosition({
-			.fullId = FullMsgId(commentsItem->history()->channelId(), commentId),
+			.fullId = FullMsgId(
+				commentsItem->history()->channelId(),
+				commentId),
 			.date = TimeId(0),
-
 		});
 	} else if (commentsItem->computeRepliesInboxReadTillFull() == MsgId(1)) {
 		_list.setAroundPosition(Data::MinMessagePosition);
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 8bc2f2200..62472aeb6 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -361,6 +361,10 @@ historyReplyCancel: IconButton {
 		color: windowBgOver;
 	}
 }
+historyPinnedShowAll: IconButton(historyReplyCancel) {
+	icon: icon {{ "pinned_show_all", historyReplyCancelFg }};
+	iconOver: icon {{ "pinned_show_all", historyReplyCancelFgOver }};
+}
 
 msgBotKbDuration: 200;
 msgBotKbFont: semiboldFont;
diff --git a/Telegram/SourceFiles/ui/chat/pinned_bar.cpp b/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
index c4878ed28..3181835dc 100644
--- a/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/pinned_bar.cpp
@@ -19,14 +19,8 @@ namespace Ui {
 
 PinnedBar::PinnedBar(
 	not_null<QWidget*> parent,
-	rpl::producer<MessageBarContent> content,
-	bool withClose)
+	rpl::producer<MessageBarContent> content)
 : _wrap(parent, object_ptr<RpWidget>(parent))
-, _close(withClose
-	? std::make_unique<IconButton>(
-		_wrap.entity(),
-		st::historyReplyCancel)
-	: nullptr)
 , _shadow(std::make_unique<PlainShadow>(_wrap.parentWidget())) {
 	_wrap.hide(anim::type::instant);
 	_shadow->hide();
@@ -73,7 +67,33 @@ PinnedBar::PinnedBar(
 	}, lifetime());
 }
 
-PinnedBar::~PinnedBar() = default;
+PinnedBar::~PinnedBar() {
+	_rightButton.destroy();
+}
+
+void PinnedBar::setRightButton(object_ptr<Ui::RpWidget> button) {
+	_rightButton.destroy();
+	_rightButton = std::move(button);
+	if (_rightButton) {
+		_rightButton->setParent(_wrap.entity());
+		_rightButton->show();
+	}
+	if (_bar) {
+		updateControlsGeometry(_wrap.geometry());
+	}
+}
+
+void PinnedBar::updateControlsGeometry(QRect wrapGeometry) {
+	_bar->widget()->resizeToWidth(
+		wrapGeometry.width() - (_rightButton ? _rightButton->width() : 0));
+	const auto hidden = _wrap.isHidden() || !wrapGeometry.height();
+	if (_shadow->isHidden() != hidden) {
+		_shadow->setVisible(!hidden);
+	}
+	if (_rightButton) {
+		_rightButton->moveToRight(0, 0);
+	}
+}
 
 void PinnedBar::setShadowGeometryPostprocess(Fn<QRect(QRect)> postprocess) {
 	_shadowGeometryPostprocess = std::move(postprocess);
@@ -97,8 +117,8 @@ void PinnedBar::createControls() {
 	_bar = std::make_unique<MessageBar>(
 		_wrap.entity(),
 		st::defaultMessageBar);
-	if (_close) {
-		_close->raise();
+	if (_rightButton) {
+		_rightButton->raise();
 	}
 
 	// Clicks.
@@ -126,15 +146,7 @@ void PinnedBar::createControls() {
 	_wrap.geometryValue(
 	) | rpl::start_with_next([=](QRect rect) {
 		updateShadowGeometry(rect);
-		_bar->widget()->resizeToWidth(
-			rect.width() - (_close ? _close->width() : 0));
-		const auto hidden = _wrap.isHidden() || !rect.height();
-		if (_shadow->isHidden() != hidden) {
-			_shadow->setVisible(!hidden);
-		}
-		if (_close) {
-			_close->moveToRight(0, 0);
-		}
+		updateControlsGeometry(rect);
 	}, _bar->widget()->lifetime());
 
 	_wrap.shownValue(
@@ -198,12 +210,6 @@ rpl::producer<int> PinnedBar::heightValue() const {
 	return _wrap.heightValue();
 }
 
-rpl::producer<> PinnedBar::closeClicks() const {
-	return !_close
-		? (rpl::never<>() | rpl::type_erased())
-		: (_close->clicks() | rpl::map([] { return rpl::empty_value(); }));
-}
-
 rpl::producer<> PinnedBar::barClicks() const {
 	return _barClicks.events();
 }
diff --git a/Telegram/SourceFiles/ui/chat/pinned_bar.h b/Telegram/SourceFiles/ui/chat/pinned_bar.h
index 55ca6a283..fd47824af 100644
--- a/Telegram/SourceFiles/ui/chat/pinned_bar.h
+++ b/Telegram/SourceFiles/ui/chat/pinned_bar.h
@@ -6,7 +6,9 @@ For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
+
 #include "ui/wrap/slide_wrap.h"
+#include "base/object_ptr.h"
 
 namespace Ui {
 
@@ -14,13 +16,13 @@ struct MessageBarContent;
 class MessageBar;
 class IconButton;
 class PlainShadow;
+class RpWidget;
 
 class PinnedBar final {
 public:
 	PinnedBar(
 		not_null<QWidget*> parent,
-		rpl::producer<Ui::MessageBarContent> content,
-		bool withClose = false);
+		rpl::producer<Ui::MessageBarContent> content);
 	~PinnedBar();
 
 	void show();
@@ -30,11 +32,12 @@ public:
 
 	void setShadowGeometryPostprocess(Fn<QRect(QRect)> postprocess);
 
+	void setRightButton(object_ptr<Ui::RpWidget> button);
+
 	void move(int x, int y);
 	void resizeToWidth(int width);
 	[[nodiscard]] int height() const;
 	[[nodiscard]] rpl::producer<int> heightValue() const;
-	[[nodiscard]] rpl::producer<> closeClicks() const;
 	[[nodiscard]] rpl::producer<> barClicks() const;
 
 	[[nodiscard]] rpl::lifetime &lifetime() {
@@ -44,10 +47,11 @@ public:
 private:
 	void createControls();
 	void updateShadowGeometry(QRect wrapGeometry);
+	void updateControlsGeometry(QRect wrapGeometry);
 
 	Ui::SlideWrap<> _wrap;
 	std::unique_ptr<Ui::MessageBar> _bar;
-	std::unique_ptr<Ui::IconButton> _close;
+	object_ptr<Ui::RpWidget> _rightButton = { nullptr };
 	std::unique_ptr<Ui::PlainShadow> _shadow;
 	rpl::event_stream<> _barClicks;
 	Fn<QRect(QRect)> _shadowGeometryPostprocess;

From 47f5a663508d2171e97d11b16b13e7ef38a7c496 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 20 Oct 2020 21:58:59 +0300
Subject: [PATCH 113/190] Fix build on macOS.

---
 .../SourceFiles/history/view/history_view_pinned_tracker.cpp  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
index 5a3673181..f2aee7419 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
@@ -82,8 +82,8 @@ void PinnedTracker::setupViewer(not_null<Data::PinnedMessages*> data) {
 	) | rpl::start_with_next([=](const Data::PinnedAroundId &snapshot) {
 		const auto i = ranges::lower_bound(snapshot.ids, _aroundId);
 		const auto empty = snapshot.ids.empty();
-		const auto before = (i - begin(snapshot.ids));
-		const auto after = (end(snapshot.ids) - i);
+		const auto before = int(i - begin(snapshot.ids));
+		const auto after = int(end(snapshot.ids) - i);
 		if (snapshot.ids.empty()) {
 			_current = PinnedId();
 			return;

From 698c9fc4be59824b18c6745269f8aa69f83ac998 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Oct 2020 10:22:06 +0300
Subject: [PATCH 114/190] Fix preloading of pinned messages.

---
 .../SourceFiles/data/data_pinned_messages.cpp | 26 ++++++++++++-------
 Telegram/SourceFiles/ui/chat/message_bar.cpp  |  2 ++
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_pinned_messages.cpp b/Telegram/SourceFiles/data/data_pinned_messages.cpp
index c1121df8a..518be33ff 100644
--- a/Telegram/SourceFiles/data/data_pinned_messages.cpp
+++ b/Telegram/SourceFiles/data/data_pinned_messages.cpp
@@ -11,6 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "storage/storage_facade.h"
 #include "storage/storage_shared_media.h"
+#include "data/data_shared_media.h"
+#include "data/data_sparse_ids.h"
 
 namespace Data {
 namespace {
@@ -44,17 +46,21 @@ MsgId PinnedMessages::topId() const {
 rpl::producer<PinnedAroundId> PinnedMessages::viewer(
 		MsgId aroundId,
 		int limit) const {
-	return _storage.query(
-		SharedMediaQuery(
-			SharedMediaKey(_peer->id, PinnedType, aroundId),
-			limit,
-			limit)
-	) | rpl::map([](const SharedMediaResult &result) {
+	return SharedMediaViewer(
+		&_peer->session(),
+		SharedMediaKey(_peer->id, PinnedType, aroundId),
+		limit,
+		limit
+	) | rpl::map([](const SparseIdsSlice &result) {
 		auto data = PinnedAroundId();
-		data.fullCount = result.count;
-		data.skippedBefore = result.skippedBefore;
-		data.skippedAfter = result.skippedAfter;
-		data.ids = result.messageIds | ranges::to_vector;
+		data.fullCount = result.fullCount();
+		data.skippedBefore = result.skippedBefore();
+		data.skippedAfter = result.skippedAfter();
+		const auto count = result.size();
+		data.ids.reserve(count);
+		for (auto i = 0; i != count; ++i) {
+			data.ids.push_back(result[i]);
+		}
 		return data;
 	});
 }
diff --git a/Telegram/SourceFiles/ui/chat/message_bar.cpp b/Telegram/SourceFiles/ui/chat/message_bar.cpp
index 42ccc6f1c..7972583cb 100644
--- a/Telegram/SourceFiles/ui/chat/message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/message_bar.cpp
@@ -435,6 +435,7 @@ void MessageBar::paintLeftBar(Painter &p) {
 		st::msgInReplyBarColor->c.alpha() / 3));
 	const auto radius = line / 2.;
 	auto hq = PainterHighQualityEnabler(p);
+	p.setClipRect(bar.x(), 0, bar.width(), fullHeight);
 	for (auto i = paintFrom; i != paintTill; ++i) {
 		const auto top = i * single - scroll;
 		const auto bottom = top + state.size;
@@ -454,6 +455,7 @@ void MessageBar::paintLeftBar(Painter &p) {
 			radius,
 			radius);
 	}
+	p.setClipping(false);
 	if (_content.count > 4) {
 		const auto firstScroll = countBarState(2).scroll;
 		const auto gradientTop = (scroll >= firstScroll)

From 5f932a8828957bc9b497f90797d59d3f8c9aba12 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Oct 2020 10:58:46 +0300
Subject: [PATCH 115/190] Show 'View X Replies' in all groups.

---
 Telegram/SourceFiles/history/history_inner_widget.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 6f9db66fd..a4fbfbb8b 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1552,10 +1552,8 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		}
 		const auto repliesCount = item->repliesCount();
 		const auto withReplies = IsServerMsgId(item->id)
-			&& (repliesCount > 0 || item->replyToTop());
-		if (withReplies
-			&& item->history()->peer->isMegagroup()
-			&& item->history()->peer->asMegagroup()->linkedChat()) {
+			&& (repliesCount > 0);
+		if (withReplies && item->history()->peer->isMegagroup()) {
 			const auto rootId = repliesCount ? item->id : item->replyToTop();
 			const auto phrase = (repliesCount > 0)
 				? tr::lng_replies_view(

From 59b4c5dad9a14d359865fda219bfa3b649967d06 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Oct 2020 11:25:41 +0300
Subject: [PATCH 116/190] Show winning top with three same values in slot
 machine.

---
 .../view/media/history_view_slot_machine.cpp        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp b/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp
index ddd1ef733..e384e038a 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp
@@ -47,21 +47,24 @@ const auto &kEmoji = ::Stickers::DicePacks::kSlotString;
 	return kShifts[partIndex] + inPartIndex;
 }
 
+[[nodiscard]] int ComputePartValue(int value, int partIndex) {
+	return ((value - 1) >> (partIndex * 2)) & 0x03; // 0..3
+}
+
 [[nodiscard]] int ComputeComplexIndex(int value, int partIndex) {
 	Expects(value > 0 && value <= 64);
 
 	if (value == kWinValue) {
 		return ComplexIndex(partIndex, kSevenWinIndex);
 	}
-	const auto bits = ((value - 1) >> (partIndex * 2)) & 0x03; // 0..3
 	return ComplexIndex(partIndex, [&] {
-		switch (bits) {
+		switch (ComputePartValue(value, partIndex)) {
 		case 0: return kBarIndex;
 		case 1: return kBerriesIndex;
 		case 2: return kLemonIndex;
 		case 3: return kSevenIndex;
 		}
-		Unexpected("Bits value in ComputeComplexIndex.");
+		Unexpected("Part value value in ComputeComplexIndex.");
 	}());
 }
 
@@ -115,7 +118,9 @@ void SlotMachine::resolveEnds(int value) {
 	if (value <= 0 || value > 64) {
 		return;
 	}
-	if (value == kWinValue) {
+	const auto firstPartValue = ComputePartValue(value, 0);
+	if (ComputePartValue(value, 1) == firstPartValue
+		&& ComputePartValue(value, 2) == firstPartValue) { // Three in a row.
 		resolve(_end[0], kWinBackIndex, kWinBackIndex, true);
 	}
 	for (auto i = 0; i != 3; ++i) {

From cd5cad72bd7cb8bcf2c335816abdb78c7ae99f87 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Oct 2020 14:07:49 +0300
Subject: [PATCH 117/190] Use only shared media code for pinned tracking.

---
 Telegram/CMakeLists.txt                       |   2 -
 Telegram/SourceFiles/apiwrap.cpp              |   3 +
 Telegram/SourceFiles/boxes/confirm_box.cpp    |   2 +-
 Telegram/SourceFiles/data/data_changes.h      |   2 +-
 Telegram/SourceFiles/data/data_channel.cpp    |   4 +-
 Telegram/SourceFiles/data/data_chat.cpp       |   4 +-
 Telegram/SourceFiles/data/data_peer.cpp       |  84 +++++-------
 Telegram/SourceFiles/data/data_peer.h         |  20 +--
 .../SourceFiles/data/data_pinned_messages.cpp |  88 ------------
 .../SourceFiles/data/data_pinned_messages.h   |  43 ------
 Telegram/SourceFiles/data/data_user.cpp       |   4 +-
 Telegram/SourceFiles/history/history.cpp      |   7 +
 Telegram/SourceFiles/history/history_item.cpp |   9 +-
 .../SourceFiles/history/history_widget.cpp    |  18 +--
 .../view/history_view_pinned_section.cpp      |   1 -
 .../view/history_view_pinned_tracker.cpp      | 129 +++++++++++-------
 .../view/history_view_pinned_tracker.h        |  15 +-
 17 files changed, 162 insertions(+), 273 deletions(-)
 delete mode 100644 Telegram/SourceFiles/data/data_pinned_messages.cpp
 delete mode 100644 Telegram/SourceFiles/data/data_pinned_messages.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index a04fd853a..85f68e378 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -400,8 +400,6 @@ PRIVATE
     data/data_photo.h
     data/data_photo_media.cpp
     data/data_photo_media.h
-    data/data_pinned_messages.cpp
-    data/data_pinned_messages.h
     data/data_poll.cpp
     data/data_poll.h
     data/data_pts_waiter.cpp
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 0d5a88a9b..a51049a54 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3570,6 +3570,9 @@ void ApiWrap::sharedMediaDone(
 		parsed.noSkipRange,
 		parsed.fullCount
 	));
+	if (type == SharedMediaType::Pinned && !parsed.messageIds.empty()) {
+		peer->setHasPinnedMessages(true);
+	}
 }
 
 void ApiWrap::requestUserPhotos(
diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp
index b098ef100..7c5afd510 100644
--- a/Telegram/SourceFiles/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/boxes/confirm_box.cpp
@@ -444,7 +444,7 @@ PinMessageBox::PinMessageBox(
 : _peer(peer)
 , _api(&peer->session().mtp())
 , _msgId(msgId)
-, _pinningOld(msgId < peer->topPinnedMessageId())
+, _pinningOld(msgId < Data::ResolveTopPinnedId(peer))
 , _text(
 	this,
 	(_pinningOld
diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h
index 3a363ee6e..5bd443688 100644
--- a/Telegram/SourceFiles/data/data_changes.h
+++ b/Telegram/SourceFiles/data/data_changes.h
@@ -57,7 +57,7 @@ struct PeerUpdate {
 		Notifications     = (1 << 4),
 		Migration         = (1 << 5),
 		UnavailableReason = (1 << 6),
-		PinnedMessage     = (1 << 7),
+		PinnedMessages    = (1 << 7),
 		IsBlocked         = (1 << 8),
 
 		// For users
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index e2b6b8c9b..102eb637e 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -769,9 +769,7 @@ void ApplyChannelUpdate(
 		}
 	}
 	if (const auto pinned = update.vpinned_msg_id()) {
-		channel->setTopPinnedMessageId(pinned->v);
-	} else {
-		channel->clearPinnedMessages();
+		SetTopPinnedMessageId(channel, pinned->v);
 	}
 	if (channel->isMegagroup()) {
 		const auto stickerSet = update.vstickerset();
diff --git a/Telegram/SourceFiles/data/data_chat.cpp b/Telegram/SourceFiles/data/data_chat.cpp
index 37930f103..47c167951 100644
--- a/Telegram/SourceFiles/data/data_chat.cpp
+++ b/Telegram/SourceFiles/data/data_chat.cpp
@@ -333,9 +333,7 @@ void ApplyChatUpdate(not_null<ChatData*> chat, const MTPDchatFull &update) {
 		return QString();
 	}));
 	if (const auto pinned = update.vpinned_msg_id()) {
-		chat->setTopPinnedMessageId(pinned->v);
-	} else {
-		chat->clearPinnedMessages();
+		SetTopPinnedMessageId(chat, pinned->v);
 	}
 	chat->checkFolder(update.vfolder_id().value_or_empty());
 	chat->fullUpdated();
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 25227cc24..b9341eb76 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -16,7 +16,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_file_origin.h"
 #include "data/data_histories.h"
-#include "data/data_pinned_messages.h"
 #include "base/unixtime.h"
 #include "base/crc32hash.h"
 #include "lang/lang_keys.h"
@@ -464,54 +463,13 @@ bool PeerData::canEditMessagesIndefinitely() const {
 	Unexpected("Peer type in PeerData::canEditMessagesIndefinitely.");
 }
 
-MsgId PeerData::topPinnedMessageId() const {
-	return _pinnedMessages ? _pinnedMessages->topId() : 0;
+bool PeerData::hasPinnedMessages() const {
+	return _hasPinnedMessages;
 }
 
-void PeerData::ensurePinnedMessagesCreated() {
-	if (!_pinnedMessages) {
-		_pinnedMessages = std::make_unique<Data::PinnedMessages>(this);
-		session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
-	}
-}
-
-void PeerData::removeEmptyPinnedMessages() {
-	if (_pinnedMessages && _pinnedMessages->empty()) {
-		_pinnedMessages = nullptr;
-		session().changes().peerUpdated(this, UpdateFlag::PinnedMessage);
-	}
-}
-
-bool PeerData::messageIdTooSmall(MsgId messageId) const {
-	if (const auto channel = asChannel()) {
-		return (messageId <= channel->availableMinId());
-	}
-	return false;
-}
-
-void PeerData::setTopPinnedMessageId(MsgId messageId) {
-	if (messageIdTooSmall(messageId)) {
-		clearPinnedMessages();
-		return;
-	}
-	const auto hiddenId = session().settings().hiddenPinnedMessageId(id);
-	if (hiddenId != 0 && hiddenId != messageId) {
-		session().settings().setHiddenPinnedMessageId(id, 0);
-		session().saveSettingsDelayed();
-	}
-	ensurePinnedMessagesCreated();
-	_pinnedMessages->setTopId(messageId);
-}
-
-void PeerData::clearPinnedMessages() {
-	if (session().settings().hiddenPinnedMessageId(id) != 0) {
-		session().settings().setHiddenPinnedMessageId(id, 0);
-		session().saveSettingsDelayed();
-	}
-	session().storage().remove(Storage::SharedMediaRemoveAll(
-		id,
-		Storage::SharedMediaType::Pinned));
-	removeEmptyPinnedMessages();
+void PeerData::setHasPinnedMessages(bool has) {
+	_hasPinnedMessages = has;
+	session().changes().peerUpdated(this, UpdateFlag::PinnedMessages);
 }
 
 bool PeerData::canExportChatHistory() const {
@@ -1038,4 +996,36 @@ std::optional<QString> RestrictionError(
 	return std::nullopt;
 }
 
+void SetTopPinnedMessageId(not_null<PeerData*> peer, MsgId messageId) {
+	if (const auto channel = peer->asChannel()) {
+		if (messageId <= channel->availableMinId()) {
+			return;
+		}
+	}
+	auto &session = peer->session();
+	const auto hiddenId = session.settings().hiddenPinnedMessageId(peer->id);
+	if (hiddenId != 0 && hiddenId != messageId) {
+		session.settings().setHiddenPinnedMessageId(peer->id, 0);
+		session.saveSettingsDelayed();
+	}
+	session.storage().add(Storage::SharedMediaAddExisting(
+		peer->id,
+		Storage::SharedMediaType::Pinned,
+		messageId,
+		{ messageId, ServerMaxMsgId }));
+	peer->setHasPinnedMessages(true);
+}
+
+MsgId ResolveTopPinnedId(not_null<PeerData*> peer) {
+	const auto slice = peer->session().storage().snapshot(
+		Storage::SharedMediaQuery(
+			Storage::SharedMediaKey(
+				peer->id,
+				Storage::SharedMediaType::Pinned,
+				ServerMaxMsgId - 1),
+			1,
+			1));
+	return slice.messageIds.empty() ? 0 : slice.messageIds.back();
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index dbdf8d094..4fa630510 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -29,8 +29,6 @@ class Session;
 namespace Data {
 
 class Session;
-class PinnedMessages;
-struct PinnedAroundId;
 
 int PeerColorIndex(PeerId peerId);
 int PeerColorIndex(int32 bareId);
@@ -328,12 +326,9 @@ public:
 
 	[[nodiscard]] bool canPinMessages() const;
 	[[nodiscard]] bool canEditMessagesIndefinitely() const;
-	[[nodiscard]] MsgId topPinnedMessageId() const;
-	void setTopPinnedMessageId(MsgId messageId);
-	void clearPinnedMessages();
-	Data::PinnedMessages *currentPinnedMessages() const {
-		return _pinnedMessages.get();
-	}
+
+	[[nodiscard]] bool hasPinnedMessages() const;
+	void setHasPinnedMessages(bool has);
 
 	[[nodiscard]] bool canExportChatHistory() const;
 
@@ -412,10 +407,6 @@ private:
 		-> const std::vector<Data::UnavailableReason> &;
 
 	void setUserpicChecked(PhotoId photoId, const ImageLocation &location);
-	void ensurePinnedMessagesCreated();
-	void removeEmptyPinnedMessages();
-
-	[[nodiscard]] bool messageIdTooSmall(MsgId messageId) const;
 
 	static constexpr auto kUnknownPhotoId = PhotoId(0xFFFFFFFFFFFFFFFFULL);
 
@@ -433,7 +424,7 @@ private:
 	base::flat_set<QChar> _nameFirstLetters;
 
 	crl::time _lastFullUpdate = 0;
-	std::unique_ptr<Data::PinnedMessages> _pinnedMessages;
+	bool _hasPinnedMessages = false;
 
 	Settings _settings = { kSettingsUnknown };
 	BlockStatus _blockStatus = BlockStatus::Unknown;
@@ -451,4 +442,7 @@ std::optional<QString> RestrictionError(
 	not_null<PeerData*> peer,
 	ChatRestriction restriction);
 
+void SetTopPinnedMessageId(not_null<PeerData*> peer, MsgId messageId);
+[[nodiscard]] MsgId ResolveTopPinnedId(not_null<PeerData*> peer);
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_pinned_messages.cpp b/Telegram/SourceFiles/data/data_pinned_messages.cpp
deleted file mode 100644
index 518be33ff..000000000
--- a/Telegram/SourceFiles/data/data_pinned_messages.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "data/data_pinned_messages.h"
-
-#include "data/data_peer.h"
-#include "main/main_session.h"
-#include "storage/storage_facade.h"
-#include "storage/storage_shared_media.h"
-#include "data/data_shared_media.h"
-#include "data/data_sparse_ids.h"
-
-namespace Data {
-namespace {
-
-constexpr auto PinnedType = Storage::SharedMediaType::Pinned;
-
-using Storage::SharedMediaQuery;
-using Storage::SharedMediaKey;
-using Storage::SharedMediaResult;
-
-} // namespace
-
-PinnedMessages::PinnedMessages(not_null<PeerData*> peer)
-: _peer(peer)
-, _storage(_peer->session().storage()) {
-}
-
-bool PinnedMessages::empty() const {
-	return _storage.empty(SharedMediaKey(_peer->id, PinnedType, 0));
-}
-
-MsgId PinnedMessages::topId() const {
-	const auto slice = _storage.snapshot(
-		SharedMediaQuery(
-			SharedMediaKey(_peer->id, PinnedType, ServerMaxMsgId),
-			1,
-			1));
-	return slice.messageIds.empty() ? 0 : slice.messageIds.back();
-}
-
-rpl::producer<PinnedAroundId> PinnedMessages::viewer(
-		MsgId aroundId,
-		int limit) const {
-	return SharedMediaViewer(
-		&_peer->session(),
-		SharedMediaKey(_peer->id, PinnedType, aroundId),
-		limit,
-		limit
-	) | rpl::map([](const SparseIdsSlice &result) {
-		auto data = PinnedAroundId();
-		data.fullCount = result.fullCount();
-		data.skippedBefore = result.skippedBefore();
-		data.skippedAfter = result.skippedAfter();
-		const auto count = result.size();
-		data.ids.reserve(count);
-		for (auto i = 0; i != count; ++i) {
-			data.ids.push_back(result[i]);
-		}
-		return data;
-	});
-}
-
-void PinnedMessages::setTopId(MsgId messageId) {
-	while (true) {
-		auto top = topId();
-		if (top > messageId) {
-			_storage.remove(Storage::SharedMediaRemoveOne(
-				_peer->id,
-				PinnedType,
-				top));
-		} else if (top == messageId) {
-			return;
-		} else {
-			break;
-		}
-	}
-	_storage.add(Storage::SharedMediaAddNew(
-		_peer->id,
-		PinnedType,
-		messageId));
-}
-
-} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_pinned_messages.h b/Telegram/SourceFiles/data/data_pinned_messages.h
deleted file mode 100644
index 5edcd29ec..000000000
--- a/Telegram/SourceFiles/data/data_pinned_messages.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include "data/data_messages.h"
-#include "base/weak_ptr.h"
-
-namespace Storage {
-class Facade;
-} // namespace Storage
-
-namespace Data {
-
-struct PinnedAroundId {
-	std::vector<MsgId> ids;
-	std::optional<int> skippedBefore;
-	std::optional<int> skippedAfter;
-	std::optional<int> fullCount;
-};
-
-class PinnedMessages final : public base::has_weak_ptr {
-public:
-	explicit PinnedMessages(not_null<PeerData*> peer);
-
-	[[nodiscard]] bool empty() const;
-	[[nodiscard]] MsgId topId() const;
-	[[nodiscard]] rpl::producer<PinnedAroundId> viewer(
-		MsgId aroundId,
-		int limit) const;
-	void setTopId(MsgId messageId);
-
-private:
-	const not_null<PeerData*> _peer;
-	Storage::Facade &_storage;
-
-};
-
-} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index 099da8df1..5a865fde1 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -262,9 +262,7 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 		user->setBotInfoVersion(-1);
 	}
 	if (const auto pinned = update.vpinned_msg_id()) {
-		user->setTopPinnedMessageId(pinned->v);
-	} else {
-		user->clearPinnedMessages();
+		SetTopPinnedMessageId(user, pinned->v);
 	}
 	user->setFullFlags(update.vflags().v);
 	user->setIsBlocked(update.is_blocked());
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 1459ce95f..e2828b48f 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -705,6 +705,9 @@ not_null<HistoryItem*> History::addNewToBack(
 				sharedMediaTypes,
 				item->id,
 				{ from, till }));
+			if (sharedMediaTypes.test(Storage::SharedMediaType::Pinned)) {
+				peer->setHasPinnedMessages(true);
+			}
 		}
 	}
 	if (item->from()->id) {
@@ -1008,6 +1011,7 @@ void History::applyServiceChanges(
 						Storage::SharedMediaType::Pinned,
 						{ id },
 						{ id, ServerMaxMsgId }));
+					peer->setHasPinnedMessages(true);
 				}
 			});
 		}
@@ -1348,6 +1352,9 @@ void History::addToSharedMedia(
 				type,
 				std::move(medias[i]),
 				{ from, till }));
+			if (type == Storage::SharedMediaType::Pinned) {
+				peer->setHasPinnedMessages(true);
+			}
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 71d4acb53..7bb00c86e 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -355,6 +355,7 @@ void HistoryItem::setIsPinned(bool pinned) {
 			Storage::SharedMediaType::Pinned,
 			id,
 			{ id, id }));
+		history()->peer->setHasPinnedMessages(true);
 	} else {
 		_flags &= ~MTPDmessage::Flag::f_pinned;
 		history()->session().storage().remove(Storage::SharedMediaRemoveOne(
@@ -489,12 +490,12 @@ void HistoryItem::indexAsNewItem() {
 		addToUnreadMentions(UnreadMentionType::New);
 		if (const auto types = sharedMediaTypes()) {
 			_history->session().storage().add(Storage::SharedMediaAddNew(
-				history()->peer->id,
+				_history->peer->id,
 				types,
 				id));
-		}
-		if (isPinned()) {
-			_history->peer->setTopPinnedMessageId(id);
+			if (types.test(Storage::SharedMediaType::Pinned)) {
+				_history->peer->setHasPinnedMessages(true);
+			}
 		}
 		//if (const auto channel = history()->peer->asChannel()) { // #feed
 		//	if (const auto feed = channel->feed()) {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index c066a84c9..2a3bbe918 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -567,7 +567,7 @@ HistoryWidget::HistoryWidget(
 		| UpdateFlag::ChannelLinkedChat
 		| UpdateFlag::Slowmode
 		| UpdateFlag::BotStartToken
-		| UpdateFlag::PinnedMessage
+		| UpdateFlag::PinnedMessages
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer.get() == _peer);
 	}) | rpl::map([](const Data::PeerUpdate &update) {
@@ -608,7 +608,7 @@ HistoryWidget::HistoryWidget(
 			| UpdateFlag::ChannelLinkedChat)) {
 			handlePeerUpdate();
 		}
-		if (_pinnedTracker && (flags & UpdateFlag::PinnedMessage)) {
+		if (_pinnedTracker && (flags & UpdateFlag::PinnedMessages)) {
 			checkPinnedBarState();
 		}
 	}, lifetime());
@@ -5184,7 +5184,7 @@ void HistoryWidget::updatePinnedViewer() {
 	}();
 	const auto lessThanId = item
 		? (item->data()->id + (offset > 0 ? 1 : 0))
-		: (_history->peer->topPinnedMessageId() + 1);
+		: (ServerMaxMsgId - 1);
 	_pinnedTracker->trackAround(lessThanId);
 }
 
@@ -5193,13 +5193,7 @@ void HistoryWidget::setupPinnedTracker() {
 
 	_pinnedTracker = std::make_unique<HistoryView::PinnedTracker>(_history);
 	_pinnedBar = nullptr;
-	Info::Profile::SharedMediaCountValue(
-		_history->peer,
-		_migrated ? _migrated->peer.get() : nullptr,
-		Storage::SharedMediaType::Pinned
-	) | rpl::start_with_next([=] {
-		checkPinnedBarState();
-	}, _pinnedTracker->lifetime());
+	checkPinnedBarState();
 }
 
 void HistoryWidget::checkPinnedBarState() {
@@ -5208,7 +5202,7 @@ void HistoryWidget::checkPinnedBarState() {
 	const auto hiddenId = _peer->canPinMessages()
 		? MsgId(0)
 		: session().settings().hiddenPinnedMessageId(_peer->id);
-	const auto currentPinnedId = _peer->topPinnedMessageId();
+	const auto currentPinnedId = Data::ResolveTopPinnedId(_peer);
 	if (currentPinnedId == hiddenId) {
 		if (_pinnedBar) {
 			_pinnedTracker->reset();
@@ -5601,7 +5595,7 @@ void HistoryWidget::hidePinnedMessage() {
 	if (_peer->canPinMessages()) {
 		unpinMessage({ peerToChannel(_peer->id), id.message });
 	} else {
-		const auto top = _peer->topPinnedMessageId();
+		const auto top = Data::ResolveTopPinnedId(_peer);
 		if (top) {
 			session().settings().setHiddenPinnedMessageId(_peer->id, top);
 			session().saveSettingsDelayed();
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 92f63e34c..b049bc262 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -34,7 +34,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "data/data_channel.h"
-#include "data/data_pinned_messages.h"
 #include "data/data_changes.h"
 #include "data/data_sparse_ids.h"
 #include "data/data_shared_media.h"
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
index f2aee7419..f8c9c6d31 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
@@ -8,9 +8,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_pinned_tracker.h"
 
 #include "data/data_changes.h"
-#include "data/data_pinned_messages.h"
 #include "data/data_peer.h"
 #include "data/data_channel.h"
+#include "data/data_shared_media.h"
 #include "data/data_session.h"
 #include "main/main_session.h"
 #include "storage/storage_facade.h"
@@ -21,16 +21,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace HistoryView {
 namespace{
 
-constexpr auto kLoadedLimit = 4;
+constexpr auto kLoadedLimit = 5;
+constexpr auto kChangeViewerLimit = 2;
 
 } // namespace
 
 PinnedTracker::PinnedTracker(not_null<History*> history) : _history(history) {
 	_history->session().changes().peerFlagsValue(
 		_history->peer,
-		Data::PeerUpdate::Flag::PinnedMessage
-	) | rpl::start_with_next([=] {
-		refreshData();
+		Data::PeerUpdate::Flag::PinnedMessages
+	) | rpl::map([=] {
+		return _history->peer->hasPinnedMessages();
+	}) | rpl::distinct_until_changed(
+	) | rpl::start_with_next([=](bool has) {
+		if (has) {
+			refreshViewer();
+		} else {
+			clear();
+		}
 	}, _lifetime);
 }
 
@@ -48,60 +56,85 @@ PinnedId PinnedTracker::currentMessageId() const {
 	return _current.current();
 }
 
-void PinnedTracker::refreshData() {
-	const auto now = _history->peer->currentPinnedMessages();
-	if (!now) {
-		_dataLifetime.destroy();
-		_current = PinnedId();
-	} else if (_data.get() != now) {
-		_dataLifetime.destroy();
-		_data = now;
-		if (_aroundId) {
-			setupViewer(now);
+void PinnedTracker::refreshViewer() {
+	if (_viewerAroundId == _aroundId) {
+		return;
+	}
+	_dataLifetime.destroy();
+	_viewerAroundId = _aroundId;
+	SharedMediaViewer(
+		&_history->peer->session(),
+		Storage::SharedMediaKey(
+			_history->peer->id,
+			Storage::SharedMediaType::Pinned,
+			_viewerAroundId),
+		kLoadedLimit,
+		kLoadedLimit
+	) | rpl::start_with_next([=](const SparseIdsSlice &result) {
+		_slice.fullCount = result.fullCount();
+		_slice.skippedBefore = result.skippedBefore();
+		_slice.skippedAfter = result.skippedAfter();
+		_slice.ids.clear();
+		const auto count = result.size();
+		_slice.ids.reserve(count);
+		for (auto i = 0; i != count; ++i) {
+			_slice.ids.push_back(result[i]);
+		}
+		refreshCurrentFromSlice();
+		if (_slice.fullCount == 0) {
+			_history->peer->setHasPinnedMessages(false);
+		}
+	}, _dataLifetime);
+}
+
+void PinnedTracker::refreshCurrentFromSlice() {
+	const auto i = ranges::lower_bound(_slice.ids, _aroundId);
+	const auto empty = _slice.ids.empty();
+	const auto before = int(i - begin(_slice.ids));
+	const auto after = int(end(_slice.ids) - i);
+	const auto haveValidData = (before > 0 || _slice.skippedBefore == 0)
+		&& (after > 0 || _slice.skippedAfter == 0);
+	const auto nearEnd = !haveValidData
+		|| (before <= kChangeViewerLimit && _slice.skippedBefore != 0)
+		|| (after <= kChangeViewerLimit && _slice.skippedAfter != 0);
+	if (haveValidData) {
+		const auto count = std::max(
+			_slice.fullCount.value_or(1),
+			int(_slice.ids.size()));
+		const auto index = _slice.skippedBefore.has_value()
+			? (*_slice.skippedBefore + before)
+			: _slice.skippedAfter.has_value()
+			? (count - *_slice.skippedAfter - after)
+			: 1;
+		if (i != begin(_slice.ids)) {
+			_current = PinnedId{ *(i - 1), index - 1, count };
+		} else if (!_slice.ids.empty()) {
+			_current = PinnedId{ _slice.ids.front(), 0, count };
+		} else {
+			_current = PinnedId();
 		}
 	}
+	if (nearEnd) {
+		refreshViewer();
+	}
+}
+
+void PinnedTracker::clear() {
+	_dataLifetime.destroy();
+	_viewerAroundId = 0;
+	_current = PinnedId();
 }
 
 void PinnedTracker::trackAround(MsgId messageId) {
 	if (_aroundId == messageId) {
 		return;
 	}
-	_dataLifetime.destroy();
 	_aroundId = messageId;
 	if (!_aroundId) {
-		_current = PinnedId();
-	} else if (const auto now = _data.get()) {
-		setupViewer(now);
+		clear();
+	} else {
+		refreshCurrentFromSlice();
 	}
 }
 
-void PinnedTracker::setupViewer(not_null<Data::PinnedMessages*> data) {
-	data->viewer(
-		_aroundId,
-		kLoadedLimit + 2
-	) | rpl::start_with_next([=](const Data::PinnedAroundId &snapshot) {
-		const auto i = ranges::lower_bound(snapshot.ids, _aroundId);
-		const auto empty = snapshot.ids.empty();
-		const auto before = int(i - begin(snapshot.ids));
-		const auto after = int(end(snapshot.ids) - i);
-		if (snapshot.ids.empty()) {
-			_current = PinnedId();
-			return;
-		}
-		const auto count = std::max(
-			snapshot.fullCount.value_or(1),
-			int(snapshot.ids.size()));
-		const auto index = snapshot.skippedBefore.has_value()
-			? (*snapshot.skippedBefore + before)
-			: snapshot.skippedAfter.has_value()
-			? (count - *snapshot.skippedAfter - after)
-			: 1;
-		if (i != begin(snapshot.ids)) {
-			_current = PinnedId{ *(i - 1), index - 1, count };
-		} else if (snapshot.skippedBefore == 0) {
-			_current = PinnedId{ snapshot.ids.front(), 0, count };
-		}
-	}, _dataLifetime);
-}
-
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
index 21f18bb4e..9335c4851 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
@@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 class History;
 
 namespace Data {
-class PinnedMessages;
 enum class LoadDirection : char;
 } // namespace Data
 
@@ -46,16 +45,24 @@ public:
 	}
 
 private:
-	void refreshData();
-	void setupViewer(not_null<Data::PinnedMessages*> data);
+	struct Slice {
+		std::vector<MsgId> ids;
+		std::optional<int> fullCount;
+		std::optional<int> skippedBefore;
+		std::optional<int> skippedAfter;
+	};
+	void clear();
+	void refreshViewer();
+	void refreshCurrentFromSlice();
 
 	const not_null<History*> _history;
 
-	base::weak_ptr<Data::PinnedMessages> _data;
 	rpl::variable<PinnedId> _current;
 	rpl::lifetime _dataLifetime;
 
 	MsgId _aroundId = 0;
+	MsgId _viewerAroundId = 0;
+	Slice _slice;
 
 	rpl::lifetime _lifetime;
 

From ebbe75ac0aa93fd6102124c96eef19bc758b1d6e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Oct 2020 15:31:15 +0300
Subject: [PATCH 118/190] Fix scrolling to message in pinned section.

---
 .../history/view/history_view_list_widget.cpp  |  4 ++--
 .../history/view/history_view_list_widget.h    |  3 ++-
 .../view/history_view_pinned_section.cpp       | 18 ++++++++++++------
 .../history/view/history_view_pinned_section.h |  3 ++-
 .../view/history_view_replies_section.cpp      | 15 ++++++++++-----
 .../view/history_view_replies_section.h        |  3 ++-
 .../view/history_view_scheduled_section.cpp    |  2 +-
 7 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index a39adecef..a53544ce8 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -389,13 +389,13 @@ std::optional<int> ListWidget::scrollTopForView(
 	return top - std::max((available - height) / 2, 0);
 }
 
-void ListWidget::animatedScrollTo(
+void ListWidget::scrollTo(
 		int scrollTop,
 		Data::MessagePosition attachPosition,
 		int delta,
 		AnimatedScroll type) {
 	_scrollToAnimation.stop();
-	if (!delta || _items.empty()) {
+	if (!delta || _items.empty() || type == AnimatedScroll::None) {
 		_delegate->listScrollTo(scrollTop);
 		return;
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index 5fa88ecde..c0c3b3d70 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -168,8 +168,9 @@ public:
 	enum class AnimatedScroll {
 		Full,
 		Part,
+		None,
 	};
-	void animatedScrollTo(
+	void scrollTo(
 		int scrollTop,
 		Data::MessagePosition attachPosition,
 		int delta,
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index b049bc262..d6c6ac3ad 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -178,7 +178,10 @@ void PinnedWidget::showAtPosition(
 
 bool PinnedWidget::showAtPositionNow(
 		Data::MessagePosition position,
-		HistoryItem *originItem) {
+		HistoryItem *originItem,
+		anim::type animated) {
+	using AnimatedScroll = HistoryView::ListWidget::AnimatedScroll;
+
 	const auto item = position.fullId
 		? _history->owner().message(position.fullId)
 		: nullptr;
@@ -189,13 +192,16 @@ bool PinnedWidget::showAtPositionNow(
 		const auto fullDelta = (wanted - currentScrollTop);
 		const auto limit = _scroll->height();
 		const auto scrollDelta = snap(fullDelta, -limit, limit);
-		_inner->animatedScrollTo(
+		const auto type = (animated == anim::type::instant)
+			? AnimatedScroll::None
+			: (std::abs(fullDelta) > limit)
+			? AnimatedScroll::Part
+			: AnimatedScroll::Full;
+		_inner->scrollTo(
 			wanted,
 			use,
 			scrollDelta,
-			(std::abs(fullDelta) > limit
-				? HistoryView::ListWidget::AnimatedScroll::Part
-				: HistoryView::ListWidget::AnimatedScroll::Full));
+			type);
 		if (use != Data::MaxMessagePosition
 			&& use != Data::UnreadMessagePosition) {
 			_inner->highlightMessage(use.fullId);
@@ -356,7 +362,7 @@ void PinnedWidget::restoreState(not_null<PinnedMemento*> memento) {
 			.date = TimeId(0),
 		};
 		_inner->showAroundPosition(position, [=] {
-			return showAtPositionNow(position, nullptr);
+			return showAtPositionNow(position, nullptr, anim::type::instant);
 		});
 	}
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.h b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
index 09935471c..c5eebcf5e 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -117,7 +117,8 @@ private:
 		HistoryItem *originItem = nullptr);
 	bool showAtPositionNow(
 		Data::MessagePosition position,
-		HistoryItem *originItem);
+		HistoryItem *originItem,
+		anim::type animated = anim::type::normal);
 
 	void setupScrollDownButton();
 	void scrollDownClicked();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 7763d2acb..17947323e 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1169,7 +1169,9 @@ void RepliesWidget::showAtPosition(
 
 bool RepliesWidget::showAtPositionNow(
 		Data::MessagePosition position,
-		HistoryItem *originItem) {
+		HistoryItem *originItem,
+		anim::type animated) {
+	using AnimatedScroll = HistoryView::ListWidget::AnimatedScroll;
 	const auto item = position.fullId
 		? _history->owner().message(position.fullId)
 		: nullptr;
@@ -1183,13 +1185,16 @@ bool RepliesWidget::showAtPositionNow(
 		const auto fullDelta = (wanted - currentScrollTop);
 		const auto limit = _scroll->height();
 		const auto scrollDelta = snap(fullDelta, -limit, limit);
-		_inner->animatedScrollTo(
+		const auto type = (animated == anim::type::instant)
+			? AnimatedScroll::None
+			: (std::abs(fullDelta) > limit)
+			? AnimatedScroll::Part
+			: AnimatedScroll::Full;
+		_inner->scrollTo(
 			wanted,
 			use,
 			scrollDelta,
-			(std::abs(fullDelta) > limit
-				? HistoryView::ListWidget::AnimatedScroll::Part
-				: HistoryView::ListWidget::AnimatedScroll::Full));
+			type);
 		if (use != Data::MaxMessagePosition
 			&& use != Data::UnreadMessagePosition) {
 			_inner->highlightMessage(use.fullId);
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 127c18dc4..e031369d5 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -150,7 +150,8 @@ private:
 		HistoryItem *originItem = nullptr);
 	bool showAtPositionNow(
 		Data::MessagePosition position,
-		HistoryItem *originItem);
+		HistoryItem *originItem,
+		anim::type animated = anim::type::normal);
 	void finishSending();
 
 	void setupComposeControls();
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index d18fdc0c9..66bc5bd48 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -802,7 +802,7 @@ bool ScheduledWidget::showAtPositionNow(Data::MessagePosition position) {
 		const auto fullDelta = (wanted - currentScrollTop);
 		const auto limit = _scroll->height();
 		const auto scrollDelta = snap(fullDelta, -limit, limit);
-		_inner->animatedScrollTo(
+		_inner->scrollTo(
 			wanted,
 			position,
 			scrollDelta,

From 61d335469f42cc09e9559fa568c26cafd714879b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Oct 2020 17:41:13 +0300
Subject: [PATCH 119/190] Improve context menu in pinned section.

---
 Telegram/Resources/langs/lang.strings         |  2 +
 .../history/history_inner_widget.cpp          | 11 ++--
 .../SourceFiles/history/history_widget.cpp    | 38 ++----------
 Telegram/SourceFiles/history/history_widget.h |  4 --
 .../view/history_view_context_menu.cpp        | 58 ++++++++++++++++++-
 .../history/view/history_view_element.h       |  1 +
 .../history/view/history_view_message.cpp     | 10 +++-
 .../view/history_view_pinned_section.cpp      | 50 ++++++----------
 .../view/history_view_pinned_section.h        |  1 +
 .../view/history_view_top_bar_widget.cpp      |  2 +-
 .../SourceFiles/window/window_peer_menu.cpp   | 26 +++++++++
 .../SourceFiles/window/window_peer_menu.h     |  5 ++
 12 files changed, 127 insertions(+), 81 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 55fe15cf6..1aaf90769 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -316,6 +316,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_events_title" = "Events";
 "lng_settings_events_joined" = "Contact joined Telegram";
 "lng_settings_events_pinned" = "Pinned messages";
+"lng_pinned_messages_title#one" = "{count} pinned message";
+"lng_pinned_messages_title#other" = "{count} pinned messages";
 
 "lng_notification_preview" = "You have a new message";
 "lng_notification_reply" = "Reply";
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index a4fbfbb8b..d819cb0e9 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1572,13 +1572,10 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		}
 		if (item->canPin()) {
 			const auto isPinned = item->isPinned();
-			_menu->addAction(isPinned ? tr::lng_context_unpin_msg(tr::now) : tr::lng_context_pin_msg(tr::now), [=] {
-				if (isPinned) {
-					_widget->unpinMessage(itemId);
-				} else {
-					_widget->pinMessage(itemId);
-				}
-			});
+			const auto controller = _controller;
+			_menu->addAction(isPinned ? tr::lng_context_unpin_msg(tr::now) : tr::lng_context_pin_msg(tr::now), crl::guard(controller, [=] {
+				Window::ToggleMessagePinned(controller, itemId, !isPinned);
+			}));
 		}
 	};
 	const auto addPhotoActions = [&](not_null<PhotoData*> photo) {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 2a3bbe918..de25e5ee2 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5552,39 +5552,6 @@ void HistoryWidget::editMessage(not_null<HistoryItem*> item) {
 	_field->setFocus();
 }
 
-void HistoryWidget::pinMessage(FullMsgId itemId) {
-	if (const auto item = session().data().message(itemId)) {
-		if (item->canPin()) {
-			Ui::show(Box<PinMessageBox>(item->history()->peer, item->id));
-		}
-	}
-}
-
-void HistoryWidget::unpinMessage(FullMsgId itemId) {
-	if (!_peer) {
-		return;
-	}
-	UnpinMessage(_peer, itemId.msg);
-}
-
-void HistoryWidget::UnpinMessage(not_null<PeerData*> peer, MsgId msgId) {
-	if (!peer) {
-		return;
-	}
-
-	const auto session = &peer->session();
-	Ui::show(Box<ConfirmBox>(tr::lng_pinned_unpin_sure(tr::now), tr::lng_pinned_unpin(tr::now), crl::guard(session, [=] {
-		Ui::hideLayer();
-		session->api().request(MTPmessages_UpdatePinnedMessage(
-			MTP_flags(MTPmessages_UpdatePinnedMessage::Flag::f_unpin),
-			peer->input,
-			MTP_int(msgId)
-		)).done([=](const MTPUpdates &result) {
-			session->api().applyUpdates(result);
-		}).send();
-	})));
-}
-
 void HistoryWidget::hidePinnedMessage() {
 	Expects(_pinnedBar != nullptr);
 
@@ -5593,7 +5560,10 @@ void HistoryWidget::hidePinnedMessage() {
 		return;
 	}
 	if (_peer->canPinMessages()) {
-		unpinMessage({ peerToChannel(_peer->id), id.message });
+		Window::ToggleMessagePinned(
+			controller(),
+			{ peerToChannel(_peer->id), id.message },
+			false);
 	} else {
 		const auto top = Data::ResolveTopPinnedId(_peer);
 		if (top) {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 4d72f0f32..197e63176 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -183,8 +183,6 @@ public:
 	void replyToMessage(not_null<HistoryItem*> item);
 	void editMessage(FullMsgId itemId);
 	void editMessage(not_null<HistoryItem*> item);
-	void pinMessage(FullMsgId itemId);
-	void unpinMessage(FullMsgId itemId);
 
 	MsgId replyToId() const;
 	bool lastForceReplyReplied(const FullMsgId &replyTo) const;
@@ -517,8 +515,6 @@ private:
 	void addMessagesToFront(PeerData *peer, const QVector<MTPMessage> &messages);
 	void addMessagesToBack(PeerData *peer, const QVector<MTPMessage> &messages);
 
-	static void UnpinMessage(not_null<PeerData*> peer, MsgId msgId);
-
 	void updateHistoryGeometry(bool initial = false, bool loadedDown = false, const ScrollChange &change = { ScrollChangeNone, 0 });
 	void updateListSize();
 
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index c4b5d101d..c1feda60f 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -496,10 +496,12 @@ bool AddReplyToMessageAction(
 		not_null<Ui::PopupMenu*> menu,
 		const ContextMenuRequest &request,
 		not_null<ListWidget*> list) {
+	const auto context = list->elementContext();
 	const auto item = request.item;
 	if (!item
 		|| !IsServerMsgId(item->id)
-		|| !item->history()->peer->canWrite()) {
+		|| !item->history()->peer->canWrite()
+		|| (context != Context::History && context != Context::Replies)) {
 		return false;
 	}
 	const auto owner = &item->history()->owner();
@@ -514,6 +516,37 @@ bool AddReplyToMessageAction(
 	return true;
 }
 
+bool AddViewRepliesAction(
+		not_null<Ui::PopupMenu*> menu,
+		const ContextMenuRequest &request,
+		not_null<ListWidget*> list) {
+	const auto context = list->elementContext();
+	const auto item = request.item;
+	if (!item
+		|| !IsServerMsgId(item->id)
+		|| (context != Context::History && context != Context::Pinned)) {
+		return false;
+	}
+	const auto repliesCount = item->repliesCount();
+	const auto withReplies = (repliesCount > 0);
+	if (!withReplies || !item->history()->peer->isMegagroup()) {
+		return false;
+	}
+	const auto rootId = repliesCount ? item->id : item->replyToTop();
+	const auto phrase = (repliesCount > 0)
+		? tr::lng_replies_view(
+			tr::now,
+			lt_count,
+			repliesCount)
+		: tr::lng_replies_view_thread(tr::now);
+	const auto controller = list->controller();
+	const auto history = item->history();
+	menu->addAction(phrase, crl::guard(controller, [=] {
+		controller->showRepliesForMessage(history, rootId);
+	}));
+	return true;
+}
+
 bool AddEditMessageAction(
 		not_null<Ui::PopupMenu*> menu,
 		const ContextMenuRequest &request,
@@ -537,6 +570,27 @@ bool AddEditMessageAction(
 	return true;
 }
 
+bool AddPinMessageAction(
+		not_null<Ui::PopupMenu*> menu,
+		const ContextMenuRequest &request,
+		not_null<ListWidget*> list) {
+	const auto context = list->elementContext();
+	const auto item = request.item;
+	if (!item
+		|| !IsServerMsgId(item->id)
+		|| !item->canPin()
+		|| (context != Context::History && context != Context::Pinned)) {
+		return false;
+	}
+	const auto itemId = item->fullId();
+	const auto isPinned = item->isPinned();
+	const auto controller = list->controller();
+	menu->addAction(isPinned ? tr::lng_context_unpin_msg(tr::now) : tr::lng_context_pin_msg(tr::now), crl::guard(controller, [=] {
+		Window::ToggleMessagePinned(controller, itemId, !isPinned);
+	}));
+	return true;
+}
+
 void AddSendNowAction(
 		not_null<Ui::PopupMenu*> menu,
 		const ContextMenuRequest &request,
@@ -720,7 +774,9 @@ void AddTopMessageActions(
 		const ContextMenuRequest &request,
 		not_null<ListWidget*> list) {
 	AddReplyToMessageAction(menu, request, list);
+	AddViewRepliesAction(menu, request, list);
 	AddEditMessageAction(menu, request, list);
+	AddPinMessageAction(menu, request, list);
 }
 
 void AddMessageActions(
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index 05aadbcdc..800761240 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -33,6 +33,7 @@ class Media;
 enum class Context : char {
 	History,
 	Replies,
+	Pinned,
 	//Feed, // #feed
 	AdminLog,
 	ContactPreview
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 1eaf6786a..d909a839d 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1214,6 +1214,7 @@ bool Message::hasFromPhoto() const {
 	//case Context::Feed: // #feed
 		return true;
 	case Context::History:
+	case Context::Pinned:
 	case Context::Replies: {
 		const auto item = message();
 		if (item->isPost()
@@ -2051,6 +2052,7 @@ bool Message::hasFromName() const {
 	//case Context::Feed: // #feed
 		return true;
 	case Context::History:
+	case Context::Pinned:
 	case Context::Replies: {
 		const auto item = message();
 		return (!hasOutLayout() || item->from()->isMegagroup())
@@ -2216,6 +2218,9 @@ bool Message::displayFastShare() const {
 }
 
 bool Message::displayGoToOriginal() const {
+	if (context() == Context::Pinned) {
+		return true;
+	}
 	const auto item = message();
 	if (const auto forwarded = item->Get<HistoryMessageForwarded>()) {
 		return forwarded->savedFromPeer
@@ -2277,7 +2282,10 @@ void Message::drawRightAction(
 
 ClickHandlerPtr Message::rightActionLink() const {
 	if (!_rightActionLink) {
-		if (displayRightActionComments()) {
+		if (context() == Context::Pinned) {
+			_rightActionLink = goToMessageClickHandler(data());
+			return _rightActionLink;
+		} else if (displayRightActionComments()) {
 			_rightActionLink = createGoToCommentsLink();
 			return _rightActionLink;
 		}
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index d6c6ac3ad..767e1c58f 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -102,6 +102,7 @@ PinnedWidget::PinnedWidget(
 	_topBar->move(0, 0);
 	_topBar->resizeToWidth(width());
 	_topBar->show();
+	_topBar->setCustomTitle(tr::lng_contacts_loading(tr::now));
 
 	_topBar->deleteSelectionRequest(
 	) | rpl::start_with_next([=] {
@@ -285,10 +286,7 @@ QPixmap PinnedWidget::grabForShowAnimation(const Window::SectionSlideParams &par
 }
 
 void PinnedWidget::doSetInnerFocus() {
-	if (!_inner->getSelectedText().rich.text.isEmpty()
-		|| !_inner->getSelectedItems().empty()) {
-		_inner->setFocus();
-	}
+	_inner->setFocus();
 }
 
 bool PinnedWidget::showInternal(
@@ -321,33 +319,7 @@ bool PinnedWidget::showMessage(
 		PeerId peerId,
 		const Window::SectionShow &params,
 		MsgId messageId) {
-	if (peerId != _history->peer->id) {
-		return false;
-	}
-	const auto id = FullMsgId{
-		_history->channelId(),
-		messageId
-	};
-	const auto message = _history->owner().message(id);
-	if (!message || !message->isPinned()) {
-		return false;
-	}
-
-	const auto originItem = [&]() -> HistoryItem* {
-		using OriginMessage = Window::SectionShow::OriginMessage;
-		if (const auto origin = std::get_if<OriginMessage>(&params.origin)) {
-			if (const auto returnTo = session().data().message(origin->id)) {
-				if (returnTo->history() == _history && returnTo->isPinned()) {
-					return returnTo;
-				}
-			}
-		}
-		return nullptr;
-	}();
-	showAtPosition(
-		Data::MessagePosition{ .fullId = id, .date = message->date() },
-		originItem);
-	return true;
+	return false; // We want 'Go to original' to work.
 }
 
 void PinnedWidget::saveState(not_null<PinnedMemento*> memento) {
@@ -463,7 +435,7 @@ QRect PinnedWidget::floatPlayerAvailableRect() {
 }
 
 Context PinnedWidget::listContext() {
-	return Context::Replies;
+	return Context::Pinned;
 }
 
 void PinnedWidget::listScrollTo(int top) {
@@ -502,7 +474,19 @@ rpl::producer<Data::MessagesSlice> PinnedWidget::listSource(
 			messageId),
 		limitBefore,
 		limitAfter
-	) | rpl::map([=](SparseIdsSlice &&slice) {
+	) | rpl::filter([=](const SparseIdsSlice &slice) {
+		const auto count = slice.fullCount();
+		if (!count.has_value()) {
+			return true;
+		} else if (*count != 0) {
+			_topBar->setCustomTitle(
+				tr::lng_pinned_messages_title(tr::now, lt_count, *count));
+			return true;
+		} else {
+			controller()->showBackFromStack();
+			return false;
+		}
+	}) | rpl::map([=](SparseIdsSlice &&slice) {
 		auto result = Data::MessagesSlice();
 		result.fullCount = slice.fullCount();
 		result.skippedAfter = slice.skippedAfter();
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.h b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
index c5eebcf5e..a3d5dd56a 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -138,6 +138,7 @@ private:
 
 	bool _skipScrollEvent = false;
 	std::unique_ptr<Ui::ScrollArea> _scroll;
+	object_ptr<Ui::FlatButton> _clearButton = { nullptr };
 
 	Ui::Animations::Simple _scrollDownShown;
 	bool _scrollDownIsShown = false;
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
index d6bb60e7d..6de1fb644 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -343,7 +343,7 @@ void TopBarWidget::paintTopBar(Painter &p) {
 				? tr::lng_reminder_messages(tr::now)
 				: tr::lng_scheduled_messages(tr::now))
 			: (_section == Section::Pinned)
-			? "Pinned messages" // #TODO pinned
+			? _customTitleText
 			: folder
 			? folder->chatListName()
 			: history->peer->isSelf()
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 3bc19bb24..6bf313f7a 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1124,6 +1124,32 @@ void PeerMenuAddChannelMembers(
 	}));
 }
 
+void ToggleMessagePinned(
+		not_null<Window::SessionNavigation*> navigation,
+		FullMsgId itemId,
+		bool pin) {
+	const auto item = navigation->session().data().message(itemId);
+	if (!item || !item->canPin()) {
+		return;
+	}
+	if (pin) {
+		Ui::show(Box<PinMessageBox>(item->history()->peer, item->id));
+	} else {
+		const auto peer = item->history()->peer;
+		const auto session = &peer->session();
+		Ui::show(Box<ConfirmBox>(tr::lng_pinned_unpin_sure(tr::now), tr::lng_pinned_unpin(tr::now), crl::guard(session, [=] {
+			Ui::hideLayer();
+			session->api().request(MTPmessages_UpdatePinnedMessage(
+				MTP_flags(MTPmessages_UpdatePinnedMessage::Flag::f_unpin),
+				peer->input,
+				MTP_int(itemId.msg)
+			)).done([=](const MTPUpdates &result) {
+				session->api().applyUpdates(result);
+			}).send();
+		})));
+	}
+}
+
 void PeerMenuAddMuteAction(
 		not_null<PeerData*> peer,
 		const PeerMenuCallback &addAction) {
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index 52706de66..7bbfc7c8e 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -111,4 +111,9 @@ QPointer<Ui::RpWidget> ShowSendNowMessagesBox(
 	MessageIdsList &&items,
 	FnMut<void()> &&successCallback = nullptr);
 
+void ToggleMessagePinned(
+	not_null<Window::SessionNavigation*> navigation,
+	FullMsgId itemId,
+	bool pin);
+
 } // namespace Window

From 994e3d8da7bb6927b158ee1c930b5d9115d670bc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 22 Oct 2020 10:53:56 +0300
Subject: [PATCH 120/190] Add hide / unpin all button in pinned section.

---
 Telegram/Resources/langs/lang.strings         | 10 ++-
 Telegram/SourceFiles/data/data_peer.cpp       | 13 ++++
 Telegram/SourceFiles/data/data_peer.h         |  1 +
 .../SourceFiles/data/data_peer_values.cpp     | 66 ++++++++++++++++++-
 Telegram/SourceFiles/data/data_peer_values.h  | 10 +--
 .../SourceFiles/history/history_widget.cpp    | 18 ++---
 .../view/history_view_context_menu.cpp        | 42 ++++++++++--
 .../history/view/history_view_list_widget.cpp |  4 ++
 .../view/history_view_pinned_section.cpp      | 55 +++++++++++++++-
 .../view/history_view_pinned_section.h        |  7 +-
 .../SourceFiles/window/window_peer_menu.cpp   | 47 +++++++++++++
 .../SourceFiles/window/window_peer_menu.h     |  7 ++
 12 files changed, 254 insertions(+), 26 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1aaf90769..f97b8f37e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -170,6 +170,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_pinned_pin" = "Pin";
 "lng_pinned_unpin" = "Unpin";
 "lng_pinned_notify" = "Notify all members";
+"lng_pinned_messages_title#one" = "{count} pinned message";
+"lng_pinned_messages_title#other" = "{count} pinned messages";
+"lng_pinned_hide_all" = "Don't show pinned messages";
+"lng_pinned_unpin_all#one" = "Unpin {count} message";
+"lng_pinned_unpin_all#other" = "Unpin all {count} messages";
+"lng_pinned_unpin_all_sure" = "Do you want to unpin all messages?";
+"lng_pinned_hide_all_sure" = "Do you want to hide the pinned messages bar? It will stay hidden until a new message is pinned.";
+"lng_pinned_hide_all_hide" = "Hide";
 
 "lng_edit_media_album_error" = "This file cannot be saved as a part of an album.";
 "lng_edit_media_invalid_file" = "Sorry, no way to use this file.";
@@ -316,8 +324,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_events_title" = "Events";
 "lng_settings_events_joined" = "Contact joined Telegram";
 "lng_settings_events_pinned" = "Pinned messages";
-"lng_pinned_messages_title#one" = "{count} pinned message";
-"lng_pinned_messages_title#other" = "{count} pinned messages";
 
 "lng_notification_preview" = "You have a new message";
 "lng_notification_reply" = "Reply";
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index b9341eb76..2b817d695 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -435,6 +435,7 @@ QString PeerData::computeUnavailableReason() const {
 	return (first != filtered.end()) ? first->text : QString();
 }
 
+// This is duplicated in CanPinMessagesValue().
 bool PeerData::canPinMessages() const {
 	if (const auto user = asUser()) {
 		return user->fullFlags() & MTPDuserFull::Flag::f_can_pin_message;
@@ -1028,4 +1029,16 @@ MsgId ResolveTopPinnedId(not_null<PeerData*> peer) {
 	return slice.messageIds.empty() ? 0 : slice.messageIds.back();
 }
 
+std::optional<int> ResolvePinnedCount(not_null<PeerData*> peer) {
+	const auto slice = peer->session().storage().snapshot(
+		Storage::SharedMediaQuery(
+			Storage::SharedMediaKey(
+				peer->id,
+				Storage::SharedMediaType::Pinned,
+				0),
+			0,
+			0));
+	return slice.count;
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index 4fa630510..2ffb3cbaf 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -444,5 +444,6 @@ std::optional<QString> RestrictionError(
 
 void SetTopPinnedMessageId(not_null<PeerData*> peer, MsgId messageId);
 [[nodiscard]] MsgId ResolveTopPinnedId(not_null<PeerData*> peer);
+[[nodiscard]] std::optional<int> ResolvePinnedCount(not_null<PeerData*> peer);
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_peer_values.cpp b/Telegram/SourceFiles/data/data_peer_values.cpp
index 5522d5ff9..4074bd889 100644
--- a/Telegram/SourceFiles/data/data_peer_values.cpp
+++ b/Telegram/SourceFiles/data/data_peer_values.cpp
@@ -252,7 +252,71 @@ rpl::producer<bool> CanWriteValue(not_null<PeerData*> peer) {
 	} else if (auto channel = peer->asChannel()) {
 		return CanWriteValue(channel);
 	}
-	Unexpected("Bad peer value in CanWriteValue()");
+	Unexpected("Bad peer value in CanWriteValue");
+}
+
+// This is duplicated in PeerData::canPinMessages().
+rpl::producer<bool> CanPinMessagesValue(not_null<PeerData*> peer) {
+	using namespace rpl::mappers;
+	if (const auto user = peer->asUser()) {
+		return PeerFullFlagsValue(
+			user,
+			MTPDuserFull::Flag::f_can_pin_message
+		) | rpl::map(_1 != MTPDuserFull::Flag(0));
+	} else if (const auto chat = peer->asChat()) {
+		const auto mask = 0
+			| MTPDchat::Flag::f_deactivated
+			| MTPDchat_ClientFlag::f_forbidden
+			| MTPDchat::Flag::f_left
+			| MTPDchat::Flag::f_creator
+			| MTPDchat::Flag::f_kicked;
+		return rpl::combine(
+			PeerFlagsValue(chat, mask),
+			AdminRightValue(chat, ChatAdminRight::f_pin_messages),
+			DefaultRestrictionValue(chat, ChatRestriction::f_pin_messages),
+			[](
+				MTPDchat::Flags flags,
+				bool adminRightAllows,
+				bool defaultRestriction) {
+			const auto amOutFlags = 0
+				| MTPDchat::Flag::f_deactivated
+				| MTPDchat_ClientFlag::f_forbidden
+				| MTPDchat::Flag::f_left
+				| MTPDchat::Flag::f_kicked;
+			return !(flags & amOutFlags)
+				&& ((flags & MTPDchat::Flag::f_creator)
+					|| adminRightAllows
+					|| !defaultRestriction);
+		});
+	} else if (const auto megagroup = peer->asMegagroup()) {
+		if (megagroup->amCreator()) {
+			return rpl::single(true);
+		}
+		return rpl::combine(
+			AdminRightValue(megagroup, ChatAdminRight::f_pin_messages),
+			DefaultRestrictionValue(megagroup, ChatRestriction::f_pin_messages),
+			PeerFlagValue(megagroup, MTPDchannel::Flag::f_username),
+			PeerFullFlagValue(megagroup, MTPDchannelFull::Flag::f_location),
+			megagroup->restrictionsValue()
+		) | rpl::map([=](
+				bool adminRightAllows,
+				bool defaultRestriction,
+				bool hasUsername,
+				bool hasLocation,
+				Data::Flags<ChatRestrictions>::Change restrictions) {
+			return adminRightAllows
+				|| (!hasUsername
+					&& !hasLocation
+					&& !defaultRestriction
+					&& !(restrictions.value & ChatRestriction::f_pin_messages));
+		});
+	} else if (const auto channel = peer->asChannel()) {
+		if (channel->amCreator()) {
+			return rpl::single(true);
+		}
+		return AdminRightValue(channel, ChatAdminRight::f_edit_messages);
+	}
+	Unexpected("Peer type in CanPinMessagesValue.");
 }
 
 TimeId SortByOnlineValue(not_null<UserData*> user, TimeId now) {
diff --git a/Telegram/SourceFiles/data/data_peer_values.h b/Telegram/SourceFiles/data/data_peer_values.h
index 339e031df..c913761f8 100644
--- a/Telegram/SourceFiles/data/data_peer_values.h
+++ b/Telegram/SourceFiles/data/data_peer_values.h
@@ -84,6 +84,7 @@ template <
 	typename = typename PeerType::FullFlags::Change>
 inline auto PeerFullFlagsValue(PeerType *peer) {
 	Expects(peer != nullptr);
+
 	return peer->fullFlagsValue();
 }
 
@@ -105,10 +106,11 @@ inline auto PeerFullFlagValue(
 	return SingleFlagValue(PeerFullFlagsValue(peer), flag);
 }
 
-rpl::producer<bool> CanWriteValue(UserData *user);
-rpl::producer<bool> CanWriteValue(ChatData *chat);
-rpl::producer<bool> CanWriteValue(ChannelData *channel);
-rpl::producer<bool> CanWriteValue(not_null<PeerData*> peer);
+[[nodiscard]] rpl::producer<bool> CanWriteValue(UserData *user);
+[[nodiscard]] rpl::producer<bool> CanWriteValue(ChatData *chat);
+[[nodiscard]] rpl::producer<bool> CanWriteValue(ChannelData *channel);
+[[nodiscard]] rpl::producer<bool> CanWriteValue(not_null<PeerData*> peer);
+[[nodiscard]] rpl::producer<bool> CanPinMessagesValue(not_null<PeerData*> peer);
 
 [[nodiscard]] TimeId SortByOnlineValue(not_null<UserData*> user, TimeId now);
 [[nodiscard]] crl::time OnlineChangeTimeout(TimeId online, TimeId now);
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index de25e5ee2..02b024b62 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5565,15 +5565,15 @@ void HistoryWidget::hidePinnedMessage() {
 			{ peerToChannel(_peer->id), id.message },
 			false);
 	} else {
-		const auto top = Data::ResolveTopPinnedId(_peer);
-		if (top) {
-			session().settings().setHiddenPinnedMessageId(_peer->id, top);
-			session().saveSettingsDelayed();
-
-			checkPinnedBarState();
-		} else {
-			session().api().requestFullPeer(_peer);
-		}
+		const auto callback = [=] {
+			if (_pinnedTracker) {
+				checkPinnedBarState();
+			}
+		};
+		Window::HidePinnedBar(
+			controller(),
+			_peer,
+			crl::guard(this, callback));
 	}
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index c1feda60f..b0a7fd185 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -77,13 +77,17 @@ MsgId ItemIdAcrossData(not_null<HistoryItem*> item) {
 	return session->data().scheduledMessages().lookupId(item);
 }
 
-bool HasEditMessageAction(const ContextMenuRequest &request) {
+bool HasEditMessageAction(
+		const ContextMenuRequest &request,
+		not_null<ListWidget*> list) {
 	const auto item = request.item;
+	const auto context = list->elementContext();
 	if (!item
 		|| item->isSending()
 		|| item->hasFailed()
 		|| item->isEditingMedia()
-		|| !request.selectedItems.empty()) {
+		|| !request.selectedItems.empty()
+		|| (context != Context::History && context != Context::Replies)) {
 		return false;
 	}
 	const auto peer = item->history()->peer;
@@ -441,8 +445,10 @@ bool AddSendNowMessageAction(
 
 bool AddRescheduleMessageAction(
 		not_null<Ui::PopupMenu*> menu,
-		const ContextMenuRequest &request) {
-	if (!HasEditMessageAction(request) || !request.item->isScheduled()) {
+		const ContextMenuRequest &request,
+		not_null<ListWidget*> list) {
+	if (!HasEditMessageAction(request, list)
+		|| !request.item->isScheduled()) {
 		return false;
 	}
 	const auto owner = &request.item->history()->owner();
@@ -551,7 +557,7 @@ bool AddEditMessageAction(
 		not_null<Ui::PopupMenu*> menu,
 		const ContextMenuRequest &request,
 		not_null<ListWidget*> list) {
-	if (!HasEditMessageAction(request)) {
+	if (!HasEditMessageAction(request, list)) {
 		return false;
 	}
 	const auto item = request.item;
@@ -591,6 +597,29 @@ bool AddPinMessageAction(
 	return true;
 }
 
+bool AddGoToMessageAction(
+		not_null<Ui::PopupMenu*> menu,
+		const ContextMenuRequest &request,
+		not_null<ListWidget*> list) {
+	const auto context = list->elementContext();
+	const auto view = request.view;
+	if (!view
+		|| !IsServerMsgId(view->data()->id)
+		|| context != Context::Pinned
+		|| !view->hasOutLayout()) {
+		return false;
+	}
+	const auto itemId = view->data()->fullId();
+	const auto controller = list->controller();
+	menu->addAction(tr::lng_context_to_msg(tr::now), crl::guard(controller, [=] {
+		const auto item = controller->session().data().message(itemId);
+		if (item) {
+			goToMessageClickHandler(item)->onClick(ClickContext{});
+		}
+	}));
+	return true;
+}
+
 void AddSendNowAction(
 		not_null<Ui::PopupMenu*> menu,
 		const ContextMenuRequest &request,
@@ -774,6 +803,7 @@ void AddTopMessageActions(
 		const ContextMenuRequest &request,
 		not_null<ListWidget*> list) {
 	AddReplyToMessageAction(menu, request, list);
+	AddGoToMessageAction(menu, request, list);
 	AddViewRepliesAction(menu, request, list);
 	AddEditMessageAction(menu, request, list);
 	AddPinMessageAction(menu, request, list);
@@ -789,7 +819,7 @@ void AddMessageActions(
 	AddDeleteAction(menu, request, list);
 	AddReportAction(menu, request, list);
 	AddSelectionAction(menu, request, list);
-	AddRescheduleMessageAction(menu, request);
+	AddRescheduleMessageAction(menu, request, list);
 }
 
 void AddCopyLinkAction(
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index a53544ce8..4a6d38f81 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -1316,6 +1316,7 @@ void ListWidget::updateItemsGeometry() {
 				view->setDisplayDate(false);
 			} else {
 				view->setDisplayDate(true);
+				view->setAttachToPrevious(false);
 				return i;
 			}
 		}
@@ -2611,6 +2612,9 @@ void ListWidget::refreshAttachmentsFromTill(int from, int till) {
 			view = next;
 		}
 	}
+	if (till == int(_items.size())) {
+		_items.back()->setAttachToNext(false);
+	}
 	updateSize();
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 767e1c58f..2e1355bc4 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_components.h"
 #include "history/history_item.h"
 #include "boxes/confirm_box.h"
+#include "data/data_peer_values.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
 #include "ui/layers/generic_box.h"
@@ -93,6 +94,10 @@ PinnedWidget::PinnedWidget(
 , _topBar(this, controller)
 , _topBarShadow(this)
 , _scroll(std::make_unique<Ui::ScrollArea>(this, st::historyScroll, false))
+, _clearButton(std::make_unique<Ui::FlatButton>(
+	this,
+	QString(),
+	st::historyComposeButton))
 , _scrollDown(_scroll.get(), st::historyToDown) {
 	_topBar->setActiveChat(
 		_history,
@@ -129,6 +134,7 @@ PinnedWidget::PinnedWidget(
 	_scroll->show();
 	connect(_scroll.get(), &Ui::ScrollArea::scrolled, [=] { onScroll(); });
 
+	setupClearButton();
 	setupScrollDownButton();
 }
 
@@ -149,6 +155,28 @@ void PinnedWidget::setupScrollDownButton() {
 	updateScrollDownVisibility();
 }
 
+void PinnedWidget::setupClearButton() {
+	Data::CanPinMessagesValue(
+		_history->peer
+	) | rpl::start_with_next([=] {
+		refreshClearButtonText();
+	}, _clearButton->lifetime());
+
+	_clearButton->setClickedCallback([=] {
+		if (!_history->peer->canPinMessages()) {
+			const auto callback = [=] {
+				controller()->showBackFromStack();
+			};
+			Window::HidePinnedBar(
+				controller(),
+				_history->peer,
+				crl::guard(this, callback));
+		} else {
+			Window::UnpinAllMessages(controller(), _history);
+		}
+	});
+}
+
 void PinnedWidget::scrollDownClicked() {
 	if (QGuiApplication::keyboardModifiers() == Qt::ControlModifier) {
 		showAtEnd();
@@ -357,6 +385,26 @@ void PinnedWidget::recountChatWidth() {
 	}
 }
 
+void PinnedWidget::setMessagesCount(int count) {
+	if (_messagesCount == count) {
+		return;
+	}
+	_messagesCount = count;
+	_topBar->setCustomTitle(
+		tr::lng_pinned_messages_title(tr::now, lt_count, count));
+	refreshClearButtonText();
+}
+
+void PinnedWidget::refreshClearButtonText() {
+	const auto can = _history->peer->canPinMessages();
+	_clearButton->setText(can
+		? tr::lng_pinned_unpin_all(
+			tr::now,
+			lt_count,
+			std::max(_messagesCount, 1)).toUpper()
+		: tr::lng_pinned_hide_all(tr::now).toUpper());
+}
+
 void PinnedWidget::updateControlsGeometry() {
 	const auto contentWidth = width();
 
@@ -366,7 +414,9 @@ void PinnedWidget::updateControlsGeometry() {
 	_topBar->resizeToWidth(contentWidth);
 	_topBarShadow->resize(contentWidth, st::lineWidth);
 
-	const auto bottom = height();
+	const auto bottom = height() - _clearButton->height();
+	_clearButton->resizeToWidth(width());
+	_clearButton->move(0, bottom);
 	const auto controlsHeight = 0;
 	const auto scrollY = _topBar->height();
 	const auto scrollHeight = bottom - scrollY - controlsHeight;
@@ -479,8 +529,7 @@ rpl::producer<Data::MessagesSlice> PinnedWidget::listSource(
 		if (!count.has_value()) {
 			return true;
 		} else if (*count != 0) {
-			_topBar->setCustomTitle(
-				tr::lng_pinned_messages_title(tr::now, lt_count, *count));
+			setMessagesCount(*count);
 			return true;
 		} else {
 			controller()->showBackFromStack();
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.h b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
index a3d5dd56a..d6984d44f 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -120,6 +120,7 @@ private:
 		HistoryItem *originItem,
 		anim::type animated = anim::type::normal);
 
+	void setupClearButton();
 	void setupScrollDownButton();
 	void scrollDownClicked();
 	void scrollDownAnimationFinish();
@@ -131,6 +132,9 @@ private:
 	void clearSelected();
 	void recountChatWidth();
 
+	void setMessagesCount(int count);
+	void refreshClearButtonText();
+
 	const not_null<History*> _history;
 	QPointer<ListWidget> _inner;
 	object_ptr<TopBarWidget> _topBar;
@@ -138,13 +142,14 @@ private:
 
 	bool _skipScrollEvent = false;
 	std::unique_ptr<Ui::ScrollArea> _scroll;
-	object_ptr<Ui::FlatButton> _clearButton = { nullptr };
+	std::unique_ptr<Ui::FlatButton> _clearButton;
 
 	Ui::Animations::Simple _scrollDownShown;
 	bool _scrollDownIsShown = false;
 	object_ptr<Ui::HistoryDownButton> _scrollDown;
 
 	Data::MessagesSlice _lastSlice;
+	int _messagesCount = -1;
 
 };
 
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 6bf313f7a..336188181 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1150,6 +1150,53 @@ void ToggleMessagePinned(
 	}
 }
 
+void HidePinnedBar(
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		Fn<void()> onHidden) {
+	Ui::show(Box<ConfirmBox>(tr::lng_pinned_hide_all_sure(tr::now), tr::lng_pinned_hide_all_hide(tr::now), crl::guard(navigation, [=] {
+		Ui::hideLayer();
+		auto &session = peer->session();
+		const auto top = Data::ResolveTopPinnedId(peer);
+		if (top) {
+			session.settings().setHiddenPinnedMessageId(peer->id, top);
+			session.saveSettingsDelayed();
+			if (onHidden) {
+				onHidden();
+			}
+		} else {
+			session.api().requestFullPeer(peer);
+		}
+	})));
+}
+
+void UnpinAllMessages(
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<History*> history) {
+	Ui::show(Box<ConfirmBox>(tr::lng_pinned_unpin_all_sure(tr::now), tr::lng_pinned_unpin(tr::now), crl::guard(navigation, [=] {
+		Ui::hideLayer();
+		const auto api = &history->session().api();
+		const auto peer = history->peer;
+		const auto sendRequest = [=](auto self) -> void {
+			api->request(MTPmessages_UnpinAllMessages(
+				peer->input
+			)).done([=](const MTPmessages_AffectedHistory &result) {
+				const auto offset = api->applyAffectedHistory(peer, result);
+				if (offset > 0) {
+					self(self);
+				} else {
+					peer->session().storage().remove(
+						Storage::SharedMediaRemoveAll(
+							peer->id,
+							Storage::SharedMediaType::Pinned));
+					peer->setHasPinnedMessages(false);
+				}
+			}).send();
+		};
+		sendRequest(sendRequest);
+	})));
+}
+
 void PeerMenuAddMuteAction(
 		not_null<PeerData*> peer,
 		const PeerMenuCallback &addAction) {
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index 7bbfc7c8e..e733211a4 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -115,5 +115,12 @@ void ToggleMessagePinned(
 	not_null<Window::SessionNavigation*> navigation,
 	FullMsgId itemId,
 	bool pin);
+void HidePinnedBar(
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	Fn<void()> onHidden);
+void UnpinAllMessages(
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<History*> history);
 
 } // namespace Window

From 3dbc131b98cdb3bc21897cb90d521441c7ab8c4f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 22 Oct 2020 12:13:00 +0300
Subject: [PATCH 121/190] Show pin icon in pinned messages.

---
 Telegram/Resources/icons/history_pin.png      | Bin 0 -> 438 bytes
 Telegram/Resources/icons/history_pin@2x.png   | Bin 0 -> 720 bytes
 Telegram/Resources/icons/history_pin@3x.png   | Bin 0 -> 1034 bytes
 Telegram/SourceFiles/history/history_item.cpp |   4 ++
 .../history/view/history_view_message.cpp     |  43 +++++++++++++++---
 .../history/view/history_view_message.h       |  12 +++--
 .../ui/chat/attach/attach_prepare.cpp         |   5 +-
 Telegram/SourceFiles/ui/chat/chat.style       |   6 +++
 8 files changed, 57 insertions(+), 13 deletions(-)
 create mode 100644 Telegram/Resources/icons/history_pin.png
 create mode 100644 Telegram/Resources/icons/history_pin@2x.png
 create mode 100644 Telegram/Resources/icons/history_pin@3x.png

diff --git a/Telegram/Resources/icons/history_pin.png b/Telegram/Resources/icons/history_pin.png
new file mode 100644
index 0000000000000000000000000000000000000000..55066f98ba051cdb81a8c5257acd1baf6f0e06d1
GIT binary patch
literal 438
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mUKs7M+SzC{oH>NS%G|u)CkWs
zUtb0-Ae)1Mu|1Q41;}CqVksbIU|?Fn1Q!unz>HvnBzGoG$OkIc^mK6yu@GE4$#7MR
zfk4~l^WhbY+}0aE2{bKW-zfTKPfNtjjMuC-%^MadggxREvA!6UQ!;Pj-3dFSZyf#Z
zoRIe9f11&=Hi4$UG1tzg9%BAr>LKEqmtV8BzwiBTgY(8Ap{!kt=Ge}6d}P5E6?=Vd
zV$B2<&jblJ6;CH)k2$H5wxZldzQUhu+B0W$G>U(zJ<nb_@AzlKuerAmY|FLd(6{SS
zI#%LmaHLR1sww$f*7-ksVx+{{9!fIZDG!;Zn)fNpHE_?`{TE7O+fyU^6hD}ryJYhA
zX!A**z|c^M;~zip9cGx8YG{3!m&Gx`hM$dl)$3mkcixvzNS!G$&pLZn+m#oJbss&p
zlreZ+7GZU4xK^q<KjymY?`*f++mobZ?|fq^-=Xs^{`a&$`3vkb+~;hH&sw|)6nLJl
KelF{r5}E*j9-*B8

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/history_pin@2x.png b/Telegram/Resources/icons/history_pin@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..285b91659c834d2060c77c0903b48d35c0588ea9
GIT binary patch
literal 720
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBSkfJR9T^xl_H+M9WCijqQX@Rm
ze0>?TfNTy1#`a7G79fieh^2s-fq`iO6I?`P0W*RPlH@#g@EA~uv!{z=NCfBGY1Zo*
z9Yu~G5B0El6sQrhNcoZAT&EglR@+{ehtVrK{1scg7GGE`%B6I%BjbutV8xlan>SXM
zzqfn##xy*y$k(Xs>>SJg@&7*GC=_tgSY5xY=8xng_7l<_=F0!iFLY3FFq+9zxcjb6
z@szq7sfSiyez|0>U;Dj0bFQZ)Ru|JYcV7G{JL6)8N@LCc%&k#28XFxR^hoyb9B&k2
zZ)tRN=w#f)tn3`RI`r-rOF8bS$cHzk7g+cRb+U9Ge;jo7`Dc~srxV+~f#&zQEDk&?
zArhb?ro1%BlUabP)uglT)APFh!qZQ?uDiZEZO1vYYpb^ys=xSHF(p>)SB#EWSD)8s
z@0hDASkxwaE)*!*bo!|icWcw4#h13RH64gsul`){6Uz**rAaKzxit&szfmwQ;^X1t
zSm5fw=(97%tk^B@xwXpfA39Txnw&JKXrI?=CBv5$c)9%ccg1gC)eb+Lu)*|@#K+XF
zQ45=LnGfDgGmsEyXFeBF6R9_SMMAX0M2{99HQ`4eD*{elb&P0F=y_SQ>i3P_{&UZZ
z58vh4-5!2pJKxe~rliZx#~*K8_^fL0vXvoS)$E^s|9#YO>+Lp0pZ)ij$E^<++GHj4
z?YFHM+oLth*MzNpnQ-p8@!IRJtptr%yewJOz4gLYwp)4Ir52n`bH4m?%gP49knOik
zd(9a(v&}l2#wBoPYOS5TxuwI##g0<!-1m+(wcWYqa4=zlnG|o7j@V9x`^Bl7BTw~l
wML!NOcUw>wy0O$?AJZ$|BgH@83Y=f)AO335+6R9=Yyl-JPgg&ebxsLQ007=Fy#N3J

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/history_pin@3x.png b/Telegram/Resources/icons/history_pin@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ef2fce37e1615347b4b6dcf2c3c3af8fed2917d
GIT binary patch
literal 1034
zcmV+l1oiugP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000s
zpaTE|000010000s00000(2ES7000AhNkl<ZXa((=zfUqT7{|*CCI-bsS=5LT6HH`s
zU}G>2{z`CxKgGp3xiA?02XN5A7&itcVPY^baZm?kFfkDZAsS&pqcQr}$9P1vy=!|1
zcQ2ty!_oHX^Zne@UfVktAp~gdxb&~%h`xckVE<cWyAkU~%prH6V~3*0Avd@o!{_sn
znVA{V-``Kp&(BGvQfbu5Uf=?4d-ixdu)e+yudlE0GaVitg5U2~(PuwYZ*MPTv)P|K
zP1mJT2_`2eW#Q}vL#SLX*95})qX1_gm?)G6DhX!~m@Je6T>HUPp(Nqj3uYEdgS)=I
z2Cvtv_dsbM*wE0B(1St~Z}hvpz0C!4eXn7%YoBiW;o)I2Jw4sX;c)otdSqlo*G{&w
zSS*r>i3z5eDKP950W{$n%;4Z4(^)GD`}+FG^Yb&aYi>AcYi3<A7=*L4Goz8x^7{Mx
zd#1i`-E8qZC@jxpGA$P^;^5%mz*?|Ep&;V7rERL!D$qI01yee<?C<Z>z}c5@P9+iv
zQZAQuMR2L96|)Z4qNAgumPUlv`P0)A%+1X)b^X%I7XPc!pN{N+lYm0KYG7#BPB=*@
zb71X)Q-CrLrorhQ6nXPSq+Aio8n9NvZES3yNR_N)#B_vn&g#g;<8h`h0a)w6(AoU_
zJiNcZi;Oa%Hd9km_Jg5_$Hzw@!6J=bUS7cMcH0YvXDvMZS()g2MO7$J+EURW*OYpC
zdPq8*CZSNMsod<JtE(&JE-V4t+1Vkpv$M(~c!rmkm%J*Wa^-N--eGNRO=$Gte34Bn
zD=TKSsXrCz4jVo`J`DBd^Le1BZRw=|543pm6tkLPBoYC7e9(nL=wve4c(Tc?bM<;1
zTrQU?6xzvy1p)!MySvkcdU$w%rKP1m!bIUtPf!2YN@|q@qn~%+;^IOV>iGB=#>U3D
z!bIS9cXzq=f`D>hdwY9aC>(m5o11{2gp8aU!L6>Y8unq}LmUjp{O|8q8YS*HVzHQ%
z7(KYf#YL&U7?9#%XncEntFbhGPfku?e0*F<2n!BxlELe15npm(3kwTStJS`s-rn9|
zYikSW&O^izw++IjQYpZ**UilhEH5u}+cF}<Ybyta9S;l)Kr|YK(a}*}r?!`ydc{p4
z9h)rKD>{*`3+BYA=xORkOz-YEv9232Cq_k2Q^!W^6S=j98&6GyasU7T07*qoM6N<$
Ef+dR9ssI20

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 7bb00c86e..a30aa9275 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -348,6 +348,7 @@ void HistoryItem::markMediaRead() {
 }
 
 void HistoryItem::setIsPinned(bool pinned) {
+	const auto changed = (isPinned() != pinned);
 	if (pinned) {
 		_flags |= MTPDmessage::Flag::f_pinned;
 		history()->session().storage().add(Storage::SharedMediaAddExisting(
@@ -363,6 +364,9 @@ void HistoryItem::setIsPinned(bool pinned) {
 			Storage::SharedMediaType::Pinned,
 			id));
 	}
+	if (changed) {
+		history()->owner().requestItemResize(this);
+	}
 }
 
 bool HistoryItem::definesReplyKeyboard() const {
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index d909a839d..b1c2bfb3e 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1816,9 +1816,28 @@ void Message::drawInfo(
 		p.drawText(dateX, dateY + st::msgDateFont->ascent, item->_timeText);
 	}
 
+	const auto viewIconTop = infoBottom + st::historyViewsTop;
+	const auto pinIconTop = infoBottom + st::historyPinTop;
+	auto left = infoRight - infoW;
+	if (displayPinIcon()) {
+		const auto icon = [&] {
+			if (outbg) {
+				return &(invertedsprites
+					? st::historyPinInvertedIcon
+					: selected
+					? st::historyPinOutSelectedIcon
+					: st::historyPinOutIcon);
+			}
+			return &(invertedsprites
+				? st::historyPinInvertedIcon
+				: selected
+				? st::historyPinInSelectedIcon
+				: st::historyPinInIcon);
+		}();
+		icon->paint(p, left, pinIconTop, width);
+		left += st::historyViewsWidth;
+	}
 	if (auto views = item->Get<HistoryMessageViews>()) {
-		auto left = infoRight - infoW;
-		const auto iconTop = infoBottom + st::historyViewsTop;
 		const auto textTop = infoBottom - st::msgDateFont->descent;
 		if (views->replies.count > 0
 			&& !views->commentsMegagroupId
@@ -1843,11 +1862,11 @@ void Message::drawInfo(
 					: st::historyViewsSendingIcon);
 			}();
 			if (item->id > 0) {
-				icon->paint(p, left, iconTop, width);
+				icon->paint(p, left, viewIconTop, width);
 				p.drawText(left + st::historyViewsWidth, textTop, views->replies.text);
 			} else if (!outbg && views->views.count < 0) { // sending outbg icon will be painted below
 				auto iconSkip = st::historyViewsSpace + views->replies.textWidth;
-				icon->paint(p, left + iconSkip, iconTop, width);
+				icon->paint(p, left + iconSkip, viewIconTop, width);
 			}
 			left += st::historyViewsSpace
 				+ views->replies.textWidth
@@ -1874,16 +1893,16 @@ void Message::drawInfo(
 					: st::historyViewsSendingIcon);
 			}();
 			if (item->id > 0) {
-				icon->paint(p, left, iconTop, width);
+				icon->paint(p, left, viewIconTop, width);
 				p.drawText(left + st::historyViewsWidth, textTop, views->views.text);
 			} else if (!outbg) { // sending outbg icon will be painted below
 				auto iconSkip = st::historyViewsSpace + views->views.textWidth;
-				icon->paint(p, left + iconSkip, iconTop, width);
+				icon->paint(p, left + iconSkip, viewIconTop, width);
 			}
 		}
 	} else if (item->id < 0 && item->history()->peer->isSelf() && !outbg) {
 		auto icon = &(invertedsprites ? st::historyViewsSendingInvertedIcon : st::historyViewsSendingIcon);
-		icon->paint(p, infoRight - infoW, infoBottom + st::historyViewsTop, width);
+		icon->paint(p, left, viewIconTop, width);
 	}
 	if (outbg) {
 		auto icon = [&] {
@@ -1951,6 +1970,9 @@ int Message::infoWidth() const {
 			result += st::historySendStateSpace;
 		}
 	}
+	if (displayPinIcon()) {
+		result += st::historyViewsWidth;
+	}
 
 	// When message is scheduled until online, time is not displayed,
 	// so message should have less space.
@@ -2000,6 +2022,9 @@ int Message::timeLeft() const {
 			result += st::historySendStateSpace;
 		}
 	}
+	if (displayPinIcon()) {
+		result += st::historyViewsWidth;
+	}
 	return result;
 }
 
@@ -2046,6 +2071,10 @@ HistoryMessageReply *Message::displayedReply() const {
 	return nullptr;
 }
 
+bool Message::displayPinIcon() const {
+	return data()->isPinned() && context() != Context::Pinned;
+}
+
 bool Message::hasFromName() const {
 	switch (context()) {
 	case Context::AdminLog:
diff --git a/Telegram/SourceFiles/history/view/history_view_message.h b/Telegram/SourceFiles/history/view/history_view_message.h
index 3ffa3cff1..e8a3fb229 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.h
+++ b/Telegram/SourceFiles/history/view/history_view_message.h
@@ -176,11 +176,13 @@ private:
 	QSize performCountCurrentSize(int newWidth) override;
 	bool hasVisibleText() const override;
 
-	bool displayFastShare() const;
-	bool displayGoToOriginal() const;
-	ClickHandlerPtr fastReplyLink() const;
-	const HistoryMessageEdited *displayedEditBadge() const;
-	HistoryMessageEdited *displayedEditBadge();
+	[[nodiscard]] bool displayFastShare() const;
+	[[nodiscard]] bool displayGoToOriginal() const;
+	[[nodiscard]] ClickHandlerPtr fastReplyLink() const;
+	[[nodiscard]] const HistoryMessageEdited *displayedEditBadge() const;
+	[[nodiscard]] HistoryMessageEdited *displayedEditBadge();
+	[[nodiscard]] bool displayPinIcon() const;
+
 	void initTime();
 	[[nodiscard]] int timeLeft() const;
 	[[nodiscard]] int plainMaxWidth() const;
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index 15339973a..be79c4dd6 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -214,9 +214,12 @@ std::vector<PreparedGroup> DivideByGroups(
 
 	auto result = std::vector<PreparedGroup>();
 	auto pushGroup = [&] {
+		const auto type = (group.files.size() > 1)
+			? groupType
+			: AlbumType::None;
 		result.push_back(PreparedGroup{
 			.list = base::take(group),
-			.type = groupType,
+			.type = type,
 		});
 	};
 	for (auto i = 0; i != list.files.size(); ++i) {
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 62472aeb6..4631d5f93 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -182,6 +182,12 @@ historyRepliesInSelectedIcon: icon {{ "history_replies", msgInDateFgSelected }};
 historyRepliesOutIcon: icon {{ "history_replies", historyOutIconFg }};
 historyRepliesOutSelectedIcon: icon {{ "history_replies", historyOutIconFgSelected }};
 historyRepliesInvertedIcon: icon {{ "history_replies", historySendingInvertedIconFg }};
+historyPinTop: -18px;
+historyPinInIcon: icon {{ "history_pin", msgInDateFg }};
+historyPinInSelectedIcon: icon {{ "history_pin", msgInDateFgSelected }};
+historyPinOutIcon: icon {{ "history_pin", historyOutIconFg }};
+historyPinOutSelectedIcon: icon {{ "history_pin", historyOutIconFgSelected }};
+historyPinInvertedIcon: icon {{ "history_pin", historySendingInvertedIconFg }};
 
 historyComposeField: InputField(defaultInputField) {
 	font: msgFont;

From 12debce2469587f8ca2ea063ee4c1e908c620a4e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 22 Oct 2020 12:58:35 +0300
Subject: [PATCH 122/190] Show checks when sending file albums.

---
 .../view/media/history_view_document.cpp      | 52 ++++++++++++++-----
 Telegram/SourceFiles/ui/chat/chat.style       |  4 ++
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index da0c222f3..6684f11e7 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -99,7 +99,8 @@ float64 Document::dataProgress() const {
 }
 
 bool Document::dataFinished() const {
-	return !_data->loading() && !_data->uploading();
+	return !_data->loading()
+		&& (!_data->uploading() || _data->waitingForAlbum());
 }
 
 bool Document::dataLoaded() const {
@@ -289,6 +290,7 @@ void Document::draw(
 	const auto rthumb = style::rtlrect(st.padding.left(), st.padding.top() - topMinus, st.thumbSize, st.thumbSize, width);
 	const auto innerSize = st::msgFileLayout.thumbSize;
 	const auto inner = QRect(rthumb.x() + (rthumb.width() - innerSize) / 2, rthumb.y() + (rthumb.height() - innerSize) / 2, innerSize, innerSize);
+	const auto radialOpacity = radial ? _animation->radial.opacity() : 1.;
 	if (thumbed) {
 		auto inWebPage = (_parent->media() != this);
 		auto roundRadius = inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
@@ -304,33 +306,43 @@ void Document::draw(
 			Ui::FillRoundRect(p, rthumb, p.textPalette().selectOverlay, overlayCorners);
 		}
 
-		if (radial || (!loaded && !_data->loading())) {
-			float64 radialOpacity = (radial && loaded && !_data->uploading()) ? _animation->radial.opacity() : 1;
+		if (radial || (!loaded && !_data->loading()) || _data->waitingForAlbum()) {
+			const auto backOpacity = (loaded && !_data->uploading()) ? radialOpacity : 1.;
 			p.setPen(Qt::NoPen);
 			if (selected) {
 				p.setBrush(st::msgDateImgBgSelected);
 			} else {
 				p.setBrush(st::msgDateImgBg);
 			}
-			p.setOpacity(radialOpacity * p.opacity());
+			p.setOpacity(backOpacity * p.opacity());
 
 			{
 				PainterHighQualityEnabler hq(p);
 				p.drawEllipse(inner);
 			}
 
-			p.setOpacity(radialOpacity);
-			auto icon = ([radial, this, selected] {
-				if (radial || _data->loading()) {
+			const auto icon = [&] {
+				if (_data->waitingForAlbum()) {
+					return &(selected ? st::historyFileThumbWaitingSelected : st::historyFileThumbWaiting);
+				} else if (radial || _data->loading()) {
 					return &(selected ? st::historyFileThumbCancelSelected : st::historyFileThumbCancel);
 				}
 				return &(selected ? st::historyFileThumbDownloadSelected : st::historyFileThumbDownload);
-			})();
-			p.setOpacity((radial && loaded) ? _animation->radial.opacity() : 1);
-			icon->paintInCenter(p, inner);
+			}();
+			const auto previous = [&]() -> const style::icon* {
+				if (_data->waitingForAlbum()) {
+					return &(selected ? st::historyFileThumbCancelSelected : st::historyFileThumbCancel);
+				}
+				return nullptr;
+			}();
+			p.setOpacity(backOpacity);
+			if (previous && radialOpacity > 0. && radialOpacity < 1.) {
+				PaintInterpolatedIcon(p, *icon, *previous, radialOpacity, inner);
+			} else {
+				icon->paintInCenter(p, inner);
+			}
+			p.setOpacity(1.);
 			if (radial) {
-				p.setOpacity(1);
-
 				QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
 				_animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
 			}
@@ -361,7 +373,9 @@ void Document::draw(
 		}
 
 		const auto icon = [&] {
-			if (!cornerDownload && (_data->loading() || _data->uploading())) {
+			if (_data->waitingForAlbum()) {
+				return &(outbg ? (selected ? st::historyFileOutWaitingSelected : st::historyFileOutWaiting) : (selected ? st::historyFileInWaitingSelected : st::historyFileInWaiting));
+			} else if (!cornerDownload && (_data->loading() || _data->uploading())) {
 				return &(outbg ? (selected ? st::historyFileOutCancelSelected : st::historyFileOutCancel) : (selected ? st::historyFileInCancelSelected : st::historyFileInCancel));
 			} else if (showPause) {
 				return &(outbg ? (selected ? st::historyFileOutPauseSelected : st::historyFileOutPause) : (selected ? st::historyFileInPauseSelected : st::historyFileInPause));
@@ -375,7 +389,17 @@ void Document::draw(
 			}
 			return &(outbg ? (selected ? st::historyFileOutDownloadSelected : st::historyFileOutDownload) : (selected ? st::historyFileInDownloadSelected : st::historyFileInDownload));
 		}();
-		icon->paintInCenter(p, inner);
+		const auto previous = [&]() -> const style::icon* {
+			if (_data->waitingForAlbum()) {
+				return &(outbg ? (selected ? st::historyFileOutCancelSelected : st::historyFileOutCancel) : (selected ? st::historyFileInCancelSelected : st::historyFileInCancel));
+			}
+			return nullptr;
+		}();
+		if (previous && radialOpacity > 0. && radialOpacity < 1.) {
+			PaintInterpolatedIcon(p, *icon, *previous, radialOpacity, inner);
+		} else {
+			icon->paintInCenter(p, inner);
+		}
 
 		if (radial && !cornerDownload) {
 			QRect rinner(inner.marginsRemoved(QMargins(st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine, st::msgFileRadialLine)));
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 4631d5f93..06d976453 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -148,6 +148,10 @@ historyFileOutPlay: icon {{ "history_file_play", historyFileOutIconFg }};
 historyFileOutPlaySelected: icon {{ "history_file_play", historyFileOutIconFgSelected }};
 historyFileInPlay: icon {{ "history_file_play", historyFileInIconFg }};
 historyFileInPlaySelected: icon {{ "history_file_play", historyFileInIconFgSelected }};
+historyFileOutWaiting: icon {{ "mediaview_save_check", historyFileOutIconFg }};
+historyFileOutWaitingSelected: icon {{ "mediaview_save_check", historyFileOutIconFgSelected }};
+historyFileInWaiting: icon {{ "mediaview_save_check", historyFileInIconFg }};
+historyFileInWaitingSelected: icon {{ "mediaview_save_check", historyFileInIconFgSelected }};
 
 historyFileThumbDownload: icon {{ "history_file_download", historyFileThumbIconFg }};
 historyFileThumbDownloadSelected: icon {{ "history_file_download", historyFileThumbIconFgSelected }};

From 18d218044c88bfe662c73400ff919bf079cd9581 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 22 Oct 2020 13:23:14 +0300
Subject: [PATCH 123/190] Fix crash when adding more files to SendFilesBox.

---
 Telegram/SourceFiles/boxes/send_files_box.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 3da6299bd..79cf159dd 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -500,7 +500,9 @@ void SendFilesBox::generatePreviewFrom(int fromBlock) {
 				continue;
 			}
 		}
-		if (type != Type::File && type != Type::None) {
+		if (type != Type::File
+			&& type != Type::Music
+			&& type != Type::None) {
 			if (albumStart < 0) {
 				albumStart = i;
 			}

From 68041d2ffb7ef00da229fb96bcf8d5a0e1bc39eb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 22 Oct 2020 15:40:33 +0300
Subject: [PATCH 124/190] Merge pinned list with migrated legacy group.

---
 Telegram/SourceFiles/boxes/confirm_box.cpp    | 17 ++++-
 Telegram/SourceFiles/data/data_peer.cpp       | 48 +++++++++++-
 Telegram/SourceFiles/data/data_peer.h         |  8 +-
 .../history/history_inner_widget.cpp          | 25 +++++++
 .../history/history_inner_widget.h            |  4 +
 .../SourceFiles/history/history_widget.cpp    | 75 ++++++++++---------
 .../history/view/history_view_pinned_bar.cpp  |  6 +-
 .../history/view/history_view_pinned_bar.h    | 10 +--
 .../view/history_view_pinned_section.cpp      | 56 ++++++++++----
 .../view/history_view_pinned_section.h        |  9 ++-
 .../view/history_view_pinned_tracker.cpp      | 54 +++++++++----
 .../view/history_view_pinned_tracker.h        | 28 +++----
 .../SourceFiles/window/window_peer_menu.cpp   | 12 ++-
 13 files changed, 248 insertions(+), 104 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp
index 7c5afd510..b88270d91 100644
--- a/Telegram/SourceFiles/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/boxes/confirm_box.cpp
@@ -69,6 +69,21 @@ TextParseOptions kMarkedTextBoxOptions = {
 	Qt::LayoutDirectionAuto, // dir
 };
 
+[[nodiscard]] bool IsOldForPin(MsgId id, not_null<PeerData*> peer) {
+	const auto normal = peer->migrateToOrMe();
+	const auto migrated = normal->migrateFrom();
+	const auto top = Data::ResolveTopPinnedId(normal, migrated);
+	if (!top) {
+		return false;
+	} else if (peer == migrated) {
+		return top.channel || (id < top.msg);
+	} else if (migrated) {
+		return top.channel && (id < top.msg);
+	} else {
+		return (id < top.msg);
+	}
+}
+
 } // namespace
 
 ConfirmBox::ConfirmBox(
@@ -444,7 +459,7 @@ PinMessageBox::PinMessageBox(
 : _peer(peer)
 , _api(&peer->session().mtp())
 , _msgId(msgId)
-, _pinningOld(msgId < Data::ResolveTopPinnedId(peer))
+, _pinningOld(IsOldForPin(msgId, peer))
 , _text(
 	this,
 	(_pinningOld
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 2b817d695..5bf2db6d4 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -1017,7 +1017,9 @@ void SetTopPinnedMessageId(not_null<PeerData*> peer, MsgId messageId) {
 	peer->setHasPinnedMessages(true);
 }
 
-MsgId ResolveTopPinnedId(not_null<PeerData*> peer) {
+FullMsgId ResolveTopPinnedId(
+		not_null<PeerData*> peer,
+		PeerData *migrated) {
 	const auto slice = peer->session().storage().snapshot(
 		Storage::SharedMediaQuery(
 			Storage::SharedMediaKey(
@@ -1026,10 +1028,32 @@ MsgId ResolveTopPinnedId(not_null<PeerData*> peer) {
 				ServerMaxMsgId - 1),
 			1,
 			1));
-	return slice.messageIds.empty() ? 0 : slice.messageIds.back();
+	const auto old = migrated
+		? migrated->session().storage().snapshot(
+			Storage::SharedMediaQuery(
+				Storage::SharedMediaKey(
+					migrated->id,
+					Storage::SharedMediaType::Pinned,
+					ServerMaxMsgId - 1),
+				1,
+				1))
+		: Storage::SharedMediaResult{
+			.count = 0,
+			.skippedBefore = 0,
+			.skippedAfter = 0,
+		};
+	if (!slice.messageIds.empty()) {
+		return FullMsgId(peerToChannel(peer->id), slice.messageIds.back());
+	} else if (!migrated || slice.count != 0 || old.messageIds.empty()) {
+		return FullMsgId();
+	} else {
+		return FullMsgId(0, old.messageIds.back());
+	}
 }
 
-std::optional<int> ResolvePinnedCount(not_null<PeerData*> peer) {
+std::optional<int> ResolvePinnedCount(
+		not_null<PeerData*> peer,
+		PeerData *migrated) {
 	const auto slice = peer->session().storage().snapshot(
 		Storage::SharedMediaQuery(
 			Storage::SharedMediaKey(
@@ -1038,7 +1062,23 @@ std::optional<int> ResolvePinnedCount(not_null<PeerData*> peer) {
 				0),
 			0,
 			0));
-	return slice.count;
+	const auto old = migrated
+		? migrated->session().storage().snapshot(
+			Storage::SharedMediaQuery(
+				Storage::SharedMediaKey(
+					migrated->id,
+					Storage::SharedMediaType::Pinned,
+					0),
+				0,
+				0))
+		: Storage::SharedMediaResult{
+			.count = 0,
+			.skippedBefore = 0,
+			.skippedAfter = 0,
+	};
+	return (slice.count.has_value() && old.count.has_value())
+		? std::make_optional(*slice.count + *old.count)
+		: std::nullopt;
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index 2ffb3cbaf..3a01b6e98 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -443,7 +443,11 @@ std::optional<QString> RestrictionError(
 	ChatRestriction restriction);
 
 void SetTopPinnedMessageId(not_null<PeerData*> peer, MsgId messageId);
-[[nodiscard]] MsgId ResolveTopPinnedId(not_null<PeerData*> peer);
-[[nodiscard]] std::optional<int> ResolvePinnedCount(not_null<PeerData*> peer);
+[[nodiscard]] FullMsgId ResolveTopPinnedId(
+	not_null<PeerData*> peer,
+	PeerData *migrated);
+[[nodiscard]] std::optional<int> ResolvePinnedCount(
+	not_null<PeerData*> peer,
+	PeerData *migrated);
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index d819cb0e9..91e593f2d 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2998,6 +2998,31 @@ int HistoryInner::itemTop(const Element *view) const {
 	return (top < 0) ? top : (top + view->y() + view->block()->y());
 }
 
+auto HistoryInner::findViewForPinnedTracking(int top) const
+-> std::pair<Element*, int> {
+	const auto normalTop = historyTop();
+	const auto oldTop = migratedTop();
+	const auto fromHistory = [&](not_null<History*> history, int historyTop)
+	-> std::pair<Element*, int> {
+		auto [view, offset] = history->findItemAndOffset(top - historyTop);
+		while (view && !IsServerMsgId(view->data()->id)) {
+			offset -= view->height();
+			view = view->nextInBlocks();
+		}
+		return { view, offset };
+	};
+	if (normalTop >= 0 && (oldTop < 0 || top >= normalTop)) {
+		return fromHistory(_history, normalTop);
+	} else if (oldTop >= 0) {
+		auto [view, offset] = fromHistory(_migrated, oldTop);
+		if (!view && normalTop >= 0) {
+			return fromHistory(_history, normalTop);
+		}
+		return { view, offset };
+	}
+	return { nullptr, 0 };
+}
+
 void HistoryInner::notifyIsBotChanged() {
 	const auto newinfo = _peer->isUser()
 		? _peer->asUser()->botInfo.get()
diff --git a/Telegram/SourceFiles/history/history_inner_widget.h b/Telegram/SourceFiles/history/history_inner_widget.h
index d58de44e1..b671f1675 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.h
+++ b/Telegram/SourceFiles/history/history_inner_widget.h
@@ -111,6 +111,10 @@ public:
 	int itemTop(const HistoryItem *item) const;
 	int itemTop(const Element *view) const;
 
+	// Returns (view, offset-from-top).
+	[[nodiscard]] std::pair<Element*, int> findViewForPinnedTracking(
+		int top) const;
+
 	void notifyIsBotChanged();
 	void notifyMigrateUpdated();
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 02b024b62..10eb82f6e 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -569,6 +569,12 @@ HistoryWidget::HistoryWidget(
 		| UpdateFlag::BotStartToken
 		| UpdateFlag::PinnedMessages
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
+		if (_migrated && update.peer.get() == _migrated->peer) {
+			if (_pinnedTracker
+				&& (update.flags & UpdateFlag::PinnedMessages)) {
+				checkPinnedBarState();
+			}
+		}
 		return (update.peer.get() == _peer);
 	}) | rpl::map([](const Data::PeerUpdate &update) {
 		return update.flags;
@@ -3398,6 +3404,7 @@ void HistoryWidget::mouseReleaseEvent(QMouseEvent *e) {
 	if (_replyForwardPressed) {
 		_replyForwardPressed = false;
 		update(0, _field->y() - st::historySendPadding - st::historyReplyHeight, width(), st::historyReplyHeight);
+		setupPinnedTracker(); AssertIsDebug();
 	}
 	if (_recording) {
 		stopRecording(_peer && _inField);
@@ -5021,6 +5028,7 @@ void HistoryWidget::handlePeerMigration() {
 	} else {
 		_migrated = _history->migrateFrom();
 		_list->notifyMigrateUpdated();
+		setupPinnedTracker();
 		updateHistoryGeometry();
 	}
 	const auto from = chat->owner().historyLoaded(chat);
@@ -5168,23 +5176,14 @@ void HistoryWidget::updatePinnedViewer() {
 		|| !_historyInited) {
 		return;
 	}
-	const auto [item, offset] = [&] {
-		auto visibleTop = _scroll->scrollTop();
-		if (_migrated
-			&& _history->loadedAtBottom()
-			&& _migrated->loadedAtTop()) {
-			visibleTop -= _migrated->height();
-		}
-		auto [item, offset] = _history->findItemAndOffset(visibleTop);
-		while (item && !IsServerMsgId(item->data()->id)) {
-			offset -= item->height();
-			item = item->nextInBlocks();
-		}
-		return std::pair(item, offset);
-	}();
-	const auto lessThanId = item
-		? (item->data()->id + (offset > 0 ? 1 : 0))
-		: (ServerMaxMsgId - 1);
+	const auto visibleTop = _scroll->scrollTop();
+	const auto add = (st::historyReplyHeight - _pinnedBarHeight);
+	auto [view, offset] = _list->findViewForPinnedTracking(visibleTop + add);
+	const auto lessThanId = !view
+		? (ServerMaxMsgId - 1)
+		: (view->data()->history() != _history)
+		? (view->data()->id + (offset > 0 ? 1 : 0) - ServerMaxMsgId)
+		: (view->data()->id + (offset > 0 ? 1 : 0));
 	_pinnedTracker->trackAround(lessThanId);
 }
 
@@ -5202,8 +5201,15 @@ void HistoryWidget::checkPinnedBarState() {
 	const auto hiddenId = _peer->canPinMessages()
 		? MsgId(0)
 		: session().settings().hiddenPinnedMessageId(_peer->id);
-	const auto currentPinnedId = Data::ResolveTopPinnedId(_peer);
-	if (currentPinnedId == hiddenId) {
+	const auto currentPinnedId = Data::ResolveTopPinnedId(
+		_peer,
+		_migrated ? _migrated->peer.get() : nullptr);
+	const auto universalPinnedId = !currentPinnedId
+		? int32(0)
+		: (_migrated && !currentPinnedId.channel)
+		? (currentPinnedId.msg - ServerMaxMsgId)
+		: currentPinnedId.msg;
+	if (universalPinnedId == hiddenId) {
 		if (_pinnedBar) {
 			_pinnedTracker->reset();
 			auto qobject = base::unique_qptr{
@@ -5221,21 +5227,13 @@ void HistoryWidget::checkPinnedBarState() {
 		}
 		return;
 	}
-	if (_pinnedBar || !currentPinnedId) {
+	if (_pinnedBar || !universalPinnedId) {
 		return;
 	}
 
-	auto shown = _pinnedTracker->shownMessageId(
-	) | rpl::map([=](HistoryView::PinnedId messageId) {
-		return HistoryView::PinnedBarId{
-			FullMsgId{ peerToChannel(_peer->id), messageId.message },
-			messageId.index,
-			messageId.count
-		};
-	});
 	auto barContent = HistoryView::PinnedBarContent(
 		&session(),
-		std::move(shown));
+		_pinnedTracker->shownMessageId());
 	_pinnedBar = std::make_unique<Ui::PinnedBar>(
 		this,
 		std::move(barContent));
@@ -5268,8 +5266,8 @@ void HistoryWidget::checkPinnedBarState() {
 	_pinnedBar->barClicks(
 	) | rpl::start_with_next([=] {
 		const auto id = _pinnedTracker->currentMessageId();
-		if (id.message) {
-			Ui::showPeerHistory(_peer, id.message);
+		if (const auto item = session().data().message(id.message)) {
+			Ui::showPeerHistory(item->history()->peer, item->id);
 		}
 	}, _pinnedBar->lifetime());
 
@@ -5303,7 +5301,11 @@ void HistoryWidget::refreshPinnedBarButton(bool many) {
 			const auto id = _pinnedTracker->currentMessageId();
 			if (id.message) {
 				controller()->showSection(
-					HistoryView::PinnedMemento(_history, id.message));
+					HistoryView::PinnedMemento(
+						_history,
+						((!_migrated || id.message.channel)
+							? id.message.msg
+							: (id.message.msg - ServerMaxMsgId))));
 			}
 		}
 	}, button->lifetime());
@@ -5560,10 +5562,7 @@ void HistoryWidget::hidePinnedMessage() {
 		return;
 	}
 	if (_peer->canPinMessages()) {
-		Window::ToggleMessagePinned(
-			controller(),
-			{ peerToChannel(_peer->id), id.message },
-			false);
+		Window::ToggleMessagePinned(controller(), id.message, false);
 	} else {
 		const auto callback = [=] {
 			if (_pinnedTracker) {
@@ -5877,7 +5876,9 @@ void HistoryWidget::handlePeerUpdate() {
 	updateHistoryGeometry();
 	if (_peer->isChat() && _peer->asChat()->noParticipantInfo()) {
 		session().api().requestFullPeer(_peer);
-	} else if (_peer->isUser() && (_peer->asUser()->blockStatus() == UserData::BlockStatus::Unknown || _peer->asUser()->callsStatus() == UserData::CallsStatus::Unknown)) {
+	} else if (_peer->isUser()
+		&& (_peer->asUser()->blockStatus() == UserData::BlockStatus::Unknown
+			|| _peer->asUser()->callsStatus() == UserData::CallsStatus::Unknown)) {
 		session().api().requestFullPeer(_peer);
 	} else if (auto channel = _peer->asMegagroup()) {
 		if (!channel->mgInfo->botStatus) {
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index 96aa406de..9e536656a 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -117,7 +117,7 @@ namespace {
 	}));
 }
 
-auto WithPinnedTitle(not_null<Main::Session*> session, PinnedBarId id) {
+auto WithPinnedTitle(not_null<Main::Session*> session, PinnedId id) {
 	return [=](Ui::MessageBarContent &&content) {
 		const auto item = session->data().message(id.message);
 		if (!item) {
@@ -144,11 +144,11 @@ rpl::producer<Ui::MessageBarContent> MessageBarContentByItemId(
 
 rpl::producer<Ui::MessageBarContent> PinnedBarContent(
 		not_null<Main::Session*> session,
-		rpl::producer<PinnedBarId> id) {
+		rpl::producer<PinnedId> id) {
 	return std::move(
 		id
 	) | rpl::distinct_until_changed(
-	) | rpl::map([=](PinnedBarId id) {
+	) | rpl::map([=](PinnedId id) {
 		return ContentByItemId(
 			session,
 			id.message
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
index 41c20d30e..1e7c3578f 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.h
@@ -28,25 +28,25 @@ namespace HistoryView {
 	FullMsgId id);
 
 enum class PinnedIdType;
-struct PinnedBarId {
+struct PinnedId {
 	FullMsgId message;
 	int index = 0;
 	int count = 1;
 
-	bool operator<(const PinnedBarId &other) const {
+	bool operator<(const PinnedId &other) const {
 		return std::tie(message, index, count)
 			< std::tie(other.message, other.index, other.count);
 	}
-	bool operator==(const PinnedBarId &other) const {
+	bool operator==(const PinnedId &other) const {
 		return std::tie(message, index, count)
 			== std::tie(other.message, other.index, other.count);
 	}
-	bool operator!=(const PinnedBarId &other) const {
+	bool operator!=(const PinnedId &other) const {
 		return !(*this == other);
 	}
 };
 [[nodiscard]] rpl::producer<Ui::MessageBarContent> PinnedBarContent(
 	not_null<Main::Session*> session,
-	rpl::producer<PinnedBarId> id);
+	rpl::producer<PinnedId> id);
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 2e1355bc4..3aa58d258 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -13,7 +13,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_components.h"
 #include "history/history_item.h"
 #include "boxes/confirm_box.h"
-#include "data/data_peer_values.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/shadow.h"
 #include "ui/layers/generic_box.h"
@@ -34,10 +33,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "data/data_chat.h"
 #include "data/data_channel.h"
 #include "data/data_changes.h"
 #include "data/data_sparse_ids.h"
 #include "data/data_shared_media.h"
+#include "data/data_peer_values.h"
 #include "storage/storage_account.h"
 #include "platform/platform_specific.h"
 #include "lang/lang_keys.h"
@@ -90,7 +91,8 @@ PinnedWidget::PinnedWidget(
 	not_null<Window::SessionController*> controller,
 	not_null<History*> history)
 : Window::SectionWidget(parent, controller)
-, _history(history)
+, _history(history->migrateToOrMe())
+, _migratedPeer(_history->peer->migrateFrom())
 , _topBar(this, controller)
 , _topBarShadow(this)
 , _scroll(std::make_unique<Ui::ScrollArea>(this, st::historyScroll, false))
@@ -321,7 +323,8 @@ bool PinnedWidget::showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) {
 	if (auto logMemento = dynamic_cast<PinnedMemento*>(memento.get())) {
-		if (logMemento->getHistory() == history()) {
+		if (logMemento->getHistory() == history()
+			|| logMemento->getHistory()->migrateToOrMe() == history()) {
 			restoreState(logMemento);
 			return true;
 		}
@@ -358,7 +361,9 @@ void PinnedWidget::restoreState(not_null<PinnedMemento*> memento) {
 	_inner->restoreState(memento->list());
 	if (const auto highlight = memento->getHighlightId()) {
 		const auto position = Data::MessagePosition{
-			.fullId = FullMsgId(_history->channelId(), highlight),
+			.fullId = ((highlight > 0 || !_migratedPeer)
+				? FullMsgId(_history->channelId(), highlight)
+				: FullMsgId(0, -highlight)),
 			.date = TimeId(0),
 		};
 		_inner->showAroundPosition(position, [=] {
@@ -508,6 +513,28 @@ void PinnedWidget::listDeleteRequest() {
 	confirmDeleteSelected();
 }
 
+rpl::producer<int> SharedMediaCountValue(
+		not_null<PeerData*> peer,
+		PeerData *migrated,
+		Storage::SharedMediaType type) {
+	auto aroundId = 0;
+	auto limit = 0;
+	auto updated = SharedMediaMergedViewer(
+		&peer->session(),
+		SharedMediaMergedKey(
+			SparseIdsMergedSlice::Key(
+				peer->id,
+				migrated ? migrated->id : 0,
+				aroundId),
+			type),
+		limit,
+		limit
+	) | rpl::map([](const SparseIdsMergedSlice &slice) {
+		return slice.fullCount();
+	}) | rpl::filter_optional();
+	return rpl::single(0) | rpl::then(std::move(updated));
+}
+
 rpl::producer<Data::MessagesSlice> PinnedWidget::listSource(
 		Data::MessagePosition aroundId,
 		int limitBefore,
@@ -516,15 +543,18 @@ rpl::producer<Data::MessagesSlice> PinnedWidget::listSource(
 	const auto messageId = aroundId.fullId.msg
 		? aroundId.fullId.msg
 		: (ServerMaxMsgId - 1);
-	return SharedMediaViewer(
+
+	return SharedMediaMergedViewer(
 		&_history->session(),
-		Storage::SharedMediaKey(
-			_history->peer->id,
-			Storage::SharedMediaType::Pinned,
-			messageId),
+		SharedMediaMergedKey(
+			SparseIdsMergedSlice::Key(
+				_history->peer->id,
+				_migratedPeer ? _migratedPeer->id : 0,
+				messageId),
+			Storage::SharedMediaType::Pinned),
 		limitBefore,
 		limitAfter
-	) | rpl::filter([=](const SparseIdsSlice &slice) {
+	) | rpl::filter([=](const SparseIdsMergedSlice &slice) {
 		const auto count = slice.fullCount();
 		if (!count.has_value()) {
 			return true;
@@ -535,7 +565,7 @@ rpl::producer<Data::MessagesSlice> PinnedWidget::listSource(
 			controller()->showBackFromStack();
 			return false;
 		}
-	}) | rpl::map([=](SparseIdsSlice &&slice) {
+	}) | rpl::map([=](SparseIdsMergedSlice &&slice) {
 		auto result = Data::MessagesSlice();
 		result.fullCount = slice.fullCount();
 		result.skippedAfter = slice.skippedAfter();
@@ -543,10 +573,10 @@ rpl::producer<Data::MessagesSlice> PinnedWidget::listSource(
 		const auto count = slice.size();
 		result.ids.reserve(count);
 		if (const auto msgId = slice.nearest(messageId)) {
-			result.nearestToAround = FullMsgId(channelId, *msgId);
+			result.nearestToAround = *msgId;
 		}
 		for (auto i = 0; i != count; ++i) {
-			result.ids.emplace_back(channelId, slice[i]);
+			result.ids.push_back(slice[i]);
 		}
 		return result;
 	});
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.h b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
index d6984d44f..8025e2bc4 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -136,6 +136,7 @@ private:
 	void refreshClearButtonText();
 
 	const not_null<History*> _history;
+	PeerData *_migratedPeer = nullptr;
 	QPointer<ListWidget> _inner;
 	object_ptr<TopBarWidget> _topBar;
 	object_ptr<Ui::PlainShadow> _topBarShadow;
@@ -155,9 +156,11 @@ private:
 
 class PinnedMemento : public Window::SectionMemento {
 public:
+	using UniversalMsgId = int32;
+
 	explicit PinnedMemento(
 		not_null<History*> history,
-		MsgId highlightId = 0);
+		UniversalMsgId highlightId = 0);
 
 	object_ptr<Window::SectionWidget> createWidget(
 		QWidget *parent,
@@ -172,13 +175,13 @@ public:
 	[[nodiscard]] not_null<ListMemento*> list() {
 		return &_list;
 	}
-	[[nodiscard]] MsgId getHighlightId() const {
+	[[nodiscard]] UniversalMsgId getHighlightId() const {
 		return _highlightId;
 	}
 
 private:
 	const not_null<History*> _history;
-	const MsgId _highlightId = 0;
+	const UniversalMsgId _highlightId = 0;
 	ListMemento _list;
 
 };
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
index f8c9c6d31..be5963df5 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "data/data_changes.h"
 #include "data/data_peer.h"
+#include "data/data_chat.h"
 #include "data/data_channel.h"
 #include "data/data_shared_media.h"
 #include "data/data_session.h"
@@ -26,13 +27,25 @@ constexpr auto kChangeViewerLimit = 2;
 
 } // namespace
 
-PinnedTracker::PinnedTracker(not_null<History*> history) : _history(history) {
-	_history->session().changes().peerFlagsValue(
-		_history->peer,
-		Data::PeerUpdate::Flag::PinnedMessages
-	) | rpl::map([=] {
-		return _history->peer->hasPinnedMessages();
-	}) | rpl::distinct_until_changed(
+PinnedTracker::PinnedTracker(not_null<History*> history)
+: _history(history->migrateToOrMe())
+, _migratedPeer(_history->peer->migrateFrom()) {
+	using namespace rpl::mappers;
+	const auto has = [&](PeerData *peer) -> rpl::producer<bool> {
+		auto &changes = _history->session().changes();
+		const auto flag = Data::PeerUpdate::Flag::PinnedMessages;
+		if (!peer) {
+			return rpl::single(false);
+		}
+		return changes.peerFlagsValue(peer, flag) | rpl::map([=] {
+			return peer->hasPinnedMessages();
+		});
+	};
+	rpl::combine(
+		has(_history->peer),
+		has(_migratedPeer),
+		_1 || _2
+	) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](bool has) {
 		if (has) {
 			refreshViewer();
@@ -62,15 +75,17 @@ void PinnedTracker::refreshViewer() {
 	}
 	_dataLifetime.destroy();
 	_viewerAroundId = _aroundId;
-	SharedMediaViewer(
+	SharedMediaMergedViewer(
 		&_history->peer->session(),
-		Storage::SharedMediaKey(
-			_history->peer->id,
-			Storage::SharedMediaType::Pinned,
-			_viewerAroundId),
+		SharedMediaMergedKey(
+			SparseIdsMergedSlice::Key(
+				_history->peer->id,
+				_migratedPeer ? _migratedPeer->id : 0,
+				_viewerAroundId),
+			Storage::SharedMediaType::Pinned),
 		kLoadedLimit,
 		kLoadedLimit
-	) | rpl::start_with_next([=](const SparseIdsSlice &result) {
+	) | rpl::start_with_next([=](const SparseIdsMergedSlice &result) {
 		_slice.fullCount = result.fullCount();
 		_slice.skippedBefore = result.skippedBefore();
 		_slice.skippedAfter = result.skippedAfter();
@@ -83,12 +98,23 @@ void PinnedTracker::refreshViewer() {
 		refreshCurrentFromSlice();
 		if (_slice.fullCount == 0) {
 			_history->peer->setHasPinnedMessages(false);
+			if (_migratedPeer) {
+				_migratedPeer->setHasPinnedMessages(false);
+			}
 		}
 	}, _dataLifetime);
 }
 
 void PinnedTracker::refreshCurrentFromSlice() {
-	const auto i = ranges::lower_bound(_slice.ids, _aroundId);
+	const auto proj1 = [](FullMsgId id) {
+		return id.channel ? id.msg : (id.msg - ServerMaxMsgId);
+	};
+	const auto proj2 = [](FullMsgId id) {
+		return id.msg;
+	};
+	const auto i = _migratedPeer
+		? ranges::lower_bound(_slice.ids, _aroundId, ranges::less(), proj1)
+		: ranges::lower_bound(_slice.ids, _aroundId, ranges::less(), proj2);
 	const auto empty = _slice.ids.empty();
 	const auto before = int(i - begin(_slice.ids));
 	const auto after = int(end(_slice.ids) - i);
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
index 9335c4851..bf4a2b8cb 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_tracker.h
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "history/view/history_view_pinned_bar.h"
+
 class History;
 
 namespace Data {
@@ -15,29 +17,16 @@ enum class LoadDirection : char;
 
 namespace HistoryView {
 
-struct PinnedId {
-	MsgId message = 0;
-	int index = 0;
-	int count = 1;
-
-	bool operator<(const PinnedId &other) const {
-		return std::tie(message, index, count)
-			< std::tie(other.message, other.index, other.count);
-	}
-	bool operator==(const PinnedId &other) const {
-		return std::tie(message, index, count)
-			== std::tie(other.message, other.index, other.count);
-	}
-};
-
 class PinnedTracker final {
 public:
+	using UniversalMsgId = int32;
+
 	explicit PinnedTracker(not_null<History*> history);
 	~PinnedTracker();
 
 	[[nodiscard]] rpl::producer<PinnedId> shownMessageId() const;
 	[[nodiscard]] PinnedId currentMessageId() const;
-	void trackAround(MsgId messageId);
+	void trackAround(UniversalMsgId messageId);
 	void reset();
 
 	[[nodiscard]] rpl::lifetime &lifetime() {
@@ -46,7 +35,7 @@ public:
 
 private:
 	struct Slice {
-		std::vector<MsgId> ids;
+		std::vector<FullMsgId> ids;
 		std::optional<int> fullCount;
 		std::optional<int> skippedBefore;
 		std::optional<int> skippedAfter;
@@ -56,12 +45,13 @@ private:
 	void refreshCurrentFromSlice();
 
 	const not_null<History*> _history;
+	PeerData *_migratedPeer = nullptr;
 
 	rpl::variable<PinnedId> _current;
 	rpl::lifetime _dataLifetime;
 
-	MsgId _aroundId = 0;
-	MsgId _viewerAroundId = 0;
+	UniversalMsgId _aroundId = 0;
+	UniversalMsgId _viewerAroundId = 0;
 	Slice _slice;
 
 	rpl::lifetime _lifetime;
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 336188181..35da3941f 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1157,9 +1157,15 @@ void HidePinnedBar(
 	Ui::show(Box<ConfirmBox>(tr::lng_pinned_hide_all_sure(tr::now), tr::lng_pinned_hide_all_hide(tr::now), crl::guard(navigation, [=] {
 		Ui::hideLayer();
 		auto &session = peer->session();
-		const auto top = Data::ResolveTopPinnedId(peer);
-		if (top) {
-			session.settings().setHiddenPinnedMessageId(peer->id, top);
+		const auto migrated = peer->migrateFrom();
+		const auto top = Data::ResolveTopPinnedId(peer, migrated);
+		const auto universal = !top
+			? int32(0)
+			: (migrated && !top.channel)
+			? (top.msg - ServerMaxMsgId)
+			: top.msg;
+		if (universal) {
+			session.settings().setHiddenPinnedMessageId(peer->id, universal);
 			session.saveSettingsDelayed();
 			if (onHidden) {
 				onHidden();

From 77894d1445aa53bd55ce20fe286553b2afa1bf1f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 22 Oct 2020 16:09:00 +0300
Subject: [PATCH 125/190] Fix sending files in scheduled messages.

---
 Telegram/SourceFiles/history/history_widget.cpp               | 2 +-
 .../SourceFiles/history/view/history_view_replies_section.cpp | 2 +-
 .../history/view/history_view_scheduled_section.cpp           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 10eb82f6e..4abcb6bef 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4255,7 +4255,7 @@ void HistoryWidget::sendingFilesConfirmed(
 			base::take(caption),
 			album,
 			action);
-	};
+	}
 }
 
 bool HistoryWidget::confirmSendingFiles(
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 17947323e..f1baa2b04 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -685,7 +685,7 @@ void RepliesWidget::sendingFilesConfirmed(
 			base::take(caption),
 			album,
 			action);
-	};
+	}
 	if (_composeControls->replyingToMessage().msg == replyTo) {
 		_composeControls->cancelReplyMessage();
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 66bc5bd48..804d68393 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -419,12 +419,12 @@ void ScheduledWidget::sendingFilesConfirmed(
 			? std::make_shared<SendingAlbum>()
 			: nullptr;
 		session().api().sendFiles(
-			std::move(list),
+			std::move(group.list),
 			type,
 			base::take(caption),
 			album,
 			action);
-	};
+	}
 }
 
 bool ScheduledWidget::confirmSendingFiles(

From c2753a9caf361d1418cb743034b623aadeffb270 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 10:04:28 +0300
Subject: [PATCH 126/190] Add checkbox 'Pin also for {user}'.

---
 Telegram/Resources/langs/lang.strings         |  2 ++
 Telegram/SourceFiles/boxes/confirm_box.cpp    | 30 +++++++++++++++----
 Telegram/SourceFiles/boxes/confirm_box.h      |  2 ++
 Telegram/SourceFiles/history/history_item.cpp |  2 ++
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f97b8f37e..f10ddf6a6 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -166,10 +166,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_pinned_quiz" = "Pinned quiz";
 "lng_pinned_unpin_sure" = "Would you like to unpin this message?";
 "lng_pinned_pin_sure" = "Would you like to pin this message?";
+"lng_pinned_pin_sure_group" = "Do you want to pin this message for all members in the group?";
 "lng_pinned_pin_old_sure" = "Do you want to pin an older message while leaving a more recent one pinned?";
 "lng_pinned_pin" = "Pin";
 "lng_pinned_unpin" = "Unpin";
 "lng_pinned_notify" = "Notify all members";
+"lng_pinned_also_for_other" = "Also pin for {user}";
 "lng_pinned_messages_title#one" = "{count} pinned message";
 "lng_pinned_messages_title#other" = "{count} pinned messages";
 "lng_pinned_hide_all" = "Don't show pinned messages";
diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp
index b88270d91..d7c715eb8 100644
--- a/Telegram/SourceFiles/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/boxes/confirm_box.cpp
@@ -464,6 +464,8 @@ PinMessageBox::PinMessageBox(
 	this,
 	(_pinningOld
 		? tr::lng_pinned_pin_old_sure(tr::now)
+		: (peer->isChat() || peer->isMegagroup())
+		? tr::lng_pinned_pin_sure_group(tr::now)
 		: tr::lng_pinned_pin_sure(tr::now)),
 	st::boxLabel) {
 }
@@ -473,12 +475,27 @@ void PinMessageBox::prepare() {
 	addButton(tr::lng_cancel(), [this] { closeBox(); });
 
 	if (!_pinningOld && (_peer->isChat() || _peer->isMegagroup())) {
-		_notify.create(this, tr::lng_pinned_notify(tr::now), true, st::defaultBoxCheckbox);
+		_notify.create(
+			this,
+			tr::lng_pinned_notify(tr::now),
+			true,
+			st::defaultBoxCheckbox);
+		_checkbox = _notify;
+	} else if (_peer->isUser() && !_peer->isSelf()) {
+		_pinForPeer.create(
+			this,
+			tr::lng_pinned_also_for_other(
+				tr::now,
+				lt_user,
+				_peer->shortName()),
+			true,
+			st::defaultBoxCheckbox);
+		_checkbox = _pinForPeer;
 	}
 
 	auto height = st::boxPadding.top() + _text->height() + st::boxPadding.bottom();
-	if (_notify) {
-		height += st::boxMediumSkip + _notify->heightNoMargins();
+	if (_checkbox) {
+		height += st::boxMediumSkip + _checkbox->heightNoMargins();
 	}
 	setDimensions(st::boxWidth, height);
 }
@@ -486,8 +503,8 @@ void PinMessageBox::prepare() {
 void PinMessageBox::resizeEvent(QResizeEvent *e) {
 	BoxContent::resizeEvent(e);
 	_text->moveToLeft(st::boxPadding.left(), st::boxPadding.top());
-	if (_notify) {
-		_notify->moveToLeft(st::boxPadding.left(), _text->y() + _text->height() + st::boxMediumSkip);
+	if (_checkbox) {
+		_checkbox->moveToLeft(st::boxPadding.left(), _text->y() + _text->height() + st::boxMediumSkip);
 	}
 }
 
@@ -506,6 +523,9 @@ void PinMessageBox::pinMessage() {
 	if (_notify && !_notify->checked()) {
 		flags |= MTPmessages_UpdatePinnedMessage::Flag::f_silent;
 	}
+	if (_pinForPeer && !_pinForPeer->checked()) {
+		flags |= MTPmessages_UpdatePinnedMessage::Flag::f_pm_oneside;
+	}
 	_requestId = _api.request(MTPmessages_UpdatePinnedMessage(
 		MTP_flags(flags),
 		_peer->input,
diff --git a/Telegram/SourceFiles/boxes/confirm_box.h b/Telegram/SourceFiles/boxes/confirm_box.h
index 585d8ec52..dea112536 100644
--- a/Telegram/SourceFiles/boxes/confirm_box.h
+++ b/Telegram/SourceFiles/boxes/confirm_box.h
@@ -188,6 +188,8 @@ private:
 
 	object_ptr<Ui::FlatLabel> _text;
 	object_ptr<Ui::Checkbox> _notify = { nullptr };
+	object_ptr<Ui::Checkbox> _pinForPeer = { nullptr };
+	QPointer<Ui::Checkbox> _checkbox;
 
 	mtpRequestId _requestId = 0;
 
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index a30aa9275..e1dce7896 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -537,6 +537,8 @@ void HistoryItem::setRealId(MsgId newId) {
 bool HistoryItem::canPin() const {
 	if (id < 0 || !toHistoryMessage()) {
 		return false;
+	} else if (const auto m = media(); m && m->call()) {
+		return false;
 	}
 	return _history->peer->canPinMessages();
 }

From ea6821aca20e38d6ef52fb2d37430789aabe1f44 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Oct 2020 11:08:43 +0300
Subject: [PATCH 127/190] Improve animation in pinned bar.

---
 Telegram/SourceFiles/ui/chat/message_bar.cpp | 90 +++++++++++++++++++-
 Telegram/SourceFiles/ui/chat/message_bar.h   |  7 ++
 2 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/ui/chat/message_bar.cpp b/Telegram/SourceFiles/ui/chat/message_bar.cpp
index 7972583cb..8b4ec1d59 100644
--- a/Telegram/SourceFiles/ui/chat/message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/message_bar.cpp
@@ -13,6 +13,33 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/palette.h"
 
 namespace Ui {
+namespace {
+
+[[nodiscard]] int SameFirstPartLength(const QString &a, const QString &b) {
+	const auto [i, j] = ranges::mismatch(a, b);
+	return (i - a.begin());
+}
+
+[[nodiscard]] bool MuchDifferent(
+		int same,
+		const QString &a,
+		const QString &b) {
+	return (same * 2 < a.size()) || (same * 2 < b.size());
+}
+
+[[nodiscard]] bool MuchDifferent(const QString &a, const QString &b) {
+	return MuchDifferent(SameFirstPartLength(a, b), a, b);
+}
+
+[[nodiscard]] bool ComplexTitleAnimation(
+		int same,
+		const QString &a,
+		const QString &b) {
+	return !MuchDifferent(same, a, b)
+		&& (same != a.size() || same != b.size());
+}
+
+} // namespace
 
 MessageBar::MessageBar(not_null<QWidget*> parent, const style::MessageBar &st)
 : _st(st)
@@ -51,10 +78,11 @@ MessageBar::BodyAnimation MessageBar::DetectBodyAnimationType(
 		? currentAnimation->bodyAnimation
 		: BodyAnimation::None;
 	const auto somethingChanged = (currentContent.text != nextContent.text)
+		|| (currentContent.title != nextContent.title)
 		|| (currentContent.index != nextContent.index)
 		|| (currentContent.count != nextContent.count);
 	return (now == BodyAnimation::Full
-		|| currentContent.title != nextContent.title
+		|| MuchDifferent(currentContent.title, nextContent.title)
 		|| (currentContent.title.isEmpty() && somethingChanged))
 		? BodyAnimation::Full
 		: (now == BodyAnimation::Text || somethingChanged)
@@ -93,10 +121,21 @@ void MessageBar::tweenTo(MessageBarContent &&content) {
 		: RectPart::None;
 	animation.imageFrom = grabImagePart();
 	animation.bodyOrTextFrom = grabBodyOrTextPart(animation.bodyAnimation);
+	const auto sameLength = SameFirstPartLength(
+		_content.title,
+		content.title);
+	if (animation.bodyAnimation == BodyAnimation::Text
+		&& ComplexTitleAnimation(sameLength, _content.title, content.title)) {
+		animation.titleSame = grabTitleBase(sameLength);
+		animation.titleFrom = grabTitlePart(sameLength);
+	}
 	auto was = std::move(_animation);
 	updateFromContent(std::move(content));
 	animation.imageTo = grabImagePart();
 	animation.bodyOrTextTo = grabBodyOrTextPart(animation.bodyAnimation);
+	if (!animation.titleSame.isNull()) {
+		animation.titleTo = grabTitlePart(sameLength);
+	}
 	if (was) {
 		_animation = std::move(was);
 		std::swap(*_animation, animation);
@@ -154,6 +193,20 @@ QRect MessageBar::imageRect() const {
 	return QRect(left, top, size, size);
 }
 
+QRect MessageBar::titleRangeRect(int from, int till) const {
+	auto result = bodyRect();
+	result.setHeight(st::msgServiceNameFont->height);
+	const auto left = from
+		? st::msgServiceNameFont->width(_content.title.mid(0, from))
+		: 0;
+	const auto right = (till <= _content.title.size())
+		? st::msgServiceNameFont->width(_content.title.mid(0, till))
+		: result.width();
+	result.setLeft(result.left() + left);
+	result.setWidth(right - left);
+	return result;
+}
+
 QRect MessageBar::bodyRect(bool withImage) const {
 	const auto innerLeft = st::msgReplyBarSkip + st::msgReplyBarSkip;
 	const auto imageSkip = st::msgReplyBarSize.height()
@@ -196,6 +249,21 @@ QPixmap MessageBar::grabBodyOrTextPart(BodyAnimation type) {
 		: QPixmap();
 }
 
+QPixmap MessageBar::grabTitleBase(int till) {
+	return grabTitleRange(0, till);
+}
+
+QPixmap MessageBar::grabTitlePart(int from) {
+	Expects(from <= _content.title.size());
+
+	return grabTitleRange(from, _content.title.size());
+}
+
+QPixmap MessageBar::grabTitleRange(int from, int till) {
+	const auto guard = makeGrabGuard();
+	return GrabWidget(widget(), titleRangeRect(from, till));
+}
+
 QPixmap MessageBar::grabBodyPart() {
 	const auto guard = makeGrabGuard();
 	return GrabWidget(widget(), bodyRect());
@@ -324,8 +392,24 @@ void MessageBar::paint(Painter &p) {
 		p.setOpacity(1.);
 	}
 	if (!_animation || _animation->bodyAnimation != BodyAnimation::Full) {
-		p.setPen(_st.titleFg);
-		_title.drawLeftElided(p, body.x(), body.y(), body.width(), width);
+		if (_animation && !_animation->titleSame.isNull()) {
+			const auto factor = style::DevicePixelRatio();
+			p.drawPixmap(body.x(), body.y(), _animation->titleSame);
+			p.setOpacity(1. - progress);
+			p.drawPixmap(
+				body.x() + (_animation->titleSame.width() / factor),
+				body.y() + shiftFrom,
+				_animation->titleFrom);
+			p.setOpacity(progress);
+			p.drawPixmap(
+				body.x() + (_animation->titleSame.width() / factor),
+				body.y() + shiftTo,
+				_animation->titleTo);
+			p.setOpacity(1.);
+		} else {
+			p.setPen(_st.titleFg);
+			_title.drawLeftElided(p, body.x(), body.y(), body.width(), width);
+		}
 	} else {
 		p.setOpacity(1. - progress);
 		p.drawPixmap(
diff --git a/Telegram/SourceFiles/ui/chat/message_bar.h b/Telegram/SourceFiles/ui/chat/message_bar.h
index bf15d219a..7ecdb9e60 100644
--- a/Telegram/SourceFiles/ui/chat/message_bar.h
+++ b/Telegram/SourceFiles/ui/chat/message_bar.h
@@ -52,6 +52,9 @@ private:
 		Ui::Animations::Simple barTop;
 		QPixmap bodyOrTextFrom;
 		QPixmap bodyOrTextTo;
+		QPixmap titleSame;
+		QPixmap titleFrom;
+		QPixmap titleTo;
 		QPixmap imageFrom;
 		QPixmap imageTo;
 		BodyAnimation bodyAnimation = BodyAnimation::None;
@@ -71,12 +74,16 @@ private:
 	[[nodiscard]] QPixmap prepareImage(const QImage &preview);
 
 	[[nodiscard]] QRect imageRect() const;
+	[[nodiscard]] QRect titleRangeRect(int from, int till) const;
 	[[nodiscard]] QRect bodyRect(bool withImage) const;
 	[[nodiscard]] QRect bodyRect() const;
 	[[nodiscard]] QRect textRect() const;
 
 	auto makeGrabGuard();
 	[[nodiscard]] QPixmap grabBodyOrTextPart(BodyAnimation type);
+	[[nodiscard]] QPixmap grabTitleBase(int till);
+	[[nodiscard]] QPixmap grabTitlePart(int from);
+	[[nodiscard]] QPixmap grabTitleRange(int from, int till);
 	[[nodiscard]] QPixmap grabImagePart();
 	[[nodiscard]] QPixmap grabBodyPart();
 	[[nodiscard]] QPixmap grabTextPart();

From 2233058ae05800560ebeeecc0ea24d4a221ff821 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 26 Oct 2020 10:29:36 +0300
Subject: [PATCH 128/190] Move pin icon to the right.

---
 .../history/view/history_view_message.cpp     | 43 ++++++++++---------
 Telegram/SourceFiles/ui/chat/chat.style       |  3 +-
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index b1c2bfb3e..5a7aa8f2c 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1819,24 +1819,6 @@ void Message::drawInfo(
 	const auto viewIconTop = infoBottom + st::historyViewsTop;
 	const auto pinIconTop = infoBottom + st::historyPinTop;
 	auto left = infoRight - infoW;
-	if (displayPinIcon()) {
-		const auto icon = [&] {
-			if (outbg) {
-				return &(invertedsprites
-					? st::historyPinInvertedIcon
-					: selected
-					? st::historyPinOutSelectedIcon
-					: st::historyPinOutIcon);
-			}
-			return &(invertedsprites
-				? st::historyPinInvertedIcon
-				: selected
-				? st::historyPinInSelectedIcon
-				: st::historyPinInIcon);
-		}();
-		icon->paint(p, left, pinIconTop, width);
-		left += st::historyViewsWidth;
-	}
 	if (auto views = item->Get<HistoryMessageViews>()) {
 		const auto textTop = infoBottom - st::msgDateFont->descent;
 		if (views->replies.count > 0
@@ -1899,11 +1881,32 @@ void Message::drawInfo(
 				auto iconSkip = st::historyViewsSpace + views->views.textWidth;
 				icon->paint(p, left + iconSkip, viewIconTop, width);
 			}
+			left += st::historyViewsSpace
+				+ views->views.textWidth
+				+ st::historyViewsWidth;
 		}
 	} else if (item->id < 0 && item->history()->peer->isSelf() && !outbg) {
 		auto icon = &(invertedsprites ? st::historyViewsSendingInvertedIcon : st::historyViewsSendingIcon);
 		icon->paint(p, left, viewIconTop, width);
 	}
+	if (displayPinIcon()) {
+		const auto icon = [&] {
+			if (outbg) {
+				return &(invertedsprites
+					? st::historyPinInvertedIcon
+					: selected
+					? st::historyPinOutSelectedIcon
+					: st::historyPinOutIcon);
+			}
+			return &(invertedsprites
+				? st::historyPinInvertedIcon
+				: selected
+				? st::historyPinInSelectedIcon
+				: st::historyPinInIcon);
+		}();
+		icon->paint(p, left, pinIconTop, width);
+		left += st::historyPinWidth;
+	}
 	if (outbg) {
 		auto icon = [&] {
 			if (item->id > 0) {
@@ -1971,7 +1974,7 @@ int Message::infoWidth() const {
 		}
 	}
 	if (displayPinIcon()) {
-		result += st::historyViewsWidth;
+		result += st::historyPinWidth;
 	}
 
 	// When message is scheduled until online, time is not displayed,
@@ -2023,7 +2026,7 @@ int Message::timeLeft() const {
 		}
 	}
 	if (displayPinIcon()) {
-		result += st::historyViewsWidth;
+		result += st::historyPinWidth;
 	}
 	return result;
 }
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 06d976453..855fd3d94 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -173,8 +173,9 @@ historyReceivedInvertedIcon: icon {{ "history_received", historyIconFgInverted,
 
 historyScheduledUntilOnlineStateSpace: 17px;
 
-historyViewsSpace: 11px;
+historyViewsSpace: 8px;
 historyViewsWidth: 20px;
+historyPinWidth: 24px;
 historyViewsTop: -15px;
 historyViewsInIcon: icon {{ "history_views", msgInDateFg }};
 historyViewsInSelectedIcon: icon {{ "history_views", msgInDateFgSelected }};

From e4f039b1418df8ee3cccb2d2cb6140a4f2ed6590 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 26 Oct 2020 10:35:51 +0300
Subject: [PATCH 129/190] Improve pinned messages title.

---
 .../SourceFiles/history/view/history_view_pinned_bar.cpp    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
index 9e536656a..2c1d0ec2e 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_bar.cpp
@@ -125,9 +125,11 @@ auto WithPinnedTitle(not_null<Main::Session*> session, PinnedId id) {
 		}
 		content.title = (id.index + 1 >= id.count)
 			? tr::lng_pinned_message(tr::now)
-			: (tr::lng_pinned_message(tr::now) // #TODO pinned
+			: (id.count == 2)
+			? tr::lng_pinned_previous(tr::now)
+			: (tr::lng_pinned_message(tr::now)
 				+ " #"
-				+ QString::number(id.count - id.index));
+				+ QString::number(id.index + 1));
 		content.count = std::max(id.count, 1);
 		content.index = std::clamp(id.index, 0, content.count - 1);
 		return std::move(content);

From 75c420b9d75227d74b8e2d08c43d2a1fec46a871 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 26 Oct 2020 11:54:59 +0300
Subject: [PATCH 130/190] Check items before deleting by 'Delete' key.

---
 .../history/view/history_view_list_widget.cpp | 79 ++++++++++++++++++-
 .../history/view/history_view_list_widget.h   |  9 ++-
 .../view/history_view_pinned_section.cpp      | 29 +------
 .../view/history_view_replies_section.cpp     | 27 +------
 .../view/history_view_scheduled_section.cpp   | 25 +-----
 5 files changed, 93 insertions(+), 76 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 4a6d38f81..71ceca6bb 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "window/window_peer_menu.h"
 #include "main/main_session.h"
+#include "boxes/confirm_box.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/toast/toast.h"
 #include "ui/inactive_press.h"
@@ -1642,10 +1643,14 @@ TextForMimeData ListWidget::getSelectedText() const {
 	return result;
 }
 
-MessageIdsList ListWidget::getSelectedItems() const {
+MessageIdsList ListWidget::getSelectedIds() const {
 	return collectSelectedIds();
 }
 
+SelectedItems ListWidget::getSelectedItems() const {
+	return collectSelectedItems();
+}
+
 int ListWidget::findItemIndexByY(int y) const {
 	Expects(!_items.empty());
 
@@ -2482,7 +2487,7 @@ std::unique_ptr<QMimeData> ListWidget::prepareDrag() {
 				return true;
 			}();
 			auto items = canForwardAll
-				? getSelectedItems()
+				? collectSelectedIds()
 				: MessageIdsList();
 			if (!items.empty()) {
 				session().data().setMimeForwardIds(std::move(items));
@@ -2711,4 +2716,74 @@ rpl::producer<FullMsgId> ListWidget::readMessageRequested() const {
 
 ListWidget::~ListWidget() = default;
 
+void ConfirmDeleteSelectedItems(not_null<ListWidget*> widget) {
+	const auto items = widget->getSelectedItems();
+	if (items.empty()) {
+		return;
+	}
+	for (const auto &item : items) {
+		if (!item.canDelete) {
+			return;
+		}
+	}
+	const auto weak = Ui::MakeWeak(widget);
+	const auto box = Ui::show(Box<DeleteMessagesBox>(
+		&widget->controller()->session(),
+		widget->getSelectedIds()));
+	box->setDeleteConfirmedCallback([=] {
+		if (const auto strong = weak.data()) {
+			strong->cancelSelection();
+		}
+	});
+}
+
+void ConfirmForwardSelectedItems(not_null<ListWidget*> widget) {
+	const auto items = widget->getSelectedItems();
+	if (items.empty()) {
+		return;
+	}
+	for (const auto &item : items) {
+		if (!item.canForward) {
+			return;
+		}
+	}
+	auto ids = widget->getSelectedIds();
+	const auto weak = Ui::MakeWeak(widget);
+	Window::ShowForwardMessagesBox(widget->controller(), std::move(ids), [=] {
+		if (const auto strong = weak.data()) {
+			strong->cancelSelection();
+		}
+	});
+}
+
+void ConfirmSendNowSelectedItems(not_null<ListWidget*> widget) {
+	const auto items = widget->getSelectedItems();
+	if (items.empty()) {
+		return;
+	}
+	const auto navigation = widget->controller();
+	const auto history = [&]() -> History* {
+		auto result = (History*)nullptr;
+		auto &data = navigation->session().data();
+		for (const auto &item : items) {
+			if (!item.canSendNow) {
+				return nullptr;
+			}
+			const auto message = data.message(item.msgId);
+			if (message) {
+				result = message->history();
+			}
+		}
+		return result;
+	}();
+	if (!history) {
+		return;
+	}
+	Window::ShowSendNowMessagesBox(
+		navigation,
+		history,
+		widget->getSelectedIds(),
+		[=] { navigation->showBackFromStack(); });
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index c0c3b3d70..38ecc163c 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -183,8 +183,9 @@ public:
 		Data::MessagePosition position,
 		Fn<bool()> overrideInitialScroll);
 
-	TextForMimeData getSelectedText() const;
-	MessageIdsList getSelectedItems() const;
+	[[nodiscard]] TextForMimeData getSelectedText() const;
+	[[nodiscard]] MessageIdsList getSelectedIds() const;
+	[[nodiscard]] SelectedItems getSelectedItems() const;
 	void cancelSelection();
 	void selectItem(not_null<HistoryItem*> item);
 	void selectItemAsGroup(not_null<HistoryItem*> item);
@@ -551,4 +552,8 @@ private:
 
 };
 
+void ConfirmDeleteSelectedItems(not_null<ListWidget*> widget);
+void ConfirmForwardSelectedItems(not_null<ListWidget*> widget);
+void ConfirmSendNowSelectedItems(not_null<ListWidget*> widget);
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 3aa58d258..5b64324ad 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -502,7 +502,7 @@ void PinnedWidget::listScrollTo(int top) {
 }
 
 void PinnedWidget::listCancelRequest() {
-	if (_inner && !_inner->getSelectedItems().empty()) {
+	if (_inner && !_inner->getSelectedIds().empty()) {
 		clearSelected();
 		return;
 	}
@@ -588,7 +588,7 @@ bool PinnedWidget::listAllowsMultiSelect() {
 
 bool PinnedWidget::listIsItemGoodForSelection(
 		not_null<HistoryItem*> item) {
-	return !item->isSending() && !item->hasFailed();
+	return IsServerMsgId(item->id);
 }
 
 bool PinnedWidget::listIsLessInOrder(
@@ -640,32 +640,11 @@ bool PinnedWidget::listIsGoodForAroundPosition(
 }
 
 void PinnedWidget::confirmDeleteSelected() {
-	auto items = _inner->getSelectedItems();
-	if (items.empty()) {
-		return;
-	}
-	const auto weak = Ui::MakeWeak(this);
-	const auto box = Ui::show(Box<DeleteMessagesBox>(
-		&_history->session(),
-		std::move(items)));
-	box->setDeleteConfirmedCallback([=] {
-		if (const auto strong = weak.data()) {
-			strong->clearSelected();
-		}
-	});
+	ConfirmDeleteSelectedItems(_inner);
 }
 
 void PinnedWidget::confirmForwardSelected() {
-	auto items = _inner->getSelectedItems();
-	if (items.empty()) {
-		return;
-	}
-	const auto weak = Ui::MakeWeak(this);
-	Window::ShowForwardMessagesBox(controller(), std::move(items), [=] {
-		if (const auto strong = weak.data()) {
-			strong->clearSelected();
-		}
-	});
+	ConfirmForwardSelectedItems(_inner);
 }
 
 void PinnedWidget::clearSelected() {
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index f1baa2b04..ead53c4ae 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1629,7 +1629,7 @@ bool RepliesWidget::listAllowsMultiSelect() {
 
 bool RepliesWidget::listIsItemGoodForSelection(
 		not_null<HistoryItem*> item) {
-	return !item->isSending() && !item->hasFailed();
+	return IsServerMsgId(item->id);
 }
 
 bool RepliesWidget::listIsLessInOrder(
@@ -1739,32 +1739,11 @@ bool RepliesWidget::listIsGoodForAroundPosition(
 }
 
 void RepliesWidget::confirmDeleteSelected() {
-	auto items = _inner->getSelectedItems();
-	if (items.empty()) {
-		return;
-	}
-	const auto weak = Ui::MakeWeak(this);
-	const auto box = Ui::show(Box<DeleteMessagesBox>(
-		&_history->session(),
-		std::move(items)));
-	box->setDeleteConfirmedCallback([=] {
-		if (const auto strong = weak.data()) {
-			strong->clearSelected();
-		}
-	});
+	ConfirmDeleteSelectedItems(_inner);
 }
 
 void RepliesWidget::confirmForwardSelected() {
-	auto items = _inner->getSelectedItems();
-	if (items.empty()) {
-		return;
-	}
-	const auto weak = Ui::MakeWeak(this);
-	Window::ShowForwardMessagesBox(controller(), std::move(items), [=] {
-		if (const auto strong = weak.data()) {
-			strong->clearSelected();
-		}
-	});
+	ConfirmForwardSelectedItems(_inner);
 }
 
 void RepliesWidget::clearSelected() {
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 804d68393..b2417000e 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -1166,32 +1166,11 @@ bool ScheduledWidget::listIsGoodForAroundPosition(
 }
 
 void ScheduledWidget::confirmSendNowSelected() {
-	auto items = _inner->getSelectedItems();
-	if (items.empty()) {
-		return;
-	}
-	const auto navigation = controller();
-	Window::ShowSendNowMessagesBox(
-		navigation,
-		_history,
-		std::move(items),
-		[=] { navigation->showBackFromStack(); });
+	ConfirmSendNowSelectedItems(_inner);
 }
 
 void ScheduledWidget::confirmDeleteSelected() {
-	auto items = _inner->getSelectedItems();
-	if (items.empty()) {
-		return;
-	}
-	const auto weak = Ui::MakeWeak(this);
-	const auto box = Ui::show(Box<DeleteMessagesBox>(
-		&_history->session(),
-		std::move(items)));
-	box->setDeleteConfirmedCallback([=] {
-		if (const auto strong = weak.data()) {
-			strong->clearSelected();
-		}
-	});
+	ConfirmDeleteSelectedItems(_inner);
 }
 
 void ScheduledWidget::clearSelected() {

From 59e0717dac99ccb5e16356ce81df454ffd70a76d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 26 Oct 2020 12:03:39 +0300
Subject: [PATCH 131/190] Show pin/unpin correctly in Recent Actions.

---
 .../history/admin_log/history_admin_log_item.cpp  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
index caba03439..e1b1da1df 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -533,11 +533,11 @@ void GenerateItems(
 	};
 
 	auto createUpdatePinned = [&](const MTPDchannelAdminLogEventActionUpdatePinned &action) {
-		if (action.vmessage().type() == mtpc_messageEmpty) {
-			auto text = tr::lng_admin_log_unpinned_message(tr::now, lt_from, fromLinkText);
-			addSimpleServiceMessage(text);
-		} else {
-			auto text = tr::lng_admin_log_pinned_message(tr::now, lt_from, fromLinkText);
+		action.vmessage().match([&](const MTPDmessage &data) {
+			const auto pinned = data.is_pinned();
+			auto text = (pinned
+				? tr::lng_admin_log_pinned_message
+				: tr::lng_admin_log_unpinned_message)(tr::now, lt_from, fromLinkText);
 			addSimpleServiceMessage(text);
 
 			auto detachExistingItem = false;
@@ -548,7 +548,10 @@ void GenerateItems(
 					date),
 				MTPDmessage_ClientFlag::f_admin_log_entry,
 				detachExistingItem));
-		}
+		}, [&](const auto &) {
+			auto text = tr::lng_admin_log_unpinned_message(tr::now, lt_from, fromLinkText);
+			addSimpleServiceMessage(text);
+		});
 	};
 
 	auto createEditMessage = [&](const MTPDchannelAdminLogEventActionEditMessage &action) {

From 1be064e2dc2bdc4065ce56ef58ec3672344e77eb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 26 Oct 2020 12:13:28 +0300
Subject: [PATCH 132/190] Don't pin for other by default.

---
 Telegram/SourceFiles/boxes/confirm_box.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp
index d7c715eb8..0788195b0 100644
--- a/Telegram/SourceFiles/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/boxes/confirm_box.cpp
@@ -474,23 +474,23 @@ void PinMessageBox::prepare() {
 	addButton(tr::lng_pinned_pin(), [this] { pinMessage(); });
 	addButton(tr::lng_cancel(), [this] { closeBox(); });
 
-	if (!_pinningOld && (_peer->isChat() || _peer->isMegagroup())) {
-		_notify.create(
-			this,
-			tr::lng_pinned_notify(tr::now),
-			true,
-			st::defaultBoxCheckbox);
-		_checkbox = _notify;
-	} else if (_peer->isUser() && !_peer->isSelf()) {
+	if (_peer->isUser() && !_peer->isSelf()) {
 		_pinForPeer.create(
 			this,
 			tr::lng_pinned_also_for_other(
 				tr::now,
 				lt_user,
 				_peer->shortName()),
-			true,
+			false,
 			st::defaultBoxCheckbox);
 		_checkbox = _pinForPeer;
+	} else if (!_pinningOld && (_peer->isChat() || _peer->isMegagroup())) {
+		_notify.create(
+			this,
+			tr::lng_pinned_notify(tr::now),
+			true,
+			st::defaultBoxCheckbox);
+		_checkbox = _notify;
 	}
 
 	auto height = st::boxPadding.top() + _text->height() + st::boxPadding.bottom();

From 77fa29f8ce342662b7d9c9c6ebd4c5530ef33b6b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 26 Oct 2020 12:33:19 +0300
Subject: [PATCH 133/190] Pin/unpin first item of an album.

---
 .../history/history_inner_widget.cpp          | 30 +++++++++++--------
 .../view/history_view_context_menu.cpp        | 14 ++++++---
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 91e593f2d..a93b45dcc 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1536,7 +1536,14 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 	_menu = base::make_unique_q<Ui::PopupMenu>(this);
 	const auto session = &this->session();
 	const auto controller = _controller;
-
+	const auto groupLeaderOrSelf = [](HistoryItem *item) -> HistoryItem* {
+		if (!item) {
+			return nullptr;
+		} else if (const auto group = item->history()->owner().groups().find(item)) {
+			return group->items.front();
+		}
+		return item;
+	};
 	const auto addItemActions = [&](HistoryItem *item) {
 		if (!item
 			|| !IsServerMsgId(item->id)
@@ -1570,11 +1577,15 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				_widget->editMessage(itemId);
 			});
 		}
-		if (item->canPin()) {
-			const auto isPinned = item->isPinned();
+		const auto pinItem = (item->canPin() && item->isPinned())
+			? item
+			: groupLeaderOrSelf(item);
+		if (pinItem->canPin()) {
+			const auto isPinned = pinItem->isPinned();
+			const auto pinItemId = pinItem->fullId();
 			const auto controller = _controller;
 			_menu->addAction(isPinned ? tr::lng_context_unpin_msg(tr::now) : tr::lng_context_pin_msg(tr::now), crl::guard(controller, [=] {
-				Window::ToggleMessagePinned(controller, itemId, !isPinned);
+				Window::ToggleMessagePinned(controller, pinItemId, !isPinned);
 			}));
 		}
 	};
@@ -1716,17 +1727,12 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		}
 	} else { // maybe cursor on some text history item?
 		const auto item = [&]() -> HistoryItem* {
-			if (const auto result = App::hoveredItem()
+			const auto result = App::hoveredItem()
 				? App::hoveredItem()->data().get()
 				: App::hoveredLinkItem()
 				? App::hoveredLinkItem()->data().get()
-				: nullptr) {
-				if (const auto group = session->data().groups().find(result)) {
-					return group->items.front();
-				}
-				return result;
-			}
-			return nullptr;
+				: nullptr;
+			return result ? groupLeaderOrSelf(result) : nullptr;
 		}();
 		const auto itemId = item ? item->fullId() : FullMsgId();
 		const auto canDelete = item
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index b0a7fd185..961efe7d9 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -584,15 +584,21 @@ bool AddPinMessageAction(
 	const auto item = request.item;
 	if (!item
 		|| !IsServerMsgId(item->id)
-		|| !item->canPin()
 		|| (context != Context::History && context != Context::Pinned)) {
 		return false;
 	}
-	const auto itemId = item->fullId();
-	const auto isPinned = item->isPinned();
+	const auto group = item->history()->owner().groups().find(item);
+	const auto pinItem = ((item->canPin() && item->isPinned()) || !group)
+		? item
+		: group->items.front().get();
+	if (!pinItem->canPin()) {
+		return false;
+	}
+	const auto pinItemId = pinItem->fullId();
+	const auto isPinned = pinItem->isPinned();
 	const auto controller = list->controller();
 	menu->addAction(isPinned ? tr::lng_context_unpin_msg(tr::now) : tr::lng_context_pin_msg(tr::now), crl::guard(controller, [=] {
-		Window::ToggleMessagePinned(controller, itemId, !isPinned);
+		Window::ToggleMessagePinned(controller, pinItemId, !isPinned);
 	}));
 	return true;
 }

From 08f706937033c7be50114c805d1947397e5e7b24 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 26 Oct 2020 13:22:14 +0300
Subject: [PATCH 134/190] Implement new choosing of shown pinned message.

---
 .../SourceFiles/history/history_widget.cpp    | 50 +++++++++++++++----
 Telegram/SourceFiles/history/history_widget.h |  4 ++
 2 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 4abcb6bef..8dbe75450 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1608,6 +1608,8 @@ void HistoryWidget::showHistory(
 		const PeerId &peerId,
 		MsgId showAtMsgId,
 		bool reload) {
+	_pinnedClickedId = FullMsgId();
+
 	MsgId wasMsgId = _showAtMsgId;
 	History *wasHistory = _history;
 
@@ -2747,6 +2749,14 @@ void HistoryWidget::onScroll() {
 	if (!_synteticScrollEvent) {
 		_lastUserScrolled = crl::now();
 	}
+	const auto scrollTop = _scroll->scrollTop();
+	if (scrollTop != _lastScrollTop) {
+		if (!_synteticScrollEvent) {
+			checkLastPinnedClickedIdReset(_lastScrollTop, scrollTop);
+		}
+		_lastScrolled = crl::now();
+		_lastScrollTop = scrollTop;
+	}
 }
 
 bool HistoryWidget::isItemCompletelyHidden(HistoryItem *item) const {
@@ -2789,12 +2799,6 @@ void HistoryWidget::preloadHistoryIfNeeded() {
 		preloadHistoryByScroll();
 		checkReplyReturns();
 	}
-
-	auto scrollTop = _scroll->scrollTop();
-	if (scrollTop != _lastScrollTop) {
-		_lastScrolled = crl::now();
-		_lastScrollTop = scrollTop;
-	}
 }
 
 void HistoryWidget::preloadHistoryByScroll() {
@@ -5176,15 +5180,39 @@ void HistoryWidget::updatePinnedViewer() {
 		|| !_historyInited) {
 		return;
 	}
-	const auto visibleTop = _scroll->scrollTop();
-	const auto add = (st::historyReplyHeight - _pinnedBarHeight);
-	auto [view, offset] = _list->findViewForPinnedTracking(visibleTop + add);
+	const auto visibleBottom = _scroll->scrollTop() + _scroll->height();
+	auto [view, offset] = _list->findViewForPinnedTracking(visibleBottom);
 	const auto lessThanId = !view
 		? (ServerMaxMsgId - 1)
 		: (view->data()->history() != _history)
 		? (view->data()->id + (offset > 0 ? 1 : 0) - ServerMaxMsgId)
 		: (view->data()->id + (offset > 0 ? 1 : 0));
-	_pinnedTracker->trackAround(lessThanId);
+	const auto lastClickedId = !_pinnedClickedId
+		? (ServerMaxMsgId - 1)
+		: (!_migrated || _pinnedClickedId.channel)
+		? _pinnedClickedId.msg
+		: (_pinnedClickedId.msg - ServerMaxMsgId);
+	if (_pinnedClickedId && lessThanId <= lastClickedId) {
+		_pinnedClickedId = FullMsgId();
+	}
+	_pinnedTracker->trackAround(std::min(lessThanId, lastClickedId));
+}
+
+void HistoryWidget::checkLastPinnedClickedIdReset(
+		int wasScrollTop,
+		int nowScrollTop) {
+	if (_firstLoadRequest
+		|| _delayedShowAtRequest
+		|| _scroll->isHidden()
+		|| !_history
+		|| !_historyInited) {
+		return;
+	}
+	if (wasScrollTop < nowScrollTop && _pinnedClickedId) {
+		// User scrolled down.
+		_pinnedClickedId = FullMsgId();
+		updatePinnedViewer();
+	}
 }
 
 void HistoryWidget::setupPinnedTracker() {
@@ -5268,6 +5296,8 @@ void HistoryWidget::checkPinnedBarState() {
 		const auto id = _pinnedTracker->currentMessageId();
 		if (const auto item = session().data().message(id.message)) {
 			Ui::showPeerHistory(item->history()->peer, item->id);
+			_pinnedClickedId = id.message;
+			updatePinnedViewer();
 		}
 	}, _pinnedBar->lifetime());
 
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 197e63176..8520cda6b 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -480,6 +480,9 @@ private:
 	void setupPinnedTracker();
 	void checkPinnedBarState();
 	void refreshPinnedBarButton(bool many);
+	void checkLastPinnedClickedIdReset(
+		int wasScrollTop,
+		int nowScrollTop);
 
 	void sendInlineResult(
 		not_null<InlineBots::Result*> result,
@@ -596,6 +599,7 @@ private:
 	std::unique_ptr<HistoryView::PinnedTracker> _pinnedTracker;
 	std::unique_ptr<Ui::PinnedBar> _pinnedBar;
 	int _pinnedBarHeight = 0;
+	FullMsgId _pinnedClickedId;
 
 	mtpRequestId _saveEditMsgRequestId = 0;
 

From 53c308c24ba3e69d4a1e261c605b0f84423e443c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 26 Oct 2020 14:46:08 +0300
Subject: [PATCH 135/190] Loop pinned messages in the top bar.

---
 Telegram/SourceFiles/data/data_peer.cpp       | 34 +++++++++++++++++++
 Telegram/SourceFiles/data/data_peer.h         |  3 ++
 .../SourceFiles/history/history_widget.cpp    | 21 +++++++++++-
 Telegram/SourceFiles/history/history_widget.h |  1 +
 .../storage/storage_sparse_ids_list.cpp       | 21 ++++++++----
 .../storage/storage_sparse_ids_list.h         |  1 -
 6 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 5bf2db6d4..2883bf42c 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -1051,6 +1051,40 @@ FullMsgId ResolveTopPinnedId(
 	}
 }
 
+FullMsgId ResolveMinPinnedId(
+		not_null<PeerData*> peer,
+		PeerData *migrated) {
+	const auto slice = peer->session().storage().snapshot(
+		Storage::SharedMediaQuery(
+			Storage::SharedMediaKey(
+				peer->id,
+				Storage::SharedMediaType::Pinned,
+				1),
+			1,
+			1));
+	const auto old = migrated
+		? migrated->session().storage().snapshot(
+			Storage::SharedMediaQuery(
+				Storage::SharedMediaKey(
+					migrated->id,
+					Storage::SharedMediaType::Pinned,
+					1),
+				1,
+				1))
+		: Storage::SharedMediaResult{
+			.count = 0,
+			.skippedBefore = 0,
+			.skippedAfter = 0,
+		};
+	if (!old.messageIds.empty()) {
+		return FullMsgId(0, old.messageIds.front());
+	} else if (old.count == 0 && !slice.messageIds.empty()) {
+		return FullMsgId(peerToChannel(peer->id), slice.messageIds.front());
+	} else {
+		return FullMsgId();
+	}
+}
+
 std::optional<int> ResolvePinnedCount(
 		not_null<PeerData*> peer,
 		PeerData *migrated) {
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index 3a01b6e98..07a76fd77 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -446,6 +446,9 @@ void SetTopPinnedMessageId(not_null<PeerData*> peer, MsgId messageId);
 [[nodiscard]] FullMsgId ResolveTopPinnedId(
 	not_null<PeerData*> peer,
 	PeerData *migrated);
+[[nodiscard]] FullMsgId ResolveMinPinnedId(
+	not_null<PeerData*> peer,
+	PeerData *migrated);
 [[nodiscard]] std::optional<int> ResolvePinnedCount(
 	not_null<PeerData*> peer,
 	PeerData *migrated);
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 8dbe75450..f816bf062 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1609,6 +1609,7 @@ void HistoryWidget::showHistory(
 		MsgId showAtMsgId,
 		bool reload) {
 	_pinnedClickedId = FullMsgId();
+	_minPinnedId = std::nullopt;
 
 	MsgId wasMsgId = _showAtMsgId;
 	History *wasHistory = _history;
@@ -5195,7 +5196,17 @@ void HistoryWidget::updatePinnedViewer() {
 	if (_pinnedClickedId && lessThanId <= lastClickedId) {
 		_pinnedClickedId = FullMsgId();
 	}
-	_pinnedTracker->trackAround(std::min(lessThanId, lastClickedId));
+	if (_pinnedClickedId && !_minPinnedId) {
+		_minPinnedId = Data::ResolveMinPinnedId(
+			_peer,
+			_migrated ? _migrated->peer.get() : nullptr);
+	}
+	if (_pinnedClickedId && _minPinnedId == _pinnedClickedId) {
+		// After click on the last pinned message we should the top one.
+		_pinnedTracker->trackAround(ServerMaxMsgId - 1);
+	} else {
+		_pinnedTracker->trackAround(std::min(lessThanId, lastClickedId));
+	}
 }
 
 void HistoryWidget::checkLastPinnedClickedIdReset(
@@ -5211,6 +5222,7 @@ void HistoryWidget::checkLastPinnedClickedIdReset(
 	if (wasScrollTop < nowScrollTop && _pinnedClickedId) {
 		// User scrolled down.
 		_pinnedClickedId = FullMsgId();
+		_minPinnedId = std::nullopt;
 		updatePinnedViewer();
 	}
 }
@@ -5269,7 +5281,13 @@ void HistoryWidget::checkPinnedBarState() {
 		_peer,
 		nullptr,
 		Storage::SharedMediaType::Pinned
+	) | rpl::distinct_until_changed(
 	) | rpl::map([=](int count) {
+		if (_pinnedClickedId) {
+			_pinnedClickedId = FullMsgId();
+			_minPinnedId = std::nullopt;
+			updatePinnedViewer();
+		}
 		return (count > 1);
 	}) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](bool many) {
@@ -5297,6 +5315,7 @@ void HistoryWidget::checkPinnedBarState() {
 		if (const auto item = session().data().message(id.message)) {
 			Ui::showPeerHistory(item->history()->peer, item->id);
 			_pinnedClickedId = id.message;
+			_minPinnedId = std::nullopt;
 			updatePinnedViewer();
 		}
 	}, _pinnedBar->lifetime());
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 8520cda6b..7242417fc 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -600,6 +600,7 @@ private:
 	std::unique_ptr<Ui::PinnedBar> _pinnedBar;
 	int _pinnedBarHeight = 0;
 	FullMsgId _pinnedClickedId;
+	std::optional<FullMsgId> _minPinnedId;
 
 	mtpRequestId _saveEditMsgRequestId = 0;
 
diff --git a/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp b/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp
index 9cc01c70c..c3845ddca 100644
--- a/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp
+++ b/Telegram/SourceFiles/storage/storage_sparse_ids_list.cpp
@@ -54,8 +54,7 @@ SparseIdsList::AddResult SparseIdsList::uniteAndAdd(
 	}
 	update.messages = &uniteFrom->messages;
 	update.range = uniteFrom->range;
-	const auto count = int(uniteFrom->messages.size());
-	return { count, count - was };
+	return { int(uniteFrom->messages.size()) - was };
 }
 
 template <typename Range>
@@ -65,6 +64,10 @@ SparseIdsList::AddResult SparseIdsList::addRangeItemsAndCountNew(
 		MsgRange noSkipRange) {
 	Expects(noSkipRange.from <= noSkipRange.till);
 
+	if (noSkipRange.from == noSkipRange.till
+		&& std::begin(messages) == std::end(messages)) {
+		return { 0 };
+	}
 	auto uniteFrom = ranges::lower_bound(
 		_slices,
 		noSkipRange.from,
@@ -88,8 +91,7 @@ SparseIdsList::AddResult SparseIdsList::addRangeItemsAndCountNew(
 	).first;
 	update.messages = &slice->messages;
 	update.range = slice->range;
-	const auto count = int(slice->messages.size());
-	return { count, count };
+	return { int(slice->messages.size()) };
 }
 
 template <typename Range>
@@ -111,12 +113,17 @@ void SparseIdsList::addRange(
 		*_count += result.added;
 	}
 	if (_slices.size() == 1) {
-		if (_slices.front().range == MsgRange { 0, ServerMaxMsgId }) {
+		if (_count && _slices.front().messages.size() >= *_count) {
+			_slices.modify(_slices.begin(), [&](Slice &slice) {
+				slice.range = { 0, ServerMaxMsgId };
+			});
+		}
+		if (_slices.front().range == MsgRange{ 0, ServerMaxMsgId }) {
 			_count = _slices.front().messages.size();
 		}
 	}
-	if (_count) {
-		accumulate_max(*_count, result.inslice);
+	if (_count && update.messages) {
+		accumulate_max(*_count, int(update.messages->size()));
 	}
 	update.count = _count;
 	_sliceUpdated.fire(std::move(update));
diff --git a/Telegram/SourceFiles/storage/storage_sparse_ids_list.h b/Telegram/SourceFiles/storage/storage_sparse_ids_list.h
index 88635f71a..5977e7dc2 100644
--- a/Telegram/SourceFiles/storage/storage_sparse_ids_list.h
+++ b/Telegram/SourceFiles/storage/storage_sparse_ids_list.h
@@ -71,7 +71,6 @@ private:
 	};
 
 	struct AddResult {
-		int inslice = 0;
 		int added = 0;
 	};
 	template <typename Range>

From 48dad5f4776df6029a2ef7da9414eb24f6adf505 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 26 Oct 2020 16:27:01 +0300
Subject: [PATCH 136/190] Improve typing status sending.

---
 .../SourceFiles/api/api_send_progress.cpp     |  9 +++++-
 .../SourceFiles/dialogs/dialogs_layout.cpp    | 32 ++++++++++++-------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_send_progress.cpp b/Telegram/SourceFiles/api/api_send_progress.cpp
index d4cfcba39..6def1f9cd 100644
--- a/Telegram/SourceFiles/api/api_send_progress.cpp
+++ b/Telegram/SourceFiles/api/api_send_progress.cpp
@@ -152,7 +152,14 @@ bool SendProgressManager::skipRequest(const Key &key) const {
 		return true;
 	}
 	const auto recently = base::unixtime::now() - kSendTypingsToOfflineFor;
-	return !Data::OnlineTextActive(user->onlineTill, recently);
+	const auto online = user->onlineTill;
+	if (online == -2) { // last seen recently
+		return false;
+	} else if (online < 0) {
+		return (-online < recently);
+	} else {
+		return (online < recently);
+	}
 }
 
 void SendProgressManager::done(
diff --git a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
index c8641fa1c..4683e9a36 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
@@ -39,10 +39,16 @@ namespace {
 constexpr int kRecentlyInSeconds = 20 * 3600;
 const auto kPsaBadgePrefix = "cloud_lng_badge_psa_";
 
-bool ShowUserBotIcon(not_null<UserData*> user) {
+[[nodiscard]] bool ShowUserBotIcon(not_null<UserData*> user) {
 	return user->isBot() && !user->isSupport() && !user->isRepliesChat();
 }
 
+[[nodiscard]] bool ShowSendActionInDialogs(History *history) {
+	return history
+		&& (!history->peer->isUser()
+			|| history->peer->asUser()->onlineTill > 0);
+}
+
 void PaintRowTopRight(Painter &p, const QString &text, QRect &rectForName, bool active, bool selected) {
 	const auto width = st::dialogsDateFont->width(text);
 	rectForName.setWidth(rectForName.width() - width - st::dialogsDateSkip);
@@ -362,7 +368,8 @@ void paintRow(
 
 		p.setFont(st::dialogsTextFont);
 		auto &color = active ? st::dialogsTextFgServiceActive : (selected ? st::dialogsTextFgServiceOver : st::dialogsTextFgService);
-		if (history && !history->sendActionPainter()->paint(p, nameleft, texttop, availableWidth, fullWidth, color, ms)) {
+		if (ShowSendActionInDialogs(history)
+			&& !history->sendActionPainter()->paint(p, nameleft, texttop, availableWidth, fullWidth, color, ms)) {
 			if (history->cloudDraftTextCache.isEmpty()) {
 				auto draftWrapped = textcmdLink(1, tr::lng_dialogs_text_from_wrapped(tr::now, lt_from, tr::lng_from_draft(tr::now)));
 				auto draftText = supportMode
@@ -389,7 +396,8 @@ void paintRow(
 
 		auto &color = active ? st::dialogsTextFgServiceActive : (selected ? st::dialogsTextFgServiceOver : st::dialogsTextFgService);
 		p.setFont(st::dialogsTextFont);
-		if (history && !history->sendActionPainter()->paint(p, nameleft, texttop, availableWidth, fullWidth, color, ms)) {
+		if (ShowSendActionInDialogs(history)
+			&& !history->sendActionPainter()->paint(p, nameleft, texttop, availableWidth, fullWidth, color, ms)) {
 			// Empty history
 		}
 	} else if (!item->isEmpty()) {
@@ -741,14 +749,16 @@ void RowPainter::paint(
 			texttop,
 			availableWidth,
 			st::dialogsTextFont->height);
-		const auto actionWasPainted = history ? history->sendActionPainter()->paint(
-			p,
-			itemRect.x(),
-			itemRect.y(),
-			itemRect.width(),
-			fullWidth,
-			color,
-			ms) : false;
+		const auto actionWasPainted = ShowSendActionInDialogs(history)
+			? history->sendActionPainter()->paint(
+				p,
+				itemRect.x(),
+				itemRect.y(),
+				itemRect.width(),
+				fullWidth,
+				color,
+				ms)
+			: false;
 		if (const auto folder = row->folder()) {
 			PaintListEntryText(p, itemRect, active, selected, row);
 		} else if (!actionWasPainted) {

From 06ee21041d7ae4995c78bb81abea3bbd4b4f42d3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Oct 2020 14:25:30 +0300
Subject: [PATCH 137/190] Use RelWithDebInfo for OpenAL on Windows.

---
 docs/building-msvc.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index 798cade8f..f7d57aa4f 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -118,7 +118,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     -D LIBTYPE:STRING=STATIC ^
     -D FORCE_STATIC_VCRT=ON
     msbuild OpenAL.vcxproj /property:Configuration=Debug
-    msbuild OpenAL.vcxproj /property:Configuration=Release
+    msbuild OpenAL.vcxproj /property:Configuration=RelWithDebInfo
     cd ..\..
 
     git clone https://github.com/google/breakpad

From 793ec840984583d28893db985ef23600dd94f253 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Oct 2020 14:55:15 +0300
Subject: [PATCH 138/190] Fix pinned message of self-destruct media.

---
 Telegram/SourceFiles/history/history_service.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index b21206af7..25a733922 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -424,8 +424,15 @@ HistoryService::PreparedText HistoryService::preparePinnedText() {
 	auto pinned = Get<HistoryServicePinned>();
 	if (pinned && pinned->msg) {
 		const auto mediaText = [&] {
+			using TTL = HistoryServiceSelfDestruct;
 			if (const auto media = pinned->msg->media()) {
 				return media->pinnedTextSubstring();
+			} else if (const auto selfdestruct = pinned->msg->Get<TTL>()) {
+				if (selfdestruct->type == TTL::Type::Photo) {
+					return tr::lng_action_pinned_media_photo(tr::now);
+				} else if (selfdestruct->type == TTL::Type::Video) {
+					return tr::lng_action_pinned_media_video(tr::now);
+				}
 			}
 			return QString();
 		}();

From 78492386c4e019c5580493ac8f2d56c3950596f2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Oct 2020 15:21:49 +0300
Subject: [PATCH 139/190] Fix pinned bar consecutive animations.

---
 Telegram/SourceFiles/ui/chat/message_bar.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/ui/chat/message_bar.cpp b/Telegram/SourceFiles/ui/chat/message_bar.cpp
index 8b4ec1d59..332d46c25 100644
--- a/Telegram/SourceFiles/ui/chat/message_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/message_bar.cpp
@@ -341,8 +341,9 @@ void MessageBar::paint(Painter &p) {
 		if (!_image.isNull()) {
 			p.drawPixmap(image, _image);
 		}
-	} else if (!_animation->imageFrom.isNull()
-		|| !_animation->imageTo.isNull()) {
+	} else if (!_animation->imageTo.isNull()
+		|| (!_animation->imageFrom.isNull()
+			&& _animation->imageShown.animating())) {
 		const auto rect = [&] {
 			if (!_animation->imageShown.animating()) {
 				return image;

From 6d9c529a65cba891e194bed49c1b56353efed029 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Oct 2020 18:21:16 +0300
Subject: [PATCH 140/190] Fix caption edit in column albums.

---
 .../history/history_inner_widget.cpp          | 24 +++++--
 .../view/media/history_view_document.cpp      | 68 ++++++++-----------
 .../view/media/history_view_document.h        |  5 +-
 .../history/view/media/history_view_gif.cpp   |  4 +-
 .../history/view/media/history_view_gif.h     |  4 +-
 .../history/view/media/history_view_media.h   |  6 +-
 .../view/media/history_view_media_grouped.cpp | 22 +++---
 .../history/view/media/history_view_photo.cpp |  6 +-
 .../history/view/media/history_view_photo.h   |  4 +-
 9 files changed, 70 insertions(+), 73 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index a93b45dcc..a9d9719de 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1544,7 +1544,9 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 		}
 		return item;
 	};
-	const auto addItemActions = [&](HistoryItem *item) {
+	const auto addItemActions = [&](
+			HistoryItem *item,
+			HistoryItem *albumPartItem) {
 		if (!item
 			|| !IsServerMsgId(item->id)
 			|| isUponSelected == 2
@@ -1572,9 +1574,16 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				controller->showRepliesForMessage(_history, rootId);
 			});
 		}
-		if (item->allowsEdit(base::unixtime::now())) {
+		const auto t = base::unixtime::now();
+		const auto editItem = (albumPartItem && albumPartItem->allowsEdit(t))
+			? albumPartItem
+			: item->allowsEdit(t)
+			? item
+			: nullptr;
+		if (editItem) {
+			const auto editItemId = editItem->fullId();
 			_menu->addAction(tr::lng_context_edit_msg(tr::now), [=] {
-				_widget->editMessage(itemId);
+				_widget->editMessage(editItemId);
 			});
 		}
 		const auto pinItem = (item->canPin() && item->isPinned())
@@ -1663,7 +1672,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					: tr::lng_context_copy_selected(tr::now)),
 				[=] { copySelectedText(); });
 		}
-		addItemActions(item);
+		addItemActions(item, item);
 		if (lnkPhoto) {
 			addPhotoActions(lnkPhoto->photo());
 		} else {
@@ -1726,7 +1735,8 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			}
 		}
 	} else { // maybe cursor on some text history item?
-		const auto item = [&]() -> HistoryItem* {
+		const auto albumPartItem = _dragStateItem;
+		const auto item = [&] {
 			const auto result = App::hoveredItem()
 				? App::hoveredItem()->data().get()
 				: App::hoveredLinkItem()
@@ -1750,9 +1760,9 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					? tr::lng_context_copy_selected_items(tr::now)
 					: tr::lng_context_copy_selected(tr::now)),
 				[=] { copySelectedText(); });
-			addItemActions(item);
+			addItemActions(item, item);
 		} else {
-			addItemActions(item);
+			addItemActions(item, albumPartItem);
 			if (item && !isUponSelected) {
 				const auto media = (view ? view->media() : nullptr);
 				const auto mediaHasTextForCopy = media && media->hasTextForCopy();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 6684f11e7..67691a00a 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -518,11 +518,9 @@ void Document::draw(
 		}
 	}
 
-	if (mode != LayoutMode::GroupedLast) {
-		if (auto captioned = Get<HistoryDocumentCaptioned>()) {
-			p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
-			captioned->_caption.draw(p, st::msgPadding.left(), bottom, captionw, style::al_left, 0, -1, selection);
-		}
+	if (auto captioned = Get<HistoryDocumentCaptioned>()) {
+		p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
+		captioned->_caption.draw(p, st::msgPadding.left(), bottom, captionw, style::al_left, 0, -1, selection);
 	}
 }
 
@@ -699,20 +697,18 @@ TextState Document::textState(
 	}
 
 	auto painth = layout.height();
-	if (mode != LayoutMode::GroupedLast) {
-		if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
-			if (point.y() >= bottom) {
-				result = TextState(_parent, captioned->_caption.getState(
-					point - QPoint(st::msgPadding.left(), bottom),
-					width - st::msgPadding.left() - st::msgPadding.right(),
-					request.forText()));
-				return result;
-			}
-			auto captionw = width - st::msgPadding.left() - st::msgPadding.right();
-			painth -= captioned->_caption.countHeight(captionw);
-			if (isBubbleBottom()) {
-				painth -= st::msgPadding.bottom();
-			}
+	if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
+		if (point.y() >= bottom) {
+			result = TextState(_parent, captioned->_caption.getState(
+				point - QPoint(st::msgPadding.left(), bottom),
+				width - st::msgPadding.left() - st::msgPadding.right(),
+				request.forText()));
+			return result;
+		}
+		auto captionw = width - st::msgPadding.left() - st::msgPadding.right();
+		painth -= captioned->_caption.countHeight(captionw);
+		if (isBubbleBottom()) {
+			painth -= st::msgPadding.bottom();
 		}
 	}
 	if (QRect(0, 0, width, painth).contains(point)
@@ -877,35 +873,29 @@ bool Document::hideForwardedFrom() const {
 	return _data->isSong();
 }
 
-QSize Document::sizeForGroupingOptimal(int maxWidth, bool last) const {
+QSize Document::sizeForGroupingOptimal(int maxWidth) const {
 	const auto thumbed = Get<HistoryDocumentThumbed>();
 	const auto &st = (thumbed ? st::msgFileThumbLayoutGrouped : st::msgFileLayoutGrouped);
 	auto height = st.padding.top() + st.thumbSize + st.padding.bottom();
-	if (!last) {
-		if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
-			auto captionw = maxWidth
-				- st::msgPadding.left()
-				- st::msgPadding.right();
-			height += captioned->_caption.countHeight(captionw);
-		}
+	if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
+		auto captionw = maxWidth
+			- st::msgPadding.left()
+			- st::msgPadding.right();
+		height += captioned->_caption.countHeight(captionw);
 	}
-
 	return { maxWidth, height };
 }
 
-QSize Document::sizeForGrouping(int width, bool last) const {
+QSize Document::sizeForGrouping(int width) const {
 	const auto thumbed = Get<HistoryDocumentThumbed>();
 	const auto &st = (thumbed ? st::msgFileThumbLayoutGrouped : st::msgFileLayoutGrouped);
 	auto height = st.padding.top() + st.thumbSize + st.padding.bottom();
-	if (!last) {
-		if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
-			auto captionw = width
-				- st::msgPadding.left()
-				- st::msgPadding.right();
-			height += captioned->_caption.countHeight(captionw);
-		}
+	if (const auto captioned = Get<HistoryDocumentCaptioned>()) {
+		auto captionw = width
+			- st::msgPadding.left()
+			- st::msgPadding.right();
+		height += captioned->_caption.countHeight(captionw);
 	}
-
 	return { maxWidth(), height };
 }
 
@@ -926,7 +916,7 @@ void Document::drawGrouped(
 		geometry.width(),
 		selection,
 		ms,
-		last ? LayoutMode::GroupedLast : LayoutMode::Grouped);
+		LayoutMode::Grouped);
 	p.translate(-geometry.topLeft());
 }
 
@@ -941,7 +931,7 @@ TextState Document::getStateGrouped(
 		point,
 		geometry.size(),
 		request,
-		last ? LayoutMode::GroupedLast : LayoutMode::Grouped);
+		LayoutMode::Grouped);
 }
 
 bool Document::voiceProgressAnimationCallback(crl::time now) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.h b/Telegram/SourceFiles/history/view/media/history_view_document.h
index 3b70a2c5b..7171babbc 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.h
@@ -62,8 +62,8 @@ public:
 	QMargins bubbleMargins() const override;
 	bool hideForwardedFrom() const override;
 
-	QSize sizeForGroupingOptimal(int maxWidth, bool last) const override;
-	QSize sizeForGrouping(int width, bool last) const override;
+	QSize sizeForGroupingOptimal(int maxWidth) const override;
+	QSize sizeForGrouping(int width) const override;
 	void drawGrouped(
 		Painter &p,
 		const QRect &clip,
@@ -106,7 +106,6 @@ private:
 	enum class LayoutMode {
 		Full,
 		Grouped,
-		GroupedLast,
 	};
 
 	void draw(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index c3475a97f..dcf2d0db3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -885,11 +885,11 @@ bool Gif::fullFeaturedGrouped(RectParts sides) const {
 	return (sides & RectPart::Left) && (sides & RectPart::Right);
 }
 
-QSize Gif::sizeForGroupingOptimal(int maxWidth, bool last) const {
+QSize Gif::sizeForGroupingOptimal(int maxWidth) const {
 	return sizeForAspectRatio();
 }
 
-QSize Gif::sizeForGrouping(int width, bool last) const {
+QSize Gif::sizeForGrouping(int width) const {
 	return sizeForAspectRatio();
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.h b/Telegram/SourceFiles/history/view/media/history_view_gif.h
index 1a1f77f7f..89487c01d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.h
@@ -69,8 +69,8 @@ public:
 	}
 
 	bool fullFeaturedGrouped(RectParts sides) const;
-	QSize sizeForGroupingOptimal(int maxWidth, bool last) const override;
-	QSize sizeForGrouping(int width, bool last) const override;
+	QSize sizeForGroupingOptimal(int maxWidth) const override;
+	QSize sizeForGrouping(int width) const override;
 	void drawGrouped(
 		Painter &p,
 		const QRect &clip,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.h b/Telegram/SourceFiles/history/view/media/history_view_media.h
index 7d52ec3d5..abde5adb8 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.h
@@ -163,12 +163,10 @@ public:
 	virtual void checkAnimation() {
 	}
 
-	[[nodiscard]] virtual QSize sizeForGroupingOptimal(
-			int maxWidth,
-			bool last) const {
+	[[nodiscard]] virtual QSize sizeForGroupingOptimal(int maxWidth) const {
 		Unexpected("Grouping method call.");
 	}
-	[[nodiscard]] virtual QSize sizeForGrouping(int width, bool last) const {
+	[[nodiscard]] virtual QSize sizeForGrouping(int width) const {
 		Unexpected("Grouping method call.");
 	}
 	virtual void drawGrouped(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
index fb6939045..0395a027d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -117,10 +117,8 @@ QSize GroupedMedia::countOptimalSize() {
 			accumulate_max(maxWidth, media->maxWidth());
 		}
 	}
-	auto index = 0;
 	for (const auto &part : _parts) {
-		const auto last = (++index == partsCount);
-		sizes.push_back(part.content->sizeForGroupingOptimal(maxWidth, last));
+		sizes.push_back(part.content->sizeForGroupingOptimal(maxWidth));
 	}
 
 	const auto layout = (_mode == Mode::Grid)
@@ -161,11 +159,9 @@ QSize GroupedMedia::countCurrentSize(int newWidth) {
 	if (_mode == Mode::Grid && newWidth < st::historyGroupWidthMin) {
 		return { newWidth, newHeight };
 	} else if (_mode == Mode::Column) {
-		auto index = 0;
 		auto top = 0;
 		for (auto &part : _parts) {
-			const auto last = (++index == _parts.size());
-			const auto size = part.content->sizeForGrouping(newWidth, last);
+			const auto size = part.content->sizeForGrouping(newWidth);
 			part.geometry = QRect(0, top, newWidth, size.height());
 			top += size.height();
 		}
@@ -242,11 +238,14 @@ QMargins GroupedMedia::groupedPadding() const {
 	const auto normal = st::msgFileLayout.padding;
 	const auto grouped = st::msgFileLayoutGrouped.padding;
 	const auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
+	const auto lastHasCaption = isBubbleBottom()
+		&& !_parts.back().item->emptyText();
+	const auto addToBottom = lastHasCaption ? st::msgPadding.bottom() : 0;
 	return QMargins(
 		0,
 		(normal.top() - grouped.top()) - topMinus,
 		0,
-		(normal.bottom() - grouped.bottom()));
+		(normal.bottom() - grouped.bottom()) + addToBottom);
 }
 
 void GroupedMedia::draw(
@@ -518,8 +517,10 @@ DocumentData *GroupedMedia::getDocument() const {
 }
 
 HistoryMessageEdited *GroupedMedia::displayedEditBadge() const {
-	if (!_caption.isEmpty()) {
-		return _parts.front().item->Get<HistoryMessageEdited>();
+	for (const auto &part : _parts) {
+		if (const auto edited = part.item->Get<HistoryMessageEdited>()) {
+			return edited;
+		}
 	}
 	return nullptr;
 }
@@ -527,8 +528,7 @@ HistoryMessageEdited *GroupedMedia::displayedEditBadge() const {
 void GroupedMedia::updateNeedBubbleState() {
 	const auto captionItem = [&]() -> HistoryItem* {
 		if (_mode == Mode::Column) {
-			const auto last = _parts.back().item.get();
-			return last->emptyText() ? nullptr : last;
+			return nullptr;
 		}
 		auto result = (HistoryItem*)nullptr;
 		for (const auto &part : _parts) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index 6d04b23f5..3d7541d09 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -467,14 +467,14 @@ TextState Photo::textState(QPoint point, StateRequest request) const {
 	return result;
 }
 
-QSize Photo::sizeForGroupingOptimal(int maxWidth, bool last) const {
+QSize Photo::sizeForGroupingOptimal(int maxWidth) const {
 	const auto width = _data->width();
 	const auto height = _data->height();
 	return { std::max(width, 1), std::max(height, 1) };
 }
 
-QSize Photo::sizeForGrouping(int width, bool last) const {
-	return sizeForGroupingOptimal(width, last);
+QSize Photo::sizeForGrouping(int width) const {
+	return sizeForGroupingOptimal(width);
 }
 
 void Photo::drawGrouped(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.h b/Telegram/SourceFiles/history/view/media/history_view_photo.h
index 418c19284..1f3038da7 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.h
@@ -58,8 +58,8 @@ public:
 		return _data;
 	}
 
-	QSize sizeForGroupingOptimal(int maxWidth, bool last) const override;
-	QSize sizeForGrouping(int width, bool last) const override;
+	QSize sizeForGroupingOptimal(int maxWidth) const override;
+	QSize sizeForGrouping(int width) const override;
 	void drawGrouped(
 		Painter &p,
 		const QRect &clip,

From 6e682643df5711a61b5acf0cf116e7bd8a0233ff Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Oct 2020 19:12:43 +0300
Subject: [PATCH 141/190] Fix captions selection in column albums.

---
 .../SourceFiles/history/history_item_text.cpp | 32 ++++++-
 .../view/media/history_view_document.cpp      |  6 +-
 .../view/media/history_view_document.h        |  6 +-
 .../history/view/media/history_view_gif.cpp   |  6 +-
 .../history/view/media/history_view_gif.h     |  6 +-
 .../history/view/media/history_view_media.cpp |  3 +-
 .../history/view/media/history_view_media.h   |  6 +-
 .../view/media/history_view_media_grouped.cpp | 84 ++++++++++++++++---
 .../view/media/history_view_media_grouped.h   |  8 +-
 .../history/view/media/history_view_photo.cpp |  6 +-
 .../history/view/media/history_view_photo.h   |  6 +-
 11 files changed, 119 insertions(+), 50 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_item_text.cpp b/Telegram/SourceFiles/history/history_item_text.cpp
index 3af55f05c..5a1d9adfb 100644
--- a/Telegram/SourceFiles/history/history_item_text.cpp
+++ b/Telegram/SourceFiles/history/history_item_text.cpp
@@ -108,12 +108,38 @@ TextForMimeData HistoryItemText(not_null<HistoryItem*> item) {
 TextForMimeData HistoryGroupText(not_null<const Data::Group*> group) {
 	Expects(!group->items.empty());
 
+	const auto columnAlbum = [&] {
+		const auto item = group->items.front();
+		if (const auto media = item->media()) {
+			if (const auto document = media->document()) {
+				return !document->isVideoFile();
+			}
+		}
+		return false;
+	}();
+	const auto hasCaption = [](not_null<HistoryItem*> item) {
+		return !item->clipboardText().empty();
+	};
+	if (columnAlbum) {
+		const auto simple = !ranges::any_of(group->items, hasCaption);
+		if (!simple) {
+			auto result = TextForMimeData();
+			for (const auto &item : group->items) {
+				if (result.empty()) {
+					result = HistoryItemText(item);
+				} else {
+					result.append(qstr("\n\n")).append(HistoryItemText(item));
+				}
+			}
+			return result;
+		}
+	}
 	auto caption = [&] {
 		auto &&nonempty = ranges::view::all(
 			group->items
-		) | ranges::view::filter([](not_null<HistoryItem*> item) {
-			return !item->clipboardText().empty();
-		}) | ranges::view::take(2);
+		) | ranges::view::filter(
+			hasCaption
+		) | ranges::view::take(2);
 		auto first = nonempty.begin();
 		auto end = nonempty.end();
 		if (first == end) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 67691a00a..2dcb0f1b4 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -908,8 +908,7 @@ void Document::drawGrouped(
 		RectParts sides,
 		RectParts corners,
 		not_null<uint64*> cacheKey,
-		not_null<QPixmap*> cache,
-		bool last) const {
+		not_null<QPixmap*> cache) const {
 	p.translate(geometry.topLeft());
 	draw(
 		p,
@@ -924,8 +923,7 @@ TextState Document::getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request,
-		bool last) const {
+		StateRequest request) const {
 	point -= geometry.topLeft();
 	return textState(
 		point,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.h b/Telegram/SourceFiles/history/view/media/history_view_document.h
index 7171babbc..d50d7e0ed 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.h
@@ -73,14 +73,12 @@ public:
 		RectParts sides,
 		RectParts corners,
 		not_null<uint64*> cacheKey,
-		not_null<QPixmap*> cache,
-		bool last) const override;
+		not_null<QPixmap*> cache) const override;
 	TextState getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request,
-		bool last) const override;
+		StateRequest request) const override;
 
 	bool voiceProgressAnimationCallback(crl::time now);
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index dcf2d0db3..883e32407 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -902,8 +902,7 @@ void Gif::drawGrouped(
 		RectParts sides,
 		RectParts corners,
 		not_null<uint64*> cacheKey,
-		not_null<QPixmap*> cache,
-		bool last) const {
+		not_null<QPixmap*> cache) const {
 	ensureDataMediaCreated();
 	const auto item = _parent->data();
 	const auto loaded = dataLoaded();
@@ -1091,8 +1090,7 @@ TextState Gif::getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request,
-		bool last) const {
+		StateRequest request) const {
 	if (!geometry.contains(point)) {
 		return {};
 	}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.h b/Telegram/SourceFiles/history/view/media/history_view_gif.h
index 89487c01d..e5bfcc30c 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.h
@@ -80,14 +80,12 @@ public:
 		RectParts sides,
 		RectParts corners,
 		not_null<uint64*> cacheKey,
-		not_null<QPixmap*> cache,
-		bool last) const override;
+		not_null<QPixmap*> cache) const override;
 	TextState getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request,
-		bool last) const override;
+		StateRequest request) const override;
 
 	void stopAnimation() override;
 	void checkAnimation() override;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.cpp b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
index 5b243babe..64eb1ff5d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
@@ -182,8 +182,7 @@ TextState Media::getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request,
-		bool last) const {
+		StateRequest request) const {
 	Unexpected("Grouping method call.");
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.h b/Telegram/SourceFiles/history/view/media/history_view_media.h
index abde5adb8..82df073bf 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.h
@@ -178,16 +178,14 @@ public:
 			RectParts sides,
 			RectParts corners,
 			not_null<uint64*> cacheKey,
-			not_null<QPixmap*> cache,
-			bool last) const {
+			not_null<QPixmap*> cache) const {
 		Unexpected("Grouping method call.");
 	}
 	[[nodiscard]] virtual TextState getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request,
-		bool last) const;
+		StateRequest request) const;
 
 	[[nodiscard]] virtual bool animating() const {
 		return false;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
index 0395a027d..a2ea6af93 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -254,14 +254,21 @@ void GroupedMedia::draw(
 		TextSelection selection,
 		crl::time ms) const {
 	const auto groupPadding = groupedPadding();
+	const auto fullSelection = (selection == FullSelection);
+	const auto textSelection = !fullSelection
+		&& !IsSubGroupSelection(selection);
 	for (auto i = 0, count = int(_parts.size()); i != count; ++i) {
 		const auto &part = _parts[i];
-		const auto partSelection = (selection == FullSelection)
+		const auto partSelection = fullSelection
 			? FullSelection
+			: textSelection
+			? selection
 			: IsGroupItemSelection(selection, i)
 			? FullSelection
 			: TextSelection();
-		const auto last = (i + 1 == count);
+		if (textSelection) {
+			selection = part.content->skipSelection(selection);
+		}
 		part.content->drawGrouped(
 			p,
 			clip,
@@ -271,8 +278,7 @@ void GroupedMedia::draw(
 			part.sides,
 			cornersFromSides(part.sides),
 			&part.cacheKey,
-			&part.cache,
-			last);
+			&part.cache);
 	}
 
 	// date
@@ -303,20 +309,19 @@ void GroupedMedia::draw(
 TextState GroupedMedia::getPartState(
 		QPoint point,
 		StateRequest request) const {
-	auto index = 0;
+	auto shift = 0;
 	for (const auto &part : _parts) {
-		++index;
 		if (part.geometry.contains(point)) {
-			const auto last = (index == _parts.size());
 			auto result = part.content->getStateGrouped(
 				part.geometry,
 				part.sides,
 				point,
-				request,
-				last);
+				request);
+			result.symbol += shift;
 			result.itemId = part.item->fullId();
 			return result;
 		}
+		shift += part.content->fullSelectionLength();
 	}
 	return TextState(_parent->data());
 }
@@ -389,12 +394,69 @@ bool GroupedMedia::dragItemByHandler(const ClickHandlerPtr &p) const {
 TextSelection GroupedMedia::adjustSelection(
 		TextSelection selection,
 		TextSelectType type) const {
-	return _caption.adjustSelection(selection, type);
+	if (_mode != Mode::Column) {
+		return _caption.adjustSelection(selection, type);
+	}
+	auto checked = 0;
+	for (const auto &part : _parts) {
+		const auto modified = ShiftItemSelection(
+			part.content->adjustSelection(
+				UnshiftItemSelection(selection, checked),
+				type),
+			checked);
+		const auto till = checked + part.content->fullSelectionLength();
+		if (selection.from >= checked && selection.from < till) {
+			selection.from = modified.from;
+		}
+		if (selection.to <= till) {
+			selection.to = modified.to;
+			return selection;
+		}
+	}
+	return selection;
+}
+
+uint16 GroupedMedia::fullSelectionLength() const {
+	if (_mode != Mode::Column) {
+		return _caption.length();
+	}
+	auto result = 0;
+	for (const auto &part : _parts) {
+		result += part.content->fullSelectionLength();
+	}
+	return result;
+}
+
+bool GroupedMedia::hasTextForCopy() const {
+	if (_mode != Mode::Column) {
+		return !_caption.isEmpty();
+	}
+	for (const auto &part : _parts) {
+		if (part.content->hasTextForCopy()) {
+			return true;
+		}
+	}
+	return false;
 }
 
 TextForMimeData GroupedMedia::selectedText(
 		TextSelection selection) const {
-	return _caption.toTextForMimeData(selection);
+	if (_mode != Mode::Column) {
+		return _caption.toTextForMimeData(selection);
+	}
+	auto result = TextForMimeData();
+	for (const auto &part : _parts) {
+		auto text = part.content->selectedText(selection);
+		if (!text.empty()) {
+			if (result.empty()) {
+				result = std::move(text);
+			} else {
+				result.append(qstr("\n\n")).append(std::move(text));
+			}
+		}
+		selection = part.content->skipSelection(selection);
+	}
+	return result;
 }
 
 auto GroupedMedia::getBubbleSelectionIntervals(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
index 615c03772..ee24c61f8 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.h
@@ -48,12 +48,8 @@ public:
 	[[nodiscard]] TextSelection adjustSelection(
 		TextSelection selection,
 		TextSelectType type) const override;
-	uint16 fullSelectionLength() const override {
-		return _caption.length();
-	}
-	bool hasTextForCopy() const override {
-		return !_caption.isEmpty();
-	}
+	uint16 fullSelectionLength() const override;
+	bool hasTextForCopy() const override;
 
 	PhotoData *getPhoto() const override;
 	DocumentData *getDocument() const override;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
index 3d7541d09..ebb7fd318 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.cpp
@@ -486,8 +486,7 @@ void Photo::drawGrouped(
 		RectParts sides,
 		RectParts corners,
 		not_null<uint64*> cacheKey,
-		not_null<QPixmap*> cache,
-		bool last) const {
+		not_null<QPixmap*> cache) const {
 	ensureDataMediaCreated();
 	_dataMedia->automaticLoad(_realParent->fullId(), _parent->data());
 
@@ -587,8 +586,7 @@ TextState Photo::getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request,
-		bool last) const {
+		StateRequest request) const {
 	if (!geometry.contains(point)) {
 		return {};
 	}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_photo.h b/Telegram/SourceFiles/history/view/media/history_view_photo.h
index 1f3038da7..234843cf0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_photo.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_photo.h
@@ -69,14 +69,12 @@ public:
 		RectParts sides,
 		RectParts corners,
 		not_null<uint64*> cacheKey,
-		not_null<QPixmap*> cache,
-		bool last) const override;
+		not_null<QPixmap*> cache) const override;
 	TextState getStateGrouped(
 		const QRect &geometry,
 		RectParts sides,
 		QPoint point,
-		StateRequest request,
-		bool last) const override;
+		StateRequest request) const override;
 
 	TextWithEntities getCaption() const override {
 		return _caption.toTextWithEntities();

From 600cf83c3f8f586862f735d0de57aba45b19ecc9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Oct 2020 19:26:58 +0300
Subject: [PATCH 142/190] Custom enter from event loop in
 applicationDidBecomeActive.

---
 .../SourceFiles/platform/mac/specific_mac_p.mm     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
index 6cba7ee3c..6b9cc508a 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
@@ -141,14 +141,16 @@ ApplicationDelegate *_sharedDelegate = nil;
 }
 
 - (void) applicationDidBecomeActive:(NSNotification *)aNotification {
-	if (Core::IsAppLaunched() && !_ignoreActivation) {
-		Core::App().handleAppActivated();
-		if (auto window = App::wnd()) {
-			if (window->isHidden()) {
-				window->showFromTray();
+	Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+		if (Core::IsAppLaunched() && !_ignoreActivation) {
+			Core::App().handleAppActivated();
+			if (auto window = App::wnd()) {
+				if (window->isHidden()) {
+					window->showFromTray();
+				}
 			}
 		}
-	}
+	});
 }
 
 - (void) applicationDidResignActive:(NSNotification *)aNotification {

From c35b6e12096b21f7dcbedf5b68ed9786bc3ea3fc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Oct 2020 19:53:07 +0300
Subject: [PATCH 143/190] Highlight internal links in Bio.

---
 .../info/profile/info_profile_actions.cpp     |  9 ++-
 .../info/profile/info_profile_values.cpp      | 71 ++++++++++---------
 .../info/profile/info_profile_values.h        |  1 -
 .../settings/settings_information.cpp         |  2 +-
 4 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 1206ce486..1a0e78b85 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -267,11 +267,10 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 			tr::lng_info_mobile_label(),
 			PhoneOrHiddenValue(user),
 			tr::lng_profile_copy_phone(tr::now));
-		if (user->isBot()) {
-			addInfoLine(tr::lng_info_about_label(), AboutValue(user));
-		} else {
-			addInfoLine(tr::lng_info_bio_label(), BioValue(user));
-		}
+		auto label = user->isBot()
+			? tr::lng_info_about_label()
+			: tr::lng_info_bio_label();
+		addInfoLine(std::move(label), AboutValue(user));
 		addInfoOneLine(
 			tr::lng_info_username_label(),
 			UsernameValue(user),
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
index a30b8a81d..7c74ebf8d 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_values.h"
 
 #include "core/application.h"
+#include "core/local_url_handlers.h"
 #include "main/main_session.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/text/text_utilities.h"
@@ -29,12 +30,12 @@ namespace {
 
 using UpdateFlag = Data::PeerUpdate::Flag;
 
-auto PlainBioValue(not_null<UserData*> user) {
-	return user->session().changes().peerFlagsValue(
-		user,
+auto PlainAboutValue(not_null<PeerData*> peer) {
+	return peer->session().changes().peerFlagsValue(
+		peer,
 		UpdateFlag::About
 	) | rpl::map([=] {
-		return user->about();
+		return peer->about();
 	});
 }
 
@@ -47,6 +48,24 @@ auto PlainUsernameValue(not_null<PeerData*> peer) {
 	});
 }
 
+void StripExternalLinks(TextWithEntities &text) {
+	const auto local = [](const QString &url) {
+		return Core::TryConvertUrlToLocal(url).startsWith(qstr("tg://"));
+	};
+	const auto notLocal = [&](const EntityInText &entity) {
+		if (entity.type() == EntityType::CustomUrl) {
+			return !local(entity.data());
+		} else if (entity.type() == EntityType::Url) {
+			return !local(text.text.mid(entity.offset(), entity.length()));
+		} else {
+			return false;
+		}
+	};
+	text.entities.erase(
+		ranges::remove_if(text.entities, notLocal),
+		text.entities.end());
+}
+
 } // namespace
 
 rpl::producer<TextWithEntities> NameValue(not_null<PeerData*> peer) {
@@ -71,25 +90,19 @@ rpl::producer<TextWithEntities> PhoneOrHiddenValue(not_null<UserData*> user) {
 	return rpl::combine(
 		PhoneValue(user),
 		PlainUsernameValue(user),
-		PlainBioValue(user),
+		PlainAboutValue(user),
 		tr::lng_info_mobile_hidden()
 	) | rpl::map([](
 			const TextWithEntities &phone,
 			const QString &username,
-			const QString &bio,
+			const QString &about,
 			const QString &hidden) {
-		return (phone.text.isEmpty() && username.isEmpty() && bio.isEmpty())
+		return (phone.text.isEmpty() && username.isEmpty() && about.isEmpty())
 			? Ui::Text::WithEntities(hidden)
 			: phone;
 	});
 }
 
-rpl::producer<TextWithEntities> BioValue(not_null<UserData*> user) {
-	return PlainBioValue(user)
-		| ToSingleLine()
-		| Ui::Text::ToWithEntities();
-}
-
 rpl::producer<TextWithEntities> UsernameValue(not_null<UserData*> user) {
 	return PlainUsernameValue(
 		user
@@ -100,32 +113,26 @@ rpl::producer<TextWithEntities> UsernameValue(not_null<UserData*> user) {
 	}) | Ui::Text::ToWithEntities();
 }
 
-rpl::producer<QString> PlainAboutValue(not_null<PeerData*> peer) {
-	if (const auto user = peer->asUser()) {
-		if (!user->isBot()) {
-			return rpl::single(QString());
-		}
-	}
-	return peer->session().changes().peerFlagsValue(
-		peer,
-		UpdateFlag::About
-	) | rpl::map([=] {
-		return peer->about();
-	});
-}
-
 rpl::producer<TextWithEntities> AboutValue(not_null<PeerData*> peer) {
-	auto flags = TextParseLinks
-		| TextParseMentions
-		| TextParseHashtags;
-	if (peer->isUser()) {
-		flags |= TextParseBotCommands;
+	auto flags = TextParseLinks | TextParseMentions;
+	const auto user = peer->asUser();
+	const auto isBot = user && user->isBot();
+	if (!user) {
+		flags |= TextParseHashtags;
+	} else if (isBot) {
+		flags |= TextParseHashtags | TextParseBotCommands;
 	}
+	const auto stripExternal = peer->isChat()
+		|| peer->isMegagroup()
+		|| (user && !isBot);
 	return PlainAboutValue(
 		peer
 	) | Ui::Text::ToWithEntities(
 	) | rpl::map([=](TextWithEntities &&text) {
 		TextUtilities::ParseEntities(text, flags);
+		if (stripExternal) {
+			StripExternalLinks(text);
+		}
 		return std::move(text);
 	});
 }
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.h b/Telegram/SourceFiles/info/profile/info_profile_values.h
index 2601d690d..da87867f6 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.h
@@ -37,7 +37,6 @@ rpl::producer<not_null<PeerData*>> MigratedOrMeValue(
 rpl::producer<TextWithEntities> NameValue(not_null<PeerData*> peer);
 rpl::producer<TextWithEntities> PhoneValue(not_null<UserData*> user);
 rpl::producer<TextWithEntities> PhoneOrHiddenValue(not_null<UserData*> user);
-rpl::producer<TextWithEntities> BioValue(not_null<UserData*> user);
 rpl::producer<TextWithEntities> UsernameValue(not_null<UserData*> user);
 rpl::producer<TextWithEntities> AboutValue(not_null<PeerData*> peer);
 rpl::producer<QString> LinkValue(not_null<PeerData*> peer);
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index da2fd6461..a35832df8 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -346,7 +346,7 @@ BioManager SetupBio(
 			std::move(done));
 	};
 
-	Info::Profile::BioValue(
+	Info::Profile::AboutValue(
 		self
 	) | rpl::start_with_next([=](const TextWithEntities &text) {
 		const auto wasChanged = (*current != bio->getLastText());

From 324affb8b9de71bdf1de3b42970cdbfd2a8e95fe Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Oct 2020 20:04:18 +0300
Subject: [PATCH 144/190] Fix go to original button in outgoing albums.

---
 Telegram/SourceFiles/history/view/history_view_message.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 5a7aa8f2c..9bd066e29 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -2251,7 +2251,7 @@ bool Message::displayFastShare() const {
 
 bool Message::displayGoToOriginal() const {
 	if (context() == Context::Pinned) {
-		return true;
+		return !hasOutLayout();
 	}
 	const auto item = message();
 	if (const auto forwarded = item->Get<HistoryMessageForwarded>()) {

From 3febace163639682eb9e9646e8f449e9baa2fa95 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Oct 2020 20:27:44 +0300
Subject: [PATCH 145/190] Fix scroll through pinned items.

---
 Telegram/SourceFiles/history/history_widget.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index f816bf062..041700d9a 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5193,7 +5193,9 @@ void HistoryWidget::updatePinnedViewer() {
 		: (!_migrated || _pinnedClickedId.channel)
 		? _pinnedClickedId.msg
 		: (_pinnedClickedId.msg - ServerMaxMsgId);
-	if (_pinnedClickedId && lessThanId <= lastClickedId) {
+	if (_pinnedClickedId
+		&& lessThanId <= lastClickedId
+		&& !_scrollToAnimation.animating()) {
 		_pinnedClickedId = FullMsgId();
 	}
 	if (_pinnedClickedId && !_minPinnedId) {
@@ -5201,7 +5203,7 @@ void HistoryWidget::updatePinnedViewer() {
 			_peer,
 			_migrated ? _migrated->peer.get() : nullptr);
 	}
-	if (_pinnedClickedId && _minPinnedId == _pinnedClickedId) {
+	if (_pinnedClickedId && _minPinnedId && _minPinnedId >= _pinnedClickedId) {
 		// After click on the last pinned message we should the top one.
 		_pinnedTracker->trackAround(ServerMaxMsgId - 1);
 	} else {
@@ -5314,7 +5316,13 @@ void HistoryWidget::checkPinnedBarState() {
 		const auto id = _pinnedTracker->currentMessageId();
 		if (const auto item = session().data().message(id.message)) {
 			Ui::showPeerHistory(item->history()->peer, item->id);
-			_pinnedClickedId = id.message;
+			if (const auto group = session().data().groups().find(item)) {
+				// Hack for the case when a non-first item of an album
+				// is pinned and we still want the 'show last after first'.
+				_pinnedClickedId = group->items.front()->fullId();
+			} else {
+				_pinnedClickedId = id.message;
+			}
 			_minPinnedId = std::nullopt;
 			updatePinnedViewer();
 		}

From a532ae81b3f39aa0155fb6f84e3b49791881843f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Oct 2020 20:36:09 +0300
Subject: [PATCH 146/190] Fix cancel of album parts uploading.

---
 .../SourceFiles/history/view/media/history_view_document.cpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 2dcb0f1b4..1c117c41d 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -77,7 +77,7 @@ Document::Document(
 		fillNamedFromData(named);
 	}
 
-	setDocumentLinks(_data, item);
+	setDocumentLinks(_data, realParent);
 
 	setStatusSize(Ui::FileStatusSizeReady);
 

From de459fa1fe75c723f993fea8c250a2357d20e672 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Oct 2020 10:57:41 +0300
Subject: [PATCH 147/190] Improve slot machine animations.

---
 .../view/media/history_view_slot_machine.cpp      | 11 +++++++++--
 .../history/view/media/history_view_sticker.cpp   |  5 +++--
 .../history/view/media/history_view_sticker.h     | 15 +++++++++++++--
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp b/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp
index e384e038a..0081d90e5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_slot_machine.cpp
@@ -29,8 +29,8 @@ constexpr auto kBarIndex = 2;
 constexpr auto kBerriesIndex = 3;
 constexpr auto kLemonIndex = 4;
 constexpr auto kStartIndex = 5;
-
 constexpr auto kWinValue = 64;
+constexpr auto kSkipFramesBeforeWinEnding = 90;
 
 const auto &kEmoji = ::Stickers::DicePacks::kSlotString;
 
@@ -162,6 +162,7 @@ void SlotMachine::draw(Painter &p, const QRect &r, bool selected) {
 	const auto pullReady = _pull && _pull->readyToDrawLottie();
 	const auto paintReady = [&] {
 		auto result = pullReady;
+		auto allPlayedEnough = true;
 		for (auto i = 1; i != 4; ++i) {
 			if (!_end[i] || !_end[i]->readyToDrawLottie()) {
 				switchedToEnd[i] = false;
@@ -170,8 +171,14 @@ void SlotMachine::draw(Painter &p, const QRect &r, bool selected) {
 				&& (!_start[i] || !_start[i]->readyToDrawLottie())) {
 				result = false;
 			}
+			const auto playedTillFrame = !switchedToEnd[i]
+				? 0
+				: _end[i]->frameIndex().value_or(0);
+			if (playedTillFrame < kSkipFramesBeforeWinEnding) {
+				allPlayedEnough = false;
+			}
 		}
-		if (!_end[0] || !_end[0]->readyToDrawLottie()) {
+		if (!_end[0] || !_end[0]->readyToDrawLottie() || !allPlayedEnough) {
 			switchedToEnd[0] = false;
 		}
 		if (ranges::contains(switchedToEnd, false)
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
index 6cc2e8cc2..68df01812 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
@@ -196,11 +196,12 @@ void Sticker::paintLottie(Painter &p, const QRect &r, bool selected) {
 		: (isEmojiSticker()
 			|| !Core::App().settings().loopAnimatedStickers());
 	const auto count = _lottie->information().framesCount;
-	_atTheEnd = (frame.index + 1 == count);
+	_frameIndex = frame.index;
+	_framesCount = count;
 	_nextLastDiceFrame = !paused
 		&& (_diceIndex > 0)
 		&& (frame.index + 2 == count);
-	const auto lastDiceFrame = (_diceIndex > 0) && _atTheEnd;
+	const auto lastDiceFrame = (_diceIndex > 0) && atTheEnd();
 	const auto switchToNext = !playOnce
 		|| (!lastDiceFrame && (frame.index != 0 || !_lottieOncePlayed));
 	if (!paused
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.h b/Telegram/SourceFiles/history/view/media/history_view_sticker.h
index 88edbfb7c..d20520b0f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.h
@@ -61,7 +61,17 @@ public:
 
 	void setDiceIndex(const QString &emoji, int index);
 	[[nodiscard]] bool atTheEnd() const {
-		return _atTheEnd;
+		return 	(_frameIndex >= 0) && (_frameIndex + 1 == _framesCount);
+	}
+	[[nodiscard]] std::optional<int> frameIndex() const {
+		return (_frameIndex >= 0)
+			? std::make_optional(_frameIndex)
+			: std::nullopt;
+	}
+	[[nodiscard]] std::optional<int> framesCount() const {
+		return (_framesCount > 0)
+			? std::make_optional(_framesCount)
+			: std::nullopt;
 	}
 	[[nodiscard]] bool readyToDrawLottie();
 
@@ -94,8 +104,9 @@ private:
 	QImage _lastDiceFrame;
 	QString _diceEmoji;
 	int _diceIndex = -1;
+	mutable int _frameIndex = -1;
+	mutable int _framesCount = -1;
 	mutable bool _lottieOncePlayed = false;
-	mutable bool _atTheEnd = false;
 	mutable bool _nextLastDiceFrame = false;
 
 	rpl::lifetime _lifetime;

From 9a2fcdde298461dae1aad829c5ff9c247b850b0b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 30 Oct 2020 15:13:48 +0300
Subject: [PATCH 148/190] Fixed fast share button's display in section of
 pinned messages.

---
 .../history/view/history_view_message.cpp       | 17 +++++++++++------
 .../history/view/history_view_message.h         |  2 ++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 9bd066e29..6763776dc 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -2075,7 +2075,7 @@ HistoryMessageReply *Message::displayedReply() const {
 }
 
 bool Message::displayPinIcon() const {
-	return data()->isPinned() && context() != Context::Pinned;
+	return data()->isPinned() && !isPinnedContext();
 }
 
 bool Message::hasFromName() const {
@@ -2250,7 +2250,7 @@ bool Message::displayFastShare() const {
 }
 
 bool Message::displayGoToOriginal() const {
-	if (context() == Context::Pinned) {
+	if (isPinnedContext()) {
 		return !hasOutLayout();
 	}
 	const auto item = message();
@@ -2305,16 +2305,17 @@ void Message::drawRightAction(
 				views->repliesSmall.text,
 				views->repliesSmall.textWidth);
 		}
-	} else if (displayFastShare()) {
-		st::historyFastShareIcon.paintInCenter(p, { left, top, size->width(), size->height() });
 	} else {
-		st::historyGoToOriginalIcon.paintInCenter(p, { left, top, size->width(), size->height() });
+		const auto &icon = (displayFastShare() && !isPinnedContext())
+			? st::historyFastShareIcon
+			: st::historyGoToOriginalIcon;
+		icon.paintInCenter(p, { left, top, size->width(), size->height() });
 	}
 }
 
 ClickHandlerPtr Message::rightActionLink() const {
 	if (!_rightActionLink) {
-		if (context() == Context::Pinned) {
+		if (isPinnedContext()) {
 			_rightActionLink = goToMessageClickHandler(data());
 			return _rightActionLink;
 		} else if (displayRightActionComments()) {
@@ -2390,6 +2391,10 @@ ClickHandlerPtr Message::fastReplyLink() const {
 	return _fastReplyLink;
 }
 
+bool Message::isPinnedContext() const {
+	return context() == Context::Pinned;
+}
+
 void Message::updateMediaInBubbleState() {
 	const auto item = message();
 	const auto media = this->media();
diff --git a/Telegram/SourceFiles/history/view/history_view_message.h b/Telegram/SourceFiles/history/view/history_view_message.h
index e8a3fb229..d07f8a076 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.h
+++ b/Telegram/SourceFiles/history/view/history_view_message.h
@@ -176,6 +176,8 @@ private:
 	QSize performCountCurrentSize(int newWidth) override;
 	bool hasVisibleText() const override;
 
+	[[nodiscard]] bool isPinnedContext() const;
+
 	[[nodiscard]] bool displayFastShare() const;
 	[[nodiscard]] bool displayGoToOriginal() const;
 	[[nodiscard]] ClickHandlerPtr fastReplyLink() const;

From b7319c00b9c74a19926b34a5371249fc3225dd80 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Oct 2020 16:27:53 +0300
Subject: [PATCH 149/190] Fix go to original button in Pinned section.

---
 Telegram/SourceFiles/history/view/history_view_message.cpp | 3 ++-
 Telegram/SourceFiles/mainwidget.cpp                        | 2 +-
 Telegram/lib_ui                                            | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 6763776dc..67f888493 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -2203,7 +2203,8 @@ bool Message::displayFastReply() const {
 }
 
 bool Message::displayRightActionComments() const {
-	return data()->repliesAreComments()
+	return !isPinnedContext()
+		&& data()->repliesAreComments()
 		&& media()
 		&& media()->isDisplayed()
 		&& !hasBubble();
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 847b82de3..63a1f13e4 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1423,7 +1423,7 @@ void MainWidget::ui_showPeerHistory(
 		if (const auto activeChat = _controller->activeChatCurrent()) {
 			if (const auto peer = activeChat.peer()) {
 				if (way == Way::Forward && peer->id == peerId) {
-					way = Way::ClearStack;
+					way = _mainSection ? Way::Backward : Way::ClearStack;
 				}
 			}
 		}
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 109375453..54a8c62bf 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 109375453e1465daff0970a920ba65e9fe8c78f0
+Subproject commit 54a8c62bf5dea5e381526a4b25aa5482e140b26c

From 0687cea1ed9ad7d468b3fd684aa6342b0774b378 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Oct 2020 17:12:04 +0300
Subject: [PATCH 150/190] Fix unpinning all messages.

---
 Telegram/SourceFiles/history/history.cpp         | 13 +++++++++++++
 Telegram/SourceFiles/history/history.h           |  2 ++
 Telegram/SourceFiles/window/window_peer_menu.cpp | 10 +++-------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index e2828b48f..8e999053b 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -441,6 +441,19 @@ void History::destroyMessage(not_null<HistoryItem*> item) {
 	}
 }
 
+void History::unpinAllMessages() {
+	session().storage().remove(
+		Storage::SharedMediaRemoveAll(
+			peer->id,
+			Storage::SharedMediaType::Pinned));
+	peer->setHasPinnedMessages(false);
+	for (const auto &message : _messages) {
+		if (message->isPinned()) {
+			message->setIsPinned(false);
+		}
+	}
+}
+
 not_null<HistoryItem*> History::addNewItem(
 		not_null<HistoryItem*> item,
 		bool unread) {
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index 30b09844b..ebb5e0181 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -113,6 +113,8 @@ public:
 	}
 	void destroyMessage(not_null<HistoryItem*> item);
 
+	void unpinAllMessages();
+
 	HistoryItem *addNewMessage(
 		const MTPMessage &msg,
 		MTPDmessage_ClientFlags clientFlags,
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 35da3941f..d105b7428 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1182,20 +1182,16 @@ void UnpinAllMessages(
 	Ui::show(Box<ConfirmBox>(tr::lng_pinned_unpin_all_sure(tr::now), tr::lng_pinned_unpin(tr::now), crl::guard(navigation, [=] {
 		Ui::hideLayer();
 		const auto api = &history->session().api();
-		const auto peer = history->peer;
 		const auto sendRequest = [=](auto self) -> void {
 			api->request(MTPmessages_UnpinAllMessages(
-				peer->input
+				history->peer->input
 			)).done([=](const MTPmessages_AffectedHistory &result) {
+				const auto peer = history->peer;
 				const auto offset = api->applyAffectedHistory(peer, result);
 				if (offset > 0) {
 					self(self);
 				} else {
-					peer->session().storage().remove(
-						Storage::SharedMediaRemoveAll(
-							peer->id,
-							Storage::SharedMediaType::Pinned));
-					peer->setHasPinnedMessages(false);
+					history->unpinAllMessages();
 				}
 			}).send();
 		};

From 99111cc1ccd4158bae0fab0a0207fbdd44bb253f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Oct 2020 18:21:36 +0300
Subject: [PATCH 151/190] Fix links in photo captions.

---
 Telegram/lib_ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 54a8c62bf..9c9a4bc4d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 54a8c62bf5dea5e381526a4b25aa5482e140b26c
+Subproject commit 9c9a4bc4d85d7d771e6ff1084fe2ffe2cc883941

From e4e1f7f5d6e76d0003855f8e93d817c2a1e24b86 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Oct 2020 18:31:07 +0300
Subject: [PATCH 152/190] Try creating base dir in FileWriteDescriptor.

---
 .../storage/details/storage_file_utilities.cpp           | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/storage/details/storage_file_utilities.cpp b/Telegram/SourceFiles/storage/details/storage_file_utilities.cpp
index b27f0e182..55dacabdd 100644
--- a/Telegram/SourceFiles/storage/details/storage_file_utilities.cpp
+++ b/Telegram/SourceFiles/storage/details/storage_file_utilities.cpp
@@ -197,7 +197,14 @@ bool FileWriteDescriptor::open(File &file, char postfix) {
 
 bool FileWriteDescriptor::writeHeader(QFileDevice &file) {
 	if (!file.open(QIODevice::WriteOnly)) {
-		return false;
+		const auto dir = QDir(_basePath);
+		if (dir.exists()) {
+			return false;
+		} else if (!QDir().mkpath(dir.absolutePath())) {
+			return false;
+		} else if (!file.open(QIODevice::WriteOnly)) {
+			return false;
+		}
 	}
 	file.write(TdfMagic, TdfMagicLen);
 	const auto version = qint32(AppVersion);

From cc9fa178e611bf2f4ef8834138350bc752d7fe18 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Oct 2020 18:34:29 +0300
Subject: [PATCH 153/190] Version 2.4.5.

- Pin several messages in any chat, including one-on-one chats.
- Jump between pinned messages or open them all on a separate page.
- Send several music tracks as a playlist.
- Send several files as an album in one chat bubble.
- Send a :slot_machine: emoji to any chat to see if you hit the jackpot.
- Hide Telegram taskbar icon on Linux in Settings > Advanced.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 8 ++++++++
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 08ce1f0c2..2b4684703 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="2.4.4.0" />
+    Version="2.4.5.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram FZ-LLC</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index febd156ef..d3e3016ee 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,4,0
- PRODUCTVERSION 2,4,4,0
+ FILEVERSION 2,4,5,0
+ PRODUCTVERSION 2,4,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "2.4.4.0"
+            VALUE "FileVersion", "2.4.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.4.0"
+            VALUE "ProductVersion", "2.4.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index d7427a781..14d7d441c 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,4,0
- PRODUCTVERSION 2,4,4,0
+ FILEVERSION 2,4,5,0
+ PRODUCTVERSION 2,4,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "2.4.4.0"
+            VALUE "FileVersion", "2.4.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.4.0"
+            VALUE "ProductVersion", "2.4.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 15003e6d0..3acc61b90 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 2004004;
-constexpr auto AppVersionStr = "2.4.4";
+constexpr auto AppVersion = 2004005;
+constexpr auto AppVersionStr = "2.4.5";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index d76bc6152..9e25ad196 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2004004
+AppVersion         2004005
 AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.4
-AppVersionStr      2.4.4
+AppVersionStrSmall 2.4.5
+AppVersionStr      2.4.5
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 2.4.4
+AppVersionOriginal 2.4.5
diff --git a/changelog.txt b/changelog.txt
index 47c2c7748..bfd779434 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,11 @@
+2.4.5 (30.10.20)
+
+- Pin several messages in any chat, including one-on-one chats.
+- Jump between pinned messages or open them all on a separate page via the top bar.
+- Send several music tracks as a playlist. 
+- Send several files as an album in one chat bubble.
+- Send a :slot_machine: emoji to any chat to see if you hit the jackpot.
+
 2.4.4 (23.10.20)
 
 - Fix application quit on call end with main window hidden in tray.

From 303684fef5d317b23eaa04ae73d5561eabd824e2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Oct 2020 21:30:55 +0300
Subject: [PATCH 154/190] Version 2.4.5: Fix build on Xcode 12 and Linux.

---
 README.md                                        |  2 +-
 Telegram/SourceFiles/history/history_widget.cpp  |  1 -
 Telegram/SourceFiles/mtproto/session_private.cpp |  2 +-
 Telegram/ThirdParty/rlottie                      |  2 +-
 Telegram/build/deploy.sh                         |  8 +-------
 Telegram/build/release.py                        | 14 --------------
 changelog.txt                                    |  1 +
 docs/building-cmake.md                           |  2 ++
 docs/building-xcode.md                           |  3 ++-
 9 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index dd331b73d..379bf9ffa 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ Version **1.8.15** was the last that supports older systems
 ## Build instructions
 
 * [Visual Studio 2019][msvc]
-* [Xcode 11][xcode]
+* [Xcode 12][xcode]
 * [CMake on GNU/Linux][cmake]
 
 [//]: # (LINKS)
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 041700d9a..db142d165 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -3409,7 +3409,6 @@ void HistoryWidget::mouseReleaseEvent(QMouseEvent *e) {
 	if (_replyForwardPressed) {
 		_replyForwardPressed = false;
 		update(0, _field->y() - st::historySendPadding - st::historyReplyHeight, width(), st::historyReplyHeight);
-		setupPinnedTracker(); AssertIsDebug();
 	}
 	if (_recording) {
 		stopRecording(_peer && _inField);
diff --git a/Telegram/SourceFiles/mtproto/session_private.cpp b/Telegram/SourceFiles/mtproto/session_private.cpp
index 75e6a2c13..b796701f1 100644
--- a/Telegram/SourceFiles/mtproto/session_private.cpp
+++ b/Telegram/SourceFiles/mtproto/session_private.cpp
@@ -115,7 +115,7 @@ void WrapInvokeAfter(
 	auto cb = reinterpret_cast<const char*>(b);
 	volatile auto different = false;
 	for (const auto ce = ca + size; ca != ce; ++ca, ++cb) {
-		different |= (*ca != *cb);
+		different = different | (*ca != *cb);
 	}
 	return different;
 }
diff --git a/Telegram/ThirdParty/rlottie b/Telegram/ThirdParty/rlottie
index 3426bf778..cbd43984e 160000
--- a/Telegram/ThirdParty/rlottie
+++ b/Telegram/ThirdParty/rlottie
@@ -1 +1 @@
-Subproject commit 3426bf778d306d41b1d1052fa06fa07ba24b2608
+Subproject commit cbd43984ebdf783e94c8303c41385bf82aa36d5b
diff --git a/Telegram/build/deploy.sh b/Telegram/build/deploy.sh
index e3e9fdf5b..ea4bde9bb 100755
--- a/Telegram/build/deploy.sh
+++ b/Telegram/build/deploy.sh
@@ -70,13 +70,7 @@ else
   DeployMac="1"
   DeployWin="1"
   DeployLinux="1"
-  if [ "$AlphaVersion" == "0" ]; then
-    DeployOsx="1"
-    DeployLinux32="1"
-    echo "Deploying five versions of $AppVersionStrFull: for Windows, OS X 10.10 and 10.11, macOS, Linux 64 bit and Linux 32 bit.."
-  else
-    echo "Deploying three versions of $AppVersionStrFull: for Windows, macOS and Linux 64 bit.."
-  fi
+  echo "Deploying three versions of $AppVersionStrFull: for Windows, macOS and Linux 64 bit.."
 fi
 if [ "$BuildTarget" == "mac" ]; then
   BackupPath="$HOME/Projects/backup/tdesktop"
diff --git a/Telegram/build/release.py b/Telegram/build/release.py
index dcccafccb..5253a25ab 100644
--- a/Telegram/build/release.py
+++ b/Telegram/build/release.py
@@ -184,13 +184,6 @@ files.append({
   'mime': 'application/octet-stream',
   'label': 'macOS 10.12+: Installer',
 })
-files.append({
-  'local': 'tsetup-osx.' + version_full + '.dmg',
-  'remote': 'tsetup-osx.' + version_full + '.dmg',
-  'backup_folder': 'tosx',
-  'mime': 'application/octet-stream',
-  'label': 'OS X 10.10 and 10.11: Installer',
-})
 files.append({
   'local': 'tsetup.' + version_full + '.tar.xz',
   'remote': 'tsetup.' + version_full + '.tar.xz',
@@ -198,13 +191,6 @@ files.append({
   'mime': 'application/octet-stream',
   'label': 'Linux 64 bit: Binary',
 })
-files.append({
-  'local': 'tsetup32.' + version_full + '.tar.xz',
-  'remote': 'tsetup32.' + version_full + '.tar.xz',
-  'backup_folder': 'tlinux32',
-  'mime': 'application/octet-stream',
-  'label': 'Linux 32 bit: Binary',
-})
 files.append({
   'local': 'sources',
   'remote': 'tdesktop-' + version + '-full.tar.gz',
diff --git a/changelog.txt b/changelog.txt
index bfd779434..c23f21627 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -5,6 +5,7 @@
 - Send several music tracks as a playlist. 
 - Send several files as an album in one chat bubble.
 - Send a :slot_machine: emoji to any chat to see if you hit the jackpot.
+- Hide Telegram taskbar icon on Linux in Settings > Advanced.
 
 2.4.4 (23.10.20)
 
diff --git a/docs/building-cmake.md b/docs/building-cmake.md
index 27022d9a9..c8337db9a 100644
--- a/docs/building-cmake.md
+++ b/docs/building-cmake.md
@@ -278,6 +278,8 @@ Go to ***BuildPath*** and run
         -openssl-linked \
         -I "$OPENSSL_DIR/include" \
         OPENSSL_LIBS="$OPENSSL_DIR/lib/libssl.a $OPENSSL_DIR/lib/libcrypto.a -ldl -lpthread" \
+        -I "/usr/local/include" \
+        LIBJPEG_LIBS="/usr/local/lib/libjpeg.a" \
         -nomake examples \
         -nomake tests
 
diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index dae91359e..f3a599b62 100644
--- a/docs/building-xcode.md
+++ b/docs/building-xcode.md
@@ -1,4 +1,4 @@
-## Build instructions for Xcode 11
+## Build instructions for Xcode 12
 
 ### Prepare folder
 
@@ -80,6 +80,7 @@ Go to ***BuildPath*** and run
     cmake -B build . \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr/local/macos \
+        -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.12 \
         -DWITH_JPEG8=ON \
         -DPNG_SUPPORTED=OFF
     cmake --build build $MAKE_THREADS_CNT

From 8afc245422b68b9c24e04b336efda7be872ae31f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 31 Oct 2020 15:14:16 +0300
Subject: [PATCH 155/190] Try to workaround MSVC compiler bug.

---
 .../SourceFiles/media/player/media_player_panel.cpp    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/media/player/media_player_panel.cpp b/Telegram/SourceFiles/media/player/media_player_panel.cpp
index fcc7fe218..f271e32cb 100644
--- a/Telegram/SourceFiles/media/player/media_player_panel.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_panel.cpp
@@ -93,13 +93,15 @@ bool Panel::preventAutoHide() const {
 }
 
 void Panel::updateControlsGeometry() {
-	auto scrollTop = contentTop();
-	auto width = contentWidth();
-	auto scrollHeight = qMax(height() - scrollTop - contentBottom() - scrollMarginBottom(), 0);
+	const auto scrollTop = contentTop();
+	const auto width = contentWidth();
+	const auto scrollHeight = qMax(
+		height() - scrollTop - contentBottom() - scrollMarginBottom(),
+		0);
 	if (scrollHeight > 0) {
 		_scroll->setGeometryToRight(contentRight(), scrollTop, width, scrollHeight);
 	}
-	if (auto widget = static_cast<TWidget*>(_scroll->widget())) {
+	if (const auto widget = static_cast<TWidget*>(_scroll->widget())) {
 		widget->resizeToWidth(width);
 	}
 }

From 6ab31219edf4a65610a9bf2ea46420c0fac453ec Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 1 Nov 2020 18:24:21 +0300
Subject: [PATCH 156/190] Workaround crash in OpenAL library.

Fixes #8887.

See https://github.com/kcat/openal-soft/issues/486
---
 .../SourceFiles/media/audio/media_audio.cpp   | 71 +++++++++++++++++--
 .../SourceFiles/media/audio/media_audio.h     | 50 +++++++++----
 2 files changed, 102 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp
index 02dcffd79..755a25c84 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio.cpp
@@ -34,6 +34,7 @@ namespace {
 constexpr auto kSuppressRatioAll = 0.2;
 constexpr auto kSuppressRatioSong = 0.05;
 constexpr auto kWaveformCounterBufferSize = 256 * 1024;
+constexpr auto kEffectDestructionDelay = crl::time(1000);
 
 QMutex AudioMutex;
 ALCdevice *AudioDevice = nullptr;
@@ -179,7 +180,7 @@ void ClosePlaybackDevice(not_null<Instance*> instance) {
 	LOG(("Audio Info: Closing audio playback device."));
 
 	if (Player::mixer()) {
-		Player::mixer()->detachTracks();
+		Player::mixer()->prepareToCloseDevice();
 	}
 	instance->detachTracks();
 
@@ -383,9 +384,11 @@ void Mixer::Track::resetSpeedEffect() {
 		if (isStreamCreated()) {
 			removeSourceSpeedEffect();
 		}
-		OpenAL::alDeleteEffects(1, &speedEffect->effect);
-		OpenAL::alDeleteAuxiliaryEffectSlots(1, &speedEffect->effectSlot);
-		OpenAL::alDeleteFilters(1, &speedEffect->filter);
+		if (Player::mixer()) {
+			// Don't destroy effect slot immediately.
+			// See https://github.com/kcat/openal-soft/issues/486
+			Player::mixer()->scheduleEffectDestruction(*speedEffect);
+		}
 	}
 	speedEffect->effect = speedEffect->effectSlot = speedEffect->filter = 0;
 }
@@ -560,6 +563,7 @@ Mixer::Track::~Track() = default;
 
 Mixer::Mixer(not_null<Audio::Instance*> instance)
 : _instance(instance)
+, _effectsDestructionTimer([=] { destroyStaleEffectsSafe(); })
 , _volumeVideo(kVolumeRound)
 , _volumeSong(kVolumeRound)
 , _fader(new Fader(&_faderThread))
@@ -622,6 +626,60 @@ void Mixer::onUpdated(const AudioMsgId &audio) {
 	Media::Player::Updated().notify(audio);
 }
 
+// Thread: Any. Must be locked: AudioMutex.
+void Mixer::scheduleEffectDestruction(const SpeedEffect &effect) {
+	_effectsForDestruction.emplace_back(
+		crl::now() + kEffectDestructionDelay,
+		effect);
+	scheduleEffectsDestruction();
+}
+
+// Thread: Any. Must be locked: AudioMutex.
+void Mixer::scheduleEffectsDestruction() {
+	if (_effectsForDestruction.empty()) {
+		return;
+	}
+	InvokeQueued(this, [=] {
+		if (!_effectsDestructionTimer.isActive()) {
+			_effectsDestructionTimer.callOnce(kEffectDestructionDelay + 1);
+		}
+	});
+}
+
+// Thread: Main. Locks: AudioMutex.
+void Mixer::destroyStaleEffectsSafe() {
+	QMutexLocker lock(&AudioMutex);
+	destroyStaleEffects();
+}
+
+// Thread: Main. Must be locked: AudioMutex.
+void Mixer::destroyStaleEffects() {
+	const auto now = crl::now();
+	const auto checkAndDestroy = [&](
+			const std::pair<crl::time, SpeedEffect> &pair) {
+		const auto &[when, effect] = pair;
+		if (when && when > now) {
+			return false;
+		}
+		OpenAL::alDeleteEffects(1, &effect.effect);
+		OpenAL::alDeleteAuxiliaryEffectSlots(1, &effect.effectSlot);
+		OpenAL::alDeleteFilters(1, &effect.filter);
+		return true;
+	};
+	_effectsForDestruction.erase(
+		ranges::remove_if(_effectsForDestruction, checkAndDestroy),
+		end(_effectsForDestruction));
+	scheduleEffectsDestruction();
+}
+
+// Thread: Main. Must be locked: AudioMutex.
+void Mixer::destroyEffectsOnClose() {
+	for (auto &[when, effect] : _effectsForDestruction) {
+		when = 0;
+	}
+	destroyStaleEffects();
+}
+
 void Mixer::onError(const AudioMsgId &audio) {
 	emit stoppedOnError(audio);
 
@@ -823,6 +881,7 @@ void Mixer::forceToBufferExternal(const AudioMsgId &audioId) {
 	_loader->forceToBufferExternal(audioId);
 }
 
+// Thread: Main. Locks: AudioMutex.
 void Mixer::setSpeedFromExternal(const AudioMsgId &audioId, float64 speed) {
 	QMutexLocker lock(&AudioMutex);
 	const auto track = trackForType(audioId.type());
@@ -1160,12 +1219,14 @@ void Mixer::setStoppedState(Track *current, State state) {
 }
 
 // Thread: Main. Must be locked: AudioMutex.
-void Mixer::detachTracks() {
+void Mixer::prepareToCloseDevice() {
 	for (auto i = 0; i != kTogetherLimit; ++i) {
 		trackForType(AudioMsgId::Type::Voice, i)->detach();
 		trackForType(AudioMsgId::Type::Song, i)->detach();
 	}
 	_videoTrack.detach();
+
+	destroyEffectsOnClose();
 }
 
 // Thread: Main. Must be locked: AudioMutex.
diff --git a/Telegram/SourceFiles/media/audio/media_audio.h b/Telegram/SourceFiles/media/audio/media_audio.h
index 890570cdb..090002ab3 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.h
+++ b/Telegram/SourceFiles/media/audio/media_audio.h
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/attach/attach_prepare.h"
 #include "core/file_location.h"
 #include "base/bytes.h"
+#include "base/timer.h"
 
 #include <QtCore/QTimer>
 
@@ -145,7 +146,10 @@ public:
 	// External player audio stream interface.
 	void feedFromExternal(ExternalSoundPart &&part);
 	void forceToBufferExternal(const AudioMsgId &audioId);
+
+	// Thread: Main. Locks: AudioMutex.
 	void setSpeedFromExternal(const AudioMsgId &audioId, float64 speed);
+
 	Streaming::TimePoint getExternalSyncTimePoint(
 		const AudioMsgId &audio) const;
 	crl::time getExternalCorrectedTime(
@@ -158,7 +162,7 @@ public:
 	TrackState currentState(AudioMsgId::Type type);
 
 	// Thread: Main. Must be locked: AudioMutex.
-	void detachTracks();
+	void prepareToCloseDevice();
 
 	// Thread: Main. Must be locked: AudioMutex.
 	void reattachIfNeeded();
@@ -193,11 +197,13 @@ signals:
 	void suppressAll(qint64 duration);
 
 private:
-	bool fadedStop(AudioMsgId::Type type, bool *fadedStart = 0);
-	void resetFadeStartPosition(AudioMsgId::Type type, int positionInBuffered = -1);
-	bool checkCurrentALError(AudioMsgId::Type type);
-
-	void externalSoundProgress(const AudioMsgId &audio);
+	struct SpeedEffect {
+		uint32 effect = 0;
+		uint32 effectSlot = 0;
+		uint32 filter = 0;
+		int coarseTune = 0;
+		float64 speed = 1.;
+	};
 
 	class Track {
 	public:
@@ -206,8 +212,10 @@ private:
 		// Thread: Any. Must be locked: AudioMutex.
 		void reattach(AudioMsgId::Type type);
 
+		// Thread: Main. Must be locked: AudioMutex.
 		void detach();
 		void clear();
+
 		void started();
 
 		bool isStreamCreated() const;
@@ -215,6 +223,7 @@ private:
 
 		int getNotQueuedBufferIndex();
 
+		// Thread: Main. Must be locked: AudioMutex.
 		void setExternalData(std::unique_ptr<ExternalSoundData> data);
 		void changeSpeedEffect(float64 speed);
 
@@ -242,13 +251,6 @@ private:
 		Stream stream;
 		std::unique_ptr<ExternalSoundData> externalData;
 
-		struct SpeedEffect {
-			uint32 effect = 0;
-			uint32 effectSlot = 0;
-			uint32 filter = 0;
-			int coarseTune = 0;
-			float64 speed = 1.;
-		};
 		std::unique_ptr<SpeedEffect> speedEffect;
 		crl::time lastUpdateWhen = 0;
 		crl::time lastUpdatePosition = 0;
@@ -263,6 +265,12 @@ private:
 
 	};
 
+	bool fadedStop(AudioMsgId::Type type, bool *fadedStart = 0);
+	void resetFadeStartPosition(AudioMsgId::Type type, int positionInBuffered = -1);
+	bool checkCurrentALError(AudioMsgId::Type type);
+
+	void externalSoundProgress(const AudioMsgId &audio);
+
 	// Thread: Any. Must be locked: AudioMutex.
 	void setStoppedState(Track *current, State state = State::Stopped);
 
@@ -271,7 +279,18 @@ private:
 	int *currentIndex(AudioMsgId::Type type);
 	const int *currentIndex(AudioMsgId::Type type) const;
 
-	not_null<Audio::Instance*> _instance;
+	// Thread: Any. Must be locked: AudioMutex.
+	void scheduleEffectDestruction(const SpeedEffect &effect);
+	void scheduleEffectsDestruction();
+
+	// Thread: Main. Must be locked: AudioMutex.
+	void destroyStaleEffects();
+	void destroyEffectsOnClose();
+
+	// Thread: Main. Locks: AudioMutex.
+	void destroyStaleEffectsSafe();
+
+	const not_null<Audio::Instance*> _instance;
 
 	int _audioCurrent = 0;
 	Track _audioTracks[kTogetherLimit];
@@ -281,6 +300,9 @@ private:
 
 	Track _videoTrack;
 
+	std::vector<std::pair<crl::time, SpeedEffect>> _effectsForDestruction;
+	base::Timer _effectsDestructionTimer;
+
 	QAtomicInt _volumeVideo;
 	QAtomicInt _volumeSong;
 

From 101ba05ce375ed4370582c901fd336381d6c4e56 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 30 Oct 2020 21:51:54 +0300
Subject: [PATCH 157/190] Updated doc for Windows.

---
 docs/building-msvc.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index f7d57aa4f..87a1d30da 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -105,7 +105,8 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     -A Win32 ^
     -DWITH_JPEG8=ON ^
     -DPNG_SUPPORTED=OFF
-    cmake --build .
+    cmake --build . --config Debug
+    cmake --build . --config Release
     cd ..
 
     git clone https://github.com/telegramdesktop/openal-soft.git

From ad54fc64594ac555e11104ac7625ab8e5f94de78 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 1 Nov 2020 03:58:42 +0400
Subject: [PATCH 158/190] Try to use portals for file dialog in snap, again

---
 snap/snapcraft.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index bb734601b..e4ecd9a24 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -18,8 +18,6 @@ apps:
     common-id: org.telegram.desktop
     desktop: usr/share/applications/telegram-desktop_telegram-desktop.desktop
     environment:
-      # Use GTK3 cursor theme, icon theme and open/save file dialogs.
-      QT_QPA_PLATFORMTHEME: gtk3
       GTK_USE_PORTAL: 1
     plugs:
       - alsa

From b7d7ba82f8a7d3b3c570224e1f363addb37346f4 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sun, 1 Nov 2020 00:43:08 +0000
Subject: [PATCH 159/190] Update User-Agent for DNS to Chrome 86.0.4240.111.

---
 .../SourceFiles/mtproto/details/mtproto_domain_resolver.cpp     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp b/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
index 91cbf1e01..cb9b824c8 100644
--- a/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
+++ b/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
@@ -65,7 +65,7 @@ QByteArray DnsUserAgent() {
 	static const auto kResult = QByteArray(
 		"Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
 		"AppleWebKit/537.36 (KHTML, like Gecko) "
-		"Chrome/86.0.4240.75 Safari/537.36");
+		"Chrome/86.0.4240.111 Safari/537.36");
 	return kResult;
 }
 

From 03c2fc2c482e4d193ba50a4998e4b072753bbd71 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 1 Nov 2020 05:03:50 +0400
Subject: [PATCH 160/190] Use ibus portal whenever it present

---
 .../platform/linux/specific_linux.cpp         | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 6d37f1f15..26c8e43b0 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -132,6 +132,14 @@ bool IsXDGDesktopPortalKDEPresent() {
 	return Result;
 }
 
+bool IsIBusPortalPresent() {
+	static const auto Result = QDBusInterface(
+		qsl("org.freedesktop.IBus.Portal"),
+		qsl("/org/freedesktop/IBus")).isValid();
+
+	return Result;
+}
+
 uint FileChooserPortalVersion() {
 	static const auto Result = [&]() -> uint {
 		auto message = QDBusMessage::createMethodCall(
@@ -1101,6 +1109,21 @@ void start() {
 			LOG(("XDG Desktop Portal is not present :("));
 		}
 	}
+
+#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+	// IBus has changed its socket path several times
+	// and each change should be synchronized with Qt.
+	// Moreover, the last time Qt changed the path,
+	// they didn't introduce a fallback to the old path
+	// and made the new Qt incompatible with IBus from older distributions.
+	// Since tdesktop is distributed in static binary form,
+	// it makes sense to use ibus portal whenever it present
+	// to ensure compatibility with the maximum range of distributions.
+	if (IsIBusPortalPresent()) {
+		LOG(("IBus portal is present! Using it."));
+		qputenv("IBUS_USE_PORTAL", "1");
+	}
+#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 }
 
 void finish() {

From 12a77cffd893ad04693f8f83dd5f61b151567e1e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 1 Nov 2020 15:05:45 +0400
Subject: [PATCH 161/190] Add flatpak and snap update URLs

---
 Telegram/SourceFiles/core/update_checker.cpp     | 12 ++++++++++--
 Telegram/SourceFiles/mtproto/session_private.cpp | 16 ++++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
index 69ba0f74b..af4ceec77 100644
--- a/Telegram/SourceFiles/core/update_checker.cpp
+++ b/Telegram/SourceFiles/core/update_checker.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "core/update_checker.h"
 
+#include "platform/platform_specific.h"
 #include "base/platform/base_platform_info.h"
 #include "base/platform/base_platform_file_utilities.h"
 #include "base/timer.h"
@@ -1575,9 +1576,16 @@ void UpdateApplication() {
 			return "https://www.microsoft.com/en-us/store/p/telegram-desktop/9nztwsqntd0s";
 #elif defined OS_MAC_STORE // OS_WIN_STORE
 			return "https://itunes.apple.com/ae/app/telegram-desktop/id946399090";
-#else // OS_WIN_STORE || OS_MAC_STORE
+#elif defined Q_OS_UNIX && !defined Q_OS_MAC // OS_WIN_STORE || OS_MAC_STORE
+			if (Platform::InFlatpak()) {
+				return "https://flathub.org/apps/details/org.telegram.desktop";
+			} else if (Platform::InSnap()) {
+				return "https://snapcraft.io/telegram-desktop";
+			}
 			return "https://desktop.telegram.org";
-#endif // OS_WIN_STORE || OS_MAC_STORE
+#else // OS_WIN_STORE || OS_MAC_STORE || (defined Q_OS_UNIX && !defined Q_OS_MAC)
+			return "https://desktop.telegram.org";
+#endif // OS_WIN_STORE || OS_MAC_STORE || (defined Q_OS_UNIX && !defined Q_OS_MAC)
 		}();
 		UrlClickHandler::Open(url);
 	} else {
diff --git a/Telegram/SourceFiles/mtproto/session_private.cpp b/Telegram/SourceFiles/mtproto/session_private.cpp
index b796701f1..c5598031c 100644
--- a/Telegram/SourceFiles/mtproto/session_private.cpp
+++ b/Telegram/SourceFiles/mtproto/session_private.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/mtproto_rpc_sender.h"
 #include "mtproto/mtproto_dc_options.h"
 #include "mtproto/connection_abstract.h"
+#include "platform/platform_specific.h"
 #include "base/openssl_help.h"
 #include "base/qthelp_url.h"
 #include "base/unixtime.h"
@@ -637,9 +638,20 @@ void SessionPrivate::tryToSend() {
 #elif defined OS_WIN_STORE // OS_MAC_STORE
 		const auto appVersion = QString::fromLatin1(AppVersionStr)
 			+ " win store";
-#else // OS_MAC_STORE || OS_WIN_STORE
+#elif defined Q_OS_UNIX && !defined Q_OS_MAC // OS_MAC_STORE || OS_WIN_STORE
+		const auto appVersion = [] {
+			if (Platform::InFlatpak()) {
+				return QString::fromLatin1(AppVersionStr)
+					+ " flatpak";
+			} else if (Platform::InSnap()) {
+				return QString::fromLatin1(AppVersionStr)
+					+ " snap";
+			}
+			return QString::fromLatin1(AppVersionStr);
+		}();
+#else // OS_MAC_STORE || OS_WIN_STORE || (defined Q_OS_UNIX && !defined Q_OS_MAC)
 		const auto appVersion = QString::fromLatin1(AppVersionStr);
-#endif // OS_MAC_STORE || OS_WIN_STORE
+#endif // OS_MAC_STORE || OS_WIN_STORE || (defined Q_OS_UNIX && !defined Q_OS_MAC)
 		const auto proxyType = _options->proxy.type;
 		const auto mtprotoProxy = (proxyType == ProxyData::Type::Mtproto);
 		const auto clientProxyFields = mtprotoProxy

From 60f91ebce471e4ac4128829129941f28ebe65a27 Mon Sep 17 00:00:00 2001
From: Crist Ye <iamCristYe@outlook.com>
Date: Mon, 2 Nov 2020 15:14:57 +0800
Subject: [PATCH 162/190] Using MS/Apple official names for stores (#8959)

---
 Telegram/SourceFiles/mtproto/session_private.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/session_private.cpp b/Telegram/SourceFiles/mtproto/session_private.cpp
index c5598031c..8bbcf7caa 100644
--- a/Telegram/SourceFiles/mtproto/session_private.cpp
+++ b/Telegram/SourceFiles/mtproto/session_private.cpp
@@ -634,18 +634,18 @@ void SessionPrivate::tryToSend() {
 			: _instance->systemVersion();
 #if defined OS_MAC_STORE
 		const auto appVersion = QString::fromLatin1(AppVersionStr)
-			+ " mac store";
+			+ " Mac App Store";
 #elif defined OS_WIN_STORE // OS_MAC_STORE
 		const auto appVersion = QString::fromLatin1(AppVersionStr)
-			+ " win store";
+			+ " Microsoft Store";
 #elif defined Q_OS_UNIX && !defined Q_OS_MAC // OS_MAC_STORE || OS_WIN_STORE
 		const auto appVersion = [] {
 			if (Platform::InFlatpak()) {
 				return QString::fromLatin1(AppVersionStr)
-					+ " flatpak";
+					+ " Flatpak";
 			} else if (Platform::InSnap()) {
 				return QString::fromLatin1(AppVersionStr)
-					+ " snap";
+					+ " Snap";
 			}
 			return QString::fromLatin1(AppVersionStr);
 		}();

From 3bd34fcff018d493172b0f92c9e16d21914c9fd8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 1 Nov 2020 03:29:02 +0400
Subject: [PATCH 163/190] Remove autodark cheat code since there are an UI
 setting for this

---
 Telegram/SourceFiles/settings/settings_codes.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_codes.cpp b/Telegram/SourceFiles/settings/settings_codes.cpp
index f78247c1a..9c9ae0031 100644
--- a/Telegram/SourceFiles/settings/settings_codes.cpp
+++ b/Telegram/SourceFiles/settings/settings_codes.cpp
@@ -136,14 +136,6 @@ auto GenerateCodes() {
 			window->showSettings(Settings::Type::Folders);
 		}
 	});
-	codes.emplace(qsl("autodark"), [](SessionController *window) {
-		auto text = Core::App().settings().systemDarkModeEnabled() ? qsl("Disable system dark mode?") : qsl("Enable system dark mode?");
-		Ui::show(Box<ConfirmBox>(text, [=] {
-			Core::App().settings().setSystemDarkModeEnabled(!Core::App().settings().systemDarkModeEnabled());
-			Core::App().saveSettingsDelayed();
-			Ui::hideLayer();
-		}));
-	});
 	codes.emplace(qsl("registertg"), [](SessionController *window) {
 		Platform::RegisterCustomScheme(true);
 		Ui::Toast::Show("Forced custom scheme register.");

From 0881e5b20d7cb4ae1aaf17ca02a42e4810080c54 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 1 Nov 2020 03:43:48 +0400
Subject: [PATCH 164/190] Use new AL_SOFT_direct_channels_remix extension

---
 Telegram/SourceFiles/media/audio/media_audio.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp
index 755a25c84..931a838ec 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio.cpp
@@ -321,6 +321,9 @@ void Mixer::Track::createStream(AudioMsgId::Type type) {
 	alSourcei(stream.source, AL_LOOPING, 0);
 	alSourcei(stream.source, AL_SOURCE_RELATIVE, 1);
 	alSourcei(stream.source, AL_ROLLOFF_FACTOR, 0);
+	if (alIsExtensionPresent("AL_SOFT_direct_channels_remix")) {
+		alSourcei(stream.source, alGetEnumValue("AL_DIRECT_CHANNELS_SOFT"), 2);
+	}
 	alGenBuffers(3, stream.buffers);
 	if (speedEffect) {
 		applySourceSpeedEffect();

From 204a08df1463771d154dffc0f4871fe0d8358f94 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 1 Nov 2020 14:55:19 +0400
Subject: [PATCH 165/190] Add a cheat code to install launcher on Linux

---
 Telegram/SourceFiles/platform/linux/specific_linux.cpp | 6 ++++--
 Telegram/SourceFiles/platform/linux/specific_linux.h   | 2 +-
 Telegram/SourceFiles/settings/settings_codes.cpp       | 7 +++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 26c8e43b0..49e83e643 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -1129,13 +1129,15 @@ void start() {
 void finish() {
 }
 
-void InstallLauncher() {
+void InstallLauncher(bool force) {
 	static const auto DisabledByEnv = qEnvironmentVariableIsSet(
 		"TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION");
 
 	// don't update desktop file for alpha version or if updater is disabled
-	if (cAlphaVersion() || Core::UpdaterDisabled() || DisabledByEnv)
+	if ((cAlphaVersion() || Core::UpdaterDisabled() || DisabledByEnv)
+		&& !force) {
 		return;
+	}
 
 	const auto applicationsPath = QStandardPaths::writableLocation(
 		QStandardPaths::ApplicationsLocation) + '/';
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.h b/Telegram/SourceFiles/platform/linux/specific_linux.h
index ff39fe802..e6b961df0 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.h
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.h
@@ -41,7 +41,7 @@ QString GetIconName();
 inline void IgnoreApplicationActivationRightNow() {
 }
 
-void InstallLauncher();
+void InstallLauncher(bool force = false);
 
 } // namespace Platform
 
diff --git a/Telegram/SourceFiles/settings/settings_codes.cpp b/Telegram/SourceFiles/settings/settings_codes.cpp
index 9c9ae0031..9f77b4578 100644
--- a/Telegram/SourceFiles/settings/settings_codes.cpp
+++ b/Telegram/SourceFiles/settings/settings_codes.cpp
@@ -157,6 +157,13 @@ auto GenerateCodes() {
 	});
 #endif // Q_OS_WIN || Q_OS_MAC
 
+#if defined Q_OS_UNIX && !defined Q_OS_MAC
+	codes.emplace(qsl("installauncher"), [](SessionController *window) {
+		Platform::InstallLauncher(true);
+		Ui::Toast::Show("Forced launcher installation.");
+	});
+#endif // Q_OS_UNIX && !Q_OS_MAC
+
 	auto audioFilters = qsl("Audio files (*.wav *.mp3);;") + FileDialog::AllFilesFilter();
 	auto audioKeys = {
 		qsl("msg_incoming"),

From 44c24f9fff46e45fa4304c92f8f3d008d3d3c9f6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 2 Nov 2020 03:26:06 +0400
Subject: [PATCH 166/190] Fix TDESKTOP_USE_PORTAL on gtk environments

---
 .../SourceFiles/platform/linux/file_utilities_linux.cpp  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index 0531a5b45..253bf528c 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -113,14 +113,15 @@ bool UseNative(Type type = Type::ReadFile) {
 	// or if QT_QPA_PLATFORMTHEME=(gtk2|gtk3)
 	// or if portals are used and operation is to open folder
 	// and portal doesn't support folder choosing
-	const auto neededForPortal = UseXDGDesktopPortal()
-		&& type == Type::ReadFolder
+	const auto neededForPortal = (type == Type::ReadFolder)
 		&& !CanOpenDirectoryWithPortal();
 
 	const auto neededNonForced = DesktopEnvironment::IsGtkBased()
-		|| neededForPortal;
+		|| (UseXDGDesktopPortal() && neededForPortal);
 
-	const auto excludeNonForced = InFlatpak() || InSnap();
+	const auto excludeNonForced = InFlatpak()
+		|| InSnap()
+		|| (UseXDGDesktopPortal() && !neededForPortal);
 
 	return IsGtkIntegrationForced()
 		|| (neededNonForced && !excludeNonForced);

From b8018f5a7f47165dd94fe8471f2e9e2a08ffda4d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 19 Oct 2020 05:23:30 +0400
Subject: [PATCH 167/190] Split system drag to a separate method in PiP

---
 .../SourceFiles/media/view/media_view_pip.cpp | 45 +++++++++++--------
 .../SourceFiles/media/view/media_view_pip.h   |  1 +
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
index a509d5cf7..6c2dadb3e 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
@@ -706,29 +706,35 @@ void PipPanel::mouseMoveEvent(QMouseEvent *e) {
 	if (!_dragState
 		&& (point - _pressPoint).manhattanLength() > distance
 		&& !_dragDisabled) {
-		if (Platform::IsWayland()) {
-			const auto stateEdges = RectPartToQtEdges(*_pressState);
-			if (stateEdges) {
-				if (!Platform::StartSystemResize(windowHandle(), stateEdges)) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) || defined DESKTOP_APP_QT_PATCHED
-					windowHandle()->startSystemResize(stateEdges);
-#endif // Qt >= 5.15 || DESKTOP_APP_QT_PATCHED
-				}
-			} else {
-				if (!Platform::StartSystemMove(windowHandle())) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) || defined DESKTOP_APP_QT_PATCHED
-					windowHandle()->startSystemMove();
-#endif // Qt >= 5.15 || DESKTOP_APP_QT_PATCHED
-				}
-			}
-			return;
-		}
 		_dragState = _pressState;
 		updateDecorations();
 		_dragStartGeometry = geometry().marginsRemoved(_padding);
 	}
 	if (_dragState) {
-		processDrag(point);
+		if (Platform::IsWayland()) {
+			startSystemDrag();
+		} else {
+			processDrag(point);
+		}
+	}
+}
+
+void PipPanel::startSystemDrag() {
+	Expects(_dragState.has_value());
+
+	const auto stateEdges = RectPartToQtEdges(*_dragState);
+	if (stateEdges) {
+		if (!Platform::StartSystemResize(windowHandle(), stateEdges)) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) || defined DESKTOP_APP_QT_PATCHED
+			windowHandle()->startSystemResize(stateEdges);
+#endif // Qt >= 5.15 || DESKTOP_APP_QT_PATCHED
+		}
+	} else {
+		if (!Platform::StartSystemMove(windowHandle())) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) || defined DESKTOP_APP_QT_PATCHED
+			windowHandle()->startSystemMove();
+#endif // Qt >= 5.15 || DESKTOP_APP_QT_PATCHED
+		}
 	}
 }
 
@@ -783,6 +789,9 @@ void PipPanel::finishDrag(QPoint point) {
 	const auto position = pos();
 	const auto clamped = [&] {
 		auto result = position;
+		if (Platform::IsWayland()) {
+			return result;
+		}
 		if (result.x() > screen.x() + screen.width() - inner.width()) {
 			result.setX(screen.x() + screen.width() - inner.width());
 		}
diff --git a/Telegram/SourceFiles/media/view/media_view_pip.h b/Telegram/SourceFiles/media/view/media_view_pip.h
index 747139a48..544d6f9ed 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.h
+++ b/Telegram/SourceFiles/media/view/media_view_pip.h
@@ -83,6 +83,7 @@ private:
 	void setPositionOnScreen(Position position, QRect available);
 
 	QScreen *myScreen() const;
+	void startSystemDrag();
 	void processDrag(QPoint point);
 	void finishDrag(QPoint point);
 	void updatePositionAnimated();

From 4432863612d17c4ad9288ecfab39c4f4f0678ae3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 Nov 2020 09:31:29 +0300
Subject: [PATCH 168/190] Fix draft display in dialogs list.

---
 Telegram/SourceFiles/dialogs/dialogs_layout.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
index 4683e9a36..1c7f238d5 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
@@ -368,8 +368,8 @@ void paintRow(
 
 		p.setFont(st::dialogsTextFont);
 		auto &color = active ? st::dialogsTextFgServiceActive : (selected ? st::dialogsTextFgServiceOver : st::dialogsTextFgService);
-		if (ShowSendActionInDialogs(history)
-			&& !history->sendActionPainter()->paint(p, nameleft, texttop, availableWidth, fullWidth, color, ms)) {
+		if (!ShowSendActionInDialogs(history)
+			|| !history->sendActionPainter()->paint(p, nameleft, texttop, availableWidth, fullWidth, color, ms)) {
 			if (history->cloudDraftTextCache.isEmpty()) {
 				auto draftWrapped = textcmdLink(1, tr::lng_dialogs_text_from_wrapped(tr::now, lt_from, tr::lng_from_draft(tr::now)));
 				auto draftText = supportMode
@@ -396,8 +396,8 @@ void paintRow(
 
 		auto &color = active ? st::dialogsTextFgServiceActive : (selected ? st::dialogsTextFgServiceOver : st::dialogsTextFgService);
 		p.setFont(st::dialogsTextFont);
-		if (ShowSendActionInDialogs(history)
-			&& !history->sendActionPainter()->paint(p, nameleft, texttop, availableWidth, fullWidth, color, ms)) {
+		if (!ShowSendActionInDialogs(history)
+			|| !history->sendActionPainter()->paint(p, nameleft, texttop, availableWidth, fullWidth, color, ms)) {
 			// Empty history
 		}
 	} else if (!item->isEmpty()) {

From 9592e7dfc8385fa49701c5cc299ac238a7d6ed61 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 Nov 2020 09:34:54 +0300
Subject: [PATCH 169/190] Highlight telegram/telegraph/telescope links.

---
 Telegram/SourceFiles/core/click_handler_types.cpp    | 12 ++++++------
 Telegram/SourceFiles/core/click_handler_types.h      |  2 ++
 .../SourceFiles/info/profile/info_profile_values.cpp |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp
index b0b71bfa5..793ea5ae9 100644
--- a/Telegram/SourceFiles/core/click_handler_types.cpp
+++ b/Telegram/SourceFiles/core/click_handler_types.cpp
@@ -25,14 +25,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtGui/QGuiApplication>
 
-namespace {
-
 bool UrlRequiresConfirmation(const QUrl &url) {
 	using namespace qthelp;
-	return !regex_match(qsl("(^|\\.)(telegram\\.org|telegra\\.ph|telesco\\.pe)$"), url.host(), RegExOption::CaseInsensitive);
-}
 
-} // namespace
+	return !regex_match(
+		"(^|\\.)(telegram\\.(org|me|dog)|t\\.me|telegra\\.ph|telesco\\.pe)$",
+		url.host(),
+		RegExOption::CaseInsensitive);
+}
 
 void HiddenUrlClickHandler::Open(QString url, QVariant context) {
 	url = Core::TryConvertUrlToLocal(url);
@@ -48,7 +48,7 @@ void HiddenUrlClickHandler::Open(QString url, QVariant context) {
 		open();
 	} else {
 		const auto parsedUrl = QUrl::fromUserInput(url);
-		if (UrlRequiresConfirmation(url)
+		if (UrlRequiresConfirmation(parsedUrl)
 			&& QGuiApplication::keyboardModifiers() != Qt::ControlModifier) {
 			Core::App().hideMediaView();
 			const auto displayed = parsedUrl.isValid()
diff --git a/Telegram/SourceFiles/core/click_handler_types.h b/Telegram/SourceFiles/core/click_handler_types.h
index 136c236d3..bed3a6bec 100644
--- a/Telegram/SourceFiles/core/click_handler_types.h
+++ b/Telegram/SourceFiles/core/click_handler_types.h
@@ -13,6 +13,8 @@ namespace Main {
 class Session;
 } // namespace Main
 
+[[nodiscard]] bool UrlRequiresConfirmation(const QUrl &url);
+
 class HiddenUrlClickHandler : public UrlClickHandler {
 public:
 	HiddenUrlClickHandler(QString url) : UrlClickHandler(url, false) {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
index 7c74ebf8d..289abaf04 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_values.h"
 
 #include "core/application.h"
-#include "core/local_url_handlers.h"
+#include "core/click_handler_types.h"
 #include "main/main_session.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/text/text_utilities.h"
@@ -50,7 +50,7 @@ auto PlainUsernameValue(not_null<PeerData*> peer) {
 
 void StripExternalLinks(TextWithEntities &text) {
 	const auto local = [](const QString &url) {
-		return Core::TryConvertUrlToLocal(url).startsWith(qstr("tg://"));
+		return !UrlRequiresConfirmation(QUrl::fromUserInput(url));
 	};
 	const auto notLocal = [&](const EntityInText &entity) {
 		if (entity.type() == EntityType::CustomUrl) {

From 6660206e612b35534dfa7d0085397a57400a6c5b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 Nov 2020 09:55:02 +0300
Subject: [PATCH 170/190] Fix poll results opening from pinned section.

Fixes #8942.
---
 .../SourceFiles/history/view/history_view_list_widget.cpp    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 71ceca6bb..66b362033 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -1268,8 +1268,9 @@ void ListWidget::elementStartStickerLoop(not_null<const Element*> view) {
 }
 
 void ListWidget::elementShowPollResults(
-	not_null<PollData*> poll,
-	FullMsgId context) {
+		not_null<PollData*> poll,
+		FullMsgId context) {
+	_controller->showPollResults(poll, context);
 }
 
 void ListWidget::elementShowTooltip(

From 39777f61492c0655ff77232d72862c9a05ba6835 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 Nov 2020 10:07:03 +0300
Subject: [PATCH 171/190] Fix compress images with drag-n-drop.

Fixes #8943.
---
 Telegram/SourceFiles/boxes/send_files_box.cpp | 32 +++++++++++--------
 Telegram/SourceFiles/boxes/send_files_box.h   |  1 +
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 79cf159dd..f7b7dd7af 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -924,6 +924,22 @@ void SendFilesBox::setInnerFocus() {
 	}
 }
 
+void SendFilesBox::saveSendWaySettings() {
+	auto way = _sendWay.current();
+	auto oldWay = Core::App().settings().sendFilesWay();
+	if (_groupFiles->isHidden()) {
+		way.setGroupFiles(oldWay.groupFiles());
+	}
+	if (_list.overrideSendImagesAsPhotos == way.sendImagesAsPhotos()
+		|| _sendImagesAsPhotos->isHidden()) {
+		way.setSendImagesAsPhotos(oldWay.sendImagesAsPhotos());
+	}
+	if (way != oldWay) {
+		Core::App().settings().setSendFilesWay(way);
+		Core::App().saveSettingsDelayed();
+	}
+}
+
 void SendFilesBox::send(
 		Api::SendOptions options,
 		bool ctrlShiftEnter) {
@@ -939,19 +955,7 @@ void SendFilesBox::send(
 		return;
 	}
 
-	auto way = _sendWay.current();
-	auto oldWay = Core::App().settings().sendFilesWay();
-	if (_groupFiles->isHidden()) {
-		way.setGroupFiles(oldWay.groupFiles());
-	}
-	if (_list.overrideSendImagesAsPhotos == way.sendImagesAsPhotos()
-		|| _sendImagesAsPhotos->isHidden()) {
-		way.setSendImagesAsPhotos(oldWay.sendImagesAsPhotos());
-	}
-	if (way != oldWay) {
-		Core::App().settings().setSendFilesWay(way);
-		Core::App().saveSettingsDelayed();
-	}
+	saveSendWaySettings();
 
 	for (auto &block : _blocks) {
 		block.applyAlbumOrder();
@@ -963,7 +967,7 @@ void SendFilesBox::send(
 			: TextWithTags();
 		_confirmedCallback(
 			std::move(_list),
-			way,
+			_sendWay.current(),
 			std::move(caption),
 			options,
 			ctrlShiftEnter);
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index 78f4c3624..f85cb43b2 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -135,6 +135,7 @@ private:
 	void sendSilent();
 	void sendScheduled();
 	void captionResized();
+	void saveSendWaySettings();
 
 	void setupDragArea();
 	void refreshTitleText();

From 5cc1871f2f538aabc5b2280079fc11ef14768261 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 Nov 2020 10:35:38 +0300
Subject: [PATCH 172/190] Fix caption/comment label in SendFilesBox.

---
 Telegram/SourceFiles/boxes/send_files_box.cpp          | 1 +
 Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index f7b7dd7af..e45b8d21e 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -591,6 +591,7 @@ void SendFilesBox::pushBlock(int from, int till) {
 void SendFilesBox::refreshControls() {
 	refreshTitleText();
 	updateSendWayControlsVisibility();
+	updateCaptionPlaceholder();
 }
 
 void SendFilesBox::setupSendWayControls() {
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
index be79c4dd6..e24e4107f 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
@@ -154,11 +154,15 @@ bool PreparedList::canAddCaption(bool sendingAlbum) const {
 		files,
 		PreparedFile::Type::File,
 		&PreparedFile::type);
+	const auto hasMusic = ranges::contains(
+		files,
+		PreparedFile::Type::Music,
+		&PreparedFile::type);
 	const auto hasNotGrouped = ranges::contains(
 		files,
 		PreparedFile::Type::None,
 		&PreparedFile::type);
-	return !hasFiles && !hasNotGrouped;
+	return !hasFiles && !hasMusic && !hasNotGrouped;
 }
 
 bool PreparedList::hasGroupOption(bool slowmode) const {

From b179e5332a3eac8cd043b87f3d67e00167242251 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 Nov 2020 11:16:04 +0300
Subject: [PATCH 173/190] Improve layout of file albums with views/replies.

---
 .../view/media/history_view_contact.cpp       |  4 +++-
 .../view/media/history_view_document.cpp      |  4 +++-
 .../view/media/history_view_media_grouped.cpp | 20 +++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_contact.cpp b/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
index ff87a9b05..cdbfbaf6e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_contact.cpp
@@ -135,8 +135,10 @@ QSize Contact::countOptimalSize() {
 	auto minHeight = st.padding.top() + st.thumbSize + st.padding.bottom();
 	if (_userId) {
 		const auto msgsigned = item->Get<HistoryMessageSigned>();
+		const auto views = item->Get<HistoryMessageViews>();
 		if ((msgsigned && !msgsigned->isAnonymousRank)
-			|| item->Has<HistoryMessageViews>()) {
+			|| (views
+				&& (views->views.count >= 0 || views->replies.count > 0))) {
 			minHeight += st::msgDateFont->height - st::msgDateDelta.y();
 		}
 	}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 1c117c41d..e0a50d517 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -195,8 +195,10 @@ QSize Document::countOptimalSize() {
 
 	auto minHeight = st.padding.top() + st.thumbSize + st.padding.bottom();
 	const auto msgsigned = item->Get<HistoryMessageSigned>();
+	const auto views = item->Get<HistoryMessageViews>();
 	if (!captioned && ((msgsigned && !msgsigned->isAnonymousRank)
-		|| item->Has<HistoryMessageViews>()
+		|| (views
+			&& (views->views.count >= 0 || views->replies.count > 0))
 		|| _parent->displayEditedBadge())) {
 		minHeight += st::msgDateFont->height - st::msgDateDelta.y();
 	}
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
index a2ea6af93..742b2a271 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -145,6 +145,16 @@ QSize GroupedMedia::countOptimalSize() {
 		if (isBubbleBottom()) {
 			minHeight += st::msgPadding.bottom();
 		}
+	} else if (_mode == Mode::Column && _parts.back().item->emptyText()) {
+		const auto item = _parent->data();
+		const auto msgsigned = item->Get<HistoryMessageSigned>();
+		const auto views = item->Get<HistoryMessageViews>();
+		if ((msgsigned && !msgsigned->isAnonymousRank)
+			|| (views
+				&& (views->views.count >= 0 || views->replies.count > 0))
+			|| displayedEditBadge()) {
+			minHeight += st::msgDateFont->height - st::msgDateDelta.y();
+		}
 	}
 
 	const auto groupPadding = groupedPadding();
@@ -205,6 +215,16 @@ QSize GroupedMedia::countCurrentSize(int newWidth) {
 		if (isBubbleBottom()) {
 			newHeight += st::msgPadding.bottom();
 		}
+	} else if (_mode == Mode::Column && _parts.back().item->emptyText()) {
+		const auto item = _parent->data();
+		const auto msgsigned = item->Get<HistoryMessageSigned>();
+		const auto views = item->Get<HistoryMessageViews>();
+		if ((msgsigned && !msgsigned->isAnonymousRank)
+			|| (views
+				&& (views->views.count >= 0 || views->replies.count > 0))
+			|| displayedEditBadge()) {
+			newHeight += st::msgDateFont->height - st::msgDateDelta.y();
+		}
 	}
 
 	const auto groupPadding = groupedPadding();

From 07f07c5eeb70a32a250cfa91934a66bcab6a5adb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 Nov 2020 11:18:54 +0300
Subject: [PATCH 174/190] Fix selection in album captions.

Fixes #8950.
---
 .../history/view/media/history_view_media_grouped.cpp          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
index 742b2a271..422f18596 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp
@@ -275,7 +275,8 @@ void GroupedMedia::draw(
 		crl::time ms) const {
 	const auto groupPadding = groupedPadding();
 	const auto fullSelection = (selection == FullSelection);
-	const auto textSelection = !fullSelection
+	const auto textSelection = (_mode == Mode::Column)
+		&& !fullSelection
 		&& !IsSubGroupSelection(selection);
 	for (auto i = 0, count = int(_parts.size()); i != count; ++i) {
 		const auto &part = _parts[i];

From a21b6d7416c0899a5622a1c3f6087cbdf0064538 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 Nov 2020 11:44:05 +0300
Subject: [PATCH 175/190] Fix restoring scroll state with a pinned bar.

---
 Telegram/SourceFiles/history/history_widget.cpp | 6 +++++-
 Telegram/SourceFiles/history/history_widget.h   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index db142d165..11aa0bd02 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -3230,6 +3230,9 @@ void HistoryWidget::doneShow() {
 	} else {
 		handlePendingHistoryUpdate();
 	}
+	// If we show pinned bar here, we don't want it to change the
+	// calculated and prepared scrollTop of the messages history.
+	_preserveScrollTop = true;
 	preloadHistoryIfNeeded();
 	updatePinnedViewer();
 	if (_pinnedBar) {
@@ -3237,6 +3240,7 @@ void HistoryWidget::doneShow() {
 	}
 	checkHistoryActivation();
 	App::wnd()->setInnerFocus();
+	_preserveScrollTop = false;
 }
 
 void HistoryWidget::finishAnimating() {
@@ -5330,7 +5334,7 @@ void HistoryWidget::checkPinnedBarState() {
 	_pinnedBarHeight = 0;
 	_pinnedBar->heightValue(
 	) | rpl::start_with_next([=](int height) {
-		_topDelta = (height - _pinnedBarHeight);
+		_topDelta = _preserveScrollTop ? 0 : (height - _pinnedBarHeight);
 		_pinnedBarHeight = height;
 		updateHistoryGeometry();
 		updateControlsGeometry();
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 7242417fc..b2b1220b4 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -599,6 +599,7 @@ private:
 	std::unique_ptr<HistoryView::PinnedTracker> _pinnedTracker;
 	std::unique_ptr<Ui::PinnedBar> _pinnedBar;
 	int _pinnedBarHeight = 0;
+	bool _preserveScrollTop = false;
 	FullMsgId _pinnedClickedId;
 	std::optional<FullMsgId> _minPinnedId;
 

From f2867df340677d190ef3bfe09f025538a8944823 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 Nov 2020 11:50:14 +0300
Subject: [PATCH 176/190] Fix sending of album with videos.

Fixes #8960.
---
 Telegram/SourceFiles/apiwrap.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index a51049a54..f97437270 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -4230,20 +4230,18 @@ void ApiWrap::sendFiles(
 	auto tasks = std::vector<std::unique_ptr<Task>>();
 	tasks.reserve(list.files.size());
 	for (auto &file : list.files) {
-		if (album) {
-			if (file.type == Ui::PreparedFile::Type::Photo
-				&& type != SendMediaType::File) {
-				type = SendMediaType::Photo;
-			} else {
-				type = SendMediaType::File;
-			}
-		}
+		const auto uploadWithType = !album
+			? type
+			: (file.type == Ui::PreparedFile::Type::Photo
+				&& type != SendMediaType::File)
+			? SendMediaType::Photo
+			: SendMediaType::File;
 		tasks.push_back(std::make_unique<FileLoadTask>(
 			&session(),
 			file.path,
 			file.content,
 			std::move(file.information),
-			type,
+			uploadWithType,
 			to,
 			caption,
 			album));

From 7dffc6e912069c114bf7b8f35497bb28450c64d4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 Nov 2020 12:36:33 +0300
Subject: [PATCH 177/190] Version 2.4.6.

- Fix image compression option when sending files with drag-n-drop.
- Fix caption text selection in media albums.
- Fix drafts display in personal chats in the chats list.
- Bug fixes and other minor improvements.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 +++---
 Telegram/Resources/winrc/Updater.rc          |  8 +++---
 Telegram/SourceFiles/core/changelogs.cpp     | 30 +++++++-------------
 Telegram/SourceFiles/core/version.h          |  4 +--
 Telegram/build/version                       |  8 +++---
 Telegram/lib_base                            |  2 +-
 changelog.txt                                |  7 +++++
 8 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 2b4684703..e980d93c5 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="2.4.5.0" />
+    Version="2.4.6.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram FZ-LLC</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index d3e3016ee..742e023b9 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,5,0
- PRODUCTVERSION 2,4,5,0
+ FILEVERSION 2,4,6,0
+ PRODUCTVERSION 2,4,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "2.4.5.0"
+            VALUE "FileVersion", "2.4.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.5.0"
+            VALUE "ProductVersion", "2.4.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 14d7d441c..b3e504d3c 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,5,0
- PRODUCTVERSION 2,4,5,0
+ FILEVERSION 2,4,6,0
+ PRODUCTVERSION 2,4,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "2.4.5.0"
+            VALUE "FileVersion", "2.4.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.5.0"
+            VALUE "ProductVersion", "2.4.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index 6dc84e216..79cd1afae 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -21,26 +21,6 @@ namespace {
 
 std::map<int, const char*> BetaLogs() {
 	return {
-	{
-		1009020,
-		"- Fix crash in shared links search.\n"
-
-		"- Fix blurred thumbnails in albums with video files.\n"
-
-		"- Fix a possible crash in animated stickers rendering."
-	},
-	{
-		1009022,
-		"- Organize chats into Chat Folders if you have too many chats.\n"
-	},
-	{
-		2000001,
-		"- Switch between folders using Ctrl+1, ..., Ctrl+8.\n"
-
-		"- Fix crash when a pinned in folder chat was added to archive.\n"
-
-		"- Fix font issues in Linux version."
-	},
 	{
 		2001008,
 		"- Add support for full group message history export.\n"
@@ -95,6 +75,16 @@ std::map<int, const char*> BetaLogs() {
 
 		"- Enjoy dark native window frame for Telegram night mode on Windows.\n"
 	},
+	{
+		2004006,
+		"- Fix image compression option when sending files with drag-n-drop.\n"
+
+		"- Fix caption text selection in media albums.\n"
+
+		"- Fix drafts display in personal chats in the chats list.\n"
+
+		"- Bug fixes and other minor improvements.\n"
+	},
 	};
 };
 
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 3acc61b90..170e5c1c5 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 2004005;
-constexpr auto AppVersionStr = "2.4.5";
+constexpr auto AppVersion = 2004006;
+constexpr auto AppVersionStr = "2.4.6";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 9e25ad196..12ea85af0 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2004005
+AppVersion         2004006
 AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.5
-AppVersionStr      2.4.5
+AppVersionStrSmall 2.4.6
+AppVersionStr      2.4.6
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 2.4.5
+AppVersionOriginal 2.4.6
diff --git a/Telegram/lib_base b/Telegram/lib_base
index df430bc4a..ffe7a4681 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit df430bc4a27ec62b736d2f43c4b5feacc79605f4
+Subproject commit ffe7a4681ab4b11353c62c36d010db96f0f90fd8
diff --git a/changelog.txt b/changelog.txt
index c23f21627..ecb7f0552 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+2.4.6 (02.11.20)
+
+- Fix image compression option when sending files with drag-n-drop.
+- Fix caption text selection in media albums.
+- Fix drafts display in personal chats in the chats list.
+- Bug fixes and other minor improvements.
+
 2.4.5 (30.10.20)
 
 - Pin several messages in any chat, including one-on-one chats.

From 55167ea95bce0a52f2a13f1c1ba690488f87b9b6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 4 Nov 2020 09:32:50 +0400
Subject: [PATCH 178/190] Handle snap icon problem in snapcraft.yaml rather
 than in code

---
 Telegram/SourceFiles/platform/linux/main_window_linux.cpp | 4 +---
 snap/snapcraft.yaml                                       | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index ccedc4e52..0cf024d9b 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -593,9 +593,7 @@ void MainWindow::setSNITrayIcon(int counter, bool muted) {
 	const auto iconName = GetTrayIconName(counter, muted);
 
 	if (qEnvironmentVariableIsSet(kDisableTrayCounter.utf8())
-		&& !iconName.isEmpty()
-		&& (!InSnap()
-			|| qEnvironmentVariableIsSet(kForcePanelIcon.utf8()))) {
+		&& !iconName.isEmpty()) {
 		if (_sniTrayIcon->iconName() == iconName) {
 			return;
 		}
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index e4ecd9a24..775756da1 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -117,7 +117,10 @@ parts:
 
       snapcraftctl set-version "$version"
 
-      sed -i 's|^Icon=.*|Icon=/usr/share/icons/hicolor/512x512/apps/telegram.png|g' lib/xdg/telegramdesktop.desktop
+      sed -i 's|^Icon=.*|Icon=${SNAP}/meta/gui/icon.png|g' lib/xdg/telegramdesktop.desktop
+    override-build: |
+      snapcraftctl build
+      rm -rf "$SNAPCRAFT_PART_INSTALL/usr/share/icons"
     stage:
       - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so.8.2.2
     after:

From ede7ad1a4cf2335770216ebd32168527aa29507b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 4 Nov 2020 11:35:02 +0400
Subject: [PATCH 179/190] Remove TDESKTOP_FORCE_PANEL_ICON variable since
 tdesktop gets current icon theme just fine now

---
 Telegram/SourceFiles/platform/linux/main_window_linux.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 0cf024d9b..c46d375a3 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -58,7 +58,6 @@ namespace Platform {
 namespace {
 
 constexpr auto kDisableTrayCounter = "TDESKTOP_DISABLE_TRAY_COUNTER"_cs;
-constexpr auto kForcePanelIcon = "TDESKTOP_FORCE_PANEL_ICON"_cs;
 constexpr auto kPanelTrayIconName = "telegram-panel"_cs;
 constexpr auto kMutePanelTrayIconName = "telegram-mute-panel"_cs;
 constexpr auto kAttentionPanelTrayIconName = "telegram-attention-panel"_cs;
@@ -149,8 +148,7 @@ QString GetTrayIconName(int counter, bool muted) {
 	const auto iconName = GetIconName();
 	const auto panelIconName = GetPanelIconName(counter, muted);
 
-	if (QIcon::hasThemeIcon(panelIconName)
-		|| qEnvironmentVariableIsSet(kForcePanelIcon.utf8())) {
+	if (QIcon::hasThemeIcon(panelIconName)) {
 		return panelIconName;
 	} else if (QIcon::hasThemeIcon(iconName)) {
 		return iconName;

From d9711f8ebd6d9551ebab68f77978eb65f7dba865 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 4 Nov 2020 04:21:42 +0400
Subject: [PATCH 180/190] QDir::tempPath already has fallback to /tmp

---
 Telegram/SourceFiles/platform/linux/specific_linux.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 49e83e643..ad80e1350 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -701,10 +701,6 @@ QString AppRuntimeDirectory() {
 			runtimeDir = QDir::tempPath();
 		}
 
-		if (runtimeDir.isEmpty()) {
-			runtimeDir = qsl("/tmp/");
-		}
-
 		if (!runtimeDir.endsWith('/')) {
 			runtimeDir += '/';
 		}

From 2b39da483b6383b8de80e7aefe1193a31e1e9fe1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 2 Nov 2020 17:24:04 +0400
Subject: [PATCH 181/190] Fix IBus portal service name

---
 Telegram/SourceFiles/platform/linux/specific_linux.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index ad80e1350..5fff0b83d 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -134,7 +134,7 @@ bool IsXDGDesktopPortalKDEPresent() {
 
 bool IsIBusPortalPresent() {
 	static const auto Result = QDBusInterface(
-		qsl("org.freedesktop.IBus.Portal"),
+		qsl("org.freedesktop.portal.IBus"),
 		qsl("/org/freedesktop/IBus")).isValid();
 
 	return Result;

From d09ece420347a33478c800cd76ee8c9108b687ba Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Nov 2020 13:53:25 +0300
Subject: [PATCH 182/190] Fix albums of music files.

---
 .../view/media/history_view_document.cpp      | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index e0a50d517..3795e115f 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -129,18 +129,18 @@ void Document::createComponents(bool caption) {
 	if (const auto thumbed = Get<HistoryDocumentThumbed>()) {
 		thumbed->_linksavel = std::make_shared<DocumentSaveClickHandler>(
 			_data,
-			_parent->data()->fullId());
+			_realParent->fullId());
 		thumbed->_linkopenwithl = std::make_shared<DocumentOpenWithClickHandler>(
 			_data,
-			_parent->data()->fullId());
+			_realParent->fullId());
 		thumbed->_linkcancell = std::make_shared<DocumentCancelClickHandler>(
 			_data,
-			_parent->data()->fullId());
+			_realParent->fullId());
 	}
 	if (const auto voice = Get<HistoryDocumentVoice>()) {
 		voice->_seekl = std::make_shared<VoiceSeekClickHandler>(
 			_data,
-			_parent->data()->fullId());
+			_realParent->fullId());
 	}
 }
 
@@ -261,7 +261,7 @@ void Document::draw(
 	const auto cornerDownload = downloadInCorner();
 
 	if (!_dataMedia->canBePlayed()) {
-		_dataMedia->automaticLoad(_realParent->fullId(), _parent->data());
+		_dataMedia->automaticLoad(_realParent->fullId(), _realParent);
 	}
 	bool loaded = dataLoaded(), displayLoading = _data->displayLoading();
 	bool selected = (selection == FullSelection);
@@ -453,7 +453,7 @@ void Document::draw(
 		auto activew = qRound(availw * progress);
 		if (!outbg
 			&& !voice->_playback
-			&& _parent->data()->hasUnreadMediaFlag()) {
+			&& _realParent->hasUnreadMediaFlag()) {
 			activew = availw;
 		}
 		auto bar_count = qMin(availw / (st::msgWaveformBar + st::msgWaveformSkip), wf_size);
@@ -507,7 +507,7 @@ void Document::draw(
 	p.setPen(status);
 	p.drawTextLeft(nameleft, statustop, width, statusText);
 
-	if (_parent->data()->hasUnreadMediaFlag()) {
+	if (_realParent->hasUnreadMediaFlag()) {
 		auto w = st::normalFont->width(statusText);
 		if (w + st::mediaUnreadSkip + st::mediaUnreadSize <= statuswidth) {
 			p.setPen(Qt::NoPen);
@@ -549,7 +549,7 @@ bool Document::downloadInCorner() const {
 	return _data->isAudioFile()
 		&& _data->canBeStreamed()
 		&& !_data->inappPlaybackFailed()
-		&& IsServerMsgId(_parent->data()->id);
+		&& IsServerMsgId(_realParent->id);
 }
 
 void Document::drawCornerDownload(Painter &p, bool selected, LayoutMode mode) const {
@@ -687,7 +687,7 @@ TextState Document::textState(
 		auto waveformbottom = st.padding.top() - topMinus + st::msgWaveformMax + st::msgWaveformMin;
 		if (QRect(nameleft, nametop, namewidth, waveformbottom - nametop).contains(point)) {
 			const auto state = ::Media::Player::instance()->getState(AudioMsgId::Type::Voice);
-			if (state.id == AudioMsgId(_data, _parent->data()->fullId(), state.id.externalPlayId())
+			if (state.id == AudioMsgId(_data, _realParent->fullId(), state.id.externalPlayId())
 				&& !::Media::Player::IsStoppedOrStopping(state.state)) {
 				if (!voice->seeking()) {
 					voice->setSeekingStart((point.x() - nameleft) / float64(namewidth));
@@ -814,7 +814,7 @@ bool Document::updateStatusText() const {
 
 	if (_data->isVoiceMessage()) {
 		const auto state = ::Media::Player::instance()->getState(AudioMsgId::Type::Voice);
-		if (state.id == AudioMsgId(_data, _parent->data()->fullId(), state.id.externalPlayId())
+		if (state.id == AudioMsgId(_data, _realParent->fullId(), state.id.externalPlayId())
 			&& !::Media::Player::IsStoppedOrStopping(state.state)) {
 			if (auto voice = Get<HistoryDocumentVoice>()) {
 				bool was = (voice->_playback != nullptr);
@@ -840,19 +840,19 @@ bool Document::updateStatusText() const {
 				voice->checkPlaybackFinished();
 			}
 		}
-		if (!showPause && (state.id == AudioMsgId(_data, _parent->data()->fullId(), state.id.externalPlayId()))) {
+		if (!showPause && (state.id == AudioMsgId(_data, _realParent->fullId(), state.id.externalPlayId()))) {
 			showPause = ::Media::Player::instance()->isSeeking(AudioMsgId::Type::Voice);
 		}
 	} else if (_data->isAudioFile()) {
 		const auto state = ::Media::Player::instance()->getState(AudioMsgId::Type::Song);
-		if (state.id == AudioMsgId(_data, _parent->data()->fullId(), state.id.externalPlayId())
+		if (state.id == AudioMsgId(_data, _realParent->fullId(), state.id.externalPlayId())
 			&& !::Media::Player::IsStoppedOrStopping(state.state)) {
 			statusSize = -1 - (state.position / state.frequency);
 			realDuration = (state.length / state.frequency);
 			showPause = ::Media::Player::ShowPauseIcon(state.state);
 		} else {
 		}
-		if (!showPause && (state.id == AudioMsgId(_data, _parent->data()->fullId(), state.id.externalPlayId()))) {
+		if (!showPause && (state.id == AudioMsgId(_data, _realParent->fullId(), state.id.externalPlayId()))) {
 			showPause = ::Media::Player::instance()->isSeeking(AudioMsgId::Type::Song);
 		}
 	}
@@ -962,7 +962,7 @@ void Document::clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed
 		} else if (!pressed && voice->seeking()) {
 			const auto type = AudioMsgId::Type::Voice;
 			const auto state = ::Media::Player::instance()->getState(type);
-			if (state.id == AudioMsgId(_data, _parent->data()->fullId(), state.id.externalPlayId()) && state.length) {
+			if (state.id == AudioMsgId(_data, _realParent->fullId(), state.id.externalPlayId()) && state.length) {
 				const auto currentProgress = voice->seekingCurrent();
 				::Media::Player::instance()->finishSeeking(
 					AudioMsgId::Type::Voice,

From ddbd36e446716d43aa7ce6871499114f0083a9da Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Nov 2020 14:02:27 +0300
Subject: [PATCH 183/190] Cancel search in chat doesn't reset search query.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index b2840faeb..a69b59264 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1795,10 +1795,7 @@ void Widget::onCancelSearchInChat() {
 		}
 		setSearchInChat(Key());
 	}
-	_inner->clearFilter();
-	_filter->clear();
-	_filter->updatePlaceholder();
-	applyFilterUpdate();
+	applyFilterUpdate(true);
 	if (!Adaptive::OneColumn() && !controller()->selectingPeer()) {
 		emit cancelled();
 	}

From c0043d56eaf3156fbcf37d96d5538cd38a3aeaba Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Nov 2020 14:58:36 +0300
Subject: [PATCH 184/190] Fix crash in search row select in privacy edition.

---
 Telegram/SourceFiles/boxes/edit_privacy_box.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 0c23ddb25..3be617c73 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -77,8 +77,12 @@ std::vector<not_null<PeerData*>> PrivacyExceptionsBoxController::getResult() con
 }
 
 void PrivacyExceptionsBoxController::rowClicked(not_null<PeerListRow*> row) {
+	const auto peer = row->peer();
+
+	// This call may delete row, if it was a search result row.
 	delegate()->peerListSetRowChecked(row, !row->checked());
-	if (const auto channel = row->peer()->asChannel()) {
+
+	if (const auto channel = peer->asChannel()) {
 		if (!channel->membersCountKnown()) {
 			channel->updateFull();
 		}

From 3fdd6848c58582924cdb90b734d17581db193811 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Nov 2020 15:05:29 +0300
Subject: [PATCH 185/190] Fix possible crash on macOS wake.

---
 Telegram/SourceFiles/platform/mac/specific_mac_p.mm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
index 6b9cc508a..b4208a042 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
@@ -157,11 +157,13 @@ ApplicationDelegate *_sharedDelegate = nil;
 }
 
 - (void) receiveWakeNote:(NSNotification*)aNotification {
-	if (Core::IsAppLaunched()) {
-		Core::App().checkLocalTime();
+	if (!Core::IsAppLaunched()) {
+		return;
 	}
+	Core::App().checkLocalTime();
 
-	LOG(("Audio Info: -receiveWakeNote: received, scheduling detach from audio device"));
+	LOG(("Audio Info: "
+		"-receiveWakeNote: received, scheduling detach from audio device"));
 	Media::Audio::ScheduleDetachFromDeviceSafe();
 }
 

From 039cad21a5eeb13b8e957701d13d733776f14ffb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Nov 2020 17:50:58 +0300
Subject: [PATCH 186/190] Fix view refresh for album part messages.

Fixes #8974.
---
 .../history/history_inner_widget.cpp          | 42 +------------------
 .../history/view/history_view_element.cpp     |  2 +
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index a9d9719de..c5b93c611 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -289,45 +289,6 @@ void HistoryInner::enumerateItemsInHistory(History *history, int historytop, Met
 
 			// Binary search should've skipped all the items that are above / below the visible area.
 			if (TopToBottom) {
-				if (itembottom <= _visibleAreaTop) {
-					QStringList debug;
-					for (const auto &logBlock : history->blocks) {
-						QStringList debugItems;
-						for (const auto &logItem : logBlock->messages) {
-							debugItems.push_back(QString("%1,%2"
-							).arg(logItem->y()
-							).arg(logItem->height()
-							));
-						}
-						debug.push_back(QString("b(%1,%2:%3)"
-						).arg(logBlock->y()
-						).arg(logBlock->height()
-						).arg(debugItems.join(';')
-						));
-					}
-					CrashReports::SetAnnotation(
-						"geometry",
-						QString("height:%1 "
-						).arg(history->height()
-						) + debug.join(';'));
-					CrashReports::SetAnnotation(
-						"info",
-						QString("block:%1(%2,%3), "
-							"item:%4(%5,%6), "
-							"limits:%7,%8, "
-							"has:%9"
-						).arg(blockIndex
-						).arg(block->y()
-						).arg(block->height()
-						).arg(itemIndex
-						).arg(view->y()
-						).arg(view->height()
-						).arg(_visibleAreaTop
-						).arg(_visibleAreaBottom
-						).arg(Logs::b(history->hasPendingResizedItems())
-						));
-					Unexpected("itembottom > _visibleAreaTop");
-				}
 				Assert(itembottom > _visibleAreaTop);
 			} else {
 				Assert(itemtop < _visibleAreaBottom);
@@ -415,8 +376,7 @@ void HistoryInner::enumerateUserpics(Method method) {
 	auto userpicCallback = [&](not_null<Element*> view, int itemtop, int itembottom) {
 		// Skip all service messages.
 		const auto item = view->data();
-		const auto message = item->toHistoryMessage();
-		if (!message) return true;
+		if (view->isHidden() || !item->toHistoryMessage()) return true;
 
 		if (lowestAttachedItemTop < 0 && view->isAttachedToNext()) {
 			lowestAttachedItemTop = itemtop + view->marginTop();
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index c6a6d5b11..44b93d055 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -493,6 +493,8 @@ void Element::recountAttachToPreviousInBlocks() {
 	if (isHidden() || data()->isEmpty()) {
 		if (const auto next = nextDisplayedInBlocks()) {
 			next->recountAttachToPreviousInBlocks();
+		} else if (const auto previous = previousDisplayedInBlocks()) {
+			previous->setAttachToNext(false);
 		}
 		return;
 	}

From fad7996e63ec762939a0a1d9c39f68cc1d7e55ba Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 5 Nov 2020 16:51:26 +0300
Subject: [PATCH 187/190] Added delete prevent in SendFilesBox when it has
 single item.

---
 Telegram/SourceFiles/boxes/send_files_box.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index e45b8d21e..e7d1f80be 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -533,6 +533,9 @@ void SendFilesBox::pushBlock(int from, int till) {
 		block.takeWidget(),
 		QMargins(0, _inner->count() ? st::sendMediaRowSkip : 0, 0, 0));
 
+	const auto preventDelete =
+		widget->lifetime().make_state<rpl::event_stream<int>>();
+
 	block.itemDeleteRequest(
 	) | rpl::filter([=] {
 		return !_removingIndex;
@@ -543,12 +546,19 @@ void SendFilesBox::pushBlock(int from, int till) {
 			if (index < 0 || index >= _list.files.size()) {
 				return;
 			}
+			// Prevent item delete if it is the only one.
+			if (_list.files.size() == 1) {
+				preventDelete->fire_copy(0);
+				return;
+			}
 			_list.files.erase(_list.files.begin() + index);
 			refreshAllAfterChanges(from);
 		});
 	}, widget->lifetime());
 
-	block.itemReplaceRequest(
+	rpl::merge(
+		block.itemReplaceRequest(),
+		preventDelete->events()
 	) | rpl::start_with_next([=](int index) {
 		const auto replace = [=](Ui::PreparedList list) {
 			if (list.files.empty()) {

From 42d4fdb89f09f7619b71a71cc38275d6cea63260 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 5 Nov 2020 17:21:52 +0300
Subject: [PATCH 188/190] Fixed preview display of small media in SendFilesBox.

---
 .../ui/chat/attach/attach_single_media_preview.cpp         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
index 199ca9844..7a82a3e06 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp
@@ -126,11 +126,18 @@ void SingleMediaPreview::preparePreview(
 		_previewWidth = qMax(preview.width(), kMinPreviewWidth);
 	}
 	auto maxthumbh = qMin(qRound(1.5 * _previewWidth), st::confirmMaxHeight);
+	const auto minthumbh = st::sendBoxAlbumGroupHeight
+		 + st::sendBoxAlbumGroupSkipTop * 2;
 	_previewHeight = qRound(originalHeight * float64(_previewWidth) / originalWidth);
 	if (_previewHeight > maxthumbh) {
 		_previewWidth = qRound(_previewWidth * float64(maxthumbh) / _previewHeight);
 		accumulate_max(_previewWidth, kMinPreviewWidth);
 		_previewHeight = maxthumbh;
+	} else if (_previewHeight < minthumbh) {
+		_previewWidth = qRound(_previewWidth * float64(minthumbh)
+			/ _previewHeight);
+		accumulate_max(_previewWidth, kMinPreviewWidth);
+		_previewHeight = minthumbh;
 	}
 	_previewLeft = (st::boxWideWidth - _previewWidth) / 2;
 

From 9329ce9059b1a758bb92320e4ba34f88b554a771 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 5 Nov 2020 18:09:31 +0400
Subject: [PATCH 189/190] Pin tg_owt commit in snap and add
 -DBUILD_SHARED_LIBS=OFF

---
 snap/snapcraft.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 775756da1..94cce2b3f 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -259,6 +259,7 @@ parts:
   webrtc:
     source: https://github.com/desktop-app/tg_owt.git
     source-depth: 1
+    source-commit: 12f4a27f2f02f9dd40f9891d8ec6e58bc1ff5263
     plugin: cmake
     build-packages:
       - yasm
@@ -270,6 +271,7 @@ parts:
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DBUILD_SHARED_LIBS=OFF
       - -DJPEG_LIBRARY_RELEASE=$SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so
       - -DJPEG_INCLUDE_DIR=$SNAPCRAFT_STAGE/usr/include
     prime: [-./*]

From 620639ef83023285e844a4a2305fc1e0634d1a0b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Nov 2020 17:54:49 +0300
Subject: [PATCH 190/190] Version 2.4.7.

- Fix playback display in albums of music files.
- Several crash fixes.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 5 +++++
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index e980d93c5..de007958c 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="2.4.6.0" />
+    Version="2.4.7.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram FZ-LLC</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 742e023b9..3f9b139bd 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,6,0
- PRODUCTVERSION 2,4,6,0
+ FILEVERSION 2,4,7,0
+ PRODUCTVERSION 2,4,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "2.4.6.0"
+            VALUE "FileVersion", "2.4.7.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.6.0"
+            VALUE "ProductVersion", "2.4.7.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index b3e504d3c..ca046b74e 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,6,0
- PRODUCTVERSION 2,4,6,0
+ FILEVERSION 2,4,7,0
+ PRODUCTVERSION 2,4,7,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "2.4.6.0"
+            VALUE "FileVersion", "2.4.7.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.6.0"
+            VALUE "ProductVersion", "2.4.7.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 170e5c1c5..bfbc759cc 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 2004006;
-constexpr auto AppVersionStr = "2.4.6";
+constexpr auto AppVersion = 2004007;
+constexpr auto AppVersionStr = "2.4.7";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 12ea85af0..8a3c6d616 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2004006
+AppVersion         2004007
 AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.6
-AppVersionStr      2.4.6
+AppVersionStrSmall 2.4.7
+AppVersionStr      2.4.7
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 2.4.6
+AppVersionOriginal 2.4.7
diff --git a/changelog.txt b/changelog.txt
index ecb7f0552..d6a7c48e8 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+2.4.7 (05.11.20)
+
+- Fix playback display in albums of music files.
+- Several crash fixes.
+
 2.4.6 (02.11.20)
 
 - Fix image compression option when sending files with drag-n-drop.