From 5c8820d5d8c29682a70c550a1ffa0b96ad231daa Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 6 Nov 2020 09:12:18 +0400
Subject: [PATCH 001/370] Use QClipboard::supportsSelection instead of ifdefs

---
 .../history/admin_log/history_admin_log_inner.cpp          | 6 +++---
 Telegram/SourceFiles/history/history_inner_widget.cpp      | 6 +++---
 .../SourceFiles/history/view/history_view_list_widget.cpp  | 7 +++----
 Telegram/SourceFiles/info/media/info_media_list_widget.cpp | 4 +---
 4 files changed, 10 insertions(+), 13 deletions(-)

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 f2a3a7753..1bb0e1a8a 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -1503,13 +1503,13 @@ void InnerWidget::mouseActionFinish(const QPoint &screenPos, Qt::MouseButton but
 	_mouseSelectType = TextSelectType::Letters;
 	//_widget->noSelectingScroll(); // TODO
 
-#if defined Q_OS_UNIX && !defined Q_OS_MAC
-	if (_selectedItem && _selectedText.from != _selectedText.to) {
+	if (QGuiApplication::clipboard()->supportsSelection()
+		&& _selectedItem
+		&& _selectedText.from != _selectedText.to) {
 		TextUtilities::SetClipboardText(
 			_selectedItem->selectedText(_selectedText),
 			QClipboard::Selection);
 	}
-#endif // Q_OS_UNIX && !Q_OS_MAC
 }
 
 void InnerWidget::updateSelected() {
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index c5b93c611..b94c38b6a 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1382,8 +1382,9 @@ void HistoryInner::mouseActionFinish(
 	_widget->noSelectingScroll();
 	_widget->updateTopBarSelection();
 
-#if defined Q_OS_UNIX && !defined Q_OS_MAC
-	if (!_selected.empty() && _selected.cbegin()->second != FullSelection) {
+	if (QGuiApplication::clipboard()->supportsSelection()
+		&& !_selected.empty()
+		&& _selected.cbegin()->second != FullSelection) {
 		const auto [item, selection] = *_selected.cbegin();
 		if (const auto view = item->mainView()) {
 			TextUtilities::SetClipboardText(
@@ -1391,7 +1392,6 @@ void HistoryInner::mouseActionFinish(
 				QClipboard::Selection);
 		}
 	}
-#endif // Q_OS_UNIX && !Q_OS_MAC
 }
 
 void HistoryInner::mouseReleaseEvent(QMouseEvent *e) {
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 66b362033..65943d1b4 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -2222,16 +2222,15 @@ void ListWidget::mouseActionFinish(
 	_mouseSelectType = TextSelectType::Letters;
 	//_widget->noSelectingScroll(); // #TODO select scroll
 
-#if defined Q_OS_UNIX && !defined Q_OS_MAC
-	if (_selectedTextItem
+	if (QGuiApplication::clipboard()->supportsSelection()
+		&& _selectedTextItem
 		&& _selectedTextRange.from != _selectedTextRange.to) {
 		if (const auto view = viewForItem(_selectedTextItem)) {
 			TextUtilities::SetClipboardText(
 				view->selectedText(_selectedTextRange),
 				QClipboard::Selection);
-}
+		}
 	}
-#endif // Q_OS_UNIX && !Q_OS_MAC
 }
 
 void ListWidget::mouseActionUpdate() {
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 3074318c9..be74d7251 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -2118,11 +2118,9 @@ void ListWidget::mouseActionFinish(
 	//_widget->noSelectingScroll(); // #TODO scroll by drag
 	//_widget->updateTopBarSelection();
 
-#if defined Q_OS_UNIX && !defined Q_OS_MAC
-	//if (hasSelectedText()) { // #TODO linux clipboard
+	//if (QGuiApplication::clipboard()->supportsSelection() && hasSelectedText()) { // #TODO linux clipboard
 	//	TextUtilities::SetClipboardText(_selected.cbegin()->first->selectedText(_selected.cbegin()->second), QClipboard::Selection);
 	//}
-#endif // Q_OS_UNIX && !Q_OS_MAC
 }
 
 void ListWidget::applyDragSelection() {

From aec2b8df7e6ad67cb6e6d4745f6417684c29d7ed Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 6 Nov 2020 10:37:30 +0400
Subject: [PATCH 002/370] Fix choosing directories in snap and flatpak

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

diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index 253bf528c..552ed888a 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -113,15 +113,17 @@ 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 sandboxedOrCustomPortal = InFlatpak()
+		|| InSnap()
+		|| UseXDGDesktopPortal();
+
 	const auto neededForPortal = (type == Type::ReadFolder)
 		&& !CanOpenDirectoryWithPortal();
 
 	const auto neededNonForced = DesktopEnvironment::IsGtkBased()
-		|| (UseXDGDesktopPortal() && neededForPortal);
+		|| (sandboxedOrCustomPortal && neededForPortal);
 
-	const auto excludeNonForced = InFlatpak()
-		|| InSnap()
-		|| (UseXDGDesktopPortal() && !neededForPortal);
+	const auto excludeNonForced = sandboxedOrCustomPortal && !neededForPortal;
 
 	return IsGtkIntegrationForced()
 		|| (neededNonForced && !excludeNonForced);

From f521275accacf6656f612acb8acf0a029a5337a0 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 6 Nov 2020 10:54:37 +0400
Subject: [PATCH 003/370] Fix AreQtPluginsBundled to include static binary

---
 Telegram/SourceFiles/platform/linux/specific_linux.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 5fff0b83d..4db8744c0 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -635,11 +635,11 @@ bool IsGtkIntegrationForced() {
 }
 
 bool AreQtPluginsBundled() {
-#ifdef DESKTOP_APP_USE_PACKAGED_LAZY
+#if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY
 	return true;
-#else // DESKTOP_APP_USE_PACKAGED_LAZY
+#else // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY
 	return false;
-#endif // !DESKTOP_APP_USE_PACKAGED_LAZY
+#endif // DESKTOP_APP_USE_PACKAGED && !DESKTOP_APP_USE_PACKAGED_LAZY
 }
 
 bool IsXDGDesktopPortalPresent() {

From 6c023084d91f8b19dde399e16f038b4a4532d3ed Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 6 Nov 2020 11:44:21 +0400
Subject: [PATCH 004/370] Move the excluding portal checks to
 UseXDGDesktopPortal

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

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 4db8744c0..240366d8a 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -657,12 +657,19 @@ bool IsXDGDesktopPortalPresent() {
 bool UseXDGDesktopPortal() {
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	static const auto Result = [&] {
+		const auto onlyIn = AreQtPluginsBundled()
+			// it is handled by Qt for flatpak and snap
+			&& !InFlatpak()
+			&& !InSnap();
+
 		const auto envVar = qEnvironmentVariableIsSet("TDESKTOP_USE_PORTAL");
 		const auto portalPresent = IsXDGDesktopPortalPresent();
 		const auto neededForKde = DesktopEnvironment::IsKDE()
 			&& IsXDGDesktopPortalKDEPresent();
 
-		return (neededForKde || envVar) && portalPresent;
+		return onlyIn
+			&& portalPresent
+			&& (neededForKde || envVar);
 	}();
 
 	return Result;
@@ -1086,24 +1093,19 @@ void start() {
 		qputenv("QT_WAYLAND_DECORATION", "material");
 	}
 
-	if (AreQtPluginsBundled()
-		// it is handled by Qt for flatpak and snap
-		&& !InFlatpak()
-		&& !InSnap()) {
-		LOG(("Checking for XDG Desktop Portal..."));
-		// this can give us a chance to use
-		// a proper file dialog for current session
-		if (IsXDGDesktopPortalPresent()) {
-			LOG(("XDG Desktop Portal is present!"));
-			if (UseXDGDesktopPortal()) {
-				LOG(("Using XDG Desktop Portal."));
-				qputenv("QT_QPA_PLATFORMTHEME", "xdgdesktopportal");
-			} else {
-				LOG(("Not using XDG Desktop Portal."));
-			}
+	// this can give us a chance to use
+	// a proper file dialog for current session
+	DEBUG_LOG(("Checking for XDG Desktop Portal..."));
+	if (IsXDGDesktopPortalPresent()) {
+		DEBUG_LOG(("XDG Desktop Portal is present!"));
+		if (UseXDGDesktopPortal()) {
+			LOG(("Using XDG Desktop Portal."));
+			qputenv("QT_QPA_PLATFORMTHEME", "xdgdesktopportal");
 		} else {
-			LOG(("XDG Desktop Portal is not present :("));
+			DEBUG_LOG(("Not using XDG Desktop Portal."));
 		}
+	} else {
+		DEBUG_LOG(("XDG Desktop Portal is not present :("));
 	}
 
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION

From f7dcf6ce814dd32471b04d97081aa1f6b49c7c86 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 6 Nov 2020 11:57:34 +0400
Subject: [PATCH 005/370] Hide IsXDGDesktopPortalPresent in a private namespace

---
 .../platform/linux/specific_linux.cpp         | 22 ++++++++-----------
 .../platform/linux/specific_linux.h           | 10 +++------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 240366d8a..c1daf15d0 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -124,6 +124,14 @@ void PortalAutostart(bool autostart, bool silent = false) {
 	}
 }
 
+bool IsXDGDesktopPortalPresent() {
+	static const auto Result = QDBusInterface(
+		kXDGDesktopPortalService.utf16(),
+		kXDGDesktopPortalObjectPath.utf16()).isValid();
+
+	return Result;
+}
+
 bool IsXDGDesktopPortalKDEPresent() {
 	static const auto Result = QDBusInterface(
 		qsl("org.freedesktop.impl.portal.desktop.kde"),
@@ -642,18 +650,6 @@ bool AreQtPluginsBundled() {
 #endif // DESKTOP_APP_USE_PACKAGED && !DESKTOP_APP_USE_PACKAGED_LAZY
 }
 
-bool IsXDGDesktopPortalPresent() {
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-	static const auto Result = QDBusInterface(
-		kXDGDesktopPortalService.utf16(),
-		kXDGDesktopPortalObjectPath.utf16()).isValid();
-
-	return Result;
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-
-	return false;
-}
-
 bool UseXDGDesktopPortal() {
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	static const auto Result = [&] {
@@ -1093,6 +1089,7 @@ void start() {
 		qputenv("QT_WAYLAND_DECORATION", "material");
 	}
 
+#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	// this can give us a chance to use
 	// a proper file dialog for current session
 	DEBUG_LOG(("Checking for XDG Desktop Portal..."));
@@ -1108,7 +1105,6 @@ void start() {
 		DEBUG_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,
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.h b/Telegram/SourceFiles/platform/linux/specific_linux.h
index e6b961df0..2dd706914 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.h
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.h
@@ -23,26 +23,22 @@ inline void SetWatchingMediaKeys(bool watching) {
 bool InFlatpak();
 bool InSnap();
 bool IsStaticBinary();
+bool AreQtPluginsBundled();
 bool UseGtkIntegration();
 bool IsGtkIntegrationForced();
-bool AreQtPluginsBundled();
-
-bool IsXDGDesktopPortalPresent();
 bool UseXDGDesktopPortal();
 bool CanOpenDirectoryWithPortal();
 
 QString AppRuntimeDirectory();
-
 QString GetLauncherBasename();
 QString GetLauncherFilename();
-
 QString GetIconName();
 
+void InstallLauncher(bool force = false);
+
 inline void IgnoreApplicationActivationRightNow() {
 }
 
-void InstallLauncher(bool force = false);
-
 } // namespace Platform
 
 inline void psCheckLocalSocket(const QString &serverName) {

From 9210cf6d365f5f9122431901039e2310e01b84a3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 8 Oct 2020 09:55:23 +0300
Subject: [PATCH 006/370] Build Windows version with Qt 5.15.1.

---
 cmake                 |  2 +-
 docs/building-msvc.md | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/cmake b/cmake
index a7e73ebc0..94025be39 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit a7e73ebc036fdf32cdca56b62405bf9dcd8f8f09
+Subproject commit 94025be392ab7e58115ac376cbf449cdca10de22
diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index 87a1d30da..57d5b856d 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -33,7 +33,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     cd ThirdParty
     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
     cd gyp
@@ -63,7 +63,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
 
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout ddd4084
+    git checkout a77e4d5
     cd ..
 
     git clone https://github.com/desktop-app/lzma.git
@@ -125,7 +125,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     git clone https://github.com/google/breakpad
     cd breakpad
     git checkout a1dbcdcb43
-    git apply ../../tdesktop/Telegram/Patches/breakpad.diff
+    git apply ../patches/breakpad.diff
     cd src
     git clone https://github.com/google/googletest testing
     cd client\windows
@@ -156,23 +156,23 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
 
     set CHERE_INVOKING=enabled_from_arguments
     set MSYS2_PATH_TYPE=inherit
-    bash --login ../../tdesktop/Telegram/Patches/build_ffmpeg_win.sh
+    bash --login ../patches/build_ffmpeg_win.sh
 
     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
+    git clone git://code.qt.io/qt/qt5.git qt_5_15_1
+    cd qt_5_15_1
     perl init-repository --module-subset=qtbase,qtimageformats
-    git checkout v5.12.8
+    git checkout v5.15.1
     git submodule update qtbase qtimageformats
     cd qtbase
-    for /r %i in (..\..\patches\qtbase_5_12_8\*) do git apply %i
+    for /r %i in (..\..\patches\qtbase_5_15_1\*) do git apply %i
     cd ..
 
     configure ^
-        -prefix "%LibrariesPath%\Qt-5.12.8" ^
+        -prefix "%LibrariesPath%\Qt-Qt-5.15.1" ^
         -debug-and-release ^
         -force-debug-info ^
         -opensource ^
@@ -181,7 +181,6 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
         -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" ^
@@ -193,8 +192,8 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
         -nomake tests ^
         -platform win32-msvc
 
-    jom -j4
-    jom -j4 install
+    jom -j8
+    jom -j8 install
     cd ..
 
     git clone https://github.com/desktop-app/tg_owt.git

From 117de5a1f9e845489a563b3e9947dc8bbb2eed24 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Oct 2020 13:32:09 +0300
Subject: [PATCH 007/370] Build macOS version with Qt 5.15.1.

---
 .../media/view/media_view_overlay_widget.cpp  |  6 +++
 .../platform/mac/notifications_manager_mac.mm |  4 +-
 .../platform/mac/specific_mac_p.mm            |  5 +-
 .../mac/touchbar/items/mac_scrubber_item.mm   | 50 ++++++++++---------
 .../mac/touchbar/mac_touchbar_audio.mm        |  1 -
 .../mac/touchbar/mac_touchbar_common.mm       | 11 ++--
 docs/building-xcode.md                        | 10 ++--
 7 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index eff607fcb..e3ce5df7b 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -350,6 +350,12 @@ OverlayWidget::OverlayWidget()
 	if (Platform::IsLinux()) {
 		setWindowFlags(Qt::FramelessWindowHint
 			| Qt::MaximizeUsingFullscreenGeometryHint);
+	} else if (Platform::IsMac()) {
+		// Without Qt::Tool starting with Qt 5.15.1 this widget
+		// when being opened from a fullscreen main window was
+		// opening not as overlay over the main window, but as
+		// a separate fullscreen window with a separate space.
+		setWindowFlags(Qt::FramelessWindowHint | Qt::Tool);
 	} else {
 		setWindowFlags(Qt::FramelessWindowHint);
 	}
diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
index 1bda44df9..827954675 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
@@ -47,8 +47,6 @@ using Manager = Platform::Notifications::Manager;
 
 } // namespace
 
-NSImage *qt_mac_create_nsimage(const QPixmap &pm);
-
 @interface NotificationDelegate : NSObject<NSUserNotificationCenterDelegate> {
 }
 
@@ -267,7 +265,7 @@ void Manager::Private::showNotification(
 			: peer->isRepliesChat()
 			? Ui::EmptyUserpic::GenerateRepliesMessages(st::notifyMacPhotoSize)
 			: peer->genUserpic(userpicView, st::notifyMacPhotoSize);
-		NSImage *img = [qt_mac_create_nsimage(userpic) autorelease];
+		NSImage *img = Q2NSImage(userpic.toImage());
 		[notification setContentImage:img];
 	}
 
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
index b4208a042..e53afe424 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
@@ -39,8 +39,6 @@ constexpr auto kIgnoreActivationTimeoutMs = 500;
 
 } // namespace
 
-NSImage *qt_mac_create_nsimage(const QPixmap &pm);
-
 using Platform::Q2NSString;
 using Platform::NS2QString;
 
@@ -214,10 +212,9 @@ void SetApplicationIcon(const QIcon &icon) {
 	if (!icon.isNull()) {
 		auto pixmap = icon.pixmap(1024, 1024);
 		pixmap.setDevicePixelRatio(cRetinaFactor());
-		image = static_cast<NSImage*>(qt_mac_create_nsimage(pixmap));
+		image = Q2NSImage(pixmap.toImage());
 	}
 	[[NSApplication sharedApplication] setApplicationIconImage:image];
-	[image release];
 }
 
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm
index 0d0395972..95f6cdea0 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.mm
@@ -43,7 +43,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #import <AppKit/NSSegmentedControl.h>
 #import <AppKit/NSTextField.h>
 
-NSImage *qt_mac_create_nsimage(const QPixmap &pm);
 using TouchBar::kCircleDiameter;
 using TouchBar::CreateNSImageFromStyleIcon;
 
@@ -96,32 +95,32 @@ struct PickerScrubberItem {
 	}
 
 	void updateThumbnail() {
-		if (!document || !qpixmap.isNull()) {
+		if (!document || !image.isNull()) {
 			return;
 		}
-		const auto image = mediaView->getStickerSmall();
-		if (!image) {
+		const auto sticker = mediaView->getStickerSmall();
+		if (!sticker) {
 			return;
 		}
-		const auto size = image->size()
+		const auto size = sticker->size()
 			.scaled(kCircleDiameter, kCircleDiameter, Qt::KeepAspectRatio);
-		qpixmap = image->pixSingle(
+		image = sticker->pixSingle(
 			size.width(),
 			size.height(),
 			kCircleDiameter,
 			kCircleDiameter,
-			ImageRoundRadius::None);
+			ImageRoundRadius::None).toImage();
 	}
 
 	bool isStickerLoaded() const {
-		return !qpixmap.isNull();
+		return !image.isNull();
 	}
 
 	QString title = QString();
 
 	DocumentData *document = nullptr;
 	std::shared_ptr<Data::DocumentMedia> mediaView = nullptr;
-	QPixmap qpixmap;
+	QImage image;
 
 	EmojiPtr emoji = nullptr;
 };
@@ -140,21 +139,25 @@ struct PickerScrubberItemsHolder {
 };
 
 using Platform::Q2NSString;
+using Platform::Q2NSImage;
 
 NSImage *CreateNSImageFromEmoji(EmojiPtr emoji) {
-	const auto s = kIdealIconSize * cIntRetinaFactor();
-	auto pixmap = QPixmap(s, s);
-	pixmap.setDevicePixelRatio(cRetinaFactor());
-	pixmap.fill(Qt::black);
-	Painter paint(&pixmap);
-	PainterHighQualityEnabler hq(paint);
-	Ui::Emoji::Draw(
-		paint,
-		std::move(emoji),
-		Ui::Emoji::GetSizeTouchbar(),
-		0,
-		0);
-	return [qt_mac_create_nsimage(pixmap) autorelease];
+	auto image = QImage(
+		QSize(kIdealIconSize, kIdealIconSize) * cIntRetinaFactor(),
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(cRetinaFactor());
+	image.fill(Qt::black);
+	{
+		Painter paint(&image);
+		PainterHighQualityEnabler hq(paint);
+		Ui::Emoji::Draw(
+			paint,
+			emoji,
+			Ui::Emoji::GetSizeTouchbar(),
+			0,
+			0);
+	}
+	return Q2NSImage(image);
 }
 
 auto ActiveChat(not_null<Window::Controller*> controller) {
@@ -421,8 +424,7 @@ void AppendEmojiPacks(
 		PickerScrubberItemView *itemView = [scrubber
 			makeItemWithIdentifier:kStickerItemIdentifier
 			owner:self];
-		itemView.imageView.image = [qt_mac_create_nsimage(item.qpixmap)
-			autorelease];
+		itemView.imageView.image = Q2NSImage(item.image);
 		itemView->documentId = document->id;
 		return itemView;
 	} else if (const auto emoji = item.emoji) {
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.mm
index 3fde9b0c6..decdef0ed 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.mm
@@ -20,7 +20,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #import <AppKit/NSSlider.h>
 #import <AppKit/NSSliderTouchBarItem.h>
 
-NSImage *qt_mac_create_nsimage(const QPixmap &pm);
 using TouchBar::kCircleDiameter;
 using TouchBar::CreateNSImageFromStyleIcon;
 
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.mm
index a7954218c..7a30c4875 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.mm
@@ -9,9 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #ifndef OS_OSX
 
-#import <AppKit/NSTextField.h>
+#include "base/platform/mac/base_utilities_mac.h"
 
-NSImage *qt_mac_create_nsimage(const QPixmap &pm);
+#import <AppKit/NSTextField.h>
 
 namespace TouchBar {
 
@@ -21,10 +21,9 @@ int WidthFromString(NSString *s) {
 }
 
 NSImage *CreateNSImageFromStyleIcon(const style::icon &icon, int size) {
-	const auto instance = icon.instance(QColor(255, 255, 255, 255), 100);
-	auto pixmap = QPixmap::fromImage(instance);
-	pixmap.setDevicePixelRatio(cRetinaFactor());
-	NSImage *image = [qt_mac_create_nsimage(pixmap) autorelease];
+	auto instance = icon.instance(QColor(255, 255, 255, 255), 100);
+	instance.setDevicePixelRatio(cRetinaFactor());
+	NSImage *image = Platform::Q2NSImage(instance);
 	[image setSize:NSMakeSize(size, size)];
 	return image;
 }
diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index f3a599b62..f56d70158 100644
--- a/docs/building-xcode.md
+++ b/docs/building-xcode.md
@@ -254,16 +254,16 @@ Go to ***BuildPath*** and run
     ninja -C out/Release
     cd ..
 
-    git clone git://code.qt.io/qt/qt5.git qt_5_12_8
-    cd qt_5_12_8
+    git clone git://code.qt.io/qt/qt5.git qt_5_15_1
+    cd qt_5_15_1
     perl init-repository --module-subset=qtbase,qtimageformats
-    git checkout v5.12.8
+    git checkout v5.15.1
     git submodule update qtbase qtimageformats
     cd qtbase
-    find ../../patches/qtbase_5_12_8 -type f -print0 | sort -z | xargs -0 git apply
+    find ../../patches/qtbase_5_15_1 -type f -print0 | sort -z | xargs -0 git apply
     cd ..
 
-    ./configure -prefix "/usr/local/desktop-app/Qt-5.12.8" \
+    ./configure -prefix "/usr/local/desktop-app/Qt-5.15.1" \
         -debug-and-release \
         -force-debug-info \
         -opensource \

From b1e2beba2cd5fc5530377c82176d12f9218972a6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 Nov 2020 17:13:25 +0300
Subject: [PATCH 008/370] Fix macOS tray icon on Big Sur & Qt 5.15.1.

---
 .../platform/mac/main_window_mac.h            |  4 +-
 .../platform/mac/main_window_mac.mm           | 64 +++++++++++--------
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h
index f9179a3e0..1366222ae 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.h
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h
@@ -65,7 +65,6 @@ protected:
 	void titleVisibilityChangedHook() override;
 	void unreadCounterChangedHook() override;
 
-	QImage psTrayIcon(bool selected = false) const;
 	bool hasTrayIcon() const override {
 		return trayIcon;
 	}
@@ -77,8 +76,6 @@ protected:
 	QSystemTrayIcon *trayIcon = nullptr;
 	QMenu *trayIconMenu = nullptr;
 
-	QImage trayImg, trayImgSel;
-
 	void psTrayMenuUpdated();
 	void psSetupTrayIcon();
 	virtual void placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift, style::color color) = 0;
@@ -95,6 +92,7 @@ private:
 	void hideAndDeactivate();
 	void updateTitleCounter();
 	void updateIconCounters();
+	[[nodiscard]] QIcon generateIconForTray(int counter, bool muted) const;
 
 	std::unique_ptr<Private> _private;
 
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index 6fbd9ec11..d99bb9630 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -124,6 +124,17 @@ private:
 
 };
 
+[[nodiscard]] QImage TrayIconBack(bool darkMode) {
+	static const auto WithColor = [](QColor color) {
+		return st::macTrayIcon.instance(color, 100);
+	};
+	static const auto DarkModeResult = WithColor({ 255, 255, 255 });
+	static const auto LightModeResult = WithColor({ 0, 0, 0, 180 });
+	auto result = darkMode ? DarkModeResult : LightModeResult;
+	result.detach();
+	return result;
+}
+
 } // namespace
 
 class MainWindow::Private {
@@ -200,7 +211,6 @@ private:
 - (void) darkModeChanged:(NSNotification *)aNotification {
 	Core::Sandbox::Instance().customEnterFromEventLoop([&] {
 		Core::App().settings().setSystemDarkMode(Platform::IsDarkMode());
-		Core::App().domain().notifyUnreadBadgeChanged();
 	});
 }
 
@@ -485,9 +495,6 @@ MainWindow::MainWindow(not_null<Window::Controller*> controller)
 	auto forceOpenGL = std::make_unique<QOpenGLWidget>(this);
 #endif // !OS_MAC_OLD
 
-	trayImg = st::macTrayIcon.instance(QColor(0, 0, 0, 180), 100);
-	trayImgSel = st::macTrayIcon.instance(QColor(255, 255, 255), 100);
-
 	_hideAfterFullScreenTimer.setCallback([this] { hideAndDeactivate(); });
 
 	subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &data) {
@@ -543,10 +550,6 @@ void MainWindow::hideAndDeactivate() {
 	hide();
 }
 
-QImage MainWindow::psTrayIcon(bool selected) const {
-	return selected ? trayImgSel : trayImg;
-}
-
 void MainWindow::psShowTrayMenu() {
 }
 
@@ -566,14 +569,13 @@ void MainWindow::psTrayMenuUpdated() {
 void MainWindow::psSetupTrayIcon() {
 	if (!trayIcon) {
 		trayIcon = new QSystemTrayIcon(this);
-
-		QIcon icon(QPixmap::fromImage(psTrayIcon(), Qt::ColorOnly));
-		icon.addPixmap(QPixmap::fromImage(psTrayIcon(true), Qt::ColorOnly), QIcon::Selected);
-
-		trayIcon->setIcon(icon);
+		trayIcon->setIcon(generateIconForTray(
+			Core::App().unreadBadge(),
+			Core::App().unreadBadgeMuted()));
 		attachToTrayIcon(trayIcon);
+	} else {
+		updateIconCounters();
 	}
-	updateIconCounters();
 
 	trayIcon->show();
 }
@@ -651,21 +653,31 @@ void MainWindow::updateIconCounters() {
 	_private->setWindowBadge(string);
 
 	if (trayIcon) {
-		bool dm = Platform::IsDarkMenuBar();
-		auto &bg = (muted ? st::trayCounterBgMute : st::trayCounterBg);
-		QIcon icon;
-		QImage img(psTrayIcon(dm)), imgsel(psTrayIcon(true));
-		img.detach();
-		imgsel.detach();
-		int32 size = 22 * cIntRetinaFactor();
-		_placeCounter(img, size, counter, bg, (dm && muted) ? st::trayCounterFgMacInvert : st::trayCounterFg);
-		_placeCounter(imgsel, size, counter, st::trayCounterBgMacInvert, st::trayCounterFgMacInvert);
-		icon.addPixmap(App::pixmapFromImageInPlace(std::move(img)));
-		icon.addPixmap(App::pixmapFromImageInPlace(std::move(imgsel)), QIcon::Selected);
-		trayIcon->setIcon(icon);
+		trayIcon->setIcon(generateIconForTray(counter, muted));
 	}
 }
 
+QIcon MainWindow::generateIconForTray(int counter, bool muted) const {
+	auto result = QIcon();
+	auto lightMode = TrayIconBack(false);
+	auto darkMode = TrayIconBack(true);
+	auto lightModeActive = darkMode;
+	auto darkModeActive = darkMode;
+	lightModeActive.detach();
+	darkModeActive.detach();
+	const auto size = 22 * cIntRetinaFactor();
+	const auto &bg = (muted ? st::trayCounterBgMute : st::trayCounterBg);
+	_placeCounter(lightMode, size, counter, bg, st::trayCounterFg);
+	_placeCounter(darkMode, size, counter, bg, muted ? st::trayCounterFgMacInvert : st::trayCounterFg);
+	_placeCounter(lightModeActive, size, counter, st::trayCounterBgMacInvert, st::trayCounterFgMacInvert);
+	_placeCounter(darkModeActive, size, counter, st::trayCounterBgMacInvert, st::trayCounterFgMacInvert);
+	result.addPixmap(App::pixmapFromImageInPlace(std::move(lightMode)), QIcon::Normal, QIcon::Off);
+	result.addPixmap(App::pixmapFromImageInPlace(std::move(darkMode)), QIcon::Normal, QIcon::On);
+	result.addPixmap(App::pixmapFromImageInPlace(std::move(lightModeActive)), QIcon::Active, QIcon::Off);
+	result.addPixmap(App::pixmapFromImageInPlace(std::move(darkModeActive)), QIcon::Active, QIcon::On);
+	return result;
+}
+
 void MainWindow::initShadows() {
 	_private->enableShadow(winId());
 }

From 80c4ecb9bff71b972c61019039588cb9745f2505 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 4 Nov 2020 09:57:03 +0300
Subject: [PATCH 009/370] Migrate CentOS docker file to Qt 5.15.1.

---
 Telegram/build/docker/build.sh              |  87 ++++++++
 Telegram/build/docker/centos_env/Dockerfile | 220 +++++++++++++-------
 Telegram/build/docker/centos_env/prepare.sh |   7 +
 Telegram/build/docker/centos_env/run.sh     |  26 +++
 4 files changed, 269 insertions(+), 71 deletions(-)
 create mode 100755 Telegram/build/docker/build.sh
 create mode 100755 Telegram/build/docker/centos_env/prepare.sh
 create mode 100755 Telegram/build/docker/centos_env/run.sh

diff --git a/Telegram/build/docker/build.sh b/Telegram/build/docker/build.sh
new file mode 100755
index 000000000..4745a07bd
--- /dev/null
+++ b/Telegram/build/docker/build.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+Run () {
+  scl enable devtoolset-8 -- "$@"
+}
+
+HomePath=/usr/src/tdesktop/Telegram
+cd $HomePath
+
+ProjectPath="$HomePath/../out"
+ReleasePath="$ProjectPath/Release"
+BinaryName="Telegram"
+
+if [ ! -f "/usr/bin/cmake" ]; then
+  ln -s cmake3 /usr/bin/cmake
+fi
+
+Run ./configure.sh
+
+cd $ProjectPath
+Run cmake --build . --config Release --target Telegram -- -j8
+cd $ReleasePath
+
+echo "$BinaryName build complete!"
+
+if [ ! -f "$ReleasePath/$BinaryName" ]; then
+Error "$BinaryName not found!"
+fi
+
+# BadCount=`objdump -T $ReleasePath/$BinaryName | grep GLIBC_2\.1[6-9] | wc -l`
+# if [ "$BadCount" != "0" ]; then
+#   Error "Bad GLIBC usages found: $BadCount"
+# fi
+
+# BadCount=`objdump -T $ReleasePath/$BinaryName | grep GLIBC_2\.2[0-9] | wc -l`
+# if [ "$BadCount" != "0" ]; then
+#   Error "Bad GLIBC usages found: $BadCount"
+# fi
+
+BadCount=`objdump -T $ReleasePath/$BinaryName | grep GCC_4\.[3-9] | wc -l`
+if [ "$BadCount" != "0" ]; then
+Error "Bad GCC usages found: $BadCount"
+fi
+
+BadCount=`objdump -T $ReleasePath/$BinaryName | grep GCC_[5-9]\. | wc -l`
+if [ "$BadCount" != "0" ]; then
+Error "Bad GCC usages found: $BadCount"
+fi
+
+if [ ! -f "$ReleasePath/Updater" ]; then
+Error "Updater not found!"
+fi
+
+BadCount=`objdump -T $ReleasePath/Updater | grep GLIBC_2\.1[6-9] | wc -l`
+if [ "$BadCount" != "0" ]; then
+Error "Bad GLIBC usages found: $BadCount"
+fi
+
+BadCount=`objdump -T $ReleasePath/Updater | grep GLIBC_2\.2[0-9] | wc -l`
+if [ "$BadCount" != "0" ]; then
+Error "Bad GLIBC usages found: $BadCount"
+fi
+
+BadCount=`objdump -T $ReleasePath/Updater | grep GCC_4\.[3-9] | wc -l`
+if [ "$BadCount" != "0" ]; then
+Error "Bad GCC usages found: $BadCount"
+fi
+
+BadCount=`objdump -T $ReleasePath/Updater | grep GCC_[5-9]\. | wc -l`
+if [ "$BadCount" != "0" ]; then
+Error "Bad GCC usages found: $BadCount"
+fi
+
+echo "Dumping debug symbols.."
+/dump_syms "$ReleasePath/$BinaryName" > "$ReleasePath/$BinaryName.sym"
+echo "Done!"
+
+echo "Stripping the executable.."
+strip -s "$ReleasePath/$BinaryName"
+echo "Done!"
+
+rm -rf "$ReleasePath/root"
+mkdir "$ReleasePath/root"
+mv "$ReleasePath/$BinaryName" "$ReleasePath/root/"
+mv "$ReleasePath/$BinaryName.sym" "$ReleasePath/root/"
+mv "$ReleasePath/Updater" "$ReleasePath/root/"
+mv "$ReleasePath/Packer" "$ReleasePath/root/"
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 0e055dee2..dcf95e11b 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -2,8 +2,9 @@ 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 QT 5_15_1
+ENV QT_TAG v5.15.1
+ENV QT_PREFIX /usr/local/desktop-app/Qt-5.15.1
 ENV OPENSSL_VER 1_1_1
 ENV OPENSSL_PREFIX /usr/local/desktop-app/openssl-1.1.1
 
@@ -18,6 +19,7 @@ RUN yum -y install git cmake3 zlib-devel gtk2-devel libICE-devel \
 	devtoolset-8-make devtoolset-8-gcc devtoolset-8-gcc-c++ \
 	devtoolset-8-binutils
 
+SHELL [ "scl", "enable", "devtoolset-8", "--", "bash", "-c" ]
 RUN ln -s cmake3 /usr/bin/cmake
 
 ENV LibrariesPath /usr/src/Libraries
@@ -31,10 +33,10 @@ 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
+RUN ./autogen.sh
+RUN ./configure --enable-static --disable-docs
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libffi-cache" install
 
 WORKDIR ..
 RUN rm -rf libffi
@@ -43,9 +45,9 @@ 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
+RUN cmake3 -B build . -DCMAKE_BUILD_TYPE=Release
+RUN cmake3 --build build -j$(nproc)
+RUN DESTDIR="$LibrariesPath/xz-cache" cmake3 --install build
 
 WORKDIR ..
 RUN rm -rf xz
@@ -54,14 +56,14 @@ 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 . \
+RUN 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
+RUN cmake3 --build build -j$(nproc)
+RUN DESTDIR="$LibrariesPath/mozjpeg-cache" cmake3 --install build
 
 WORKDIR ..
 RUN rm -rf mozjpeg
@@ -70,10 +72,10 @@ 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
+RUN ./autogen.sh
+RUN ./configure
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/opus-cache" install
 
 WORKDIR ..
 RUN rm -rf opus
@@ -82,9 +84,9 @@ 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
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-proto-cache" install
 
 WORKDIR ..
 RUN rm -rf xcbproto
@@ -95,20 +97,71 @@ 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
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-cache" install
 
 WORKDIR ..
 RUN rm -rf libxcb
 
+FROM builder AS xcb-wm
+
+RUN git clone --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-wm.git
+
+WORKDIR libxcb-wm
+RUN git checkout 0.4.1
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-wm-cache" install
+
+FROM builder AS xcb-util
+
+RUN git clone --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-util.git
+
+WORKDIR libxcb-util
+RUN git checkout 0.4.0
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-util-cache" install
+
+FROM builder AS xcb-image
+COPY --from=xcb-util ${LibrariesPath}/xcb-util-cache /
+
+RUN git clone --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-image.git
+
+WORKDIR libxcb-image
+RUN git checkout 0.4.0
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-image-cache" install
+
+FROM builder AS xcb-keysyms
+
+RUN git clone --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms.git
+
+WORKDIR libxcb-keysyms
+RUN git checkout 0.4.0
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-keysyms-cache" install
+
+FROM builder AS xcb-render-util
+
+RUN git clone --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util.git
+
+WORKDIR libxcb-render-util
+RUN git checkout 0.3.9
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xcb-render-util-cache" install
+
 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
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libXext-cache" install
 
 WORKDIR ..
 RUN rm -rf libxext
@@ -117,9 +170,9 @@ 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
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libXfixes-cache" install
 
 WORKDIR ..
 RUN rm -rf libxfixes
@@ -128,9 +181,9 @@ 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
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libXi-cache" install
 
 WORKDIR ..
 RUN rm -rf libxi
@@ -139,9 +192,9 @@ 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
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libXrender-cache" install
 
 WORKDIR ..
 RUN rm -rf libxrender
@@ -152,13 +205,13 @@ 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 \
+RUN ./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
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/wayland-cache" install
 
 WORKDIR ..
 RUN rm -rf wayland
@@ -173,9 +226,9 @@ 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
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libva-cache" install
 
 WORKDIR ..
 RUN rm -rf libva
@@ -184,9 +237,9 @@ 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
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libvdpau-cache" install
 
 WORKDIR ..
 RUN rm -rf libvdpau
@@ -200,7 +253,7 @@ 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 \
+RUN ./configure \
 	--disable-debug \
 	--disable-programs \
 	--disable-doc \
@@ -302,14 +355,14 @@ RUN scl enable devtoolset-8 -- ./configure \
 	--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
+RUN make -j$(nproc)
+RUN 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 . \
+RUN cmake3 -B build . \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DLIBTYPE:STRING=STATIC \
 	-DALSOFT_EXAMPLES=OFF \
@@ -317,8 +370,8 @@ RUN scl enable devtoolset-8 -- cmake3 -B build . \
 	-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
+RUN cmake3 --build build -j$(nproc)
+RUN DESTDIR="$LibrariesPath/openal-cache" cmake3 --install build
 
 WORKDIR ..
 RUN rm -rf openal
@@ -329,9 +382,9 @@ 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
+RUN ./config --prefix="$OPENSSL_PREFIX" no-tests
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/openssl-cache" install_sw
 
 WORKDIR ..
 RUN rm -rf $opensslDir
@@ -340,14 +393,14 @@ 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 \
+RUN ./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
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/xkbcommon-cache" install
 
 WORKDIR ..
 RUN rm -rf libxkbcommon
@@ -357,6 +410,11 @@ FROM patches AS qt
 COPY --from=libffi ${LibrariesPath}/libffi-cache /
 COPY --from=mozjpeg ${LibrariesPath}/mozjpeg-cache /
 COPY --from=xcb ${LibrariesPath}/xcb-cache /
+COPY --from=xcb-wm ${LibrariesPath}/xcb-wm-cache /
+COPY --from=xcb-util ${LibrariesPath}/xcb-util-cache /
+COPY --from=xcb-image ${LibrariesPath}/xcb-image-cache /
+COPY --from=xcb-keysyms ${LibrariesPath}/xcb-keysyms-cache /
+COPY --from=xcb-render-util ${LibrariesPath}/xcb-render-util-cache /
 COPY --from=libXext ${LibrariesPath}/libXext-cache /
 COPY --from=libXfixes ${LibrariesPath}/libXfixes-cache /
 COPY --from=libXi ${LibrariesPath}/libXi-cache /
@@ -365,37 +423,42 @@ 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}
+RUN git clone -b ${QT_TAG} --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" \
+# I couldn't make it work with direct ./configure call :(
+RUN echo './configure -prefix '$'\"''$QT_PREFIX'$'\"'' \
 	-release \
 	-opensource \
 	-confirm-license \
+	-xcb \
 	-qt-libpng \
 	-qt-harfbuzz \
 	-qt-pcre \
-	-qt-xcb \
 	-no-icu \
 	-no-gtk \
+	-no-feature-wayland-server \
 	-static \
 	-dbus-runtime \
 	-openssl-linked \
-	-I "$OPENSSL_PREFIX/include" OPENSSL_LIBS="$OPENSSL_PREFIX/lib/libssl.a $OPENSSL_PREFIX/lib/libcrypto.a -lz -ldl -lpthread" \
+	-I '$'\"''$OPENSSL_PREFIX/include'$'\"'' \
+	OPENSSL_LIBS='$'\"''$OPENSSL_PREFIX/lib/libssl.a $OPENSSL_PREFIX/lib/libcrypto.a -lz -ldl -lpthread'$'\"'' \
 	-nomake examples \
 	-nomake tests \
-	-L /usr/local/lib64
+	-L /usr/local/lib64' >> ./run_configure.sh
+RUN cat ./run_configure.sh
+RUN chmod a+x ./run_configure.sh
+RUN ./run_configure.sh
+RUN rm ./run_configure.sh
 
-RUN scl enable devtoolset-8 -- make -j$(nproc)
-RUN scl enable devtoolset-8 -- make INSTALL_ROOT="$LibrariesPath/qt-cache" install
+RUN make -j$(nproc)
+RUN make INSTALL_ROOT="$LibrariesPath/qt-cache" install
 
 WORKDIR ..
 RUN rm -rf qt_${QT}
@@ -419,9 +482,9 @@ 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
+RUN ./configure
+RUN make -j$(nproc)
+RUN make DESTDIR="$BreakpadCache" install
 
 WORKDIR src
 RUN rm -rf testing
@@ -432,8 +495,8 @@ 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 cmake3 .
+RUN cmake3 --build . --target dump_syms -j$(nproc)
 RUN mv dump_syms $BreakpadCache
 
 WORKDIR ..
@@ -451,7 +514,7 @@ 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 . \
+RUN cmake3 -B out/Release . \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DTG_OWT_SPECIAL_TARGET=linux \
 	-DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \
@@ -459,7 +522,17 @@ RUN scl enable devtoolset-8 -- cmake3 -B out/Release . \
 	-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
+RUN cmake3 --build out/Release -- -j8
+
+RUN cmake3 -B out/Debug . \
+	-DCMAKE_BUILD_TYPE=Debug \
+	-DTG_OWT_SPECIAL_TARGET=linux \
+	-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
+
+RUN cmake3 --build out/Debug -- -j8
 
 FROM builder
 
@@ -468,6 +541,11 @@ 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=xcb-wm ${LibrariesPath}/xcb-wm-cache /
+COPY --from=xcb-util ${LibrariesPath}/xcb-util-cache /
+COPY --from=xcb-image ${LibrariesPath}/xcb-image-cache /
+COPY --from=xcb-keysyms ${LibrariesPath}/xcb-keysyms-cache /
+COPY --from=xcb-render-util ${LibrariesPath}/xcb-render-util-cache /
 COPY --from=libXext ${LibrariesPath}/libXext-cache /
 COPY --from=libXfixes ${LibrariesPath}/libXfixes-cache /
 COPY --from=libXi ${LibrariesPath}/libXi-cache /
diff --git a/Telegram/build/docker/centos_env/prepare.sh b/Telegram/build/docker/centos_env/prepare.sh
new file mode 100755
index 000000000..c25644aa8
--- /dev/null
+++ b/Telegram/build/docker/centos_env/prepare.sh
@@ -0,0 +1,7 @@
+set -e
+FullExecPath=$PWD
+pushd `dirname $0` > /dev/null
+FullScriptPath=`pwd`
+popd > /dev/null
+
+docker build -t tdesktop:centos_env "$FullScriptPath/"
diff --git a/Telegram/build/docker/centos_env/run.sh b/Telegram/build/docker/centos_env/run.sh
new file mode 100755
index 000000000..2e65751cf
--- /dev/null
+++ b/Telegram/build/docker/centos_env/run.sh
@@ -0,0 +1,26 @@
+set -e
+FullExecPath=$PWD
+pushd `dirname $0` > /dev/null
+FullScriptPath=`pwd`
+popd > /dev/null
+
+if [ ! -d "$FullScriptPath/../../../../../DesktopPrivate" ]; then
+  echo ""
+  echo "This script is for building the production version of Telegram Desktop."
+  echo ""
+  echo "For building custom versions please visit the build instructions page at:"
+  echo "https://github.com/telegramdesktop/tdesktop/#build-instructions"
+  exit
+fi
+
+Error () {
+  cd $FullExecPath
+  echo "$1"
+  exit 1
+}
+
+if [ "$1" == "" ]; then
+  Error "Script not found!"
+fi
+
+docker run -it --rm --cpus=8 --memory=10g -v $HOME/Telegram/DesktopPrivate:/usr/src/DesktopPrivate -v $HOME/Telegram/tdesktop:/usr/src/tdesktop tdesktop:centos_env $1

From 74d23137844ad43ba746a481373dc4daf5d003a8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 4 Nov 2020 18:50:17 +0300
Subject: [PATCH 010/370] Build Linux version with Qt 5.15.1 in CentOS 7
 docker.

---
 Telegram/SourceFiles/apiwrap.cpp              |  5 +-
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |  2 +-
 .../boxes/peers/edit_participant_box.cpp      |  3 +-
 Telegram/SourceFiles/calls/calls_panel.cpp    |  2 +-
 .../chat_helpers/emoji_suggestions_widget.cpp |  6 +-
 .../chat_helpers/stickers_list_widget.cpp     |  4 +-
 Telegram/SourceFiles/core/application.cpp     |  3 +-
 .../SourceFiles/core/crash_report_window.cpp  | 10 +--
 Telegram/SourceFiles/core/sandbox.cpp         |  6 +-
 Telegram/SourceFiles/core/update_checker.cpp  | 10 ++-
 .../SourceFiles/data/data_peer_values.cpp     |  3 +-
 Telegram/SourceFiles/data/data_web_page.cpp   |  3 +-
 .../export/view/export_view_settings.cpp      |  3 +-
 .../history/history_item_components.cpp       |  3 +-
 .../media/clip/media_clip_reader.h            |  2 +-
 .../media/view/media_view_overlay_widget.cpp  | 20 +++---
 .../SourceFiles/media/view/media_view_pip.cpp |  4 +-
 .../mtproto/details/mtproto_tcp_socket.cpp    |  6 +-
 .../mtproto/details/mtproto_tls_socket.cpp    |  6 +-
 .../mtproto/mtproto_dc_options.cpp            |  3 +-
 .../mtproto/special_config_request.cpp        |  4 +-
 .../SourceFiles/overview/overview_layout.cpp  |  3 +-
 .../platform/linux/file_utilities_linux.cpp   |  4 +-
 .../platform/linux/file_utilities_linux.h     |  2 +-
 .../linux/linux_desktop_environment.cpp       |  3 +-
 .../platform/linux/specific_linux.cpp         | 35 +++++----
 .../platform/mac/file_utilities_mac.mm        |  9 ++-
 .../platform/win/file_utilities_win.cpp       |  6 +-
 .../platform/win/main_window_win.cpp          |  2 +-
 .../profile/profile_block_peer_list.h         |  2 +-
 .../SourceFiles/storage/file_download_web.cpp |  6 +-
 .../support/support_autocomplete.cpp          |  3 +-
 Telegram/SourceFiles/ui/countryinput.cpp      |  3 +-
 .../SourceFiles/ui/widgets/separate_panel.cpp |  1 -
 .../themes/window_theme_editor_block.cpp      |  3 +-
 .../SourceFiles/window/window_title_qt.cpp    |  2 +-
 Telegram/ThirdParty/fcitx-qt5                 |  2 +-
 Telegram/build/build.sh                       | 72 ++-----------------
 Telegram/build/docker/build.sh                | 17 ++++-
 Telegram/codegen                              |  2 +-
 Telegram/lib_base                             |  2 +-
 Telegram/lib_lottie                           |  2 +-
 Telegram/lib_qr                               |  2 +-
 Telegram/lib_spellcheck                       |  2 +-
 Telegram/lib_ui                               |  2 +-
 Telegram/lib_webrtc                           |  2 +-
 cmake                                         |  2 +-
 47 files changed, 131 insertions(+), 168 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index f97437270..d21aec624 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -42,6 +42,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "base/openssl_help.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 #include "base/call_delayed.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
@@ -3277,7 +3278,7 @@ void ApiWrap::requestMessageAfterDate(
 	// So we request a message with offset_date = desired_date - 1 and add_offset = -1.
 	// This should give us the first message with date >= desired_date.
 	auto offsetId = 0;
-	auto offsetDate = static_cast<int>(QDateTime(date).toTime_t()) - 1;
+	auto offsetDate = static_cast<int>(base::QDateToDateTime(date).toTime_t()) - 1;
 	auto addOffset = -1;
 	auto limit = 1;
 	auto maxId = 0;
@@ -3365,7 +3366,7 @@ void ApiWrap::jumpToHistoryDate(not_null<PeerData*> peer, const QDate &date) {
 //		const QDate &date,
 //		Callback &&callback) {
 //	const auto offsetId = 0;
-//	const auto offsetDate = static_cast<TimeId>(QDateTime(date).toTime_t());
+//	const auto offsetDate = static_cast<TimeId>(base::QDateToDateTime(date).toTime_t());
 //	const auto addOffset = -2;
 //	const auto limit = 1;
 //	const auto hash = 0;
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 9b8a5d51e..5a08ed6e7 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -178,7 +178,7 @@ void PeerListBox::resizeEvent(QResizeEvent *e) {
 
 void PeerListBox::paintEvent(QPaintEvent *e) {
 	Painter p(this);
-	for (auto rect : e->region().rects()) {
+	for (const auto rect : e->region()) {
 		p.fillRect(rect, st::contactsBg);
 	}
 }
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
index ab18b9f87..c6fbac836 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
@@ -34,6 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "core/core_cloud_password.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 #include "apiwrap.h"
 #include "main/main_session.h"
 #include "styles/style_layers.h"
@@ -694,7 +695,7 @@ void EditRestrictedBox::showRestrictUntil() {
 			highlighted,
 			[this](const QDate &date) {
 				setRestrictUntil(
-					static_cast<int>(QDateTime(date).toTime_t()));
+					static_cast<int>(base::QDateToDateTime(date).toTime_t()));
 			}),
 		Ui::LayerOption::KeepOther);
 	_restrictUntilBox->setMaxDate(
diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index 10b1d6bd3..217924d13 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -981,7 +981,7 @@ void Panel::paint(QRect clip) {
 	if (!_incoming->isHidden()) {
 		region = region.subtracted(QRegion(_incoming->geometry()));
 	}
-	for (const auto rect : region.rects()) {
+	for (const auto rect : region) {
 		p.fillRect(rect, st::callBgOpaque);
 	}
 	if (_incoming && _incoming->isHidden()) {
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
index c3693d3b3..772d2e0ce 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
@@ -171,10 +171,8 @@ bool SuggestionsWidget::eventHook(QEvent *e) {
 }
 
 void SuggestionsWidget::scrollByWheelEvent(not_null<QWheelEvent*> e) {
-	const auto horizontal = (e->angleDelta().x() != 0)
-		|| (e->orientation() == Qt::Horizontal);
-	const auto vertical = (e->angleDelta().y() != 0)
-		|| (e->orientation() == Qt::Vertical);
+	const auto horizontal = (e->angleDelta().x() != 0);
+	const auto vertical = (e->angleDelta().y() != 0);
 	const auto current = scrollCurrent();
 	const auto scroll = [&] {
 		if (horizontal) {
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index bece2cd01..d2534c7ed 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -614,8 +614,8 @@ bool StickersListWidget::Footer::eventHook(QEvent *e) {
 
 void StickersListWidget::Footer::scrollByWheelEvent(
 		not_null<QWheelEvent*> e) {
-	auto horizontal = (e->angleDelta().x() != 0 || e->orientation() == Qt::Horizontal);
-	auto vertical = (e->angleDelta().y() != 0 || e->orientation() == Qt::Vertical);
+	auto horizontal = (e->angleDelta().x() != 0);
+	auto vertical = (e->angleDelta().y() != 0);
 	if (horizontal) {
 		_horizontal = true;
 	}
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 74152204e..8058a0f32 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -79,6 +79,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtWidgets/QDesktopWidget>
 #include <QtCore/QMimeDatabase>
 #include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
 
 namespace Core {
 namespace {
@@ -941,7 +942,7 @@ QPoint Application::getPointForCallPanelCenter() const {
 	if (const auto window = activeWindow()) {
 		return window->getPointForCallPanelCenter();
 	}
-	return QApplication::desktop()->screenGeometry().center();
+	return QGuiApplication::primaryScreen()->geometry().center();
 }
 
 // macOS Qt bug workaround, sometimes no leaveEvent() gets to the nested widgets.
diff --git a/Telegram/SourceFiles/core/crash_report_window.cpp b/Telegram/SourceFiles/core/crash_report_window.cpp
index 4f69672b8..26277e331 100644
--- a/Telegram/SourceFiles/core/crash_report_window.cpp
+++ b/Telegram/SourceFiles/core/crash_report_window.cpp
@@ -39,7 +39,7 @@ PreLaunchWindow::PreLaunchWindow(QString title) {
 	setWindowTitle(title.isEmpty() ? qsl("Telegram") : title);
 
 	QPalette p(palette());
-	p.setColor(QPalette::Background, QColor(255, 255, 255));
+	p.setColor(QPalette::Window, QColor(255, 255, 255));
 	setPalette(p);
 
 	QLabel tmp(this);
@@ -79,7 +79,7 @@ PreLaunchLabel::PreLaunchLabel(QWidget *parent) : QLabel(parent) {
 	setFont(labelFont);
 
 	QPalette p(palette());
-	p.setColor(QPalette::Foreground, QColor(0, 0, 0));
+	p.setColor(QPalette::WindowText, QColor(0, 0, 0));
 	setPalette(p);
 	show();
 };
@@ -97,7 +97,7 @@ PreLaunchInput::PreLaunchInput(QWidget *parent, bool password) : QLineEdit(paren
 	setFont(logFont);
 
 	QPalette p(palette());
-	p.setColor(QPalette::Foreground, QColor(0, 0, 0));
+	p.setColor(QPalette::WindowText, QColor(0, 0, 0));
 	setPalette(p);
 
 	QLineEdit::setTextMargins(0, 0, 0, 0);
@@ -115,7 +115,7 @@ PreLaunchLog::PreLaunchLog(QWidget *parent) : QTextEdit(parent) {
 	setFont(logFont);
 
 	QPalette p(palette());
-	p.setColor(QPalette::Foreground, QColor(96, 96, 96));
+	p.setColor(QPalette::WindowText, QColor(96, 96, 96));
 	setPalette(p);
 
 	setReadOnly(true);
@@ -783,7 +783,7 @@ void LastCrashedWindow::updateControls() {
 	}
 
 	QRect scr(QApplication::primaryScreen()->availableGeometry());
-	QSize s(2 * padding + QFontMetrics(_label.font()).width(qsl("Last time Telegram Desktop was not closed properly.")) + padding + _networkSettings.width(), h);
+	QSize s(2 * padding + QFontMetrics(_label.font()).horizontalAdvance(qsl("Last time Telegram Desktop was not closed properly.")) + padding + _networkSettings.width(), h);
 	if (s == size()) {
 		resizeEvent(0);
 	} else {
diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 3f6f47cb5..ecbe4d8f3 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/invoke_queued.h"
 #include "base/qthelp_url.h"
 #include "base/qthelp_regex.h"
+#include "base/qt_adapters.h"
 #include "ui/effects/animations.h"
 #include "facades.h"
 #include "app.h"
@@ -35,9 +36,6 @@ namespace {
 
 constexpr auto kEmptyPidForCommandResponse = 0ULL;
 
-using ErrorSignal = void(QLocalSocket::*)(QLocalSocket::LocalSocketError);
-const auto QLocalSocket_error = ErrorSignal(&QLocalSocket::error);
-
 QChar _toHex(ushort v) {
 	v = v & 0x000F;
 	return QChar::fromLatin1((v >= 10) ? ('a' + (v - 10)) : ('0' + v));
@@ -112,7 +110,7 @@ int Sandbox::start() {
 		[=] { socketDisconnected(); });
 	connect(
 		&_localSocket,
-		QLocalSocket_error,
+		base::QLocalSocket_error,
 		[=](QLocalSocket::LocalSocketError error) { socketError(error); });
 	connect(
 		&_localSocket,
diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
index af4ceec77..79320c9e1 100644
--- a/Telegram/SourceFiles/core/update_checker.cpp
+++ b/Telegram/SourceFiles/core/update_checker.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "base/bytes.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 #include "storage/localstorage.h"
 #include "core/application.h"
 #include "core/changelogs.h"
@@ -58,9 +59,6 @@ bool UpdaterIsDisabled = false;
 
 std::weak_ptr<Updater> UpdaterInstance;
 
-using ErrorSignal = void(QNetworkReply::*)(QNetworkReply::NetworkError);
-const auto QNetworkReply_error = ErrorSignal(&QNetworkReply::error);
-
 using Progress = UpdateChecker::Progress;
 using State = UpdateChecker::State;
 
@@ -626,7 +624,7 @@ void HttpChecker::start() {
 	_reply->connect(_reply, &QNetworkReply::finished, [=] {
 		gotResponse();
 	});
-	_reply->connect(_reply, QNetworkReply_error, [=](auto e) {
+	_reply->connect(_reply, base::QNetworkReply_error, [=](auto e) {
 		gotFailure(e);
 	});
 }
@@ -665,7 +663,7 @@ void HttpChecker::clearSentRequest() {
 		return;
 	}
 	reply->disconnect(reply, &QNetworkReply::finished, nullptr, nullptr);
-	reply->disconnect(reply, QNetworkReply_error, nullptr, nullptr);
+	reply->disconnect(reply, base::QNetworkReply_error, nullptr, nullptr);
 	reply->abort();
 	reply->deleteLater();
 	_manager = nullptr;
@@ -819,7 +817,7 @@ void HttpLoaderActor::sendRequest() {
 		&HttpLoaderActor::partFinished);
 	connect(
 		_reply.get(),
-		QNetworkReply_error,
+		base::QNetworkReply_error,
 		this,
 		&HttpLoaderActor::partFailed);
 	connect(
diff --git a/Telegram/SourceFiles/data/data_peer_values.cpp b/Telegram/SourceFiles/data/data_peer_values.cpp
index 4074bd889..d0cf78fd0 100644
--- a/Telegram/SourceFiles/data/data_peer_values.cpp
+++ b/Telegram/SourceFiles/data/data_peer_values.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_chat.h"
 #include "data/data_user.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 
 namespace Data {
 namespace {
@@ -39,7 +40,7 @@ int OnlinePhraseChangeInSeconds(TimeId online, TimeId now) {
 		return (hours + 1) * 3600 - (now - online);
 	}
 	const auto nowFull = base::unixtime::parse(now);
-	const auto tomorrow = QDateTime(nowFull.date().addDays(1));
+	const auto tomorrow = base::QDateToDateTime(nowFull.date().addDays(1));
 	return std::max(static_cast<TimeId>(nowFull.secsTo(tomorrow)), 0);
 }
 
diff --git a/Telegram/SourceFiles/data/data_web_page.cpp b/Telegram/SourceFiles/data/data_web_page.cpp
index e08da3326..d0d5b895b 100644
--- a/Telegram/SourceFiles/data/data_web_page.cpp
+++ b/Telegram/SourceFiles/data/data_web_page.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_photo.h"
 #include "data/data_channel.h"
 #include "data/data_document.h"
+#include "base/qt_adapters.h"
 #include "ui/image/image.h"
 #include "ui/text/text_entity.h"
 
@@ -26,7 +27,7 @@ QString SiteNameFromUrl(const QString &url) {
 	if (m.hasMatch()) pretty = pretty.mid(m.capturedLength());
 	int32 slash = pretty.indexOf('/');
 	if (slash > 0) pretty = pretty.mid(0, slash);
-	QStringList components = pretty.split('.', QString::SkipEmptyParts);
+	QStringList components = pretty.split('.', base::QStringSkipEmptyParts);
 	if (components.size() >= 2) {
 		components = components.mid(components.size() - 2);
 		return components.at(0).at(0).toUpper() + components.at(0).mid(1) + '.' + components.at(1);
diff --git a/Telegram/SourceFiles/export/view/export_view_settings.cpp b/Telegram/SourceFiles/export/view/export_view_settings.cpp
index c06e8e38c..7fefa6639 100644
--- a/Telegram/SourceFiles/export/view/export_view_settings.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_settings.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/file_utilities.h"
 #include "boxes/calendar_box.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 #include "main/main_session.h"
 #include "styles/style_widgets.h"
 #include "styles/style_export.h"
@@ -478,7 +479,7 @@ void SettingsWidget::editDateLimit(
 		}));
 	};
 	const auto callback = crl::guard(this, [=](const QDate &date) {
-		done(base::unixtime::serialize(QDateTime(date)));
+		done(base::unixtime::serialize(base::QDateToDateTime(date)));
 		if (const auto weak = shared->data()) {
 			weak->closeBox();
 		}
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 8a7f5e784..4215341c9 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "window/window_session_controller.h"
 #include "facades.h"
+#include "base/qt_adapters.h"
 #include "styles/style_widgets.h"
 #include "styles/style_chat.h"
 
@@ -109,7 +110,7 @@ HiddenSenderInfo::HiddenSenderInfo(const QString &name)
 , colorPeerId(Data::FakePeerIdForJustName(name))
 , userpic(Data::PeerUserpicColor(colorPeerId), name) {
 	nameText.setText(st::msgNameStyle, name, Ui::NameTextOptions());
-	const auto parts = name.trimmed().split(' ', QString::SkipEmptyParts);
+	const auto parts = name.trimmed().split(' ', base::QStringSkipEmptyParts);
 	firstName = parts[0];
 	for (const auto &part : parts.mid(1)) {
 		if (!lastName.isEmpty()) {
diff --git a/Telegram/SourceFiles/media/clip/media_clip_reader.h b/Telegram/SourceFiles/media/clip/media_clip_reader.h
index 9a86e68eb..b4ea5a3e9 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_reader.h
+++ b/Telegram/SourceFiles/media/clip/media_clip_reader.h
@@ -226,7 +226,7 @@ public:
 	~Manager();
 
 	int loadLevel() const {
-		return _loadLevel.load();
+		return _loadLevel;
 	}
 	void append(Reader *reader, const Core::FileLocation &location, const QByteArray &data);
 	void start(Reader *reader);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index e3ce5df7b..47c119cd4 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -2968,13 +2968,11 @@ void OverlayWidget::validatePhotoCurrentImage() {
 
 void OverlayWidget::paintEvent(QPaintEvent *e) {
 	const auto r = e->rect();
-	const auto &region = e->region();
-	const auto rects = region.rects();
-
+	const auto region = e->region();
 	const auto contentShown = _photo || documentContentShown();
-	const auto bgRects = contentShown
-		? (region - contentRect()).rects()
-		: rects;
+	const auto bgRegion = contentShown
+		? (region - contentRect())
+		: region;
 
 	auto ms = crl::now();
 
@@ -2988,7 +2986,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
 	const auto m = p.compositionMode();
 	p.setCompositionMode(QPainter::CompositionMode_Source);
 	const auto bgColor = _fullScreenVideo ? st::mediaviewVideoBg : st::mediaviewBg;
-	for (const auto &rect : bgRects) {
+	for (const auto rect : bgRegion) {
 		p.fillRect(rect, bgColor);
 	}
 	p.setCompositionMode(m);
@@ -3084,7 +3082,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
 			auto o = overLevel(OverLeftNav);
 			if (o > 0) {
 				p.setOpacity(o * co);
-				for (const auto &rect : rects) {
+				for (const auto &rect : region) {
 					const auto fill = _leftNav.intersected(rect);
 					if (!fill.isEmpty()) p.fillRect(fill, st::mediaviewControlBg);
 				}
@@ -3100,7 +3098,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
 			auto o = overLevel(OverRightNav);
 			if (o > 0) {
 				p.setOpacity(o * co);
-				for (const auto &rect : rects) {
+				for (const auto &rect : region) {
 					const auto fill = _rightNav.intersected(rect);
 					if (!fill.isEmpty()) p.fillRect(fill, st::mediaviewControlBg);
 				}
@@ -3116,7 +3114,7 @@ void OverlayWidget::paintEvent(QPaintEvent *e) {
 			auto o = overLevel(OverClose);
 			if (o > 0) {
 				p.setOpacity(o * co);
-				for (const auto &rect : rects) {
+				for (const auto &rect : region) {
 					const auto fill = _closeNav.intersected(rect);
 					if (!fill.isEmpty()) p.fillRect(fill, st::mediaviewControlBg);
 				}
@@ -4151,7 +4149,7 @@ bool OverlayWidget::eventHook(QEvent *e) {
 		} else {
 			_accumScroll += ev->angleDelta();
 			if (ev->phase() == Qt::ScrollEnd) {
-				if (ev->orientation() == Qt::Horizontal) {
+				if (ev->angleDelta().x() != 0) {
 					if (_accumScroll.x() * _accumScroll.x() > _accumScroll.y() * _accumScroll.y() && _accumScroll.x() != 0) {
 						moveToNext(_accumScroll.x() > 0 ? -1 : 1);
 					}
diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
index 6c2dadb3e..3059d8993 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
@@ -334,7 +334,7 @@ Qt::Edges RectPartToQtEdges(RectPart rectPart) {
 		return Qt::BottomEdge;
 	}
 
-	return 0;
+	return Qt::Edges();
 }
 
 } // namespace
@@ -591,7 +591,7 @@ void PipPanel::paintEvent(QPaintEvent *e) {
 	QPainter p(this);
 
 	if (_useTransparency) {
-		Ui::Platform::StartTranslucentPaint(p, e->region().rects());
+		Ui::Platform::StartTranslucentPaint(p, e->region());
 	}
 
 	auto request = FrameRequest();
diff --git a/Telegram/SourceFiles/mtproto/details/mtproto_tcp_socket.cpp b/Telegram/SourceFiles/mtproto/details/mtproto_tcp_socket.cpp
index 53680461a..aec382f3d 100644
--- a/Telegram/SourceFiles/mtproto/details/mtproto_tcp_socket.cpp
+++ b/Telegram/SourceFiles/mtproto/details/mtproto_tcp_socket.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/details/mtproto_tcp_socket.h"
 
 #include "base/invoke_queued.h"
+#include "base/qt_adapters.h"
 
 namespace MTP::details {
 
@@ -33,12 +34,9 @@ TcpSocket::TcpSocket(not_null<QThread*> thread, const QNetworkProxy &proxy)
 		&_socket,
 		&QTcpSocket::readyRead,
 		wrap([=] { _readyRead.fire({}); }));
-
-	using ErrorSignal = void(QTcpSocket::*)(QAbstractSocket::SocketError);
-	const auto QTcpSocket_error = ErrorSignal(&QAbstractSocket::error);
 	connect(
 		&_socket,
-		QTcpSocket_error,
+		base::QTcpSocket_error,
 		wrap([=](Error e) { handleError(e); }));
 }
 
diff --git a/Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp b/Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp
index b8cb2bb12..34030993a 100644
--- a/Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp
+++ b/Telegram/SourceFiles/mtproto/details/mtproto_tls_socket.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/bytes.h"
 #include "base/invoke_queued.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 
 #include <QtCore/QtEndian>
 #include <range/v3/algorithm/reverse.hpp>
@@ -470,12 +471,9 @@ TlsSocket::TlsSocket(
 		&_socket,
 		&QTcpSocket::readyRead,
 		wrap([=] { plainReadyRead(); }));
-
-	using ErrorSignal = void(QTcpSocket::*)(QAbstractSocket::SocketError);
-	const auto QTcpSocket_error = ErrorSignal(&QAbstractSocket::error);
 	connect(
 		&_socket,
-		QTcpSocket_error,
+		base::QTcpSocket_error,
 		wrap([=](Error e) { handleError(e); }));
 }
 
diff --git a/Telegram/SourceFiles/mtproto/mtproto_dc_options.cpp b/Telegram/SourceFiles/mtproto/mtproto_dc_options.cpp
index bb9211567..f232c2eb6 100644
--- a/Telegram/SourceFiles/mtproto/mtproto_dc_options.cpp
+++ b/Telegram/SourceFiles/mtproto/mtproto_dc_options.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/facade.h"
 #include "mtproto/connection_tcp.h"
 #include "storage/serialize_common.h"
+#include "base/qt_adapters.h"
 
 #include <QtCore/QFile>
 #include <QtCore/QRegularExpression>
@@ -779,7 +780,7 @@ bool DcOptions::loadFromFile(const QString &path) {
 	stream.setCodec("UTF-8");
 	while (!stream.atEnd()) {
 		auto line = stream.readLine();
-		auto components = line.split(QRegularExpression(R"(\s)"), QString::SkipEmptyParts);
+		auto components = line.split(QRegularExpression(R"(\s)"), base::QStringSkipEmptyParts);
 		if (components.isEmpty() || components[0].startsWith('#')) {
 			continue;
 		}
diff --git a/Telegram/SourceFiles/mtproto/special_config_request.cpp b/Telegram/SourceFiles/mtproto/special_config_request.cpp
index 0d99e881c..f93c8539b 100644
--- a/Telegram/SourceFiles/mtproto/special_config_request.cpp
+++ b/Telegram/SourceFiles/mtproto/special_config_request.cpp
@@ -79,9 +79,9 @@ bool CheckPhoneByPrefixesRules(const QString &phone, const QString &rules) {
 }
 
 QByteArray ConcatenateDnsTxtFields(const std::vector<DnsEntry> &response) {
-	auto entries = QMap<int, QString>();
+	auto entries = QMultiMap<int, QString>();
 	for (const auto &entry : response) {
-		entries.insertMulti(INT_MAX - entry.data.size(), entry.data);
+		entries.insert(INT_MAX - entry.data.size(), entry.data);
 	}
 	return QStringList(entries.values()).join(QString()).toLatin1();
 }
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 57d25bdf4..470d68f09 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -34,6 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_components.h"
 #include "history/view/history_view_cursor_state.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 #include "ui/effects/round_checkbox.h"
 #include "ui/image/image.h"
 #include "ui/text/format_values.h"
@@ -1518,7 +1519,7 @@ Link::Link(
 			domain = parts.at(2);
 		}
 
-		parts = domain.split('@').back().split('.', QString::SkipEmptyParts);
+		parts = domain.split('@').back().split('.', base::QStringSkipEmptyParts);
 		if (parts.size() > 1) {
 			_letter = parts.at(parts.size() - 2).at(0).toUpper();
 			if (_title.isEmpty()) {
diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index 552ed888a..41b68d79c 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/linux_desktop_environment.h"
 #include "platform/linux/specific_linux.h"
 #include "storage/localstorage.h"
+#include "base/qt_adapters.h"
 
 #include <QtGui/QDesktopServices>
 
@@ -387,7 +388,7 @@ QStringList cleanFilterList(const QString &filter) {
 	int i = regexp.indexIn(f);
 	if (i >= 0)
 		f = regexp.cap(2);
-	return f.split(QLatin1Char(' '), QString::SkipEmptyParts);
+	return f.split(QLatin1Char(' '), base::QStringSkipEmptyParts);
 }
 
 } // namespace
@@ -585,7 +586,6 @@ GtkFileChooserAction gtkFileChooserAction(QFileDialog::FileMode fileMode, QFileD
 		else
 			return GTK_FILE_CHOOSER_ACTION_SAVE;
 	case QFileDialog::Directory:
-	case QFileDialog::DirectoryOnly:
 	default:
 		if (acceptMode == QFileDialog::AcceptOpen)
 			return GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h
index 13fe85301..4b57d656e 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h
@@ -141,7 +141,7 @@ private:
 	void hideHelper();
 
 	// Options
-	QFileDialog::Options _options = { 0 };
+	QFileDialog::Options _options;
 	QString _windowTitle = "Choose file";
 	QString _initialDirectory;
 	QStringList _initialFiles;
diff --git a/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp b/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp
index 61f95452a..9a74925e0 100644
--- a/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/linux_desktop_environment.h"
 
 #include "platform/linux/specific_linux.h"
+#include "base/qt_adapters.h"
 
 namespace Platform {
 namespace DesktopEnvironment {
@@ -22,7 +23,7 @@ QString GetEnv(const char *name) {
 
 Type Compute() {
 	auto xdgCurrentDesktop = GetEnv("XDG_CURRENT_DESKTOP").toLower();
-	auto list = xdgCurrentDesktop.split(':', QString::SkipEmptyParts);
+	auto list = xdgCurrentDesktop.split(':', base::QStringSkipEmptyParts);
 	auto desktopSession = GetEnv("DESKTOP_SESSION").toLower();
 	auto slash = desktopSession.lastIndexOf('/');
 	auto kdeSession = GetEnv("KDE_SESSION_VERSION");
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index c1daf15d0..3a833dd78 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -10,6 +10,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 "base/qt_adapters.h"
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
@@ -248,14 +249,14 @@ bool GenerateDesktopFile(
 					QRegularExpression::MultilineOption),
 				qsl("TryExec=")
 					+ QFile::encodeName(cExeDir() + cExeName())
-						.replace('\\', qsl("\\\\")));
+						.replace('\\', "\\\\"));
 			fileText = fileText.replace(
 				QRegularExpression(
 					qsl("^Exec=.*$"),
 					QRegularExpression::MultilineOption),
 				qsl("Exec=")
 					+ EscapeShell(QFile::encodeName(cExeDir() + cExeName()))
-						.replace('\\', qsl("\\\\"))
+						.replace('\\', "\\\\")
 					+ (args.isEmpty() ? QString() : ' ' + args));
 		} else {
 			fileText = fileText.replace(
@@ -1025,7 +1026,7 @@ namespace Platform {
 
 void start() {
 	PlatformThemes = QString::fromUtf8(qgetenv("QT_QPA_PLATFORMTHEME"))
-		.split(':', QString::SkipEmptyParts);
+		.split(':', base::QStringSkipEmptyParts);
 
 	LOG(("Launcher filename: %1").arg(GetLauncherFilename()));
 
@@ -1249,27 +1250,35 @@ void OpenSystemSettingsForPermission(PermissionType type) {
 
 bool OpenSystemSettings(SystemSettingsType type) {
 	if (type == SystemSettingsType::Audio) {
-		auto options = std::vector<QString>();
-		const auto add = [&](const char *option) {
-			options.emplace_back(option);
+		struct Command {
+			QString command;
+			QStringList arguments;
+		};
+		auto options = std::vector<Command>();
+		const auto add = [&](const char *option, const char *arg = nullptr) {
+			auto command = Command{ .command = option };
+			if (arg) {
+				command.arguments.push_back(arg);
+			}
+			options.push_back(std::move(command));
 		};
 		if (DesktopEnvironment::IsUnity()) {
-			add("unity-control-center sound");
+			add("unity-control-center", "sound");
 		} else if (DesktopEnvironment::IsKDE()) {
-			add("kcmshell5 kcm_pulseaudio");
-			add("kcmshell4 phonon");
+			add("kcmshell5", "kcm_pulseaudio");
+			add("kcmshell4", "phonon");
 		} else if (DesktopEnvironment::IsGnome()) {
-			add("gnome-control-center sound");
+			add("gnome-control-center", "sound");
 		} else if (DesktopEnvironment::IsCinnamon()) {
-			add("cinnamon-settings sound");
+			add("cinnamon-settings", "sound");
 		} else if (DesktopEnvironment::IsMATE()) {
 			add("mate-volume-control");
 		}
 		add("pavucontrol-qt");
 		add("pavucontrol");
 		add("alsamixergui");
-		return ranges::any_of(options, [](const QString &command) {
-			return QProcess::startDetached(command);
+		return ranges::any_of(options, [](const Command &command) {
+			return QProcess::startDetached(command.command, command.arguments);
 		});
 	}
 	return true;
diff --git a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
index 59f7f7329..3d678abe4 100644
--- a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
@@ -9,10 +9,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/platform/mac/base_utilities_mac.h"
 #include "lang/lang_keys.h"
+#include "base/qt_adapters.h"
 #include "styles/style_window.h"
 
 #include <QtWidgets/QApplication>
-#include <QtWidgets/QDesktopWidget>
+#include <QtGui/QScreen>
 
 #include <Cocoa/Cocoa.h>
 #include <CoreFoundation/CFURL.h>
@@ -398,7 +399,11 @@ bool UnsafeShowOpenWithDropdown(const QString &filepath, QPoint menuPosition) {
 	NSString *file = Q2NSString(filepath);
 	@try {
 		OpenFileWithInterface *menu = [[[OpenFileWithInterface alloc] init:file] autorelease];
-		auto r = QApplication::desktop()->screenGeometry(menuPosition);
+		const auto screen = base::QScreenNearestTo(menuPosition);
+		if (!screen) {
+			return false;
+		}
+		const auto r = screen->availableGeometry();
 		auto x = menuPosition.x();
 		auto y = r.y() + r.height() - menuPosition.y();
 		return !![menu popupAtX:x andY:y];
diff --git a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
index b515f8e65..6db8cffca 100644
--- a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
+++ b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
@@ -358,11 +358,7 @@ bool Get(
 		dialog.setAcceptMode(QFileDialog::AcceptOpen);
 	} else if (type == Type::ReadFolder) { // save dir
 		dialog.setAcceptMode(QFileDialog::AcceptOpen);
-
-		// We use "obsolete" value ::DirectoryOnly instead of ::Directory + ::ShowDirsOnly
-		// because in Windows XP native dialog this one works, while the "preferred" one
-		// shows a native file choose dialog where you can't choose a directory, only open one.
-		dialog.setFileMode(QFileDialog::DirectoryOnly);
+		dialog.setFileMode(QFileDialog::Directory);
 		dialog.setOption(QFileDialog::ShowDirsOnly);
 	} else { // save file
 		dialog.setFileMode(QFileDialog::AnyFile);
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp
index 10d625363..63c43fe43 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.cpp
+++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp
@@ -199,7 +199,7 @@ void MainWindow::psRefreshTaskbarIcon() {
 	refresher->setWindowFlags(static_cast<Qt::WindowFlags>(Qt::Tool) | Qt::FramelessWindowHint);
 	refresher->setGeometry(x() + 1, y() + 1, 1, 1);
 	auto palette = refresher->palette();
-	palette.setColor(QPalette::Background, (isActiveWindow() ? st::titleBgActive : st::titleBg)->c);
+	palette.setColor(QPalette::Window, (isActiveWindow() ? st::titleBgActive : st::titleBg)->c);
 	refresher->setPalette(palette);
 	refresher->show();
 	refresher->activateWindow();
diff --git a/Telegram/SourceFiles/profile/profile_block_peer_list.h b/Telegram/SourceFiles/profile/profile_block_peer_list.h
index 7ead3ab7a..69231da3b 100644
--- a/Telegram/SourceFiles/profile/profile_block_peer_list.h
+++ b/Telegram/SourceFiles/profile/profile_block_peer_list.h
@@ -72,7 +72,7 @@ public:
 	}
 	template <typename Predicate>
 	void sortItems(Predicate predicate) {
-		qSort(_items.begin(), _items.end(), std::move(predicate));
+		std::sort(_items.begin(), _items.end(), std::move(predicate));
 	}
 
 	void setPreloadMoreCallback(Fn<void()> callback) {
diff --git a/Telegram/SourceFiles/storage/file_download_web.cpp b/Telegram/SourceFiles/storage/file_download_web.cpp
index 73722eb50..3a963dc25 100644
--- a/Telegram/SourceFiles/storage/file_download_web.cpp
+++ b/Telegram/SourceFiles/storage/file_download_web.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/file_download_web.h"
 
 #include "storage/cache/storage_cache_types.h"
+#include "base/qt_adapters.h"
 
 #include <QtNetwork/QAuthenticator>
 
@@ -19,9 +20,6 @@ constexpr auto kResetDownloadPrioritiesTimeout = crl::time(200);
 
 std::weak_ptr<WebLoadManager> GlobalLoadManager;
 
-using ErrorSignal = void(QNetworkReply::*)(QNetworkReply::NetworkError);
-const auto QNetworkReply_error = ErrorSignal(&QNetworkReply::error);
-
 [[nodiscard]] std::shared_ptr<WebLoadManager> GetManager() {
 	auto result = GlobalLoadManager.lock();
 	if (!result) {
@@ -270,7 +268,7 @@ not_null<QNetworkReply*> WebLoadManager::send(int id, const QString &url) {
 		failed(id, result, error);
 	};
 	connect(result, &QNetworkReply::downloadProgress, handleProgress);
-	connect(result, QNetworkReply_error, handleError);
+	connect(result, base::QNetworkReply_error, handleError);
 	return result;
 }
 
diff --git a/Telegram/SourceFiles/support/support_autocomplete.cpp b/Telegram/SourceFiles/support/support_autocomplete.cpp
index 5222f63ff..e6b96c52c 100644
--- a/Telegram/SourceFiles/support/support_autocomplete.cpp
+++ b/Telegram/SourceFiles/support/support_autocomplete.cpp
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "base/unixtime.h"
 #include "base/call_delayed.h"
+#include "base/qt_adapters.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "apiwrap.h"
@@ -484,7 +485,7 @@ void Autocomplete::submitValue(const QString &value) {
 		const auto contact = value.mid(
 			prefix.size(),
 			(line > 0) ? (line - prefix.size()) : -1);
-		const auto parts = contact.split(' ', QString::SkipEmptyParts);
+		const auto parts = contact.split(' ', base::QStringSkipEmptyParts);
 		if (parts.size() > 1) {
 			const auto phone = parts[0];
 			const auto firstName = parts[1];
diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp
index b1bed7429..99ae478d8 100644
--- a/Telegram/SourceFiles/ui/countryinput.cpp
+++ b/Telegram/SourceFiles/ui/countryinput.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/multi_select.h"
 #include "ui/effects/ripple_animation.h"
 #include "data/data_countries.h"
+#include "base/qt_adapters.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_intro.h"
@@ -248,7 +249,7 @@ CountrySelectBox::Inner::Inner(QWidget *parent, Type type)
 				: QString());
 		const auto namesList = std::move(full).toLower().split(
 			QRegularExpression("[\\s\\-]"),
-			QString::SkipEmptyParts);
+			base::QStringSkipEmptyParts);
 		auto &names = _namesList.emplace_back();
 		names.reserve(namesList.size());
 		for (const auto &name : namesList) {
diff --git a/Telegram/SourceFiles/ui/widgets/separate_panel.cpp b/Telegram/SourceFiles/ui/widgets/separate_panel.cpp
index dfd0478fd..d2caed510 100644
--- a/Telegram/SourceFiles/ui/widgets/separate_panel.cpp
+++ b/Telegram/SourceFiles/ui/widgets/separate_panel.cpp
@@ -358,7 +358,6 @@ void SeparatePanel::initGeometry(QSize size) {
 			st::lineWidth,
 			st::lineWidth);
 	setAttribute(Qt::WA_OpaquePaintEvent, !_useTransparency);
-	const auto screen = QApplication::desktop()->screenGeometry(center);
 	const auto rect = [&] {
 		const QRect initRect(QPoint(), size);
 		return initRect.translated(center - initRect.center()).marginsAdded(_padding);
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
index 573cac4e5..59cfb29ec 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/edit_color_box.h"
 #include "lang/lang_keys.h"
 #include "base/call_delayed.h"
+#include "base/qt_adapters.h"
 
 namespace Window {
 namespace Theme {
@@ -154,7 +155,7 @@ void EditorBlock::Row::fillSearchIndex() {
 	_searchWords.clear();
 	_searchStartChars.clear();
 	auto toIndex = _name + ' ' + _copyOf + ' ' + TextUtilities::RemoveAccents(_description.toString()) + ' ' + _valueString;
-	auto words = toIndex.toLower().split(SearchSplitter, QString::SkipEmptyParts);
+	auto words = toIndex.toLower().split(SearchSplitter, base::QStringSkipEmptyParts);
 	for_const (auto &word, words) {
 		_searchWords.insert(word);
 		_searchStartChars.insert(word[0]);
diff --git a/Telegram/SourceFiles/window/window_title_qt.cpp b/Telegram/SourceFiles/window/window_title_qt.cpp
index 71cb2118a..fc210e1aa 100644
--- a/Telegram/SourceFiles/window/window_title_qt.cpp
+++ b/Telegram/SourceFiles/window/window_title_qt.cpp
@@ -393,7 +393,7 @@ Qt::Edges TitleWidgetQt::edgesFromPos(const QPoint &pos) {
 		>= (window()->height() - getResizeArea(Qt::BottomEdge))) {
 		return Qt::BottomEdge;
 	} else {
-		return 0;
+		return Qt::Edges();
 	}
 }
 
diff --git a/Telegram/ThirdParty/fcitx-qt5 b/Telegram/ThirdParty/fcitx-qt5
index 4abe66549..f95f76d63 160000
--- a/Telegram/ThirdParty/fcitx-qt5
+++ b/Telegram/ThirdParty/fcitx-qt5
@@ -1 +1 @@
-Subproject commit 4abe66549e13b33fd4baa84858d932e0178ce8c0
+Subproject commit f95f76d637990f66f056eb099d46e3b5e6e7366f
diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh
index 8e8cd5c05..5d9b64514 100755
--- a/Telegram/build/build.sh
+++ b/Telegram/build/build.sh
@@ -134,73 +134,13 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
     Error "Backup folder not found!"
   fi
 
-  ./configure.sh
+  ./build/docker/centos_env/run.sh /usr/src/tdesktop/Telegram/build/docker/build.sh
 
-  cd $ProjectPath
-  cmake --build . --config Release --target Telegram -- -j8
-  cd $ReleasePath
-
-  echo "$BinaryName build complete!"
-
-  if [ ! -f "$ReleasePath/$BinaryName" ]; then
-    Error "$BinaryName not found!"
-  fi
-
-  # BadCount=`objdump -T $ReleasePath/$BinaryName | grep GLIBC_2\.1[6-9] | wc -l`
-  # if [ "$BadCount" != "0" ]; then
-  #   Error "Bad GLIBC usages found: $BadCount"
-  # fi
-
-  # BadCount=`objdump -T $ReleasePath/$BinaryName | grep GLIBC_2\.2[0-9] | wc -l`
-  # if [ "$BadCount" != "0" ]; then
-  #   Error "Bad GLIBC usages found: $BadCount"
-  # fi
-
-  BadCount=`objdump -T $ReleasePath/$BinaryName | grep GCC_4\.[3-9] | wc -l`
-  if [ "$BadCount" != "0" ]; then
-    Error "Bad GCC usages found: $BadCount"
-  fi
-
-  BadCount=`objdump -T $ReleasePath/$BinaryName | grep GCC_[5-9]\. | wc -l`
-  if [ "$BadCount" != "0" ]; then
-    Error "Bad GCC usages found: $BadCount"
-  fi
-
-  if [ ! -f "$ReleasePath/Updater" ]; then
-    Error "Updater not found!"
-  fi
-
-  BadCount=`objdump -T $ReleasePath/Updater | grep GLIBC_2\.1[6-9] | wc -l`
-  if [ "$BadCount" != "0" ]; then
-    Error "Bad GLIBC usages found: $BadCount"
-  fi
-
-  BadCount=`objdump -T $ReleasePath/Updater | grep GLIBC_2\.2[0-9] | wc -l`
-  if [ "$BadCount" != "0" ]; then
-    Error "Bad GLIBC usages found: $BadCount"
-  fi
-
-  BadCount=`objdump -T $ReleasePath/Updater | grep GCC_4\.[3-9] | wc -l`
-  if [ "$BadCount" != "0" ]; then
-    Error "Bad GCC usages found: $BadCount"
-  fi
-
-  BadCount=`objdump -T $ReleasePath/Updater | grep GCC_[5-9]\. | wc -l`
-  if [ "$BadCount" != "0" ]; then
-    Error "Bad GCC usages found: $BadCount"
-  fi
-
-  echo "Dumping debug symbols.."
-  "$HomePath/../../Libraries/breakpad/out/Default/dump_syms" "$ReleasePath/$BinaryName" > "$ReleasePath/$BinaryName.sym"
-  echo "Done!"
-
-  echo "Stripping the executable.."
-  strip -s "$ReleasePath/$BinaryName"
-  echo "Done!"
-
-  echo "Removing RPATH.."
-  chrpath -d "$ReleasePath/$BinaryName"
-  echo "Done!"
+  echo "Copying from docker result folder."
+  cp "$ReleasePath/root/$BinaryName" "$ReleasePath/$BinaryName"
+  cp "$ReleasePath/root/$BinaryName.sym" "$ReleasePath/$BinaryName.sym"
+  cp "$ReleasePath/root/Updater" "$ReleasePath/Updater"
+  cp "$ReleasePath/root/Packer" "$ReleasePath/Packer"
 
   echo "Preparing version $AppVersionStrFull, executing Packer.."
   cd "$ReleasePath"
diff --git a/Telegram/build/docker/build.sh b/Telegram/build/docker/build.sh
index 4745a07bd..c9415e2f8 100755
--- a/Telegram/build/docker/build.sh
+++ b/Telegram/build/docker/build.sh
@@ -1,10 +1,25 @@
 #!/bin/bash
 
+set -e
+FullExecPath=$PWD
+pushd `dirname $0` > /dev/null
+FullScriptPath=`pwd`
+popd > /dev/null
+
+if [ ! -d "$FullScriptPath/../../../../DesktopPrivate" ]; then
+  echo ""
+  echo "This script is for building the production version of Telegram Desktop."
+  echo ""
+  echo "For building custom versions please visit the build instructions page at:"
+  echo "https://github.com/telegramdesktop/tdesktop/#build-instructions"
+  exit
+fi
+
 Run () {
   scl enable devtoolset-8 -- "$@"
 }
 
-HomePath=/usr/src/tdesktop/Telegram
+HomePath="$FullScriptPath/../.."
 cd $HomePath
 
 ProjectPath="$HomePath/../out"
diff --git a/Telegram/codegen b/Telegram/codegen
index 8b4686f24..127968de8 160000
--- a/Telegram/codegen
+++ b/Telegram/codegen
@@ -1 +1 @@
-Subproject commit 8b4686f24d80f1f8d6a4ad0d6a55bf1bb701f35a
+Subproject commit 127968de8129e8ccfa6ac50721c70415a5a087c3
diff --git a/Telegram/lib_base b/Telegram/lib_base
index ffe7a4681..03b7b4cd6 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit ffe7a4681ab4b11353c62c36d010db96f0f90fd8
+Subproject commit 03b7b4cd6f26ff53dff311438bf9c3f84dec13aa
diff --git a/Telegram/lib_lottie b/Telegram/lib_lottie
index b83eed168..fb40f379d 160000
--- a/Telegram/lib_lottie
+++ b/Telegram/lib_lottie
@@ -1 +1 @@
-Subproject commit b83eed16812f4de3c2537cd12722d3dece95021b
+Subproject commit fb40f379d82ffa1fc7506e9a8dddcf48847715ae
diff --git a/Telegram/lib_qr b/Telegram/lib_qr
index 9877397db..92ce41a69 160000
--- a/Telegram/lib_qr
+++ b/Telegram/lib_qr
@@ -1 +1 @@
-Subproject commit 9877397dbf97b7198d539a3994bf0e9619cf653c
+Subproject commit 92ce41a690a463eb462089a4eb1e51e019308018
diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck
index 053e44a10..8aede3acc 160000
--- a/Telegram/lib_spellcheck
+++ b/Telegram/lib_spellcheck
@@ -1 +1 @@
-Subproject commit 053e44a10107de4a0b7e9ad8826150c577db2a2b
+Subproject commit 8aede3acc9d386484d2774316e9d1a3d0c265dd5
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 9c9a4bc4d..d4c99701b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 9c9a4bc4d85d7d771e6ff1084fe2ffe2cc883941
+Subproject commit d4c99701b5210a2db83b1c0f13da1a62f48dfb80
diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
index d7c4f1f0b..52d52cad4 160000
--- a/Telegram/lib_webrtc
+++ b/Telegram/lib_webrtc
@@ -1 +1 @@
-Subproject commit d7c4f1f0b902158f065ea9fb6b7ec80fa0ceac45
+Subproject commit 52d52cad4e554dac1907224372d51fd40b9da92f
diff --git a/cmake b/cmake
index 94025be39..3a2d8a252 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 94025be392ab7e58115ac376cbf449cdca10de22
+Subproject commit 3a2d8a252d7e84547b532605aaa557a8c70d6d0f

From d9df82642d2ef25632a5af7673e01493af7798ed Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Nov 2020 16:41:59 +0300
Subject: [PATCH 011/370] Patch FFmpeg asm objects for Xcode 12 linking.

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

diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index f56d70158..949580ee8 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 a77e4d5
+    git checkout cdca495
     cd ../
     git clone https://chromium.googlesource.com/external/gyp
     git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@@ -39,14 +39,26 @@ Go to ***BuildPath*** and run
     git apply ../patches/gyp.diff
     ./setup.py build
     sudo ./setup.py install
-    cd ../..
+    cd ..
 
+    git clone -b macos_padding https://github.com/desktop-app/yasm.git
+    cd yasm
+    ./autogen.sh
+    make $MAKE_THREADS_CNT
+    cd ..
+
+    git clone https://github.com/desktop-app/macho_edit.git
+    cd macho_edit
+    xcodebuild build -configuration Release -project macho_edit.xcodeproj -target macho_edit
+    cd ..
+
+    cd ..
     mkdir -p Libraries/macos
     cd Libraries/macos
 
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout a77e4d5
+    git checkout cdca495
     cd ..
 
     git clone https://git.tukaani.org/xz.git
@@ -119,12 +131,15 @@ Go to ***BuildPath*** and run
     CFLAGS=`freetype-config --cflags`
     LDFLAGS=`freetype-config --libs`
     PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig
+    cp ../patches/macos_yasm_wrap.sh ./
 
     ./configure --prefix=/usr/local/macos \
     --extra-cflags="$MIN_VER $UNGUARDED" \
     --extra-cxxflags="$MIN_VER $UNGUARDED" \
     --extra-ldflags="$MIN_VER" \
-    --enable-protocol=file --enable-libopus \
+    --x86asmexe=`pwd`/macos_yasm_wrap.sh \
+    --enable-protocol=file \
+    --enable-libopus \
     --disable-programs \
     --disable-doc \
     --disable-network \

From 951bb22c3822d422bb7dcf76758dc86021828a4c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Nov 2020 20:18:11 +0300
Subject: [PATCH 012/370] Update docs/docker to use FFmpeg 4.2 / OpenAL 1.20.1.

---
 Telegram/build/docker/centos_env/Dockerfile | 4 ++--
 docs/building-cmake.md                      | 2 ++
 docs/building-msvc.md                       | 4 ++--
 docs/building-xcode.md                      | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index dcf95e11b..cbeaab8f3 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -250,7 +250,7 @@ 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
+RUN git clone -b release/4.2 --depth=1 $GIT/FFmpeg/FFmpeg.git ffmpeg
 
 WORKDIR ffmpeg
 RUN ./configure \
@@ -359,7 +359,7 @@ RUN make -j$(nproc)
 RUN 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
+RUN git clone -b fix_mono --depth=1 $GIT/telegramdesktop/openal-soft.git
 
 WORKDIR openal-soft
 RUN cmake3 -B build . \
diff --git a/docs/building-cmake.md b/docs/building-cmake.md
index c8337db9a..6f3dccceb 100644
--- a/docs/building-cmake.md
+++ b/docs/building-cmake.md
@@ -1,5 +1,7 @@
 ## Build instructions for CMake under Ubuntu 14.04
 
+**NB** These are outdated.
+
 ### Prepare folder
 
 Choose an empty folder for the future build, for example **/home/user/TBuild**. It will be named ***BuildPath*** in the rest of this document.
diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index 57d5b856d..92042d06b 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -152,7 +152,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
 
     git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg
     cd ffmpeg
-    git checkout release/3.4
+    git checkout release/4.2
 
     set CHERE_INVOKING=enabled_from_arguments
     set MSYS2_PATH_TYPE=inherit
@@ -172,7 +172,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     cd ..
 
     configure ^
-        -prefix "%LibrariesPath%\Qt-Qt-5.15.1" ^
+        -prefix "%LibrariesPath%\Qt-5.15.1" ^
         -debug-and-release ^
         -force-debug-info ^
         -opensource ^
diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index 949580ee8..d8c19f8c7 100644
--- a/docs/building-xcode.md
+++ b/docs/building-xcode.md
@@ -127,7 +127,7 @@ Go to ***BuildPath*** and run
 
     git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg
     cd ffmpeg
-    git checkout release/3.4
+    git checkout release/4.2
     CFLAGS=`freetype-config --cflags`
     LDFLAGS=`freetype-config --libs`
     PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig
@@ -240,9 +240,9 @@ Go to ***BuildPath*** and run
     sudo make install
     cd ..
 
-    git clone git://repo.or.cz/openal-soft.git
+    git clone https://github.com/telegramdesktop/openal-soft.git
     cd openal-soft
-    git checkout v1.19
+    git checkout fix_mono
     cd build
     CFLAGS=$UNGUARDED CPPFLAGS=$UNGUARDED cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr/local/macos -D ALSOFT_EXAMPLES=OFF -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.12 ..
     make $MAKE_THREADS_CNT

From 547251f67cc42015d16475f5215ce2bb12364ce8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Feb 2020 16:39:47 +0400
Subject: [PATCH 013/370] Fix deprecation warnings when building with FFmpeg
 4.2.

---
 Telegram/SourceFiles/core/utils.cpp                        | 7 -------
 Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp             | 2 +-
 Telegram/SourceFiles/media/audio/media_audio_capture.cpp   | 7 ++++---
 .../SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp  | 2 +-
 Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp      | 2 +-
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/core/utils.cpp b/Telegram/SourceFiles/core/utils.cpp
index d989ff25e..3a924059f 100644
--- a/Telegram/SourceFiles/core/utils.cpp
+++ b/Telegram/SourceFiles/core/utils.cpp
@@ -170,17 +170,10 @@ namespace ThirdParty {
 			LOG(("MTP Error: dynlock_create callback is set without dynlock_lock callback!"));
 		}
 
-		av_register_all();
-		avcodec_register_all();
-
-		av_lockmgr_register(_ffmpegLockManager);
-
 		_sslInited = true;
 	}
 
 	void finish() {
-		av_lockmgr_register(nullptr);
-
 		CRYPTO_cleanup_all_ex_data();
 #ifndef LIBRESSL_VERSION_NUMBER
 		FIPS_mode_set(0);
diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
index 5221c92da..ccaec6630 100644
--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
@@ -174,7 +174,7 @@ CodecPointer MakeCodecPointer(not_null<AVStream*> stream) {
 		LogError(qstr("avcodec_parameters_to_context"), error);
 		return {};
 	}
-	av_codec_set_pkt_timebase(context, stream->time_base);
+	context->pkt_timebase = stream->time_base;
 	av_opt_set(context, "threads", "auto", 0);
 	av_opt_set_int(context, "refcounted_frames", 1, 0);
 
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
index 580a8f8bc..20795f14a 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
@@ -253,8 +253,9 @@ void Instance::Inner::start(Fn<void(Update)> updated, Fn<void()> error) {
 	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;
-	while ((fmt = av_oformat_next(fmt))) {
+	const AVOutputFormat *fmt = nullptr;
+	void *i = nullptr;
+	while ((fmt = av_muxer_iterate(&i))) {
 		if (fmt->name == qstr("opus")) {
 			break;
 		}
@@ -265,7 +266,7 @@ void Instance::Inner::start(Fn<void(Update)> updated, Fn<void()> error) {
 		return;
 	}
 
-	if ((res = avformat_alloc_output_context2(&d->fmtContext, fmt, 0, 0)) < 0) {
+	if ((res = avformat_alloc_output_context2(&d->fmtContext, (AVOutputFormat*)fmt, 0, 0)) < 0) {
 		LOG(("Audio Error: Unable to avformat_alloc_output_context2 for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
 		fail();
 		return;
diff --git a/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp
index 24c8bac2a..7122e65e1 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_ffmpeg_loader.cpp
@@ -550,7 +550,7 @@ bool FFMpegLoader::openCodecContext() {
 			));
 		return false;
 	}
-	av_codec_set_pkt_timebase(_codecContext, stream->time_base);
+	_codecContext->pkt_timebase = stream->time_base;
 	av_opt_set_int(_codecContext, "refcounted_frames", 1, 0);
 
 	if ((res = avcodec_open2(_codecContext, codec, 0)) < 0) {
diff --git a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
index 15afec3ec..5d46bd822 100644
--- a/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
+++ b/Telegram/SourceFiles/media/clip/media_clip_ffmpeg.cpp
@@ -312,7 +312,7 @@ bool FFMpegReaderImplementation::start(Mode mode, crl::time &positionMs) {
 		LOG(("Gif 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(_codecContext, _fmtContext->streams[_streamId]->time_base);
+	_codecContext->pkt_timebase = _fmtContext->streams[_streamId]->time_base;
 	av_opt_set_int(_codecContext, "refcounted_frames", 1, 0);
 
 	const auto codec = avcodec_find_decoder(_codecContext->codec_id);

From 71de24641131deaeac9be5d0f99812f11f1ff022 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 6 Nov 2020 08:48:05 +0300
Subject: [PATCH 014/370] Disable Linux GLIBC wraps for special builds.

---
 .../platform/linux/linux_glibc_wraps.c        | 30 -----------
 .../platform/linux/linux_glibc_wraps_32.c     | 50 -------------------
 .../platform/linux/linux_glibc_wraps_64.c     | 25 ----------
 Telegram/build/docker/centos_env/run.sh       | 13 ++---
 cmake                                         |  2 +-
 5 files changed, 5 insertions(+), 115 deletions(-)
 delete mode 100644 Telegram/SourceFiles/platform/linux/linux_glibc_wraps.c
 delete mode 100644 Telegram/SourceFiles/platform/linux/linux_glibc_wraps_32.c
 delete mode 100644 Telegram/SourceFiles/platform/linux/linux_glibc_wraps_64.c

diff --git a/Telegram/SourceFiles/platform/linux/linux_glibc_wraps.c b/Telegram/SourceFiles/platform/linux/linux_glibc_wraps.c
deleted file mode 100644
index f937dcd6d..000000000
--- a/Telegram/SourceFiles/platform/linux/linux_glibc_wraps.c
+++ /dev/null
@@ -1,30 +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 <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-void *__wrap_aligned_alloc(size_t alignment, size_t size) {
-	void *result = NULL;
-	return (posix_memalign(&result, alignment, size) == 0)
-		? result
-		: NULL;
-}
-
-int enable_secure_inited = 0;
-int enable_secure = 1;
-
-char *__wrap_secure_getenv(const char *name) {
-	if (enable_secure_inited == 0) {
-		enable_secure_inited = 1;
-		enable_secure = (geteuid() != getuid())
-		|| (getegid() != getgid());
-	}
-	return enable_secure ? NULL : getenv(name);
-}
-
diff --git a/Telegram/SourceFiles/platform/linux/linux_glibc_wraps_32.c b/Telegram/SourceFiles/platform/linux/linux_glibc_wraps_32.c
deleted file mode 100644
index 5ddf94fe7..000000000
--- a/Telegram/SourceFiles/platform/linux/linux_glibc_wraps_32.c
+++ /dev/null
@@ -1,50 +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 <time.h>
-#include <stdint.h>
-
-#if defined(_M_IX86) || defined(__i386__)
-#define GETTIME_GLIBC_VERSION "2.2"
-#elif defined(_M_ARM) || defined(__arm__)
-#define GETTIME_GLIBC_VERSION "2.4"
-#else
-#error Please add glibc wraps for your architecture
-#endif
-
-int __clock_gettime_glibc_old(clockid_t clk_id, struct timespec *tp);
-__asm__(".symver __clock_gettime_glibc_old,clock_gettime@GLIBC_" GETTIME_GLIBC_VERSION);
-
-int __wrap_clock_gettime(clockid_t clk_id, struct timespec *tp) {
-	return __clock_gettime_glibc_old(clk_id, tp);
-}
-
-uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem_p);
-
-int64_t __wrap___divmoddi4(int64_t num, int64_t den, int64_t *rem_p) {
-	int minus = 0;
-	int64_t v;
-
-	if (num < 0) {
-		num = -num;
-		minus = 1;
-	}
-	if (den < 0) {
-		den = -den;
-		minus ^= 1;
-	}
-
-	v = __udivmoddi4(num, den, (uint64_t *)rem_p);
-	if (minus) {
-		v = -v;
-		if (rem_p)
-			*rem_p = -(*rem_p);
-	}
-
-	return v;
-}
-
diff --git a/Telegram/SourceFiles/platform/linux/linux_glibc_wraps_64.c b/Telegram/SourceFiles/platform/linux/linux_glibc_wraps_64.c
deleted file mode 100644
index f0ec95577..000000000
--- a/Telegram/SourceFiles/platform/linux/linux_glibc_wraps_64.c
+++ /dev/null
@@ -1,25 +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 <time.h>
-
-#if defined(_M_X64) || defined(__x86_64__)
-#define GETTIME_GLIBC_VERSION "2.2.5"
-#elif defined(__aarch64__)
-#define GETTIME_GLIBC_VERSION "2.17"
-#else
-#error Please add glibc wraps for your architecture
-#endif
-
-int __clock_gettime_glibc_old(clockid_t clk_id, struct timespec *tp);
-__asm__(".symver __clock_gettime_glibc_old,clock_gettime@GLIBC_" GETTIME_GLIBC_VERSION);
-
-
-int __wrap_clock_gettime(clockid_t clk_id, struct timespec *tp) {
-	return __clock_gettime_glibc_old(clk_id, tp);
-}
-
diff --git a/Telegram/build/docker/centos_env/run.sh b/Telegram/build/docker/centos_env/run.sh
index 2e65751cf..84e211e50 100755
--- a/Telegram/build/docker/centos_env/run.sh
+++ b/Telegram/build/docker/centos_env/run.sh
@@ -13,14 +13,9 @@ if [ ! -d "$FullScriptPath/../../../../../DesktopPrivate" ]; then
   exit
 fi
 
-Error () {
-  cd $FullExecPath
-  echo "$1"
-  exit 1
-}
-
-if [ "$1" == "" ]; then
-  Error "Script not found!"
+Command="$1"
+if [ "$Command" == "" ]; then
+  Command="scl enable devtoolset-8 -- bash"
 fi
 
-docker run -it --rm --cpus=8 --memory=10g -v $HOME/Telegram/DesktopPrivate:/usr/src/DesktopPrivate -v $HOME/Telegram/tdesktop:/usr/src/tdesktop tdesktop:centos_env $1
+docker run -it --rm --cpus=8 --memory=10g -v $HOME/Telegram/DesktopPrivate:/usr/src/DesktopPrivate -v $HOME/Telegram/tdesktop:/usr/src/tdesktop tdesktop:centos_env $Command
diff --git a/cmake b/cmake
index 3a2d8a252..4bf45519f 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 3a2d8a252d7e84547b532605aaa557a8c70d6d0f
+Subproject commit 4bf45519f6b39afa85e394c19680971fd92bfac4

From 65ba81f50409d10f2d592a1594477525d436a3df Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 6 Nov 2020 09:46:45 +0300
Subject: [PATCH 015/370] Beta version 2.4.8.

- Upgrade Qt to version 5.15.1.
- Upgrade FFmpeg to version 4.2.
- Upgrade OpenAL to version 1.20.1.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 ++++----
 Telegram/Resources/winrc/Updater.rc          |  8 ++++----
 Telegram/SourceFiles/core/changelogs.cpp     |  4 ++++
 Telegram/SourceFiles/core/version.h          |  6 +++---
 Telegram/build/version                       | 10 +++++-----
 Telegram/lib_ui                              |  2 +-
 changelog.txt                                |  6 ++++++
 8 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index de007958c..b18c7d93a 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.7.0" />
+    Version="2.4.8.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 3f9b139bd..57b01f04d 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,7,0
- PRODUCTVERSION 2,4,7,0
+ FILEVERSION 2,4,8,0
+ PRODUCTVERSION 2,4,8,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.7.0"
+            VALUE "FileVersion", "2.4.8.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.7.0"
+            VALUE "ProductVersion", "2.4.8.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index ca046b74e..dc896ff0c 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,7,0
- PRODUCTVERSION 2,4,7,0
+ FILEVERSION 2,4,8,0
+ PRODUCTVERSION 2,4,8,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.7.0"
+            VALUE "FileVersion", "2.4.8.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.7.0"
+            VALUE "ProductVersion", "2.4.8.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index 79cd1afae..aa9457047 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -85,6 +85,10 @@ std::map<int, const char*> BetaLogs() {
 
 		"- Bug fixes and other minor improvements.\n"
 	},
+	{
+		2004008,
+		"- Upgrade several third party libraries to latest versions.\n"
+	},
 	};
 };
 
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index bfbc759cc..839219172 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 = 2004007;
-constexpr auto AppVersionStr = "2.4.7";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 2004008;
+constexpr auto AppVersionStr = "2.4.8";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 8a3c6d616..64d838527 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2004007
+AppVersion         2004008
 AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.7
-AppVersionStr      2.4.7
-BetaChannel        0
+AppVersionStrSmall 2.4.8
+AppVersionStr      2.4.8
+BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 2.4.7
+AppVersionOriginal 2.4.8.beta
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index d4c99701b..cffa5e11d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit d4c99701b5210a2db83b1c0f13da1a62f48dfb80
+Subproject commit cffa5e11d8d1f340bd2356c0944a0d3e91e38f2c
diff --git a/changelog.txt b/changelog.txt
index d6a7c48e8..1affa8cbe 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+2.4.8 beta (06.11.20)
+
+- Upgrade Qt to version 5.15.1.
+- Upgrade FFmpeg to version 4.2.
+- Upgrade OpenAL to version 1.20.1.
+
 2.4.7 (05.11.20)
 
 - Fix playback display in albums of music files.

From 05f43cabdf5338c65b8ada00918296680c7b4593 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 6 Nov 2020 17:22:14 +0300
Subject: [PATCH 016/370] Beta version 2.4.9.

- Fix crash in tray icon removing. (macOS only)
---
 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/docker/centos_env/Dockerfile  | 2 +-
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 4 ++++
 docs/building-msvc.md                        | 4 ++--
 docs/building-xcode.md                       | 4 ++--
 9 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index b18c7d93a..0318c74bd 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.8.0" />
+    Version="2.4.9.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 57b01f04d..5cf4fdcb7 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,8,0
- PRODUCTVERSION 2,4,8,0
+ FILEVERSION 2,4,9,0
+ PRODUCTVERSION 2,4,9,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.8.0"
+            VALUE "FileVersion", "2.4.9.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.8.0"
+            VALUE "ProductVersion", "2.4.9.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index dc896ff0c..8be2c6186 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,8,0
- PRODUCTVERSION 2,4,8,0
+ FILEVERSION 2,4,9,0
+ PRODUCTVERSION 2,4,9,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.8.0"
+            VALUE "FileVersion", "2.4.9.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.8.0"
+            VALUE "ProductVersion", "2.4.9.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 839219172..4d81de3c5 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 = 2004008;
-constexpr auto AppVersionStr = "2.4.8";
+constexpr auto AppVersion = 2004009;
+constexpr auto AppVersionStr = "2.4.9";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index cbeaab8f3..90464e42b 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -27,7 +27,7 @@ WORKDIR $LibrariesPath
 
 FROM builder AS patches
 RUN git clone $GIT/desktop-app/patches.git
-RUN cd patches && git checkout b00f25d
+RUN cd patches && git checkout e052c49
 
 FROM builder AS libffi
 RUN git clone -b v3.3 --depth=1 $GIT/libffi/libffi.git
diff --git a/Telegram/build/version b/Telegram/build/version
index 64d838527..ad3eafa56 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2004008
+AppVersion         2004009
 AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.8
-AppVersionStr      2.4.8
+AppVersionStrSmall 2.4.9
+AppVersionStr      2.4.9
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 2.4.8.beta
+AppVersionOriginal 2.4.9.beta
diff --git a/changelog.txt b/changelog.txt
index 1affa8cbe..f6702ef31 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+2.4.9 beta (06.11.20)
+
+- Fix crash in tray icon removing. (macOS only)
+
 2.4.8 beta (06.11.20)
 
 - Upgrade Qt to version 5.15.1.
diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index 92042d06b..0913e0e1d 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -33,7 +33,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     cd ThirdParty
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout a77e4d5
+    git checkout e052c49
     cd ../
     git clone https://chromium.googlesource.com/external/gyp
     cd gyp
@@ -63,7 +63,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
 
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout a77e4d5
+    git checkout e052c49
     cd ..
 
     git clone https://github.com/desktop-app/lzma.git
diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index d8c19f8c7..48dfc7d93 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 cdca495
+    git checkout e052c49
     cd ../
     git clone https://chromium.googlesource.com/external/gyp
     git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@@ -58,7 +58,7 @@ Go to ***BuildPath*** and run
 
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout cdca495
+    git checkout e052c49
     cd ..
 
     git clone https://git.tukaani.org/xz.git

From d97dcaec62a480274533bec90bdb5f63d5a4d7b2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 6 Nov 2020 20:22:02 +0300
Subject: [PATCH 017/370] Add possibility to build on Windows for x64.

---
 .../SourceFiles/platform/win/launcher_win.cpp |   4 +-
 Telegram/ThirdParty/libtgvoip                 |   2 +-
 Telegram/configure.py                         |   8 +
 Telegram/lib_base                             |   2 +-
 cmake                                         |   2 +-
 docs/building-msvc-x64.md                     | 244 ++++++++++++++++++
 docs/building-msvc.md                         |  27 +-
 7 files changed, 270 insertions(+), 19 deletions(-)
 create mode 100644 docs/building-msvc-x64.md

diff --git a/Telegram/SourceFiles/platform/win/launcher_win.cpp b/Telegram/SourceFiles/platform/win/launcher_win.cpp
index 20d530249..44821f1ea 100644
--- a/Telegram/SourceFiles/platform/win/launcher_win.cpp
+++ b/Telegram/SourceFiles/platform/win/launcher_win.cpp
@@ -129,11 +129,11 @@ bool Launcher::launch(
 		arguments.toStdWString().c_str(),
 		nativeWorkingDir.empty() ? nullptr : nativeWorkingDir.c_str(),
 		SW_SHOWNORMAL);
-	if (long(result) < 32) {
+	if (int64(result) < 32) {
 		DEBUG_LOG(("Application Error: failed to execute %1, working directory: '%2', result: %3"
 			).arg(binaryPath
 			).arg(cWorkingDir()
-			).arg(long(result)
+			).arg(int64(result)
 			));
 		return false;
 	}
diff --git a/Telegram/ThirdParty/libtgvoip b/Telegram/ThirdParty/libtgvoip
index 7563a96b8..931f6a49c 160000
--- a/Telegram/ThirdParty/libtgvoip
+++ b/Telegram/ThirdParty/libtgvoip
@@ -1 +1 @@
-Subproject commit 7563a96b8f8e86b7a5fd1ce783388adf29bf4cf9
+Subproject commit 931f6a49c531995d4daf64f8357042a1eeeef43f
diff --git a/Telegram/configure.py b/Telegram/configure.py
index 61f88e93d..e42616858 100644
--- a/Telegram/configure.py
+++ b/Telegram/configure.py
@@ -38,6 +38,12 @@ if os.path.isfile(officialTargetFile):
         for line in f:
             officialTarget = line.strip()
 
+arch = ''
+if officialTarget == 'win' or officialTarget == 'uwp':
+    arch = 'x86'
+elif officialTarget == 'win64' or officialTarget == 'uwp64':
+    arch = 'x64'
+
 if officialTarget != '':
     officialApiIdFile = scriptPath + '/../../DesktopPrivate/custom_api_id.h'
     if not os.path.isfile(officialApiIdFile):
@@ -51,6 +57,8 @@ if officialTarget != '':
                 arguments.append('-DTDESKTOP_API_ID=' + apiIdMatch.group(1))
             elif apiHashMatch:
                 arguments.append('-DTDESKTOP_API_HASH=' + apiHashMatch.group(1))
+    if arch != '':
+        arguments.append(arch)
     finish(run_cmake.run(scriptName, arguments))
 elif 'linux' in sys.platform:
     debugCode = run_cmake.run(scriptName, arguments, "Debug")
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 03b7b4cd6..2d674eff9 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 03b7b4cd6f26ff53dff311438bf9c3f84dec13aa
+Subproject commit 2d674eff931c2540147e4f1ac29965e90ab4af22
diff --git a/cmake b/cmake
index 4bf45519f..d9e8a608c 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 4bf45519f6b39afa85e394c19680971fd92bfac4
+Subproject commit d9e8a608c21ca175ed118955d83010580fb46e65
diff --git a/docs/building-msvc-x64.md b/docs/building-msvc-x64.md
new file mode 100644
index 000000000..91c1fa4fe
--- /dev/null
+++ b/docs/building-msvc-x64.md
@@ -0,0 +1,244 @@
+# Build instructions for Visual Studio 2019 for 64 bit
+
+- [Prepare folder](#prepare-folder)
+- [Install third party software](#install-third-party-software)
+- [Clone source code and prepare libraries](#clone-source-code-and-prepare-libraries)
+- [Build the project](#build-the-project)
+- [Qt Visual Studio Tools](#qt-visual-studio-tools)
+
+## Prepare folder
+
+Choose an empty folder for the future build, for example **D:\\TBuild**. It will be named ***BuildPath*** in the rest of this document. Create two folders there, ***BuildPath*\\ThirdParty** and ***BuildPath*\\Libraries**.
+
+All commands (if not stated otherwise) will be launched from **x64 Native Tools Command Prompt for VS 2019.bat** (should be in **Start Menu > Visual Studio 2019** menu folder). Pay attention not to use any other Command Prompt.
+
+### Obtain your API credentials
+
+You will require **api_id** and **api_hash** to access the Telegram API servers. To learn how to obtain them [click here][api_credentials].
+
+## Install third party software
+
+* Download **Strawberry Perl** installer from [http://strawberryperl.com/](http://strawberryperl.com/) and install to ***BuildPath*\\ThirdParty\\Strawberry**
+* Download **NASM** installer from [http://www.nasm.us](http://www.nasm.us) and install to ***BuildPath*\\ThirdParty\\NASM**
+* Download **Yasm** executable from [http://yasm.tortall.net/Download.html](http://yasm.tortall.net/Download.html), rename to *yasm.exe* and put to ***BuildPath*\\ThirdParty\\yasm**
+* Download **MSYS2** installer from [http://www.msys2.org/](http://www.msys2.org/) and install to ***BuildPath*\\ThirdParty\\msys64**
+* Download **jom** archive from [http://download.qt.io/official_releases/jom/jom.zip](http://download.qt.io/official_releases/jom/jom.zip) and unpack to ***BuildPath*\\ThirdParty\\jom**
+* Download **Python 2.7** installer from [https://www.python.org/downloads/](https://www.python.org/downloads/) and install to ***BuildPath*\\ThirdParty\\Python27**
+* Download **CMake** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake**
+* Download **Ninja** executable from [https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip](https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip) and unpack to ***BuildPath*\\ThirdParty\\Ninja**
+* Download **Git** installer from [https://git-scm.com/download/win](https://git-scm.com/download/win) and install it.
+
+Open **x64 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** and run
+
+    cd ThirdParty
+    git clone https://github.com/desktop-app/patches.git
+    cd patches
+    git checkout 9fb66f2
+    cd ../
+    git clone https://chromium.googlesource.com/external/gyp
+    cd gyp
+    git checkout 9f2a7bb1
+    git apply ../patches/gyp.diff
+    cd ..\..
+
+Add **GYP** and **Ninja** to your PATH:
+
+* Open **Control Panel** -> **System** -> **Advanced system settings**
+* Press **Environment Variables...**
+* Select **Path**
+* Press **Edit**
+* Add ***BuildPath*\\ThirdParty\\gyp** value
+* Add ***BuildPath*\\ThirdParty\\Ninja** value
+
+## Clone source code and prepare libraries
+
+Open **x64 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** and run
+
+    SET PATH=%cd%\ThirdParty\Strawberry\perl\bin;%cd%\ThirdParty\Python27;%cd%\ThirdParty\NASM;%cd%\ThirdParty\jom;%cd%\ThirdParty\cmake\bin;%cd%\ThirdParty\yasm;%PATH%
+
+    git clone --recursive https://github.com/telegramdesktop/tdesktop.git
+
+    if not exist Libraries\win64 mkdir Libraries\win64
+    cd Libraries\win64
+
+    git clone https://github.com/desktop-app/patches.git
+    cd patches
+    git checkout 9fb66f2
+    cd ..
+
+    git clone https://github.com/desktop-app/lzma.git
+    cd lzma\C\Util\LzmaLib
+    msbuild LzmaLib.sln /property:Configuration=Debug /property:Platform="x64"
+    msbuild LzmaLib.sln /property:Configuration=Release /property:Platform="x64"
+    cd ..\..\..\..
+
+    git clone https://github.com/openssl/openssl.git openssl_1_1_1
+    cd openssl_1_1_1
+    git checkout OpenSSL_1_1_1-stable
+    perl Configure no-shared no-tests debug-VC-WIN64A
+    nmake
+    mkdir out64.dbg
+    move libcrypto.lib out64.dbg
+    move libssl.lib out64.dbg
+    move ossl_static.pdb out64.dbg\ossl_static
+    nmake clean
+    move out64.dbg\ossl_static out64.dbg\ossl_static.pdb
+    perl Configure no-shared no-tests VC-WIN64A
+    nmake
+    mkdir out64
+    move libcrypto.lib out64
+    move libssl.lib out64
+    move ossl_static.pdb out64
+    cd ..
+
+    git clone https://github.com/desktop-app/zlib.git
+    cd zlib\contrib\vstudio\vc14
+    msbuild zlibstat.vcxproj /property:Configuration=Debug /property:Platform="x64"
+    msbuild zlibstat.vcxproj /property:Configuration=ReleaseWithoutAsm /property:Platform="x64"
+    cd ..\..\..\..
+
+    git clone -b v4.0.1-rc2 https://github.com/mozilla/mozjpeg.git
+    cd mozjpeg
+    cmake . ^
+        -G "Visual Studio 16 2019" ^
+        -A x64 ^
+        -DWITH_JPEG8=ON ^
+        -DPNG_SUPPORTED=OFF
+    cmake --build . --config Debug
+    cmake --build . --config Release
+    cd ..
+
+    git clone https://github.com/telegramdesktop/openal-soft.git
+    cd openal-soft
+    git checkout fix_mono
+    cd build
+    cmake .. ^
+        -G "Visual Studio 16 2019" ^
+        -A x64 ^
+        -D LIBTYPE:STRING=STATIC ^
+        -D FORCE_STATIC_VCRT=ON
+    msbuild OpenAL.vcxproj /property:Configuration=Debug /property:Platform="x64"
+    msbuild OpenAL.vcxproj /property:Configuration=RelWithDebInfo /property:Platform="x64"
+    cd ..\..
+
+    git clone https://github.com/google/breakpad
+    cd breakpad
+    git checkout a1dbcdcb43
+    git apply ../patches/breakpad.diff
+    cd src
+    git clone https://github.com/google/googletest testing
+    cd client\windows
+    gyp --no-circular-check breakpad_client.gyp --format=ninja
+    cd ..\..
+    ninja -C out/Debug_x64 common crash_generation_client exception_handler
+    ninja -C out/Release_x64 common crash_generation_client exception_handler
+    cd tools\windows\dump_syms
+    gyp dump_syms.gyp
+    msbuild dump_syms.vcxproj /property:Configuration=Release /property:Platform="x64"
+    cd ..\..\..\..\..
+
+    git clone https://github.com/telegramdesktop/opus.git
+    cd opus
+    git checkout tdesktop
+    cd win32\VS2015
+    msbuild opus.sln /property:Configuration=Debug /property:Platform="x64"
+    msbuild opus.sln /property:Configuration=Release /property:Platform="x64"
+
+    cd ..\..\..\..\..
+    SET PATH_BACKUP_=%PATH%
+    SET PATH=%cd%\ThirdParty\msys64\usr\bin;%PATH%
+    cd Libraries\win64
+
+    git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg
+    cd ffmpeg
+    git checkout release/4.2
+
+    set CHERE_INVOKING=enabled_from_arguments
+    set MSYS2_PATH_TYPE=inherit
+    bash --login ../patches/build_ffmpeg_win.sh
+
+    SET PATH=%PATH_BACKUP_%
+    cd ..
+
+    SET LibrariesPath=%cd%
+    git clone git://code.qt.io/qt/qt5.git qt_5_15_1
+    cd qt_5_15_1
+    perl init-repository --module-subset=qtbase,qtimageformats
+    git checkout v5.15.1
+    git submodule update qtbase qtimageformats
+    cd qtbase
+    for /r %i in (..\..\patches\qtbase_5_15_1\*) do git apply %i
+    cd ..
+
+    configure ^
+        -prefix "%LibrariesPath%\Qt-5.15.1" ^
+        -debug-and-release ^
+        -force-debug-info ^
+        -opensource ^
+        -confirm-license ^
+        -static ^
+        -static-runtime ^
+        -no-opengl ^
+        -openssl-linked ^
+        -I "%LibrariesPath%\openssl_1_1_1\include" ^
+        OPENSSL_LIBS_DEBUG="%LibrariesPath%\openssl_1_1_1\out64.dbg\libssl.lib %LibrariesPath%\openssl_1_1_1\out64.dbg\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
+        OPENSSL_LIBS_RELEASE="%LibrariesPath%\openssl_1_1_1\out64\libssl.lib %LibrariesPath%\openssl_1_1_1\out64\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 -j8
+    jom -j8 install
+    cd ..
+
+    git clone https://github.com/desktop-app/tg_owt.git
+    cd tg_owt
+    mkdir out
+    cd out
+    mkdir Debug
+    cd Debug
+    cmake -G Ninja ^
+        -DCMAKE_BUILD_TYPE=Debug ^
+        -DTG_OWT_SPECIAL_TARGET=win64 ^
+        -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=win64 ^
+        -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 ..\..\..
+
+## Build the project
+
+Go to ***BuildPath*\\tdesktop\\Telegram** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
+
+    configure.bat x64 -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH -D DESKTOP_APP_USE_PACKAGED=OFF -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF
+
+* Open ***BuildPath*\\tdesktop\\out\\Telegram.sln** in Visual Studio 2019
+* Select Telegram project and press Build > Build Telegram (Debug and Release configurations)
+* The result Telegram.exe will be located in **D:\TBuild\tdesktop\out\Debug** (and **Release**)
+
+### Qt Visual Studio Tools
+
+For better debugging you may want to install Qt Visual Studio Tools:
+
+* Open **Extensions** -> **Manage Extensions**
+* Go to **Online** tab
+* Search for **Qt**
+* Install **Qt Visual Studio Tools** extension
+
+[api_credentials]: api_credentials.md
diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index 0913e0e1d..5d12e6f71 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -68,8 +68,8 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
 
     git clone https://github.com/desktop-app/lzma.git
     cd lzma\C\Util\LzmaLib
-    msbuild LzmaLib.sln /property:Configuration=Debug
-    msbuild LzmaLib.sln /property:Configuration=Release
+    msbuild LzmaLib.sln /property:Configuration=Debug /property:Platform="x86"
+    msbuild LzmaLib.sln /property:Configuration=Release /property:Platform="x86"
     cd ..\..\..\..
 
     git clone https://github.com/openssl/openssl.git openssl_1_1_1
@@ -92,19 +92,18 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     cd ..
 
     git clone https://github.com/desktop-app/zlib.git
-    cd zlib
-    cd contrib\vstudio\vc14
-    msbuild zlibstat.vcxproj /property:Configuration=Debug
-    msbuild zlibstat.vcxproj /property:Configuration=ReleaseWithoutAsm
+    cd zlib\contrib\vstudio\vc14
+    msbuild zlibstat.vcxproj /property:Configuration=Debug /property:Platform="x86"
+    msbuild zlibstat.vcxproj /property:Configuration=ReleaseWithoutAsm /property:Platform="x86"
     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
+        -G "Visual Studio 16 2019" ^
+        -A Win32 ^
+        -DWITH_JPEG8=ON ^
+        -DPNG_SUPPORTED=OFF
     cmake --build . --config Debug
     cmake --build . --config Release
     cd ..
@@ -114,10 +113,10 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     git checkout fix_mono
     cd build
     cmake .. ^
-    -G "Visual Studio 16 2019" ^
-    -A Win32 ^
-    -D LIBTYPE:STRING=STATIC ^
-    -D FORCE_STATIC_VCRT=ON
+        -G "Visual Studio 16 2019" ^
+        -A Win32 ^
+        -D LIBTYPE:STRING=STATIC ^
+        -D FORCE_STATIC_VCRT=ON
     msbuild OpenAL.vcxproj /property:Configuration=Debug
     msbuild OpenAL.vcxproj /property:Configuration=RelWithDebInfo
     cd ..\..

From eee3049fdd0a0e4cdfc5aa8ee5a032e2122eea60 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 6 Nov 2020 12:22:40 +0400
Subject: [PATCH 018/370] Remove definitions of unused psLocalServerPrefix and
 psInitLogs

---
 .../SourceFiles/platform/linux/specific_linux.h    |  4 ----
 Telegram/SourceFiles/platform/mac/specific_mac.h   |  4 ----
 Telegram/SourceFiles/platform/mac/specific_mac.mm  | 14 --------------
 Telegram/SourceFiles/platform/win/specific_win.cpp | 10 ----------
 Telegram/SourceFiles/platform/win/specific_win.h   |  4 ----
 5 files changed, 36 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.h b/Telegram/SourceFiles/platform/linux/specific_linux.h
index 2dd706914..2bf9d9e61 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.h
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.h
@@ -50,11 +50,7 @@ inline void psCheckLocalSocket(const QString &serverName) {
 
 void psWriteDump();
 
-QStringList psInitLogs();
-void psClearInitLogs();
-
 void psActivateProcess(uint64 pid = 0);
-QString psLocalServerPrefix();
 QString psAppDataPath();
 void psAutoStart(bool start, bool silent = false);
 void psSendToMenu(bool send, bool silent = false);
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h
index 25c3bc933..00b0bb44c 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.h
@@ -78,11 +78,7 @@ inline void psCheckLocalSocket(const QString &serverName) {
 
 void psWriteDump();
 
-QStringList psInitLogs();
-void psClearInitLogs();
-
 void psActivateProcess(uint64 pid = 0);
-QString psLocalServerPrefix();
 QString psAppDataPath();
 void psAutoStart(bool start, bool silent = false);
 void psSendToMenu(bool send, bool silent = false);
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm
index d2becc60d..e856a103d 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm
@@ -38,12 +38,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
-QStringList _initLogs;
-
-};
-
-namespace {
-
 QRect _monitorRect;
 crl::time _monitorLastGot = 0;
 
@@ -65,14 +59,6 @@ void psWriteDump() {
 #endif // DESKTOP_APP_DISABLE_CRASH_REPORTS
 }
 
-QStringList psInitLogs() {
-	return _initLogs;
-}
-
-void psClearInitLogs() {
-	_initLogs = QStringList();
-}
-
 void psActivateProcess(uint64 pid) {
 	if (!pid) {
 		objc_activateProgram(App::wnd() ? App::wnd()->winId() : 0);
diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp
index ae492a312..fc0b9957f 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 {
 
-QStringList _initLogs;
-
 bool themeInited = false;
 bool finished = true;
 QMargins simpleMargins, margins;
@@ -108,14 +106,6 @@ BOOL CALLBACK _ActivateProcess(HWND hWnd, LPARAM lParam) {
 
 }
 
-QStringList psInitLogs() {
-	return _initLogs;
-}
-
-void psClearInitLogs() {
-	_initLogs = QStringList();
-}
-
 void psActivateProcess(uint64 pid) {
 	if (pid) {
 		::EnumWindows((WNDENUMPROC)_ActivateProcess, (LPARAM)&pid);
diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h
index e86df71bb..c5fa006a5 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.h
+++ b/Telegram/SourceFiles/platform/win/specific_win.h
@@ -69,11 +69,7 @@ inline void psCheckLocalSocket(const QString &) {
 
 void psWriteDump();
 
-QStringList psInitLogs();
-void psClearInitLogs();
-
 void psActivateProcess(uint64 pid = 0);
-QString psLocalServerPrefix();
 QString psAppDataPath();
 QString psAppDataPathOld();
 void psAutoStart(bool start, bool silent = false);

From e04598835be5af3ea3699c34a82937dee2d1dff6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 6 Nov 2020 13:52:19 +0400
Subject: [PATCH 019/370] Move _monitorRect and _monitorLastGot to
 psDesktopRect method

---
 Telegram/SourceFiles/platform/linux/specific_linux.cpp | 9 ++-------
 Telegram/SourceFiles/platform/mac/specific_mac.mm      | 9 ++-------
 Telegram/SourceFiles/platform/win/specific_win.cpp     | 9 ++-------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 3a833dd78..abad7435b 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -947,14 +947,9 @@ Window::ControlsLayout WindowControlsLayout() {
 
 } // namespace Platform
 
-namespace {
-
-QRect _monitorRect;
-auto _monitorLastGot = 0LL;
-
-} // namespace
-
 QRect psDesktopRect() {
+	static QRect _monitorRect;
+	static auto _monitorLastGot = 0LL;
 	auto tnow = crl::now();
 	if (tnow > _monitorLastGot + 1000LL || tnow < _monitorLastGot) {
 		_monitorLastGot = tnow;
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm
index e856a103d..712e42c93 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm
@@ -36,14 +36,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <mach-o/dyld.h>
 #include <AVFoundation/AVFoundation.h>
 
-namespace {
-
-QRect _monitorRect;
-crl::time _monitorLastGot = 0;
-
-} // namespace
-
 QRect psDesktopRect() {
+	static QRect _monitorRect;
+	static crl::time _monitorLastGot = 0;
 	auto tnow = crl::now();
 	if (tnow > _monitorLastGot + 1000 || tnow < _monitorLastGot) {
 		_monitorLastGot = tnow;
diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp
index fc0b9957f..ad7ee8a2c 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.cpp
+++ b/Telegram/SourceFiles/platform/win/specific_win.cpp
@@ -145,14 +145,9 @@ void psDoCleanup() {
 	}
 }
 
-namespace {
-
-QRect _monitorRect;
-crl::time _monitorLastGot = 0;
-
-} // namespace
-
 QRect psDesktopRect() {
+	static QRect _monitorRect;
+	static crl::time _monitorLastGot = 0;
 	auto tnow = crl::now();
 	if (tnow > _monitorLastGot + 1000LL || tnow < _monitorLastGot) {
 		_monitorLastGot = tnow;

From 3d18d28dc57bf273c6e44c2eaae51372ecb9e63d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 6 Nov 2020 14:26:26 +0400
Subject: [PATCH 020/370] Use kIconName on icon creating

---
 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 abad7435b..b27979c68 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -1139,7 +1139,7 @@ void InstallLauncher(bool force) {
 
 	if (!QDir(icons).exists()) QDir().mkpath(icons);
 
-	const auto icon = icons + qsl("telegram.png");
+	const auto icon = icons + kIconName.utf16() + qsl(".png");
 	auto iconExists = QFile(icon).exists();
 	if (Local::oldSettingsVersion() < 10021 && iconExists) {
 		// Icon was changed.

From f980cade395bbcb5c26d1e4d064b42a4397f4f11 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 6 Nov 2020 14:21:19 +0400
Subject: [PATCH 021/370] Use static QFile methods in linux platform code

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

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index b27979c68..deb0e3268 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -272,8 +272,8 @@ bool GenerateDesktopFile(
 
 		if (IsStaticBinary()) {
 			DEBUG_LOG(("App Info: removing old .desktop files"));
-			QFile(qsl("%1telegram.desktop").arg(targetPath)).remove();
-			QFile(qsl("%1telegramdesktop.desktop").arg(targetPath)).remove();
+			QFile::remove(qsl("%1telegram.desktop").arg(targetPath));
+			QFile::remove(qsl("%1telegramdesktop.desktop").arg(targetPath));
 		}
 
 		return true;
@@ -986,9 +986,9 @@ QString psAppDataPath() {
 	if (!home.isEmpty()) {
 		auto oldPath = home + qsl(".TelegramDesktop/");
 		auto oldSettingsBase = oldPath + qsl("tdata/settings");
-		if (QFile(oldSettingsBase + '0').exists()
-			|| QFile(oldSettingsBase + '1').exists()
-			|| QFile(oldSettingsBase + 's').exists()) {
+		if (QFile::exists(oldSettingsBase + '0')
+			|| QFile::exists(oldSettingsBase + '1')
+			|| QFile::exists(oldSettingsBase + 's')) {
 			return oldPath;
 		}
 	}
@@ -1140,15 +1140,15 @@ void InstallLauncher(bool force) {
 	if (!QDir(icons).exists()) QDir().mkpath(icons);
 
 	const auto icon = icons + kIconName.utf16() + qsl(".png");
-	auto iconExists = QFile(icon).exists();
+	auto iconExists = QFile::exists(icon);
 	if (Local::oldSettingsVersion() < 10021 && iconExists) {
 		// Icon was changed.
-		if (QFile(icon).remove()) {
+		if (QFile::remove(icon)) {
 			iconExists = false;
 		}
 	}
 	if (!iconExists) {
-		if (QFile(qsl(":/gui/art/logo_256.png")).copy(icon)) {
+		if (QFile::copy(qsl(":/gui/art/logo_256.png"), icon)) {
 			DEBUG_LOG(("App Info: Icon copied to '%1'").arg(icon));
 		}
 	}

From 876c57dcfb9672e1ca8c9b65572792ff378da8e0 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 6 Nov 2020 20:45:42 +0400
Subject: [PATCH 022/370] Fix getting FileChooser portal version

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

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index deb0e3268..6bd4847f1 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -162,11 +162,11 @@ uint FileChooserPortalVersion() {
 			qsl("version")
 		});
 
-		const QDBusReply<uint> reply = QDBusConnection::sessionBus().call(
+		const QDBusReply<QVariant> reply = QDBusConnection::sessionBus().call(
 			message);
 
 		if (reply.isValid()) {
-			return reply.value();
+			return reply.value().toUInt();
 		} else {
 			LOG(("Error getting FileChooser portal version: %1")
 				.arg(reply.error().message()));

From e0de4dbc5e15a3ac66fc92b19cc9e2ff3212524a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 7 Nov 2020 06:58:10 +0400
Subject: [PATCH 023/370] Replace new #ifdef Q_OS_LINUX in main_window.cpp
 added a month ago

---
 Telegram/SourceFiles/window/main_window.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index cef351733..cf0c168b1 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -365,7 +365,7 @@ void MainWindow::refreshTitleWidget() {
 		_titleShadow.destroy();
 	}
 
-#ifdef Q_OS_LINUX
+#if defined Q_OS_UNIX && !defined Q_OS_MAC
 	// setWindowFlag calls setParent(parentWidget(), newFlags), which
 	// always calls hide() explicitly, we have to show() the window back.
 	const auto hidden = isHidden();
@@ -378,7 +378,7 @@ void MainWindow::refreshTitleWidget() {
 			this,
 			[=] { show(); });
 	}
-#endif // Q_OS_LINUX
+#endif // Q_OS_UNIX && !Q_OS_MAC
 }
 
 void MainWindow::updateMinimumSize() {

From acaf8e4931dbec11ceb087cd8408958022e6556e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 8 Nov 2020 00:29:58 +0400
Subject: [PATCH 024/370] Use g_filename_to_uri

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

diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index 41b68d79c..3a74b6207 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -82,7 +82,7 @@ void UnsafeLaunch(const QString &filepath) {
 	const auto absolutePath = QFileInfo(filepath).absoluteFilePath();
 
 	if (!g_app_info_launch_default_for_uri(
-		("file://" + absolutePath).toUtf8(),
+		g_filename_to_uri(absolutePath.toUtf8(), nullptr, nullptr),
 		nullptr,
 		nullptr)) {
 		QDesktopServices::openUrl(QUrl::fromLocalFile(filepath));

From 3a45957ceb2f90407070a57ea37832976e0fa356 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 8 Nov 2020 10:47:51 +0400
Subject: [PATCH 025/370] Set parent window ID for portal autostart dialog

---
 .../SourceFiles/platform/linux/specific_linux.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 6bd4847f1..1e7b5dd44 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -20,6 +20,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/localstorage.h"
 #include "core/crash_reports.h"
 #include "core/update_checker.h"
+#include "window/window_controller.h"
+#include "core/application.h"
 
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QDesktopWidget>
@@ -108,8 +110,19 @@ void PortalAutostart(bool autostart, bool silent = false) {
 		qsl("org.freedesktop.portal.Background"),
 		qsl("RequestBackground"));
 
+	const auto parentWindowId = [&] {
+		if (const auto activeWindow = Core::App().activeWindow()) {
+			if (!IsWayland()) {
+				return qsl("x11:%1").arg(QString::number(
+					activeWindow->widget().get()->windowHandle()->winId(),
+					16));
+			}
+		}
+		return QString();
+	}();
+
 	message.setArguments({
-		QString(),
+		parentWindowId,
 		options
 	});
 

From 91a2ec225ada7d6c45d5e5c22dfef6c07d2eddc0 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 8 Nov 2020 01:28:24 +0400
Subject: [PATCH 026/370] Add support for open with on linux

---
 .../platform/linux/file_utilities_linux.cpp   | 96 ++++++++++++++++++-
 .../platform/linux/file_utilities_linux.h     |  4 -
 .../SourceFiles/platform/linux/linux_libs.cpp |  9 ++
 .../SourceFiles/platform/linux/linux_libs.h   | 25 +++++
 4 files changed, 129 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index 3a74b6207..84fc2b205 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -13,6 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/specific_linux.h"
 #include "storage/localstorage.h"
 #include "base/qt_adapters.h"
+#include "window/window_controller.h"
+#include "core/application.h"
 
 #include <QtGui/QDesktopServices>
 
@@ -35,6 +37,58 @@ extern "C" {
 
 namespace Platform {
 namespace File {
+namespace {
+
+#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
+bool ShowOpenWithSupported() {
+	return Platform::internal::GdkHelperLoaded()
+		&& (Libs::gtk_app_chooser_dialog_new != nullptr)
+		&& (Libs::gtk_app_chooser_get_app_info != nullptr)
+		&& (Libs::gtk_app_chooser_get_type != nullptr)
+		&& (Libs::gtk_widget_get_type != nullptr)
+		&& (Libs::gtk_widget_get_window != nullptr)
+		&& (Libs::gtk_widget_realize != nullptr)
+		&& (Libs::gtk_widget_show != nullptr)
+		&& (Libs::gtk_widget_destroy != nullptr);
+}
+
+void HandleAppChooserResponse(
+		GtkDialog *dialog,
+		int responseId,
+		GFile *file) {
+	GAppInfo *chosenAppInfo = nullptr;
+
+	switch (responseId) {
+	case GTK_RESPONSE_OK:
+		chosenAppInfo = Libs::gtk_app_chooser_get_app_info(
+			Libs::gtk_app_chooser_cast(dialog));
+
+		if (chosenAppInfo) {
+			GList *uris = nullptr;
+			uris = g_list_prepend(uris, g_file_get_uri(file));
+			g_app_info_launch_uris(chosenAppInfo, uris, nullptr, nullptr);
+			g_list_free(uris);
+			g_object_unref(chosenAppInfo);
+		}
+
+		g_object_unref(file);
+		Libs::gtk_widget_destroy(Libs::gtk_widget_cast(dialog));
+		break;
+
+	case GTK_RESPONSE_CANCEL:
+	case GTK_RESPONSE_DELETE_EVENT:
+		g_object_unref(file);
+		Libs::gtk_widget_destroy(Libs::gtk_widget_cast(dialog));
+		break;
+
+	default:
+		break;
+	}
+}
+#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
+
+} // namespace
+
 namespace internal {
 
 QByteArray EscapeShell(const QByteArray &content) {
@@ -78,6 +132,44 @@ void UnsafeOpenEmailLink(const QString &email) {
 	UnsafeOpenUrl(qstr("mailto:") + email);
 }
 
+bool UnsafeShowOpenWith(const QString &filepath) {
+#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
+	if (InFlatpak()
+		|| InSnap()
+		|| !ShowOpenWithSupported()) {
+		return false;
+	}
+
+	const auto absolutePath = QFileInfo(filepath).absoluteFilePath();
+	auto gfileInstance = g_file_new_for_path(absolutePath.toUtf8());
+
+	auto appChooserDialog = Libs::gtk_app_chooser_dialog_new(
+		nullptr,
+		GTK_DIALOG_MODAL,
+		gfileInstance);
+
+	g_signal_connect(
+		appChooserDialog,
+		"response",
+		G_CALLBACK(HandleAppChooserResponse),
+		gfileInstance);
+
+	Libs::gtk_widget_realize(appChooserDialog);
+
+	if (const auto activeWindow = Core::App().activeWindow()) {
+		Platform::internal::XSetTransientForHint(
+			Libs::gtk_widget_get_window(appChooserDialog),
+			activeWindow->widget().get()->windowHandle()->winId());
+	}
+
+	Libs::gtk_widget_show(appChooserDialog);
+
+	return true;
+#else // !TDESKTOP_DISABLE_GTK_INTEGRATION
+	return false;
+#endif // TDESKTOP_DISABLE_GTK_INTEGRATION
+}
+
 void UnsafeLaunch(const QString &filepath) {
 	const auto absolutePath = QFileInfo(filepath).absoluteFilePath();
 
@@ -85,7 +177,9 @@ void UnsafeLaunch(const QString &filepath) {
 		g_filename_to_uri(absolutePath.toUtf8(), nullptr, nullptr),
 		nullptr,
 		nullptr)) {
-		QDesktopServices::openUrl(QUrl::fromLocalFile(filepath));
+		if (!UnsafeShowOpenWith(filepath)) {
+			QDesktopServices::openUrl(QUrl::fromLocalFile(filepath));
+		}
 	}
 }
 
diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h
index 4b57d656e..a0dc9c186 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h
@@ -34,10 +34,6 @@ inline bool UnsafeShowOpenWithDropdown(const QString &filepath, QPoint menuPosit
 	return false;
 }
 
-inline bool UnsafeShowOpenWith(const QString &filepath) {
-	return false;
-}
-
 inline void PostprocessDownloaded(const QString &filepath) {
 }
 
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
index 50f53f37a..793b811d7 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
@@ -70,6 +70,7 @@ bool setupGtkBase(QLibrary &lib_gtk) {
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_widget_realize", gtk_widget_realize)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_widget_hide_on_delete", gtk_widget_hide_on_delete)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_widget_destroy", gtk_widget_destroy)) return false;
+	if (!LOAD_SYMBOL(lib_gtk, "gtk_widget_get_type", gtk_widget_get_type)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_clipboard_get", gtk_clipboard_get)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_clipboard_store", gtk_clipboard_store)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_clipboard_wait_for_contents", gtk_clipboard_wait_for_contents)) return false;
@@ -211,6 +212,7 @@ f_gtk_widget_get_window gtk_widget_get_window = nullptr;
 f_gtk_widget_realize gtk_widget_realize = nullptr;
 f_gtk_widget_hide_on_delete gtk_widget_hide_on_delete = nullptr;
 f_gtk_widget_destroy gtk_widget_destroy = nullptr;
+f_gtk_widget_get_type gtk_widget_get_type = nullptr;
 f_gtk_clipboard_get gtk_clipboard_get = nullptr;
 f_gtk_clipboard_store gtk_clipboard_store = nullptr;
 f_gtk_clipboard_wait_for_contents gtk_clipboard_wait_for_contents = nullptr;
@@ -246,6 +248,9 @@ f_gtk_image_set_from_pixbuf gtk_image_set_from_pixbuf = nullptr;
 f_gtk_dialog_get_widget_for_response gtk_dialog_get_widget_for_response = nullptr;
 f_gtk_button_set_label gtk_button_set_label = nullptr;
 f_gtk_button_get_type gtk_button_get_type = nullptr;
+f_gtk_app_chooser_dialog_new gtk_app_chooser_dialog_new = nullptr;
+f_gtk_app_chooser_get_app_info gtk_app_chooser_get_app_info = nullptr;
+f_gtk_app_chooser_get_type gtk_app_chooser_get_type = nullptr;
 f_gdk_set_allowed_backends gdk_set_allowed_backends = nullptr;
 f_gdk_window_set_modal_hint gdk_window_set_modal_hint = nullptr;
 f_gdk_window_focus gdk_window_focus = nullptr;
@@ -304,6 +309,10 @@ void start() {
 		LOAD_SYMBOL(lib_gtk, "gtk_button_set_label", gtk_button_set_label);
 		LOAD_SYMBOL(lib_gtk, "gtk_button_get_type", gtk_button_get_type);
 
+		LOAD_SYMBOL(lib_gtk, "gtk_app_chooser_dialog_new", gtk_app_chooser_dialog_new);
+		LOAD_SYMBOL(lib_gtk, "gtk_app_chooser_get_app_info", gtk_app_chooser_get_app_info);
+		LOAD_SYMBOL(lib_gtk, "gtk_app_chooser_get_type", gtk_app_chooser_get_type);
+
 		SetIconTheme();
 
 		const auto settings = gtk_settings_get_default();
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h
index a1f383534..cf207d88b 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.h
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
@@ -18,6 +18,9 @@ extern "C" {
 #define signals public
 } // extern "C"
 
+// present start with gtk 3.0, we're building with gtk 2.0 headers
+typedef struct _GtkAppChooser GtkAppChooser;
+
 #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
 
 #if defined DESKTOP_APP_USE_PACKAGED && !defined DESKTOP_APP_USE_PACKAGED_LAZY
@@ -172,6 +175,12 @@ extern f_gtk_image_new gtk_image_new;
 typedef void (*f_gtk_image_set_from_pixbuf)(GtkImage *image, GdkPixbuf *pixbuf);
 extern f_gtk_image_set_from_pixbuf gtk_image_set_from_pixbuf;
 
+typedef GtkWidget* (*f_gtk_app_chooser_dialog_new)(GtkWindow *parent, GtkDialogFlags flags, GFile *file);
+extern f_gtk_app_chooser_dialog_new gtk_app_chooser_dialog_new;
+
+typedef GAppInfo* (*f_gtk_app_chooser_get_app_info)(GtkAppChooser *self);
+extern f_gtk_app_chooser_get_app_info gtk_app_chooser_get_app_info;
+
 typedef void (*f_gdk_set_allowed_backends)(const gchar *backends);
 extern f_gdk_set_allowed_backends gdk_set_allowed_backends;
 
@@ -226,6 +235,22 @@ inline GtkWindow *gtk_window_cast(Object *obj) {
 	return g_type_cic_helper<GtkWindow, Object>(obj, gtk_window_get_type());
 }
 
+typedef GType (*f_gtk_widget_get_type)(void) G_GNUC_CONST;
+extern f_gtk_widget_get_type gtk_widget_get_type;
+
+template <typename Object>
+inline GtkWidget *gtk_widget_cast(Object *obj) {
+	return g_type_cic_helper<GtkWidget, Object>(obj, gtk_widget_get_type());
+}
+
+typedef GType (*f_gtk_app_chooser_get_type)(void) G_GNUC_CONST;
+extern f_gtk_app_chooser_get_type gtk_app_chooser_get_type;
+
+template <typename Object>
+inline GtkAppChooser *gtk_app_chooser_cast(Object *obj) {
+	return g_type_cic_helper<GtkAppChooser, Object>(obj, gtk_app_chooser_get_type());
+}
+
 template <typename Object>
 inline bool g_type_cit_helper(Object *instance, GType iface_type) {
 	if (!instance) return false;

From 167a73ef1bc411a713424352d66c27d2c9181c33 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 9 Nov 2020 12:36:15 +0300
Subject: [PATCH 027/370] Add sent/read checks for some service messages.

---
 Telegram/SourceFiles/history/history_service.cpp | 5 +++++
 Telegram/SourceFiles/history/history_service.h   | 4 +---
 Telegram/lib_base                                | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index 25a733922..bda13ceac 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -617,6 +617,11 @@ bool HistoryService::updateDependencyItem() {
 	return HistoryItem::updateDependencyItem();
 }
 
+bool HistoryService::needCheck() const {
+	return (GetDependentData() != nullptr)
+		|| Has<HistoryServiceSelfDestruct>();
+}
+
 QString HistoryService::inDialogsText(DrawInDialog way) const {
 	return textcmdLink(1, TextUtilities::Clean(notificationText()));
 }
diff --git a/Telegram/SourceFiles/history/history_service.h b/Telegram/SourceFiles/history/history_service.h
index 200f6c8f6..99e93be8d 100644
--- a/Telegram/SourceFiles/history/history_service.h
+++ b/Telegram/SourceFiles/history/history_service.h
@@ -95,9 +95,7 @@ public:
 
 	Storage::SharedMediaTypesMask sharedMediaTypes() const override;
 
-	bool needCheck() const override {
-		return false;
-	}
+	bool needCheck() const override;
 	bool serviceMsg() const override {
 		return true;
 	}
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 2d674eff9..4f22126e7 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 2d674eff931c2540147e4f1ac29965e90ab4af22
+Subproject commit 4f22126e7e855b517857408abf2467cba163a6f2

From 091b62bed4060fbd2d2e7dd5ef01558c7feda67e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 9 Nov 2020 12:41:59 +0300
Subject: [PATCH 028/370] Allow cancel search-in-chat and keep search query.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index a69b59264..5e82e23b9 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1784,7 +1784,9 @@ bool Widget::onCancelSearch() {
 void Widget::onCancelSearchInChat() {
 	cancelSearchRequest();
 	if (_searchInChat) {
-		if (Adaptive::OneColumn() && !controller()->selectingPeer()) {
+		if (Adaptive::OneColumn()
+			&& !controller()->selectingPeer()
+			&& _filter->getLastText().trimmed().isEmpty()) {
 			if (const auto peer = _searchInChat.peer()) {
 				Ui::showPeerHistory(peer, ShowAtUnreadMsgId);
 			//} else if (const auto feed = _searchInChat.feed()) { // #feed

From 87e4bb10595ec6b65284fac2091009b1b0f8726f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 9 Nov 2020 12:57:49 +0300
Subject: [PATCH 029/370] Fix scroll position restore with pinned bar.

---
 .../SourceFiles/history/history_widget.cpp    | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 11aa0bd02..71e7780e9 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -3183,11 +3183,20 @@ void HistoryWidget::showAnimated(
 	_a_show.stop();
 
 	_cacheUnder = params.oldContentCache;
+
+	// If we show pinned bar here, we don't want it to change the
+	// calculated and prepared scrollTop of the messages history.
+	_preserveScrollTop = true;
 	show();
 	_topBar->finishAnimating();
 	historyDownAnimationFinish();
 	unreadMentionsAnimationFinish();
+	if (_pinnedBar) {
+		_pinnedBar->finishAnimating();
+	}
 	_topShadow->setVisible(params.withTopBarShadow ? false : true);
+	_preserveScrollTop = false;
+
 	_cacheOver = controller()->content()->grabForShowAnimation(params);
 
 	if (_tabbedPanel) {
@@ -3216,8 +3225,12 @@ void HistoryWidget::animationCallback() {
 	if (!_a_show.animating()) {
 		historyDownAnimationFinish();
 		unreadMentionsAnimationFinish();
+		if (_pinnedBar) {
+			_pinnedBar->finishAnimating();
+		}
 		_cacheUnder = _cacheOver = QPixmap();
 		doneShow();
+		synteticScrollToY(_scroll->scrollTop());
 	}
 }
 
@@ -4676,11 +4689,7 @@ void HistoryWidget::updateHistoryGeometry(
 		}
 	}
 	const auto toY = std::clamp(newScrollTop, 0, _scroll->scrollTopMax());
-	if (_scroll->scrollTop() == toY) {
-		visibleAreaUpdated();
-	} else {
-		synteticScrollToY(toY);
-	}
+	synteticScrollToY(toY);
 }
 
 void HistoryWidget::updateListSize() {

From db23485fa22ef93b82fa81ffaaa315f9eb8a437d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 9 Nov 2020 13:47:53 +0300
Subject: [PATCH 030/370] Fix quit from fullscreen on macOS.

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

diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index ecbe4d8f3..ab441b564 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -215,7 +215,7 @@ void Sandbox::setupScreenScale() {
 Sandbox::~Sandbox() = default;
 
 bool Sandbox::event(QEvent *e) {
-	if (e->type() == QEvent::Close) {
+	if (e->type() == QEvent::Close || e->type() == QEvent::Quit) {
 		App::quit();
 	}
 	return QApplication::event(e);

From 8a9317f9e11d3dca6a019bcf477bcc1a5927de1f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 9 Nov 2020 15:05:36 +0300
Subject: [PATCH 031/370] Download video avatars as .mp4 in media viewer.

Fixes #9017.
---
 .../media/view/media_view_overlay_widget.cpp  | 80 +++++++++++++++++--
 .../media/view/media_view_overlay_widget.h    |  9 +++
 .../SourceFiles/storage/file_download.cpp     |  3 +-
 3 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 47c119cd4..245388078 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -627,6 +627,34 @@ void OverlayWidget::refreshNavVisibility() {
 	}
 }
 
+bool OverlayWidget::contentCanBeSaved() const {
+	if (_photo) {
+		return _photo->hasVideo() || _photoMedia->loaded();
+	} else if (_document) {
+		return _document->filepath(true).isEmpty() && !_document->loading();
+	} else {
+		return false;
+	}
+}
+
+void OverlayWidget::checkForSaveLoaded() {
+	if (_savePhotoVideoWhenLoaded == SavePhotoVideo::None) {
+		return;
+	} else if (!_photo
+		|| !_photo->hasVideo()
+		|| _photoMedia->videoContent().isEmpty()) {
+		return;
+	} else if (_savePhotoVideoWhenLoaded == SavePhotoVideo::QuickSave) {
+		_savePhotoVideoWhenLoaded = SavePhotoVideo::None;
+		onDownload();
+	} else if (_savePhotoVideoWhenLoaded == SavePhotoVideo::SaveAs) {
+		_savePhotoVideoWhenLoaded = SavePhotoVideo::None;
+		onSaveAs();
+	} else {
+		Unexpected("SavePhotoVideo in OverlayWidget::checkForSaveLoaded.");
+	}
+}
+
 void OverlayWidget::updateControls() {
 	if (_document && documentBubbleShown()) {
 		if (_document->loading()) {
@@ -658,10 +686,7 @@ void OverlayWidget::updateControls() {
 
 	updateThemePreviewGeometry();
 
-	_saveVisible = (_photo && _photoMedia->loaded())
-		|| (_document
-			&& _document->filepath(true).isEmpty()
-			&& !_document->loading());
+	_saveVisible = contentCanBeSaved();
 	_rotateVisible = !_themePreviewShown;
 	const auto navRect = [&](int i) {
 		return myrtlrect(width() - st::mediaviewIconSize.width() * i,
@@ -1153,6 +1178,7 @@ OverlayWidget::~OverlayWidget() {
 }
 
 void OverlayWidget::assignMediaPointer(DocumentData *document) {
+	_savePhotoVideoWhenLoaded = SavePhotoVideo::None;
 	_photo = nullptr;
 	_photoMedia = nullptr;
 	if (_document != document) {
@@ -1167,6 +1193,7 @@ void OverlayWidget::assignMediaPointer(DocumentData *document) {
 }
 
 void OverlayWidget::assignMediaPointer(not_null<PhotoData*> photo) {
+	_savePhotoVideoWhenLoaded = SavePhotoVideo::None;
 	_document = nullptr;
 	_documentMedia = nullptr;
 	if (_photo != photo) {
@@ -1348,6 +1375,31 @@ void OverlayWidget::onSaveAs() {
 			updateControls();
 			updateOver(_lastMouseMovePos);
 		}
+	} else if (_photo && _photo->hasVideo()) {
+		if (const auto bytes = _photoMedia->videoContent(); !bytes.isEmpty()) {
+			auto filter = qsl("Video Files (*.mp4);;") + FileDialog::AllFilesFilter();
+			FileDialog::GetWritePath(
+				this,
+				tr::lng_save_video(tr::now),
+				filter,
+				filedialogDefaultName(
+					qsl("photo"),
+					qsl(".mp4"),
+					QString(),
+					false,
+					_photo->date),
+				crl::guard(this, [=, photo = _photo](const QString &result) {
+					QFile f(result);
+					if (!result.isEmpty()
+						&& _photo == photo
+						&& f.open(QIODevice::WriteOnly)) {
+						f.write(bytes);
+					}
+				}));
+		} else {
+			_photo->loadVideo(fileOrigin());
+			_savePhotoVideoWhenLoaded = SavePhotoVideo::SaveAs;
+		}
 	} else {
 		if (!_photo || !_photoMedia->loaded()) {
 			return;
@@ -1436,14 +1488,29 @@ void OverlayWidget::onDownload() {
 					DocumentSaveClickHandler::Mode::ToFile);
 				updateControls();
 			} else {
-				_saveVisible = false;
+				_saveVisible = contentCanBeSaved();
 				update(_saveNav);
 			}
 			updateOver(_lastMouseMovePos);
 		}
+	} else if (_photo && _photo->hasVideo()) {
+		if (const auto bytes = _photoMedia->videoContent(); !bytes.isEmpty()) {
+			if (!QDir().exists(path)) {
+				QDir().mkpath(path);
+			}
+			toName = filedialogDefaultName(qsl("photo"), qsl(".mp4"), path);
+			QFile f(toName);
+			if (!f.open(QIODevice::WriteOnly)
+				|| f.write(bytes) != bytes.size()) {
+				toName = QString();
+			}
+		} else {
+			_photo->loadVideo(fileOrigin());
+			_savePhotoVideoWhenLoaded = SavePhotoVideo::QuickSave;
+		}
 	} else {
 		if (!_photo || !_photoMedia->loaded()) {
-			_saveVisible = false;
+			_saveVisible = contentCanBeSaved();
 			update(_saveNav);
 		} else {
 			const auto image = _photoMedia->image(
@@ -3685,6 +3752,7 @@ void OverlayWidget::setSession(not_null<Main::Session*> session) {
 	) | rpl::start_with_next([=] {
 		if (!isHidden()) {
 			updateControls();
+			checkForSaveLoaded();
 		}
 	}, _sessionLifetime);
 
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 69902cfec..598760928 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -159,6 +159,11 @@ private:
 			not_null<DocumentData*>> data;
 		HistoryItem *item;
 	};
+	enum class SavePhotoVideo {
+		None,
+		QuickSave,
+		SaveAs,
+	};
 
 	void paintEvent(QPaintEvent *e) override;
 
@@ -207,6 +212,9 @@ private:
 	bool moveToNext(int delta);
 	void preloadData(int delta);
 
+	bool contentCanBeSaved() const;
+	void checkForSaveLoaded();
+
 	Entity entityForUserPhotos(int index) const;
 	Entity entityForSharedMedia(int index) const;
 	Entity entityForCollage(int index) const;
@@ -502,6 +510,7 @@ private:
 	QRect _saveMsg;
 	QTimer _saveMsgUpdater;
 	Ui::Text::String _saveMsgText;
+	SavePhotoVideo _savePhotoVideoWhenLoaded = SavePhotoVideo::None;
 
 	base::flat_map<OverState, crl::time> _animations;
 	base::flat_map<OverState, anim::value> _animationOpacities;
diff --git a/Telegram/SourceFiles/storage/file_download.cpp b/Telegram/SourceFiles/storage/file_download.cpp
index 629f2922b..2a2e9cb59 100644
--- a/Telegram/SourceFiles/storage/file_download.cpp
+++ b/Telegram/SourceFiles/storage/file_download.cpp
@@ -471,8 +471,9 @@ bool FileLoader::finalizeResult() {
 					_cacheTag));
 		}
 	}
-	_session->notifyDownloaderTaskFinished();
+	const auto session = _session;
 	_updates.fire_done();
+	session->notifyDownloaderTaskFinished();
 	return true;
 }
 

From a68d9b45222e947385616f9bef7aa4be8d7a72b9 Mon Sep 17 00:00:00 2001
From: zurg3 <20664125+zurg3@users.noreply.github.com>
Date: Fri, 6 Nov 2020 19:10:14 +0300
Subject: [PATCH 032/370] Updated Qt version in GitHub Actions workflows

---
 .github/workflows/linux.yml | 14 +++++++-------
 .github/workflows/mac.yml   | 18 +++++++++---------
 .github/workflows/win.yml   | 12 ++++++------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 6d69c0b1a..d71ca2a62 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -58,8 +58,8 @@ jobs:
 
     env:
       GIT: "https://github.com"
-      QT: "5_12_8"
-      QT_PREFIX: "/usr/local/desktop-app/Qt-5.12.8"
+      QT: "5_15_1"
+      QT_PREFIX: "/usr/local/desktop-app/Qt-5.15.1"
       OPENSSL_VER: "1_1_1"
       OPENSSL_PREFIX: "/usr/local/desktop-app/openssl-1.1.1"
       CMAKE_VER: "3.17.0"
@@ -427,18 +427,18 @@ jobs:
           cd ..
           rm -rf libxkbcommon
 
-      - name: Qt 5.12.8 cache.
+      - name: Qt 5.15.1 cache.
         id: cache-qt
         uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/qt-cache
-          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qt*_5_12_8/*') }}
-      - name: Qt 5.12.8 build.
+          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qt*_5_15_1/*') }}
+      - name: Qt 5.15.1 build.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |
           cd $LibrariesPath
 
-          git clone -b v5.12.8 --depth=1 git://code.qt.io/qt/qt5.git qt_${QT}
+          git clone -b v5.15.1 --depth=1 git://code.qt.io/qt/qt5.git qt_${QT}
           cd qt_${QT}
           perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg
           git submodule update qtbase qtwayland qtimageformats qtsvg
@@ -471,7 +471,7 @@ jobs:
           sudo make INSTALL_ROOT="$LibrariesPath/qt-cache" install
           cd ..
           rm -rf qt_${QT}
-      - name: Qt 5.12.8 install.
+      - name: Qt 5.15.1 install.
         run: |
           cd $LibrariesPath
           sudo cp -R qt-cache/. /
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 48ad4d4da..fe1c08bea 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -57,9 +57,9 @@ jobs:
       PREFIX: "/usr/local/macos"
       MACOSX_DEPLOYMENT_TARGET: "10.12"
       XZ: "xz-5.2.4"
-      QT: "5_12_8"
+      QT: "5_15_1"
       OPENSSL_VER: "1_1_1"
-      QT_PREFIX: "/usr/local/desktop-app/Qt-5.12.8"
+      QT_PREFIX: "/usr/local/desktop-app/Qt-5.15.1"
       LIBICONV_VER: "libiconv-1.16"
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
@@ -417,20 +417,20 @@ jobs:
           build/gyp_crashpad.py -Dmac_deployment_target=10.10
           ninja -C out/Debug
 
-      - name: Qt 5.12.8 cache.
+      - name: Qt 5.15.1 cache.
         id: cache-qt
         uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/qt-cache
-          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8/*') }}
-      - name: Use cached Qt 5.12.8.
+          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_1/*') }}
+      - name: Use cached Qt 5.15.1.
         if: steps.cache-qt.outputs.cache-hit == 'true'
         run: |
           cd $LibrariesPath
-          mv qt-cache Qt-5.12.8
+          mv qt-cache Qt-5.15.1
           sudo mkdir -p $QT_PREFIX
-          sudo mv -f Qt-5.12.8 "$(dirname "$QT_PREFIX")"/
-      - name: Qt 5.12.8 build.
+          sudo mv -f Qt-5.15.1 "$(dirname "$QT_PREFIX")"/
+      - name: Qt 5.15.1 build.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |
           cd $LibrariesPath
@@ -438,7 +438,7 @@ jobs:
           git clone git://code.qt.io/qt/qt5.git qt_$QT
           cd qt_$QT
           perl init-repository --module-subset=qtbase,qtimageformats
-          git checkout v5.12.8
+          git checkout v5.15.1
           git submodule update qtbase
           git submodule update qtimageformats
           cd qtbase
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 83ffcc001..6f3d1d6ce 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -59,8 +59,8 @@ jobs:
       SDK: "10.0.18362.0"
       VC: "call vcvars32.bat && cd Libraries"
       GIT: "https://github.com"
-      QT: "5_12_8"
-      QT_VER: "5.12.8"
+      QT: "5_15_1"
+      QT_VER: "5.15.1"
       OPENSSL_VER: "1_1_1"
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
@@ -301,13 +301,13 @@ jobs:
 
           rmdir /S /Q .git
 
-      - name: Qt 5.12.8 cache.
+      - name: Qt 5.15.1 cache.
         id: cache-qt
         uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/Qt-${{ env.QT_VER }}
-          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8/*') }}
-      - name: Configure Qt 5.12.8.
+          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_1/*') }}
+      - name: Configure Qt 5.15.1.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |
           %VC%
@@ -344,7 +344,7 @@ jobs:
           -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.
+      - name: Qt 5.15.1 build.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |
           %VC%

From a768b652958b03f132dea8ba576f61e7931d65b3 Mon Sep 17 00:00:00 2001
From: zurg3 <20664125+zurg3@users.noreply.github.com>
Date: Mon, 9 Nov 2020 22:44:11 +0300
Subject: [PATCH 033/370] Updated FFmpeg version in GitHub Actions workflows

---
 .github/workflows/linux.yml |  2 +-
 .github/workflows/mac.yml   | 10 ++++++----
 .github/workflows/win.yml   |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index d71ca2a62..fdb5c5ca0 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -229,7 +229,7 @@ jobs:
         run: |
           cd $LibrariesPath
 
-          git clone --branch release/3.4 $GIT/FFmpeg/FFmpeg ffmpeg
+          git clone --branch release/4.2 $GIT/FFmpeg/FFmpeg ffmpeg
           cd ffmpeg
           ./configure \
           --disable-debug \
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index fe1c08bea..26a625dca 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -235,7 +235,7 @@ jobs:
 
           git clone $GIT/FFmpeg/FFmpeg.git ffmpeg
           cd ffmpeg
-          git checkout release/3.4
+          git checkout release/4.2
           CFLAGS=`freetype-config --cflags`
           LDFLAGS=`freetype-config --libs`
           PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig
@@ -244,7 +244,9 @@ jobs:
           --extra-cflags="$MIN_MAC $UNGUARDED" \
           --extra-cxxflags="$MIN_MAC $UNGUARDED" \
           --extra-ldflags="$MIN_MAC" \
-          --enable-protocol=file --enable-libopus \
+          --x86asmexe=`pwd`/macos_yasm_wrap.sh \
+          --enable-protocol=file \
+          --enable-libopus \
           --disable-programs \
           --disable-doc \
           --disable-network \
@@ -364,9 +366,9 @@ jobs:
         run: |
           cd $LibrariesPath
 
-          git clone $GIT/kcat/openal-soft.git
+          git clone https://github.com/telegramdesktop/openal-soft.git
           cd openal-soft
-          git checkout openal-soft-1.19.1
+          git checkout fix_mono
           cd build
 
           CFLAGS="$UNGUARDED" CPPFLAGS="$UNGUARDED" cmake \
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 6f3d1d6ce..510ce788e 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -294,10 +294,10 @@ jobs:
 
           git clone %GIT%/FFmpeg/FFmpeg.git ffmpeg
           cd ffmpeg
-          git checkout release/3.4
+          git checkout release/4.2
           set CHERE_INVOKING=enabled_from_arguments
           set MSYS2_PATH_TYPE=inherit
-          call c:\tools\msys64\usr\bin\bash --login ../../%REPO_NAME%/Telegram/Patches/build_ffmpeg_win.sh
+          call c:\tools\msys64\usr\bin\bash --login ../patches/build_ffmpeg_win.sh
 
           rmdir /S /Q .git
 

From 8b0fcee6a60028b9132bb2560379dddde1ad332e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 12 Nov 2020 13:24:13 +0400
Subject: [PATCH 034/370] Use docker build in linux action

---
 .github/workflows/linux.yml | 506 ++----------------------------------
 1 file changed, 15 insertions(+), 491 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index fdb5c5ca0..ef2a521e7 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -45,9 +45,17 @@ on:
 jobs:
 
   linux:
-    name: Ubuntu 14.04
+    name: CentOS 7
     runs-on: ubuntu-latest
-    container: ubuntu:trusty
+    container:
+      image: docker.pkg.github.com/telegramdesktop/tdesktop/centos_env
+      credentials:
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    defaults:
+      run:
+        shell: scl enable devtoolset-8 -- bash --noprofile --norc -eo pipefail {0}
 
     strategy:
       matrix:
@@ -57,59 +65,17 @@ jobs:
           - "TDESKTOP_DISABLE_GTK_INTEGRATION"
 
     env:
-      GIT: "https://github.com"
-      QT: "5_15_1"
-      QT_PREFIX: "/usr/local/desktop-app/Qt-5.15.1"
-      OPENSSL_VER: "1_1_1"
-      OPENSSL_PREFIX: "/usr/local/desktop-app/openssl-1.1.1"
-      CMAKE_VER: "3.17.0"
       UPLOAD_ARTIFACT: "false"
-      ONLY_CACHE: "false"
-      MANUAL_CACHING: "6"
-      DOC_PATH: "docs/building-cmake.md"
-      AUTO_CACHING: "1"
 
     steps:
       - name: Get repository name.
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
-      - name: Disable man for further package installs.
+      - name: Yum install.
         run: |
-          cfgFile="/etc/dpkg/dpkg.cfg.d/no_man"
-          sudo touch $cfgFile
-          p() {
-            sudo echo "path-exclude=/usr/share/$1/*" >> $cfgFile
-          }
-
-          p man
-          p locale
-          p doc
-
-      - name: Apt install.
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt-get install software-properties-common -y && \
-          sudo add-apt-repository ppa:git-core/ppa -y && \
-          sudo apt-get update && \
-          sudo apt-get install git libexif-dev liblzma-dev libz-dev libssl-dev \
-          libgtk2.0-dev libice-dev libsm-dev libicu-dev libdrm-dev dh-autoreconf \
-          autoconf automake build-essential libxml2-dev libass-dev libfreetype6-dev \
-          libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev \
-          libvorbis-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev \
-          libxcb-screensaver0-dev libjpeg-dev ninja-build \
-          libxcb-xfixes0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libatspi2.0-dev \
-          libxcb-render-util0-dev libxcb-util0-dev libxcb-xkb-dev libxrender-dev \
-          libasound-dev libpulse-dev libxcb-sync0-dev libxcb-randr0-dev libegl1-mesa-dev \
-          libx11-xcb-dev libffi-dev libncurses5-dev pkg-config texi2html bison yasm \
-          zlib1g-dev xutils-dev python-xcbgen chrpath gperf wget -y --force-yes && \
-          sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-          sudo apt-get update && \
-          sudo apt-get install gcc-8 g++-8 -y && \
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 && \
-          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 60 && \
-          sudo update-alternatives --config gcc && \
-          sudo add-apt-repository --remove ppa:ubuntu-toolchain-r/test -y
+          yum -y autoremove git
+          yum -y install https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-1.7-1.x86_64.rpm
+          yum -y install git
 
       - name: Clone.
         uses: actions/checkout@v2
@@ -118,452 +84,11 @@ jobs:
           path: ${{ env.REPO_NAME }}
 
       - name: First set up.
-        shell: bash
         run: |
           gcc --version
-
-          gcc --version > CACHE_KEY.txt
-          echo $MANUAL_CACHING >> CACHE_KEY.txt
-          if [ "$AUTO_CACHING" == "1" ]; then
-            thisFile=$REPO_NAME/.github/workflows/linux.yml
-            echo `md5sum $thisFile | cut -c -32` >> CACHE_KEY.txt
-          fi
-          md5cache=$(md5sum CACHE_KEY.txt | cut -c -32)
-          echo "CACHE_KEY=$md5cache" >> $GITHUB_ENV
-
-          mkdir -p Libraries
-          cd Libraries
-          echo "LibrariesPath=`pwd`" >> $GITHUB_ENV
-
-      - name: Patches.
-        run: |
-          echo "Find necessary commit from doc."
-          checkoutCommit=$(grep -A 1 "cd patches" $REPO_NAME/$DOC_PATH | sed -n 2p)
-          cd $LibrariesPath
-          git clone $GIT/desktop-app/patches.git
-          cd patches
-          eval $checkoutCommit
-
-      - name: CMake.
-        run: |
-          cd $LibrariesPath
-
-          file=cmake-$CMAKE_VER-Linux-x86_64.sh
-          wget $GIT/Kitware/CMake/releases/download/v$CMAKE_VER/$file
-          sudo mkdir /opt/cmake
-          sudo sh $file --prefix=/opt/cmake --skip-license
-          sudo ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
-          rm $file
-
-          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
-        with:
-          path: ${{ env.LibrariesPath }}/opus
-          key: ${{ runner.OS }}-opus-${{ env.CACHE_KEY }}
-      - name: Opus.
-        if: steps.cache-opus.outputs.cache-hit != 'true'
-        run: |
-          cd $LibrariesPath
-
-          git clone -b v1.3 --depth=1 $GIT/xiph/opus
-          cd opus
-          ./autogen.sh
-          ./configure
-          make -j$(nproc)
-      - name: Opus install.
-        run: |
-          cd $LibrariesPath/opus
-          sudo make install
-
-      - name: Libva.
-        run: |
-          cd $LibrariesPath
-
-          git clone $GIT/intel/libva.git
-          cd libva
-          ./autogen.sh --enable-static
-          make -j$(nproc)
-          sudo make install
-          cd ..
-          rm -rf libva
-
-      - name: Libvdpau.
-        run: |
-          cd $LibrariesPath
-
-          git clone -b libvdpau-1.2 --depth=1 https://gitlab.freedesktop.org/vdpau/libvdpau.git
-          cd libvdpau
-          ./autogen.sh --enable-static
-          make -j$(nproc)
-          sudo make install
-          cd ..
-          rm -rf libvdpau
-
-      - name: FFmpeg cache.
-        id: cache-ffmpeg
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.LibrariesPath }}/ffmpeg-cache
-          key: ${{ runner.OS }}-ffmpeg-${{ env.CACHE_KEY }}
-      - name: FFmpeg build.
-        if: steps.cache-ffmpeg.outputs.cache-hit != 'true'
-        run: |
-          cd $LibrariesPath
-
-          git clone --branch release/4.2 $GIT/FFmpeg/FFmpeg ffmpeg
-          cd ffmpeg
-          ./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
-
-          make -j$(nproc)
-          sudo make DESTDIR="$LibrariesPath/ffmpeg-cache" install
-          cd ..
-          rm -rf ffmpeg
-      - name: FFmpeg install.
-        run: |
-          cd $LibrariesPath
-          #List of files from cmake/external/ffmpeg/CMakeLists.txt.
-          copyLib() {
-            mkdir -p ffmpeg/$1
-            yes | cp -i ffmpeg-cache/usr/local/lib/$1.a ffmpeg/$1/$1.a
-          }
-          copyLib libavformat
-          copyLib libavcodec
-          copyLib libswresample
-          copyLib libswscale
-          copyLib libavutil
-
-          sudo cp -R ffmpeg-cache/. /
-
-      - name: OpenAL Soft.
-        run: |
-          cd $LibrariesPath
-
-          git clone -b openal-soft-1.20.1 --depth=1 $GIT/kcat/openal-soft.git
-          cd openal-soft/build
-          cmake .. \
-          -DCMAKE_BUILD_TYPE=Release \
-          -DLIBTYPE:STRING=STATIC \
-          -DALSOFT_EXAMPLES=OFF \
-          -DALSOFT_TESTS=OFF \
-          -DALSOFT_UTILS=OFF \
-          -DALSOFT_CONFIG=OFF
-          make -j$(nproc)
-          sudo make install
-          cd -
-          rm -rf openal-soft
-
-      - name: OpenSSL cache.
-        id: cache-openssl
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.LibrariesPath }}/openssl-cache
-          key: ${{ runner.OS }}-${{ env.OPENSSL_VER }}-${{ env.CACHE_KEY }}
-      - name: OpenSSL build.
-        if: steps.cache-openssl.outputs.cache-hit != 'true'
-        run: |
-          cd $LibrariesPath
-
-          opensslDir=openssl_${OPENSSL_VER}
-          git clone -b OpenSSL_${OPENSSL_VER}-stable --depth=1 \
-            $GIT/openssl/openssl $opensslDir
-          cd $opensslDir
-          ./config --prefix="$OPENSSL_PREFIX" no-tests
-          make -j$(nproc)
-          sudo make DESTDIR="$LibrariesPath/openssl-cache" install_sw
-          cd ..
-          # rm -rf $opensslDir # Keep this folder for WebRTC.
-      - name: OpenSSL install.
-        run: |
-          cd $LibrariesPath
-          sudo cp -R openssl-cache/. /
-
-      - name: Libwayland.
-        run: |
-          cd $LibrariesPath
-
-          git clone -b 1.18.0 https://gitlab.freedesktop.org/wayland/wayland
-          cd wayland
-          ./autogen.sh \
-          --enable-static \
-          --disable-documentation \
-          --disable-dtd-validation
-          make -j$(nproc)
-          sudo make install
-          cd ..
-          rm -rf wayland
-
-      - name: Libxkbcommon.
-        run: |
-          cd $LibrariesPath
-
-          git clone -b xkbcommon-0.8.4 --depth=1 $GIT/xkbcommon/libxkbcommon.git
-          cd libxkbcommon
-          ./autogen.sh \
-          --disable-docs \
-          --disable-wayland \
-          --with-xkb-config-root=/usr/share/X11/xkb \
-          --with-x-locale-root=/usr/share/X11/locale
-          make -j$(nproc)
-          sudo make install
-          cd ..
-          rm -rf libxkbcommon
-
-      - name: Qt 5.15.1 cache.
-        id: cache-qt
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.LibrariesPath }}/qt-cache
-          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qt*_5_15_1/*') }}
-      - name: Qt 5.15.1 build.
-        if: steps.cache-qt.outputs.cache-hit != 'true'
-        run: |
-          cd $LibrariesPath
-
-          git clone -b v5.15.1 --depth=1 git://code.qt.io/qt/qt5.git qt_${QT}
-          cd qt_${QT}
-          perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg
-          git submodule update qtbase qtwayland qtimageformats qtsvg
-          cd qtbase
-          find ../../patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git apply
-          cd ..
-          cd qtwayland
-          find ../../patches/qtwayland_${QT} -type f -print0 | sort -z | xargs -r0 git apply
-          cd ..
-
-          ./configure -prefix "$QT_PREFIX" \
-          -release \
-          -opensource \
-          -confirm-license \
-          -qt-zlib \
-          -qt-libpng \
-          -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 -ldl -lpthread" \
-          -nomake examples \
-          -nomake tests
-
-          make -j$(nproc)
-          sudo make INSTALL_ROOT="$LibrariesPath/qt-cache" install
-          cd ..
-          rm -rf qt_${QT}
-      - name: Qt 5.15.1 install.
-        run: |
-          cd $LibrariesPath
-          sudo cp -R qt-cache/. /
-
-      - name: Breakpad cache.
-        id: cache-breakpad
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.LibrariesPath }}/breakpad-cache
-          key: ${{ runner.OS }}-breakpad-${{ env.CACHE_KEY }}
-      - name: Breakpad clone.
-        run: |
-          cd $LibrariesPath
-
-          git clone https://chromium.googlesource.com/breakpad/breakpad
-          cd breakpad
-          git checkout bc8fb886
-          git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss
-          cd src/third_party/lss
-          git checkout a91633d1
-      - name: Breakpad build.
-        if: steps.cache-breakpad.outputs.cache-hit != 'true'
-        run: |
-          cd $LibrariesPath
-
-          BreakpadCache=$LibrariesPath/breakpad-cache
-
-          git clone https://chromium.googlesource.com/external/gyp
-          cd gyp
-          git checkout 9f2a7bb1
-          git apply ../patches/gyp.diff
-          cd ..
-
-          cd breakpad
-          ./configure
-          make -j$(nproc)
-          sudo make DESTDIR="$BreakpadCache" install
-          cd src
-          rm -r testing
-          git clone $GIT/google/googletest testing
-          cd tools
-          sed -i 's/minidump_upload.m/minidump_upload.cc/' linux/tools_linux.gypi
-          ../../../gyp/gyp  --depth=. --generator-output=.. -Goutput_dir=../out tools.gyp --format=cmake
-          cd ../../out/Default
-          cmake .
-          make -j$(nproc) dump_syms
-
-          mv dump_syms $BreakpadCache/
-          cd ..
-          rm -rf gyp breakpad
-      - name: Breakpad install.
-        run: |
-          cd $LibrariesPath
-          sudo cp -R breakpad-cache/. /
-          mkdir -p breakpad/out/Default/
-          cp breakpad-cache/dump_syms breakpad/out/Default/dump_syms
-
-      - name: WebRTC cache.
-        id: cache-webrtc
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.LibrariesPath }}/tg_owt
-          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}
-      - name: WebRTC.
-        if: steps.cache-webrtc.outputs.cache-hit != 'true'
-        run: |
-          cd $LibrariesPath
-
-          git clone $GIT/desktop-app/tg_owt.git
-          mkdir -p tg_owt/out/Debug
-          cd tg_owt/out/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=$OPENSSL_PREFIX/include \
-          -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus \
-          -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include \
-          ../..
-          ninja
-
-          # Cleanup.
-          cd $LibrariesPath/tg_owt
-          mv out/Debug/libtg_owt.a libtg_owt.a
-          rm -rf out
-          mkdir -p out/Debug
-          mv libtg_owt.a out/Debug/libtg_owt.a
-
-          rm -rf $LibrariesPath/openssl_${OPENSSL_VER}
+          ln -s $LibrariesPath Libraries
 
       - name: Telegram Desktop build.
-        if: env.ONLY_CACHE == 'false'
         run: |
           cd $REPO_NAME/Telegram
 
@@ -587,7 +112,6 @@ jobs:
           make -j$(nproc)
 
       - name: Check.
-        if: env.ONLY_CACHE == 'false'
         run: |
           filePath="$REPO_NAME/out/Debug/bin/Telegram"
           if test -f "$filePath"; then

From 21133abe132344bab00f9cad2ac139d0960fd596 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 10 Nov 2020 14:00:26 +0400
Subject: [PATCH 035/370] Fix 30s hang in case ibus portal couldn't be started

---
 .../platform/linux/specific_linux.cpp         | 42 +++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 1e7b5dd44..fc5658557 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -38,6 +38,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusConnectionInterface>
 #include <QtDBus/QDBusMessage>
 #include <QtDBus/QDBusReply>
 #include <QtDBus/QDBusError>
@@ -90,6 +91,31 @@ constexpr auto kXCBFrameExtentsAtomName = "_GTK_FRAME_EXTENTS"_cs;
 QStringList PlatformThemes;
 
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+QStringList ListDBusActivatableNames() {
+	static const auto Result = [&] {
+		const auto message = QDBusMessage::createMethodCall(
+			qsl("org.freedesktop.DBus"),
+			qsl("/org/freedesktop/DBus"),
+			qsl("org.freedesktop.DBus"),
+			qsl("ListActivatableNames"));
+
+		const QDBusReply<QStringList> reply = QDBusConnection::sessionBus()
+			.call(message);
+
+		if (reply.isValid()) {
+			return reply.value();
+		} else {
+			LOG(("App Error: %1: %2")
+				.arg(reply.error().name())
+				.arg(reply.error().message()));
+		}
+
+		return QStringList{};
+	}();
+
+	return Result;
+}
+
 void PortalAutostart(bool autostart, bool silent = false) {
 	if (cExeName().isEmpty()) {
 		return;
@@ -155,9 +181,19 @@ bool IsXDGDesktopPortalKDEPresent() {
 }
 
 bool IsIBusPortalPresent() {
-	static const auto Result = QDBusInterface(
-		qsl("org.freedesktop.portal.IBus"),
-		qsl("/org/freedesktop/IBus")).isValid();
+	static const auto Result = [&] {
+		const auto interface = QDBusConnection::sessionBus().interface();
+		const auto activatableNames = ListDBusActivatableNames();
+
+		const auto serviceRegistered = interface
+			&& interface->isServiceRegistered(
+				qsl("org.freedesktop.portal.IBus"));
+
+		const auto serviceActivatable = activatableNames.contains(
+			qsl("org.freedesktop.portal.IBus"));
+
+		return serviceRegistered || serviceActivatable;
+	}();
 
 	return Result;
 }

From e64f6f72667d1beccd5464ec4d915b66f6db329d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 12 Nov 2020 19:10:30 +0400
Subject: [PATCH 036/370] Since changing the ibus portal check, it is not
 compatible with snap anymore

---
 Telegram/SourceFiles/platform/linux/specific_linux.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index fc5658557..61ce860be 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -1158,7 +1158,10 @@ void start() {
 	// 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()) {
+	if (AreQtPluginsBundled()
+		&& !InFlatpak()
+		&& !InSnap()
+		&& IsIBusPortalPresent()) {
 		LOG(("IBus portal is present! Using it."));
 		qputenv("IBUS_USE_PORTAL", "1");
 	}

From c8ce5dfa8bad172dbc35f15f2906defb1b04e322 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 15 Nov 2020 11:18:23 +0400
Subject: [PATCH 037/370] Fix escaping in scheme creation on Linux and set
 -workdir

---
 .../platform/linux/specific_linux.cpp         | 58 +++++++++----------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 61ce860be..9ca496c03 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -124,10 +124,12 @@ void PortalAutostart(bool autostart, bool silent = false) {
 	QVariantMap options;
 	options["reason"] = tr::lng_settings_auto_start(tr::now);
 	options["autostart"] = autostart;
-	options["commandline"] = QStringList({
+	options["commandline"] = QStringList{
 		cExeName(),
+		qsl("-workdir"),
+		cWorkingDir(),
 		qsl("-autostart")
-	});
+	};
 	options["dbus-activatable"] = false;
 
 	auto message = QDBusMessage::createMethodCall(
@@ -228,6 +230,10 @@ uint FileChooserPortalVersion() {
 }
 #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
+QString EscapeShellInLauncher(const QString &content) {
+	return EscapeShell(content.toUtf8()).replace('\\', "\\\\");
+}
+
 QString FlatpakID() {
 	static const auto Result = [] {
 		if (!qEnvironmentVariableIsEmpty("FLATPAK_ID")) {
@@ -291,35 +297,26 @@ bool GenerateDesktopFile(
 
 	QFile target(targetFile);
 	if (target.open(QIODevice::WriteOnly)) {
-		if (!Core::UpdaterDisabled()) {
-			fileText = fileText.replace(
-				QRegularExpression(
-					qsl("^TryExec=.*$"),
-					QRegularExpression::MultilineOption),
-				qsl("TryExec=")
-					+ QFile::encodeName(cExeDir() + cExeName())
-						.replace('\\', "\\\\"));
-			fileText = fileText.replace(
-				QRegularExpression(
-					qsl("^Exec=.*$"),
-					QRegularExpression::MultilineOption),
-				qsl("Exec=")
-					+ EscapeShell(QFile::encodeName(cExeDir() + cExeName()))
-						.replace('\\', "\\\\")
-					+ (args.isEmpty() ? QString() : ' ' + args));
-		} else {
-			fileText = fileText.replace(
-				QRegularExpression(
-					qsl("^Exec=(.*) -- %u$"),
-					QRegularExpression::MultilineOption),
-				qsl("Exec=\\1")
-					+ (args.isEmpty() ? QString() : ' ' + args));
-		}
+		fileText = fileText.replace(
+			QRegularExpression(
+				qsl("^TryExec=.*$"),
+				QRegularExpression::MultilineOption),
+			qsl("TryExec=%1").arg(
+				QString(cExeDir() + cExeName()).replace('\\', "\\\\")));
+
+		fileText = fileText.replace(
+			QRegularExpression(
+				qsl("^Exec=.*$"),
+				QRegularExpression::MultilineOption),
+			qsl("Exec=%1 -workdir %2").arg(
+				EscapeShellInLauncher(cExeDir() + cExeName()),
+				EscapeShellInLauncher(cWorkingDir()))
+				+ (args.isEmpty() ? QString() : ' ' + args));
 
 		target.write(fileText.toUtf8());
 		target.close();
 
-		if (IsStaticBinary()) {
+		if (!Core::UpdaterDisabled()) {
 			DEBUG_LOG(("App Info: removing old .desktop files"));
 			QFile::remove(qsl("%1telegram.desktop").arg(targetPath));
 			QFile::remove(qsl("%1telegramdesktop.desktop").arg(targetPath));
@@ -1217,10 +1214,9 @@ void RegisterCustomScheme(bool force) {
 
 	GError *error = nullptr;
 
-	const auto neededCommandlineBuilder = qsl("%1 --")
-		.arg(!Core::UpdaterDisabled()
-			? cExeDir() + cExeName()
-			: cExeName());
+	const auto neededCommandlineBuilder = qsl("%1 -workdir %2 --").arg(
+		QString(EscapeShell(QFile::encodeName(cExeDir() + cExeName()))),
+		QString(EscapeShell(QFile::encodeName(cWorkingDir()))));
 
 	const auto neededCommandline = qsl("%1 %u")
 		.arg(neededCommandlineBuilder);

From 772bd81ea560c190aec6fc63aad94fe4dadbb69f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 15 Nov 2020 19:50:15 +0400
Subject: [PATCH 038/370] Fix typo in the installlauncher cheat code

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

diff --git a/Telegram/SourceFiles/settings/settings_codes.cpp b/Telegram/SourceFiles/settings/settings_codes.cpp
index 9f77b4578..a83e690ce 100644
--- a/Telegram/SourceFiles/settings/settings_codes.cpp
+++ b/Telegram/SourceFiles/settings/settings_codes.cpp
@@ -158,7 +158,7 @@ auto GenerateCodes() {
 #endif // Q_OS_WIN || Q_OS_MAC
 
 #if defined Q_OS_UNIX && !defined Q_OS_MAC
-	codes.emplace(qsl("installauncher"), [](SessionController *window) {
+	codes.emplace(qsl("installlauncher"), [](SessionController *window) {
 		Platform::InstallLauncher(true);
 		Ui::Toast::Show("Forced launcher installation.");
 	});

From d7ef484aecf48500371752e8641b0b3f10e7826b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 14 Nov 2020 01:10:23 +0400
Subject: [PATCH 039/370] Use QWindow::setFlag that doesn't hide the windw

---
 Telegram/SourceFiles/window/main_window.cpp     | 14 +-------------
 Telegram/SourceFiles/window/window_title_qt.cpp | 12 +-----------
 Telegram/SourceFiles/window/window_title_qt.h   |  6 ------
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index cf0c168b1..f9733b6a4 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -13,7 +13,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/platform/ui_platform_utility.h"
 #include "history/history.h"
 #include "window/themes/window_theme.h"
-#include "window/window_title_qt.h" // kShowAfterWindowFlagChangeDelay
 #include "window/window_session_controller.h"
 #include "window/window_lock_widgets.h"
 #include "window/window_outdated_bar.h"
@@ -365,20 +364,9 @@ void MainWindow::refreshTitleWidget() {
 		_titleShadow.destroy();
 	}
 
-#if defined Q_OS_UNIX && !defined Q_OS_MAC
-	// setWindowFlag calls setParent(parentWidget(), newFlags), which
-	// always calls hide() explicitly, we have to show() the window back.
-	const auto hidden = isHidden();
 	const auto withShadow = hasShadow();
-	setWindowFlag(Qt::NoDropShadowWindowHint, withShadow);
+	windowHandle()->setFlag(Qt::NoDropShadowWindowHint, withShadow);
 	setAttribute(Qt::WA_OpaquePaintEvent, !withShadow);
-	if (!hidden) {
-		base::call_delayed(
-			kShowAfterWindowFlagChangeDelay,
-			this,
-			[=] { show(); });
-	}
-#endif // Q_OS_UNIX && !Q_OS_MAC
 }
 
 void MainWindow::updateMinimumSize() {
diff --git a/Telegram/SourceFiles/window/window_title_qt.cpp b/Telegram/SourceFiles/window/window_title_qt.cpp
index fc210e1aa..2dbc133b6 100644
--- a/Telegram/SourceFiles/window/window_title_qt.cpp
+++ b/Telegram/SourceFiles/window/window_title_qt.cpp
@@ -91,17 +91,7 @@ TitleWidgetQt::~TitleWidgetQt() {
 }
 
 void TitleWidgetQt::toggleFramelessWindow(bool enabled) {
-	// setWindowFlag calls setParent(parentWidget(), newFlags), which
-	// always calls hide() explicitly, we have to show() the window back.
-	const auto top = window();
-	const auto hidden = top->isHidden();
-	top->setWindowFlag(Qt::FramelessWindowHint, enabled);
-	if (!hidden) {
-		base::call_delayed(
-			kShowAfterWindowFlagChangeDelay,
-			top,
-			[=] { top->show(); });
-	}
+	window()->windowHandle()->setFlag(Qt::FramelessWindowHint, enabled);
 }
 
 void TitleWidgetQt::init() {
diff --git a/Telegram/SourceFiles/window/window_title_qt.h b/Telegram/SourceFiles/window/window_title_qt.h
index 126711e95..00b65cc09 100644
--- a/Telegram/SourceFiles/window/window_title_qt.h
+++ b/Telegram/SourceFiles/window/window_title_qt.h
@@ -22,12 +22,6 @@ class PlainShadow;
 
 namespace Window {
 
-// If we toggle frameless window hint in maximized window, and
-// show it back too quickly, the mouse position inside the window
-// won't be correct (from Qt-s point of view) until we Alt-Tab from
-// that window. If we show the window back with this delay it works.
-inline constexpr auto kShowAfterWindowFlagChangeDelay = crl::time(1000);
-
 class TitleWidgetQt : public TitleWidget {
 public:
 	TitleWidgetQt(QWidget *parent);

From 620c5962001e3930601958a0cac201f60c276e38 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 12 Nov 2020 16:29:44 +0400
Subject: [PATCH 040/370] Remove the last workaround in tray implementation

Since tdesktop gets icon theme pretty well now, there's no need for any workaround.
---
 .../platform/linux/main_window_linux.cpp      | 30 ++-----------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index c46d375a3..482a1a0cf 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -52,12 +52,9 @@ extern "C" {
 } // extern "C"
 #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
-#include <glib.h>
-
 namespace Platform {
 namespace {
 
-constexpr auto kDisableTrayCounter = "TDESKTOP_DISABLE_TRAY_COUNTER"_cs;
 constexpr auto kPanelTrayIconName = "telegram-panel"_cs;
 constexpr auto kMutePanelTrayIconName = "telegram-mute-panel"_cs;
 constexpr auto kAttentionPanelTrayIconName = "telegram-attention-panel"_cs;
@@ -201,13 +198,6 @@ QIcon TrayIconGen(int counter, bool muted) {
 
 	const auto iconName = GetTrayIconName(counter, muted);
 
-	if (qEnvironmentVariableIsSet(kDisableTrayCounter.utf8())
-		&& !iconName.isEmpty()) {
-		const auto result = QIcon::fromTheme(iconName);
-		UpdateIconRegenerationNeeded(result, counter, muted, iconThemeName);
-		return result;
-	}
-
 	QIcon result;
 	QIcon systemIcon;
 
@@ -261,8 +251,7 @@ QIcon TrayIconGen(int counter, bool muted) {
 
 		auto iconImage = currentImageBack;
 
-		if (!qEnvironmentVariableIsSet(kDisableTrayCounter.utf8())
-			&& counter > 0) {
+		if (counter > 0) {
 			const auto &bg = muted
 				? st::trayCounterBgMute
 				: st::trayCounterBg;
@@ -590,15 +579,7 @@ void MainWindow::psTrayMenuUpdated() {
 void MainWindow::setSNITrayIcon(int counter, bool muted) {
 	const auto iconName = GetTrayIconName(counter, muted);
 
-	if (qEnvironmentVariableIsSet(kDisableTrayCounter.utf8())
-		&& !iconName.isEmpty()) {
-		if (_sniTrayIcon->iconName() == iconName) {
-			return;
-		}
-
-		_sniTrayIcon->setIconByName(iconName);
-		_sniTrayIcon->setToolTipIconByName(iconName);
-	} else if (IsIndicatorApplication()) {
+	if (IsIndicatorApplication()) {
 		if (!IsIconRegenerationNeeded(counter, muted)
 			&& _trayIconFile
 			&& _sniTrayIcon->iconName() == _trayIconFile->fileName()) {
@@ -871,13 +852,6 @@ void MainWindow::LibsLoaded() {
 	qDBusRegisterMetaType<IconPixmap>();
 	qDBusRegisterMetaType<IconPixmapList>();
 #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-
-	if (!qEnvironmentVariableIsSet(kDisableTrayCounter.utf8())) {
-		g_message(
-			"You can disable tray icon counter with %s "
-			"and make it look better if it is monochrome.",
-			kDisableTrayCounter.utf8().constData());
-	}
 }
 
 void MainWindow::initTrayMenuHook() {

From 5c8a19b7f77f0bad2313452cad55e292d04a9b9d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 12 Nov 2020 16:32:09 +0400
Subject: [PATCH 041/370] Use only really supported icon sizes

---
 Telegram/SourceFiles/platform/linux/main_window_linux.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 482a1a0cf..9becbfffc 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -202,7 +202,6 @@ QIcon TrayIconGen(int counter, bool muted) {
 	QIcon systemIcon;
 
 	const auto iconSizes = {
-		16,
 		22,
 		24,
 		32,

From e4b9900a069373e9f404986bdb3b3eba1d5fb38f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 12 Nov 2020 11:28:31 +0400
Subject: [PATCH 042/370] Construct WindowControlsLayout without variable

---
 .../platform/linux/specific_linux.cpp         | 33 +++++++++----------
 .../SourceFiles/platform/mac/specific_mac.mm  | 13 ++++----
 .../SourceFiles/platform/win/specific_win.cpp | 13 ++++----
 3 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 9ca496c03..ec80da17a 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -964,31 +964,30 @@ Window::ControlsLayout WindowControlsLayout() {
 			);
 		}
 
-		Window::ControlsLayout controls;
-		controls.left = controlsLeft;
-		controls.right = controlsRight;
-
-		return controls;
+		return Window::ControlsLayout{
+			.left = controlsLeft,
+			.right = controlsRight
+		};
 	}
 #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
 
-	Window::ControlsLayout controls;
-
 	if (DesktopEnvironment::IsUnity()) {
-		controls.left = {
-			Window::Control::Close,
-			Window::Control::Minimize,
-			Window::Control::Maximize,
+		return Window::ControlsLayout{
+			.left = {
+				Window::Control::Close,
+				Window::Control::Minimize,
+				Window::Control::Maximize,
+			}
 		};
 	} else {
-		controls.right = {
-			Window::Control::Minimize,
-			Window::Control::Maximize,
-			Window::Control::Close,
+		return Window::ControlsLayout{
+			.right = {
+				Window::Control::Minimize,
+				Window::Control::Maximize,
+				Window::Control::Close,
+			}
 		};
 	}
-
-	return controls;
 }
 
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm
index 712e42c93..162629e89 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm
@@ -204,14 +204,13 @@ void IgnoreApplicationActivationRightNow() {
 }
 
 Window::ControlsLayout WindowControlsLayout() {
-	Window::ControlsLayout controls;
-	controls.left = {
-		Window::Control::Close,
-		Window::Control::Minimize,
-		Window::Control::Maximize,
+	return Window::ControlsLayout{
+		.left = {
+			Window::Control::Close,
+			Window::Control::Minimize,
+			Window::Control::Maximize,
+		}
 	};
-
-	return controls;
 }
 
 } // namespace Platform
diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp
index ad7ee8a2c..cec77bfa6 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.cpp
+++ b/Telegram/SourceFiles/platform/win/specific_win.cpp
@@ -325,14 +325,13 @@ bool ShowWindowMenu(QWindow *window) {
 }
 
 Window::ControlsLayout WindowControlsLayout() {
-	Window::ControlsLayout controls;
-	controls.right = {
-		Window::Control::Minimize,
-		Window::Control::Maximize,
-		Window::Control::Close,
+	return Window::ControlsLayout{
+		.right = {
+			Window::Control::Minimize,
+			Window::Control::Maximize,
+			Window::Control::Close,
+		}
 	};
-
-	return controls;
 }
 
 } // namespace Platform

From b4cb47cf7fb2b1eef00d818eb08199c9abee0d06 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 10 Nov 2020 01:36:45 +0400
Subject: [PATCH 043/370] Prefer gtk3 headers

---
 Telegram/CMakeLists.txt                              |  2 +-
 .../platform/linux/file_utilities_linux.cpp          | 12 +++++++-----
 Telegram/SourceFiles/platform/linux/linux_libs.h     |  2 +-
 Telegram/build/docker/centos_env/Dockerfile          |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 85f68e378..c3db02293 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -112,7 +112,7 @@ if (LINUX)
                 PkgConfig::X11
             )
         else()
-            pkg_search_module(GTK REQUIRED gtk+-2.0 gtk+-3.0)
+            pkg_search_module(GTK REQUIRED gtk+-3.0 gtk+-2.0)
             target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS})
             target_link_libraries(Telegram PRIVATE X11)
         endif()
diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index 84fc2b205..0cc204e63 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -500,8 +500,10 @@ GtkFileDialog::GtkFileDialog(QWidget *parent, const QString &caption, const QStr
 
 	d.reset(new QGtkDialog(Libs::gtk_file_chooser_dialog_new("", nullptr,
 		GTK_FILE_CHOOSER_ACTION_OPEN,
-		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-		GTK_STOCK_OK, GTK_RESPONSE_OK, nullptr)));
+		// https://developer.gnome.org/gtk3/stable/GtkFileChooserDialog.html#gtk-file-chooser-dialog-new
+		// first_button_text doesn't need explicit conversion to char*, while all others are vardict
+		tr::lng_cancel(tr::now).toUtf8(), GTK_RESPONSE_CANCEL,
+		tr::lng_box_ok(tr::now).toUtf8().constData(), GTK_RESPONSE_OK, nullptr)));
 	connect(d.data(), SIGNAL(accept()), this, SLOT(onAccepted()));
 	connect(d.data(), SIGNAL(reject()), this, SLOT(onRejected()));
 
@@ -737,9 +739,9 @@ void GtkFileDialog::applyOptions() {
 			/*if (opts->isLabelExplicitlySet(QFileDialogOptions::Accept))
 				Libs::gtk_button_set_label(Libs::gtk_button_cast(acceptButton), opts->labelText(QFileDialogOptions::Accept).toUtf8());
 			else*/ if (_acceptMode == QFileDialog::AcceptOpen)
-				Libs::gtk_button_set_label(Libs::gtk_button_cast(acceptButton), GTK_STOCK_OPEN);
+				Libs::gtk_button_set_label(Libs::gtk_button_cast(acceptButton), tr::lng_open_link(tr::now).toUtf8());
 			else
-				Libs::gtk_button_set_label(Libs::gtk_button_cast(acceptButton), GTK_STOCK_SAVE);
+				Libs::gtk_button_set_label(Libs::gtk_button_cast(acceptButton), tr::lng_settings_save(tr::now).toUtf8());
 		}
 
 		GtkWidget *rejectButton = Libs::gtk_dialog_get_widget_for_response(gtkDialog, GTK_RESPONSE_CANCEL);
@@ -747,7 +749,7 @@ void GtkFileDialog::applyOptions() {
 			/*if (opts->isLabelExplicitlySet(QFileDialogOptions::Reject))
 				Libs::gtk_button_set_label(Libs::gtk_button_cast(rejectButton), opts->labelText(QFileDialogOptions::Reject).toUtf8());
 			else*/
-				Libs::gtk_button_set_label(Libs::gtk_button_cast(rejectButton), GTK_STOCK_CANCEL);
+				Libs::gtk_button_set_label(Libs::gtk_button_cast(rejectButton), tr::lng_cancel(tr::now).toUtf8());
 		}
 	}
 }
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h
index cf207d88b..fa651615d 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.h
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
@@ -18,7 +18,7 @@ extern "C" {
 #define signals public
 } // extern "C"
 
-// present start with gtk 3.0, we're building with gtk 2.0 headers
+// present starting with gtk 3.0, we can build with gtk2 headers
 typedef struct _GtkAppChooser GtkAppChooser;
 
 #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 90464e42b..0bb9d3650 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -11,7 +11,7 @@ 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 \
+RUN yum -y install git cmake3 zlib-devel gtk3-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 \

From 2df7e4181f560ccdc37a758ec81e1c92e44b2413 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 10 Nov 2020 01:52:34 +0400
Subject: [PATCH 044/370] Add a comment about GTK_USE_PORTAL in snap

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 94cce2b3f..3efba1dc7 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -18,6 +18,7 @@ apps:
     common-id: org.telegram.desktop
     desktop: usr/share/applications/telegram-desktop_telegram-desktop.desktop
     environment:
+      # Tell glib to use portals on file associations handling.
       GTK_USE_PORTAL: 1
     plugs:
       - alsa

From c3b638449abd33c02716fc2a45c4b5030e78a22f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 10 Nov 2020 17:14:43 +0400
Subject: [PATCH 045/370] Re-check the screen media viewer appears on before
 adjusting geometry

---
 Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 245388078..d9a63d55f 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -432,9 +432,7 @@ void OverlayWidget::moveToScreen(bool force) {
 	if (activeWindowScreen && myScreen && myScreen != activeWindowScreen) {
 		windowHandle()->setScreen(activeWindowScreen);
 	}
-	const auto screen = activeWindowScreen
-		? activeWindowScreen
-		: QApplication::primaryScreen();
+	const auto screen = widgetScreen(this);
 	const auto available = screen->geometry();
 	if (!force && geometry() == available) {
 		return;

From 9d6e5f2a5bcba1f10d3727de2dcb4d341ed3803e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 10 Nov 2020 03:09:16 +0400
Subject: [PATCH 046/370] Adapt linux tray icon implementation to the new
 QIcon::pixmap behavior

More info: https://codereview.qt-project.org/c/qt/qtbase/+/314618
---
 .../platform/linux/main_window_linux.cpp      | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 9becbfffc..a85bdbab0 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -201,7 +201,7 @@ QIcon TrayIconGen(int counter, bool muted) {
 	QIcon result;
 	QIcon systemIcon;
 
-	const auto iconSizes = {
+	static const auto iconSizes = {
 		22,
 		24,
 		32,
@@ -240,9 +240,12 @@ QIcon TrayIconGen(int counter, bool muted) {
 				currentImageBack = Core::App().logo();
 			}
 
-			if (currentImageBack.size() != desiredSize) {
+			const auto currentImageBackSize = currentImageBack.size()
+				/ currentImageBack.devicePixelRatio();
+
+			if (currentImageBackSize != desiredSize) {
 				currentImageBack = currentImageBack.scaled(
-					desiredSize,
+					desiredSize * currentImageBack.devicePixelRatio(),
 					Qt::IgnoreAspectRatio,
 					Qt::SmoothTransformation);
 			}
@@ -327,8 +330,7 @@ std::unique_ptr<QTemporaryFile> TrayIconFile(
 	static const auto templateName = AppRuntimeDirectory()
 		+ kTrayIconFilename.utf16();
 
-	const auto dpr = style::DevicePixelRatio();
-	const auto desiredSize = QSize(22 * dpr, 22 * dpr);
+	static const auto desiredSize = QSize(22, 22);
 
 	auto ret = std::make_unique<QTemporaryFile>(
 		templateName,
@@ -346,10 +348,11 @@ std::unique_ptr<QTemporaryFile> TrayIconFile(
 			std::less<>(),
 			&QSize::width);
 
-		icon
-			.pixmap(*biggestSize)
+		const auto iconPixmap = icon.pixmap(*biggestSize);
+
+		iconPixmap
 			.scaled(
-				desiredSize,
+				desiredSize * iconPixmap.devicePixelRatio(),
 				Qt::IgnoreAspectRatio,
 				Qt::SmoothTransformation)
 			.save(ret.get());

From 0089692b527fab7cad633a605bc48b85c82d47f1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Nov 2020 19:38:24 +0300
Subject: [PATCH 047/370] Fix build for Mac App Store.

---
 Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm
index 27fd68f93..337055443 100644
--- a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm
@@ -7,6 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "platform/mac/file_bookmark_mac.h"
 
+#include "base/platform/mac/base_utilities_mac.h"
+#include "logs.h"
+
+#include <Cocoa/Cocoa.h>
+#include <CoreFoundation/CFURL.h>
+
 namespace Platform {
 namespace {
 
@@ -61,7 +67,7 @@ bool FileBookmark::enable() const {
 #else // OS_MAC_STORE
 	if (!data) return false;
 
-	QMutexLocker lock(&_bookmarksMutex);
+	QMutexLocker lock(&BookmarksMutex);
 	if (data->counter > 0 || [data->url startAccessingSecurityScopedResource] == YES) {
 		++data->counter;
 		return true;
@@ -74,7 +80,7 @@ void FileBookmark::disable() const {
 #ifdef OS_MAC_STORE
 	if (!data) return;
 
-	QMutexLocker lock(&_bookmarksMutex);
+	QMutexLocker lock(&BookmarksMutex);
 	if (data->counter > 0) {
 		--data->counter;
 		if (!data->counter) {

From 358228ce0096e368d46eb1941c92bb0ef671f784 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 16 Nov 2020 13:09:40 +0300
Subject: [PATCH 048/370] Update submodules.

---
 Telegram/lib_base | 2 +-
 Telegram/lib_ui   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 4f22126e7..ee68d3a63 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 4f22126e7e855b517857408abf2467cba163a6f2
+Subproject commit ee68d3a63b4f1e550e7f93c1f8d6e8e372bc0f33
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index cffa5e11d..a417bc87d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit cffa5e11d8d1f340bd2356c0944a0d3e91e38f2c
+Subproject commit a417bc87d01a7f733cfa72f40dd679b7b5ee449d

From 02eea3872445b72d0c16c18ab480ac7a08d2d2f7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 16 Nov 2020 14:22:19 +0300
Subject: [PATCH 049/370] Remove color space before sending in JPG.

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

diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 6865d5200..0a67661e7 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtCore/QBuffer>
 #include <QtGui/QImageWriter>
+#include <QtGui/QColorSpace>
 
 namespace {
 
@@ -878,6 +879,11 @@ void FileLoadTask::process(Args &&args) {
 				auto medium = (w > 320 || h > 320) ? fullimage.scaled(320, 320, Qt::KeepAspectRatio, Qt::SmoothTransformation) : fullimage;
 				auto full = (w > 1280 || h > 1280) ? fullimage.scaled(1280, 1280, Qt::KeepAspectRatio, Qt::SmoothTransformation) : fullimage;
 				{
+					// We have an example of dark .png image that when being sent without
+					// removing its color space is displayed fine on tdesktop, but with
+					// a light gray background on mobile apps.
+					full.setColorSpace(QColorSpace());
+
 					QBuffer buffer(&filedata);
 					QImageWriter writer(&buffer, "JPEG");
 					writer.setQuality(87);

From e4d2a66f45db3fd210673e959f567b1ea83b2d5e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 16 Nov 2020 19:31:34 +0300
Subject: [PATCH 050/370] Revert "Re-check the screen media viewer appears on
 before adjusting geometry"

This reverts commit c3b638449abd33c02716fc2a45c4b5030e78a22f.

It doesn't work as it was supposed to :(
---
 Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp | 4 +++-
 1 file changed, 3 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 d9a63d55f..245388078 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -432,7 +432,9 @@ void OverlayWidget::moveToScreen(bool force) {
 	if (activeWindowScreen && myScreen && myScreen != activeWindowScreen) {
 		windowHandle()->setScreen(activeWindowScreen);
 	}
-	const auto screen = widgetScreen(this);
+	const auto screen = activeWindowScreen
+		? activeWindowScreen
+		: QApplication::primaryScreen();
 	const auto available = screen->geometry();
 	if (!force && geometry() == available) {
 		return;

From b71f61dec33c752f8a9d711c5ed5efc6bdb774a5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 16 Nov 2020 19:37:29 +0300
Subject: [PATCH 051/370] Update submodules.

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

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index a417bc87d..77b6e43b1 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit a417bc87d01a7f733cfa72f40dd679b7b5ee449d
+Subproject commit 77b6e43b17df43d64354ba7198e6a7695a636627

From cd67cb1c62637dae2d00fdc87746c6b5f1365cd1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 16 Nov 2020 20:47:32 +0400
Subject: [PATCH 052/370] Update media viewer geometry on showing and screen
 change

---
 .../media/view/media_view_overlay_widget.cpp  | 45 +++++++++++++++----
 .../media/view/media_view_overlay_widget.h    |  6 ++-
 2 files changed, 41 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 245388078..e7d4fce54 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -359,6 +359,7 @@ OverlayWidget::OverlayWidget()
 	} else {
 		setWindowFlags(Qt::FramelessWindowHint);
 	}
+	updateGeometry(QApplication::primaryScreen()->geometry());
 	moveToScreen();
 	setAttribute(Qt::WA_NoSystemBackground, true);
 	setAttribute(Qt::WA_TranslucentBackground, true);
@@ -374,6 +375,17 @@ OverlayWidget::OverlayWidget()
 		setWindowState(Qt::WindowFullScreen);
 	}
 
+	connect(
+		windowHandle(),
+		&QWindow::visibleChanged,
+		this,
+		[=](bool visible) { handleVisibleChanged(visible); });
+	connect(
+		windowHandle(),
+		&QWindow::screenChanged,
+		this,
+		[=](QScreen *screen) { handleScreenChanged(screen); });
+
 #if defined Q_OS_MAC && !defined OS_OSX
 	TouchBar::SetupMediaViewTouchBar(
 		winId(),
@@ -417,7 +429,7 @@ void OverlayWidget::refreshLang() {
 	InvokeQueued(this, [this] { updateThemePreviewGeometry(); });
 }
 
-void OverlayWidget::moveToScreen(bool force) {
+void OverlayWidget::moveToScreen() {
 	const auto widgetScreen = [&](auto &&widget) -> QScreen* {
 		if (auto handle = widget ? widget->windowHandle() : nullptr) {
 			return handle->screen();
@@ -432,14 +444,10 @@ void OverlayWidget::moveToScreen(bool force) {
 	if (activeWindowScreen && myScreen && myScreen != activeWindowScreen) {
 		windowHandle()->setScreen(activeWindowScreen);
 	}
-	const auto screen = activeWindowScreen
-		? activeWindowScreen
-		: QApplication::primaryScreen();
-	const auto available = screen->geometry();
-	if (!force && geometry() == available) {
-		return;
-	}
-	setGeometry(available);
+}
+
+void OverlayWidget::updateGeometry(const QRect &rect) {
+	setGeometry(rect);
 
 	auto navSkip = 2 * st::mediaviewControlMargin + st::mediaviewControlSize;
 	_closeNav = myrtlrect(width() - st::mediaviewControlMargin - st::mediaviewControlSize, st::mediaviewControlMargin, st::mediaviewControlSize, st::mediaviewControlSize);
@@ -1294,6 +1302,12 @@ void OverlayWidget::onScreenResized(int screen) {
 	const auto changed = (screen >= 0 && screen < screens.size())
 		? screens[screen]
 		: nullptr;
+	if (windowHandle()
+		&& windowHandle()->screen()
+		&& changed
+		&& windowHandle()->screen() == changed) {
+		updateGeometry(changed->geometry());
+	}
 	if (!windowHandle()
 		|| !windowHandle()->screen()
 		|| !changed
@@ -1302,6 +1316,19 @@ void OverlayWidget::onScreenResized(int screen) {
 	}
 }
 
+void OverlayWidget::handleVisibleChanged(bool visible) {
+	if (visible) {
+		const auto screen = windowHandle()->screen()
+			? windowHandle()->screen()
+			: QApplication::primaryScreen();
+		updateGeometry(screen->geometry());
+	}
+}
+
+void OverlayWidget::handleScreenChanged(QScreen *screen) {
+	updateGeometry(screen->geometry());
+}
+
 void OverlayWidget::onToMessage() {
 	if (!_session) {
 		return;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 598760928..194659f40 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -208,10 +208,14 @@ private:
 	void assignMediaPointer(not_null<PhotoData*> photo);
 
 	void updateOver(QPoint mpos);
-	void moveToScreen(bool force = false);
+	void moveToScreen();
 	bool moveToNext(int delta);
 	void preloadData(int delta);
 
+	void updateGeometry(const QRect &rect);
+	void handleVisibleChanged(bool visible);
+	void handleScreenChanged(QScreen *screen);
+
 	bool contentCanBeSaved() const;
 	void checkForSaveLoaded();
 

From 8845652f772b2ba50786982fbf332b02c8f180de Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 13 Nov 2020 23:56:30 +0300
Subject: [PATCH 053/370] Fixed macOS build.

---
 .../SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm
index 32b4becd2..e2c337034 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm
@@ -229,7 +229,7 @@ NSSliderTouchBarItem *CreateTouchBarSlider(
 			touchesMatchingPhase:NSTouchPhaseEnded
 			inView:nil].count > 0;
 		Core::Sandbox::Instance().customEnterFromEventLoop([=] {
-			callback(touchUp, seekBar.doubleValue, *lastDurationMs);
+			callback(touchUp, seekBar.slider.doubleValue, *lastDurationMs);
 		});
 	} copy];
 

From f7c6876e1bf9fdc7f30937ab45fd2c274c0a4a48 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 2 Oct 2020 13:36:22 +0300
Subject: [PATCH 054/370] Moved history_view_compose_controls to controls
 folder.

---
 Telegram/CMakeLists.txt                                       | 4 ++--
 .../view/{ => controls}/history_view_compose_controls.cpp     | 2 +-
 .../view/{ => controls}/history_view_compose_controls.h       | 0
 .../SourceFiles/history/view/history_view_replies_section.cpp | 2 +-
 .../history/view/history_view_scheduled_section.cpp           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename Telegram/SourceFiles/history/view/{ => controls}/history_view_compose_controls.cpp (99%)
 rename Telegram/SourceFiles/history/view/{ => controls}/history_view_compose_controls.h (100%)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index c3db02293..c487387cf 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -474,6 +474,8 @@ PRIVATE
     history/admin_log/history_admin_log_section.h
     # history/feed/history_feed_section.cpp
     # history/feed/history_feed_section.h
+    history/view/controls/history_view_compose_controls.cpp
+    history/view/controls/history_view_compose_controls.h
     history/view/media/history_view_call.h
     history/view/media/history_view_call.cpp
     history/view/media/history_view_contact.h
@@ -514,8 +516,6 @@ PRIVATE
     history/view/media/history_view_theme_document.cpp
     history/view/media/history_view_web_page.h
     history/view/media/history_view_web_page.cpp
-    history/view/history_view_compose_controls.cpp
-    history/view/history_view_compose_controls.h
     history/view/history_view_contact_status.cpp
     history/view/history_view_contact_status.h
     history/view/history_view_context_menu.cpp
diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
similarity index 99%
rename from Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
rename to Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 6e3ec83d2..7648e7344 100644
--- a/Telegram/SourceFiles/history/view/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -5,7 +5,7 @@ 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_compose_controls.h"
+#include "history/view/controls/history_view_compose_controls.h"
 
 #include "base/event_filter.h"
 #include "base/qt_signal_producer.h"
diff --git a/Telegram/SourceFiles/history/view/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
similarity index 100%
rename from Telegram/SourceFiles/history/view/history_view_compose_controls.h
rename to Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index ead53c4ae..b3170d8cf 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/history_view_replies_section.h"
 
-#include "history/view/history_view_compose_controls.h"
+#include "history/view/controls/history_view_compose_controls.h"
 #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"
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index b2417000e..0afcc8d93 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/history_view_scheduled_section.h"
 
-#include "history/view/history_view_compose_controls.h"
+#include "history/view/controls/history_view_compose_controls.h"
 #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"

From 6d775d6f452ce275a4a398f8e5fa1f4d631c4cc4 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 3 Oct 2020 19:43:03 +0300
Subject: [PATCH 055/370] Moved structures of compose controls to separated
 header.

---
 Telegram/CMakeLists.txt                       |  1 +
 .../view/controls/compose_controls_common.h   | 42 +++++++++++++++++++
 .../history_view_compose_controls.cpp         |  1 +
 .../controls/history_view_compose_controls.h  | 30 ++++---------
 4 files changed, 51 insertions(+), 23 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/controls/compose_controls_common.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index c487387cf..85aed68e2 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -474,6 +474,7 @@ PRIVATE
     history/admin_log/history_admin_log_section.h
     # history/feed/history_feed_section.cpp
     # history/feed/history_feed_section.h
+    history/view/controls/compose_controls_common.h
     history/view/controls/history_view_compose_controls.cpp
     history/view/controls/history_view_compose_controls.h
     history/view/media/history_view_call.h
diff --git a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
new file mode 100644
index 000000000..d34621c1e
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
@@ -0,0 +1,42 @@
+/*
+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 Api {
+enum class SendProgressType;
+struct SendOptions;
+} // namespace Api
+
+class History;
+
+namespace HistoryView::Controls {
+
+struct MessageToEdit {
+	FullMsgId fullId;
+	Api::SendOptions options;
+	TextWithTags textWithTags;
+};
+struct VoiceToSend {
+	QByteArray bytes;
+	VoiceWaveform waveform;
+	int duration = 0;
+};
+struct SendActionUpdate {
+	Api::SendProgressType type = Api::SendProgressType();
+	int progress = 0;
+};
+
+struct SetHistoryArgs {
+	required<History*> history;
+	Fn<bool()> showSlowmodeError;
+	rpl::producer<int> slowmodeSecondsLeft;
+	rpl::producer<bool> sendDisabledBySlowmode;
+	rpl::producer<std::optional<QString>> writeRestriction;
+};
+
+} // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 7648e7344..0020e9944 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -56,6 +56,7 @@ using PhotoChosen = ComposeControls::PhotoChosen;
 using MessageToEdit = ComposeControls::MessageToEdit;
 using VoiceToSend = ComposeControls::VoiceToSend;
 using SendActionUpdate = ComposeControls::SendActionUpdate;
+using SetHistoryArgs = ComposeControls::SetHistoryArgs;
 
 [[nodiscard]] auto ShowWebPagePreview(WebPageData *page) {
 	return page && (page->pendingTill >= 0);
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 6b1b2f0a1..0bea19106 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/required.h"
 #include "api/api_common.h"
 #include "base/unique_qptr.h"
+#include "history/view/controls/compose_controls_common.h"
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
 #include "ui/widgets/input_fields.h"
@@ -61,26 +62,17 @@ class ComposeControls final {
 public:
 	using FileChosen = ChatHelpers::TabbedSelector::FileChosen;
 	using PhotoChosen = ChatHelpers::TabbedSelector::PhotoChosen;
+
+	using MessageToEdit = Controls::MessageToEdit;
+	using VoiceToSend = Controls::VoiceToSend;
+	using SendActionUpdate = Controls::SendActionUpdate;
+	using SetHistoryArgs = Controls::SetHistoryArgs;
+
 	enum class Mode {
 		Normal,
 		Scheduled,
 	};
 
-	struct MessageToEdit {
-		FullMsgId fullId;
-		Api::SendOptions options;
-		TextWithTags textWithTags;
-	};
-	struct VoiceToSend {
-		QByteArray bytes;
-		VoiceWaveform waveform;
-		int duration = 0;
-	};
-	struct SendActionUpdate {
-		Api::SendProgressType type = Api::SendProgressType();
-		int progress = 0;
-	};
-
 	ComposeControls(
 		not_null<QWidget*> parent,
 		not_null<Window::SessionController*> window,
@@ -88,14 +80,6 @@ public:
 	~ComposeControls();
 
 	[[nodiscard]] Main::Session &session() const;
-
-	struct SetHistoryArgs {
-		required<History*> history;
-		Fn<bool()> showSlowmodeError;
-		rpl::producer<int> slowmodeSecondsLeft;
-		rpl::producer<bool> sendDisabledBySlowmode;
-		rpl::producer<std::optional<QString>> writeRestriction;
-	};
 	void setHistory(SetHistoryArgs &&args);
 	void finishAnimating();
 

From 112dea85941ccf7043914c67b30e5f5312558c5e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 2 Oct 2020 21:14:41 +0300
Subject: [PATCH 056/370] Created voice record bar as separated history view
 class.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../history_view_voice_record_bar.cpp         | 279 ++++++++++++++++++
 .../controls/history_view_voice_record_bar.h  |  93 ++++++
 Telegram/SourceFiles/ui/chat/chat.style       |   1 +
 4 files changed, 375 insertions(+)
 create mode 100644 Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
 create mode 100644 Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 85aed68e2..e686508b3 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -477,6 +477,8 @@ PRIVATE
     history/view/controls/compose_controls_common.h
     history/view/controls/history_view_compose_controls.cpp
     history/view/controls/history_view_compose_controls.h
+    history/view/controls/history_view_voice_record_bar.cpp
+    history/view/controls/history_view_voice_record_bar.h
     history/view/media/history_view_call.h
     history/view/media/history_view_call.cpp
     history/view/media/history_view_contact.h
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
new file mode 100644
index 000000000..9685f5d01
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -0,0 +1,279 @@
+/*
+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/controls/history_view_voice_record_bar.h"
+
+#include "api/api_send_progress.h"
+#include "core/application.h"
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "media/audio/media_audio.h"
+#include "media/audio/media_audio_capture.h"
+#include "styles/style_chat.h"
+#include "ui/controls/send_button.h"
+#include "ui/text/format_values.h"
+#include "window/window_session_controller.h"
+
+namespace HistoryView::Controls {
+
+namespace {
+
+using SendActionUpdate = VoiceRecordBar::SendActionUpdate;
+using VoiceToSend = VoiceRecordBar::VoiceToSend;
+
+constexpr auto kRecordingUpdateDelta = crl::time(100);
+constexpr auto kMaxSamples =
+	::Media::Player::kDefaultFrequency * AudioVoiceMsgMaxLength;
+
+[[nodiscard]] auto Duration(int samples) {
+	return samples / ::Media::Player::kDefaultFrequency;
+}
+
+} // namespace
+
+VoiceRecordBar::VoiceRecordBar(
+	not_null<Ui::RpWidget*> parent,
+	not_null<Window::SessionController*> controller,
+	std::shared_ptr<Ui::SendButton> send,
+	int recorderHeight)
+: RpWidget(parent)
+, _controller(controller)
+, _wrap(std::make_unique<Ui::RpWidget>(parent))
+, _send(send)
+, _cancelFont(st::historyRecordFont)
+, _recordCancelWidth(_cancelFont->width(tr::lng_record_cancel(tr::now)))
+, _recordingAnimation([=](crl::time now) {
+	return recordingAnimationCallback(now);
+}) {
+	resize(QSize(parent->width(), recorderHeight));
+	init();
+}
+
+VoiceRecordBar::~VoiceRecordBar() {
+	if (isRecording()) {
+		stopRecording(false);
+	}
+}
+
+void VoiceRecordBar::updateControlsGeometry(QSize size) {
+	_centerY = size.height() / 2;
+	{
+		const auto maxD = st::historyRecordSignalMax * 2;
+		const auto point = _centerY - st::historyRecordSignalMax;
+		_redCircleRect = { point, point, maxD, maxD };
+	}
+}
+
+void VoiceRecordBar::init() {
+	hide();
+	// Keep VoiceRecordBar behind SendButton.
+	rpl::single(
+	) | rpl::then(
+		_send->events(
+		) | rpl::filter([](not_null<QEvent*> e) {
+			return e->type() == QEvent::ZOrderChange;
+		}) | rpl::to_empty
+	) | rpl::start_with_next([=] {
+		stackUnder(_send.get());
+	}, lifetime());
+
+	sizeValue(
+	) | rpl::start_with_next([=](QSize size) {
+		updateControlsGeometry(size);
+	}, lifetime());
+
+	paintRequest(
+	) | rpl::start_with_next([=] {
+		Painter p(this);
+		p.fillRect(rect(), st::historyComposeAreaBg);
+
+		drawRecording(p, _send->recordActiveRatio());
+	}, lifetime());
+}
+
+void VoiceRecordBar::startRecording() {
+	using namespace ::Media::Capture;
+	if (!instance()->available()) {
+		return;
+	}
+	show();
+	_recording = true;
+
+	instance()->start();
+	instance()->updated(
+	) | rpl::start_with_next_error([=](const Update &update) {
+		recordUpdated(update.level, update.samples);
+	}, [=] {
+		stopRecording(false);
+	}, _recordingLifetime);
+
+	_inField = true;
+	_controller->widget()->setInnerFocus();
+
+	update();
+	_send->setRecordActive(true);
+
+	_send->events(
+	) | rpl::filter([=](not_null<QEvent*> e) {
+		return isTypeRecord()
+			&& (e->type() == QEvent::MouseMove
+				|| e->type() == QEvent::MouseButtonRelease);
+	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		const auto type = e->type();
+		if (type == QEvent::MouseMove) {
+			const auto mouse = static_cast<QMouseEvent*>(e.get());
+			const auto pos = mapFromGlobal(mouse->globalPos());
+			const auto inField = rect().contains(pos);
+			if (inField != _inField) {
+				_inField = inField;
+				_send->setRecordActive(_inField);
+			}
+		} else if (type == QEvent::MouseButtonRelease) {
+			stopRecording(_inField);
+		}
+	}, _recordingLifetime);
+}
+
+bool VoiceRecordBar::recordingAnimationCallback(crl::time now) {
+	const auto dt = anim::Disabled()
+		? 1.
+		: ((now - _recordingAnimation.started())
+			/ float64(kRecordingUpdateDelta));
+	if (dt >= 1.) {
+		_recordingLevel.finish();
+	} else {
+		_recordingLevel.update(dt, anim::linear);
+	}
+	if (!anim::Disabled()) {
+		update(_redCircleRect);
+	}
+	return (dt < 1.);
+}
+
+void VoiceRecordBar::recordUpdated(quint16 level, int samples) {
+	_recordingLevel.start(level);
+	_recordingAnimation.start();
+	_recordingSamples = samples;
+	if (samples < 0 || samples >= kMaxSamples) {
+		stopRecording(samples > 0 && _inField);
+	}
+	Core::App().updateNonIdle();
+	update();
+	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice });
+}
+
+void VoiceRecordBar::stopRecording(bool send) {
+	hide();
+	_recording = false;
+
+	using namespace ::Media::Capture;
+	if (send) {
+		instance()->stop(crl::guard(this, [=](const Result &data) {
+			if (data.bytes.isEmpty()) {
+				return;
+			}
+
+			Window::ActivateWindow(_controller);
+			const auto duration = Duration(data.samples);
+			_sendVoiceRequests.fire({ data.bytes, data.waveform, duration });
+		}));
+	} else {
+		instance()->stop();
+	}
+
+	_recordingLevel = anim::value();
+	_recordingAnimation.stop();
+
+	_recordingLifetime.destroy();
+	_recordingSamples = 0;
+	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice, -1 });
+
+	_controller->widget()->setInnerFocus();
+
+	update();
+	_send->setRecordActive(false);
+}
+
+void VoiceRecordBar::drawRecording(Painter &p, float64 recordActive) {
+	p.setPen(Qt::NoPen);
+	p.setBrush(st::historyRecordSignalColor);
+
+	{
+		PainterHighQualityEnabler hq(p);
+		const auto min = st::historyRecordSignalMin;
+		const auto max = st::historyRecordSignalMax;
+		const auto delta = std::min(_recordingLevel.current() / 0x4000, 1.);
+		const auto radii = qRound(min + (delta * (max - min)));
+		const auto center = _redCircleRect.center() + QPoint(1, 1);
+		p.drawEllipse(center, radii, radii);
+	}
+
+	const auto duration = Ui::FormatDurationText(Duration(_recordingSamples));
+	p.setFont(_cancelFont);
+	p.setPen(st::historyRecordDurationFg);
+
+	const auto durationLeft = _redCircleRect.x()
+		+ _redCircleRect.width()
+		+ st::historyRecordDurationSkip;
+	const auto durationWidth = _cancelFont->width(duration);
+	p.drawText(
+		QRect(
+			durationLeft,
+			_redCircleRect.y(),
+			durationWidth,
+			_redCircleRect.height()),
+		style::al_left,
+		duration);
+
+	const auto leftCancel = durationLeft
+		+ durationWidth
+		+ ((_send->width() - st::historyRecordVoice.width()) / 2);
+	const auto rightCancel = width() - _send->width();
+
+	p.setPen(
+		anim::pen(
+			st::historyRecordCancel,
+			st::historyRecordCancelActive,
+			1. - recordActive));
+	p.drawText(
+		leftCancel + (rightCancel - leftCancel - _recordCancelWidth) / 2,
+		st::historyRecordTextTop + _cancelFont->ascent,
+		tr::lng_record_cancel(tr::now));
+}
+
+rpl::producer<SendActionUpdate> VoiceRecordBar::sendActionUpdates() const {
+	return _sendActionUpdates.events();
+}
+
+rpl::producer<VoiceToSend> VoiceRecordBar::sendVoiceRequests() const {
+	return _sendVoiceRequests.events();
+}
+
+bool VoiceRecordBar::isRecording() const {
+	return _recording.current();
+}
+
+void VoiceRecordBar::finishAnimating() {
+	_recordingAnimation.stop();
+}
+
+rpl::producer<bool> VoiceRecordBar::recordingStateChanges() const {
+	return _recording.changes();
+}
+
+rpl::producer<> VoiceRecordBar::startRecordingRequests() const {
+	return _send->events(
+	) | rpl::filter([=](not_null<QEvent*> e) {
+		return isTypeRecord() && (e->type() == QEvent::MouseButtonPress);
+	}) | rpl::to_empty;
+}
+
+bool VoiceRecordBar::isTypeRecord() const {
+	return (_send->type() == Ui::SendButton::Type::Record);
+}
+
+} // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
new file mode 100644
index 000000000..3e2c8ce5d
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -0,0 +1,93 @@
+/*
+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 "api/api_common.h"
+#include "history/view/controls/compose_controls_common.h"
+#include "ui/effects/animations.h"
+#include "ui/rp_widget.h"
+
+namespace Ui {
+class SendButton;
+} // namespace Ui
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace HistoryView::Controls {
+
+class VoiceRecordBar final : public Ui::RpWidget {
+public:
+	using SendActionUpdate = Controls::SendActionUpdate;
+	using VoiceToSend = Controls::VoiceToSend;
+
+	void startRecording();
+	void finishAnimating();
+
+	[[nodiscard]] rpl::producer<SendActionUpdate> sendActionUpdates() const;
+	[[nodiscard]] rpl::producer<VoiceToSend> sendVoiceRequests() const;
+	[[nodiscard]] rpl::producer<bool> recordingStateChanges() const;
+	[[nodiscard]] rpl::producer<> startRecordingRequests() const;
+
+	[[nodiscard]] bool isRecording() const;
+
+	VoiceRecordBar(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Window::SessionController*> controller,
+		std::shared_ptr<Ui::SendButton> send,
+		int recorderHeight);
+	~VoiceRecordBar();
+
+private:
+	void init();
+
+	void updateControlsGeometry(QSize size);
+
+	void recordError();
+	void recordUpdated(quint16 level, int samples);
+
+	bool recordingAnimationCallback(crl::time now);
+	void stopRecording(bool send);
+
+	void recordStopCallback(bool active);
+	void recordUpdateCallback(QPoint globalPos);
+
+	bool showRecordButton() const;
+	void drawRecording(Painter &p, float64 recordActive);
+	void updateOverStates(QPoint pos);
+
+	bool isTypeRecord() const;
+
+	const not_null<Window::SessionController*> _controller;
+	const std::unique_ptr<Ui::RpWidget> _wrap;
+	const std::shared_ptr<Ui::SendButton> _send;
+
+	rpl::event_stream<SendActionUpdate> _sendActionUpdates;
+	rpl::event_stream<VoiceToSend> _sendVoiceRequests;
+
+	int _centerY = 0;
+	QRect _redCircleRect;
+
+	rpl::variable<bool> _recording = false;
+	bool _inField = false;
+	int _recordingSamples = 0;
+
+	const style::font &_cancelFont;
+	int _recordCancelWidth;
+
+	rpl::lifetime _recordingLifetime;
+
+	// This can animate for a very long time (like in music playing),
+	// so it should be a Basic, not a Simple animation.
+	Ui::Animations::Basic _recordingAnimation;
+	anim::value _recordingLevel;
+
+};
+
+} // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 855fd3d94..ed8a05b06 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -339,6 +339,7 @@ historyRecordSignalMax: 12px;
 historyRecordCancel: windowSubTextFg;
 historyRecordCancelActive: windowActiveTextFg;
 historyRecordFont: font(13px);
+historyRecordDurationSkip: 12px;
 historyRecordDurationFg: historyComposeAreaFg;
 historyRecordTextTop: 14px;
 

From fd76b44dbdf150d91761946e6f853390f9035c67 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 4 Oct 2020 00:46:03 +0300
Subject: [PATCH 057/370] Replaced voice record processing with VoiceRecordBar
 in ComposeControls.

---
 .../history_view_compose_controls.cpp         | 273 +++---------------
 .../controls/history_view_compose_controls.h  |  32 +-
 2 files changed, 57 insertions(+), 248 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 0020e9944..21c8e5e93 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/confirm_box.h"
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/view/controls/history_view_voice_record_bar.h"
 #include "history/view/history_view_webpage_preview.h"
 #include "inline_bots/inline_results_widget.h"
 #include "lang/lang_keys.h"
@@ -57,6 +58,7 @@ using MessageToEdit = ComposeControls::MessageToEdit;
 using VoiceToSend = ComposeControls::VoiceToSend;
 using SendActionUpdate = ComposeControls::SendActionUpdate;
 using SetHistoryArgs = ComposeControls::SetHistoryArgs;
+using VoiceRecordBar = HistoryView::Controls::VoiceRecordBar;
 
 [[nodiscard]] auto ShowWebPagePreview(WebPageData *page) {
 	return page && (page->pendingTill >= 0);
@@ -500,7 +502,7 @@ ComposeControls::ComposeControls(
 , _mode(mode)
 , _wrap(std::make_unique<Ui::RpWidget>(parent))
 , _writeRestricted(std::make_unique<Ui::RpWidget>(parent))
-, _send(Ui::CreateChild<Ui::SendButton>(_wrap.get()))
+, _send(std::make_shared<Ui::SendButton>(_wrap.get()))
 , _attachToggle(Ui::CreateChild<Ui::IconButton>(
 	_wrap.get(),
 	st::historyAttach))
@@ -516,18 +518,16 @@ ComposeControls::ComposeControls(
 , _header(std::make_unique<FieldHeader>(
 		_wrap.get(),
 		&_window->session().data()))
-, _textUpdateEvents(TextUpdateEvent::SendTyping)
-, _recordCancelWidth(st::historyRecordFont->width(tr::lng_record_cancel(tr::now)))
-, _recordingAnimation([=](crl::time now) {
-	return recordingAnimationCallback(now);
-}) {
+, _voiceRecordBar(std::make_unique<VoiceRecordBar>(
+		_wrap.get(),
+		window,
+		_send,
+		st::historySendSize.height()))
+, _textUpdateEvents(TextUpdateEvent::SendTyping) {
 	init();
 }
 
 ComposeControls::~ComposeControls() {
-	if (_recording) {
-		stopRecording(false);
-	}
 	setTabbedPanel(nullptr);
 }
 
@@ -579,91 +579,13 @@ int ComposeControls::heightCurrent() const {
 }
 
 bool ComposeControls::focus() {
-	if (_recording) {
+	if (_voiceRecordBar->isRecording()) {
 		return false;
 	}
 	_field->setFocus();
 	return true;
 }
 
-void ComposeControls::updateControlsVisibility() {
-	if (_recording) {
-		_field->hide();
-		_tabbedSelectorToggle->hide();
-		//_botKeyboardShow->hide();
-		//_botKeyboardHide->hide();
-		//_botCommandStart->hide();
-		_attachToggle->hide();
-		//if (_silent) {
-		//	_silent->hide();
-		//}
-		//if (_scheduled) {
-		//	_scheduled->hide();
-		//}
-		//if (_kbShown) {
-		//	_kbScroll->show();
-		//} else {
-		//	_kbScroll->hide();
-		//}
-	} else {
-		_field->show();
-		//if (_kbShown) {
-		//	_kbScroll->show();
-		//	_tabbedSelectorToggle->hide();
-		//	_botKeyboardHide->show();
-		//	_botKeyboardShow->hide();
-		//	_botCommandStart->hide();
-		//} else if (_kbReplyTo) {
-		//	_kbScroll->hide();
-		//	_tabbedSelectorToggle->show();
-		//	_botKeyboardHide->hide();
-		//	_botKeyboardShow->hide();
-		//	_botCommandStart->hide();
-		//} else {
-		//	_kbScroll->hide();
-		//	_tabbedSelectorToggle->show();
-		//	_botKeyboardHide->hide();
-		//	if (_keyboard->hasMarkup()) {
-		//		_botKeyboardShow->show();
-		//		_botCommandStart->hide();
-		//	} else {
-		//		_botKeyboardShow->hide();
-		//		if (_cmdStartShown) {
-		//			_botCommandStart->show();
-		//		} else {
-		//			_botCommandStart->hide();
-		//		}
-		//	}
-		//}
-		_tabbedSelectorToggle->show();
-		_attachToggle->show();
-		//if (_silent) {
-		//	_silent->show();
-		//}
-		//if (_scheduled) {
-		//	_scheduled->show();
-		//}
-		//updateFieldPlaceholder();
-	}
-
-}
-
-bool ComposeControls::recordingAnimationCallback(crl::time now) {
-	const auto dt = anim::Disabled()
-		? 1.
-		: ((now - _recordingAnimation.started())
-			/ float64(kRecordingUpdateDelta));
-	if (dt >= 1.) {
-		_recordingLevel.finish();
-	} else {
-		_recordingLevel.update(dt, anim::linear);
-	}
-	if (!anim::Disabled()) {
-		_wrap->update(_attachToggle->geometry());
-	}
-	return (dt < 1.);
-}
-
 rpl::producer<> ComposeControls::cancelRequests() const {
 	return _cancelRequests.events();
 }
@@ -693,7 +615,7 @@ rpl::producer<> ComposeControls::sendRequests() const {
 }
 
 rpl::producer<VoiceToSend> ComposeControls::sendVoiceRequests() const {
-	return _sendVoiceRequests.events();
+	return _voiceRecordBar->sendVoiceRequests();
 }
 
 rpl::producer<MessageToEdit> ComposeControls::editRequests() const {
@@ -792,6 +714,7 @@ void ComposeControls::init() {
 	initTabbedSelector();
 	initSendButton();
 	initWriteRestriction();
+	initVoiceRecordBar();
 
 	_wrap->sizeValue(
 	) | rpl::start_with_next([=](QSize size) {
@@ -841,99 +764,12 @@ void ComposeControls::init() {
 			cancelEditMessage();
 		}, _wrap->lifetime());
 	}
+
+	orderControls();
 }
 
-void ComposeControls::recordDone(
-		QByteArray result,
-		VoiceWaveform waveform,
-		int samples) {
-	if (result.isEmpty()) {
-		return;
-	}
-
-	Window::ActivateWindow(_window);
-	const auto duration = samples / ::Media::Player::kDefaultFrequency;
-	_sendVoiceRequests.fire({ result, waveform, duration });
-}
-
-void ComposeControls::recordUpdated(quint16 level, int samples) {
-	if (!_recording) {
-		return;
-	}
-
-	_recordingLevel.start(level);
-	_recordingAnimation.start();
-	_recordingSamples = samples;
-	if (samples < 0 || samples >= ::Media::Player::kDefaultFrequency * AudioVoiceMsgMaxLength) {
-		stopRecording(samples > 0 && _inField);
-	}
-	Core::App().updateNonIdle();
-	_wrap->update();
-	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice });
-}
-
-void ComposeControls::recordStartCallback() {
-	using namespace ::Media::Capture;
-	const auto error = _history
-		? Data::RestrictionError(_history->peer, ChatRestriction::f_send_media)
-		: std::nullopt;
-	if (error) {
-		Ui::show(Box<InformBox>(*error));
-		return;
-	} else if (_showSlowmodeError && _showSlowmodeError()) {
-		return;
-	} else if (!instance()->available()) {
-		return;
-	}
-
-	instance()->start();
-	instance()->updated(
-	) | rpl::start_with_next_error([=](const Update &update) {
-		recordUpdated(update.level, update.samples);
-	}, [=] {
-		stopRecording(false);
-	}, _recordingLifetime);
-
-	_recording = _inField = true;
-	updateControlsVisibility();
-	_window->widget()->setInnerFocus();
-
-	_wrap->update();
-
-	_send->setRecordActive(true);
-}
-
-void ComposeControls::recordStopCallback(bool active) {
-	stopRecording(active);
-}
-
-void ComposeControls::recordUpdateCallback(QPoint globalPos) {
-	updateOverStates(_wrap->mapFromGlobal(globalPos));
-}
-
-void ComposeControls::stopRecording(bool send) {
-	if (send) {
-		::Media::Capture::instance()->stop(crl::guard(_wrap.get(), [=](
-				const ::Media::Capture::Result &result) {
-			recordDone(result.bytes, result.waveform, result.samples);
-		}));
-	} else {
-		::Media::Capture::instance()->stop();
-	}
-
-	_recordingLevel = anim::value();
-	_recordingAnimation.stop();
-
-	_recordingLifetime.destroy();
-	_recording = false;
-	_recordingSamples = 0;
-	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice, -1 });
-
-	updateControlsVisibility();
-	_window->widget()->setInnerFocus();
-
-	_wrap->update();
-	_send->setRecordActive(false);
+void ComposeControls::orderControls() {
+	_send->raise();
 }
 
 bool ComposeControls::showRecordButton() const {
@@ -943,30 +779,6 @@ bool ComposeControls::showRecordButton() const {
 		&& !isEditingMessage();
 }
 
-void ComposeControls::drawRecording(Painter &p, float64 recordActive) {
-	p.setPen(Qt::NoPen);
-	p.setBrush(st::historyRecordSignalColor);
-
-	auto delta = qMin(_recordingLevel.current() / 0x4000, 1.);
-	auto d = 2 * qRound(st::historyRecordSignalMin + (delta * (st::historyRecordSignalMax - st::historyRecordSignalMin)));
-	{
-		PainterHighQualityEnabler hq(p);
-		p.drawEllipse(_attachToggle->x() + (_tabbedSelectorToggle->width() - d) / 2, _attachToggle->y() + (_attachToggle->height() - d) / 2, d, d);
-	}
-
-	auto duration = Ui::FormatDurationText(_recordingSamples / ::Media::Player::kDefaultFrequency);
-	p.setFont(st::historyRecordFont);
-
-	p.setPen(st::historyRecordDurationFg);
-	p.drawText(_attachToggle->x() + _tabbedSelectorToggle->width(), _attachToggle->y() + st::historyRecordTextTop + st::historyRecordFont->ascent, duration);
-
-	int32 left = _attachToggle->x() + _tabbedSelectorToggle->width() + st::historyRecordFont->width(duration) + ((_send->width() - st::historyRecordVoice.width()) / 2);
-	int32 right = _wrap->width() - _send->width();
-
-	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 ComposeControls::drawRestrictedWrite(Painter &p, const QString &error) {
 	p.fillRect(_writeRestricted->rect(), st::historyReplyBg);
 
@@ -1023,7 +835,9 @@ void ComposeControls::fieldChanged() {
 }
 
 rpl::producer<SendActionUpdate> ComposeControls::sendActionUpdates() const {
-	return _sendActionUpdates.events();
+	return rpl::merge(
+		_sendActionUpdates.events(),
+		_voiceRecordBar->sendActionUpdates());
 }
 
 void ComposeControls::initTabbedSelector() {
@@ -1093,6 +907,29 @@ void ComposeControls::initWriteRestriction() {
 	}, _wrap->lifetime());
 }
 
+void ComposeControls::initVoiceRecordBar() {
+	_voiceRecordBar->recordingStateChanges(
+	) | rpl::start_with_next([=](bool active) {
+		_field->setVisible(!active);
+	}, _wrap->lifetime());
+
+	_voiceRecordBar->startRecordingRequests(
+	) | rpl::start_with_next([=] {
+		const auto error = _history
+			? Data::RestrictionError(
+				_history->peer,
+				ChatRestriction::f_send_media)
+			: std::nullopt;
+		if (error) {
+			Ui::show(Box<InformBox>(*error));
+			return;
+		} else if (_showSlowmodeError && _showSlowmodeError()) {
+			return;
+		}
+		_voiceRecordBar->startRecording();
+	}, _wrap->lifetime());
+}
+
 void ComposeControls::updateWrappingVisibility() {
 	const auto restricted = _writeRestriction.current().has_value();
 	_writeRestricted->setVisible(restricted);
@@ -1124,16 +961,11 @@ void ComposeControls::updateSendButtonType() {
 	_send->setSlowmodeDelay(delay);
 	_send->setDisabled(_sendDisabledBySlowmode.current()
 		&& (type == Type::Send || type == Type::Record));
-
-	_send->setRecordStartCallback([=] { recordStartCallback(); });
-	_send->setRecordStopCallback([=](bool active) { recordStopCallback(active); });
-	_send->setRecordUpdateCallback([=](QPoint globalPos) { recordUpdateCallback(globalPos); });
-	_send->setRecordAnimationCallback([=] { _wrap->update(); });
 }
 
 void ComposeControls::finishAnimating() {
 	_send->finishAnimating();
-	_recordingAnimation.stop();
+	_voiceRecordBar->finishAnimating();
 }
 
 void ComposeControls::updateControlsGeometry(QSize size) {
@@ -1165,6 +997,11 @@ void ComposeControls::updateControlsGeometry(QSize size) {
 	_send->moveToRight(right, buttonsTop);
 	right += _send->width();
 	_tabbedSelectorToggle->moveToRight(right, buttonsTop);
+
+	_voiceRecordBar->resizeToWidth(size.width());
+	_voiceRecordBar->moveToLeft(
+		0,
+		size.height() - _voiceRecordBar->height());
 }
 
 void ComposeControls::updateOuterGeometry(QRect rect) {
@@ -1178,24 +1015,10 @@ void ComposeControls::updateOuterGeometry(QRect rect) {
 	}
 }
 
-void ComposeControls::updateOverStates(QPoint pos) {
-	const auto inField = _wrap->rect().contains(pos);
-	if (inField != _inField && _recording) {
-		_inField = inField;
-		_send->setRecordActive(_inField);
-	}
-}
-
 void ComposeControls::paintBackground(QRect clip) {
 	Painter p(_wrap.get());
 
 	p.fillRect(clip, st::historyComposeAreaBg);
-	if (!_field->isHidden() || _recording) {
-		//drawField(p, clip);
-		if (!_send->isHidden() && _recording) {
-			drawRecording(p, _send->recordActiveRatio());
-		}
-	}
 }
 
 void ComposeControls::escape() {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 0bea19106..3d642ab5d 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -56,6 +56,10 @@ enum class SendProgressType;
 
 namespace HistoryView {
 
+namespace Controls {
+class VoiceRecordBar;
+} // namespace Controls
+
 class FieldHeader;
 
 class ComposeControls final {
@@ -145,6 +149,7 @@ private:
 	void initSendButton();
 	void initWebpageProcess();
 	void initWriteRestriction();
+	void initVoiceRecordBar();
 	void updateSendButtonType();
 	void updateHeight();
 	void updateWrappingVisibility();
@@ -153,6 +158,8 @@ private:
 	void updateOuterGeometry(QRect rect);
 	void paintBackground(QRect clip);
 
+	void orderControls();
+
 	void escape();
 	void fieldChanged();
 	void toggleTabbedSelectorMode();
@@ -161,18 +168,7 @@ private:
 
 	void setTextFromEditingMessage(not_null<HistoryItem*> item);
 
-	void recordUpdated(quint16 level, int samples);
-	void recordDone(QByteArray result, VoiceWaveform waveform, int samples);
-
-	bool recordingAnimationCallback(crl::time now);
-	void stopRecording(bool send);
-
-	void recordStartCallback();
-	void recordStopCallback(bool active);
-	void recordUpdateCallback(QPoint globalPos);
-
 	bool showRecordButton() const;
-	void drawRecording(Painter &p, float64 recordActive);
 	void drawRestrictedWrite(Painter &p, const QString &error);
 	void updateOverStates(QPoint pos);
 
@@ -188,7 +184,7 @@ private:
 	const std::unique_ptr<Ui::RpWidget> _wrap;
 	const std::unique_ptr<Ui::RpWidget> _writeRestricted;
 
-	const not_null<Ui::SendButton*> _send;
+	const std::shared_ptr<Ui::SendButton> _send;
 	const not_null<Ui::IconButton*> _attachToggle;
 	const not_null<Ui::EmojiButton*> _tabbedSelectorToggle;
 	const not_null<Ui::InputField*> _field;
@@ -197,32 +193,22 @@ private:
 
 	friend class FieldHeader;
 	const std::unique_ptr<FieldHeader> _header;
+	const std::unique_ptr<Controls::VoiceRecordBar> _voiceRecordBar;
 
 	rpl::event_stream<> _cancelRequests;
 	rpl::event_stream<FileChosen> _fileChosen;
 	rpl::event_stream<PhotoChosen> _photoChosen;
 	rpl::event_stream<ChatHelpers::TabbedSelector::InlineChosen> _inlineResultChosen;
 	rpl::event_stream<SendActionUpdate> _sendActionUpdates;
-	rpl::event_stream<VoiceToSend> _sendVoiceRequests;
 
 	TextWithTags _localSavedText;
 	TextUpdateEvents _textUpdateEvents;
 
-	bool _recording = false;
-	bool _inField = false;
 	//bool _inReplyEditForward = false;
 	//bool _inClickable = false;
-	int _recordingSamples = 0;
-	int _recordCancelWidth;
-	rpl::lifetime _recordingLifetime;
 
 	rpl::lifetime _uploaderSubscriptions;
 
-	// This can animate for a very long time (like in music playing),
-	// so it should be a Basic, not a Simple animation.
-	Ui::Animations::Basic _recordingAnimation;
-	anim::value _recordingLevel;
-
 	Fn<void()> _raiseEmojiSuggestions;
 
 };

From db564ca486cd73dec529a6bb3b537a34d38fd04e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 4 Oct 2020 02:25:25 +0300
Subject: [PATCH 058/370] Replaced voice record processing with VoiceRecordBar
 in HistoryWidget.

---
 Telegram/SourceFiles/config.h                 |   3 -
 .../SourceFiles/history/history_widget.cpp    | 310 ++++++------------
 Telegram/SourceFiles/history/history_widget.h |  29 +-
 .../history_view_voice_record_bar.cpp         |   3 +-
 4 files changed, 103 insertions(+), 242 deletions(-)

diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index f9b9f496d..40ee00143 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -29,9 +29,6 @@ enum {
 	LinksOverviewPerPage = 12,
 	MediaOverviewStartPerPage = 5,
 
-	AudioVoiceMsgMaxLength = 100 * 60, // 100 minutes
-	AudioVoiceMsgChannels = 2, // stereo
-
 	PreloadHeightsCount = 3, // when 3 screens to scroll left make a preload request
 
 	SearchPeopleLimit = 5,
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 71e7780e9..2cdfee1ac 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -62,6 +62,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_inner_widget.h"
 #include "history/history_item_components.h"
 //#include "history/feed/history_feed_section.h" // #feed
+#include "history/view/controls/history_view_voice_record_bar.h"
 #include "history/view/history_view_service_message.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_scheduled_section.h"
@@ -176,7 +177,7 @@ HistoryWidget::HistoryWidget(
 , _supportAutocomplete(session().supportMode()
 	? object_ptr<Support::Autocomplete>(this, &session())
 	: nullptr)
-, _send(this)
+, _send(std::make_shared<Ui::SendButton>(this))
 , _unblock(this, tr::lng_unblock_button(tr::now).toUpper(), st::historyUnblock)
 , _botStart(this, tr::lng_bot_start(tr::now).toUpper(), st::historyComposeButton)
 , _joinChannel(
@@ -192,15 +193,16 @@ HistoryWidget::HistoryWidget(
 , _botKeyboardShow(this, st::historyBotKeyboardShow)
 , _botKeyboardHide(this, st::historyBotKeyboardHide)
 , _botCommandStart(this, st::historyBotCommandStart)
+, _voiceRecordBar(std::make_unique<HistoryWidget::VoiceRecordBar>(
+		this,
+		controller,
+		_send,
+		st::historySendSize.height()))
 , _field(
 	this,
 	st::historyComposeField,
 	Ui::InputField::Mode::MultiLine,
 	tr::lng_message_ph())
-, _recordCancelWidth(st::historyRecordFont->width(tr::lng_record_cancel(tr::now)))
-, _recordingAnimation([=](crl::time now) {
-	return recordingAnimationCallback(now);
-})
 , _kbScroll(this, st::botKbScroll)
 , _topShadow(this) {
 	setAcceptDrops(true);
@@ -217,7 +219,7 @@ HistoryWidget::HistoryWidget(
 	_send->addClickHandler([=] { sendButtonClicked(); });
 
 	SendMenu::SetupMenuAndShortcuts(
-		_send,
+		_send.get(),
 		[=] { return sendButtonMenuType(); },
 		[=] { sendSilent(); },
 		[=] { sendScheduled(); });
@@ -349,10 +351,7 @@ HistoryWidget::HistoryWidget(
 	_joinChannel->hide();
 	_muteUnmute->hide();
 
-	_send->setRecordStartCallback([this] { recordStartCallback(); });
-	_send->setRecordStopCallback([this](bool active) { recordStopCallback(active); });
-	_send->setRecordUpdateCallback([this](QPoint globalPos) { recordUpdateCallback(globalPos); });
-	_send->setRecordAnimationCallback([this] { updateField(); });
+	initVoiceRecordBar();
 
 	_attachToggle->hide();
 	_tabbedSelectorToggle->hide();
@@ -717,6 +716,48 @@ void HistoryWidget::refreshTabbedPanel() {
 	}
 }
 
+void HistoryWidget::initVoiceRecordBar() {
+	_voiceRecordBar->startRecordingRequests(
+	) | rpl::start_with_next([=] {
+		const auto error = _peer
+			? Data::RestrictionError(_peer, ChatRestriction::f_send_media)
+			: std::nullopt;
+		if (error) {
+			Ui::show(Box<InformBox>(*error));
+			return;
+		} else if (showSlowmodeError()) {
+			return;
+		}
+		_voiceRecordBar->startRecording();
+	}, lifetime());
+
+	_voiceRecordBar->sendActionUpdates(
+	) | rpl::start_with_next([=](const auto &data) {
+		if (!_history) {
+			return;
+		}
+		session().sendProgressManager().update(
+			_history,
+			data.type,
+			data.progress);
+	}, lifetime());
+
+	_voiceRecordBar->sendVoiceRequests(
+	) | rpl::start_with_next([=](const auto &data) {
+		if (!canWriteMessage() || data.bytes.isEmpty() || !_history) {
+			return;
+		}
+
+		auto action = Api::SendAction(_history);
+		action.replyTo = replyToId();
+		session().api().sendVoiceMessage(
+			data.bytes,
+			data.waveform,
+			data.duration,
+			action);
+	}, lifetime());
+}
+
 void HistoryWidget::initTabbedSelector() {
 	refreshTabbedPanel();
 
@@ -1145,6 +1186,7 @@ void HistoryWidget::applyInlineBotQuery(UserData *bot, const QString &query) {
 }
 
 void HistoryWidget::orderWidgets() {
+	_send->raise();
 	if (_contactStatus) {
 		_contactStatus->raise();
 	}
@@ -1343,6 +1385,10 @@ void HistoryWidget::writeDrafts(Data::Draft **localDraft, Data::Draft **editDraf
 	}
 }
 
+bool HistoryWidget::isRecording() const {
+	return _voiceRecordBar->isRecording();
+}
+
 void HistoryWidget::activate() {
 	if (_history) {
 		if (!_historyInited) {
@@ -1360,7 +1406,7 @@ void HistoryWidget::setInnerFocus() {
 	} else if (_list) {
 		if (_nonEmptySelection
 			|| (_list && _list->wasSelectedText())
-			|| _recording
+			|| isRecording()
 			|| isBotStart()
 			|| isBlocked()
 			|| !_canSendMessages) {
@@ -1371,41 +1417,6 @@ void HistoryWidget::setInnerFocus() {
 	}
 }
 
-void HistoryWidget::recordDone(
-		QByteArray result,
-		VoiceWaveform waveform,
-		int samples) {
-	if (!canWriteMessage() || result.isEmpty()) {
-		return;
-	}
-
-	Window::ActivateWindow(controller());
-	const auto duration = samples / Media::Player::kDefaultFrequency;
-	auto action = Api::SendAction(_history);
-	action.replyTo = replyToId();
-	session().api().sendVoiceMessage(result, waveform, duration, action);
-}
-
-void HistoryWidget::recordUpdate(ushort level, int samples) {
-	if (!_recording) {
-		return;
-	}
-
-	_recordingLevel.start(level);
-	_recordingAnimation.start();
-	_recordingSamples = samples;
-	if (samples < 0 || samples >= Media::Player::kDefaultFrequency * AudioVoiceMsgMaxLength) {
-		stopRecording(_peer && samples > 0 && _inField);
-	}
-	Core::App().updateNonIdle();
-	updateField();
-	if (_history) {
-		session().sendProgressManager().update(
-			_history,
-			Api::SendProgressType::RecordVoice);
-	}
-}
-
 bool HistoryWidget::notify_switchInlineBotButtonReceived(const QString &query, UserData *samePeerBot, MsgId samePeerReplyTo) {
 	if (samePeerBot) {
 		if (_history) {
@@ -2125,63 +2136,45 @@ void HistoryWidget::updateControlsVisibility() {
 		_muteUnmute->hide();
 		_send->show();
 		updateSendButtonType();
-		if (_recording) {
-			_field->hide();
+
+		_field->show();
+		if (_kbShown) {
+			_kbScroll->show();
 			_tabbedSelectorToggle->hide();
+			_botKeyboardHide->show();
+			_botKeyboardShow->hide();
+			_botCommandStart->hide();
+		} else if (_kbReplyTo) {
+			_kbScroll->hide();
+			_tabbedSelectorToggle->show();
+			_botKeyboardHide->hide();
 			_botKeyboardShow->hide();
-			_botKeyboardHide->hide();
 			_botCommandStart->hide();
-			_attachToggle->hide();
-			if (_silent) {
-				_silent->hide();
-			}
-			if (_scheduled) {
-				_scheduled->hide();
-			}
-			if (_kbShown) {
-				_kbScroll->show();
-			} else {
-				_kbScroll->hide();
-			}
 		} else {
-			_field->show();
-			if (_kbShown) {
-				_kbScroll->show();
-				_tabbedSelectorToggle->hide();
-				_botKeyboardHide->show();
-				_botKeyboardShow->hide();
-				_botCommandStart->hide();
-			} else if (_kbReplyTo) {
-				_kbScroll->hide();
-				_tabbedSelectorToggle->show();
-				_botKeyboardHide->hide();
-				_botKeyboardShow->hide();
+			_kbScroll->hide();
+			_tabbedSelectorToggle->show();
+			_botKeyboardHide->hide();
+			if (_keyboard->hasMarkup()) {
+				_botKeyboardShow->show();
 				_botCommandStart->hide();
 			} else {
-				_kbScroll->hide();
-				_tabbedSelectorToggle->show();
-				_botKeyboardHide->hide();
-				if (_keyboard->hasMarkup()) {
-					_botKeyboardShow->show();
-					_botCommandStart->hide();
+				_botKeyboardShow->hide();
+				if (_cmdStartShown) {
+					_botCommandStart->show();
 				} else {
-					_botKeyboardShow->hide();
-					if (_cmdStartShown) {
-						_botCommandStart->show();
-					} else {
-						_botCommandStart->hide();
-					}
+					_botCommandStart->hide();
 				}
 			}
-			_attachToggle->show();
-			if (_silent) {
-				_silent->show();
-			}
-			if (_scheduled) {
-				_scheduled->show();
-			}
-			updateFieldPlaceholder();
 		}
+		_attachToggle->show();
+		if (_silent) {
+			_silent->show();
+		}
+		if (_scheduled) {
+			_scheduled->show();
+		}
+		updateFieldPlaceholder();
+
 		if (_editMsgId || _replyToId || readyToForward() || (_previewData && _previewData->pendingTill >= 0) || _kbReplyTo) {
 			if (_fieldBarCancel->isHidden()) {
 				_fieldBarCancel->show();
@@ -3275,22 +3268,6 @@ void HistoryWidget::unreadMentionsAnimationFinish() {
 	updateUnreadMentionsPosition();
 }
 
-bool HistoryWidget::recordingAnimationCallback(crl::time now) {
-	const auto dt = anim::Disabled()
-		? 1.
-		: ((now - _recordingAnimation.started())
-			/ float64(kRecordingUpdateDelta));
-	if (dt >= 1.) {
-		_recordingLevel.finish();
-	} else {
-		_recordingLevel.update(dt, anim::linear);
-	}
-	if (!anim::Disabled()) {
-		update(_attachToggle->geometry());
-	}
-	return (dt < 1.);
-}
-
 void HistoryWidget::chooseAttach() {
 	if (_editMsgId) {
 		Ui::show(Box<InformBox>(tr::lng_edit_caption_attach(tr::now)));
@@ -3362,13 +3339,8 @@ 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 inClickable = inReplyEditForward;
-	if (inField != _inField && _recording) {
-		_inField = inField;
-		_send->setRecordActive(_inField);
-	}
 	_inReplyEditForward = inReplyEditForward;
 	if (inClickable != _inClickable) {
 		_inClickable = inClickable;
@@ -3382,85 +3354,11 @@ void HistoryWidget::leaveToChildEvent(QEvent *e, QWidget *child) { // e -- from
 	}
 }
 
-void HistoryWidget::recordStartCallback() {
-	using namespace Media::Capture;
-
-	const auto error = _peer
-		? Data::RestrictionError(_peer, ChatRestriction::f_send_media)
-		: std::nullopt;
-	if (error) {
-		Ui::show(Box<InformBox>(*error));
-		return;
-	} else if (showSlowmodeError()) {
-		return;
-	} else if (!instance()->available()) {
-		return;
-	}
-
-	instance()->start();
-	instance()->updated(
-	) | rpl::start_with_next_error([=](const Update &update) {
-		recordUpdate(update.level, update.samples);
-	}, [=] {
-		stopRecording(false);
-	}, _recordingLifetime);
-
-	_recording = _inField = true;
-	updateControlsVisibility();
-	activate();
-
-	updateField();
-
-	_send->setRecordActive(true);
-}
-
-void HistoryWidget::recordStopCallback(bool active) {
-	stopRecording(_peer && active);
-}
-
-void HistoryWidget::recordUpdateCallback(QPoint globalPos) {
-	updateOverStates(mapFromGlobal(globalPos));
-}
-
 void HistoryWidget::mouseReleaseEvent(QMouseEvent *e) {
 	if (_replyForwardPressed) {
 		_replyForwardPressed = false;
 		update(0, _field->y() - st::historySendPadding - st::historyReplyHeight, width(), st::historyReplyHeight);
 	}
-	if (_recording) {
-		stopRecording(_peer && _inField);
-	}
-}
-
-void HistoryWidget::stopRecording(bool send) {
-	if (send) {
-		const auto weak = Ui::MakeWeak(this);
-		Media::Capture::instance()->stop(crl::guard(this, [=](
-				const Media::Capture::Result &result) {
-			recordDone(result.bytes, result.waveform, result.samples);
-		}));
-	} else {
-		Media::Capture::instance()->stop();
-	}
-
-	_recordingLevel = anim::value();
-	_recordingAnimation.stop();
-
-	_recordingLifetime.destroy();
-	_recording = false;
-	_recordingSamples = 0;
-	if (_history) {
-		session().sendProgressManager().update(
-			_history,
-			Api::SendProgressType::RecordVoice,
-			-1);
-	}
-
-	updateControlsVisibility();
-	activate();
-
-	updateField();
-	_send->setRecordActive(false);
 }
 
 void HistoryWidget::sendBotCommand(
@@ -3971,6 +3869,7 @@ void HistoryWidget::moveFieldControls() {
 	_field->moveToLeft(left, bottom - _field->height() - st::historySendPadding);
 	auto right = st::historySendRight;
 	_send->moveToRight(right, buttonsBottom); right += _send->width();
+	_voiceRecordBar->moveToLeft(0, bottom - _voiceRecordBar->height());
 	_tabbedSelectorToggle->moveToRight(right, buttonsBottom);
 	_botKeyboardHide->moveToRight(right, buttonsBottom); right += _botKeyboardHide->width();
 	_botKeyboardShow->moveToRight(right, buttonsBottom);
@@ -4445,6 +4344,7 @@ void HistoryWidget::resizeEvent(QResizeEvent *e) {
 void HistoryWidget::updateControlsGeometry() {
 	_topBar->resizeToWidth(width());
 	_topBar->moveToLeft(0, 0);
+	_voiceRecordBar->resizeToWidth(width());
 
 	moveFieldControls();
 
@@ -5571,7 +5471,7 @@ void HistoryWidget::editMessage(not_null<HistoryItem*> item) {
 		}
 	}
 
-	if (_recording) {
+	if (isRecording()) {
 		// Just fix some strange inconsistency.
 		_send->clearState();
 	}
@@ -6070,7 +5970,7 @@ void HistoryWidget::updateTopBarSelection() {
 	if (!Ui::isLayerShown() && !Core::App().passcodeLocked()) {
 		if (_nonEmptySelection
 			|| (_list && _list->wasSelectedText())
-			|| _recording
+			|| isRecording()
 			|| isBotStart()
 			|| isBlocked()
 			|| !_canSendMessages) {
@@ -6097,7 +5997,7 @@ void HistoryWidget::updateReplyEditText(not_null<HistoryItem*> item) {
 		st::messageTextStyle,
 		item->inReplyText(),
 		Ui::DialogTextOptions());
-	if (!_field->isHidden() || _recording) {
+	if (!_field->isHidden() || isRecording()) {
 		_fieldBarCancel->show();
 		updateMouseTracking();
 	}
@@ -6400,29 +6300,6 @@ void HistoryWidget::paintEditHeader(Painter &p, const QRect &rect, int left, int
 	}
 }
 
-void HistoryWidget::drawRecording(Painter &p, float64 recordActive) {
-	p.setPen(Qt::NoPen);
-	p.setBrush(st::historyRecordSignalColor);
-
-	auto delta = qMin(_recordingLevel.current() / 0x4000, 1.);
-	auto d = 2 * qRound(st::historyRecordSignalMin + (delta * (st::historyRecordSignalMax - st::historyRecordSignalMin)));
-	{
-		PainterHighQualityEnabler hq(p);
-		p.drawEllipse(_attachToggle->x() + (_tabbedSelectorToggle->width() - d) / 2, _attachToggle->y() + (_attachToggle->height() - d) / 2, d, d);
-	}
-
-	auto duration = Ui::FormatDurationText(_recordingSamples / Media::Player::kDefaultFrequency);
-	p.setFont(st::historyRecordFont);
-
-	p.setPen(st::historyRecordDurationFg);
-	p.drawText(_attachToggle->x() + _tabbedSelectorToggle->width(), _attachToggle->y() + st::historyRecordTextTop + st::historyRecordFont->ascent, duration);
-
-	int32 left = _attachToggle->x() + _tabbedSelectorToggle->width() + st::historyRecordFont->width(duration) + ((_send->width() - st::historyRecordVoice.width()) / 2);
-	int32 right = width() - _send->width();
-
-	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) {
 //	//if (_pinnedBar->msg) {
@@ -6478,11 +6355,8 @@ void HistoryWidget::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 	const auto clip = e->rect();
 	if (_list) {
-		if (!_field->isHidden() || _recording) {
+		if (!_field->isHidden() || isRecording()) {
 			drawField(p, clip);
-			if (!_send->isHidden() && _recording) {
-				drawRecording(p, _send->recordActiveRatio());
-			}
 		} else if (const auto error = writeRestriction()) {
 			drawRestrictedWrite(p, *error);
 		}
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index b2b1220b4..ecd664f6d 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -94,6 +94,9 @@ class TopBarWidget;
 class ContactStatus;
 class Element;
 class PinnedTracker;
+namespace Controls {
+class VoiceRecordBar;
+} // namespace Controls
 } // namespace HistoryView
 
 class DragArea;
@@ -108,6 +111,7 @@ class HistoryWidget final : public Window::AbstractSectionWidget {
 
 public:
 	using FieldHistoryAction = Ui::InputField::HistoryAction;
+	using VoiceRecordBar = HistoryView::Controls::VoiceRecordBar;
 
 	HistoryWidget(
 		QWidget *parent,
@@ -201,9 +205,6 @@ public:
 	void updatePreview();
 	void previewCancel();
 
-	bool recordingAnimationCallback(crl::time now);
-	void stopRecording(bool send);
-
 	void escape();
 
 	void sendBotCommand(
@@ -345,6 +346,7 @@ private:
 	friend inline constexpr bool is_flag_type(TextUpdateEvent) { return true; };
 
 	void initTabbedSelector();
+	void initVoiceRecordBar();
 	void refreshTabbedPanel();
 	void createTabbedPanel();
 	void setTabbedPanel(std::unique_ptr<TabbedPanel> panel);
@@ -395,11 +397,6 @@ private:
 
 	void animationCallback();
 	void updateOverStates(QPoint pos);
-	void recordDone(QByteArray result, VoiceWaveform waveform, int samples);
-	void recordUpdate(ushort level, int samples);
-	void recordStartCallback();
-	void recordStopCallback(bool active);
-	void recordUpdateCallback(QPoint globalPos);
 	void chooseAttach();
 	void historyDownAnimationFinish();
 	void unreadMentionsAnimationFinish();
@@ -495,7 +492,6 @@ private:
 		const QRect &rect,
 		int left,
 		int top) const;
-	void drawRecording(Painter &p, float64 recordActive);
 	void drawRestrictedWrite(Painter &p, const QString &error);
 	bool paintShowAnimationFrame();
 
@@ -566,6 +562,8 @@ private:
 	void inlineBotResolveDone(const MTPcontacts_ResolvedPeer &result);
 	void inlineBotResolveFail(const RPCError &error, const QString &username);
 
+	bool isRecording() const;
+
 	bool isBotStart() const;
 	bool isBlocked() const;
 	bool isJoinChannel() const;
@@ -673,7 +671,7 @@ private:
 
 	std::unique_ptr<HistoryView::ContactStatus> _contactStatus;
 
-	object_ptr<Ui::SendButton> _send;
+	const std::shared_ptr<Ui::SendButton> _send;
 	object_ptr<Ui::FlatButton> _unblock;
 	object_ptr<Ui::FlatButton> _botStart;
 	object_ptr<Ui::FlatButton> _joinChannel;
@@ -685,20 +683,11 @@ private:
 	object_ptr<Ui::IconButton> _botCommandStart;
 	object_ptr<Ui::SilentToggle> _silent = { nullptr };
 	object_ptr<Ui::IconButton> _scheduled = { nullptr };
+	const std::unique_ptr<VoiceRecordBar> _voiceRecordBar;
 	bool _cmdStartShown = false;
 	object_ptr<Ui::InputField> _field;
-	bool _recording = false;
-	bool _inField = false;
 	bool _inReplyEditForward = false;
 	bool _inClickable = false;
-	int _recordingSamples = 0;
-	int _recordCancelWidth;
-	rpl::lifetime _recordingLifetime;
-
-	// This can animate for a very long time (like in music playing),
-	// so it should be a Basic, not a Simple animation.
-	Ui::Animations::Basic _recordingAnimation;
-	anim::value _recordingLevel;
 
 	bool kbWasHidden() const;
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 9685f5d01..6f52b02d4 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -26,8 +26,9 @@ using SendActionUpdate = VoiceRecordBar::SendActionUpdate;
 using VoiceToSend = VoiceRecordBar::VoiceToSend;
 
 constexpr auto kRecordingUpdateDelta = crl::time(100);
+constexpr auto kAudioVoiceMaxLength = 100 * 60; // 100 minutes
 constexpr auto kMaxSamples =
-	::Media::Player::kDefaultFrequency * AudioVoiceMsgMaxLength;
+	::Media::Player::kDefaultFrequency * kAudioVoiceMaxLength;
 
 [[nodiscard]] auto Duration(int samples) {
 	return samples / ::Media::Player::kDefaultFrequency;

From 3e4866d3b7312740fe1e1475c5340c3a4958fd6b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 4 Oct 2020 16:32:45 +0300
Subject: [PATCH 059/370] Moved active animation processing from SendButton to
 VoiceRecordBar.

---
 .../history_view_voice_record_bar.cpp         | 42 ++++++++++++++-----
 .../controls/history_view_voice_record_bar.h  |  6 ++-
 .../SourceFiles/ui/controls/send_button.cpp   | 25 ++++-------
 .../SourceFiles/ui/controls/send_button.h     |  7 ++--
 4 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 6f52b02d4..0a42498b1 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -92,8 +92,28 @@ void VoiceRecordBar::init() {
 		Painter p(this);
 		p.fillRect(rect(), st::historyComposeAreaBg);
 
-		drawRecording(p, _send->recordActiveRatio());
+		drawRecording(p, activeAnimationRatio());
 	}, lifetime());
+
+	_inField.changes(
+	) | rpl::start_with_next([=](bool value) {
+		activeAnimate(value);
+	}, lifetime());
+}
+
+void VoiceRecordBar::activeAnimate(bool active) {
+	const auto to = active ? 1. : 0.;
+	const auto duration = st::historyRecordVoiceDuration;
+	if (_activeAnimation.animating()) {
+		_activeAnimation.change(to, duration);
+	} else {
+		auto callback = [=] {
+			update();
+			_send->requestPaintRecord(activeAnimationRatio());
+		};
+		const auto from = active ? 0. : 1.;
+		_activeAnimation.start(std::move(callback), from, to, duration);
+	}
 }
 
 void VoiceRecordBar::startRecording() {
@@ -116,7 +136,7 @@ void VoiceRecordBar::startRecording() {
 	_controller->widget()->setInnerFocus();
 
 	update();
-	_send->setRecordActive(true);
+	activeAnimate(true);
 
 	_send->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
@@ -127,14 +147,9 @@ void VoiceRecordBar::startRecording() {
 		const auto type = e->type();
 		if (type == QEvent::MouseMove) {
 			const auto mouse = static_cast<QMouseEvent*>(e.get());
-			const auto pos = mapFromGlobal(mouse->globalPos());
-			const auto inField = rect().contains(pos);
-			if (inField != _inField) {
-				_inField = inField;
-				_send->setRecordActive(_inField);
-			}
+			_inField = rect().contains(mapFromGlobal(mouse->globalPos()));
 		} else if (type == QEvent::MouseButtonRelease) {
-			stopRecording(_inField);
+			stopRecording(_inField.current());
 		}
 	}, _recordingLifetime);
 }
@@ -160,7 +175,7 @@ void VoiceRecordBar::recordUpdated(quint16 level, int samples) {
 	_recordingAnimation.start();
 	_recordingSamples = samples;
 	if (samples < 0 || samples >= kMaxSamples) {
-		stopRecording(samples > 0 && _inField);
+		stopRecording(samples > 0 && _inField.current());
 	}
 	Core::App().updateNonIdle();
 	update();
@@ -189,6 +204,8 @@ void VoiceRecordBar::stopRecording(bool send) {
 	_recordingLevel = anim::value();
 	_recordingAnimation.stop();
 
+	_inField = false;
+
 	_recordingLifetime.destroy();
 	_recordingSamples = 0;
 	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice, -1 });
@@ -196,7 +213,6 @@ void VoiceRecordBar::stopRecording(bool send) {
 	_controller->widget()->setInnerFocus();
 
 	update();
-	_send->setRecordActive(false);
 }
 
 void VoiceRecordBar::drawRecording(Painter &p, float64 recordActive) {
@@ -277,4 +293,8 @@ bool VoiceRecordBar::isTypeRecord() const {
 	return (_send->type() == Ui::SendButton::Type::Record);
 }
 
+float64 VoiceRecordBar::activeAnimationRatio() const {
+	return _activeAnimation.value(_inField.current() ? 1. : 0.);
+}
+
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 3e2c8ce5d..f33a1dc27 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -64,6 +64,9 @@ private:
 
 	bool isTypeRecord() const;
 
+	void activeAnimate(bool active);
+	float64 activeAnimationRatio() const;
+
 	const not_null<Window::SessionController*> _controller;
 	const std::unique_ptr<Ui::RpWidget> _wrap;
 	const std::shared_ptr<Ui::SendButton> _send;
@@ -75,7 +78,7 @@ private:
 	QRect _redCircleRect;
 
 	rpl::variable<bool> _recording = false;
-	bool _inField = false;
+	rpl::variable<bool> _inField = false;
 	int _recordingSamples = 0;
 
 	const style::font &_cancelFont;
@@ -86,6 +89,7 @@ private:
 	// This can animate for a very long time (like in music playing),
 	// so it should be a Basic, not a Simple animation.
 	Ui::Animations::Basic _recordingAnimation;
+	Ui::Animations::Simple _activeAnimation;
 	anim::value _recordingLevel;
 
 };
diff --git a/Telegram/SourceFiles/ui/controls/send_button.cpp b/Telegram/SourceFiles/ui/controls/send_button.cpp
index 3c7df9e84..e7ed3e87a 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/send_button.cpp
@@ -43,20 +43,7 @@ void SendButton::setType(Type type) {
 		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();
+		_recordProgress = 0.;
 	}
 }
 
@@ -76,7 +63,6 @@ void SendButton::setSlowmodeDelay(int seconds) {
 
 void SendButton::finishAnimating() {
 	_a_typeChanged.stop();
-	_a_recordActive.stop();
 	update();
 }
 
@@ -89,6 +75,13 @@ void SendButton::mouseMoveEvent(QMouseEvent *e) {
 	}
 }
 
+void SendButton::requestPaintRecord(float64 progress) {
+	if (_type == Type::Record) {
+		_recordProgress = progress;
+		update();
+	}
+}
+
 void SendButton::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
@@ -118,7 +111,7 @@ void SendButton::paintEvent(QPaintEvent *e) {
 }
 
 void SendButton::paintRecord(Painter &p, bool over) {
-	auto recordActive = recordActiveRatio();
+	const auto recordActive = _recordProgress;
 	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);
diff --git a/Telegram/SourceFiles/ui/controls/send_button.h b/Telegram/SourceFiles/ui/controls/send_button.h
index ad6500699..0b7676474 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.h
+++ b/Telegram/SourceFiles/ui/controls/send_button.h
@@ -46,9 +46,7 @@ public:
 		_recordAnimationCallback = std::move(callback);
 	}
 
-	[[nodiscard]] float64 recordActiveRatio() {
-		return _a_recordActive.value(_recordActive ? 1. : 0.);
-	}
+	void requestPaintRecord(float64 progress);
 
 protected:
 	void mouseMoveEvent(QMouseEvent *e) override;
@@ -76,7 +74,8 @@ private:
 	QPixmap _contentFrom, _contentTo;
 
 	Ui::Animations::Simple _a_typeChanged;
-	Ui::Animations::Simple _a_recordActive;
+
+	float64 _recordProgress = 0.;
 
 	bool _recording = false;
 	Fn<void()> _recordStartCallback;

From e7454e384954a954f5f5f75e3406944fc0dfbce2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 4 Oct 2020 18:25:03 +0300
Subject: [PATCH 060/370] Removed redundant record methods from SendButton.

---
 .../SourceFiles/ui/controls/send_button.cpp   | 37 -------------------
 .../SourceFiles/ui/controls/send_button.h     | 24 ------------
 2 files changed, 61 deletions(-)

diff --git a/Telegram/SourceFiles/ui/controls/send_button.cpp b/Telegram/SourceFiles/ui/controls/send_button.cpp
index e7ed3e87a..f28cff456 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/send_button.cpp
@@ -66,15 +66,6 @@ void SendButton::finishAnimating() {
 	update();
 }
 
-void SendButton::mouseMoveEvent(QMouseEvent *e) {
-	AbstractButton::mouseMoveEvent(e);
-	if (_recording) {
-		if (_recordUpdateCallback) {
-			_recordUpdateCallback(e->globalPos());
-		}
-	}
-}
-
 void SendButton::requestPaintRecord(float64 progress) {
 	if (_type == Type::Record) {
 		_recordProgress = progress;
@@ -189,27 +180,6 @@ void SendButton::paintSlowmode(Painter &p) {
 		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);
 }
@@ -248,11 +218,4 @@ QPoint SendButton::prepareRippleStartPosition() const {
 	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
index 0b7676474..443571d43 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.h
+++ b/Telegram/SourceFiles/ui/controls/send_button.h
@@ -29,35 +29,18 @@ public:
 		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);
-	}
-
 	void requestPaintRecord(float64 progress);
 
 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;
 
@@ -70,19 +53,12 @@ private:
 
 	Type _type = Type::Send;
 	Type _afterSlowmodeType = Type::Send;
-	bool _recordActive = false;
 	QPixmap _contentFrom, _contentTo;
 
 	Ui::Animations::Simple _a_typeChanged;
 
 	float64 _recordProgress = 0.;
 
-	bool _recording = false;
-	Fn<void()> _recordStartCallback;
-	Fn<void(bool active)> _recordStopCallback;
-	Fn<void(QPoint globalPos)> _recordUpdateCallback;
-	Fn<void()> _recordAnimationCallback;
-
 	int _slowmodeDelay = 0;
 	QString _slowmodeDelayText;
 

From 5c006002b6c94cd4783769dc95ffe66cdc0cbbd7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 4 Oct 2020 21:19:34 +0300
Subject: [PATCH 061/370] Added appearance animation to VoiceRecordBar.

---
 .../history_view_voice_record_bar.cpp         | 117 +++++++++++-------
 .../controls/history_view_voice_record_bar.h  |   4 +
 Telegram/SourceFiles/ui/chat/chat.style       |   1 +
 3 files changed, 77 insertions(+), 45 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 0a42498b1..5933067b7 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -90,6 +90,7 @@ void VoiceRecordBar::init() {
 	paintRequest(
 	) | rpl::start_with_next([=] {
 		Painter p(this);
+		p.setOpacity(_showAnimation.value(1.));
 		p.fillRect(rect(), st::historyComposeAreaBg);
 
 		drawRecording(p, activeAnimationRatio());
@@ -116,28 +117,46 @@ void VoiceRecordBar::activeAnimate(bool active) {
 	}
 }
 
-void VoiceRecordBar::startRecording() {
-	using namespace ::Media::Capture;
-	if (!instance()->available()) {
-		return;
-	}
-	show();
-	_recording = true;
+void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
+	const auto to = show ? 1. : 0.;
+	const auto from = show ? 0. : 1.;
+	const auto duration = st::historyRecordVoiceShowDuration;
+	auto animationCallback = [=, callback = std::move(callback)](auto value) {
+		update();
+		if ((show && value == 1.) || (!show && value == 0.)) {
+			if (callback) {
+				callback();
+			}
+		}
+	};
+	_showAnimation.start(std::move(animationCallback), from, to, duration);
+}
 
-	instance()->start();
-	instance()->updated(
-	) | rpl::start_with_next_error([=](const Update &update) {
-		recordUpdated(update.level, update.samples);
-	}, [=] {
-		stopRecording(false);
-	}, _recordingLifetime);
+void VoiceRecordBar::startRecording() {
+	auto appearanceCallback = [=] {
+		Expects(!_showAnimation.animating());
+
+		using namespace ::Media::Capture;
+		if (!instance()->available()) {
+			stop(false);
+			return;
+		}
+
+		_recording = true;
+		instance()->start();
+		instance()->updated(
+		) | rpl::start_with_next_error([=](const Update &update) {
+			recordUpdated(update.level, update.samples);
+		}, [=] {
+			stop(false);
+		}, _recordingLifetime);
+	};
+	visibilityAnimate(true, std::move(appearanceCallback));
+	show();
 
 	_inField = true;
 	_controller->widget()->setInnerFocus();
 
-	update();
-	activeAnimate(true);
-
 	_send->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return isTypeRecord()
@@ -149,7 +168,7 @@ void VoiceRecordBar::startRecording() {
 			const auto mouse = static_cast<QMouseEvent*>(e.get());
 			_inField = rect().contains(mapFromGlobal(mouse->globalPos()));
 		} else if (type == QEvent::MouseButtonRelease) {
-			stopRecording(_inField.current());
+			stop(_inField.current());
 		}
 	}, _recordingLifetime);
 }
@@ -175,44 +194,51 @@ void VoiceRecordBar::recordUpdated(quint16 level, int samples) {
 	_recordingAnimation.start();
 	_recordingSamples = samples;
 	if (samples < 0 || samples >= kMaxSamples) {
-		stopRecording(samples > 0 && _inField.current());
+		stop(samples > 0 && _inField.current());
 	}
 	Core::App().updateNonIdle();
 	update();
 	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice });
 }
 
+void VoiceRecordBar::stop(bool send) {
+	auto disappearanceCallback = [=] {
+		Expects(!_showAnimation.animating());
+
+		hide();
+		_recording = false;
+
+		stopRecording(send);
+
+		_recordingLevel = anim::value();
+		_recordingAnimation.stop();
+
+		_inField = false;
+
+		_recordingLifetime.destroy();
+		_recordingSamples = 0;
+		_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice, -1 });
+
+		_controller->widget()->setInnerFocus();
+	};
+	visibilityAnimate(false, std::move(disappearanceCallback));
+}
+
 void VoiceRecordBar::stopRecording(bool send) {
-	hide();
-	_recording = false;
-
 	using namespace ::Media::Capture;
-	if (send) {
-		instance()->stop(crl::guard(this, [=](const Result &data) {
-			if (data.bytes.isEmpty()) {
-				return;
-			}
-
-			Window::ActivateWindow(_controller);
-			const auto duration = Duration(data.samples);
-			_sendVoiceRequests.fire({ data.bytes, data.waveform, duration });
-		}));
-	} else {
+	if (!send) {
 		instance()->stop();
+		return;
 	}
+	instance()->stop(crl::guard(this, [=](const Result &data) {
+		if (data.bytes.isEmpty()) {
+			return;
+		}
 
-	_recordingLevel = anim::value();
-	_recordingAnimation.stop();
-
-	_inField = false;
-
-	_recordingLifetime.destroy();
-	_recordingSamples = 0;
-	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice, -1 });
-
-	_controller->widget()->setInnerFocus();
-
-	update();
+		Window::ActivateWindow(_controller);
+		const auto duration = Duration(data.samples);
+		_sendVoiceRequests.fire({ data.bytes, data.waveform, duration });
+	}));
 }
 
 void VoiceRecordBar::drawRecording(Painter &p, float64 recordActive) {
@@ -276,6 +302,7 @@ bool VoiceRecordBar::isRecording() const {
 
 void VoiceRecordBar::finishAnimating() {
 	_recordingAnimation.stop();
+	_showAnimation.stop();
 }
 
 rpl::producer<bool> VoiceRecordBar::recordingStateChanges() const {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index f33a1dc27..667d9a558 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -53,7 +53,10 @@ private:
 	void recordUpdated(quint16 level, int samples);
 
 	bool recordingAnimationCallback(crl::time now);
+
+	void stop(bool send);
 	void stopRecording(bool send);
+	void visibilityAnimate(bool show, Fn<void()> &&callback);
 
 	void recordStopCallback(bool active);
 	void recordUpdateCallback(QPoint globalPos);
@@ -90,6 +93,7 @@ private:
 	// so it should be a Basic, not a Simple animation.
 	Ui::Animations::Basic _recordingAnimation;
 	Ui::Animations::Simple _activeAnimation;
+	Ui::Animations::Simple _showAnimation;
 	anim::value _recordingLevel;
 
 };
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index ed8a05b06..625ef7a59 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -328,6 +328,7 @@ historyScheduledToggle: IconButton(historyAttach) {
 historyRecordVoiceFg: historyComposeIconFg;
 historyRecordVoiceFgOver: historyComposeIconFgOver;
 historyRecordVoiceFgActive: windowBgActive;
+historyRecordVoiceShowDuration: 120;
 historyRecordVoiceDuration: 120;
 historyRecordVoice: icon {{ "send_control_record", historyRecordVoiceFg }};
 historyRecordVoiceOver: icon {{ "send_control_record", historyRecordVoiceFgOver }};

From ebe1fa74089688bcdca36c4935f4fbe21e3a8d42 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 4 Oct 2020 23:13:00 +0300
Subject: [PATCH 062/370] Improved duration text paint in VoiceRecordBar.

---
 .../history_view_voice_record_bar.cpp         | 45 ++++++++++++-------
 .../controls/history_view_voice_record_bar.h  |  1 +
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 5933067b7..5cb05356f 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -30,10 +30,23 @@ constexpr auto kAudioVoiceMaxLength = 100 * 60; // 100 minutes
 constexpr auto kMaxSamples =
 	::Media::Player::kDefaultFrequency * kAudioVoiceMaxLength;
 
+constexpr auto kPrecision = 10;
+
 [[nodiscard]] auto Duration(int samples) {
 	return samples / ::Media::Player::kDefaultFrequency;
 }
 
+[[nodiscard]] auto FormatVoiceDuration(int samples) {
+	const int duration = kPrecision
+		* (float64(samples) / ::Media::Player::kDefaultFrequency);
+	const auto durationString = Ui::FormatDurationText(duration / kPrecision);
+	const auto decimalPart = duration % kPrecision;
+	return QString("%1%2%3")
+		.arg(durationString)
+		.arg(QLocale::system().decimalPoint())
+		.arg(decimalPart);
+}
+
 } // namespace
 
 VoiceRecordBar::VoiceRecordBar(
@@ -67,6 +80,16 @@ void VoiceRecordBar::updateControlsGeometry(QSize size) {
 		const auto point = _centerY - st::historyRecordSignalMax;
 		_redCircleRect = { point, point, maxD, maxD };
 	}
+	{
+		const auto durationLeft = _redCircleRect.x()
+			+ _redCircleRect.width()
+			+ st::historyRecordDurationSkip;
+		_durationRect = QRect(
+			durationLeft,
+			_redCircleRect.y(),
+			_cancelFont->width(FormatVoiceDuration(kMaxSamples)),
+			_redCircleRect.height());
+	}
 }
 
 void VoiceRecordBar::init() {
@@ -197,7 +220,7 @@ void VoiceRecordBar::recordUpdated(quint16 level, int samples) {
 		stop(samples > 0 && _inField.current());
 	}
 	Core::App().updateNonIdle();
-	update();
+	update(_durationRect);
 	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice });
 }
 
@@ -255,25 +278,15 @@ void VoiceRecordBar::drawRecording(Painter &p, float64 recordActive) {
 		p.drawEllipse(center, radii, radii);
 	}
 
-	const auto duration = Ui::FormatDurationText(Duration(_recordingSamples));
+	const auto duration = FormatVoiceDuration(_recordingSamples);
 	p.setFont(_cancelFont);
 	p.setPen(st::historyRecordDurationFg);
 
-	const auto durationLeft = _redCircleRect.x()
-		+ _redCircleRect.width()
-		+ st::historyRecordDurationSkip;
-	const auto durationWidth = _cancelFont->width(duration);
-	p.drawText(
-		QRect(
-			durationLeft,
-			_redCircleRect.y(),
-			durationWidth,
-			_redCircleRect.height()),
-		style::al_left,
-		duration);
+	p.fillRect(_durationRect, Qt::red);
+	p.drawText(_durationRect, style::al_left, duration);
 
-	const auto leftCancel = durationLeft
-		+ durationWidth
+	const auto leftCancel = _durationRect.x()
+		+ _durationRect.width()
 		+ ((_send->width() - st::historyRecordVoice.width()) / 2);
 	const auto rightCancel = width() - _send->width();
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 667d9a558..a0d8b92bf 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -79,6 +79,7 @@ private:
 
 	int _centerY = 0;
 	QRect _redCircleRect;
+	QRect _durationRect;
 
 	rpl::variable<bool> _recording = false;
 	rpl::variable<bool> _inField = false;

From 43635f6e4b9d0b914f2ba69db92432b2d67c021f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 5 Oct 2020 01:16:31 +0300
Subject: [PATCH 063/370] Slightly optimized paint in VoiceRecordBar.

---
 .../history_view_voice_record_bar.cpp         | 72 ++++++++++++-------
 .../controls/history_view_voice_record_bar.h  |  6 +-
 2 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 5cb05356f..02a5a73a9 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -59,7 +59,6 @@ VoiceRecordBar::VoiceRecordBar(
 , _wrap(std::make_unique<Ui::RpWidget>(parent))
 , _send(send)
 , _cancelFont(st::historyRecordFont)
-, _recordCancelWidth(_cancelFont->width(tr::lng_record_cancel(tr::now)))
 , _recordingAnimation([=](crl::time now) {
 	return recordingAnimationCallback(now);
 }) {
@@ -90,6 +89,18 @@ void VoiceRecordBar::updateControlsGeometry(QSize size) {
 			_cancelFont->width(FormatVoiceDuration(kMaxSamples)),
 			_redCircleRect.height());
 	}
+	{
+		const auto left = _durationRect.x()
+			+ _durationRect.width()
+			+ ((_send->width() - st::historyRecordVoice.width()) / 2);
+		const auto right = width() - _send->width();
+		const auto width = _cancelFont->width(tr::lng_record_cancel(tr::now));
+		_messageRect = QRect(
+			left + (right - left - width) / 2,
+			st::historyRecordTextTop,
+			width + st::historyRecordDurationSkip,
+			_cancelFont->height);
+	}
 }
 
 void VoiceRecordBar::init() {
@@ -111,12 +122,23 @@ void VoiceRecordBar::init() {
 	}, lifetime());
 
 	paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::start_with_next([=](const QRect &clip) {
 		Painter p(this);
-		p.setOpacity(_showAnimation.value(1.));
-		p.fillRect(rect(), st::historyComposeAreaBg);
+		if (_showAnimation.animating()) {
+			p.setOpacity(_showAnimation.value(1.));
+		}
+		p.fillRect(clip, st::historyComposeAreaBg);
 
-		drawRecording(p, activeAnimationRatio());
+		if (clip.intersects(_messageRect)) {
+			// The message should be painted first to avoid flickering.
+			drawMessage(p, activeAnimationRatio());
+		}
+		if (clip.intersects(_redCircleRect)) {
+			drawRecording(p);
+		}
+		if (clip.intersects(_durationRect)) {
+			drawDuration(p);
+		}
 	}, lifetime());
 
 	_inField.changes(
@@ -132,7 +154,7 @@ void VoiceRecordBar::activeAnimate(bool active) {
 		_activeAnimation.change(to, duration);
 	} else {
 		auto callback = [=] {
-			update();
+			update(_messageRect);
 			_send->requestPaintRecord(activeAnimationRatio());
 		};
 		const auto from = active ? 0. : 1.;
@@ -264,40 +286,36 @@ void VoiceRecordBar::stopRecording(bool send) {
 	}));
 }
 
-void VoiceRecordBar::drawRecording(Painter &p, float64 recordActive) {
-	p.setPen(Qt::NoPen);
-	p.setBrush(st::historyRecordSignalColor);
-
-	{
-		PainterHighQualityEnabler hq(p);
-		const auto min = st::historyRecordSignalMin;
-		const auto max = st::historyRecordSignalMax;
-		const auto delta = std::min(_recordingLevel.current() / 0x4000, 1.);
-		const auto radii = qRound(min + (delta * (max - min)));
-		const auto center = _redCircleRect.center() + QPoint(1, 1);
-		p.drawEllipse(center, radii, radii);
-	}
-
+void VoiceRecordBar::drawDuration(Painter &p) {
 	const auto duration = FormatVoiceDuration(_recordingSamples);
 	p.setFont(_cancelFont);
 	p.setPen(st::historyRecordDurationFg);
 
-	p.fillRect(_durationRect, Qt::red);
 	p.drawText(_durationRect, style::al_left, duration);
+}
 
-	const auto leftCancel = _durationRect.x()
-		+ _durationRect.width()
-		+ ((_send->width() - st::historyRecordVoice.width()) / 2);
-	const auto rightCancel = width() - _send->width();
+void VoiceRecordBar::drawRecording(Painter &p) {
+	PainterHighQualityEnabler hq(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(st::historyRecordSignalColor);
 
+	const auto min = st::historyRecordSignalMin;
+	const auto max = st::historyRecordSignalMax;
+	const auto delta = std::min(_recordingLevel.current() / 0x4000, 1.);
+	const auto radii = qRound(min + (delta * (max - min)));
+	const auto center = _redCircleRect.center() + QPoint(1, 1);
+	p.drawEllipse(center, radii, radii);
+}
+
+void VoiceRecordBar::drawMessage(Painter &p, float64 recordActive) {
 	p.setPen(
 		anim::pen(
 			st::historyRecordCancel,
 			st::historyRecordCancelActive,
 			1. - recordActive));
 	p.drawText(
-		leftCancel + (rightCancel - leftCancel - _recordCancelWidth) / 2,
-		st::historyRecordTextTop + _cancelFont->ascent,
+		_messageRect.x(),
+		_messageRect.y() + _cancelFont->ascent,
 		tr::lng_record_cancel(tr::now));
 }
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index a0d8b92bf..8fdc0fc02 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -62,7 +62,9 @@ private:
 	void recordUpdateCallback(QPoint globalPos);
 
 	bool showRecordButton() const;
-	void drawRecording(Painter &p, float64 recordActive);
+	void drawDuration(Painter &p);
+	void drawRecording(Painter &p);
+	void drawMessage(Painter &p, float64 recordActive);
 	void updateOverStates(QPoint pos);
 
 	bool isTypeRecord() const;
@@ -80,13 +82,13 @@ private:
 	int _centerY = 0;
 	QRect _redCircleRect;
 	QRect _durationRect;
+	QRect _messageRect;
 
 	rpl::variable<bool> _recording = false;
 	rpl::variable<bool> _inField = false;
 	int _recordingSamples = 0;
 
 	const style::font &_cancelFont;
-	int _recordCancelWidth;
 
 	rpl::lifetime _recordingLifetime;
 

From 478f5f671cd595676b05dcdea05ae52f0d33d625 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 7 Oct 2020 12:19:03 +0300
Subject: [PATCH 064/370] Added initial implementation of voice recording lock.

---
 Telegram/Resources/langs/lang.strings         |   3 +
 .../SourceFiles/history/history_widget.cpp    |  22 ++
 Telegram/SourceFiles/history/history_widget.h |   2 +
 .../history_view_voice_record_bar.cpp         | 229 +++++++++++++++++-
 .../controls/history_view_voice_record_bar.h  |  35 ++-
 Telegram/SourceFiles/ui/chat/chat.style       |   3 +
 6 files changed, 278 insertions(+), 16 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f10ddf6a6..d6c0eac12 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1341,6 +1341,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_broadcast_silent_ph" = "Silent broadcast...";
 "lng_send_anonymous_ph" = "Send anonymously...";
 "lng_record_cancel" = "Release outside this field to cancel";
+"lng_record_lock_cancel" = "Click outside of microphone button to cancel";
+"lng_record_lock_cancel_sure" = "Are you sure you want to stop recording and discard your voice message?";
+"lng_record_lock_discard" = "Discard";
 "lng_will_be_notified" = "Members will be notified when you post";
 "lng_wont_be_notified" = "Members will not be notified when you post";
 "lng_willbe_history" = "Please select a chat to start messaging";
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 2cdfee1ac..dc7ec4571 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -717,6 +717,16 @@ void HistoryWidget::refreshTabbedPanel() {
 }
 
 void HistoryWidget::initVoiceRecordBar() {
+	{
+		auto scrollHeight = rpl::combine(
+			_scroll->topValue(),
+			_scroll->heightValue()
+		) | rpl::map([=](int top, int height) {
+			return top + height;
+		});
+		_voiceRecordBar->setLockBottom(std::move(scrollHeight));
+	}
+
 	_voiceRecordBar->startRecordingRequests(
 	) | rpl::start_with_next([=] {
 		const auto error = _peer
@@ -756,6 +766,12 @@ void HistoryWidget::initVoiceRecordBar() {
 			data.duration,
 			action);
 	}, lifetime());
+
+	_voiceRecordBar->lockShowStarts(
+	) | rpl::start_with_next([=] {
+		updateHistoryDownVisibility();
+		updateUnreadMentionsVisibility();
+	}, lifetime());
 }
 
 void HistoryWidget::initTabbedSelector() {
@@ -4787,6 +4803,9 @@ void HistoryWidget::updateHistoryDownVisibility() {
 		if (!_list || _firstLoadRequest) {
 			return false;
 		}
+		if (_voiceRecordBar->isLockPresent()) {
+			return false;
+		}
 		if (!_history->loadedAtBottom() || _replyReturn) {
 			return true;
 		}
@@ -4830,6 +4849,9 @@ void HistoryWidget::updateUnreadMentionsVisibility() {
 		if (!showUnreadMentions || _firstLoadRequest) {
 			return false;
 		}
+		if (_voiceRecordBar->isLockPresent()) {
+			return false;
+		}
 		if (!_history->getUnreadMentionsLoadedCount()) {
 			return false;
 		}
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index ecd664f6d..b7956ec7c 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -95,6 +95,7 @@ class ContactStatus;
 class Element;
 class PinnedTracker;
 namespace Controls {
+class RecordLock;
 class VoiceRecordBar;
 } // namespace Controls
 } // namespace HistoryView
@@ -111,6 +112,7 @@ class HistoryWidget final : public Window::AbstractSectionWidget {
 
 public:
 	using FieldHistoryAction = Ui::InputField::HistoryAction;
+	using RecordLock = HistoryView::Controls::RecordLock;
 	using VoiceRecordBar = HistoryView::Controls::VoiceRecordBar;
 
 	HistoryWidget(
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 02a5a73a9..d94221565 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -8,12 +8,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/controls/history_view_voice_record_bar.h"
 
 #include "api/api_send_progress.h"
+#include "base/event_filter.h"
+#include "boxes/confirm_box.h"
 #include "core/application.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
 #include "media/audio/media_audio.h"
 #include "media/audio/media_audio_capture.h"
 #include "styles/style_chat.h"
+#include "styles/style_layers.h"
 #include "ui/controls/send_button.h"
 #include "ui/text/format_values.h"
 #include "window/window_session_controller.h"
@@ -25,6 +28,7 @@ namespace {
 using SendActionUpdate = VoiceRecordBar::SendActionUpdate;
 using VoiceToSend = VoiceRecordBar::VoiceToSend;
 
+constexpr auto kLockDelay = crl::time(100);
 constexpr auto kRecordingUpdateDelta = crl::time(100);
 constexpr auto kAudioVoiceMaxLength = 100 * 60; // 100 minutes
 constexpr auto kMaxSamples =
@@ -49,6 +53,77 @@ constexpr auto kPrecision = 10;
 
 } // namespace
 
+class RecordLock final : public Ui::RpWidget {
+public:
+	RecordLock(not_null<Ui::RpWidget*> parent);
+
+	void requestPaintProgress(float64 progress);
+	void reset();
+
+	[[nodiscard]] rpl::producer<> locks() const;
+	[[nodiscard]] bool isLocked() const;
+
+private:
+	void init();
+
+	Ui::Animations::Simple _lockAnimation;
+
+	rpl::variable<float64> _progress = 0.;
+};
+
+RecordLock::RecordLock(not_null<Ui::RpWidget*> parent) : RpWidget(parent) {
+	resize(st::historyRecordLockSize);
+	init();
+}
+
+void RecordLock::init() {
+	setAttribute(Qt::WA_TransparentForMouseEvents);
+	shownValue(
+	) | rpl::start_with_next([=](bool shown) {
+		if (!shown) {
+			_lockAnimation.stop();
+			_progress = 0.;
+		}
+	}, lifetime());
+
+	paintRequest(
+	) | rpl::start_with_next([=](const QRect &clip) {
+		Painter p(this);
+		if (isLocked()) {
+			const auto color = anim::color(
+				Qt::red,
+				Qt::green,
+				_lockAnimation.value(1.));
+			p.fillRect(clip, color);
+			return;
+		}
+		p.fillRect(clip, anim::color(Qt::blue, Qt::red, _progress.current()));
+	}, lifetime());
+
+	locks(
+	) | rpl::start_with_next([=] {
+		const auto duration = st::historyRecordVoiceShowDuration * 3;
+		_lockAnimation.start([=] { update(); }, 0., 1., duration);
+	}, lifetime());
+}
+
+void RecordLock::requestPaintProgress(float64 progress) {
+	if (isHidden() || isLocked()) {
+		return;
+	}
+	_progress = progress;
+	update();
+}
+
+bool RecordLock::isLocked() const {
+	return _progress.current() == 1.;
+}
+
+rpl::producer<> RecordLock::locks() const {
+	return _progress.changes(
+	) | rpl::filter([=] { return isLocked(); }) | rpl::to_empty;
+}
+
 VoiceRecordBar::VoiceRecordBar(
 	not_null<Ui::RpWidget*> parent,
 	not_null<Window::SessionController*> controller,
@@ -56,8 +131,8 @@ VoiceRecordBar::VoiceRecordBar(
 	int recorderHeight)
 : RpWidget(parent)
 , _controller(controller)
-, _wrap(std::make_unique<Ui::RpWidget>(parent))
 , _send(send)
+, _lock(std::make_unique<RecordLock>(parent))
 , _cancelFont(st::historyRecordFont)
 , _recordingAnimation([=](crl::time now) {
 	return recordingAnimationCallback(now);
@@ -94,7 +169,7 @@ void VoiceRecordBar::updateControlsGeometry(QSize size) {
 			+ _durationRect.width()
 			+ ((_send->width() - st::historyRecordVoice.width()) / 2);
 		const auto right = width() - _send->width();
-		const auto width = _cancelFont->width(tr::lng_record_cancel(tr::now));
+		const auto width = _cancelFont->width(cancelMessage());
 		_messageRect = QRect(
 			left + (right - left - width) / 2,
 			st::historyRecordTextTop,
@@ -145,6 +220,44 @@ void VoiceRecordBar::init() {
 	) | rpl::start_with_next([=](bool value) {
 		activeAnimate(value);
 	}, lifetime());
+
+	_lockShowing.changes(
+	) | rpl::start_with_next([=](bool show) {
+		const auto to = show ? 1. : 0.;
+		const auto from = show ? 0. : 1.;
+		const auto duration = st::historyRecordLockShowDuration;
+		_lock->show();
+		auto callback = [=](auto value) {
+			const auto right = anim::interpolate(
+				-_lock->width(),
+				0,
+				value);
+			_lock->moveToRight(right, _lock->y());
+			if (value == 0. && !show) {
+				_lock->hide();
+			} else if (value == 1. && show) {
+				computeAndSetLockProgress(QCursor::pos());
+			}
+		};
+		_showLockAnimation.start(std::move(callback), from, to, duration);
+	}, lifetime());
+
+	_lock->hide();
+	_lock->locks(
+	) | rpl::start_with_next([=] {
+
+		updateControlsGeometry(rect().size());
+		update(_messageRect);
+
+		installClickOutsideFilter();
+
+		_send->clicks(
+		) | rpl::filter([=] {
+			return _send->type() == Ui::SendButton::Type::Record;
+		}) | rpl::start_with_next([=] {
+			stop(true);
+		}, _recordingLifetime);
+	}, lifetime());
 }
 
 void VoiceRecordBar::activeAnimate(bool active) {
@@ -177,6 +290,14 @@ void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
 	_showAnimation.start(std::move(animationCallback), from, to, duration);
 }
 
+void VoiceRecordBar::setLockBottom(rpl::producer<int> &&bottom) {
+	std::move(
+		bottom
+	) | rpl::start_with_next([=](int value) {
+		_lock->moveToLeft(_lock->x(), value - _lock->height());
+	}, lifetime());
+}
+
 void VoiceRecordBar::startRecording() {
 	auto appearanceCallback = [=] {
 		Expects(!_showAnimation.animating());
@@ -187,10 +308,17 @@ void VoiceRecordBar::startRecording() {
 			return;
 		}
 
+		const auto shown = _recordingLifetime.make_state<bool>(false);
+
 		_recording = true;
 		instance()->start();
 		instance()->updated(
 		) | rpl::start_with_next_error([=](const Update &update) {
+			if (!(*shown) && !_showAnimation.animating()) {
+				// Show the lock widget after the first successful update.
+				*shown = true;
+				_lockShowing = true;
+			}
 			recordUpdated(update.level, update.samples);
 		}, [=] {
 			stop(false);
@@ -205,13 +333,20 @@ void VoiceRecordBar::startRecording() {
 	_send->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return isTypeRecord()
+			&& !_lock->isLocked()
 			&& (e->type() == QEvent::MouseMove
 				|| e->type() == QEvent::MouseButtonRelease);
 	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
 		const auto type = e->type();
 		if (type == QEvent::MouseMove) {
 			const auto mouse = static_cast<QMouseEvent*>(e.get());
-			_inField = rect().contains(mapFromGlobal(mouse->globalPos()));
+			const auto localPos = mapFromGlobal(mouse->globalPos());
+			_inField = rect().contains(localPos);
+
+			if (_showLockAnimation.animating()) {
+				return;
+			}
+			computeAndSetLockProgress(mouse->globalPos());
 		} else if (type == QEvent::MouseButtonRelease) {
 			stop(_inField.current());
 		}
@@ -266,6 +401,7 @@ void VoiceRecordBar::stop(bool send) {
 
 		_controller->widget()->setInnerFocus();
 	};
+	_lockShowing = false;
 	visibilityAnimate(false, std::move(disappearanceCallback));
 }
 
@@ -316,7 +452,7 @@ void VoiceRecordBar::drawMessage(Painter &p, float64 recordActive) {
 	p.drawText(
 		_messageRect.x(),
 		_messageRect.y() + _cancelFont->ascent,
-		tr::lng_record_cancel(tr::now));
+		cancelMessage());
 }
 
 rpl::producer<SendActionUpdate> VoiceRecordBar::sendActionUpdates() const {
@@ -340,10 +476,21 @@ rpl::producer<bool> VoiceRecordBar::recordingStateChanges() const {
 	return _recording.changes();
 }
 
+rpl::producer<bool> VoiceRecordBar::lockShowStarts() const {
+	return _lockShowing.changes();
+}
+
+bool VoiceRecordBar::isLockPresent() const {
+	return _lockShowing.current();
+}
+
 rpl::producer<> VoiceRecordBar::startRecordingRequests() const {
 	return _send->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
-		return isTypeRecord() && (e->type() == QEvent::MouseButtonPress);
+		return isTypeRecord()
+			&& !_showAnimation.animating()
+			&& !_lock->isLocked()
+			&& (e->type() == QEvent::MouseButtonPress);
 	}) | rpl::to_empty;
 }
 
@@ -355,4 +502,76 @@ float64 VoiceRecordBar::activeAnimationRatio() const {
 	return _activeAnimation.value(_inField.current() ? 1. : 0.);
 }
 
+QString VoiceRecordBar::cancelMessage() const {
+	return _lock->isLocked()
+		? tr::lng_record_lock_cancel(tr::now)
+		: tr::lng_record_cancel(tr::now);
+}
+
+void VoiceRecordBar::computeAndSetLockProgress(QPoint globalPos) {
+	const auto localPos = mapFromGlobal(globalPos);
+	const auto lower = _lock->height();
+	const auto higher = 0;
+	const auto progress = localPos.y() / (float64)(higher - lower);
+	_lock->requestPaintProgress(std::clamp(progress, 0., 1.));
+}
+
+void VoiceRecordBar::installClickOutsideFilter() {
+	const auto box = _recordingLifetime.make_state<QPointer<ConfirmBox>>();
+	const auto showBox = [=] {
+		if (*box || _send->underMouse()) {
+			return;
+		}
+		auto sure = [=](Fn<void()> &&close) {
+			stop(false);
+			close();
+		};
+		*box = Ui::show(Box<ConfirmBox>(
+			tr::lng_record_lock_cancel_sure(tr::now),
+			tr::lng_record_lock_discard(tr::now),
+			st::attentionBoxButton,
+			std::move(sure)));
+	};
+
+	const auto computeResult = [=](not_null<QEvent*> e) {
+		using Result = base::EventFilterResult;
+		if (!_lock->isLocked()) {
+			return Result::Continue;
+		}
+		const auto type = e->type();
+		const auto noBox = !(*box);
+		if (type == QEvent::KeyPress) {
+			if (noBox) {
+				return Result::Cancel;
+			}
+			const auto key = static_cast<QKeyEvent*>(e.get())->key();
+			const auto cancelOrConfirmBox = (key == Qt::Key_Escape
+				|| (key == Qt::Key_Enter || key == Qt::Key_Return));
+			return cancelOrConfirmBox ? Result::Continue : Result::Cancel;
+		} else if (type == QEvent::ContextMenu || type == QEvent::Shortcut) {
+			return Result::Cancel;
+		} else if (type == QEvent::MouseButtonPress) {
+			return (noBox && !_send->underMouse())
+				? Result::Cancel
+				: Result::Continue;
+		}
+		return Result::Continue;
+	};
+
+	auto filterCallback = [=](not_null<QEvent*> e) {
+		const auto result = computeResult(e);
+		if (result == base::EventFilterResult::Cancel) {
+			showBox();
+		}
+		return result;
+	};
+
+	auto filter = base::install_event_filter(
+		QCoreApplication::instance(),
+		std::move(filterCallback));
+
+	_recordingLifetime.make_state<base::unique_qptr<QObject>>(
+		std::move(filter));
+}
+
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 8fdc0fc02..29ed0cab8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -22,11 +22,20 @@ class SessionController;
 
 namespace HistoryView::Controls {
 
+class RecordLock;
+
 class VoiceRecordBar final : public Ui::RpWidget {
 public:
 	using SendActionUpdate = Controls::SendActionUpdate;
 	using VoiceToSend = Controls::VoiceToSend;
 
+	VoiceRecordBar(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Window::SessionController*> controller,
+		std::shared_ptr<Ui::SendButton> send,
+		int recorderHeight);
+	~VoiceRecordBar();
+
 	void startRecording();
 	void finishAnimating();
 
@@ -34,15 +43,12 @@ public:
 	[[nodiscard]] rpl::producer<VoiceToSend> sendVoiceRequests() const;
 	[[nodiscard]] rpl::producer<bool> recordingStateChanges() const;
 	[[nodiscard]] rpl::producer<> startRecordingRequests() const;
+	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
+
+	void setLockBottom(rpl::producer<int> &&bottom);
 
 	[[nodiscard]] bool isRecording() const;
-
-	VoiceRecordBar(
-		not_null<Ui::RpWidget*> parent,
-		not_null<Window::SessionController*> controller,
-		std::shared_ptr<Ui::SendButton> send,
-		int recorderHeight);
-	~VoiceRecordBar();
+	[[nodiscard]] bool isLockPresent() const;
 
 private:
 	void init();
@@ -58,23 +64,26 @@ private:
 	void stopRecording(bool send);
 	void visibilityAnimate(bool show, Fn<void()> &&callback);
 
-	void recordStopCallback(bool active);
-	void recordUpdateCallback(QPoint globalPos);
-
 	bool showRecordButton() const;
 	void drawDuration(Painter &p);
 	void drawRecording(Painter &p);
 	void drawMessage(Painter &p, float64 recordActive);
 	void updateOverStates(QPoint pos);
 
+	void installClickOutsideFilter();
+
 	bool isTypeRecord() const;
 
 	void activeAnimate(bool active);
 	float64 activeAnimationRatio() const;
 
+	void computeAndSetLockProgress(QPoint globalPos);
+
+	QString cancelMessage() const;
+
 	const not_null<Window::SessionController*> _controller;
-	const std::unique_ptr<Ui::RpWidget> _wrap;
 	const std::shared_ptr<Ui::SendButton> _send;
+	const std::unique_ptr<RecordLock> _lock;
 
 	rpl::event_stream<SendActionUpdate> _sendActionUpdates;
 	rpl::event_stream<VoiceToSend> _sendVoiceRequests;
@@ -92,6 +101,10 @@ private:
 
 	rpl::lifetime _recordingLifetime;
 
+	rpl::variable<bool> _lockShowing = false;
+
+	Ui::Animations::Simple _showLockAnimation;
+
 	// This can animate for a very long time (like in music playing),
 	// so it should be a Basic, not a Simple animation.
 	Ui::Animations::Basic _recordingAnimation;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 625ef7a59..1bf1b08ba 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -344,6 +344,9 @@ historyRecordDurationSkip: 12px;
 historyRecordDurationFg: historyComposeAreaFg;
 historyRecordTextTop: 14px;
 
+historyRecordLockShowDuration: historyToDownDuration;
+historyRecordLockSize: size(50px, 150px);
+
 historySilentToggle: IconButton(historyBotKeyboardShow) {
 	icon: icon {{ "send_control_silent_off", historyComposeIconFg }};
 	iconOver: icon {{ "send_control_silent_off", historyComposeIconFgOver }};

From 326342420d2a8217025ee73f41c1a34c3fe96730 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 8 Oct 2020 17:38:17 +0300
Subject: [PATCH 065/370] Added animation of voice recording lock with dummy
 lock icons.

---
 .../Resources/icons/lock/record_lock_body.png | Bin 0 -> 107 bytes
 .../icons/lock/record_lock_body@2x.png        | Bin 0 -> 122 bytes
 .../icons/lock/record_lock_body@3x.png        | Bin 0 -> 176 bytes
 .../icons/lock/record_lock_body_shadow.png    | Bin 0 -> 122 bytes
 .../icons/lock/record_lock_body_shadow@2x.png | Bin 0 -> 199 bytes
 .../icons/lock/record_lock_body_shadow@3x.png | Bin 0 -> 341 bytes
 .../icons/lock/record_lock_bottom.png         | Bin 0 -> 369 bytes
 .../icons/lock/record_lock_bottom@2x.png      | Bin 0 -> 657 bytes
 .../icons/lock/record_lock_bottom@3x.png      | Bin 0 -> 1012 bytes
 .../icons/lock/record_lock_bottom_shadow.png  | Bin 0 -> 576 bytes
 .../lock/record_lock_bottom_shadow@2x.png     | Bin 0 -> 2265 bytes
 .../lock/record_lock_bottom_shadow@3x.png     | Bin 0 -> 4705 bytes
 .../Resources/icons/lock/record_lock_top.png  | Bin 0 -> 359 bytes
 .../icons/lock/record_lock_top@2x.png         | Bin 0 -> 661 bytes
 .../icons/lock/record_lock_top@3x.png         | Bin 0 -> 1010 bytes
 .../icons/lock/record_lock_top_shadow.png     | Bin 0 -> 557 bytes
 .../icons/lock/record_lock_top_shadow@2x.png  | Bin 0 -> 2244 bytes
 .../icons/lock/record_lock_top_shadow@3x.png  | Bin 0 -> 4604 bytes
 .../SourceFiles/history/history_widget.cpp    |   2 +-
 .../history_view_voice_record_bar.cpp         |  99 ++++++++++++++++--
 Telegram/SourceFiles/ui/chat/chat.style       |  16 ++-
 21 files changed, 107 insertions(+), 10 deletions(-)
 create mode 100644 Telegram/Resources/icons/lock/record_lock_body.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_body@2x.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_body@3x.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_body_shadow.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_body_shadow@2x.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_body_shadow@3x.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_bottom.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_bottom@2x.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_bottom@3x.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_bottom_shadow.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_bottom_shadow@2x.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_bottom_shadow@3x.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_top.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_top@2x.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_top@3x.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_top_shadow.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_top_shadow@2x.png
 create mode 100644 Telegram/Resources/icons/lock/record_lock_top_shadow@3x.png

diff --git a/Telegram/Resources/icons/lock/record_lock_body.png b/Telegram/Resources/icons/lock/record_lock_body.png
new file mode 100644
index 0000000000000000000000000000000000000000..6204b88ce44654acc312fcb73389f27b3dda9807
GIT binary patch
literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^IzY_C!2~4NIII)^Qk(@Ik;M!QddeWoSh3W;3@9k;
z>EaktaVt3?A>qfLpP&CTGC8c4RCw_B_jl&k91IF?er3L9C}069WbkzLb6Mw<&;$Ve
CE*@L}

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_body@2x.png b/Telegram/Resources/icons/lock/record_lock_body@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf955e2914fe6d14b625be80f406dff2084a863f
GIT binary patch
literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^5kSns!2~2*cjvzcQk(@Ik;M!QddeWoSh3W;3@E7M
z>EaktaVt52q1k`F-Cy~M4?aIX&vW9ze-1Vc#*aYu#Ri5(^Za`~AJ#B39NYD}#WRED
QH&7pgr>mdKI;Vst0GTQ$zyJUM

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_body@3x.png b/Telegram/Resources/icons/lock/record_lock_body@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1da493f530811593190d65746028aca617b5d1e4
GIT binary patch
literal 176
zcmeAS@N?(olHy`uVBq!ia0vp^EkMl1!2~3G;}$9dDb50q$YKTtJs?|8nXzK2eHl<t
zvcxr_Bsf2<q&%@GmBBG3KPgqgGdD3kH7GSPrLyp3str()t*47)NX4z>goZ|bdAmRI
ztR?IR64DQ_%(ttR;+6W<e15)ta%a!Q0!a-6DamGQBe(9Ajv+q1VGo$&8kre(ZoL$o
T`_b|<&>#j+S3j3^P6<r_OaU~d

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_body_shadow.png b/Telegram/Resources/icons/lock/record_lock_body_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee20e6c70a894d17582967d278dd54cf1f320728
GIT binary patch
literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^CP2)@!2~2{SZ445Db50q$YKTtJ!KGPtXOJa1{Bos
zba4!+xRspXz+`4-7QH?1ue}39hUo=Ho*fO%&4=IJ-OYZg&|!5WpF<fx!*b?dGuQqt
RJrC5!;OXk;vd$@?2>@AiB1ZrK

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_body_shadow@2x.png b/Telegram/Resources/icons/lock/record_lock_body_shadow@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b01ea846d4ba0f185d942490c5c4856bfa24cf5
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^89>a!!2~4Vdc3_3q&N#aB8wRq^pruEv0|xx8Bnm&
z)5S5Q;?~nk2YDF;1zHnDFLYe!U!cb+C8Q;2bzmRUw}kIj@9o;(pEvksc5dgCOA^9P
z8cV<2yB^hk-~fwQ%7KIKEK3r;g9O)XH9QveS|a(qucFM115G?TiunX5JSw(`SvDmq
td&!}*mX7BvtKV<E_Wy9;?;WQL_#Y{~nj&(}z8vTX22WQ%mvv4FO#n#FOm_eP

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_body_shadow@3x.png b/Telegram/Resources/icons/lock/record_lock_body_shadow@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..cef5497898e4494ec4a026972d259b640f5162da
GIT binary patch
literal 341
zcmV-b0jmCqP)<h;3K|Lk000e1NJLTq005i-000IE0ssI2xhG&h00009a7bBm001r{
z001r{0eGc9b^rhX8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0OCnR
zK~#9!?bOGOgJ2XzVY8qBpa()1q)rf_8bs&>321{*1fc-J2K!6_GvkGky!dYcZ}A=J
zJtRqb{61Nh6-Ci?-L~x@2+}mIs;cX{X_~feyRPdgcEf;$7i6dbhaG$p5P}>;`6Jm+
z(0`+<s%jX9<2Yd$W?5F(b>H{%Jn#E1^zR$IAVUo}>`@fCu1g4Vd?u=Cnq1^=p65-|
z48yQ2%W)in{=UHrGSq;>9>=lgd4%|6R4#J2D2ldi$8i)<@7{Ty>$*Y>cv+T7lK8%F
nS(c`0BC3e`MpW^Bzdz~={`1fTlQJPq00000NkvXXu0mjf;{A)_

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_bottom.png b/Telegram/Resources/icons/lock/record_lock_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..8be9d5e19ed3df9ea6edea42c605cab82e866671
GIT binary patch
literal 369
zcmV-%0gnEOP)<h;3K|Lk000e1NJLTq001li000&U0ssI2GzaOO00009a7bBm001r{
z001r{0eGc9b^rhYBS}O-RCwCemc5QeP!xr?hIk33f=(fV2jIPEMXTWn6cTDrpwX!n
z5{(#il9`nmnM~%-ojV-4Uv;pp^%W;MhlpqxhUbfzritEY+x9AnuIo05x~{L1K=me(
zW!Y5{sNN)e-@i%%)tiLlI9ExadXo?YVH`*H1}Noup5BS$n7u@jB=iwY)7VR(ls-|G
zB})U;(N`2jVJV@iDt${31Z)gYL_fiCT+=jX8=wM3^b3+C&GUSo!Llr<pj`~ZSl9Io
z1H>YnZbaAh!_RjFB9{JyEX!3@9c6$h1kxQ~`-EZme*=W<?8IG6)6DbyzWSml@H-ua
zWm!=a^?iR!H^wk*+cuqnD2lG@dY+f2DK160oISmQ1s?GdpD=(idN^JHEqfIavgoe0
P00000NkvXXu0mjfYHpb=

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_bottom@2x.png b/Telegram/Resources/icons/lock/record_lock_bottom@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..99296c69fa9b0609179b8d42f8875ce50839e244
GIT binary patch
literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq003A3001lq0ssI2Zbay`00009a7bBm001r{
z001r{0eGc9b^rhZLrFwIRCwC$nmw<<P#DLbgu&)z5=|r`G1to%VQ1=Co3%cKPoN<d
zVi0B}9k56&Y(_~VF?fr`z5m?1+~Qttakb~%--NX1JpW(X<LOC>J~$i>Z@fZZSuU4+
zT3D~wCK2=boKF#kVVFcrCKEnI%w{u_h;FybrwC2cOd?cO<x>QLn?xvz!lwuXH;G86
z(|n3RaFd8=G|Hz41g8@giv@2M5Sh+tG#b2#K;#P|BuU~;1R`G$Aqc|pc;v?d!iGX2
zx`?jp{D?qU`VLu^`4N%N=f4%<_xpFd9S;@|6JhBGIO(-dJL_{qQDlC}M8J4FPFLx4
zI&6zTK)QuQBEj%QfoREOl5V6@sjw=dTCLLU1cSlVYQ>%fghDj>6-@RN2t~ie<#LTi
zBbF>64nmOyVzJm}vth#mf*=lACYQ^xAp$|@PD-Vc(=8wZ-4E`oR;%S)3+;B>;?i)A
z*Xtb&22QkqvQa!e5In1m$75$%K*3iYF|FbA`7}*)iUpL4g6T<kJf3E=X@3hS5~b2p
z!NOzn{}Gh;u+{M@*=*K^y%tJBVf4qKQ5z12w(6ko>K*UF?RFOmg_m!0q5zbEV(7Jm
z!{J)3_L99EOp2*d0NICBDuo{Ik9XWKDcKWI6wBrEQ*W02ey^%3CL;S22n1wV)^+`X
z_X~!?fEX5olj9HsL6W3;y>9uP1DuG{F$jhtHi$$bnM_7e6kOQ7UT->`8iujmZa)L#
r1HR(Ne!q_cip3%h#wqmAKd<2(0y9^$CoXzt00000NkvXXu0mjf52+w#

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_bottom@3x.png b/Telegram/Resources/icons/lock/record_lock_bottom@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd1cd6a8a296d49a9a9bf0ff58c41640bfc5fbf8
GIT binary patch
literal 1012
zcmV<Q0}K3#P)<h;3K|Lk000e1NJLTq004vl002S=0ssI28JFo<00009a7bBm001r{
z001r{0eGc9b^rhX8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?1A$3I
zK~#9!?VLMLDnS^Azon#+M6n_iYADo%#>!x$7FuWr(ZU!@ZKc;jjkiW^)x=II3?#M+
z`~Yt>`Uf<z5R6)=h3C8pImt;}beG*3R`z`=F3Zk0&zoi0nOQ{s@rN`B`O5S2Grj2N
z<>kdBjHjn3s?iU$n}l(He@`{~fp(KHN~IFj=;!+S+9Zs#voosE&*|x@Nf?<-hHCV4
zbaZ4A#@gB%)#wM>O~RO+ouwN6K)Xp8qobo#qaSED2_qVfQjLC~T}*j=e54(nK)BQ*
zpU+c}P9VHy82mxyiJwwc#>U1dNGA|pGmN&jw$IN`I?@AFx3;#*H=LiJQ<EN`TE1s_
zd6}B@u(Y)FLl}uff|~RI)jxz02n0B>p#eySYWb0^tu4w@4J3;d`uqDSOEr*eDGb9f
zZf|etOC8V)$zqZD`FSc+2lR?{!r}1y`#Y_v0Ait6Y;kaKKyfO7Sg}h_PY;JiR1AUi
z_V!90WV2c7bC+B$C-o7J$9ZtLdsy`K^-0}u{f>(qA0LYoVzJoA#|J$+2O1$$9J0B&
zNtMolMsZF{OUuK<18q710z;vYxWeS*B!xNw0>wp6PEP2wKA=wAB@&60%VnCi3#37v
zxK1jSqFlQ`nkZs_f1iG>16`tyU@&-fbw$fofGFq^rF3+3@Z@3TRMFYlDH<3Y9OP`r
zH$V;)i8iLDrYOA@)6>(UnT3S~djHDe;-WMJ4qGW1fT|C}Fm`r!m_Ze&u(9StQ63u`
z8%zSnM1zyy`J)QDFP>s%X2yrpQ0Ou`E*@lPXvkOBgXrw=@UVCmT%TWFUiu*kbQ7Hw
zj}r_A_xARhegshYxRZ+{lgXz1%0j0Uj*6=z5{Wd~{2;ocWTr?P6B83nu$}>3aCsiP
zQG`MvToe7$fnJo2;$2(Y;SsvJx-yx}FIq2(Qc*C<mS!a$k7u)4k4J*?a=9Ez6+h73
z-MzcJ`}X$cwHQzm3PX9~H`?3V)9Lih&5ajgKp7|oC5fLg3?q?9Y;SKj<o<Isil$M3
zSH@gDLLd+r7#LVtS-H5lP<m3q&d~%KLUWexjQ2U=aCm%te06oTSS(g573Tq9Cxt=*
zJH&2n-``07CmM~8jEv09&8@GmA08g&^Z8P#ba!`GE|*_lU#q(D08jBE-oggh3>)Jk
i_+ZWd0VISFVu!y_Fv)P)Kp4va0000<MNUMnLSTXbe$A->

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_bottom_shadow.png b/Telegram/Resources/icons/lock/record_lock_bottom_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..efa0930639db7a235b4a5404120334dafdfc679f
GIT binary patch
literal 576
zcmV-G0>Ax<P)<h;3K|Lk000e1NJLTq001-q000^Y0ssI2cf9EO00009a7bBm001r{
z001r{0eGc9b^rhY@<~KNRCwC$mOqaHK^VqIWpy?Zt*sPV<x043K*yr-NffB)@c|^e
zHSzDF7KPGR5E=~)iMwB1BbSU_ZjHO-p33gdJijMnX5LqbD`hg7>2&(>B7r7=kSU!`
zPbQOJ8qPG$e!u^!aD%}hl}bs&C6h_pwoj*%`eZ;I$02|;Ts$7{bUKH_L47!&pa~!i
z7mY@%)#`S;RUZy0XaY#Xg+if9rLtPB)Q1BKngHU4I4{HDP<=R{w~p$UVzF4W+1%}R
zDwBZ&3fd)HFc`EfYq?yi3<nM<XyK|vBEiAg@Aqnw0Rjh9c#)=Q`FwsppQ{N62pmx1
zQT+Y2T5Y{vKRX!+K<>NkT7f`-Qr7GBo_Zl;4gwH3ahJGqa=F}iJU$+e&q#(X<{(_|
zHkou?FPF=++06HR7-EY#2=TBYkw~dj8jVIi9$u_4#1?b$LxscPY&Og0@a249f)$3?
z3SY#wVB6N~^~GZG@DehS>5WDMs|WYljq__5MxjvXcDr2Y6rA(<>?IS!7|awVG98n<
z&!+b!<SM7sPzov4v=W=mh9&vdpYq5{J~4n{tyZg8EHcsO1(VfZu1%T<njD(2cDqdz
zOOyS65kGk3C7&3;Fa~?7o4zk3?IG<e?KSQH+eQ4~k(Yc@u~h&1Yx)E#<CGJOK(Y1!
O0000<MNUMnLSTXr2m|H-

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_bottom_shadow@2x.png b/Telegram/Resources/icons/lock/record_lock_bottom_shadow@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2804459cdc810835cbfa919cfeed615da8f09fd0
GIT binary patch
literal 2265
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

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_bottom_shadow@3x.png b/Telegram/Resources/icons/lock/record_lock_bottom_shadow@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5421949809ff69580454065f6ba8ba7d618d93a8
GIT binary patch
literal 4705
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

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_top.png b/Telegram/Resources/icons/lock/record_lock_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4ee1db1b2904f7416c09930e3e4923960849cae
GIT binary patch
literal 359
zcmV-t0hs=YP)<h;3K|Lk000e1NJLTq001li000&U0ssI2GzaOO00009a7bBm001r{
z001r{0eGc9b^rhY8A(JzRCwCemaVFVKomxgMe!w!2BSelv*2?HR?QaQz#!Ot0*lRT
z5G?*TVV^GyT<+!E^Q$wQ)pYjkwc=bZUx%uyp63NYkY!n2*In1m^E{4Y+qU?`PaI(Y
zW2fj{*G-b7?|XUzjA0m84%0i1QxpZg1uo+Hrv-5w)5l=Rn|fW>tE!@dz$z?!t-!LZ
zVHoI8un=pXEwF8S-*-9zti|%j1)8R<>q@7wZ5tH#3M5HtnubmW3W)xVh@yzN0MYFN
z!!U>=(A|hA%aUgVbbkv>(<JUd`YR$$Q~nW<{uC&RGEEcz2uNjFW)Z&clOUjG5n&jL
zih!C$<asVC0%{h4N0F!qs96MFX`&*aW)aJ>h>Cz30avy76x-*8si*(|002ovPDHLk
FV1ig0m5l%Z

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_top@2x.png b/Telegram/Resources/icons/lock/record_lock_top@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b578b31059c3132800c1fc8c2b856a61b9f07b8c
GIT binary patch
literal 661
zcmV;G0&4w<P)<h;3K|Lk000e1NJLTq003A3001lq0ssI2Zbay`00009a7bBm001r{
z001r{0eGc9b^rhZM@d9MRCwC$nor9yQ5=S!Vqu4!C@Ft-N_>*pV`XP{wtNUa08PqD
zO2(d=1vad(QFfxF49bGvd)HHMjr8)&YyO?{Tw62e-1jv)&dm7w`sEjEh(scSAe75x
zNs@-c;e0;dZnwwdk%+F>>wdpqtyZ(y3?JbD9EO8&3M1u%!C)?ztJmx6^_p~n6B~^N
z2EkCy>+kpbMNw1~<#xN#hq&MG7!bo^a0e(zCX={;m&=6=1A}7<Ok`69nM|hF>*2bQ
zDPSU5mNBV~6okX!R;y*2f(IR#8UZX;;C8!9rPBF)CQCs8#6TEpEW~25@pw$O0b%0t
zxY-u6*{rInWHS&6!Aw%%a=EJ2D%qG?t%i`sTJU&0olb{r4?-fUQ5JkY-(WBxhk&RE
zY{+JDI-QcEK;RE=L%m+_Xfz@Rg4hWEvDLBL?UG}`e)ltLr_FyO-T@W<*8=W;i3#%g
zynYLbMB;Qhu^|FQP)Fy|Fquq<Ay7xpVo@v>i8(}3{F#M7AaFPw*b{+LsP+R9&1RDr
z1=ZfQkWQy9dCFqivz&LIYss=qOw;f8Ut36}QVf3`{(dP?^MwdWl86IP^TjQup-<xN
z18V;3#+1pugPuKwqA2``K-uROLZJ}z%jCn7`TTuqp->>sK;<VQ+U+)PB2f8>h|Olh
zn+Q~Xv=EI(iAzviBSH`aK1HCoMnt7j;Zp>P^SHBqz1McoE3D6g;u;Z)#ez=}%jHrd
vVz=AzDFVecBEJ9c$RVn#YD5snd>i-!9z0f8tbs7&00000NkvXXu0mjfRwXgS

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_top@3x.png b/Telegram/Resources/icons/lock/record_lock_top@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8d63fe3c127d7f74b84fa49489a09a67afb148e
GIT binary patch
literal 1010
zcmV<O0}cF%P)<h;3K|Lk000e1NJLTq004vl002S=0ssI28JFo<00009a7bBm001r{
z001r{0eGc9b^rhX8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?1Aj?G
zK~#9!?VP($DnS@Wg-!}J0v!|>36TP7#7YZ8ft86SG`3hmjV3fGYyq*-#9k@DL|UcS
zf<WUxAS4tT1BnC@9e=quxw((!BJ9rW>pPVX*qu2?V3}Q<n<EH<AQa>EdbhW?4-XIX
z`TW(@RlQzswOZ|V`}Os;-|w>@;0t_<AL3WI0d9sH<1V-(?oJM8XL)&fXJ_Z+<OEuw
zm?;Ju!KSc5Y!(|Q!xOOE?U6_%o6SBxK7M|FGH!f)d^|inU`N;;c1q^|08)y@;`8$}
z6ApHYU9YdNTfKqX?M|gqPft%w2VfW&42ER641qx4{QP_{7%-iIAz@%^YipLs5DJBE
zZf@|b&2$W2u`oys)wCH_S69pBvd%O7l>`IEuuYX=X=zE4q~UPL3<!pe!D9+$D6zl4
z-|cpp!NC+T5d&xNcs#XQjhP5c2a_^hiQV1ZmzNi2I`B>&Q!`A4`T6<F%S&czFhPgI
zq4yF#pRdtqFbjZbVzT-zv9+~j%BQArV6vF99!ne?92oTARSBcf2ou*=iA*NLEDWZv
ziwriKEuYUb%Tp*6phDvkXJ=<r;wMm{We@y0P=nu*BuSeRM@L6w|6h)ek42YABobWD
zj2arq5m#b!bJK!Hu~RMdLXn6PD=RCOdS^HD5*9@9E#YuDEVA06%6bXk^()h_0II&8
z$Z=Ji{7ws(^>&ZPqso<i7JTtg|9q6m&e@6N_V!lI5_@}l<Wva|s7{H6g#{B_QJ^gl
zxVX5eLJUcg$fhoqt^9ufXfz^~%7I46R21X-`kFkdMY&v7bX_d12C4{ThQr|*V^k^?
zGN>-qYIT+p!C;Uc7Cast5Ic2@i;D|##{-C+`ZGoE@9!jz2N3IWxu%GbPN&HlKcIJt
z7&`f!omqk2@0N%}BIJuV-~D`Tu~;NoyeXARlS|m`_D-imvUt;Ow<rHUfQ^j}G9`v+
zG&&(hE|()sVu0!iG3eqCVL<i&N;sWPS^^QdGy>scW5nZeawHN69~<NJ^ppgN1j5J0
zsMqTxNF)$GHU?cpD;NluFX8oi$&PsBFL8^-Vx&eq&@K}rnM{%z@jyErO6mK6imuAh
z1ZbCuaeseLYQ%GQcPA60)oPI%@id!FnHY2$LldA~CdS*_8>tZww9CZk^?Ia6JpF!O
gCI)%YieCx70KdJ*Y!AUGEC2ui07*qoM6N<$f)m-hCIA2c

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_top_shadow.png b/Telegram/Resources/icons/lock/record_lock_top_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..30d0aa4ec92cf5805f4a3e12dcab5c0686d967f2
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq001-q000^Y0ssI2cf9EO00009a7bBm001r{
z001r{0eGc9b^rhY-$_J4RCwC$m%Xk5Q51!#&=C_Yl|o5L!XwZjCJ`?}LFWN@0fpMX
zL`^f@cmy&U#f*l;xnFf7a{Zq<x3RjJv-esnbM`rVkH_=H7hlMM-|vq^BJp@Ul}cqY
znOrWH&1Tc-bTXObB})XT_T=;VqR}Wms?}<}Uhi}|{eFKq9M0$S*=#l#40z-vO9T)`
zFe$Fv3Iqa)M50_Sx7+RUcx;-cWm$*A;dDBQ3-HKGmIxq>U{XjV-7ROaSgcekb-P`|
zF!uZX`Fs{nfG~ndA(3=Qyk4*54@M=mTCLS;W!tuR3nY>b2~^TPVK5lX=kvW@Z?oBm
zkFniup@I<FPn~I+R;g4blZoRvLK2{Y5ZZ7!{JyhLD5UH9VzD?Lk3uRSgcfon-mJ4i
zp)j3Jr91oe2RRZi*B=LpvZXjA?&hESiv&WionNlaX0s{f1l$J_2qE`EQz{mV%jHri
z0Yb<<+vvE;xiDSb(5uZw4$-IjCas1GT_^-{h(7MWY(K4#hNIFPa)>^zJjNbcwNQ@H
zXoU2GyRBBMt=DVy<`6~t-kryI*l09%yPbM-h$4-Fo8}l_IXH}B>dhgFGzM;(W7=kj
vy_y`=08ykdaMK+B0ZiNCpMW$5F8%xfX+W6Sp^+#300000NkvXXu0mjfZC(2-

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_top_shadow@2x.png b/Telegram/Resources/icons/lock/record_lock_top_shadow@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc3943e4e0ece9ac5c056b06a8539e59a809f2de
GIT binary patch
literal 2244
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

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/lock/record_lock_top_shadow@3x.png b/Telegram/Resources/icons/lock/record_lock_top_shadow@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5aca3269ce1e0848e2c861ff870787e77a7c444d
GIT binary patch
literal 4604
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
Y;O2AA$#g7k;GY|is<I}mR1p#SFU~xlR{#J2

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index dc7ec4571..2f706afca 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -722,7 +722,7 @@ void HistoryWidget::initVoiceRecordBar() {
 			_scroll->topValue(),
 			_scroll->heightValue()
 		) | rpl::map([=](int top, int height) {
-			return top + height;
+			return top + height - st::historyRecordLockPosition.y();
 		});
 		_voiceRecordBar->setLockBottom(std::move(scrollHeight));
 	}
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index d94221565..a5d1a3085 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -66,13 +66,18 @@ public:
 private:
 	void init();
 
+	void drawProgress(Painter &p);
+
 	Ui::Animations::Simple _lockAnimation;
 
 	rpl::variable<float64> _progress = 0.;
 };
 
 RecordLock::RecordLock(not_null<Ui::RpWidget*> parent) : RpWidget(parent) {
-	resize(st::historyRecordLockSize);
+	resize(
+		st::historyRecordLockTopShadow.width(),
+		st::historyRecordLockSize.height());
+	// resize(st::historyRecordLockSize);
 	init();
 }
 
@@ -90,23 +95,101 @@ void RecordLock::init() {
 	) | rpl::start_with_next([=](const QRect &clip) {
 		Painter p(this);
 		if (isLocked()) {
-			const auto color = anim::color(
-				Qt::red,
-				Qt::green,
+			const auto top = anim::interpolate(
+				0,
+				height() - st::historyRecordLockTopShadow.height() * 2,
 				_lockAnimation.value(1.));
-			p.fillRect(clip, color);
+			p.translate(0, top);
+			drawProgress(p);
 			return;
 		}
-		p.fillRect(clip, anim::color(Qt::blue, Qt::red, _progress.current()));
+		drawProgress(p);
 	}, lifetime());
 
 	locks(
 	) | rpl::start_with_next([=] {
-		const auto duration = st::historyRecordVoiceShowDuration * 3;
+		const auto duration = st::historyRecordVoiceShowDuration;
 		_lockAnimation.start([=] { update(); }, 0., 1., duration);
 	}, lifetime());
 }
 
+void RecordLock::drawProgress(Painter &p) {
+	const auto progress = _progress.current();
+
+	const auto &originTop = st::historyRecordLockTop;
+	const auto &originBottom = st::historyRecordLockBottom;
+	const auto &originBody = st::historyRecordLockBody;
+	const auto &shadowTop = st::historyRecordLockTopShadow;
+	const auto &shadowBottom = st::historyRecordLockBottomShadow;
+	const auto &shadowBody = st::historyRecordLockBodyShadow;
+	const auto &shadowMargins = st::historyRecordLockMargin;
+
+	const auto bottomMargin = anim::interpolate(
+		0,
+		rect().height() - shadowTop.height() - shadowBottom.height(),
+		progress);
+
+	const auto topMargin = anim::interpolate(
+		rect().height() / 4,
+		0,
+		progress);
+
+	const auto full = rect().marginsRemoved(
+		style::margins(0, topMargin, 0, bottomMargin));
+	const auto inner = full.marginsRemoved(shadowMargins);
+	const auto content = inner.marginsRemoved(style::margins(
+		0,
+		originTop.height(),
+		0,
+		originBottom.height()));
+	const auto contentShadow = full.marginsRemoved(style::margins(
+		0,
+		shadowTop.height(),
+		0,
+		shadowBottom.height()));
+
+	const auto w = full.width();
+	{
+		shadowTop.paint(p, full.topLeft(), w);
+		originTop.paint(p, inner.topLeft(), w);
+	}
+	{
+		const auto shadowPos = QPoint(
+			full.x(),
+			contentShadow.y() + contentShadow.height());
+		const auto originPos = QPoint(
+			inner.x(),
+			content.y() + content.height());
+		shadowBottom.paint(p, shadowPos, w);
+		originBottom.paint(p, originPos, w);
+	}
+	{
+		shadowBody.fill(p, contentShadow);
+		originBody.fill(p, content);
+	}
+	{
+		const auto &arrow = st::historyRecordLockArrow;
+		const auto arrowRect = QRect(
+			inner.x(),
+			content.y() + content.height() - arrow.height() / 2,
+			inner.width(),
+			arrow.height());
+		p.setOpacity(1. - progress);
+		arrow.paintInCenter(p, arrowRect);
+		p.setOpacity(1.);
+	}
+	{
+		const auto &icon = isLocked()
+			? st::historyRecordLockIcon
+			: st::historyRecordUnlockIcon;
+		icon.paint(
+			p,
+			inner.x() + (inner.width() - icon.width()) / 2,
+			inner.y() + (originTop.height() * 2 - icon.height()) / 2,
+			inner.width());
+	}
+}
+
 void RecordLock::requestPaintProgress(float64 progress) {
 	if (isHidden() || isLocked()) {
 		return;
@@ -230,7 +313,7 @@ void VoiceRecordBar::init() {
 		auto callback = [=](auto value) {
 			const auto right = anim::interpolate(
 				-_lock->width(),
-				0,
+				st::historyRecordLockPosition.x(),
 				value);
 			_lock->moveToRight(right, _lock->y());
 			if (value == 0. && !show) {
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 1bf1b08ba..325c6160d 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -345,7 +345,21 @@ historyRecordDurationFg: historyComposeAreaFg;
 historyRecordTextTop: 14px;
 
 historyRecordLockShowDuration: historyToDownDuration;
-historyRecordLockSize: size(50px, 150px);
+historyRecordLockSize: size(75px, 150px);
+
+historyRecordLockTopShadow: icon {{ "lock/record_lock_top_shadow", historyToDownShadow }};
+historyRecordLockTop: icon {{ "lock/record_lock_top", historyToDownBg }};
+historyRecordLockBottomShadow: icon {{ "lock/record_lock_bottom_shadow", historyToDownShadow }};
+historyRecordLockBottom: icon {{ "lock/record_lock_bottom", historyToDownBg }};
+historyRecordLockBodyShadow: icon {{ "lock/record_lock_body_shadow", historyToDownShadow }};
+historyRecordLockBody: icon {{ "lock/record_lock_body", historyToDownBg }};
+historyRecordLockMargin: margins(4px, 4px, 4px, 4px);
+historyRecordLockArrow: icon {{ "history_down_arrow-flip_vertical", historyToDownFg }};
+
+historyRecordLockPosition: historyToDownPosition;
+
+historyRecordLockIcon: icon {{ "dialogs_unlock", historyToDownFg, point(1px, 0px) }};
+historyRecordUnlockIcon: icon {{ "dialogs_lock", historyToDownFg, point(0px, 0px) }};
 
 historySilentToggle: IconButton(historyBotKeyboardShow) {
 	icon: icon {{ "send_control_silent_off", historyComposeIconFg }};

From 914e40fb62c93cd5479743d1b2fc5ea7f7e38cbc Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 9 Oct 2020 17:07:58 +0300
Subject: [PATCH 066/370] Added red coloring of record button.

---
 .../history_view_voice_record_bar.cpp         | 21 +++++++++++++
 Telegram/SourceFiles/ui/chat/chat.style       |  2 ++
 .../SourceFiles/ui/controls/send_button.cpp   | 30 +++++++++++++++++--
 .../SourceFiles/ui/controls/send_button.h     |  3 ++
 4 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index a5d1a3085..d822a0f05 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -340,6 +340,24 @@ void VoiceRecordBar::init() {
 		}) | rpl::start_with_next([=] {
 			stop(true);
 		}, _recordingLifetime);
+
+		auto hover = _send->events(
+		) | rpl::filter([=](not_null<QEvent*> e) {
+			return e->type() == QEvent::Enter
+				|| e->type() == QEvent::Leave;
+		}) | rpl::map([=](not_null<QEvent*> e) {
+			return (e->type() == QEvent::Enter);
+		});
+
+		_send->setLockRecord(true);
+		_send->setForceRippled(true);
+		rpl::single(
+			false
+		) | rpl::then(
+			std::move(hover)
+		) | rpl::start_with_next([=](bool enter) {
+			_inField = enter;
+		}, _recordingLifetime);
 	}, lifetime());
 }
 
@@ -482,6 +500,9 @@ void VoiceRecordBar::stop(bool send) {
 		_recordingSamples = 0;
 		_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice, -1 });
 
+		_send->setForceRippled(false);
+		_send->clearRecordState();
+
 		_controller->widget()->setInnerFocus();
 	};
 	_lockShowing = false;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 325c6160d..46e808eb7 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -333,7 +333,9 @@ historyRecordVoiceDuration: 120;
 historyRecordVoice: icon {{ "send_control_record", historyRecordVoiceFg }};
 historyRecordVoiceOver: icon {{ "send_control_record", historyRecordVoiceFgOver }};
 historyRecordVoiceActive: icon {{ "send_control_record", historyRecordVoiceFgActive }};
+historyRecordVoiceCancel: icon {{ "send_control_record", attentionButtonFg }};
 historyRecordVoiceRippleBgActive: lightButtonBgOver;
+historyRecordVoiceRippleBgCancel: attentionButtonBgRipple;
 historyRecordSignalColor: attentionButtonFg;
 historyRecordSignalMin: 5px;
 historyRecordSignalMax: 12px;
diff --git a/Telegram/SourceFiles/ui/controls/send_button.cpp b/Telegram/SourceFiles/ui/controls/send_button.cpp
index f28cff456..ec9635791 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/send_button.cpp
@@ -43,7 +43,7 @@ void SendButton::setType(Type type) {
 		update();
 	}
 	if (_type != Type::Record) {
-		_recordProgress = 0.;
+		clearRecordState();
 	}
 }
 
@@ -73,6 +73,19 @@ void SendButton::requestPaintRecord(float64 progress) {
 	}
 }
 
+void SendButton::setLockRecord(bool lock) {
+	if (_type == Type::Record) {
+		_recordLocked = lock;
+		update();
+	}
+}
+
+void SendButton::clearRecordState() {
+	_recordLocked = false;
+	_recordProgress = 0.;
+	update();
+}
+
 void SendButton::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
@@ -104,8 +117,17 @@ void SendButton::paintEvent(QPaintEvent *e) {
 void SendButton::paintRecord(Painter &p, bool over) {
 	const auto recordActive = _recordProgress;
 	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 rippleColor = anim::color(
+			_recordLocked
+				? st::historyRecordVoiceRippleBgCancel
+				: st::historyAttachEmoji.ripple.color,
+			st::historyRecordVoiceRippleBgActive,
+			recordActive);
+		paintRipple(
+			p,
+			(width() - st::historyAttachEmoji.rippleAreaSize) / 2,
+			st::historyAttachEmoji.rippleAreaPosition.y(),
+			&rippleColor);
 	}
 
 	auto fastIcon = [&] {
@@ -113,6 +135,8 @@ void SendButton::paintRecord(Painter &p, bool over) {
 			return &st::historyRecordVoice;
 		} else if (recordActive == 1.) {
 			return &st::historyRecordVoiceActive;
+		} else if (_recordLocked) {
+			return &st::historyRecordVoiceCancel;
 		} else if (over) {
 			return &st::historyRecordVoiceOver;
 		}
diff --git a/Telegram/SourceFiles/ui/controls/send_button.h b/Telegram/SourceFiles/ui/controls/send_button.h
index 443571d43..938a0aa0c 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.h
+++ b/Telegram/SourceFiles/ui/controls/send_button.h
@@ -29,6 +29,8 @@ public:
 		return _type;
 	}
 	void setType(Type state);
+	void setLockRecord(bool lock);
+	void clearRecordState();
 	void setSlowmodeDelay(int seconds);
 	void finishAnimating();
 
@@ -57,6 +59,7 @@ private:
 
 	Ui::Animations::Simple _a_typeChanged;
 
+	bool _recordLocked = false;
 	float64 _recordProgress = 0.;
 
 	int _slowmodeDelay = 0;

From fe5242d6d2bce3418e99939e20767259de0b7713 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 9 Oct 2020 21:29:03 +0300
Subject: [PATCH 067/370] Added ability to pass filter for Escape key to voice
 record bar.

---
 Telegram/SourceFiles/history/history_widget.cpp    |  3 +++
 .../controls/history_view_voice_record_bar.cpp     | 14 +++++++++++---
 .../view/controls/history_view_voice_record_bar.h  |  3 +++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 2f706afca..1ad11462f 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -726,6 +726,9 @@ void HistoryWidget::initVoiceRecordBar() {
 		});
 		_voiceRecordBar->setLockBottom(std::move(scrollHeight));
 	}
+	_voiceRecordBar->setEscFilter([=]() -> bool {
+		return _replyToId || (_nonEmptySelection && _list);
+	});
 
 	_voiceRecordBar->startRecordingRequests(
 	) | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index d822a0f05..02f05e4d3 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -391,6 +391,10 @@ void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
 	_showAnimation.start(std::move(animationCallback), from, to, duration);
 }
 
+void VoiceRecordBar::setEscFilter(Fn<bool()> &&callback) {
+	_escFilter = std::move(callback);
+}
+
 void VoiceRecordBar::setLockBottom(rpl::producer<int> &&bottom) {
 	std::move(
 		bottom
@@ -412,6 +416,7 @@ void VoiceRecordBar::startRecording() {
 		const auto shown = _recordingLifetime.make_state<bool>(false);
 
 		_recording = true;
+		_controller->widget()->setInnerFocus();
 		instance()->start();
 		instance()->updated(
 		) | rpl::start_with_next_error([=](const Update &update) {
@@ -429,7 +434,6 @@ void VoiceRecordBar::startRecording() {
 	show();
 
 	_inField = true;
-	_controller->widget()->setInnerFocus();
 
 	_send->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
@@ -645,11 +649,15 @@ void VoiceRecordBar::installClickOutsideFilter() {
 		const auto type = e->type();
 		const auto noBox = !(*box);
 		if (type == QEvent::KeyPress) {
+			const auto key = static_cast<QKeyEvent*>(e.get())->key();
+			const auto isEsc = (key == Qt::Key_Escape);
 			if (noBox) {
+				if (isEsc && (_escFilter && _escFilter())) {
+					return Result::Continue;
+				}
 				return Result::Cancel;
 			}
-			const auto key = static_cast<QKeyEvent*>(e.get())->key();
-			const auto cancelOrConfirmBox = (key == Qt::Key_Escape
+			const auto cancelOrConfirmBox = (isEsc
 				|| (key == Qt::Key_Enter || key == Qt::Key_Return));
 			return cancelOrConfirmBox ? Result::Continue : Result::Cancel;
 		} else if (type == QEvent::ContextMenu || type == QEvent::Shortcut) {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 29ed0cab8..d3c6f28a7 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -46,6 +46,7 @@ public:
 	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
 
 	void setLockBottom(rpl::producer<int> &&bottom);
+	void setEscFilter(Fn<bool()> &&callback);
 
 	[[nodiscard]] bool isRecording() const;
 	[[nodiscard]] bool isLockPresent() const;
@@ -93,6 +94,8 @@ private:
 	QRect _durationRect;
 	QRect _messageRect;
 
+	Fn<bool()> _escFilter;
+
 	rpl::variable<bool> _recording = false;
 	rpl::variable<bool> _inField = false;
 	int _recordingSamples = 0;

From b6743feec1f36eafd3b748e6f23580ed3abae9fe Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 9 Oct 2020 21:49:14 +0300
Subject: [PATCH 068/370] Added ability to send recording voice message with
 Enter key.

---
 .../history_view_voice_record_bar.cpp         | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 02f05e4d3..26c26e37c 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -36,6 +36,12 @@ constexpr auto kMaxSamples =
 
 constexpr auto kPrecision = 10;
 
+enum class FilterType {
+	Continue,
+	ShowBox,
+	Cancel,
+};
+
 [[nodiscard]] auto Duration(int samples) {
 	return samples / ::Media::Player::kDefaultFrequency;
 }
@@ -627,7 +633,7 @@ void VoiceRecordBar::computeAndSetLockProgress(QPoint globalPos) {
 void VoiceRecordBar::installClickOutsideFilter() {
 	const auto box = _recordingLifetime.make_state<QPointer<ConfirmBox>>();
 	const auto showBox = [=] {
-		if (*box || _send->underMouse()) {
+		if (*box) {
 			return;
 		}
 		auto sure = [=](Fn<void()> &&close) {
@@ -642,40 +648,48 @@ void VoiceRecordBar::installClickOutsideFilter() {
 	};
 
 	const auto computeResult = [=](not_null<QEvent*> e) {
-		using Result = base::EventFilterResult;
+		using Type = FilterType;
 		if (!_lock->isLocked()) {
-			return Result::Continue;
+			return Type::Continue;
 		}
 		const auto type = e->type();
 		const auto noBox = !(*box);
 		if (type == QEvent::KeyPress) {
 			const auto key = static_cast<QKeyEvent*>(e.get())->key();
 			const auto isEsc = (key == Qt::Key_Escape);
+			const auto isEnter = (key == Qt::Key_Enter
+				|| key == Qt::Key_Return);
 			if (noBox) {
-				if (isEsc && (_escFilter && _escFilter())) {
-					return Result::Continue;
+				if (isEnter) {
+					stop(true);
+					return Type::Cancel;
+				} else if (isEsc && (_escFilter && _escFilter())) {
+					return Type::Continue;
 				}
-				return Result::Cancel;
+				return Type::ShowBox;
 			}
-			const auto cancelOrConfirmBox = (isEsc
-				|| (key == Qt::Key_Enter || key == Qt::Key_Return));
-			return cancelOrConfirmBox ? Result::Continue : Result::Cancel;
+			return (isEsc || isEnter) ? Type::Continue : Type::ShowBox;
 		} else if (type == QEvent::ContextMenu || type == QEvent::Shortcut) {
-			return Result::Cancel;
+			return Type::ShowBox;
 		} else if (type == QEvent::MouseButtonPress) {
 			return (noBox && !_send->underMouse())
-				? Result::Cancel
-				: Result::Continue;
+				? Type::ShowBox
+				: Type::Continue;
 		}
-		return Result::Continue;
+		return Type::Continue;
 	};
 
 	auto filterCallback = [=](not_null<QEvent*> e) {
-		const auto result = computeResult(e);
-		if (result == base::EventFilterResult::Cancel) {
+		using Result = base::EventFilterResult;
+		switch(computeResult(e)) {
+		case FilterType::ShowBox: {
 			showBox();
+			return Result::Cancel;
+		}
+		case FilterType::Continue: return Result::Continue;
+		case FilterType::Cancel: return Result::Cancel;
+		default: return Result::Continue;
 		}
-		return result;
 	};
 
 	auto filter = base::install_event_filter(

From cdb77d46b1579912d08cae53de601bb7769467f6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 10 Oct 2020 15:03:28 +0300
Subject: [PATCH 069/370] Slightly refactored text drawing in VoiceRecordBar.

---
 .../history_view_voice_record_bar.cpp         | 62 +++++++++++++------
 .../controls/history_view_voice_record_bar.h  |  3 +
 Telegram/SourceFiles/ui/chat/chat.style       |  9 ++-
 3 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 26c26e37c..ccd2ddf48 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -253,18 +253,27 @@ void VoiceRecordBar::updateControlsGeometry(QSize size) {
 			_cancelFont->width(FormatVoiceDuration(kMaxSamples)),
 			_redCircleRect.height());
 	}
-	{
-		const auto left = _durationRect.x()
-			+ _durationRect.width()
-			+ ((_send->width() - st::historyRecordVoice.width()) / 2);
-		const auto right = width() - _send->width();
-		const auto width = _cancelFont->width(cancelMessage());
-		_messageRect = QRect(
-			left + (right - left - width) / 2,
-			st::historyRecordTextTop,
-			width + st::historyRecordDurationSkip,
-			_cancelFont->height);
-	}
+	updateMessageGeometry();
+}
+
+void VoiceRecordBar::updateMessageGeometry() {
+	const auto left = _durationRect.x()
+		+ _durationRect.width()
+		+ st::historyRecordTextLeft;
+	const auto right = width()
+		- _send->width()
+		- st::historyRecordTextRight;
+	const auto textWidth = _message.maxWidth();
+	const auto width = ((right - left) < textWidth)
+		? st::historyRecordTextWidthForWrap
+		: textWidth;
+	const auto countLines = std::ceil((float)textWidth / width);
+	const auto textHeight = _message.minHeight() * countLines;
+	_messageRect = QRect(
+		left + (right - left - width) / 2,
+		(height() - textHeight) / 2,
+		width,
+		textHeight);
 }
 
 void VoiceRecordBar::init() {
@@ -334,10 +343,6 @@ void VoiceRecordBar::init() {
 	_lock->hide();
 	_lock->locks(
 	) | rpl::start_with_next([=] {
-
-		updateControlsGeometry(rect().size());
-		update(_messageRect);
-
 		installClickOutsideFilter();
 
 		_send->clicks(
@@ -365,6 +370,22 @@ void VoiceRecordBar::init() {
 			_inField = enter;
 		}, _recordingLifetime);
 	}, lifetime());
+
+	rpl::merge(
+		_lock->locks(),
+		shownValue() | rpl::to_empty
+	) | rpl::start_with_next([=] {
+		const auto direction = Qt::LayoutDirectionAuto;
+		_message.setText(
+			st::historyRecordTextStyle,
+			_lock->isLocked()
+				? tr::lng_record_lock_cancel(tr::now)
+				: tr::lng_record_cancel(tr::now),
+			TextParseOptions{ TextParseMultiline, 0, 0, direction });
+
+		updateMessageGeometry();
+		update(_messageRect);
+	}, lifetime());
 }
 
 void VoiceRecordBar::activeAnimate(bool active) {
@@ -563,10 +584,13 @@ void VoiceRecordBar::drawMessage(Painter &p, float64 recordActive) {
 			st::historyRecordCancel,
 			st::historyRecordCancelActive,
 			1. - recordActive));
-	p.drawText(
+
+	_message.draw(
+		p,
 		_messageRect.x(),
-		_messageRect.y() + _cancelFont->ascent,
-		cancelMessage());
+		_messageRect.y(),
+		_messageRect.width(),
+		style::al_center);
 }
 
 rpl::producer<SendActionUpdate> VoiceRecordBar::sendActionUpdates() const {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index d3c6f28a7..e96ea6583 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -55,6 +55,7 @@ private:
 	void init();
 
 	void updateControlsGeometry(QSize size);
+	void updateMessageGeometry();
 
 	void recordError();
 	void recordUpdated(quint16 level, int samples);
@@ -94,6 +95,8 @@ private:
 	QRect _durationRect;
 	QRect _messageRect;
 
+	Ui::Text::String _message;
+
 	Fn<bool()> _escFilter;
 
 	rpl::variable<bool> _recording = false;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 46e808eb7..0ea46b9eb 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -344,7 +344,14 @@ historyRecordCancelActive: windowActiveTextFg;
 historyRecordFont: font(13px);
 historyRecordDurationSkip: 12px;
 historyRecordDurationFg: historyComposeAreaFg;
-historyRecordTextTop: 14px;
+
+historyRecordTextStyle: TextStyle(defaultTextStyle) {
+	font: historyRecordFont;
+}
+
+historyRecordTextWidthForWrap: 210px;
+historyRecordTextLeft: 15px;
+historyRecordTextRight: 25px;
 
 historyRecordLockShowDuration: historyToDownDuration;
 historyRecordLockSize: size(75px, 150px);

From 497074073952f064acd637900f7ce4b4e14bc1f1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 10 Oct 2020 15:16:48 +0300
Subject: [PATCH 070/370] Fixed voice recording lock position on resizing.

---
 .../history_view_voice_record_bar.cpp         | 54 ++++++++++---------
 .../controls/history_view_voice_record_bar.h  |  2 +-
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index ccd2ddf48..7240cd0e1 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -236,26 +236,6 @@ VoiceRecordBar::~VoiceRecordBar() {
 	}
 }
 
-void VoiceRecordBar::updateControlsGeometry(QSize size) {
-	_centerY = size.height() / 2;
-	{
-		const auto maxD = st::historyRecordSignalMax * 2;
-		const auto point = _centerY - st::historyRecordSignalMax;
-		_redCircleRect = { point, point, maxD, maxD };
-	}
-	{
-		const auto durationLeft = _redCircleRect.x()
-			+ _redCircleRect.width()
-			+ st::historyRecordDurationSkip;
-		_durationRect = QRect(
-			durationLeft,
-			_redCircleRect.y(),
-			_cancelFont->width(FormatVoiceDuration(kMaxSamples)),
-			_redCircleRect.height());
-	}
-	updateMessageGeometry();
-}
-
 void VoiceRecordBar::updateMessageGeometry() {
 	const auto left = _durationRect.x()
 		+ _durationRect.width()
@@ -276,6 +256,14 @@ void VoiceRecordBar::updateMessageGeometry() {
 		textHeight);
 }
 
+void VoiceRecordBar::updateLockGeometry() {
+	const auto right = anim::interpolate(
+		-_lock->width(),
+		st::historyRecordLockPosition.x(),
+		_showLockAnimation.value(_lockShowing.current() ? 1. : 0.));
+	_lock->moveToRight(right, _lock->y());
+}
+
 void VoiceRecordBar::init() {
 	hide();
 	// Keep VoiceRecordBar behind SendButton.
@@ -291,7 +279,25 @@ void VoiceRecordBar::init() {
 
 	sizeValue(
 	) | rpl::start_with_next([=](QSize size) {
-		updateControlsGeometry(size);
+		_centerY = size.height() / 2;
+		{
+			const auto maxD = st::historyRecordSignalMax * 2;
+			const auto point = _centerY - st::historyRecordSignalMax;
+			_redCircleRect = { point, point, maxD, maxD };
+		}
+		{
+			const auto durationLeft = _redCircleRect.x()
+				+ _redCircleRect.width()
+				+ st::historyRecordDurationSkip;
+			const auto &ascent = _cancelFont->ascent;
+			_durationRect = QRect(
+				durationLeft,
+				_redCircleRect.y() - (ascent - _redCircleRect.height()) / 2,
+				_cancelFont->width(FormatVoiceDuration(kMaxSamples)),
+				ascent);
+		}
+		updateMessageGeometry();
+		updateLockGeometry();
 	}, lifetime());
 
 	paintRequest(
@@ -326,11 +332,7 @@ void VoiceRecordBar::init() {
 		const auto duration = st::historyRecordLockShowDuration;
 		_lock->show();
 		auto callback = [=](auto value) {
-			const auto right = anim::interpolate(
-				-_lock->width(),
-				st::historyRecordLockPosition.x(),
-				value);
-			_lock->moveToRight(right, _lock->y());
+			updateLockGeometry();
 			if (value == 0. && !show) {
 				_lock->hide();
 			} else if (value == 1. && show) {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index e96ea6583..dfe60f111 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -54,8 +54,8 @@ public:
 private:
 	void init();
 
-	void updateControlsGeometry(QSize size);
 	void updateMessageGeometry();
+	void updateLockGeometry();
 
 	void recordError();
 	void recordUpdated(quint16 level, int samples);

From ba3862e70f2cbb7b5b84497749ddf0b6dd3a781e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 10 Oct 2020 21:27:01 +0300
Subject: [PATCH 071/370] Added new send recorded voice button with recording
 animation.

---
 .../icons/send_control_record_active.png      | Bin 0 -> 869 bytes
 .../icons/send_control_record_active@2x.png   | Bin 0 -> 1396 bytes
 .../icons/send_control_record_active@3x.png   | Bin 0 -> 1877 bytes
 .../history_view_voice_record_bar.cpp         | 221 ++++++++++++++++--
 .../controls/history_view_voice_record_bar.h  |   3 +
 Telegram/SourceFiles/ui/chat/chat.style       |   8 +-
 6 files changed, 213 insertions(+), 19 deletions(-)
 create mode 100644 Telegram/Resources/icons/send_control_record_active.png
 create mode 100644 Telegram/Resources/icons/send_control_record_active@2x.png
 create mode 100644 Telegram/Resources/icons/send_control_record_active@3x.png

diff --git a/Telegram/Resources/icons/send_control_record_active.png b/Telegram/Resources/icons/send_control_record_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..af937a2014591dd16c3b53a729f7c251298a8c6f
GIT binary patch
literal 869
zcmV-r1DgDaP)<h;3K|Lk000e1NJLTq000sI000;W1^@s6_f@Si0004SX+uL$X=7sm
z04R}lk-ba9Kp4iKwo0X~bWlOWAww017K(y6Y8|>1DYb%Cm*kqXLXw6{iWFDD#i8IJ
zy7)EtALuH$DhPrih&cEc__auh?=^)MY45naKc3w4a`znI&*;ps`;vfRIy{$7Nvnl5
zDfo^M%_v3?mYHoWWV0Fc96yiniTaQby?XEKI>JTOW`J*ic$Qh*A)Y7BY&n+TJ>p?j
zmW#wE#BojsB)%28;_;i{lE+_yc|NxY_(e~t)WJ#zvobe`r-);QUS+NGh?_)Ib7h(8
z7_D*G$RUjsBq*q26FM9usG5{ncVDvUTSA3AjJ_6X;N&QwOx`%DRqCoz)ks%q>Zpm_
z|L19IGt*x8NDAnGb=}ViAh-`S>aP2H>bi|HAn*cQn{9uEa+>=lz24Sh$3S!kxV&j=
z$^me-3yeNnGMAfDfR<m=fR77cumB9*1EF;<tJZ&<KLPn|dZIhv@CcZs{n3p-nigl<
z2dx{$00009a7bBm000XT000XT0n*)m`~Uy}n@L1LR5%g6R56aiKn&cR5Dk0-(I7xT
z%R_ieen0~cfG1GUB04(6Gt!elLnOerGs1f$Y_cbvbe0wydpsEvFOe}u?D?~ORWWor
z9kbbNOqOLlh>@!^C@P$8w=3uKS;~eSYGwTEdyxc5`*d<V9uLQ*F>1divg458`FuJe
z4X)R#mnc$M);qIJF7^dcgtnqp{@4l&kt!}o<a@d{zxyDOf<wywk4Tk-Mhq$ffs*N%
zKHos{a5%6wolboiQ>CWdC%SmeW|PaN3u%>nm@Z_y-Dd56zq5y<9gjyU8I4Bt`~9BY
zBAr5wce@>Py<U(0bUM+KNF~l@GbZCWHffp`M#6Z=p$1c|_97=%31!}HHyI2Dl!{x9
z3wpU+co6H&@AvxxEDXKiAQ6J~dd)(TBr+ThwfN!jAYfqVd6E1OA+g<V3CQzYmdm9~
zCKGA3T0Dr6Lk$M(8%dD}h1F_BVBH5WC6Z4f0LJ67EEWr~Z-lFX^+1dqY912t{vTPO
vGpmeo)lw=jctsQ#^1LE-p!s}WS9Y~;^VPRZN|E~R00000NkvXXu0mjfH3*0K

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/send_control_record_active@2x.png b/Telegram/Resources/icons/send_control_record_active@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f854549ac5675770634baba8a770f581d514ab09
GIT binary patch
literal 1396
zcmV-)1&jKLP)<h;3K|Lk000e1NJLTq001Na001xu1^@s6c}Lh40004SX+uL$X=7sm
z04R}lk-ba9Kp4iKwo0X~bWlOWAww017K(y6Y8|>1DYb%Cm*kqXLXw6{iWFDD#i8IJ
zy7)EtALuH$DhPrih&cEc__auh?=^)MY45naKc3w4a`znI&*;ps`;vfRIy{$7Nvnl5
zDfo^M%_v3?mYHoWWV0Fc96yiniTaQby?XEKI>JTOW`J*ic$Qh*A)Y7BY&n+TJ>p?j
zmW#wE#BojsB)%28;_;i{lE+_yc|NxY_(e~t)WJ#zvobe`r-);QUS+NGh?_)Ib7h(8
z7_D*G$RUjsBq*q26FM9usG5{ncVDvUTSA3AjJ_6X;N&QwOx`%DRqCoz)ks%q>Zpm_
z|L19IGt*x8NDAnGb=}ViAh-`S>aP2H>bi|HAn*cQn{9uEa+>=lz24Sh$3S!kxV&j=
z$^me-3yeNnGMAfDfR<m=fR77cumB9*1EF;<tJZ&<KLPn|dZIhv@CcZs{n3p-nigl<
z2dx{$00009a7bBm000XT000XT0n*)m`~Uz0s!2paR9Fe!Siwp&F%V9F{t8NqiWiT1
z(iae+DA<dF;!`O49-b_H0>z`Wdhr3gRA_H{@FsfjBq%5ztnHzo`SV2+liBQUx~VAt
zz_OXi%s1c8WW#22j4>{*Un75h4U<nIf3p%=US4Jk3kz&<agoi<%}JQ^^K;g0Hd(9H
zVyCC4S)pai&^E7YY;26z>vf(cwOWmjj*fa^lH7ho5VW$g!f$VH)41q)_#%cROw;`c
z;c5FJqgWvZRqcb6A0f1W%KQ5}H92*(c%X#D0*)l|C8Gj?;X}&nwa42;C6~)lQ=;y|
za0Pe~!mAxBz8H8+lrmA;?KUeE3W+{xldrF@tXM3jxiK$7VjWmO(EDu}0DNM+T4u5N
zW+f9LpC`@AI};(5jJ8tQL+(L@T!}+T1`+y>)&&uARVdUpa6+L~8#tjKtx)I!c99RN
zP*Quck_{r{dO~GOBCC8{_irQQO6FsegpQAoS-0Dj*WuxzPh6^xPs>hDPFSzkW6#ge
z?BL))V{-9nAmTry)9LV`p&{$*PJDi->CAWJ5E=D_9HIys4>>R|EA;a6qS=j%jIfD`
z39VyradBbkSrnYvOhJy};bCpUHy1<_y1u^F6Bx|S&RRMSf1yG#W@ctA$eWuRsY^oC
znSO5KBpNCdgXS<faC)k^yu8%C7DVLOby|IUd*e8Lm=|nRT*n~fFvU1fGA??_#X2(Q
zxi}?Qq;S|9)Iky0rXaUiyDHyD1uB(_>BG;?&bZjzl#{#<;wTNwMx$ZnLT=RwEDfow
zt*u#3P`0+VOh-8$A0OvOM@JD~YCxM@M`&PDL2kuE6M|uHZ_o0@o-{u{Z#wHS*4@s|
zj(l49;lh){7I#Vo7W_=v-{04mpQOGvtLf=!PB+1)r>9s_##2$yhz>HqG6lJili++2
z!o=q0rWqs0*ipB)w<Bwc08wD6W6dCzRtCVx<-o8B!J%5MMo7Vcg<dL^Tp&&xe9=ai
zAcuntY*9i<qyT<(b;WmgcX_#7=980?JfF|Y3uD+Y2cI}eAQMjrq&7A-BKuQZ5+6JE
zo0vA4)pA!zRc>l(D)RREB&R-jn}DTo6Yj}`RN(shI>!d~`1nY3#p>`y3}O{d+TH8#
zhXAoe>@)h8@Y2$fH76E+(68Z4giHpaJf`aP%f$*Hiv0W_wjWjhKSKBS_qw7F4-a}A
zGVp!_M3RW_>gp;Nr1;(49mm+^(~m89QHNB*75fj0ES}>VmiDLs0000<MNUMnLSTaP
C%$i;R

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/send_control_record_active@3x.png b/Telegram/Resources/icons/send_control_record_active@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1406aadc58d9a042e1f744cd535945995dc909da
GIT binary patch
literal 1877
zcmV-b2demqP)<h;3K|Lk000e1NJLTq001@s002k`1^@s6y=?|;0004SX+uL$X=7sm
z04R}lk-ba9Kp4iKwo0X~bWlOWAww017K(y6Y8|>1DYb%Cm*kqXLXw6{iWFDD#i8IJ
zy7)EtALuH$DhPrih&cEc__auh?=^)MY45naKc3w4a`znI&*;ps`;vfRIy{$7Nvnl5
zDfo^M%_v3?mYHoWWV0Fc96yiniTaQby?XEKI>JTOW`J*ic$Qh*A)Y7BY&n+TJ>p?j
zmW#wE#BojsB)%28;_;i{lE+_yc|NxY_(e~t)WJ#zvobe`r-);QUS+NGh?_)Ib7h(8
z7_D*G$RUjsBq*q26FM9usG5{ncVDvUTSA3AjJ_6X;N&QwOx`%DRqCoz)ks%q>Zpm_
z|L19IGt*x8NDAnGb=}ViAh-`S>aP2H>bi|HAn*cQn{9uEa+>=lz24Sh$3S!kxV&j=
z$^me-3yeNnGMAfDfR<m=fR77cumB9*1EF;<tJZ&<KLPn|dZIhv@CcZs{n3p-nigl<
z2dx{$00009a7bBm000XT000XT0n*)m`~Uz2i%CR5RA>e5T01W_K^We{=Nbx>Dhjto
z5D5~ON}&>=!{5-+DqJHGq9YL!*MvqPL0l3Qg`gG`h(zO(m~Wo_z8$k?XLe_2ch5PI
zGs%hBci#7TpJ!%vcFb<fFbqO}zpiBbIz|5l{aRsvq8hP^iVCB<yW8mO>@;d>YK)SS
z5;N8F^Rsbvb!F`B?HOBJTgL6}ZB!J@dkptkD8Kghc5--lNK^}a5ffH^4ksKzxw*My
zZf=fze}AiLVt$B0EHF4?LF>VV6&DwilamuhRJQ^QV1*<un6Ui(d~$YnrmMvf2P|NQ
zATF4&g@pwNxu6DMCRG@2dYya9OE@q?SWxsw?C9voi=%csumg^op0L{5T5Zy*fykjN
zPJ8Fk)6+w9Mq7g9&=%I(+8V7Yir&`Nrkz7uSXEV(c2d>A%F0SrSBGDWS}>1&myeGR
zBRf0WcbuPq&(BXICnv{G2=mnzMi&4E5@jV814aKudn)=*mDq^1u*CLv@N7vLu|(XT
zX<@-9M`96@GGe+*xSy^`iZDL}b$!#qbbC$|m!68EUQx8Ar=ns<rHos`Mhv?R*^YxA
z-h|#E2@@7Na}U7CUP{F0bz2GD+Tw9kuYc``rG&8bh^fv)>c>V52Q$;t(*|D5y}Z1b
z^{5YPeDHL*s_->WTc@U`=xS^)qobqJlUTc_+Lg{ZKUE~;puqQEARQ?OJJ@8v^!Ux;
zAGQHGWcd~N{u3taP5SOw2!4NmAGQt$9&(6;fs?2}gXPceG2C0CQd(LnG8@;|*Frl@
zD75PsZ*FdcVKPonPfyIB2|GAAU`D<oJIbc7d3ZNg4^x;dhl~?_QO|fVVf6hkGxC+D
zrY8Q9)i*XaSe>tAWH3nHtW{rMUl+#7IK^u)=VfDKqiEWai;D|3Z)p}=Jy|dQz)4h~
zf#di?_Wk``<WJ}aD0~2`<8`WR(GdZ`m;Z@;V1rLbM+eKpku|x9;=rBvqxBzQySuxh
z7&10C79Yf}=jZ2zF+q&L<azORa1j-7=ly8?N7%r?fGCE%y}c3HvY*J$A@B_dxQGh4
z^IB}e%F4<JeJ3S~Ba@Sp@qz3bqQm&s0~oRn1Zi*(6>tW3sW3Fm%*=>l$=BBxX=rGO
z4`$bSd3k|9Idc1OrLL~d<RBsk&T*n}{WBF&r%S0Q*0j-wGAS%96oD`s7L?=TV<|>_
z1AJu*g~hF)pnxE^tTZ<_v;0;J{c9J7>xqd883x(j-X@uunIa&YjXp%l(9jUs-`^(>
z4-e)P$CN=GHnhP<l%KaD7jnu9xbps7-6^cRyj*&dBEizql9D(si7dIR9ikQ&7iF4E
zj^HZE;}izR{{DU`AR0C|HwmVQ1T?T6*mQT}$^jf*@{5HbU}R*(6_{>PNqv328@N^*
zFoEq>z|BPz+T_B}w!FOThHtJ^_@}R^sK_gkXFD)}g%#MXfRh(*PhkMq+1YW+W467%
zzM4Cf>gsBhq&6SKU`GKAuOirC*swUk?jvS7uB@zh<z(%bmzU<s+Sk`d@SzuW3|U!O
z<_~q)(1sNazN%$)byX%pWLFagfy2YYsvJW1LvE{+75}OW10Yr+*?ui_H53rJJXSxM
zV1L3O4$qG9@$o2h*f5d9<vAr2WZC@-v!+5zOADEuot18!Z7dZpusZ=Ju&q3rfAxh~
z3DK*AgM;SkDf?&DO&4OY@&Y5k2-!M9`|CF<N?Pc@=mtL2q?=Qtx3^d5x3;!soSvQ<
zIIuZCKNtE0F-9VcCqzezzhw0&UPLf(S_$t+iAPO=dRkZt41zBT=@IkQT`Axk`H0b@
z0Ef)S$47@P3WM#zMiYd3-PP4)o^x0a=)1c+0$bR5;_)JXjzuvNDwux(`xVK|g-!D5
P00000NkvXXu0mjf+4Xmx

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 7240cd0e1..0cc734955 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -59,6 +59,43 @@ enum class FilterType {
 
 } // namespace
 
+class RecordLevel final : public Ui::AbstractButton {
+public:
+	RecordLevel(
+		not_null<Ui::RpWidget*> parent,
+		rpl::producer<> leaveWindowEventProducer);
+
+	void requestPaintColor(float64 progress);
+	void requestPaintProgress(float64 progress);
+	void requestPaintLevel(quint16 level);
+	void reset();
+
+	[[nodiscard]] rpl::producer<bool> actives() const;
+
+	[[nodiscard]] bool inCircle(const QPoint &localPos) const;
+
+private:
+	void init();
+
+	void drawProgress(Painter &p);
+
+	const int _height;
+	const int _center;
+
+	rpl::variable<float64> _showProgress = 0.;
+	rpl::variable<float64> _colorProgress = 0.;
+	rpl::variable<bool> _inCircle = false;
+
+	bool recordingAnimationCallback(crl::time now);
+
+	// This can animate for a very long time (like in music playing),
+	// so it should be a Basic, not a Simple animation.
+	Ui::Animations::Basic _recordingAnimation;
+	anim::value _recordingLevel;
+
+	rpl::lifetime _showingLifetime;
+};
+
 class RecordLock final : public Ui::RpWidget {
 public:
 	RecordLock(not_null<Ui::RpWidget*> parent);
@@ -79,6 +116,149 @@ private:
 	rpl::variable<float64> _progress = 0.;
 };
 
+RecordLevel::RecordLevel(
+	not_null<Ui::RpWidget*> parent,
+	rpl::producer<> leaveWindowEventProducer)
+: AbstractButton(parent)
+, _height(st::historyRecordLevelMaxRadius * 2)
+, _center(_height / 2)
+, _recordingAnimation([=](crl::time now) {
+	return recordingAnimationCallback(now);
+}) {
+	resize(_height, _height);
+	std::move(
+		leaveWindowEventProducer
+	) | rpl::start_with_next([=] {
+		_inCircle = false;
+	}, lifetime());
+	init();
+}
+
+void RecordLevel::requestPaintLevel(quint16 level) {
+	_recordingLevel.start(level);
+	_recordingAnimation.start();
+}
+
+bool RecordLevel::recordingAnimationCallback(crl::time now) {
+	const auto dt = anim::Disabled()
+		? 1.
+		: ((now - _recordingAnimation.started())
+			/ float64(kRecordingUpdateDelta));
+	if (dt >= 1.) {
+		_recordingLevel.finish();
+	} else {
+		_recordingLevel.update(dt, anim::sineInOut);
+	}
+	if (!anim::Disabled()) {
+		update();
+	}
+	return (dt < 1.);
+}
+
+void RecordLevel::init() {
+	shownValue(
+	) | rpl::start_with_next([=](bool shown) {
+	}, lifetime());
+
+	paintRequest(
+	) | rpl::start_with_next([=](const QRect &clip) {
+		Painter p(this);
+
+		drawProgress(p);
+
+		st::historyRecordVoiceActive.paintInCenter(p, rect());
+	}, lifetime());
+
+	_showProgress.changes(
+	) | rpl::map([](auto value) {
+		return value != 0.;
+	}) | rpl::distinct_until_changed(
+	) | rpl::start_with_next([=](bool show) {
+		setVisible(show);
+		setMouseTracking(show);
+		if (!show) {
+			_recordingLevel = anim::value();
+			_recordingAnimation.stop();
+			_showingLifetime.destroy();
+		}
+	}, lifetime());
+
+	actives(
+	) | rpl::distinct_until_changed(
+	) | rpl::start_with_next([=](bool active) {
+		setPointerCursor(active);
+	}, lifetime());
+}
+
+rpl::producer<bool> RecordLevel::actives() const {
+	return events(
+	) | rpl::filter([=](not_null<QEvent*> e) {
+		return (e->type() == QEvent::MouseMove
+			|| e->type() == QEvent::Leave
+			|| e->type() == QEvent::Enter);
+	}) | rpl::map([=](not_null<QEvent*> e) {
+		switch(e->type()) {
+		case QEvent::MouseMove:
+			return inCircle((static_cast<QMouseEvent*>(e.get()))->pos());
+		case QEvent::Leave: return false;
+		case QEvent::Enter: return inCircle(mapFromGlobal(QCursor::pos()));
+		default: return false;
+		}
+	});
+}
+
+bool RecordLevel::inCircle(const QPoint &localPos) const {
+	const auto &radii = st::historyRecordLevelMaxRadius;
+	const auto dx = std::abs(localPos.x() - _center);
+	if (dx > radii) {
+		return false;
+	}
+	const auto dy = std::abs(localPos.y() - _center);
+	if (dy > radii) {
+		return false;
+	} else if (dx + dy <= radii) {
+		return true;
+	}
+	return ((dx * dx + dy * dy) <= (radii * radii));
+}
+
+void RecordLevel::drawProgress(Painter &p) {
+	PainterHighQualityEnabler hq(p);
+	p.setPen(Qt::NoPen);
+	const auto color = anim::color(
+		st::historyRecordSignalColor,
+		st::historyRecordVoiceFgActive,
+		_colorProgress.current());
+	p.setBrush(color);
+
+	const auto progress = _showProgress.current();
+
+	const auto center = QPoint(_center, _center);
+	const int mainRadii = progress * st::historyRecordLevelMainRadius;
+
+	{
+		p.setOpacity(.5);
+		const auto min = progress * st::historyRecordLevelMinRadius;
+		const auto max = progress * st::historyRecordLevelMaxRadius;
+		const auto delta = std::min(_recordingLevel.current() / 0x4000, 1.);
+		const auto radii = qRound(min + (delta * (max - min)));
+		p.drawEllipse(center, radii, radii);
+		p.setOpacity(1.);
+	}
+
+	p.drawEllipse(center, mainRadii, mainRadii);
+}
+
+void RecordLevel::requestPaintProgress(float64 progress) {
+	_showProgress = progress;
+	update();
+}
+
+void RecordLevel::requestPaintColor(float64 progress) {
+	_colorProgress = progress;
+	update();
+}
+
 RecordLock::RecordLock(not_null<Ui::RpWidget*> parent) : RpWidget(parent) {
 	resize(
 		st::historyRecordLockTopShadow.width(),
@@ -222,6 +402,9 @@ VoiceRecordBar::VoiceRecordBar(
 , _controller(controller)
 , _send(send)
 , _lock(std::make_unique<RecordLock>(parent))
+, _level(std::make_unique<RecordLevel>(
+	parent,
+	_controller->widget()->leaveEvents()))
 , _cancelFont(st::historyRecordFont)
 , _recordingAnimation([=](crl::time now) {
 	return recordingAnimationCallback(now);
@@ -264,6 +447,11 @@ void VoiceRecordBar::updateLockGeometry() {
 	_lock->moveToRight(right, _lock->y());
 }
 
+void VoiceRecordBar::updateLevelGeometry() {
+	const auto center = (_send->width() - _level->width()) / 2;
+	_level->moveToRight(st::historySendRight + center, y() + center);
+}
+
 void VoiceRecordBar::init() {
 	hide();
 	// Keep VoiceRecordBar behind SendButton.
@@ -275,6 +463,7 @@ void VoiceRecordBar::init() {
 		}) | rpl::to_empty
 	) | rpl::start_with_next([=] {
 		stackUnder(_send.get());
+		_level->raise();
 	}, lifetime());
 
 	sizeValue(
@@ -298,6 +487,7 @@ void VoiceRecordBar::init() {
 		}
 		updateMessageGeometry();
 		updateLockGeometry();
+		updateLevelGeometry();
 	}, lifetime());
 
 	paintRequest(
@@ -347,27 +537,17 @@ void VoiceRecordBar::init() {
 	) | rpl::start_with_next([=] {
 		installClickOutsideFilter();
 
-		_send->clicks(
-		) | rpl::filter([=] {
-			return _send->type() == Ui::SendButton::Type::Record;
-		}) | rpl::start_with_next([=] {
+		_level->clicks(
+		) | rpl::start_with_next([=] {
 			stop(true);
 		}, _recordingLifetime);
 
-		auto hover = _send->events(
-		) | rpl::filter([=](not_null<QEvent*> e) {
-			return e->type() == QEvent::Enter
-				|| e->type() == QEvent::Leave;
-		}) | rpl::map([=](not_null<QEvent*> e) {
-			return (e->type() == QEvent::Enter);
-		});
-
 		_send->setLockRecord(true);
 		_send->setForceRippled(true);
 		rpl::single(
 			false
 		) | rpl::then(
-			std::move(hover)
+			_level->actives()
 		) | rpl::start_with_next([=](bool enter) {
 			_inField = enter;
 		}, _recordingLifetime);
@@ -398,7 +578,7 @@ void VoiceRecordBar::activeAnimate(bool active) {
 	} else {
 		auto callback = [=] {
 			update(_messageRect);
-			_send->requestPaintRecord(activeAnimationRatio());
+			_level->requestPaintColor(activeAnimationRatio());
 		};
 		const auto from = active ? 0. : 1.;
 		_activeAnimation.start(std::move(callback), from, to, duration);
@@ -410,6 +590,7 @@ void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
 	const auto from = show ? 0. : 1.;
 	const auto duration = st::historyRecordVoiceShowDuration;
 	auto animationCallback = [=, callback = std::move(callback)](auto value) {
+		_level->requestPaintProgress(value);
 		update();
 		if ((show && value == 1.) || (!show && value == 0.)) {
 			if (callback) {
@@ -429,6 +610,7 @@ void VoiceRecordBar::setLockBottom(rpl::producer<int> &&bottom) {
 		bottom
 	) | rpl::start_with_next([=](int value) {
 		_lock->moveToLeft(_lock->x(), value - _lock->height());
+		updateLevelGeometry();
 	}, lifetime());
 }
 
@@ -474,8 +656,12 @@ void VoiceRecordBar::startRecording() {
 		const auto type = e->type();
 		if (type == QEvent::MouseMove) {
 			const auto mouse = static_cast<QMouseEvent*>(e.get());
-			const auto localPos = mapFromGlobal(mouse->globalPos());
-			_inField = rect().contains(localPos);
+			const auto globalPos = mouse->globalPos();
+			const auto localPos = mapFromGlobal(globalPos);
+			const auto inField = rect().contains(localPos);
+			_inField = inField
+				? inField
+				: _level->inCircle(_level->mapFromGlobal(globalPos));
 
 			if (_showLockAnimation.animating()) {
 				return;
@@ -504,6 +690,7 @@ bool VoiceRecordBar::recordingAnimationCallback(crl::time now) {
 }
 
 void VoiceRecordBar::recordUpdated(quint16 level, int samples) {
+	_level->requestPaintLevel(level);
 	_recordingLevel.start(level);
 	_recordingAnimation.start();
 	_recordingSamples = samples;
@@ -698,7 +885,7 @@ void VoiceRecordBar::installClickOutsideFilter() {
 		} else if (type == QEvent::ContextMenu || type == QEvent::Shortcut) {
 			return Type::ShowBox;
 		} else if (type == QEvent::MouseButtonPress) {
-			return (noBox && !_send->underMouse())
+			return (noBox && !_inField.current())
 				? Type::ShowBox
 				: Type::Continue;
 		}
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index dfe60f111..79f08ac60 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -22,6 +22,7 @@ class SessionController;
 
 namespace HistoryView::Controls {
 
+class RecordLevel;
 class RecordLock;
 
 class VoiceRecordBar final : public Ui::RpWidget {
@@ -56,6 +57,7 @@ private:
 
 	void updateMessageGeometry();
 	void updateLockGeometry();
+	void updateLevelGeometry();
 
 	void recordError();
 	void recordUpdated(quint16 level, int samples);
@@ -86,6 +88,7 @@ private:
 	const not_null<Window::SessionController*> _controller;
 	const std::shared_ptr<Ui::SendButton> _send;
 	const std::unique_ptr<RecordLock> _lock;
+	const std::unique_ptr<RecordLevel> _level;
 
 	rpl::event_stream<SendActionUpdate> _sendActionUpdates;
 	rpl::event_stream<VoiceToSend> _sendVoiceRequests;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 0ea46b9eb..743831fb1 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -332,8 +332,8 @@ historyRecordVoiceShowDuration: 120;
 historyRecordVoiceDuration: 120;
 historyRecordVoice: icon {{ "send_control_record", historyRecordVoiceFg }};
 historyRecordVoiceOver: icon {{ "send_control_record", historyRecordVoiceFgOver }};
-historyRecordVoiceActive: icon {{ "send_control_record", historyRecordVoiceFgActive }};
-historyRecordVoiceCancel: icon {{ "send_control_record", attentionButtonFg }};
+historyRecordVoiceActive: icon {{ "send_control_record_active", recordActiveIcon }};
+historyRecordVoiceCancel: icon {{ "send_control_record_active", attentionButtonFg }};
 historyRecordVoiceRippleBgActive: lightButtonBgOver;
 historyRecordVoiceRippleBgCancel: attentionButtonBgRipple;
 historyRecordSignalColor: attentionButtonFg;
@@ -345,6 +345,10 @@ historyRecordFont: font(13px);
 historyRecordDurationSkip: 12px;
 historyRecordDurationFg: historyComposeAreaFg;
 
+historyRecordLevelMainRadius: 37px;
+historyRecordLevelMinRadius: 38px;
+historyRecordLevelMaxRadius: 60px;
+
 historyRecordTextStyle: TextStyle(defaultTextStyle) {
 	font: historyRecordFont;
 }

From cab22c07a5c6a33db8e61c8ed68f1f67ca891d38 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 11 Oct 2020 14:39:43 +0300
Subject: [PATCH 072/370] Replaced recording animation with simple red circle
 animation.

---
 .../history_view_voice_record_bar.cpp         | 71 +++++++++----------
 .../controls/history_view_voice_record_bar.h  | 10 ++-
 Telegram/SourceFiles/ui/chat/chat.style       |  3 +-
 3 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 0cc734955..5724baf44 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -405,10 +405,7 @@ VoiceRecordBar::VoiceRecordBar(
 , _level(std::make_unique<RecordLevel>(
 	parent,
 	_controller->widget()->leaveEvents()))
-, _cancelFont(st::historyRecordFont)
-, _recordingAnimation([=](crl::time now) {
-	return recordingAnimationCallback(now);
-}) {
+, _cancelFont(st::historyRecordFont) {
 	resize(QSize(parent->width(), recorderHeight));
 	init();
 }
@@ -470,8 +467,8 @@ void VoiceRecordBar::init() {
 	) | rpl::start_with_next([=](QSize size) {
 		_centerY = size.height() / 2;
 		{
-			const auto maxD = st::historyRecordSignalMax * 2;
-			const auto point = _centerY - st::historyRecordSignalMax;
+			const auto maxD = st::historyRecordSignalRadius * 2;
+			const auto point = _centerY - st::historyRecordSignalRadius;
 			_redCircleRect = { point, point, maxD, maxD };
 		}
 		{
@@ -494,7 +491,7 @@ void VoiceRecordBar::init() {
 	) | rpl::start_with_next([=](const QRect &clip) {
 		Painter p(this);
 		if (_showAnimation.animating()) {
-			p.setOpacity(_showAnimation.value(1.));
+			p.setOpacity(showAnimationRatio());
 		}
 		p.fillRect(clip, st::historyComposeAreaBg);
 
@@ -502,12 +499,13 @@ void VoiceRecordBar::init() {
 			// The message should be painted first to avoid flickering.
 			drawMessage(p, activeAnimationRatio());
 		}
-		if (clip.intersects(_redCircleRect)) {
-			drawRecording(p);
-		}
 		if (clip.intersects(_durationRect)) {
 			drawDuration(p);
 		}
+		if (clip.intersects(_redCircleRect)) {
+			// Should be the last to be drawn.
+			drawRedCircle(p);
+		}
 	}, lifetime());
 
 	_inField.changes(
@@ -635,6 +633,7 @@ void VoiceRecordBar::startRecording() {
 				// Show the lock widget after the first successful update.
 				*shown = true;
 				_lockShowing = true;
+				startRedCircleAnimation();
 			}
 			recordUpdated(update.level, update.samples);
 		}, [=] {
@@ -673,26 +672,8 @@ void VoiceRecordBar::startRecording() {
 	}, _recordingLifetime);
 }
 
-bool VoiceRecordBar::recordingAnimationCallback(crl::time now) {
-	const auto dt = anim::Disabled()
-		? 1.
-		: ((now - _recordingAnimation.started())
-			/ float64(kRecordingUpdateDelta));
-	if (dt >= 1.) {
-		_recordingLevel.finish();
-	} else {
-		_recordingLevel.update(dt, anim::linear);
-	}
-	if (!anim::Disabled()) {
-		update(_redCircleRect);
-	}
-	return (dt < 1.);
-}
-
 void VoiceRecordBar::recordUpdated(quint16 level, int samples) {
 	_level->requestPaintLevel(level);
-	_recordingLevel.start(level);
-	_recordingAnimation.start();
 	_recordingSamples = samples;
 	if (samples < 0 || samples >= kMaxSamples) {
 		stop(samples > 0 && _inField.current());
@@ -711,8 +692,7 @@ void VoiceRecordBar::stop(bool send) {
 
 		stopRecording(send);
 
-		_recordingLevel = anim::value();
-		_recordingAnimation.stop();
+		_redCircleProgress = 0.;
 
 		_inField = false;
 
@@ -754,17 +734,31 @@ void VoiceRecordBar::drawDuration(Painter &p) {
 	p.drawText(_durationRect, style::al_left, duration);
 }
 
-void VoiceRecordBar::drawRecording(Painter &p) {
+void VoiceRecordBar::startRedCircleAnimation() {
+	if (anim::Disabled()) {
+		return;
+	}
+	const auto animation = _recordingLifetime
+		.make_state<Ui::Animations::Basic>();
+	animation->init([=](crl::time now) {
+		const auto diffTime = now - animation->started();
+		_redCircleProgress = std::abs(std::sin(diffTime / 400.));
+		update(_redCircleRect);
+		return true;
+	});
+	animation->start();
+}
+
+void VoiceRecordBar::drawRedCircle(Painter &p) {
 	PainterHighQualityEnabler hq(p);
 	p.setPen(Qt::NoPen);
 	p.setBrush(st::historyRecordSignalColor);
 
-	const auto min = st::historyRecordSignalMin;
-	const auto max = st::historyRecordSignalMax;
-	const auto delta = std::min(_recordingLevel.current() / 0x4000, 1.);
-	const auto radii = qRound(min + (delta * (max - min)));
+	p.setOpacity(1. - _redCircleProgress);
+	const int radii = st::historyRecordSignalRadius * showAnimationRatio();
 	const auto center = _redCircleRect.center() + QPoint(1, 1);
 	p.drawEllipse(center, radii, radii);
+	p.setOpacity(1.);
 }
 
 void VoiceRecordBar::drawMessage(Painter &p, float64 recordActive) {
@@ -795,7 +789,6 @@ bool VoiceRecordBar::isRecording() const {
 }
 
 void VoiceRecordBar::finishAnimating() {
-	_recordingAnimation.stop();
 	_showAnimation.stop();
 }
 
@@ -829,6 +822,12 @@ float64 VoiceRecordBar::activeAnimationRatio() const {
 	return _activeAnimation.value(_inField.current() ? 1. : 0.);
 }
 
+float64 VoiceRecordBar::showAnimationRatio() const {
+	// There is no reason to set the final value to zero,
+	// because at zero this widget is hidden.
+	return _showAnimation.value(1.);
+}
+
 QString VoiceRecordBar::cancelMessage() const {
 	return _lock->isLocked()
 		? tr::lng_record_lock_cancel(tr::now)
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 79f08ac60..e9d4d67ce 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -70,15 +70,17 @@ private:
 
 	bool showRecordButton() const;
 	void drawDuration(Painter &p);
-	void drawRecording(Painter &p);
+	void drawRedCircle(Painter &p);
 	void drawMessage(Painter &p, float64 recordActive);
 	void updateOverStates(QPoint pos);
 
+	void startRedCircleAnimation();
 	void installClickOutsideFilter();
 
 	bool isTypeRecord() const;
 
 	void activeAnimate(bool active);
+	float64 showAnimationRatio() const;
 	float64 activeAnimationRatio() const;
 
 	void computeAndSetLockProgress(QPoint globalPos);
@@ -105,6 +107,7 @@ private:
 	rpl::variable<bool> _recording = false;
 	rpl::variable<bool> _inField = false;
 	int _recordingSamples = 0;
+	float64 _redCircleProgress = 0.;
 
 	const style::font &_cancelFont;
 
@@ -113,13 +116,8 @@ private:
 	rpl::variable<bool> _lockShowing = false;
 
 	Ui::Animations::Simple _showLockAnimation;
-
-	// This can animate for a very long time (like in music playing),
-	// so it should be a Basic, not a Simple animation.
-	Ui::Animations::Basic _recordingAnimation;
 	Ui::Animations::Simple _activeAnimation;
 	Ui::Animations::Simple _showAnimation;
-	anim::value _recordingLevel;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 743831fb1..f37fead11 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -337,8 +337,7 @@ historyRecordVoiceCancel: icon {{ "send_control_record_active", attentionButtonF
 historyRecordVoiceRippleBgActive: lightButtonBgOver;
 historyRecordVoiceRippleBgCancel: attentionButtonBgRipple;
 historyRecordSignalColor: attentionButtonFg;
-historyRecordSignalMin: 5px;
-historyRecordSignalMax: 12px;
+historyRecordSignalRadius: 5px;
 historyRecordCancel: windowSubTextFg;
 historyRecordCancelActive: windowActiveTextFg;
 historyRecordFont: font(13px);

From 6ed7615653752cefa8e5a07557239507bcb236fd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 11 Oct 2020 14:49:23 +0300
Subject: [PATCH 073/370] Removed redundant methods for record from SendButton.

---
 .../history_view_voice_record_bar.cpp         |  5 ---
 Telegram/SourceFiles/ui/chat/chat.style       |  2 --
 .../SourceFiles/ui/controls/send_button.cpp   | 31 ++-----------------
 .../SourceFiles/ui/controls/send_button.h     |  7 -----
 4 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 5724baf44..d87e563fb 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -540,8 +540,6 @@ void VoiceRecordBar::init() {
 			stop(true);
 		}, _recordingLifetime);
 
-		_send->setLockRecord(true);
-		_send->setForceRippled(true);
 		rpl::single(
 			false
 		) | rpl::then(
@@ -700,9 +698,6 @@ void VoiceRecordBar::stop(bool send) {
 		_recordingSamples = 0;
 		_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice, -1 });
 
-		_send->setForceRippled(false);
-		_send->clearRecordState();
-
 		_controller->widget()->setInnerFocus();
 	};
 	_lockShowing = false;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index f37fead11..bd386eb65 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -333,9 +333,7 @@ historyRecordVoiceDuration: 120;
 historyRecordVoice: icon {{ "send_control_record", historyRecordVoiceFg }};
 historyRecordVoiceOver: icon {{ "send_control_record", historyRecordVoiceFgOver }};
 historyRecordVoiceActive: icon {{ "send_control_record_active", recordActiveIcon }};
-historyRecordVoiceCancel: icon {{ "send_control_record_active", attentionButtonFg }};
 historyRecordVoiceRippleBgActive: lightButtonBgOver;
-historyRecordVoiceRippleBgCancel: attentionButtonBgRipple;
 historyRecordSignalColor: attentionButtonFg;
 historyRecordSignalRadius: 5px;
 historyRecordCancel: windowSubTextFg;
diff --git a/Telegram/SourceFiles/ui/controls/send_button.cpp b/Telegram/SourceFiles/ui/controls/send_button.cpp
index ec9635791..d1c3c3080 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/send_button.cpp
@@ -42,9 +42,6 @@ void SendButton::setType(Type type) {
 		setPointerCursor(_type != Type::Slowmode);
 		update();
 	}
-	if (_type != Type::Record) {
-		clearRecordState();
-	}
 }
 
 void SendButton::setSlowmodeDelay(int seconds) {
@@ -66,26 +63,6 @@ void SendButton::finishAnimating() {
 	update();
 }
 
-void SendButton::requestPaintRecord(float64 progress) {
-	if (_type == Type::Record) {
-		_recordProgress = progress;
-		update();
-	}
-}
-
-void SendButton::setLockRecord(bool lock) {
-	if (_type == Type::Record) {
-		_recordLocked = lock;
-		update();
-	}
-}
-
-void SendButton::clearRecordState() {
-	_recordLocked = false;
-	_recordProgress = 0.;
-	update();
-}
-
 void SendButton::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
@@ -115,12 +92,10 @@ void SendButton::paintEvent(QPaintEvent *e) {
 }
 
 void SendButton::paintRecord(Painter &p, bool over) {
-	const auto recordActive = _recordProgress;
+	const auto recordActive = 0.;
 	if (!isDisabled()) {
 		auto rippleColor = anim::color(
-			_recordLocked
-				? st::historyRecordVoiceRippleBgCancel
-				: st::historyAttachEmoji.ripple.color,
+			st::historyAttachEmoji.ripple.color,
 			st::historyRecordVoiceRippleBgActive,
 			recordActive);
 		paintRipple(
@@ -135,8 +110,6 @@ void SendButton::paintRecord(Painter &p, bool over) {
 			return &st::historyRecordVoice;
 		} else if (recordActive == 1.) {
 			return &st::historyRecordVoiceActive;
-		} else if (_recordLocked) {
-			return &st::historyRecordVoiceCancel;
 		} else if (over) {
 			return &st::historyRecordVoiceOver;
 		}
diff --git a/Telegram/SourceFiles/ui/controls/send_button.h b/Telegram/SourceFiles/ui/controls/send_button.h
index 938a0aa0c..da67bcbf5 100644
--- a/Telegram/SourceFiles/ui/controls/send_button.h
+++ b/Telegram/SourceFiles/ui/controls/send_button.h
@@ -29,13 +29,9 @@ public:
 		return _type;
 	}
 	void setType(Type state);
-	void setLockRecord(bool lock);
-	void clearRecordState();
 	void setSlowmodeDelay(int seconds);
 	void finishAnimating();
 
-	void requestPaintRecord(float64 progress);
-
 protected:
 	void paintEvent(QPaintEvent *e) override;
 
@@ -59,9 +55,6 @@ private:
 
 	Ui::Animations::Simple _a_typeChanged;
 
-	bool _recordLocked = false;
-	float64 _recordProgress = 0.;
-
 	int _slowmodeDelay = 0;
 	QString _slowmodeDelayText;
 

From ad4bf9b5c8f6c509cda2be25f6df43b24cd69c2f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 11 Oct 2020 21:35:09 +0300
Subject: [PATCH 074/370] Improved VoiceRecordBar support in ComposeControls.

---
 .../SourceFiles/history/history_widget.cpp    |  2 +
 .../history_view_compose_controls.cpp         | 36 +++++++++++-
 .../controls/history_view_compose_controls.h  |  5 +-
 .../history_view_voice_record_bar.cpp         | 57 ++++++++++++++-----
 .../controls/history_view_voice_record_bar.h  | 12 +++-
 .../view/history_view_replies_section.cpp     |  8 +++
 .../view/history_view_scheduled_section.cpp   |  8 +++
 7 files changed, 110 insertions(+), 18 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 1ad11462f..f02f1eb31 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -730,6 +730,8 @@ void HistoryWidget::initVoiceRecordBar() {
 		return _replyToId || (_nonEmptySelection && _list);
 	});
 
+	_voiceRecordBar->setSendButtonGeometryValue(_send->geometryValue());
+
 	_voiceRecordBar->startRecordingRequests(
 	) | rpl::start_with_next([=] {
 		const auto error = _peer
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 21c8e5e93..69b8f1fe0 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -494,7 +494,7 @@ MessageToEdit FieldHeader::queryToEdit() {
 }
 
 ComposeControls::ComposeControls(
-	not_null<QWidget*> parent,
+	not_null<Ui::RpWidget*> parent,
 	not_null<Window::SessionController*> window,
 	Mode mode)
 : _parent(parent)
@@ -520,6 +520,7 @@ ComposeControls::ComposeControls(
 		&_window->session().data()))
 , _voiceRecordBar(std::make_unique<VoiceRecordBar>(
 		_wrap.get(),
+		parent,
 		window,
 		_send,
 		st::historySendSize.height()))
@@ -671,6 +672,7 @@ void ComposeControls::showFinished() {
 		_tabbedPanel->hideFast();
 	}
 	updateWrappingVisibility();
+	_voiceRecordBar->orderControls();
 }
 
 void ComposeControls::showForGrab() {
@@ -928,6 +930,30 @@ void ComposeControls::initVoiceRecordBar() {
 		}
 		_voiceRecordBar->startRecording();
 	}, _wrap->lifetime());
+
+	{
+		auto geometry = rpl::merge(
+			_wrap->geometryValue(),
+			_send->geometryValue()
+		) | rpl::map([=](QRect geometry) {
+			auto r = _send->geometry();
+			r.setY(r.y() + _wrap->y());
+			return r;
+		});
+		_voiceRecordBar->setSendButtonGeometryValue(std::move(geometry));
+	}
+
+	{
+		auto bottom = _wrap->geometryValue(
+		) | rpl::map([=](QRect geometry) {
+			return geometry.y() - st::historyRecordLockPosition.y();
+		});
+		_voiceRecordBar->setLockBottom(std::move(bottom));
+	}
+
+	_voiceRecordBar->setEscFilter([=] {
+		return (isEditingMessage() || replyingToMessage());
+	});
 }
 
 void ComposeControls::updateWrappingVisibility() {
@@ -1311,4 +1337,12 @@ FullMsgId ComposeControls::replyingToMessage() const {
 	return _header->replyingToMessage();
 }
 
+bool ComposeControls::isLockPresent() const {
+	return _voiceRecordBar->isLockPresent();
+}
+
+rpl::producer<bool> ComposeControls::lockShowStarts() const {
+	return _voiceRecordBar->lockShowStarts();
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 3d642ab5d..5df22827d 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -78,7 +78,7 @@ public:
 	};
 
 	ComposeControls(
-		not_null<QWidget*> parent,
+		not_null<Ui::RpWidget*> parent,
 		not_null<Window::SessionController*> window,
 		Mode mode);
 	~ComposeControls();
@@ -135,6 +135,9 @@ public:
 	void clear();
 	void hidePanelsAnimated();
 
+	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
+	[[nodiscard]] bool isLockPresent() const;
+
 private:
 	enum class TextUpdateEvent {
 		//SaveDraft = (1 << 0),
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index d87e563fb..78b769c3e 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -156,8 +156,15 @@ bool RecordLevel::recordingAnimationCallback(crl::time now) {
 }
 
 void RecordLevel::init() {
+	const auto hasProgress = [](auto value) { return value != 0.; };
+
+	// Do not allow the widget to be shown from the outside.
 	shownValue(
 	) | rpl::start_with_next([=](bool shown) {
+		const auto shouldShown = hasProgress(_showProgress.current());
+		if (shown != shouldShown) {
+			setVisible(shouldShown);
+		}
 	}, lifetime());
 
 	paintRequest(
@@ -170,9 +177,7 @@ void RecordLevel::init() {
 	}, lifetime());
 
 	_showProgress.changes(
-	) | rpl::map([](auto value) {
-		return value != 0.;
-	}) | rpl::distinct_until_changed(
+	) | rpl::map(hasProgress) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](bool show) {
 		setVisible(show);
 		setMouseTracking(show);
@@ -395,21 +400,31 @@ rpl::producer<> RecordLock::locks() const {
 
 VoiceRecordBar::VoiceRecordBar(
 	not_null<Ui::RpWidget*> parent,
+	not_null<Ui::RpWidget*> sectionWidget,
 	not_null<Window::SessionController*> controller,
 	std::shared_ptr<Ui::SendButton> send,
 	int recorderHeight)
 : RpWidget(parent)
+, _sectionWidget(sectionWidget)
 , _controller(controller)
 , _send(send)
-, _lock(std::make_unique<RecordLock>(parent))
+, _lock(std::make_unique<RecordLock>(sectionWidget))
 , _level(std::make_unique<RecordLevel>(
-	parent,
+	sectionWidget,
 	_controller->widget()->leaveEvents()))
 , _cancelFont(st::historyRecordFont) {
 	resize(QSize(parent->width(), recorderHeight));
 	init();
 }
 
+VoiceRecordBar::VoiceRecordBar(
+	not_null<Ui::RpWidget*> parent,
+	not_null<Window::SessionController*> controller,
+	std::shared_ptr<Ui::SendButton> send,
+	int recorderHeight)
+: VoiceRecordBar(parent, parent, controller, send, recorderHeight) {
+}
+
 VoiceRecordBar::~VoiceRecordBar() {
 	if (isRecording()) {
 		stopRecording(false);
@@ -444,11 +459,6 @@ void VoiceRecordBar::updateLockGeometry() {
 	_lock->moveToRight(right, _lock->y());
 }
 
-void VoiceRecordBar::updateLevelGeometry() {
-	const auto center = (_send->width() - _level->width()) / 2;
-	_level->moveToRight(st::historySendRight + center, y() + center);
-}
-
 void VoiceRecordBar::init() {
 	hide();
 	// Keep VoiceRecordBar behind SendButton.
@@ -459,8 +469,7 @@ void VoiceRecordBar::init() {
 			return e->type() == QEvent::ZOrderChange;
 		}) | rpl::to_empty
 	) | rpl::start_with_next([=] {
-		stackUnder(_send.get());
-		_level->raise();
+		orderControls();
 	}, lifetime());
 
 	sizeValue(
@@ -484,7 +493,6 @@ void VoiceRecordBar::init() {
 		}
 		updateMessageGeometry();
 		updateLockGeometry();
-		updateLevelGeometry();
 	}, lifetime());
 
 	paintRequest(
@@ -606,7 +614,16 @@ void VoiceRecordBar::setLockBottom(rpl::producer<int> &&bottom) {
 		bottom
 	) | rpl::start_with_next([=](int value) {
 		_lock->moveToLeft(_lock->x(), value - _lock->height());
-		updateLevelGeometry();
+	}, lifetime());
+}
+
+void VoiceRecordBar::setSendButtonGeometryValue(
+		rpl::producer<QRect> &&geometry) {
+	std::move(
+		geometry
+	) | rpl::start_with_next([=](QRect r) {
+		const auto center = (r.width() - _level->width()) / 2;
+		_level->moveToLeft(r.x() + center, r.y() + center);
 	}, lifetime());
 }
 
@@ -660,7 +677,7 @@ void VoiceRecordBar::startRecording() {
 				? inField
 				: _level->inCircle(_level->mapFromGlobal(globalPos));
 
-			if (_showLockAnimation.animating()) {
+			if (_showLockAnimation.animating() || !hasDuration()) {
 				return;
 			}
 			computeAndSetLockProgress(mouse->globalPos());
@@ -813,6 +830,10 @@ bool VoiceRecordBar::isTypeRecord() const {
 	return (_send->type() == Ui::SendButton::Type::Record);
 }
 
+bool VoiceRecordBar::hasDuration() const {
+	return _recordingSamples > 0;
+}
+
 float64 VoiceRecordBar::activeAnimationRatio() const {
 	return _activeAnimation.value(_inField.current() ? 1. : 0.);
 }
@@ -837,6 +858,12 @@ void VoiceRecordBar::computeAndSetLockProgress(QPoint globalPos) {
 	_lock->requestPaintProgress(std::clamp(progress, 0., 1.));
 }
 
+void VoiceRecordBar::orderControls() {
+	stackUnder(_send.get());
+	_level->raise();
+	_lock->raise();
+}
+
 void VoiceRecordBar::installClickOutsideFilter() {
 	const auto box = _recordingLifetime.make_state<QPointer<ConfirmBox>>();
 	const auto showBox = [=] {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index e9d4d67ce..bd1b95356 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -30,6 +30,12 @@ public:
 	using SendActionUpdate = Controls::SendActionUpdate;
 	using VoiceToSend = Controls::VoiceToSend;
 
+	VoiceRecordBar(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Ui::RpWidget*> sectionWidget,
+		not_null<Window::SessionController*> controller,
+		std::shared_ptr<Ui::SendButton> send,
+		int recorderHeight);
 	VoiceRecordBar(
 		not_null<Ui::RpWidget*> parent,
 		not_null<Window::SessionController*> controller,
@@ -40,6 +46,8 @@ public:
 	void startRecording();
 	void finishAnimating();
 
+	void orderControls();
+
 	[[nodiscard]] rpl::producer<SendActionUpdate> sendActionUpdates() const;
 	[[nodiscard]] rpl::producer<VoiceToSend> sendVoiceRequests() const;
 	[[nodiscard]] rpl::producer<bool> recordingStateChanges() const;
@@ -47,6 +55,7 @@ public:
 	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
 
 	void setLockBottom(rpl::producer<int> &&bottom);
+	void setSendButtonGeometryValue(rpl::producer<QRect> &&geometry);
 	void setEscFilter(Fn<bool()> &&callback);
 
 	[[nodiscard]] bool isRecording() const;
@@ -57,7 +66,6 @@ private:
 
 	void updateMessageGeometry();
 	void updateLockGeometry();
-	void updateLevelGeometry();
 
 	void recordError();
 	void recordUpdated(quint16 level, int samples);
@@ -78,6 +86,7 @@ private:
 	void installClickOutsideFilter();
 
 	bool isTypeRecord() const;
+	bool hasDuration() const;
 
 	void activeAnimate(bool active);
 	float64 showAnimationRatio() const;
@@ -87,6 +96,7 @@ private:
 
 	QString cancelMessage() const;
 
+	const not_null<Ui::RpWidget*> _sectionWidget;
 	const not_null<Window::SessionController*> _controller;
 	const std::shared_ptr<Ui::SendButton> _send;
 	const std::unique_ptr<RecordLock> _lock;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index b3170d8cf..af7297e63 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -507,6 +507,11 @@ void RepliesWidget::setupComposeControls() {
 		Unexpected("action in MimeData hook.");
 	});
 
+	_composeControls->lockShowStarts(
+	) | rpl::start_with_next([=] {
+		updateScrollDownVisibility();
+	}, lifetime());
+
 	_composeControls->finishAnimating();
 }
 
@@ -1213,6 +1218,9 @@ void RepliesWidget::updateScrollDownVisibility() {
 	}
 
 	const auto scrollDownIsVisible = [&]() -> std::optional<bool> {
+		if (_composeControls->isLockPresent()) {
+			return false;
+		}
 		const auto top = _scroll->scrollTop() + st::historyToDownShownAfter;
 		if (top < _scroll->scrollTopMax() || _replyReturn) {
 			return true;
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 0afcc8d93..4367b4d5c 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -253,6 +253,11 @@ void ScheduledWidget::setupComposeControls() {
 		}
 		Unexpected("action in MimeData hook.");
 	});
+
+	_composeControls->lockShowStarts(
+	) | rpl::start_with_next([=] {
+		updateScrollDownVisibility();
+	}, lifetime());
 }
 
 void ScheduledWidget::chooseAttach() {
@@ -820,6 +825,9 @@ void ScheduledWidget::updateScrollDownVisibility() {
 	}
 
 	const auto scrollDownIsVisible = [&]() -> std::optional<bool> {
+		if (_composeControls->isLockPresent()) {
+			return false;
+		}
 		const auto top = _scroll->scrollTop() + st::historyToDownShownAfter;
 		if (top < _scroll->scrollTopMax()) {
 			return true;

From 57eb4f8234995eab3b82588f3bf34c9ad0691a70 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 12 Oct 2020 14:45:48 +0300
Subject: [PATCH 075/370] Disabled drag'n'drop area when user is recording
 voice message.

---
 Telegram/SourceFiles/history/history_widget.cpp             | 2 +-
 .../history/view/controls/history_view_compose_controls.cpp | 6 +++++-
 .../history/view/controls/history_view_compose_controls.h   | 1 +
 .../history/view/history_view_replies_section.cpp           | 2 +-
 .../history/view/history_view_scheduled_section.cpp         | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index f02f1eb31..83c81180f 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -368,7 +368,7 @@ HistoryWidget::HistoryWidget(
 	_attachDragAreas = DragArea::SetupDragAreaToContainer(
 		this,
 		crl::guard(this, [=](not_null<const QMimeData*> d) {
-			return _history && _canSendMessages;
+			return _history && _canSendMessages && !isRecording();
 		}),
 		crl::guard(this, [=](bool f) { _field->setAcceptDrops(f); }),
 		crl::guard(this, [=] { updateControlsGeometry(); }));
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 69b8f1fe0..3bd0d458d 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -580,7 +580,7 @@ int ComposeControls::heightCurrent() const {
 }
 
 bool ComposeControls::focus() {
-	if (_voiceRecordBar->isRecording()) {
+	if (isRecording()) {
 		return false;
 	}
 	_field->setFocus();
@@ -1345,4 +1345,8 @@ rpl::producer<bool> ComposeControls::lockShowStarts() const {
 	return _voiceRecordBar->lockShowStarts();
 }
 
+bool ComposeControls::isRecording() const {
+	return _voiceRecordBar->isRecording();
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 5df22827d..926e3da32 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -137,6 +137,7 @@ public:
 
 	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
 	[[nodiscard]] bool isLockPresent() const;
+	[[nodiscard]] bool isRecording() const;
 
 private:
 	enum class TextUpdateEvent {
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index af7297e63..c10451a42 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1761,7 +1761,7 @@ void RepliesWidget::clearSelected() {
 void RepliesWidget::setupDragArea() {
 	const auto areas = DragArea::SetupDragAreaToContainer(
 		this,
-		[=](not_null<const QMimeData*> d) { return _history; },
+		[=](auto d) { return _history && !_composeControls->isRecording(); },
 		nullptr,
 		[=] { updateControlsGeometry(); });
 
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 4367b4d5c..4465ac2ff 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -1188,7 +1188,7 @@ void ScheduledWidget::clearSelected() {
 void ScheduledWidget::setupDragArea() {
 	const auto areas = DragArea::SetupDragAreaToContainer(
 		this,
-		[=](not_null<const QMimeData*> d) { return _history; },
+		[=](auto d) { return _history && !_composeControls->isRecording(); },
 		nullptr,
 		[=] { updateControlsGeometry(); });
 

From 367b487a6ce383483fa9c581e20ddbde869bb359 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 12 Oct 2020 17:40:37 +0300
Subject: [PATCH 076/370] Prettified fast locking of voice record.

---
 .../history_view_voice_record_bar.cpp         | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 78b769c3e..17a7f8061 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -110,8 +110,11 @@ private:
 	void init();
 
 	void drawProgress(Painter &p);
+	void setProgress(float64 progress);
+	void startLockingAnimation(float64 to);
 
 	Ui::Animations::Simple _lockAnimation;
+	Ui::Animations::Simple _lockEnderAnimation;
 
 	rpl::variable<float64> _progress = 0.;
 };
@@ -381,10 +384,24 @@ void RecordLock::drawProgress(Painter &p) {
 	}
 }
 
+void RecordLock::startLockingAnimation(float64 to) {
+	auto callback = [=](auto value) { setProgress(value); };
+	const auto duration = st::historyRecordVoiceShowDuration;
+	_lockEnderAnimation.start(std::move(callback), 0., to, duration);
+}
+
 void RecordLock::requestPaintProgress(float64 progress) {
-	if (isHidden() || isLocked()) {
+	if (isHidden() || isLocked() || _lockEnderAnimation.animating()) {
 		return;
 	}
+	if (!_progress.current() && (progress > .3)) {
+		startLockingAnimation(progress);
+		return;
+	}
+	setProgress(progress);
+}
+
+void RecordLock::setProgress(float64 progress) {
 	_progress = progress;
 	update();
 }

From 041d8571c21b7f92c8150fa238d284e374d39dd9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 12 Oct 2020 19:52:41 +0300
Subject: [PATCH 077/370] Added delay for start recording voice message.

---
 .../SourceFiles/history/history_widget.cpp    | 11 +++--
 .../history_view_compose_controls.cpp         | 11 +++--
 .../history_view_voice_record_bar.cpp         | 43 +++++++++++++------
 .../controls/history_view_voice_record_bar.h  |  6 ++-
 4 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 83c81180f..67107ad19 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -732,19 +732,18 @@ void HistoryWidget::initVoiceRecordBar() {
 
 	_voiceRecordBar->setSendButtonGeometryValue(_send->geometryValue());
 
-	_voiceRecordBar->startRecordingRequests(
-	) | rpl::start_with_next([=] {
+	_voiceRecordBar->setStartRecordingFilter([=] {
 		const auto error = _peer
 			? Data::RestrictionError(_peer, ChatRestriction::f_send_media)
 			: std::nullopt;
 		if (error) {
 			Ui::show(Box<InformBox>(*error));
-			return;
+			return true;
 		} else if (showSlowmodeError()) {
-			return;
+			return true;
 		}
-		_voiceRecordBar->startRecording();
-	}, lifetime());
+		return false;
+	});
 
 	_voiceRecordBar->sendActionUpdates(
 	) | rpl::start_with_next([=](const auto &data) {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 3bd0d458d..901e31e45 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -915,8 +915,7 @@ void ComposeControls::initVoiceRecordBar() {
 		_field->setVisible(!active);
 	}, _wrap->lifetime());
 
-	_voiceRecordBar->startRecordingRequests(
-	) | rpl::start_with_next([=] {
+	_voiceRecordBar->setStartRecordingFilter([=] {
 		const auto error = _history
 			? Data::RestrictionError(
 				_history->peer,
@@ -924,12 +923,12 @@ void ComposeControls::initVoiceRecordBar() {
 			: std::nullopt;
 		if (error) {
 			Ui::show(Box<InformBox>(*error));
-			return;
+			return true;
 		} else if (_showSlowmodeError && _showSlowmodeError()) {
-			return;
+			return true;
 		}
-		_voiceRecordBar->startRecording();
-	}, _wrap->lifetime());
+		return false;
+	});
 
 	{
 		auto geometry = rpl::merge(
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 17a7f8061..5cee3c4ed 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -429,6 +429,7 @@ VoiceRecordBar::VoiceRecordBar(
 , _level(std::make_unique<RecordLevel>(
 	sectionWidget,
 	_controller->widget()->leaveEvents()))
+, _startTimer([=] { startRecording(); })
 , _cancelFont(st::historyRecordFont) {
 	resize(QSize(parent->width(), recorderHeight));
 	init();
@@ -589,6 +590,25 @@ void VoiceRecordBar::init() {
 		updateMessageGeometry();
 		update(_messageRect);
 	}, lifetime());
+
+	_send->events(
+	) | rpl::filter([=](not_null<QEvent*> e) {
+		return isTypeRecord()
+			&& !isRecording()
+			&& !_showAnimation.animating()
+			&& !_lock->isLocked()
+			&& (e->type() == QEvent::MouseButtonPress
+				|| e->type() == QEvent::MouseButtonRelease);
+	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::MouseButtonPress) {
+			if (_startRecordingFilter && _startRecordingFilter()) {
+				return;
+			}
+			_startTimer.callOnce(st::historyRecordVoiceShowDuration);
+		} else if (e->type() == QEvent::MouseButtonRelease) {
+			_startTimer.cancel();
+		}
+	}, lifetime());
 }
 
 void VoiceRecordBar::activeAnimate(bool active) {
@@ -626,6 +646,10 @@ void VoiceRecordBar::setEscFilter(Fn<bool()> &&callback) {
 	_escFilter = std::move(callback);
 }
 
+void VoiceRecordBar::setStartRecordingFilter(Fn<bool()> &&callback) {
+	_startRecordingFilter = std::move(callback);
+}
+
 void VoiceRecordBar::setLockBottom(rpl::producer<int> &&bottom) {
 	std::move(
 		bottom
@@ -645,8 +669,13 @@ void VoiceRecordBar::setSendButtonGeometryValue(
 }
 
 void VoiceRecordBar::startRecording() {
+	if (isRecording()) {
+		return;
+	}
 	auto appearanceCallback = [=] {
-		Expects(!_showAnimation.animating());
+		if(_showAnimation.animating()) {
+			return;
+		}
 
 		using namespace ::Media::Capture;
 		if (!instance()->available()) {
@@ -717,7 +746,7 @@ void VoiceRecordBar::recordUpdated(quint16 level, int samples) {
 
 void VoiceRecordBar::stop(bool send) {
 	auto disappearanceCallback = [=] {
-		Expects(!_showAnimation.animating());
+		_showAnimation.stop();
 
 		hide();
 		_recording = false;
@@ -833,16 +862,6 @@ bool VoiceRecordBar::isLockPresent() const {
 	return _lockShowing.current();
 }
 
-rpl::producer<> VoiceRecordBar::startRecordingRequests() const {
-	return _send->events(
-	) | rpl::filter([=](not_null<QEvent*> e) {
-		return isTypeRecord()
-			&& !_showAnimation.animating()
-			&& !_lock->isLocked()
-			&& (e->type() == QEvent::MouseButtonPress);
-	}) | rpl::to_empty;
-}
-
 bool VoiceRecordBar::isTypeRecord() const {
 	return (_send->type() == Ui::SendButton::Type::Record);
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index bd1b95356..5e592b595 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "api/api_common.h"
+#include "base/timer.h"
 #include "history/view/controls/compose_controls_common.h"
 #include "ui/effects/animations.h"
 #include "ui/rp_widget.h"
@@ -51,12 +52,12 @@ public:
 	[[nodiscard]] rpl::producer<SendActionUpdate> sendActionUpdates() const;
 	[[nodiscard]] rpl::producer<VoiceToSend> sendVoiceRequests() const;
 	[[nodiscard]] rpl::producer<bool> recordingStateChanges() const;
-	[[nodiscard]] rpl::producer<> startRecordingRequests() const;
 	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
 
 	void setLockBottom(rpl::producer<int> &&bottom);
 	void setSendButtonGeometryValue(rpl::producer<QRect> &&geometry);
 	void setEscFilter(Fn<bool()> &&callback);
+	void setStartRecordingFilter(Fn<bool()> &&callback);
 
 	[[nodiscard]] bool isRecording() const;
 	[[nodiscard]] bool isLockPresent() const;
@@ -102,6 +103,8 @@ private:
 	const std::unique_ptr<RecordLock> _lock;
 	const std::unique_ptr<RecordLevel> _level;
 
+	base::Timer _startTimer;
+
 	rpl::event_stream<SendActionUpdate> _sendActionUpdates;
 	rpl::event_stream<VoiceToSend> _sendVoiceRequests;
 
@@ -113,6 +116,7 @@ private:
 	Ui::Text::String _message;
 
 	Fn<bool()> _escFilter;
+	Fn<bool()> _startRecordingFilter;
 
 	rpl::variable<bool> _recording = false;
 	rpl::variable<bool> _inField = false;

From b3925a3bec8163d03c57763da3a774dac94fa31e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 12 Oct 2020 22:30:14 +0300
Subject: [PATCH 078/370] Added touchbar hiding while recording voice message.

---
 .../SourceFiles/media/audio/media_audio_capture.cpp   |  5 +++++
 .../SourceFiles/media/audio/media_audio_capture.h     |  5 +++++
 .../platform/mac/touchbar/mac_touchbar_manager.mm     | 11 ++++++++---
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
index 20795f14a..06df89bb2 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
@@ -96,6 +96,9 @@ void Instance::start() {
 				_updates.fire_error({});
 			});
 		});
+		crl::on_main(this, [=] {
+			_started = true;
+		});
 	});
 }
 
@@ -103,11 +106,13 @@ void Instance::stop(Fn<void(Result&&)> callback) {
 	InvokeQueued(_inner.get(), [=] {
 		if (!callback) {
 			_inner->stop();
+			crl::on_main(this, [=] { _started = false; });
 			return;
 		}
 		_inner->stop([=](Result &&result) {
 			crl::on_main([=, result = std::move(result)]() mutable {
 				callback(std::move(result));
+				_started = false;
 			});
 		});
 	});
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.h b/Telegram/SourceFiles/media/audio/media_audio_capture.h
index 10ad66abc..a6db3606b 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.h
@@ -42,6 +42,10 @@ public:
 		return _updates.events();
 	}
 
+	[[nodiscard]] rpl::producer<bool> startedChanges() const {
+		return _started.changes();
+	}
+
 	void start();
 	void stop(Fn<void(Result&&)> callback = nullptr);
 
@@ -50,6 +54,7 @@ private:
 	friend class Inner;
 
 	bool _available = false;
+	rpl::variable<bool> _started = false;;
 	rpl::event_stream<Update, rpl::empty_error> _updates;
 	QThread _thread;
 	std::unique_ptr<Inner> _inner;
diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
index c26850176..2136d6783 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.mm
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_domain.h"
 #include "main/main_session.h"
 #include "mainwidget.h" // MainWidget::closeBothPlayers
+#include "media/audio/media_audio_capture.h"
 #include "media/player/media_player_instance.h"
 #include "platform/mac/touchbar/mac_touchbar_audio.h"
 #include "platform/mac/touchbar/mac_touchbar_common.h"
@@ -91,20 +92,24 @@ const auto kAudioItemIdentifier = @"touchbarAudio";
 		Media::Player::instance()->startsPlay(type) | rpl::map_to(true)
 	);
 
+	auto voiceRecording = ::Media::Capture::instance()->startedChanges();
+
 	rpl::combine(
 		std::move(sessionChanges),
 		rpl::single(false) | rpl::then(Core::App().passcodeLockChanges()),
-		rpl::single(false) | rpl::then(std::move(audioPlayer))
+		rpl::single(false) | rpl::then(std::move(audioPlayer)),
+		rpl::single(false) | rpl::then(std::move(voiceRecording))
 	) | rpl::start_with_next([=](
 			Main::Session *session,
 			bool lock,
-			bool audio) {
+			bool audio,
+			bool recording) {
 		TouchBar::CustomEnterToCocoaEventLoop([=] {
 			_touchBarSwitches.fire({});
 			if (!audio) {
 				self.defaultItemIdentifiers = @[];
 			}
-			self.defaultItemIdentifiers = lock
+			self.defaultItemIdentifiers = (lock || recording)
 				? @[]
 				: audio
 				? @[kAudioItemIdentifier]

From cb84e70bdceb8543bcb4c190368f03a63ff65d9b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 14 Oct 2020 02:48:10 +0300
Subject: [PATCH 079/370] Improved display management of voice record controls.

---
 .../SourceFiles/history/history_widget.cpp    | 37 ++++++----
 Telegram/SourceFiles/history/history_widget.h |  1 +
 .../history_view_compose_controls.cpp         |  6 ++
 .../history_view_voice_record_bar.cpp         | 69 ++++++++++---------
 .../controls/history_view_voice_record_bar.h  |  7 +-
 5 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 67107ad19..2599b63ca 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -776,6 +776,8 @@ void HistoryWidget::initVoiceRecordBar() {
 		updateHistoryDownVisibility();
 		updateUnreadMentionsVisibility();
 	}, lifetime());
+
+	_voiceRecordBar->hideFast();
 }
 
 void HistoryWidget::initTabbedSelector() {
@@ -2063,13 +2065,7 @@ void HistoryWidget::updateControlsVisibility() {
 	updateHistoryDownVisibility();
 	updateUnreadMentionsVisibility();
 	if (!_history || _a_show.animating()) {
-		if (_tabbedPanel) {
-			_tabbedPanel->hideFast();
-		}
-		if (_pinnedBar) {
-			_pinnedBar->hide();
-		}
-		hideChildren();
+		hideChildWidgets();
 		return;
 	}
 
@@ -2140,6 +2136,9 @@ void HistoryWidget::updateControlsVisibility() {
 		if (_tabbedPanel) {
 			_tabbedPanel->hide();
 		}
+		if (_voiceRecordBar) {
+			_voiceRecordBar->hideFast();
+		}
 		if (_inlineResults) {
 			_inlineResults->hide();
 		}
@@ -2231,6 +2230,9 @@ void HistoryWidget::updateControlsVisibility() {
 		if (_tabbedPanel) {
 			_tabbedPanel->hide();
 		}
+		if (_voiceRecordBar) {
+			_voiceRecordBar->hideFast();
+		}
 		if (_inlineResults) {
 			_inlineResults->hide();
 		}
@@ -3005,6 +3007,19 @@ void HistoryWidget::saveEditMsg() {
 		fail);
 }
 
+void HistoryWidget::hideChildWidgets() {
+	if (_tabbedPanel) {
+		_tabbedPanel->hideFast();
+	}
+	if (_pinnedBar) {
+		_pinnedBar->hide();
+	}
+	if (_voiceRecordBar) {
+		_voiceRecordBar->hideFast();
+	}
+	hideChildren();
+}
+
 void HistoryWidget::hideSelectorControlsAnimated() {
 	_fieldAutocomplete->hideAnimated();
 	if (_supportAutocomplete) {
@@ -3212,13 +3227,7 @@ void HistoryWidget::showAnimated(
 
 	_cacheOver = controller()->content()->grabForShowAnimation(params);
 
-	if (_tabbedPanel) {
-		_tabbedPanel->hideFast();
-	}
-	if (_pinnedBar) {
-		_pinnedBar->hide();
-	}
-	hideChildren();
+	hideChildWidgets();
 	if (params.withTopBarShadow) _topShadow->show();
 
 	if (_showDirection == Window::SlideDirection::FromLeft) {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index b7956ec7c..57c964f03 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -456,6 +456,7 @@ private:
 	bool replyToNextMessage();
 	[[nodiscard]] bool showSlowmodeError();
 
+	void hideChildWidgets();
 	void hideSelectorControlsAnimated();
 	int countMembersDropdownHeightMax() const;
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 901e31e45..ba9062365 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -660,6 +660,9 @@ void ComposeControls::showStarted() {
 	if (_tabbedPanel) {
 		_tabbedPanel->hideFast();
 	}
+	if (_voiceRecordBar) {
+		_voiceRecordBar->hideFast();
+	}
 	_wrap->hide();
 	_writeRestricted->hide();
 }
@@ -671,6 +674,9 @@ void ComposeControls::showFinished() {
 	if (_tabbedPanel) {
 		_tabbedPanel->hideFast();
 	}
+	if (_voiceRecordBar) {
+		_voiceRecordBar->hideFast();
+	}
 	updateWrappingVisibility();
 	_voiceRecordBar->orderControls();
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 5cee3c4ed..48e328ea0 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -68,7 +68,6 @@ public:
 	void requestPaintColor(float64 progress);
 	void requestPaintProgress(float64 progress);
 	void requestPaintLevel(quint16 level);
-	void reset();
 
 	[[nodiscard]] rpl::producer<bool> actives() const;
 
@@ -101,7 +100,6 @@ public:
 	RecordLock(not_null<Ui::RpWidget*> parent);
 
 	void requestPaintProgress(float64 progress);
-	void reset();
 
 	[[nodiscard]] rpl::producer<> locks() const;
 	[[nodiscard]] bool isLocked() const;
@@ -161,26 +159,19 @@ bool RecordLevel::recordingAnimationCallback(crl::time now) {
 void RecordLevel::init() {
 	const auto hasProgress = [](auto value) { return value != 0.; };
 
-	// Do not allow the widget to be shown from the outside.
-	shownValue(
-	) | rpl::start_with_next([=](bool shown) {
-		const auto shouldShown = hasProgress(_showProgress.current());
-		if (shown != shouldShown) {
-			setVisible(shouldShown);
-		}
-	}, lifetime());
-
 	paintRequest(
 	) | rpl::start_with_next([=](const QRect &clip) {
 		Painter p(this);
 
 		drawProgress(p);
 
+		p.setOpacity(_showProgress.current());
 		st::historyRecordVoiceActive.paintInCenter(p, rect());
 	}, lifetime());
 
-	_showProgress.changes(
-	) | rpl::map(hasProgress) | rpl::distinct_until_changed(
+	rpl::merge(
+		shownValue(),
+		_showProgress.value() | rpl::map(hasProgress)
 	) | rpl::start_with_next([=](bool show) {
 		setVisible(show);
 		setMouseTracking(show);
@@ -188,6 +179,7 @@ void RecordLevel::init() {
 			_recordingLevel = anim::value();
 			_recordingAnimation.stop();
 			_showingLifetime.destroy();
+			_showProgress = 0.;
 		}
 	}, lifetime());
 
@@ -281,6 +273,7 @@ void RecordLock::init() {
 	) | rpl::start_with_next([=](bool shown) {
 		if (!shown) {
 			_lockAnimation.stop();
+			_lockEnderAnimation.stop();
 			_progress = 0.;
 		}
 	}, lifetime());
@@ -433,6 +426,7 @@ VoiceRecordBar::VoiceRecordBar(
 , _cancelFont(st::historyRecordFont) {
 	resize(QSize(parent->width(), recorderHeight));
 	init();
+	hideFast();
 }
 
 VoiceRecordBar::VoiceRecordBar(
@@ -478,7 +472,6 @@ void VoiceRecordBar::updateLockGeometry() {
 }
 
 void VoiceRecordBar::init() {
-	hide();
 	// Keep VoiceRecordBar behind SendButton.
 	rpl::single(
 	) | rpl::then(
@@ -490,6 +483,13 @@ void VoiceRecordBar::init() {
 		orderControls();
 	}, lifetime());
 
+	shownValue(
+	) | rpl::start_with_next([=](bool show) {
+		if (!show) {
+			finish();
+		}
+	}, lifetime());
+
 	sizeValue(
 	) | rpl::start_with_next([=](QSize size) {
 		_centerY = size.height() / 2;
@@ -556,7 +556,6 @@ void VoiceRecordBar::init() {
 		_showLockAnimation.start(std::move(callback), from, to, duration);
 	}, lifetime());
 
-	_lock->hide();
 	_lock->locks(
 	) | rpl::start_with_next([=] {
 		installClickOutsideFilter();
@@ -746,27 +745,35 @@ void VoiceRecordBar::recordUpdated(quint16 level, int samples) {
 
 void VoiceRecordBar::stop(bool send) {
 	auto disappearanceCallback = [=] {
-		_showAnimation.stop();
-
 		hide();
-		_recording = false;
 
 		stopRecording(send);
-
-		_redCircleProgress = 0.;
-
-		_inField = false;
-
-		_recordingLifetime.destroy();
-		_recordingSamples = 0;
-		_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice, -1 });
-
-		_controller->widget()->setInnerFocus();
 	};
 	_lockShowing = false;
 	visibilityAnimate(false, std::move(disappearanceCallback));
 }
 
+void VoiceRecordBar::finish() {
+	_recordingLifetime.destroy();
+	_lockShowing = false;
+	_recording = false;
+	_inField = false;
+	_redCircleProgress = 0.;
+	_recordingSamples = 0;
+
+	_showAnimation.stop();
+
+	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice, -1 });
+	_controller->widget()->setInnerFocus();
+}
+
+void VoiceRecordBar::hideFast() {
+	hide();
+	_lock->hide();
+	_level->hide();
+	stopRecording(false);
+}
+
 void VoiceRecordBar::stopRecording(bool send) {
 	using namespace ::Media::Capture;
 	if (!send) {
@@ -880,12 +887,6 @@ float64 VoiceRecordBar::showAnimationRatio() const {
 	return _showAnimation.value(1.);
 }
 
-QString VoiceRecordBar::cancelMessage() const {
-	return _lock->isLocked()
-		? tr::lng_record_lock_cancel(tr::now)
-		: tr::lng_record_cancel(tr::now);
-}
-
 void VoiceRecordBar::computeAndSetLockProgress(QPoint globalPos) {
 	const auto localPos = mapFromGlobal(globalPos);
 	const auto lower = _lock->height();
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 5e592b595..a70a0e4db 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -46,6 +46,7 @@ public:
 
 	void startRecording();
 	void finishAnimating();
+	void hideFast();
 
 	void orderControls();
 
@@ -68,7 +69,6 @@ private:
 	void updateMessageGeometry();
 	void updateLockGeometry();
 
-	void recordError();
 	void recordUpdated(quint16 level, int samples);
 
 	bool recordingAnimationCallback(crl::time now);
@@ -81,7 +81,6 @@ private:
 	void drawDuration(Painter &p);
 	void drawRedCircle(Painter &p);
 	void drawMessage(Painter &p, float64 recordActive);
-	void updateOverStates(QPoint pos);
 
 	void startRedCircleAnimation();
 	void installClickOutsideFilter();
@@ -89,14 +88,14 @@ private:
 	bool isTypeRecord() const;
 	bool hasDuration() const;
 
+	void finish();
+
 	void activeAnimate(bool active);
 	float64 showAnimationRatio() const;
 	float64 activeAnimationRatio() const;
 
 	void computeAndSetLockProgress(QPoint globalPos);
 
-	QString cancelMessage() const;
-
 	const not_null<Ui::RpWidget*> _sectionWidget;
 	const not_null<Window::SessionController*> _controller;
 	const std::shared_ptr<Ui::SendButton> _send;

From 7a32d7868972e337ea9c989dba2642c6e956d612 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 15 Oct 2020 21:58:02 +0300
Subject: [PATCH 080/370] Replaced record circle button with bezier circle.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../history_view_voice_record_bar.cpp         | 181 +----
 .../controls/history_view_voice_record_bar.h  |   4 +-
 .../history_view_voice_record_button.cpp      | 746 ++++++++++++++++++
 .../history_view_voice_record_button.h        |  58 ++
 Telegram/SourceFiles/ui/chat/chat.style       |  10 +-
 6 files changed, 818 insertions(+), 183 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
 create mode 100644 Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index e686508b3..2decd8466 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -479,6 +479,8 @@ PRIVATE
     history/view/controls/history_view_compose_controls.h
     history/view/controls/history_view_voice_record_bar.cpp
     history/view/controls/history_view_voice_record_bar.h
+    history/view/controls/history_view_voice_record_button.cpp
+    history/view/controls/history_view_voice_record_button.h
     history/view/media/history_view_call.h
     history/view/media/history_view_call.cpp
     history/view/media/history_view_contact.h
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 48e328ea0..1a85e370b 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/event_filter.h"
 #include "boxes/confirm_box.h"
 #include "core/application.h"
+#include "history/view/controls/history_view_voice_record_button.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
 #include "media/audio/media_audio.h"
@@ -59,42 +60,6 @@ enum class FilterType {
 
 } // namespace
 
-class RecordLevel final : public Ui::AbstractButton {
-public:
-	RecordLevel(
-		not_null<Ui::RpWidget*> parent,
-		rpl::producer<> leaveWindowEventProducer);
-
-	void requestPaintColor(float64 progress);
-	void requestPaintProgress(float64 progress);
-	void requestPaintLevel(quint16 level);
-
-	[[nodiscard]] rpl::producer<bool> actives() const;
-
-	[[nodiscard]] bool inCircle(const QPoint &localPos) const;
-
-private:
-	void init();
-
-	void drawProgress(Painter &p);
-
-	const int _height;
-	const int _center;
-
-	rpl::variable<float64> _showProgress = 0.;
-	rpl::variable<float64> _colorProgress = 0.;
-	rpl::variable<bool> _inCircle = false;
-
-	bool recordingAnimationCallback(crl::time now);
-
-	// This can animate for a very long time (like in music playing),
-	// so it should be a Basic, not a Simple animation.
-	Ui::Animations::Basic _recordingAnimation;
-	anim::value _recordingLevel;
-
-	rpl::lifetime _showingLifetime;
-};
-
 class RecordLock final : public Ui::RpWidget {
 public:
 	RecordLock(not_null<Ui::RpWidget*> parent);
@@ -117,148 +82,6 @@ private:
 	rpl::variable<float64> _progress = 0.;
 };
 
-RecordLevel::RecordLevel(
-	not_null<Ui::RpWidget*> parent,
-	rpl::producer<> leaveWindowEventProducer)
-: AbstractButton(parent)
-, _height(st::historyRecordLevelMaxRadius * 2)
-, _center(_height / 2)
-, _recordingAnimation([=](crl::time now) {
-	return recordingAnimationCallback(now);
-}) {
-	resize(_height, _height);
-	std::move(
-		leaveWindowEventProducer
-	) | rpl::start_with_next([=] {
-		_inCircle = false;
-	}, lifetime());
-	init();
-}
-
-void RecordLevel::requestPaintLevel(quint16 level) {
-	_recordingLevel.start(level);
-	_recordingAnimation.start();
-}
-
-bool RecordLevel::recordingAnimationCallback(crl::time now) {
-	const auto dt = anim::Disabled()
-		? 1.
-		: ((now - _recordingAnimation.started())
-			/ float64(kRecordingUpdateDelta));
-	if (dt >= 1.) {
-		_recordingLevel.finish();
-	} else {
-		_recordingLevel.update(dt, anim::sineInOut);
-	}
-	if (!anim::Disabled()) {
-		update();
-	}
-	return (dt < 1.);
-}
-
-void RecordLevel::init() {
-	const auto hasProgress = [](auto value) { return value != 0.; };
-
-	paintRequest(
-	) | rpl::start_with_next([=](const QRect &clip) {
-		Painter p(this);
-
-		drawProgress(p);
-
-		p.setOpacity(_showProgress.current());
-		st::historyRecordVoiceActive.paintInCenter(p, rect());
-	}, lifetime());
-
-	rpl::merge(
-		shownValue(),
-		_showProgress.value() | rpl::map(hasProgress)
-	) | rpl::start_with_next([=](bool show) {
-		setVisible(show);
-		setMouseTracking(show);
-		if (!show) {
-			_recordingLevel = anim::value();
-			_recordingAnimation.stop();
-			_showingLifetime.destroy();
-			_showProgress = 0.;
-		}
-	}, lifetime());
-
-	actives(
-	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](bool active) {
-		setPointerCursor(active);
-	}, lifetime());
-}
-
-rpl::producer<bool> RecordLevel::actives() const {
-	return events(
-	) | rpl::filter([=](not_null<QEvent*> e) {
-		return (e->type() == QEvent::MouseMove
-			|| e->type() == QEvent::Leave
-			|| e->type() == QEvent::Enter);
-	}) | rpl::map([=](not_null<QEvent*> e) {
-		switch(e->type()) {
-		case QEvent::MouseMove:
-			return inCircle((static_cast<QMouseEvent*>(e.get()))->pos());
-		case QEvent::Leave: return false;
-		case QEvent::Enter: return inCircle(mapFromGlobal(QCursor::pos()));
-		default: return false;
-		}
-	});
-}
-
-bool RecordLevel::inCircle(const QPoint &localPos) const {
-	const auto &radii = st::historyRecordLevelMaxRadius;
-	const auto dx = std::abs(localPos.x() - _center);
-	if (dx > radii) {
-		return false;
-	}
-	const auto dy = std::abs(localPos.y() - _center);
-	if (dy > radii) {
-		return false;
-	} else if (dx + dy <= radii) {
-		return true;
-	}
-	return ((dx * dx + dy * dy) <= (radii * radii));
-}
-
-void RecordLevel::drawProgress(Painter &p) {
-	PainterHighQualityEnabler hq(p);
-	p.setPen(Qt::NoPen);
-	const auto color = anim::color(
-		st::historyRecordSignalColor,
-		st::historyRecordVoiceFgActive,
-		_colorProgress.current());
-	p.setBrush(color);
-
-	const auto progress = _showProgress.current();
-
-	const auto center = QPoint(_center, _center);
-	const int mainRadii = progress * st::historyRecordLevelMainRadius;
-
-	{
-		p.setOpacity(.5);
-		const auto min = progress * st::historyRecordLevelMinRadius;
-		const auto max = progress * st::historyRecordLevelMaxRadius;
-		const auto delta = std::min(_recordingLevel.current() / 0x4000, 1.);
-		const auto radii = qRound(min + (delta * (max - min)));
-		p.drawEllipse(center, radii, radii);
-		p.setOpacity(1.);
-	}
-
-	p.drawEllipse(center, mainRadii, mainRadii);
-}
-
-void RecordLevel::requestPaintProgress(float64 progress) {
-	_showProgress = progress;
-	update();
-}
-
-void RecordLevel::requestPaintColor(float64 progress) {
-	_colorProgress = progress;
-	update();
-}
-
 RecordLock::RecordLock(not_null<Ui::RpWidget*> parent) : RpWidget(parent) {
 	resize(
 		st::historyRecordLockTopShadow.width(),
@@ -419,7 +242,7 @@ VoiceRecordBar::VoiceRecordBar(
 , _controller(controller)
 , _send(send)
 , _lock(std::make_unique<RecordLock>(sectionWidget))
-, _level(std::make_unique<RecordLevel>(
+, _level(std::make_unique<VoiceRecordButton>(
 	sectionWidget,
 	_controller->widget()->leaveEvents()))
 , _startTimer([=] { startRecording(); })
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index a70a0e4db..16b7447d3 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -23,7 +23,7 @@ class SessionController;
 
 namespace HistoryView::Controls {
 
-class RecordLevel;
+class VoiceRecordButton;
 class RecordLock;
 
 class VoiceRecordBar final : public Ui::RpWidget {
@@ -100,7 +100,7 @@ private:
 	const not_null<Window::SessionController*> _controller;
 	const std::shared_ptr<Ui::SendButton> _send;
 	const std::unique_ptr<RecordLock> _lock;
-	const std::unique_ptr<RecordLevel> _level;
+	const std::unique_ptr<VoiceRecordButton> _level;
 
 	base::Timer _startTimer;
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
new file mode 100644
index 000000000..bb9b81c0e
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -0,0 +1,746 @@
+/*
+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/controls/history_view_voice_record_button.h"
+
+#include "styles/style_chat.h"
+#include "styles/style_layers.h"
+
+#include <QMatrix>
+
+namespace HistoryView::Controls {
+
+namespace {
+
+constexpr auto kRecordingUpdateDelta = crl::time(100);
+
+constexpr auto kSegmentsCount = 12;
+constexpr auto kMajorDegreeOffset = 360 / kSegmentsCount;
+constexpr auto kSixtyDegrees = 60;
+
+constexpr auto kEnterIdleAnimationDuration = crl::time(1200);
+
+constexpr auto kRotationSpeed = 0.36 * 0.1;
+
+constexpr auto kRandomAdditionFactor = 0.3;
+
+constexpr auto kIdleRadiusGlobalFactor = 0.56;
+constexpr auto kIdleRadiusFactor = 0.15 * 0.5;
+
+constexpr auto kOpacityMajor = 0.30;
+constexpr auto kOpacityMinor = 0.15;
+
+constexpr auto kIdleRotationSpeed = 0.2;
+constexpr auto kIdleRotateDiff = 0.1 * kIdleRotationSpeed;
+
+constexpr auto kWaveAngle = 0.03;
+
+constexpr auto kAnimationSpeedMajor = 1.5;// - 0.65;
+constexpr auto kAnimationSpeedMinor = 1.5;// - 0.45;
+constexpr auto kAnimationSpeedCircle = 1.5;// - 0.25;
+
+constexpr auto kAmplitudeDiffFactorMax = 500.;
+constexpr auto kAmplitudeDiffFactorMajor = 300.;
+constexpr auto kAmplitudeDiffFactorMinor = 400.;
+
+constexpr auto kFlingDistanceFactorMajor = 8 * 16;
+constexpr auto kFlingDistanceFactorMinor = 20 * 16;
+
+constexpr auto kFlingInAnimationDurationMajor = 200;
+constexpr auto kFlingInAnimationDurationMinor = 350;
+constexpr auto kFlingOutAnimationDurationMajor = 220;
+constexpr auto kFlingOutAnimationDurationMinor = 380;
+
+constexpr auto kSineWaveSpeedMajor = 0.02 * 0.2 * 0.5;
+constexpr auto kSineWaveSpeedMinor = 0.026 * 0.2 * 0.5;
+
+constexpr auto kSmallWaveRadius = 0.55;
+
+constexpr auto kFlingDistance = 0.50;
+
+constexpr auto kMinDivider = 100.;
+
+constexpr auto kMaxAmplitude = 1800.;
+
+constexpr auto kZeroPoint = QPointF(0, 0);
+
+void ApplyTo(float64 &value, const float64 &to, const float64 &diff) {
+	if ((value != to) && ((diff > 0) == (value > to))) {
+		value = to;
+	}
+}
+
+template <typename Number>
+void Normalize(Number &value, Number right) {
+	if (value >= right) {
+		value -= right;
+	}
+}
+
+float64 RandomAdditional() {
+	return (rand_value<int>() % 100 / 100.);
+}
+
+void PerformAnimation(
+		rpl::producer<crl::time> &&animationTicked,
+		Fn<void(float64)> &&applyValue,
+		Fn<void()> &&finishCallback,
+		float64 duration,
+		float64 from,
+		float64 to,
+		rpl::lifetime &lifetime) {
+	lifetime.destroy();
+	const auto animValue =
+		lifetime.make_state<anim::value>(from, to);
+	const auto animStarted = crl::now();
+	std::move(
+		animationTicked
+	) | rpl::start_with_next([=,
+			applyValue = std::move(applyValue),
+			finishCallback = std::move(finishCallback),
+			&lifetime](crl::time now) mutable {
+		const auto dt = anim::Disabled()
+			? 1.
+			: ((now - animStarted) / duration);
+		if (dt >= 1.) {
+			animValue->finish();
+			applyValue(animValue->current());
+			lifetime.destroy();
+			if (finishCallback) {
+				finishCallback();
+			}
+		} else {
+			animValue->update(dt, anim::linear);
+			applyValue(animValue->current());
+		}
+	}, lifetime);
+}
+
+} // namespace
+
+class CircleBezier final {
+public:
+	CircleBezier(int n);
+
+	void computeRandomAdditionals();
+	void paintCircle(
+		Painter &p,
+		const QColor &c,
+		float64 radius,
+		float64 cubicBezierFactor,
+		float64 idleStateDiff,
+		float64 radiusDiff,
+		float64 randomFactor);
+
+private:
+	struct Points {
+		QPointF point;
+		QPointF control;
+	};
+
+	const int _segmentsCount;
+	const float64 _segmentLength;
+	std::vector<float64> _randomAdditionals;
+
+};
+
+class Wave final {
+public:
+	Wave(
+		rpl::producer<crl::time> animationTicked,
+		int n,
+		float64 rotationOffset,
+		float64 amplitudeRadius,
+		float64 amplitudeWaveDiff,
+		float64 fling,
+		int flingDistanceFactor,
+		int flingInAnimationDuration,
+		int flingOutAnimationDuration,
+		float64 amplitudeDiffSpeed,
+		float64 amplitudeDiffFactor,
+		bool isDirectionClockwise);
+
+	void setValue(float64 value);
+	void tick(float64 circleRadius, crl::time lastUpdateTime);
+
+	void paint(Painter &p, QColor c);
+
+private:
+
+	void initEnterIdleAnimation(rpl::producer<crl::time> animationTicked);
+	void initFlingAnimation(rpl::producer<crl::time> animationTicked);
+
+	Ui::Animations::Simple _flingAnimation;
+
+	const std::unique_ptr<CircleBezier> _circleBezier;
+
+	const float _rotationOffset;
+	const float64 _idleGlobalRadius;
+	const float64 _amplitudeRadius;
+	const float64 _amplitudeWaveDiff;
+	const float64 _randomAdditions;
+	const float64 _fling;
+	const int _flingDistanceFactor;
+	const int _flingInAnimationDuration;
+	const int _flingOutAnimationDuration;
+	const float64 _amplitudeDiffSpeed;
+	const float64 _amplitudeDiffFactor;
+	const int _directionClockwise;
+
+	bool _incRandomAdditionals = false;
+	bool _isIdle = true;
+	bool _wasFling = false;
+	float64 _amplitude = 0.;
+	float64 _animateAmplitudeDiff = 0.;
+	float64 _animateAmplitudeSlowDiff = 0.;
+	float64 _animateToAmplitude = 0.;
+	float64 _flingRadius = 0.;
+	float64 _idleRadius = 0.;
+	float64 _idleRotation = 0.;
+	float64 _lastRadius = 0.;
+	float64 _rotation = 0.;
+	float64 _sineAngleMax = 0.;
+	float64 _slowAmplitude = 0.;
+	float64 _waveAngle = 0.;
+	float64 _waveDiff = 0.;
+
+	rpl::event_stream<float64> _flingAnimationRequests;
+	rpl::event_stream<> _enterIdleAnimationRequests;
+	rpl::lifetime _animationEnterIdleLifetime;
+	rpl::lifetime _animationFlingLifetime;
+	rpl::lifetime _lifetime;
+};
+
+class RecordCircle final {
+public:
+	RecordCircle(rpl::producer<crl::time> animationTicked);
+
+	void setAmplitude(float64 value);
+	void paint(Painter &p, QColor c);
+
+private:
+
+	const std::unique_ptr<Wave> _majorWave;
+	const std::unique_ptr<Wave> _minorWave;
+
+	float64 _amplitude = 0.;
+	float64 _animateToAmplitude = 0.;
+	float64 _animateAmplitudeDiff = 0.;
+	crl::time _lastUpdateTime = 0;
+
+	rpl::lifetime _animationLifetime;
+	rpl::lifetime _lifetime;
+
+};
+
+CircleBezier::CircleBezier(int n)
+: _segmentsCount(n)
+, _segmentLength((4.0 / 3.0) * std::tan(M_PI / (2 * n)))
+, _randomAdditionals(n) {
+}
+
+void CircleBezier::computeRandomAdditionals() {
+	ranges::generate(_randomAdditionals, RandomAdditional);
+}
+
+void CircleBezier::paintCircle(
+		Painter &p,
+		const QColor &c,
+		float64 radius,
+		float64 cubicBezierFactor,
+		float64 idleStateDiff,
+		float64 radiusDiff,
+		float64 randomFactor) {
+	PainterHighQualityEnabler hq(p);
+
+	const auto r1 = radius - idleStateDiff / 2. - radiusDiff / 2.;
+	const auto r2 = radius + radiusDiff / 2. + idleStateDiff / 2.;
+	const auto l = _segmentLength * std::max(r1, r2) * cubicBezierFactor;
+
+	auto m = QMatrix();
+
+	const auto preparePoints = [&](int i, bool isStart) -> Points {
+		Normalize(i, _segmentsCount);
+		const auto randomAddition = randomFactor * _randomAdditionals[i];
+		const auto r = ((i % 2 == 0) ? r1 : r2) + randomAddition;
+
+		m.reset();
+		m.rotate(360. / _segmentsCount * i);
+		const auto sign = isStart ? 1 : -1;
+
+		return {
+			(isStart && i) ? QPointF() : m.map(QPointF(0, -r)),
+			m.map(QPointF(sign * (l + randomAddition * _segmentLength), -r)),
+		};
+	};
+
+	const auto &[startPoint, _] = preparePoints(0, true);
+
+	auto path = QPainterPath();
+	path.moveTo(startPoint);
+
+	for (auto i = 0; i < _segmentsCount; i++) {
+		const auto &[_, startControl] = preparePoints(i, true);
+		const auto &[end, endControl] = preparePoints(i + 1, false);
+
+		path.cubicTo(startControl, endControl, end);
+	}
+
+	p.setBrush(Qt::NoBrush);
+
+	auto pen = QPen(Qt::NoPen);
+	pen.setCapStyle(Qt::RoundCap);
+	pen.setJoinStyle(Qt::RoundJoin);
+
+	p.setPen(pen);
+	p.fillPath(path, c);
+	p.drawPath(path);
+}
+
+Wave::Wave(
+	rpl::producer<crl::time> animationTicked,
+	int n,
+	float64 rotationOffset,
+	float64 amplitudeRadius,
+	float64 amplitudeWaveDiff,
+	float64 fling,
+	int flingDistanceFactor,
+	int flingInAnimationDuration,
+	int flingOutAnimationDuration,
+	float64 amplitudeDiffSpeed,
+	float64 amplitudeDiffFactor,
+	bool isDirectionClockwise)
+: _circleBezier(std::make_unique<CircleBezier>(n))
+, _rotationOffset(rotationOffset)
+, _idleGlobalRadius(st::historyRecordRadiusDiffMin * kIdleRadiusGlobalFactor)
+, _amplitudeRadius(amplitudeRadius)
+, _amplitudeWaveDiff(amplitudeWaveDiff)
+, _randomAdditions(st::historyRecordRandomAddition * kRandomAdditionFactor)
+, _fling(fling)
+, _flingDistanceFactor(flingDistanceFactor)
+, _flingInAnimationDuration(flingInAnimationDuration)
+, _flingOutAnimationDuration(flingOutAnimationDuration)
+, _amplitudeDiffSpeed(amplitudeDiffSpeed)
+, _amplitudeDiffFactor(amplitudeDiffFactor)
+, _directionClockwise(isDirectionClockwise ? 1 : -1)
+, _rotation(rotationOffset) {
+	initEnterIdleAnimation(rpl::duplicate(animationTicked));
+	initFlingAnimation(std::move(animationTicked));
+}
+
+void Wave::setValue(float64 value) {
+	_animateToAmplitude = value;
+
+	const auto amplitudeDelta = (_animateToAmplitude - _amplitude);
+	const auto amplitudeSlowDelta = (_animateToAmplitude - _slowAmplitude);
+	const auto factor = (_animateToAmplitude <= _amplitude)
+		? kAmplitudeDiffFactorMax
+		: _amplitudeDiffFactor;
+	_animateAmplitudeDiff = amplitudeDelta
+		/ (kMinDivider + factor * _amplitudeDiffSpeed);
+	_animateAmplitudeSlowDiff = amplitudeSlowDelta
+		/ (kMinDivider + kAmplitudeDiffFactorMax * _amplitudeDiffSpeed);
+
+	const auto idle = value < 0.1;
+	if (_isIdle != idle && idle) {
+		_enterIdleAnimationRequests.fire({});
+	}
+
+	_isIdle = idle;
+
+	if (!_isIdle) {
+		_animationEnterIdleLifetime.destroy();
+	}
+}
+
+void Wave::initEnterIdleAnimation(rpl::producer<crl::time> animationTicked) {
+	_enterIdleAnimationRequests.events(
+	) | rpl::start_with_next([=] {
+		const auto &k = kSixtyDegrees;
+
+		const auto rotation = _rotation;
+		const auto rotationTo = std::round(rotation / k) * k
+			+ _rotationOffset;
+		const auto waveDiff = _waveDiff;
+
+		auto applyValue = [=](float64 v) {
+			_rotation = rotationTo + (rotation - rotationTo) * v;
+			_waveDiff = 1. + (waveDiff - 1.) * v;
+			_waveAngle = std::acos(_waveDiff * _directionClockwise);
+		};
+
+		PerformAnimation(
+			rpl::duplicate(animationTicked),
+			std::move(applyValue),
+			nullptr,
+			kEnterIdleAnimationDuration,
+			1,
+			0,
+			_animationEnterIdleLifetime);
+
+	}, _lifetime);
+}
+
+void Wave::initFlingAnimation(rpl::producer<crl::time> animationTicked) {
+	_flingAnimationRequests.events(
+	) | rpl::start_with_next([=](float64 delta) {
+
+		const auto fling = _fling * 2;
+		const auto flingDistance = delta
+			* _amplitudeRadius
+			* _flingDistanceFactor
+			* fling;
+
+		const auto applyValue = [=](float64 v) {
+			_flingRadius = v;
+		};
+		auto finishCallback = [=] {
+			PerformAnimation(
+				rpl::duplicate(animationTicked),
+				applyValue,
+				nullptr,
+				_flingOutAnimationDuration * fling,
+				flingDistance,
+				0,
+				_animationFlingLifetime);
+		};
+
+		PerformAnimation(
+			rpl::duplicate(animationTicked),
+			applyValue,
+			std::move(finishCallback),
+			_flingInAnimationDuration * fling,
+			_flingRadius,
+			flingDistance,
+			_animationFlingLifetime);
+
+	}, _lifetime);
+}
+
+void Wave::tick(float64 circleRadius, crl::time lastUpdateTime) {
+	const auto dt = (crl::now() - lastUpdateTime);
+
+	if (_animateToAmplitude != _amplitude) {
+		_amplitude += _animateAmplitudeDiff * dt;
+		ApplyTo(_amplitude, _animateToAmplitude, _animateAmplitudeDiff);
+
+		if (std::abs(_amplitude - _animateToAmplitude) * _amplitudeRadius
+				< (st::historyRecordRandomAddition / 2)) {
+			if (!_wasFling) {
+				_flingAnimationRequests.fire_copy(_animateAmplitudeDiff);
+				_wasFling = true;
+			}
+		} else {
+			_wasFling = false;
+		}
+	}
+
+	if (_animateToAmplitude != _slowAmplitude) {
+		_slowAmplitude += _animateAmplitudeSlowDiff * dt;
+		if (std::abs(_slowAmplitude - _amplitude) > 0.2) {
+			_slowAmplitude = _amplitude + (_slowAmplitude > _amplitude ?
+					0.2 : -0.2);
+		}
+		ApplyTo(_slowAmplitude,
+			_animateToAmplitude,
+			_animateAmplitudeSlowDiff);
+	}
+
+	_idleRadius = circleRadius * kIdleRadiusFactor;
+
+	{
+		const auto delta = (_sineAngleMax - _animateToAmplitude);
+		if (std::abs(delta) - 0.25 < 0) {
+			_sineAngleMax = _animateToAmplitude;
+		} else {
+			_sineAngleMax -= 0.25 * ((delta < 0) ? -1 : 1);
+		}
+	}
+
+	if (!_isIdle) {
+		_rotation += dt
+			* (kRotationSpeed * 4. * (_amplitude > 0.5 ? 1 : _amplitude / 0.5)
+				+ kRotationSpeed * 0.5);
+		Normalize(_rotation, 360.);
+	} else {
+		_idleRotation += kIdleRotateDiff * dt;
+		Normalize(_idleRotation, 360.);
+	}
+
+	_lastRadius = circleRadius;
+
+	if (!_isIdle) {
+		_waveAngle += (_amplitudeWaveDiff * _sineAngleMax) * dt;
+		_waveDiff = std::cos(_waveAngle) * _directionClockwise;
+
+		if ((_waveDiff != 0) && ((_waveDiff > 0) == _incRandomAdditionals)) {
+			_circleBezier->computeRandomAdditionals();
+			_incRandomAdditionals = !_incRandomAdditionals;
+		}
+	}
+}
+
+
+void Wave::paint(Painter &p, QColor c) {
+	const auto waveAmplitude = _amplitude < 0.3 ? _amplitude / 0.3 : 1.;
+	const auto radiusDiff = st::historyRecordRadiusDiffMin
+		+ st::historyRecordRadiusDiff * kWaveAngle * _animateToAmplitude;
+
+	const auto diffFactor = 0.35 * waveAmplitude * _waveDiff;
+
+	const auto radius = (_lastRadius + _amplitudeRadius * _amplitude)
+		+ _idleGlobalRadius
+		+ (_flingRadius * waveAmplitude);
+
+	const auto cubicBezierFactor = 1.
+		+ std::abs(diffFactor) * waveAmplitude
+		+ (1. - waveAmplitude) * kIdleRadiusFactor;
+
+	const auto circleRadiusDiff = std::max(
+		radiusDiff * diffFactor,
+		st::historyRecordLevelMainRadius - radius);
+
+	p.rotate((_rotation + _idleRotation) * _directionClockwise);
+
+	_circleBezier->paintCircle(
+		p,
+		c,
+		radius,
+		cubicBezierFactor,
+		_idleRadius * (1. - waveAmplitude),
+		circleRadiusDiff,
+		waveAmplitude * _waveDiff * _randomAdditions);
+
+	p.rotate(0);
+}
+
+RecordCircle::RecordCircle(rpl::producer<crl::time> animationTicked)
+: _majorWave(std::make_unique<Wave>(
+	rpl::duplicate(animationTicked),
+	kSegmentsCount,
+	kMajorDegreeOffset,
+	st::historyRecordMajorAmplitudeRadius,
+	kSineWaveSpeedMajor,
+	0.,
+	kFlingDistanceFactorMajor,
+	kFlingInAnimationDurationMajor,
+	kFlingOutAnimationDurationMajor,
+	kAnimationSpeedMajor,
+	kAmplitudeDiffFactorMajor,
+	true))
+, _minorWave(std::make_unique<Wave>(
+	std::move(animationTicked),
+	kSegmentsCount,
+	0,
+	st::historyRecordMinorAmplitudeRadius
+		+ st::historyRecordMinorAmplitudeRadius * kSmallWaveRadius,
+	kSineWaveSpeedMinor,
+	kFlingDistance,
+	kFlingDistanceFactorMinor,
+	kFlingInAnimationDurationMinor,
+	kFlingOutAnimationDurationMinor,
+	kAnimationSpeedMinor,
+	kAmplitudeDiffFactorMinor,
+	false)) {
+}
+
+void RecordCircle::setAmplitude(float64 value) {
+	_animateToAmplitude = std::min(kMaxAmplitude, value) / kMaxAmplitude;
+	_majorWave->setValue(_animateToAmplitude);
+	_minorWave->setValue(_animateToAmplitude);
+	_animateAmplitudeDiff = (_animateToAmplitude - _amplitude)
+		/ (kMinDivider + kAmplitudeDiffFactorMax * kAnimationSpeedCircle);
+}
+
+void RecordCircle::paint(Painter &p, QColor c) {
+
+	const auto dt = (crl::now() - _lastUpdateTime);
+	if (_animateToAmplitude != _amplitude) {
+		_amplitude += _animateAmplitudeDiff * dt;
+		ApplyTo(_amplitude, _animateToAmplitude, _animateAmplitudeDiff);
+	}
+
+	const auto radius = (st::historyRecordLevelMainRadius
+		+ st::historyRecordLevelMainRadiusAmplitude * _amplitude);
+
+	_majorWave->tick(radius, _lastUpdateTime);
+	_minorWave->tick(radius, _lastUpdateTime);
+	_lastUpdateTime = crl::now();
+
+	const auto opacity = p.opacity();
+	p.setOpacity(kOpacityMajor);
+	_majorWave->paint(p, c);
+	p.setOpacity(kOpacityMinor);
+	_minorWave->paint(p, c);
+	p.setOpacity(opacity);
+
+	p.setPen(Qt::NoPen);
+	p.setBrush(c);
+	p.drawEllipse(kZeroPoint, radius, radius);
+}
+
+VoiceRecordButton::VoiceRecordButton(
+	not_null<Ui::RpWidget*> parent,
+	rpl::producer<> leaveWindowEventProducer)
+: AbstractButton(parent)
+, _recordCircle(std::make_unique<RecordCircle>(
+	_recordAnimationTicked.events()))
+, _height(st::historyRecordLevelMaxRadius * 2)
+, _center(_height / 2)
+, _recordingAnimation([=](crl::time now) {
+	update();
+	_recordAnimationTicked.fire_copy(now);
+	return true;
+}) {
+	resize(_height, _height);
+	std::move(
+		leaveWindowEventProducer
+	) | rpl::start_with_next([=] {
+		_inCircle = false;
+	}, lifetime());
+	init();
+}
+
+VoiceRecordButton::~VoiceRecordButton() = default;
+
+void VoiceRecordButton::requestPaintLevel(quint16 level) {
+	_recordCircle->setAmplitude(level);
+	update();
+}
+
+bool VoiceRecordButton::recordingAnimationCallback(crl::time now) {
+	const auto dt = anim::Disabled()
+		? 1.
+		: ((now - _recordingAnimation.started())
+			/ float64(kRecordingUpdateDelta));
+	if (dt >= 1.) {
+		_recordingLevel.finish();
+	} else {
+		_recordingLevel.update(dt, anim::sineInOut);
+	}
+	if (!anim::Disabled()) {
+		update();
+	}
+	return (dt < 1.);
+}
+
+void VoiceRecordButton::init() {
+	const auto hasProgress = [](auto value) { return value != 0.; };
+
+	paintRequest(
+	) | rpl::start_with_next([=](const QRect &clip) {
+		Painter p(this);
+
+		p.translate(_center, _center);
+		PainterHighQualityEnabler hq(p);
+		const auto color = anim::color(
+			st::historyRecordSignalColor,
+			st::historyRecordVoiceFgActive,
+			_colorProgress.current());
+		_recordCircle->paint(p, color);
+		p.resetTransform();
+
+		p.setOpacity(_showProgress.current());
+		st::historyRecordVoiceActive.paintInCenter(p, rect());
+
+	}, lifetime());
+
+	rpl::merge(
+		shownValue(),
+		_showProgress.value() | rpl::map(hasProgress)
+	) | rpl::start_with_next([=](bool show) {
+		setVisible(show);
+		setMouseTracking(show);
+		if (!show) {
+			_recordingLevel = anim::value();
+			_recordingAnimation.stop();
+			_showingLifetime.destroy();
+			_showProgress = 0.;
+		} else {
+			if (!_recordingAnimation.animating()) {
+				_recordingAnimation.start();
+			}
+		}
+	}, lifetime());
+
+	actives(
+	) | rpl::distinct_until_changed(
+	) | rpl::start_with_next([=](bool active) {
+		setPointerCursor(active);
+	}, lifetime());
+}
+
+rpl::producer<bool> VoiceRecordButton::actives() const {
+	return events(
+	) | rpl::filter([=](not_null<QEvent*> e) {
+		return (e->type() == QEvent::MouseMove
+			|| e->type() == QEvent::Leave
+			|| e->type() == QEvent::Enter);
+	}) | rpl::map([=](not_null<QEvent*> e) {
+		switch(e->type()) {
+		case QEvent::MouseMove:
+			return inCircle((static_cast<QMouseEvent*>(e.get()))->pos());
+		case QEvent::Leave: return false;
+		case QEvent::Enter: return inCircle(mapFromGlobal(QCursor::pos()));
+		default: return false;
+		}
+	});
+}
+
+bool VoiceRecordButton::inCircle(const QPoint &localPos) const {
+	const auto &radii = st::historyRecordLevelMaxRadius;
+	const auto dx = std::abs(localPos.x() - _center);
+	if (dx > radii) {
+		return false;
+	}
+	const auto dy = std::abs(localPos.y() - _center);
+	if (dy > radii) {
+		return false;
+	} else if (dx + dy <= radii) {
+		return true;
+	}
+	return ((dx * dx + dy * dy) <= (radii * radii));
+}
+
+void VoiceRecordButton::drawProgress(Painter &p) {
+	PainterHighQualityEnabler hq(p);
+	p.setPen(Qt::NoPen);
+	const auto color = anim::color(
+		st::historyRecordSignalColor,
+		st::historyRecordVoiceFgActive,
+		_colorProgress.current());
+	p.setBrush(color);
+
+	const auto progress = _showProgress.current();
+
+	const auto center = QPoint(_center, _center);
+	const int mainRadii = progress * st::historyRecordLevelMainRadius;
+
+	{
+		p.setOpacity(.5);
+		const auto min = progress * st::historyRecordLevelMinRadius;
+		const auto max = progress * st::historyRecordLevelMaxRadius;
+		const auto delta = std::min(_recordingLevel.current() / 0x4000, 1.);
+		const auto radii = qRound(min + (delta * (max - min)));
+		p.drawEllipse(center, radii, radii);
+		p.setOpacity(1.);
+	}
+
+	p.drawEllipse(center, mainRadii, mainRadii);
+}
+
+void VoiceRecordButton::requestPaintProgress(float64 progress) {
+	_showProgress = progress;
+	update();
+}
+
+void VoiceRecordButton::requestPaintColor(float64 progress) {
+	_colorProgress = progress;
+	update();
+}
+
+} // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
new file mode 100644
index 000000000..e44573d81
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
@@ -0,0 +1,58 @@
+/*
+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/abstract_button.h"
+#include "ui/effects/animations.h"
+#include "ui/rp_widget.h"
+
+namespace HistoryView::Controls {
+
+class RecordCircle;
+
+class VoiceRecordButton final : public Ui::AbstractButton {
+public:
+	VoiceRecordButton(
+		not_null<Ui::RpWidget*> parent,
+		rpl::producer<> leaveWindowEventProducer);
+	~VoiceRecordButton();
+
+	void requestPaintColor(float64 progress);
+	void requestPaintProgress(float64 progress);
+	void requestPaintLevel(quint16 level);
+
+	[[nodiscard]] rpl::producer<bool> actives() const;
+
+	[[nodiscard]] bool inCircle(const QPoint &localPos) const;
+
+private:
+	void init();
+
+	void drawProgress(Painter &p);
+
+	rpl::event_stream<crl::time> _recordAnimationTicked;
+	std::unique_ptr<RecordCircle> _recordCircle;
+
+	const int _height;
+	const int _center;
+
+	rpl::variable<float64> _showProgress = 0.;
+	rpl::variable<float64> _colorProgress = 0.;
+	rpl::variable<bool> _inCircle = false;
+
+	bool recordingAnimationCallback(crl::time now);
+
+	// This can animate for a very long time (like in music playing),
+	// so it should be a Basic, not a Simple animation.
+	Ui::Animations::Basic _recordingAnimation;
+	anim::value _recordingLevel;
+
+	rpl::lifetime _showingLifetime;
+};
+
+} // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index bd386eb65..ebaca8649 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -342,9 +342,15 @@ historyRecordFont: font(13px);
 historyRecordDurationSkip: 12px;
 historyRecordDurationFg: historyComposeAreaFg;
 
-historyRecordLevelMainRadius: 37px;
+historyRecordLevelMainRadius: 23px;
+historyRecordLevelMainRadiusAmplitude: 14px;
+historyRecordMajorAmplitudeRadius: 14px;
+historyRecordMinorAmplitudeRadius: 7px;
+historyRecordRandomAddition: 8px;
+historyRecordRadiusDiff: 50px;
+historyRecordRadiusDiffMin: 10px;
 historyRecordLevelMinRadius: 38px;
-historyRecordLevelMaxRadius: 60px;
+historyRecordLevelMaxRadius: 70px;
 
 historyRecordTextStyle: TextStyle(defaultTextStyle) {
 	font: historyRecordFont;

From 6ae15485adc8d56d515789f576ce7597488c5c04 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 29 Oct 2020 03:32:24 +0300
Subject: [PATCH 081/370] Added show animation to VoiceRecordButton.

---
 .../view/controls/history_view_voice_record_button.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index bb9b81c0e..2cd2da163 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -635,7 +635,13 @@ void VoiceRecordButton::init() {
 	) | rpl::start_with_next([=](const QRect &clip) {
 		Painter p(this);
 
+		const auto progress = _showProgress.current();
+		const auto complete = (progress == 1.);
+
 		p.translate(_center, _center);
+		if (!complete) {
+			p.scale(progress, progress);
+		}
 		PainterHighQualityEnabler hq(p);
 		const auto color = anim::color(
 			st::historyRecordSignalColor,
@@ -644,7 +650,9 @@ void VoiceRecordButton::init() {
 		_recordCircle->paint(p, color);
 		p.resetTransform();
 
-		p.setOpacity(_showProgress.current());
+		if (!complete) {
+			p.setOpacity(progress);
+		}
 		st::historyRecordVoiceActive.paintInCenter(p, rect());
 
 	}, lifetime());

From ce1ae5ba12af0f12ae0e82d3bbe4d6a5cb61e409 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 29 Oct 2020 03:40:40 +0300
Subject: [PATCH 082/370] Removed redundant code from VoiceRecordButton.

---
 .../history_view_voice_record_button.cpp      | 69 +------------------
 .../history_view_voice_record_button.h        |  8 ---
 2 files changed, 3 insertions(+), 74 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index 2cd2da163..68ff4f302 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -16,8 +16,6 @@ namespace HistoryView::Controls {
 
 namespace {
 
-constexpr auto kRecordingUpdateDelta = crl::time(100);
-
 constexpr auto kSegmentsCount = 12;
 constexpr auto kMajorDegreeOffset = 360 / kSegmentsCount;
 constexpr auto kSixtyDegrees = 60;
@@ -196,7 +194,6 @@ private:
 	bool _wasFling = false;
 	float64 _amplitude = 0.;
 	float64 _animateAmplitudeDiff = 0.;
-	float64 _animateAmplitudeSlowDiff = 0.;
 	float64 _animateToAmplitude = 0.;
 	float64 _flingRadius = 0.;
 	float64 _idleRadius = 0.;
@@ -204,7 +201,6 @@ private:
 	float64 _lastRadius = 0.;
 	float64 _rotation = 0.;
 	float64 _sineAngleMax = 0.;
-	float64 _slowAmplitude = 0.;
 	float64 _waveAngle = 0.;
 	float64 _waveDiff = 0.;
 
@@ -336,14 +332,11 @@ void Wave::setValue(float64 value) {
 	_animateToAmplitude = value;
 
 	const auto amplitudeDelta = (_animateToAmplitude - _amplitude);
-	const auto amplitudeSlowDelta = (_animateToAmplitude - _slowAmplitude);
 	const auto factor = (_animateToAmplitude <= _amplitude)
 		? kAmplitudeDiffFactorMax
 		: _amplitudeDiffFactor;
 	_animateAmplitudeDiff = amplitudeDelta
 		/ (kMinDivider + factor * _amplitudeDiffSpeed);
-	_animateAmplitudeSlowDiff = amplitudeSlowDelta
-		/ (kMinDivider + kAmplitudeDiffFactorMax * _amplitudeDiffSpeed);
 
 	const auto idle = value < 0.1;
 	if (_isIdle != idle && idle) {
@@ -439,17 +432,6 @@ void Wave::tick(float64 circleRadius, crl::time lastUpdateTime) {
 		}
 	}
 
-	if (_animateToAmplitude != _slowAmplitude) {
-		_slowAmplitude += _animateAmplitudeSlowDiff * dt;
-		if (std::abs(_slowAmplitude - _amplitude) > 0.2) {
-			_slowAmplitude = _amplitude + (_slowAmplitude > _amplitude ?
-					0.2 : -0.2);
-		}
-		ApplyTo(_slowAmplitude,
-			_animateToAmplitude,
-			_animateAmplitudeSlowDiff);
-	}
-
 	_idleRadius = circleRadius * kIdleRadiusFactor;
 
 	{
@@ -589,14 +571,14 @@ VoiceRecordButton::VoiceRecordButton(
 : AbstractButton(parent)
 , _recordCircle(std::make_unique<RecordCircle>(
 	_recordAnimationTicked.events()))
-, _height(st::historyRecordLevelMaxRadius * 2)
-, _center(_height / 2)
+, _center(st::historyRecordLevelMaxRadius)
 , _recordingAnimation([=](crl::time now) {
 	update();
 	_recordAnimationTicked.fire_copy(now);
 	return true;
 }) {
-	resize(_height, _height);
+	const auto h = st::historyRecordLevelMaxRadius * 2;
+	resize(h, h);
 	std::move(
 		leaveWindowEventProducer
 	) | rpl::start_with_next([=] {
@@ -612,22 +594,6 @@ void VoiceRecordButton::requestPaintLevel(quint16 level) {
 	update();
 }
 
-bool VoiceRecordButton::recordingAnimationCallback(crl::time now) {
-	const auto dt = anim::Disabled()
-		? 1.
-		: ((now - _recordingAnimation.started())
-			/ float64(kRecordingUpdateDelta));
-	if (dt >= 1.) {
-		_recordingLevel.finish();
-	} else {
-		_recordingLevel.update(dt, anim::sineInOut);
-	}
-	if (!anim::Disabled()) {
-		update();
-	}
-	return (dt < 1.);
-}
-
 void VoiceRecordButton::init() {
 	const auto hasProgress = [](auto value) { return value != 0.; };
 
@@ -664,9 +630,7 @@ void VoiceRecordButton::init() {
 		setVisible(show);
 		setMouseTracking(show);
 		if (!show) {
-			_recordingLevel = anim::value();
 			_recordingAnimation.stop();
-			_showingLifetime.destroy();
 			_showProgress = 0.;
 		} else {
 			if (!_recordingAnimation.animating()) {
@@ -714,33 +678,6 @@ bool VoiceRecordButton::inCircle(const QPoint &localPos) const {
 	return ((dx * dx + dy * dy) <= (radii * radii));
 }
 
-void VoiceRecordButton::drawProgress(Painter &p) {
-	PainterHighQualityEnabler hq(p);
-	p.setPen(Qt::NoPen);
-	const auto color = anim::color(
-		st::historyRecordSignalColor,
-		st::historyRecordVoiceFgActive,
-		_colorProgress.current());
-	p.setBrush(color);
-
-	const auto progress = _showProgress.current();
-
-	const auto center = QPoint(_center, _center);
-	const int mainRadii = progress * st::historyRecordLevelMainRadius;
-
-	{
-		p.setOpacity(.5);
-		const auto min = progress * st::historyRecordLevelMinRadius;
-		const auto max = progress * st::historyRecordLevelMaxRadius;
-		const auto delta = std::min(_recordingLevel.current() / 0x4000, 1.);
-		const auto radii = qRound(min + (delta * (max - min)));
-		p.drawEllipse(center, radii, radii);
-		p.setOpacity(1.);
-	}
-
-	p.drawEllipse(center, mainRadii, mainRadii);
-}
-
 void VoiceRecordButton::requestPaintProgress(float64 progress) {
 	_showProgress = progress;
 	update();
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
index e44573d81..27d0068eb 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
@@ -33,26 +33,18 @@ public:
 private:
 	void init();
 
-	void drawProgress(Painter &p);
-
 	rpl::event_stream<crl::time> _recordAnimationTicked;
 	std::unique_ptr<RecordCircle> _recordCircle;
 
-	const int _height;
 	const int _center;
 
 	rpl::variable<float64> _showProgress = 0.;
 	rpl::variable<float64> _colorProgress = 0.;
 	rpl::variable<bool> _inCircle = false;
 
-	bool recordingAnimationCallback(crl::time now);
-
 	// This can animate for a very long time (like in music playing),
 	// so it should be a Basic, not a Simple animation.
 	Ui::Animations::Basic _recordingAnimation;
-	anim::value _recordingLevel;
-
-	rpl::lifetime _showingLifetime;
 };
 
 } // namespace HistoryView::Controls

From 71e8bda7bb933ee73c3d294be35bd0231756ac8e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 29 Oct 2020 17:25:36 +0300
Subject: [PATCH 083/370] Replaced raw variables for animations in
 VoiceRecordButton.

---
 .../history_view_voice_record_button.cpp      | 145 ++++++++++--------
 1 file changed, 85 insertions(+), 60 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index 68ff4f302..e554ce534 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -66,12 +66,6 @@ constexpr auto kMaxAmplitude = 1800.;
 
 constexpr auto kZeroPoint = QPointF(0, 0);
 
-void ApplyTo(float64 &value, const float64 &to, const float64 &diff) {
-	if ((value != to) && ((diff > 0) == (value > to))) {
-		value = to;
-	}
-}
-
 template <typename Number>
 void Normalize(Number &value, Number right) {
 	if (value >= right) {
@@ -120,6 +114,49 @@ void PerformAnimation(
 
 } // namespace
 
+class ContinuousValue {
+public:
+	ContinuousValue() = default;
+	ContinuousValue(float64 duration) : _duration(duration) {
+	}
+	void start(float64 to, float64 duration) {
+		_to = to;
+		_delta = (_to - _cur) / duration;
+	}
+	void start(float64 to) {
+		start(to, _duration);
+	}
+
+	float64 current() const {
+		return _cur;
+	}
+	float64 to() const {
+		return _to;
+	}
+	float64 delta() const {
+		return _delta;
+	}
+	void update(crl::time dt, Fn<void(float64 &)> &&callback = nullptr) {
+		if (_to != _cur) {
+			_cur += _delta * dt;
+			if ((_to != _cur) && ((_delta > 0) == (_cur > _to))) {
+				_cur = _to;
+			}
+			if (callback) {
+				callback(_cur);
+			}
+		}
+	}
+
+private:
+	float64 _duration = 0.;
+	float64 _to = 0.;
+
+	float64 _cur = 0.;
+	float64 _delta = 0.;
+
+};
+
 class CircleBezier final {
 public:
 	CircleBezier(int n);
@@ -162,8 +199,8 @@ public:
 		float64 amplitudeDiffFactor,
 		bool isDirectionClockwise);
 
-	void setValue(float64 value);
-	void tick(float64 circleRadius, crl::time lastUpdateTime);
+	void setValue(float64 to);
+	void tick(float64 circleRadius, crl::time dt);
 
 	void paint(Painter &p, QColor c);
 
@@ -185,16 +222,13 @@ private:
 	const int _flingDistanceFactor;
 	const int _flingInAnimationDuration;
 	const int _flingOutAnimationDuration;
-	const float64 _amplitudeDiffSpeed;
-	const float64 _amplitudeDiffFactor;
+	const float64 _amplitudeInAnimationDuration;
+	const float64 _amplitudeOutAnimationDuration;
 	const int _directionClockwise;
 
 	bool _incRandomAdditionals = false;
 	bool _isIdle = true;
 	bool _wasFling = false;
-	float64 _amplitude = 0.;
-	float64 _animateAmplitudeDiff = 0.;
-	float64 _animateToAmplitude = 0.;
 	float64 _flingRadius = 0.;
 	float64 _idleRadius = 0.;
 	float64 _idleRotation = 0.;
@@ -203,6 +237,7 @@ private:
 	float64 _sineAngleMax = 0.;
 	float64 _waveAngle = 0.;
 	float64 _waveDiff = 0.;
+	ContinuousValue _levelValue;
 
 	rpl::event_stream<float64> _flingAnimationRequests;
 	rpl::event_stream<> _enterIdleAnimationRequests;
@@ -223,13 +258,8 @@ private:
 	const std::unique_ptr<Wave> _majorWave;
 	const std::unique_ptr<Wave> _minorWave;
 
-	float64 _amplitude = 0.;
-	float64 _animateToAmplitude = 0.;
-	float64 _animateAmplitudeDiff = 0.;
 	crl::time _lastUpdateTime = 0;
-
-	rpl::lifetime _animationLifetime;
-	rpl::lifetime _lifetime;
+	ContinuousValue _levelValue;
 
 };
 
@@ -320,25 +350,23 @@ Wave::Wave(
 , _flingDistanceFactor(flingDistanceFactor)
 , _flingInAnimationDuration(flingInAnimationDuration)
 , _flingOutAnimationDuration(flingOutAnimationDuration)
-, _amplitudeDiffSpeed(amplitudeDiffSpeed)
-, _amplitudeDiffFactor(amplitudeDiffFactor)
+, _amplitudeInAnimationDuration(kMinDivider
+	+ amplitudeDiffFactor * amplitudeDiffSpeed)
+, _amplitudeOutAnimationDuration(kMinDivider
+	+ kAmplitudeDiffFactorMax * amplitudeDiffSpeed)
 , _directionClockwise(isDirectionClockwise ? 1 : -1)
 , _rotation(rotationOffset) {
 	initEnterIdleAnimation(rpl::duplicate(animationTicked));
 	initFlingAnimation(std::move(animationTicked));
 }
 
-void Wave::setValue(float64 value) {
-	_animateToAmplitude = value;
+void Wave::setValue(float64 to) {
+	const auto duration = (to <= _levelValue.current())
+		? _amplitudeOutAnimationDuration
+		: _amplitudeInAnimationDuration;
+	_levelValue.start(to, duration);
 
-	const auto amplitudeDelta = (_animateToAmplitude - _amplitude);
-	const auto factor = (_animateToAmplitude <= _amplitude)
-		? kAmplitudeDiffFactorMax
-		: _amplitudeDiffFactor;
-	_animateAmplitudeDiff = amplitudeDelta
-		/ (kMinDivider + factor * _amplitudeDiffSpeed);
-
-	const auto idle = value < 0.1;
+	const auto idle = to < 0.1;
 	if (_isIdle != idle && idle) {
 		_enterIdleAnimationRequests.fire({});
 	}
@@ -414,30 +442,28 @@ void Wave::initFlingAnimation(rpl::producer<crl::time> animationTicked) {
 	}, _lifetime);
 }
 
-void Wave::tick(float64 circleRadius, crl::time lastUpdateTime) {
-	const auto dt = (crl::now() - lastUpdateTime);
+void Wave::tick(float64 circleRadius, crl::time dt) {
 
-	if (_animateToAmplitude != _amplitude) {
-		_amplitude += _animateAmplitudeDiff * dt;
-		ApplyTo(_amplitude, _animateToAmplitude, _animateAmplitudeDiff);
-
-		if (std::abs(_amplitude - _animateToAmplitude) * _amplitudeRadius
+	auto amplitudeCallback = [&](float64 &value) {
+		if (std::abs(value - _levelValue.to()) * _amplitudeRadius
 				< (st::historyRecordRandomAddition / 2)) {
 			if (!_wasFling) {
-				_flingAnimationRequests.fire_copy(_animateAmplitudeDiff);
+				_flingAnimationRequests.fire_copy(_levelValue.delta());
 				_wasFling = true;
 			}
 		} else {
 			_wasFling = false;
 		}
-	}
+	};
+	_levelValue.update(dt, std::move(amplitudeCallback));
 
 	_idleRadius = circleRadius * kIdleRadiusFactor;
 
 	{
-		const auto delta = (_sineAngleMax - _animateToAmplitude);
+		const auto to = _levelValue.to();
+		const auto delta = (_sineAngleMax - to);
 		if (std::abs(delta) - 0.25 < 0) {
-			_sineAngleMax = _animateToAmplitude;
+			_sineAngleMax = to;
 		} else {
 			_sineAngleMax -= 0.25 * ((delta < 0) ? -1 : 1);
 		}
@@ -445,7 +471,7 @@ void Wave::tick(float64 circleRadius, crl::time lastUpdateTime) {
 
 	if (!_isIdle) {
 		_rotation += dt
-			* (kRotationSpeed * 4. * (_amplitude > 0.5 ? 1 : _amplitude / 0.5)
+			* (kRotationSpeed * 4. * std::min(_levelValue.current() / .5, 1.)
 				+ kRotationSpeed * 0.5);
 		Normalize(_rotation, 360.);
 	} else {
@@ -468,13 +494,14 @@ void Wave::tick(float64 circleRadius, crl::time lastUpdateTime) {
 
 
 void Wave::paint(Painter &p, QColor c) {
-	const auto waveAmplitude = _amplitude < 0.3 ? _amplitude / 0.3 : 1.;
+	const auto amplitude = _levelValue.current();
+	const auto waveAmplitude = std::min(amplitude / .3, 1.);
 	const auto radiusDiff = st::historyRecordRadiusDiffMin
-		+ st::historyRecordRadiusDiff * kWaveAngle * _animateToAmplitude;
+		+ st::historyRecordRadiusDiff * kWaveAngle * _levelValue.to();
 
 	const auto diffFactor = 0.35 * waveAmplitude * _waveDiff;
 
-	const auto radius = (_lastRadius + _amplitudeRadius * _amplitude)
+	const auto radius = (_lastRadius + _amplitudeRadius * amplitude)
 		+ _idleGlobalRadius
 		+ (_flingRadius * waveAmplitude);
 
@@ -527,30 +554,28 @@ RecordCircle::RecordCircle(rpl::producer<crl::time> animationTicked)
 	kFlingOutAnimationDurationMinor,
 	kAnimationSpeedMinor,
 	kAmplitudeDiffFactorMinor,
-	false)) {
+	false))
+, _levelValue(kMinDivider
+	+ kAmplitudeDiffFactorMax * kAnimationSpeedCircle) {
 }
 
 void RecordCircle::setAmplitude(float64 value) {
-	_animateToAmplitude = std::min(kMaxAmplitude, value) / kMaxAmplitude;
-	_majorWave->setValue(_animateToAmplitude);
-	_minorWave->setValue(_animateToAmplitude);
-	_animateAmplitudeDiff = (_animateToAmplitude - _amplitude)
-		/ (kMinDivider + kAmplitudeDiffFactorMax * kAnimationSpeedCircle);
+	const auto to = std::min(kMaxAmplitude, value) / kMaxAmplitude;
+	_levelValue.start(to);
+	_majorWave->setValue(to);
+	_minorWave->setValue(to);
 }
 
 void RecordCircle::paint(Painter &p, QColor c) {
 
-	const auto dt = (crl::now() - _lastUpdateTime);
-	if (_animateToAmplitude != _amplitude) {
-		_amplitude += _animateAmplitudeDiff * dt;
-		ApplyTo(_amplitude, _animateToAmplitude, _animateAmplitudeDiff);
-	}
+	const auto dt = crl::now() - _lastUpdateTime;
+	_levelValue.update(dt);
 
 	const auto radius = (st::historyRecordLevelMainRadius
-		+ st::historyRecordLevelMainRadiusAmplitude * _amplitude);
+		+ st::historyRecordLevelMainRadiusAmplitude * _levelValue.current());
 
-	_majorWave->tick(radius, _lastUpdateTime);
-	_minorWave->tick(radius, _lastUpdateTime);
+	_majorWave->tick(radius, dt);
+	_minorWave->tick(radius, dt);
 	_lastUpdateTime = crl::now();
 
 	const auto opacity = p.opacity();

From dd462eb8cfe35fd4783272d39c8e0a2b28f8c081 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 2 Nov 2020 00:49:17 +0300
Subject: [PATCH 084/370] Slightly improved animation of bezier circle in
 VoiceRecordButton.

---
 .../history_view_voice_record_button.cpp       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index e554ce534..8a7a84719 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -24,7 +24,7 @@ constexpr auto kEnterIdleAnimationDuration = crl::time(1200);
 
 constexpr auto kRotationSpeed = 0.36 * 0.1;
 
-constexpr auto kRandomAdditionFactor = 0.3;
+constexpr auto kRandomAdditionFactor = 0.15;
 
 constexpr auto kIdleRadiusGlobalFactor = 0.56;
 constexpr auto kIdleRadiusFactor = 0.15 * 0.5;
@@ -37,13 +37,13 @@ constexpr auto kIdleRotateDiff = 0.1 * kIdleRotationSpeed;
 
 constexpr auto kWaveAngle = 0.03;
 
-constexpr auto kAnimationSpeedMajor = 1.5;// - 0.65;
-constexpr auto kAnimationSpeedMinor = 1.5;// - 0.45;
-constexpr auto kAnimationSpeedCircle = 1.5;// - 0.25;
+constexpr auto kAnimationSpeedMajor = 1.5 - 0.65;
+constexpr auto kAnimationSpeedMinor = 1.5 - 0.45;
+constexpr auto kAnimationSpeedCircle = 1.5 - 0.25;
 
-constexpr auto kAmplitudeDiffFactorMax = 500.;
-constexpr auto kAmplitudeDiffFactorMajor = 300.;
-constexpr auto kAmplitudeDiffFactorMinor = 400.;
+constexpr auto kAmplitudeDiffFactorMax = 500. - 100.;
+constexpr auto kAmplitudeDiffFactorMajor = 300. - 100.;
+constexpr auto kAmplitudeDiffFactorMinor = 400. - 100.;
 
 constexpr auto kFlingDistanceFactorMajor = 8 * 16;
 constexpr auto kFlingDistanceFactorMinor = 20 * 16;
@@ -53,8 +53,8 @@ constexpr auto kFlingInAnimationDurationMinor = 350;
 constexpr auto kFlingOutAnimationDurationMajor = 220;
 constexpr auto kFlingOutAnimationDurationMinor = 380;
 
-constexpr auto kSineWaveSpeedMajor = 0.02 * 0.2 * 0.5;
-constexpr auto kSineWaveSpeedMinor = 0.026 * 0.2 * 0.5;
+constexpr auto kSineWaveSpeedMajor = 0.02 * 0.2;
+constexpr auto kSineWaveSpeedMinor = 0.026 * 0.2;
 
 constexpr auto kSmallWaveRadius = 0.55;
 

From c4897cec0a18d30771fd7aed5f78ce7c830bd9d9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 2 Nov 2020 19:32:38 +0300
Subject: [PATCH 085/370] Replaced dummy lock icons with lock animation.

---
 .../history_view_voice_record_bar.cpp         | 69 ++++++++++++++++---
 Telegram/SourceFiles/ui/chat/chat.style       | 11 ++-
 2 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 1a85e370b..d5cad9a26 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -37,6 +37,8 @@ constexpr auto kMaxSamples =
 
 constexpr auto kPrecision = 10;
 
+constexpr auto kLockArcAngle = 15.;
+
 enum class FilterType {
 	Continue,
 	ShowBox,
@@ -76,13 +78,22 @@ private:
 	void setProgress(float64 progress);
 	void startLockingAnimation(float64 to);
 
+	const QPen _arcPen;
+
 	Ui::Animations::Simple _lockAnimation;
 	Ui::Animations::Simple _lockEnderAnimation;
 
 	rpl::variable<float64> _progress = 0.;
 };
 
-RecordLock::RecordLock(not_null<Ui::RpWidget*> parent) : RpWidget(parent) {
+RecordLock::RecordLock(not_null<Ui::RpWidget*> parent)
+: RpWidget(parent)
+, _arcPen(
+	st::historyRecordLockIconFg,
+	st::historyRecordLockIconLineWidth,
+	Qt::SolidLine,
+	Qt::SquareCap,
+	Qt::RoundJoin) {
 	resize(
 		st::historyRecordLockTopShadow.width(),
 		st::historyRecordLockSize.height());
@@ -189,14 +200,54 @@ void RecordLock::drawProgress(Painter &p) {
 		p.setOpacity(1.);
 	}
 	{
-		const auto &icon = isLocked()
-			? st::historyRecordLockIcon
-			: st::historyRecordUnlockIcon;
-		icon.paint(
-			p,
-			inner.x() + (inner.width() - icon.width()) / 2,
-			inner.y() + (originTop.height() * 2 - icon.height()) / 2,
-			inner.width());
+		PainterHighQualityEnabler hq(p);
+		const auto &size = st::historyRecordLockIconSize;
+		const auto &blockHeight = st::historyRecordLockIconBottomHeight;
+		const auto blockRect = QRect(
+			0,
+			size.height() - blockHeight,
+			size.width(),
+			blockHeight);
+		const auto &lineHeight = st::historyRecordLockIconLineHeight;
+		const auto &offset = st::historyRecordLockIconLineSkip;
+
+		p.setPen(Qt::NoPen);
+		p.setBrush(st::historyRecordLockIconFg);
+		p.translate(
+			inner.x() + (inner.width() - size.width()) / 2,
+			inner.y() + (originTop.height() * 2 - size.height()) / 2);
+		p.drawRoundedRect(blockRect, 2, 3);
+
+		p.translate(
+			size.width() - offset,
+			blockRect.y());
+
+		if (progress < 1. && progress > 0.) {
+			p.rotate(kLockArcAngle * progress);
+		}
+
+		p.setPen(_arcPen);
+		const auto rLine = QLineF(0, 0, 0, -lineHeight);
+		p.drawLine(rLine);
+
+		const auto arcWidth = size.width() - offset * 2;
+		const auto &arcHeight = st::historyRecordLockIconArcHeight;
+		p.drawArc(
+			-arcWidth,
+			rLine.dy() - arcHeight - _arcPen.width() + rLine.y1(),
+			arcWidth,
+			arcHeight * 2,
+			0,
+			180 * 16);
+
+		const auto lockProgress = 1. - _lockAnimation.value(1.);
+		if (progress == 1. && lockProgress < 1.) {
+			p.drawLine(
+				-arcWidth,
+				rLine.y2(),
+				-arcWidth,
+				rLine.dy() * lockProgress);
+		}
 	}
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index ebaca8649..f783f6fd1 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -363,6 +363,14 @@ historyRecordTextRight: 25px;
 historyRecordLockShowDuration: historyToDownDuration;
 historyRecordLockSize: size(75px, 150px);
 
+historyRecordLockIconFg: historyToDownFg;
+historyRecordLockIconSize: size(14px, 18px);
+historyRecordLockIconBottomHeight: 9px;
+historyRecordLockIconLineHeight: 2px;
+historyRecordLockIconLineSkip: 3px;
+historyRecordLockIconLineWidth: 2px;
+historyRecordLockIconArcHeight: 4px;
+
 historyRecordLockTopShadow: icon {{ "lock/record_lock_top_shadow", historyToDownShadow }};
 historyRecordLockTop: icon {{ "lock/record_lock_top", historyToDownBg }};
 historyRecordLockBottomShadow: icon {{ "lock/record_lock_bottom_shadow", historyToDownShadow }};
@@ -374,9 +382,6 @@ historyRecordLockArrow: icon {{ "history_down_arrow-flip_vertical", historyToDow
 
 historyRecordLockPosition: historyToDownPosition;
 
-historyRecordLockIcon: icon {{ "dialogs_unlock", historyToDownFg, point(1px, 0px) }};
-historyRecordUnlockIcon: icon {{ "dialogs_lock", historyToDownFg, point(0px, 0px) }};
-
 historySilentToggle: IconButton(historyBotKeyboardShow) {
 	icon: icon {{ "send_control_silent_off", historyComposeIconFg }};
 	iconOver: icon {{ "send_control_silent_off", historyComposeIconFgOver }};

From 203539256439f56d11a6121e1bdff46bc3922141 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 3 Nov 2020 18:57:40 +0300
Subject: [PATCH 086/370] Removed bezier circle paint when animations are
 disabled.

---
 .../history_view_voice_record_button.cpp      | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index 8a7a84719..148496977 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -571,19 +571,22 @@ void RecordCircle::paint(Painter &p, QColor c) {
 	const auto dt = crl::now() - _lastUpdateTime;
 	_levelValue.update(dt);
 
+	const auto &mainRadius = st::historyRecordLevelMainRadiusAmplitude;
 	const auto radius = (st::historyRecordLevelMainRadius
-		+ st::historyRecordLevelMainRadiusAmplitude * _levelValue.current());
+		+ (anim::Disabled() ? 0 : mainRadius * _levelValue.current()));
 
-	_majorWave->tick(radius, dt);
-	_minorWave->tick(radius, dt);
-	_lastUpdateTime = crl::now();
+	if (!anim::Disabled()) {
+		_majorWave->tick(radius, dt);
+		_minorWave->tick(radius, dt);
+		_lastUpdateTime = crl::now();
 
-	const auto opacity = p.opacity();
-	p.setOpacity(kOpacityMajor);
-	_majorWave->paint(p, c);
-	p.setOpacity(kOpacityMinor);
-	_minorWave->paint(p, c);
-	p.setOpacity(opacity);
+		const auto opacity = p.opacity();
+		p.setOpacity(kOpacityMajor);
+		_majorWave->paint(p, c);
+		p.setOpacity(kOpacityMinor);
+		_minorWave->paint(p, c);
+		p.setOpacity(opacity);
+	}
 
 	p.setPen(Qt::NoPen);
 	p.setBrush(c);
@@ -598,7 +601,9 @@ VoiceRecordButton::VoiceRecordButton(
 	_recordAnimationTicked.events()))
 , _center(st::historyRecordLevelMaxRadius)
 , _recordingAnimation([=](crl::time now) {
-	update();
+	if (!anim::Disabled()) {
+		update();
+	}
 	_recordAnimationTicked.fire_copy(now);
 	return true;
 }) {

From 1d120092cff03b40b1396a30b25793acf83386ad Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 3 Nov 2020 19:29:30 +0300
Subject: [PATCH 087/370] Fixed previous values resetting in VoiceRecordButton.

---
 .../history_view_voice_record_button.cpp      | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index 148496977..e94604f94 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -126,6 +126,9 @@ public:
 	void start(float64 to) {
 		start(to, _duration);
 	}
+	void reset() {
+		_to = _cur = _delta = 0.;
+	}
 
 	float64 current() const {
 		return _cur;
@@ -201,6 +204,7 @@ public:
 
 	void setValue(float64 to);
 	void tick(float64 circleRadius, crl::time dt);
+	void reset();
 
 	void paint(Painter &p, QColor c);
 
@@ -250,6 +254,7 @@ class RecordCircle final {
 public:
 	RecordCircle(rpl::producer<crl::time> animationTicked);
 
+	void reset();
 	void setAmplitude(float64 value);
 	void paint(Painter &p, QColor c);
 
@@ -360,6 +365,21 @@ Wave::Wave(
 	initFlingAnimation(std::move(animationTicked));
 }
 
+void Wave::reset() {
+	_incRandomAdditionals = false;
+	_isIdle = true;
+	_wasFling = false;
+	_flingRadius = 0.;
+	_idleRadius = 0.;
+	_idleRotation = 0.;
+	_lastRadius = 0.;
+	_rotation = 0.;
+	_sineAngleMax = 0.;
+	_waveAngle = 0.;
+	_waveDiff = 0.;
+	_levelValue.reset();
+}
+
 void Wave::setValue(float64 to) {
 	const auto duration = (to <= _levelValue.current())
 		? _amplitudeOutAnimationDuration
@@ -559,6 +579,12 @@ RecordCircle::RecordCircle(rpl::producer<crl::time> animationTicked)
 	+ kAmplitudeDiffFactorMax * kAnimationSpeedCircle) {
 }
 
+void RecordCircle::reset() {
+	_majorWave->reset();
+	_minorWave->reset();
+	_levelValue.reset();
+}
+
 void RecordCircle::setAmplitude(float64 value) {
 	const auto to = std::min(kMaxAmplitude, value) / kMaxAmplitude;
 	_levelValue.start(to);
@@ -567,7 +593,6 @@ void RecordCircle::setAmplitude(float64 value) {
 }
 
 void RecordCircle::paint(Painter &p, QColor c) {
-
 	const auto dt = crl::now() - _lastUpdateTime;
 	_levelValue.update(dt);
 
@@ -655,13 +680,15 @@ void VoiceRecordButton::init() {
 
 	rpl::merge(
 		shownValue(),
-		_showProgress.value() | rpl::map(hasProgress)
+		_showProgress.value(
+		) | rpl::map(hasProgress) | rpl::distinct_until_changed()
 	) | rpl::start_with_next([=](bool show) {
 		setVisible(show);
 		setMouseTracking(show);
 		if (!show) {
 			_recordingAnimation.stop();
 			_showProgress = 0.;
+			_recordCircle->reset();
 		} else {
 			if (!_recordingAnimation.animating()) {
 				_recordingAnimation.start();

From 5d2ffae215f2bd29ff11e2250c072004a336cce8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 9 Nov 2020 17:35:51 +0300
Subject: [PATCH 088/370] Improved VoiceRecordButton colors.

---
 .../history/view/controls/history_view_voice_record_bar.cpp  | 2 +-
 .../view/controls/history_view_voice_record_button.cpp       | 2 +-
 Telegram/SourceFiles/ui/chat/chat.style                      | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index d5cad9a26..29a765397 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -691,7 +691,7 @@ void VoiceRecordBar::startRedCircleAnimation() {
 void VoiceRecordBar::drawRedCircle(Painter &p) {
 	PainterHighQualityEnabler hq(p);
 	p.setPen(Qt::NoPen);
-	p.setBrush(st::historyRecordSignalColor);
+	p.setBrush(st::historyRecordVoiceFgInactive);
 
 	p.setOpacity(1. - _redCircleProgress);
 	const int radii = st::historyRecordSignalRadius * showAnimationRatio();
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index e94604f94..64ef1e235 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -665,7 +665,7 @@ void VoiceRecordButton::init() {
 		}
 		PainterHighQualityEnabler hq(p);
 		const auto color = anim::color(
-			st::historyRecordSignalColor,
+			st::historyRecordVoiceFgInactive,
 			st::historyRecordVoiceFgActive,
 			_colorProgress.current());
 		_recordCircle->paint(p, color);
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index f783f6fd1..7fead3ef5 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -327,14 +327,15 @@ historyScheduledToggle: IconButton(historyAttach) {
 }
 historyRecordVoiceFg: historyComposeIconFg;
 historyRecordVoiceFgOver: historyComposeIconFgOver;
+historyRecordVoiceFgInactive: attentionButtonFg;
 historyRecordVoiceFgActive: windowBgActive;
+historyRecordVoiceFgActiveIcon: windowFgActive;
 historyRecordVoiceShowDuration: 120;
 historyRecordVoiceDuration: 120;
 historyRecordVoice: icon {{ "send_control_record", historyRecordVoiceFg }};
 historyRecordVoiceOver: icon {{ "send_control_record", historyRecordVoiceFgOver }};
-historyRecordVoiceActive: icon {{ "send_control_record_active", recordActiveIcon }};
+historyRecordVoiceActive: icon {{ "send_control_record_active", historyRecordVoiceFgActiveIcon }};
 historyRecordVoiceRippleBgActive: lightButtonBgOver;
-historyRecordSignalColor: attentionButtonFg;
 historyRecordSignalRadius: 5px;
 historyRecordCancel: windowSubTextFg;
 historyRecordCancelActive: windowActiveTextFg;

From ac02e2be9e8b201a048b7f5c9421949e9a50319d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 10 Nov 2020 17:10:08 +0300
Subject: [PATCH 089/370] Add FieldAutocomplete to ComposeControls.

---
 .../chat_helpers/field_autocomplete.cpp       | 192 +++++++++++-----
 .../chat_helpers/field_autocomplete.h         | 173 ++++-----------
 .../SourceFiles/history/history_widget.cpp    |   4 +-
 .../history_view_compose_controls.cpp         | 209 +++++++++++++++++-
 .../controls/history_view_compose_controls.h  |  12 +
 .../view/history_view_replies_section.cpp     |  32 ++-
 .../view/history_view_replies_section.h       |   1 +
 .../view/history_view_scheduled_section.cpp   |  18 +-
 .../support/support_autocomplete.h            |   2 +-
 9 files changed, 444 insertions(+), 199 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 41bce617a..3c6100de8 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/stickers/data_stickers.h"
 #include "chat_helpers/send_context_menu.h" // SendMenu::FillSendMenu
 #include "chat_helpers/stickers_lottie.h"
+#include "chat_helpers/message_field.h" // PrepareMentionTag.
 #include "mainwindow.h"
 #include "apiwrap.h"
 #include "main/main_session.h"
@@ -27,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lottie/lottie_single_player.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/scroll_area.h"
+#include "ui/widgets/input_fields.h"
 #include "ui/image/image.h"
 #include "ui/ui_utility.h"
 #include "ui/cached_round_corners.h"
@@ -39,15 +41,105 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtWidgets/QApplication>
 
+class FieldAutocomplete::Inner final
+	: public Ui::RpWidget
+	, private base::Subscriber {
+
+public:
+	struct ScrollTo {
+		int top;
+		int bottom;
+	};
+
+	Inner(
+		not_null<Window::SessionController*> controller,
+		not_null<FieldAutocomplete*> parent,
+		not_null<MentionRows*> mrows,
+		not_null<HashtagRows*> hrows,
+		not_null<BotCommandRows*> brows,
+		not_null<StickerRows*> srows);
+
+	void clearSel(bool hidden = false);
+	bool moveSel(int key);
+	bool chooseSelected(FieldAutocomplete::ChooseMethod method) const;
+	bool chooseAtIndex(
+		FieldAutocomplete::ChooseMethod method,
+		int index,
+		Api::SendOptions options = Api::SendOptions()) const;
+
+	void setRecentInlineBotsInRows(int32 bots);
+	void rowsUpdated();
+
+	rpl::producer<FieldAutocomplete::MentionChosen> mentionChosen() const;
+	rpl::producer<FieldAutocomplete::HashtagChosen> hashtagChosen() const;
+	rpl::producer<FieldAutocomplete::BotCommandChosen>
+		botCommandChosen() const;
+	rpl::producer<FieldAutocomplete::StickerChosen> stickerChosen() const;
+	rpl::producer<ScrollTo> scrollToRequested() const;
+
+	void onParentGeometryChanged();
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+
+	void enterEventHook(QEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void contextMenuEvent(QContextMenuEvent *e) override;
+
+	void updateSelectedRow();
+	void setSel(int sel, bool scroll = false);
+	void showPreview();
+	void selectByMouse(QPoint global);
+
+	QSize stickerBoundingBox() const;
+	void setupLottie(StickerSuggestion &suggestion);
+	void repaintSticker(not_null<DocumentData*> document);
+	std::shared_ptr<Lottie::FrameRenderer> getLottieRenderer();
+
+	const not_null<Window::SessionController*> _controller;
+	const not_null<FieldAutocomplete*> _parent;
+	const not_null<MentionRows*> _mrows;
+	const not_null<HashtagRows*> _hrows;
+	const not_null<BotCommandRows*> _brows;
+	const not_null<StickerRows*> _srows;
+	rpl::lifetime _stickersLifetime;
+	std::weak_ptr<Lottie::FrameRenderer> _lottieRenderer;
+	base::unique_qptr<Ui::PopupMenu> _menu;
+	int _stickersPerRow = 1;
+	int _recentInlineBotsInRows = 0;
+	int _sel = -1;
+	int _down = -1;
+	std::optional<QPoint> _lastMousePosition;
+	bool _mouseSelection = false;
+
+	bool _overDelete = false;
+
+	bool _previewShown = false;
+
+	rpl::event_stream<FieldAutocomplete::MentionChosen> _mentionChosen;
+	rpl::event_stream<FieldAutocomplete::HashtagChosen> _hashtagChosen;
+	rpl::event_stream<FieldAutocomplete::BotCommandChosen> _botCommandChosen;
+	rpl::event_stream<FieldAutocomplete::StickerChosen> _stickerChosen;
+	rpl::event_stream<ScrollTo> _scrollToRequested;
+
+	base::Timer _previewTimer;
+
+};
+
 FieldAutocomplete::FieldAutocomplete(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
 : RpWidget(parent)
 , _controller(controller)
 , _scroll(this, st::mentionScroll) {
-	_scroll->setGeometry(rect());
+	hide();
 
-	using Inner = internal::FieldAutocompleteInner;
+	_scroll->setGeometry(rect());
 
 	_inner = _scroll->setOwnedWidget(
 		object_ptr<Inner>(
@@ -76,6 +168,10 @@ FieldAutocomplete::FieldAutocomplete(
 		&Inner::onParentGeometryChanged);
 }
 
+not_null<Window::SessionController*> FieldAutocomplete::controller() const {
+	return _controller;
+}
+
 auto FieldAutocomplete::mentionChosen() const
 -> rpl::producer<FieldAutocomplete::MentionChosen> {
 	return _inner->mentionChosen();
@@ -125,9 +221,9 @@ void FieldAutocomplete::showFiltered(
 	if (query.isEmpty()) {
 		_type = Type::Mentions;
 		rowsUpdated(
-			internal::MentionRows(),
-			internal::HashtagRows(),
-			internal::BotCommandRows(),
+			MentionRows(),
+			HashtagRows(),
+			BotCommandRows(),
 			base::take(_srows),
 			false);
 		return;
@@ -171,7 +267,7 @@ void FieldAutocomplete::showStickers(EmojiPtr emoji) {
 			base::take(_mrows),
 			base::take(_hrows),
 			base::take(_brows),
-			internal::StickerRows(),
+			StickerRows(),
 			false);
 		return;
 	}
@@ -203,7 +299,7 @@ inline int indexOfInFirstN(const T &v, const U &elem, int last) {
 }
 }
 
-internal::StickerRows FieldAutocomplete::getStickerSuggestions() {
+FieldAutocomplete::StickerRows FieldAutocomplete::getStickerSuggestions() {
 	const auto list = _controller->session().data().stickers().getListByEmoji(
 		_emoji,
 		_stickersSeed
@@ -211,7 +307,7 @@ internal::StickerRows FieldAutocomplete::getStickerSuggestions() {
 	auto result = ranges::view::all(
 		list
 	) | ranges::view::transform([](not_null<DocumentData*> sticker) {
-		return internal::StickerSuggestion{
+		return StickerSuggestion{
 			sticker,
 			sticker->createMediaView()
 		};
@@ -223,7 +319,7 @@ internal::StickerRows FieldAutocomplete::getStickerSuggestions() {
 		const auto i = ranges::find(
 			result,
 			suggestion.document,
-			&internal::StickerSuggestion::document);
+			&StickerSuggestion::document);
 		if (i != end(result)) {
 			i->animated = std::move(suggestion.animated);
 		}
@@ -233,10 +329,10 @@ internal::StickerRows FieldAutocomplete::getStickerSuggestions() {
 
 void FieldAutocomplete::updateFiltered(bool resetScroll) {
 	int32 now = base::unixtime::now(), recentInlineBots = 0;
-	internal::MentionRows mrows;
-	internal::HashtagRows hrows;
-	internal::BotCommandRows brows;
-	internal::StickerRows srows;
+	MentionRows mrows;
+	HashtagRows hrows;
+	BotCommandRows brows;
+	StickerRows srows;
 	if (_emoji) {
 		srows = getStickerSuggestions();
 	} else if (_type == Type::Mentions) {
@@ -435,10 +531,10 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
 }
 
 void FieldAutocomplete::rowsUpdated(
-		internal::MentionRows &&mrows,
-		internal::HashtagRows &&hrows,
-		internal::BotCommandRows &&brows,
-		internal::StickerRows &&srows,
+		MentionRows &&mrows,
+		HashtagRows &&hrows,
+		BotCommandRows &&brows,
+		StickerRows &&srows,
 		bool resetScroll) {
 	if (mrows.empty() && hrows.empty() && brows.empty() && srows.empty()) {
 		if (!isHidden()) {
@@ -620,9 +716,7 @@ bool FieldAutocomplete::eventFilter(QObject *obj, QEvent *e) {
 	return QWidget::eventFilter(obj, e);
 }
 
-namespace internal {
-
-FieldAutocompleteInner::FieldAutocompleteInner(
+FieldAutocomplete::Inner::Inner(
 	not_null<Window::SessionController*> controller,
 	not_null<FieldAutocomplete*> parent,
 	not_null<MentionRows*> mrows,
@@ -642,7 +736,7 @@ FieldAutocompleteInner::FieldAutocompleteInner(
 	}, lifetime());
 }
 
-void FieldAutocompleteInner::paintEvent(QPaintEvent *e) {
+void FieldAutocomplete::Inner::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
 	QRect r(e->rect());
@@ -841,11 +935,11 @@ void FieldAutocompleteInner::paintEvent(QPaintEvent *e) {
 	p.fillRect(Adaptive::OneColumn() ? 0 : st::lineWidth, _parent->innerTop(), width() - (Adaptive::OneColumn() ? 0 : st::lineWidth), st::lineWidth, st::shadowFg);
 }
 
-void FieldAutocompleteInner::resizeEvent(QResizeEvent *e) {
+void FieldAutocomplete::Inner::resizeEvent(QResizeEvent *e) {
 	_stickersPerRow = qMax(1, int32(width() - 2 * st::stickerPanPadding) / int32(st::stickerPanSize.width()));
 }
 
-void FieldAutocompleteInner::mouseMoveEvent(QMouseEvent *e) {
+void FieldAutocomplete::Inner::mouseMoveEvent(QMouseEvent *e) {
 	const auto globalPosition = e->globalPos();
 	if (!_lastMousePosition) {
 		_lastMousePosition = globalPosition;
@@ -857,7 +951,7 @@ void FieldAutocompleteInner::mouseMoveEvent(QMouseEvent *e) {
 	selectByMouse(globalPosition);
 }
 
-void FieldAutocompleteInner::clearSel(bool hidden) {
+void FieldAutocomplete::Inner::clearSel(bool hidden) {
 	_overDelete = false;
 	_mouseSelection = false;
 	_lastMousePosition = std::nullopt;
@@ -868,7 +962,7 @@ void FieldAutocompleteInner::clearSel(bool hidden) {
 	}
 }
 
-bool FieldAutocompleteInner::moveSel(int key) {
+bool FieldAutocomplete::Inner::moveSel(int key) {
 	_mouseSelection = false;
 	_lastMousePosition = std::nullopt;
 
@@ -903,12 +997,12 @@ bool FieldAutocompleteInner::moveSel(int key) {
 	return true;
 }
 
-bool FieldAutocompleteInner::chooseSelected(
+bool FieldAutocomplete::Inner::chooseSelected(
 		FieldAutocomplete::ChooseMethod method) const {
 	return chooseAtIndex(method, _sel);
 }
 
-bool FieldAutocompleteInner::chooseAtIndex(
+bool FieldAutocomplete::Inner::chooseAtIndex(
 		FieldAutocomplete::ChooseMethod method,
 		int index,
 		Api::SendOptions options) const {
@@ -955,11 +1049,11 @@ bool FieldAutocompleteInner::chooseAtIndex(
 	return false;
 }
 
-void FieldAutocompleteInner::setRecentInlineBotsInRows(int32 bots) {
+void FieldAutocomplete::Inner::setRecentInlineBotsInRows(int32 bots) {
 	_recentInlineBotsInRows = bots;
 }
 
-void FieldAutocompleteInner::mousePressEvent(QMouseEvent *e) {
+void FieldAutocomplete::Inner::mousePressEvent(QMouseEvent *e) {
 	selectByMouse(e->globalPos());
 	if (e->button() == Qt::LeftButton) {
 		if (_overDelete && _sel >= 0 && _sel < (_mrows->empty() ? _hrows->size() : _recentInlineBotsInRows)) {
@@ -999,7 +1093,7 @@ void FieldAutocompleteInner::mousePressEvent(QMouseEvent *e) {
 	}
 }
 
-void FieldAutocompleteInner::mouseReleaseEvent(QMouseEvent *e) {
+void FieldAutocomplete::Inner::mouseReleaseEvent(QMouseEvent *e) {
 	_previewTimer.cancel();
 
 	int32 pressed = _down;
@@ -1017,7 +1111,7 @@ void FieldAutocompleteInner::mouseReleaseEvent(QMouseEvent *e) {
 	chooseSelected(FieldAutocomplete::ChooseMethod::ByClick);
 }
 
-void FieldAutocompleteInner::contextMenuEvent(QContextMenuEvent *e) {
+void FieldAutocomplete::Inner::contextMenuEvent(QContextMenuEvent *e) {
 	if (_sel < 0 || _srows->empty() || _down >= 0) {
 		return;
 	}
@@ -1040,11 +1134,11 @@ void FieldAutocompleteInner::contextMenuEvent(QContextMenuEvent *e) {
 	}
 }
 
-void FieldAutocompleteInner::enterEventHook(QEvent *e) {
+void FieldAutocomplete::Inner::enterEventHook(QEvent *e) {
 	setMouseTracking(true);
 }
 
-void FieldAutocompleteInner::leaveEventHook(QEvent *e) {
+void FieldAutocomplete::Inner::leaveEventHook(QEvent *e) {
 	setMouseTracking(false);
 	if (_mouseSelection) {
 		setSel(-1);
@@ -1053,7 +1147,7 @@ void FieldAutocompleteInner::leaveEventHook(QEvent *e) {
 	}
 }
 
-void FieldAutocompleteInner::updateSelectedRow() {
+void FieldAutocomplete::Inner::updateSelectedRow() {
 	if (_sel >= 0) {
 		if (_srows->empty()) {
 			update(0, _sel * st::mentionHeight, width(), st::mentionHeight);
@@ -1064,7 +1158,7 @@ void FieldAutocompleteInner::updateSelectedRow() {
 	}
 }
 
-void FieldAutocompleteInner::setSel(int sel, bool scroll) {
+void FieldAutocomplete::Inner::setSel(int sel, bool scroll) {
 	updateSelectedRow();
 	_sel = sel;
 	updateSelectedRow();
@@ -1084,13 +1178,13 @@ void FieldAutocompleteInner::setSel(int sel, bool scroll) {
 	}
 }
 
-void FieldAutocompleteInner::rowsUpdated() {
+void FieldAutocomplete::Inner::rowsUpdated() {
 	if (_srows->empty()) {
 		_stickersLifetime.destroy();
 	}
 }
 
-auto FieldAutocompleteInner::getLottieRenderer()
+auto FieldAutocomplete::Inner::getLottieRenderer()
 -> std::shared_ptr<Lottie::FrameRenderer> {
 	if (auto result = _lottieRenderer.lock()) {
 		return result;
@@ -1100,7 +1194,7 @@ auto FieldAutocompleteInner::getLottieRenderer()
 	return result;
 }
 
-void FieldAutocompleteInner::setupLottie(StickerSuggestion &suggestion) {
+void FieldAutocomplete::Inner::setupLottie(StickerSuggestion &suggestion) {
 	const auto document = suggestion.document;
 	suggestion.animated = ChatHelpers::LottiePlayerFromDocument(
 		suggestion.documentMedia.get(),
@@ -1115,13 +1209,13 @@ void FieldAutocompleteInner::setupLottie(StickerSuggestion &suggestion) {
 	}, _stickersLifetime);
 }
 
-QSize FieldAutocompleteInner::stickerBoundingBox() const {
+QSize FieldAutocomplete::Inner::stickerBoundingBox() const {
 	return QSize(
 		st::stickerPanSize.width() - st::buttonRadius * 2,
 		st::stickerPanSize.height() - st::buttonRadius * 2);
 }
 
-void FieldAutocompleteInner::repaintSticker(
+void FieldAutocomplete::Inner::repaintSticker(
 		not_null<DocumentData*> document) {
 	const auto i = ranges::find(
 		*_srows,
@@ -1140,7 +1234,7 @@ void FieldAutocompleteInner::repaintSticker(
 		st::stickerPanSize.height());
 }
 
-void FieldAutocompleteInner::selectByMouse(QPoint globalPosition) {
+void FieldAutocomplete::Inner::selectByMouse(QPoint globalPosition) {
 	_mouseSelection = true;
 	_lastMousePosition = globalPosition;
 	const auto mouse = mapFromGlobal(globalPosition);
@@ -1186,7 +1280,7 @@ void FieldAutocompleteInner::selectByMouse(QPoint globalPosition) {
 	}
 }
 
-void FieldAutocompleteInner::onParentGeometryChanged() {
+void FieldAutocomplete::Inner::onParentGeometryChanged() {
 	const auto globalPosition = QCursor::pos();
 	if (rect().contains(mapFromGlobal(globalPosition))) {
 		setMouseTracking(true);
@@ -1196,7 +1290,7 @@ void FieldAutocompleteInner::onParentGeometryChanged() {
 	}
 }
 
-void FieldAutocompleteInner::showPreview() {
+void FieldAutocomplete::Inner::showPreview() {
 	if (_down >= 0 && _down < _srows->size()) {
 		if (const auto w = App::wnd()) {
 			w->showMediaPreview(
@@ -1207,29 +1301,27 @@ void FieldAutocompleteInner::showPreview() {
 	}
 }
 
-auto FieldAutocompleteInner::mentionChosen() const
+auto FieldAutocomplete::Inner::mentionChosen() const
 -> rpl::producer<FieldAutocomplete::MentionChosen> {
 	return _mentionChosen.events();
 }
 
-auto FieldAutocompleteInner::hashtagChosen() const
+auto FieldAutocomplete::Inner::hashtagChosen() const
 -> rpl::producer<FieldAutocomplete::HashtagChosen> {
 	return _hashtagChosen.events();
 }
 
-auto FieldAutocompleteInner::botCommandChosen() const
+auto FieldAutocomplete::Inner::botCommandChosen() const
 -> rpl::producer<FieldAutocomplete::BotCommandChosen> {
 	return _botCommandChosen.events();
 }
 
-auto FieldAutocompleteInner::stickerChosen() const
+auto FieldAutocomplete::Inner::stickerChosen() const
 -> rpl::producer<FieldAutocomplete::StickerChosen> {
 	return _stickerChosen.events();
 }
 
-auto FieldAutocompleteInner::scrollToRequested() const
+auto FieldAutocomplete::Inner::scrollToRequested() const
 -> rpl::producer<ScrollTo> {
 	return _scrollToRequested.events();
 }
-
-} // namespace internal
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
index e7d3f3205..8adbaa2c3 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Ui {
 class PopupMenu;
 class ScrollArea;
+class InputField;
 } // namespace Ui
 
 namespace Lottie {
@@ -32,42 +33,15 @@ class DocumentMedia;
 class CloudImageView;
 } // namespace Data
 
-namespace internal {
-
-struct StickerSuggestion {
-	not_null<DocumentData*> document;
-	std::shared_ptr<Data::DocumentMedia> documentMedia;
-	std::unique_ptr<Lottie::SinglePlayer> animated;
-};
-
-struct MentionRow {
-	not_null<UserData*> user;
-	std::shared_ptr<Data::CloudImageView> userpic;
-};
-
-struct BotCommandRow {
-	not_null<UserData*> user;
-	not_null<const BotCommand*> command;
-	std::shared_ptr<Data::CloudImageView> userpic;
-};
-
-using HashtagRows = std::vector<QString>;
-using BotCommandRows = std::vector<BotCommandRow>;
-using StickerRows = std::vector<StickerSuggestion>;
-using MentionRows = std::vector<MentionRow>;
-
-class FieldAutocompleteInner;
-
-} // namespace internal
-
 class FieldAutocomplete final : public Ui::RpWidget {
-
 public:
 	FieldAutocomplete(
 		QWidget *parent,
 		not_null<Window::SessionController*> controller);
 	~FieldAutocomplete();
 
+	[[nodiscard]] not_null<Window::SessionController*> controller() const;
+
 	bool clearFilteredBotCommands();
 	void showFiltered(
 		not_null<PeerData*> peer,
@@ -140,29 +114,54 @@ protected:
 	void paintEvent(QPaintEvent *e) override;
 
 private:
+	class Inner;
+	friend class Inner;
+
+	struct StickerSuggestion {
+		not_null<DocumentData*> document;
+		std::shared_ptr<Data::DocumentMedia> documentMedia;
+		std::unique_ptr<Lottie::SinglePlayer> animated;
+	};
+
+	struct MentionRow {
+		not_null<UserData*> user;
+		std::shared_ptr<Data::CloudImageView> userpic;
+	};
+
+	struct BotCommandRow {
+		not_null<UserData*> user;
+		not_null<const BotCommand*> command;
+		std::shared_ptr<Data::CloudImageView> userpic;
+	};
+
+	using HashtagRows = std::vector<QString>;
+	using BotCommandRows = std::vector<BotCommandRow>;
+	using StickerRows = std::vector<StickerSuggestion>;
+	using MentionRows = std::vector<MentionRow>;
+
 	void animationCallback();
 	void hideFinish();
 
 	void updateFiltered(bool resetScroll = false);
 	void recount(bool resetScroll = false);
-	internal::StickerRows getStickerSuggestions();
+	StickerRows getStickerSuggestions();
 
 	const not_null<Window::SessionController*> _controller;
 	QPixmap _cache;
-	internal::MentionRows _mrows;
-	internal::HashtagRows _hrows;
-	internal::BotCommandRows _brows;
-	internal::StickerRows _srows;
+	MentionRows _mrows;
+	HashtagRows _hrows;
+	BotCommandRows _brows;
+	StickerRows _srows;
 
 	void rowsUpdated(
-		internal::MentionRows &&mrows,
-		internal::HashtagRows &&hrows,
-		internal::BotCommandRows &&brows,
-		internal::StickerRows &&srows,
+		MentionRows &&mrows,
+		HashtagRows &&hrows,
+		BotCommandRows &&brows,
+		StickerRows &&srows,
 		bool resetScroll);
 
 	object_ptr<Ui::ScrollArea> _scroll;
-	QPointer<internal::FieldAutocompleteInner> _inner;
+	QPointer<Inner> _inner;
 
 	ChatData *_chat = nullptr;
 	UserData *_user = nullptr;
@@ -186,100 +185,4 @@ private:
 
 	Fn<bool(int)> _moderateKeyActivateCallback;
 
-	friend class internal::FieldAutocompleteInner;
-
 };
-
-namespace internal {
-
-class FieldAutocompleteInner final
-	: public Ui::RpWidget
-	, private base::Subscriber {
-
-public:
-	struct ScrollTo {
-		int top;
-		int bottom;
-	};
-
-	FieldAutocompleteInner(
-		not_null<Window::SessionController*> controller,
-		not_null<FieldAutocomplete*> parent,
-		not_null<MentionRows*> mrows,
-		not_null<HashtagRows*> hrows,
-		not_null<BotCommandRows*> brows,
-		not_null<StickerRows*> srows);
-
-	void clearSel(bool hidden = false);
-	bool moveSel(int key);
-	bool chooseSelected(FieldAutocomplete::ChooseMethod method) const;
-	bool chooseAtIndex(
-		FieldAutocomplete::ChooseMethod method,
-		int index,
-		Api::SendOptions options = Api::SendOptions()) const;
-
-	void setRecentInlineBotsInRows(int32 bots);
-	void rowsUpdated();
-
-	rpl::producer<FieldAutocomplete::MentionChosen> mentionChosen() const;
-	rpl::producer<FieldAutocomplete::HashtagChosen> hashtagChosen() const;
-	rpl::producer<FieldAutocomplete::BotCommandChosen>
-		botCommandChosen() const;
-	rpl::producer<FieldAutocomplete::StickerChosen> stickerChosen() const;
-	rpl::producer<ScrollTo> scrollToRequested() const;
-
-	void onParentGeometryChanged();
-
-private:
-	void paintEvent(QPaintEvent *e) override;
-	void resizeEvent(QResizeEvent *e) override;
-
-	void enterEventHook(QEvent *e) override;
-	void leaveEventHook(QEvent *e) override;
-
-	void mousePressEvent(QMouseEvent *e) override;
-	void mouseMoveEvent(QMouseEvent *e) override;
-	void mouseReleaseEvent(QMouseEvent *e) override;
-	void contextMenuEvent(QContextMenuEvent *e) override;
-
-	void updateSelectedRow();
-	void setSel(int sel, bool scroll = false);
-	void showPreview();
-	void selectByMouse(QPoint global);
-
-	QSize stickerBoundingBox() const;
-	void setupLottie(StickerSuggestion &suggestion);
-	void repaintSticker(not_null<DocumentData*> document);
-	std::shared_ptr<Lottie::FrameRenderer> getLottieRenderer();
-
-	const not_null<Window::SessionController*> _controller;
-	const not_null<FieldAutocomplete*> _parent;
-	const not_null<MentionRows*> _mrows;
-	const not_null<HashtagRows*> _hrows;
-	const not_null<BotCommandRows*> _brows;
-	const not_null<StickerRows*> _srows;
-	rpl::lifetime _stickersLifetime;
-	std::weak_ptr<Lottie::FrameRenderer> _lottieRenderer;
-	base::unique_qptr<Ui::PopupMenu> _menu;
-	int _stickersPerRow = 1;
-	int _recentInlineBotsInRows = 0;
-	int _sel = -1;
-	int _down = -1;
-	std::optional<QPoint> _lastMousePosition;
-	bool _mouseSelection = false;
-
-	bool _overDelete = false;
-
-	bool _previewShown = false;
-
-	rpl::event_stream<FieldAutocomplete::MentionChosen> _mentionChosen;
-	rpl::event_stream<FieldAutocomplete::HashtagChosen> _hashtagChosen;
-	rpl::event_stream<FieldAutocomplete::BotCommandChosen> _botCommandChosen;
-	rpl::event_stream<FieldAutocomplete::StickerChosen> _stickerChosen;
-	rpl::event_stream<ScrollTo> _scrollToRequested;
-
-	base::Timer _previewTimer;
-
-};
-
-} // namespace internal
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 2599b63ca..07cd555fc 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -286,7 +286,6 @@ HistoryWidget::HistoryWidget(
 	_unreadMentions->installEventFilter(this);
 
 	InitMessageField(controller, _field);
-	_fieldAutocomplete->hide();
 
 	_fieldAutocomplete->mentionChosen(
 	) | rpl::start_with_next([=](FieldAutocomplete::MentionChosen data) {
@@ -1216,6 +1215,9 @@ void HistoryWidget::orderWidgets() {
 		_pinnedBar->raise();
 	}
 	_topShadow->raise();
+	if (_fieldAutocomplete) {
+		_fieldAutocomplete->raise();
+	}
 	if (_membersDropdown) {
 		_membersDropdown->raise();
 	}
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index ba9062365..8f164e219 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -15,12 +15,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/tabbed_panel.h"
 #include "chat_helpers/tabbed_section.h"
 #include "chat_helpers/tabbed_selector.h"
+#include "chat_helpers/field_autocomplete.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "data/data_changes.h"
 #include "data/data_messages.h"
 #include "data/data_session.h"
+#include "data/data_user.h"
+#include "data/stickers/data_stickers.h"
 #include "data/data_web_page.h"
+#include "storage/storage_account.h"
 #include "facades.h"
 #include "boxes/confirm_box.h"
 #include "history/history.h"
@@ -515,6 +519,9 @@ ComposeControls::ComposeControls(
 		st::historyComposeField,
 		Ui::InputField::Mode::MultiLine,
 		tr::lng_message_ph()))
+, _autocomplete(std::make_unique<FieldAutocomplete>(
+		parent,
+		window))
 , _header(std::make_unique<FieldHeader>(
 		_wrap.get(),
 		&_window->session().data()))
@@ -565,6 +572,12 @@ void ComposeControls::resizeToWidth(int width) {
 	updateHeight();
 }
 
+void ComposeControls::setAutocompleteBoundingRect(QRect rect) {
+	if (_autocomplete) {
+		_autocomplete->setBoundings(rect);
+	}
+}
+
 rpl::producer<int> ComposeControls::height() const {
 	using namespace rpl::mappers;
 	return rpl::conditional(
@@ -619,6 +632,10 @@ rpl::producer<VoiceToSend> ComposeControls::sendVoiceRequests() const {
 	return _voiceRecordBar->sendVoiceRequests();
 }
 
+rpl::producer<QString> ComposeControls::sendCommandRequests() const {
+	return _sendCommandRequests.events();
+}
+
 rpl::producer<MessageToEdit> ComposeControls::editRequests() const {
 	auto toValue = rpl::map([=] { return _header->queryToEdit(); });
 	auto filter = rpl::filter([=] {
@@ -681,6 +698,21 @@ void ComposeControls::showFinished() {
 	_voiceRecordBar->orderControls();
 }
 
+void ComposeControls::raisePanels() {
+	if (_autocomplete) {
+		_autocomplete->raise();
+	}
+	if (_inlineResults) {
+		_inlineResults->raise();
+	}
+	if (_tabbedPanel) {
+		_tabbedPanel->raise();
+	}
+	if (_raiseEmojiSuggestions) {
+		_raiseEmojiSuggestions();
+	}
+}
+
 void ComposeControls::showForGrab() {
 	showFinished();
 }
@@ -708,7 +740,9 @@ void ComposeControls::setText(const TextWithTags &textWithTags) {
 }
 
 void ComposeControls::hidePanelsAnimated() {
-	//_fieldAutocomplete->hideAnimated();
+	if (_autocomplete) {
+		_autocomplete->hideAnimated();
+	}
 	if (_tabbedPanel) {
 		_tabbedPanel->hideAnimated();
 	}
@@ -717,6 +751,36 @@ void ComposeControls::hidePanelsAnimated() {
 	}
 }
 
+void ComposeControls::checkAutocomplete() {
+	if (!_history) {
+		return;
+	}
+
+	const auto peer = _history->peer;
+	const auto isInlineBot = false;// _inlineBot && !_inlineLookingUpBot;
+	const auto autocomplete = isInlineBot
+		? AutocompleteQuery()
+		: ParseMentionHashtagBotCommandQuery(_field);
+	if (!autocomplete.query.isEmpty()) {
+		if (autocomplete.query[0] == '#'
+			&& cRecentWriteHashtags().isEmpty()
+			&& cRecentSearchHashtags().isEmpty()) {
+			peer->session().local().readRecentHashtagsAndBots();
+		} else if (autocomplete.query[0] == '@'
+			&& cRecentInlineBots().isEmpty()) {
+			peer->session().local().readRecentHashtagsAndBots();
+		} else if (autocomplete.query[0] == '/'
+			&& peer->isUser()
+			&& !peer->asUser()->isBot()) {
+			return;
+		}
+	}
+	_autocomplete->showFiltered(
+		peer,
+		autocomplete.query,
+		autocomplete.fromStart);
+}
+
 void ComposeControls::init() {
 	initField();
 	initTabbedSelector();
@@ -817,11 +881,12 @@ void ComposeControls::initField() {
 	_field->setSubmitSettings(Core::App().settings().sendSubmitWay());
 	//Ui::Connect(_field, &Ui::InputField::submitted, [=] { send(); });
 	Ui::Connect(_field, &Ui::InputField::cancelled, [=] { escape(); });
-	//Ui::Connect(_field, &Ui::InputField::tabbed, [=] { fieldTabbed(); });
+	Ui::Connect(_field, &Ui::InputField::tabbed, [=] { fieldTabbed(); });
 	Ui::Connect(_field, &Ui::InputField::resized, [=] { updateHeight(); });
 	//Ui::Connect(_field, &Ui::InputField::focused, [=] { fieldFocused(); });
 	Ui::Connect(_field, &Ui::InputField::changed, [=] { fieldChanged(); });
 	InitMessageField(_window, _field);
+	initAutocomplete();
 	const auto suggestions = Ui::Emoji::SuggestionsController::Init(
 		_parent,
 		_field,
@@ -830,6 +895,112 @@ void ComposeControls::initField() {
 	InitSpellchecker(_window, _field);
 }
 
+void ComposeControls::initAutocomplete() {
+	const auto insertHashtagOrBotCommand = [=](
+			const QString &string,
+			FieldAutocomplete::ChooseMethod method) {
+		// Send bot command at once, if it was not inserted by pressing Tab.
+		if (string.at(0) == '/' && method != FieldAutocomplete::ChooseMethod::ByTab) {
+			_sendCommandRequests.fire_copy(string);
+			setText(
+				_field->getTextWithTagsPart(_field->textCursor().position()));
+		} else {
+			_field->insertTag(string);
+		}
+	};
+	const auto insertMention = [=](not_null<UserData*> user) {
+		auto replacement = QString();
+		auto entityTag = QString();
+		if (user->username.isEmpty()) {
+			_field->insertTag(
+				user->firstName.isEmpty() ? user->name : user->firstName,
+				PrepareMentionTag(user));
+		} else {
+			_field->insertTag('@' + user->username);
+		}
+	};
+
+	_autocomplete->mentionChosen(
+	) | rpl::start_with_next([=](FieldAutocomplete::MentionChosen data) {
+		insertMention(data.user);
+	}, _autocomplete->lifetime());
+
+	_autocomplete->hashtagChosen(
+	) | rpl::start_with_next([=](FieldAutocomplete::HashtagChosen data) {
+		insertHashtagOrBotCommand(data.hashtag, data.method);
+	}, _autocomplete->lifetime());
+
+	_autocomplete->botCommandChosen(
+	) | rpl::start_with_next([=](FieldAutocomplete::BotCommandChosen data) {
+		insertHashtagOrBotCommand(data.command, data.method);
+	}, _autocomplete->lifetime());
+
+	_autocomplete->stickerChosen(
+	) | rpl::start_with_next([=](FieldAutocomplete::StickerChosen data) {
+		setText({});
+		//_saveDraftText = true;
+		//_saveDraftStart = crl::now();
+		//onDraftSave();
+		//onCloudDraftSave(); // won't be needed if SendInlineBotResult will clear the cloud draft
+		_fileChosen.fire(FileChosen{
+			.document = data.sticker,
+			.options = data.options,
+		});
+	}, _autocomplete->lifetime());
+
+	//_autocomplete->setModerateKeyActivateCallback([=](int key) {
+	//	return _keyboard->isHidden()
+	//		? false
+	//		: _keyboard->moderateKeyActivate(key);
+	//});
+
+	_field->rawTextEdit()->installEventFilter(_autocomplete.get());
+
+	_window->session().data().botCommandsChanges(
+	) | rpl::filter([=](not_null<UserData*> user) {
+		const auto peer = _history ? _history->peer.get() : nullptr;
+		return peer && (peer == user || !peer->isUser());
+	}) | rpl::start_with_next([=](not_null<UserData*> user) {
+		if (_autocomplete->clearFilteredBotCommands()) {
+			checkAutocomplete();
+		}
+	}, _autocomplete->lifetime());
+
+	_window->session().data().stickers().updated(
+	) | rpl::start_with_next([=] {
+		updateStickersByEmoji();
+	}, _autocomplete->lifetime());
+
+	QObject::connect(
+		_field->rawTextEdit(),
+		&QTextEdit::cursorPositionChanged,
+		_autocomplete.get(),
+		[=] { checkAutocomplete(); },
+		Qt::QueuedConnection);
+}
+
+void ComposeControls::updateStickersByEmoji() {
+	if (!_history) {
+		return;
+	}
+	const auto emoji = [&] {
+		const auto errorForStickers = Data::RestrictionError(
+			_history->peer,
+			ChatRestriction::f_send_stickers);
+		if (!isEditingMessage() && !errorForStickers) {
+			const auto &text = _field->getTextWithTags().text;
+			auto length = 0;
+			if (const auto emoji = Ui::Emoji::Find(text, &length)) {
+				if (text.size() <= length) {
+					return emoji;
+				}
+			}
+		}
+		return EmojiPtr(nullptr);
+	}();
+	_autocomplete->showStickers(emoji);
+}
+
 void ComposeControls::fieldChanged() {
 	if (/*!_inlineBot
 		&& */!_header->isEditingMessage()
@@ -840,6 +1011,15 @@ void ComposeControls::fieldChanged() {
 	if (showRecordButton()) {
 		//_previewCancelled = false;
 	}
+	InvokeQueued(_autocomplete.get(), [=] {
+		updateStickersByEmoji();
+	});
+}
+
+void ComposeControls::fieldTabbed() {
+	if (!_autocomplete->isHidden()) {
+		_autocomplete->chooseSelected(FieldAutocomplete::ChooseMethod::ByTab);
+	}
 }
 
 rpl::producer<SendActionUpdate> ComposeControls::sendActionUpdates() const {
@@ -1136,10 +1316,16 @@ void ComposeControls::updateHeight() {
 void ComposeControls::editMessage(FullMsgId id) {
 	cancelEditMessage();
 	_header->editMessage(id);
+	if (_autocomplete) {
+		InvokeQueued(_autocomplete.get(), [=] { checkAutocomplete(); });
+	}
 }
 
 void ComposeControls::cancelEditMessage() {
 	_header->editMessage({});
+	if (_autocomplete) {
+		InvokeQueued(_autocomplete.get(), [=] { checkAutocomplete(); });
+	}
 }
 
 void ComposeControls::replyToMessage(FullMsgId id) {
@@ -1151,6 +1337,20 @@ void ComposeControls::cancelReplyMessage() {
 	_header->replyToMessage({});
 }
 
+bool ComposeControls::handleCancelRequest() {
+	if (isEditingMessage()) {
+		cancelEditMessage();
+		return true;
+	} else if (_autocomplete && !_autocomplete->isHidden()) {
+		_autocomplete->hideAnimated();
+		return true;
+	} else if (replyingToMessage()) {
+		cancelReplyMessage();
+		return true;
+	}
+	return false;
+}
+
 void ComposeControls::initWebpageProcess() {
 	Expects(_history);
 	const auto peer = _history->peer;
@@ -1287,7 +1487,10 @@ void ComposeControls::initWebpageProcess() {
 		Data::PeerUpdate::Flag::Rights
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer.get() == peer);
-	}) | rpl::start_with_next(checkPreview, lifetime);
+	}) | rpl::start_with_next([=] {
+		checkPreview();
+		updateStickersByEmoji();
+	}, lifetime);
 
 	_window->session().downloaderTaskFinished(
 	) | rpl::filter([=] {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 926e3da32..d7c6cc3ce 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/tabbed_selector.h"
 
 class History;
+class FieldAutocomplete;
 
 namespace ChatHelpers {
 class TabbedPanel;
@@ -89,6 +90,7 @@ public:
 
 	void move(int x, int y);
 	void resizeToWidth(int width);
+	void setAutocompleteBoundingRect(QRect rect);
 	[[nodiscard]] rpl::producer<int> height() const;
 	[[nodiscard]] int heightCurrent() const;
 
@@ -96,6 +98,7 @@ public:
 	[[nodiscard]] rpl::producer<> cancelRequests() const;
 	[[nodiscard]] rpl::producer<> sendRequests() const;
 	[[nodiscard]] rpl::producer<VoiceToSend> sendVoiceRequests() const;
+	[[nodiscard]] rpl::producer<QString> sendCommandRequests() const;
 	[[nodiscard]] rpl::producer<MessageToEdit> editRequests() const;
 	[[nodiscard]] rpl::producer<> attachRequests() const;
 	[[nodiscard]] rpl::producer<FileChosen> fileChosen() const;
@@ -122,6 +125,7 @@ public:
 	void showForGrab();
 	void showStarted();
 	void showFinished();
+	void raisePanels();
 
 	void editMessage(FullMsgId id);
 	void cancelEditMessage();
@@ -129,6 +133,8 @@ public:
 	void replyToMessage(FullMsgId id);
 	void cancelReplyMessage();
 
+	bool handleCancelRequest();
+
 	[[nodiscard]] TextWithTags getTextWithAppliedMarkdown() const;
 	[[nodiscard]] WebPageId webPageId() const;
 	void setText(const TextWithTags &text);
@@ -154,6 +160,7 @@ private:
 	void initWebpageProcess();
 	void initWriteRestriction();
 	void initVoiceRecordBar();
+	void initAutocomplete();
 	void updateSendButtonType();
 	void updateHeight();
 	void updateWrappingVisibility();
@@ -163,9 +170,12 @@ private:
 	void paintBackground(QRect clip);
 
 	void orderControls();
+	void checkAutocomplete();
+	void updateStickersByEmoji();
 
 	void escape();
 	void fieldChanged();
+	void fieldTabbed();
 	void toggleTabbedSelectorMode();
 	void createTabbedPanel();
 	void setTabbedPanel(std::unique_ptr<ChatHelpers::TabbedPanel> panel);
@@ -194,6 +204,7 @@ private:
 	const not_null<Ui::InputField*> _field;
 	std::unique_ptr<InlineBots::Layout::Widget> _inlineResults;
 	std::unique_ptr<ChatHelpers::TabbedPanel> _tabbedPanel;
+	std::unique_ptr<FieldAutocomplete> _autocomplete;
 
 	friend class FieldHeader;
 	const std::unique_ptr<FieldHeader> _header;
@@ -204,6 +215,7 @@ private:
 	rpl::event_stream<PhotoChosen> _photoChosen;
 	rpl::event_stream<ChatHelpers::TabbedSelector::InlineChosen> _inlineResultChosen;
 	rpl::event_stream<SendActionUpdate> _sendActionUpdates;
+	rpl::event_stream<QString> _sendCommandRequests;
 
 	TextWithTags _localSavedText;
 	TextUpdateEvents _textUpdateEvents;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index c10451a42..9f931c52e 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -253,6 +253,7 @@ RepliesWidget::RepliesWidget(
 
 	setupScrollDownButton();
 	setupComposeControls();
+	orderWidgets();
 }
 
 RepliesWidget::~RepliesWidget() {
@@ -263,6 +264,17 @@ RepliesWidget::~RepliesWidget() {
 	_history->owner().repliesSendActionPainterRemoved(_history, _rootId);
 }
 
+void RepliesWidget::orderWidgets() {
+	if (_topBar) {
+		_topBar->raise();
+	}
+	if (_rootView) {
+		_rootView->raise();
+	}
+	_topBarShadow->raise();
+	_composeControls->raisePanels();
+}
+
 void RepliesWidget::sendReadTillRequest() {
 	if (!_root) {
 		_readRequestPending = true;
@@ -428,6 +440,18 @@ void RepliesWidget::setupComposeControls() {
 		sendVoice(data.bytes, data.waveform, data.duration);
 	}, lifetime());
 
+	_composeControls->sendCommandRequests(
+	) | rpl::start_with_next([=](const QString &command) {
+		if (showSlowmodeError()) {
+			return;
+		}
+		auto message = ApiWrap::MessageToSend(_history);
+		message.textWithTags = { command };
+		message.action.replyTo = replyToId();
+		session().api().sendMessage(std::move(message));
+		finishSending();
+	}, lifetime());
+
 	const auto saveEditMsgRequestId = lifetime().make_state<mtpRequestId>(0);
 	_composeControls->editRequests(
 	) | rpl::start_with_next([=](auto data) {
@@ -1474,6 +1498,7 @@ void RepliesWidget::updateControlsGeometry() {
 		updateInnerVisibleArea();
 	}
 	_composeControls->move(0, bottom - controlsHeight);
+	_composeControls->setAutocompleteBoundingRect(_scroll->geometry());
 
 	updateScrollDownPosition();
 }
@@ -1598,12 +1623,7 @@ void RepliesWidget::listCancelRequest() {
 	if (_inner && !_inner->getSelectedItems().empty()) {
 		clearSelected();
 		return;
-	}
-	if (_composeControls->isEditingMessage()) {
-		_composeControls->cancelEditMessage();
-		return;
-	} else if (_composeControls->replyingToMessage()) {
-		_composeControls->cancelReplyMessage();
+	} else if (_composeControls->handleCancelRequest()) {
 		return;
 	}
 	controller()->showBackFromStack();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index e031369d5..a22b5d92f 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -186,6 +186,7 @@ private:
 	[[nodiscard]] MsgId replyToId() const;
 	[[nodiscard]] HistoryItem *lookupRoot() const;
 	[[nodiscard]] bool computeAreComments() const;
+	void orderWidgets();
 
 	void pushReplyReturn(not_null<HistoryItem*> item);
 	void computeCurrentReplyReturn();
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 4465ac2ff..0a2e506b5 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -180,6 +180,19 @@ void ScheduledWidget::setupComposeControls() {
 		sendVoice(data.bytes, data.waveform, data.duration);
 	}, lifetime());
 
+	_composeControls->sendCommandRequests(
+	) | rpl::start_with_next([=](const QString &command) {
+		const auto callback = [=](Api::SendOptions options) {
+			auto message = ApiWrap::MessageToSend(_history);
+			message.textWithTags = { command };
+			message.action.options = options;
+			session().api().sendMessage(std::move(message));
+		};
+		Ui::show(
+			PrepareScheduleBox(this, sendMenuType(), callback),
+			Ui::LayerOption::KeepOther);
+	}, lifetime());
+
 	const auto saveEditMsgRequestId = lifetime().make_state<mtpRequestId>(0);
 	_composeControls->editRequests(
 	) | rpl::start_with_next([=](auto data) {
@@ -979,6 +992,7 @@ void ScheduledWidget::updateControlsGeometry() {
 		updateInnerVisibleArea();
 	}
 	_composeControls->move(0, bottom - controlsHeight);
+	_composeControls->setAutocompleteBoundingRect(_scroll->geometry());
 
 	updateScrollDownPosition();
 }
@@ -1057,9 +1071,7 @@ void ScheduledWidget::listCancelRequest() {
 	if (_inner && !_inner->getSelectedItems().empty()) {
 		clearSelected();
 		return;
-	}
-	if (_composeControls->isEditingMessage()) {
-		_composeControls->cancelEditMessage();
+	} else if (_composeControls->handleCancelRequest()) {
 		return;
 	}
 	controller()->showBackFromStack();
diff --git a/Telegram/SourceFiles/support/support_autocomplete.h b/Telegram/SourceFiles/support/support_autocomplete.h
index bcc961a98..d2abc4671 100644
--- a/Telegram/SourceFiles/support/support_autocomplete.h
+++ b/Telegram/SourceFiles/support/support_autocomplete.h
@@ -35,7 +35,7 @@ struct Contact {
 	QString lastName;
 };
 
-class Autocomplete : public Ui::RpWidget {
+class Autocomplete final : public Ui::RpWidget {
 public:
 	Autocomplete(QWidget *parent, not_null<Main::Session*> session);
 

From cf6ca3b1ac945f957584387eea5b4c833b5233c5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 10 Nov 2020 19:38:21 +0300
Subject: [PATCH 090/370] Handle bot command clicks in Replies / Scheduled.

---
 .../SourceFiles/core/click_handler_types.cpp  | 16 ++----
 .../SourceFiles/core/click_handler_types.h    | 26 ++++------
 .../SourceFiles/core/local_url_handlers.cpp   | 13 ++---
 Telegram/SourceFiles/core/ui_integration.cpp  |  4 +-
 Telegram/SourceFiles/core/ui_integration.h    | 17 ++++---
 .../admin_log/history_admin_log_inner.cpp     |  5 ++
 .../admin_log/history_admin_log_inner.h       |  3 ++
 .../history/history_inner_widget.cpp          | 35 ++++++++++++-
 .../history/history_inner_widget.h            |  3 ++
 .../SourceFiles/history/history_message.cpp   |  2 +-
 .../SourceFiles/history/history_widget.cpp    | 12 ++---
 .../history/view/history_view_element.cpp     |  5 ++
 .../history/view/history_view_element.h       |  6 +++
 .../history/view/history_view_list_widget.cpp | 49 ++++++++++++++++++-
 .../history/view/history_view_list_widget.h   | 15 ++++++
 .../view/history_view_pinned_section.cpp      |  5 ++
 .../view/history_view_pinned_section.h        |  3 ++
 .../view/history_view_replies_section.cpp     | 18 +++++--
 .../view/history_view_replies_section.h       |  3 ++
 .../view/history_view_scheduled_section.cpp   | 25 ++++++----
 .../view/history_view_scheduled_section.h     |  3 ++
 .../history/view/media/history_view_game.cpp  |  4 +-
 .../history/view/media/history_view_media.cpp |  2 +-
 .../view/media/history_view_web_page.cpp      |  7 +--
 .../media/view/media_view_overlay_widget.cpp  |  2 +-
 25 files changed, 210 insertions(+), 73 deletions(-)

diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp
index 793ea5ae9..38a16c4b7 100644
--- a/Telegram/SourceFiles/core/click_handler_types.cpp
+++ b/Telegram/SourceFiles/core/click_handler_types.cpp
@@ -180,20 +180,14 @@ auto CashtagClickHandler::getTextEntity() const -> TextEntity {
 	return { EntityType::Cashtag };
 }
 
-PeerData *BotCommandClickHandler::_peer = nullptr;
-UserData *BotCommandClickHandler::_bot = nullptr;
 void BotCommandClickHandler::onClick(ClickContext context) const {
 	const auto button = context.button;
 	if (button == Qt::LeftButton || button == Qt::MiddleButton) {
-		if (auto peer = peerForCommand()) {
-			if (auto bot = peer->isUser() ? peer->asUser() : botForCommand()) {
-				Ui::showPeerHistory(peer, ShowAtTheEndMsgId);
-				App::sendBotCommand(peer, bot, _cmd);
-				return;
-			}
-		}
-
-		if (auto peer = Ui::getPeerForMouseAction()) { // old way
+		const auto my = context.other.value<ClickHandlerContext>();
+		if (const auto delegate = my.elementDelegate ? my.elementDelegate() : nullptr) {
+			delegate->elementSendBotCommand(_cmd, my.itemId);
+			return;
+		} else if (auto peer = Ui::getPeerForMouseAction()) { // old way
 			auto bot = peer->isUser() ? peer->asUser() : nullptr;
 			if (!bot) {
 				if (const auto view = App::hoveredLinkItem()) {
diff --git a/Telegram/SourceFiles/core/click_handler_types.h b/Telegram/SourceFiles/core/click_handler_types.h
index bed3a6bec..152b45076 100644
--- a/Telegram/SourceFiles/core/click_handler_types.h
+++ b/Telegram/SourceFiles/core/click_handler_types.h
@@ -13,8 +13,18 @@ namespace Main {
 class Session;
 } // namespace Main
 
+namespace HistoryView {
+class ElementDelegate;
+} // namespace HistoryView
+
 [[nodiscard]] bool UrlRequiresConfirmation(const QUrl &url);
 
+struct ClickHandlerContext {
+	FullMsgId itemId;
+	Fn<HistoryView::ElementDelegate*()> elementDelegate;
+};
+Q_DECLARE_METATYPE(ClickHandlerContext);
+
 class HiddenUrlClickHandler : public UrlClickHandler {
 public:
 	HiddenUrlClickHandler(QString url) : UrlClickHandler(url, false) {
@@ -165,30 +175,14 @@ public:
 		return _cmd;
 	}
 
-	static void setPeerForCommand(PeerData *peer) {
-		_peer = peer;
-	}
-	static void setBotForCommand(UserData *bot) {
-		_bot = bot;
-	}
-
 	TextEntity getTextEntity() const override;
 
 protected:
 	QString url() const override {
 		return _cmd;
 	}
-	static PeerData *peerForCommand() {
-		return _peer;
-	}
-	static UserData *botForCommand() {
-		return _bot;
-	}
 
 private:
 	QString _cmd;
 
-	static PeerData *_peer;
-	static UserData *_bot;
-
 };
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index cda4d9141..19af8f2ba 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "core/update_checker.h"
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "boxes/confirm_phone_box.h"
 #include "boxes/background_preview_box.h"
 #include "boxes/confirm_box.h"
@@ -76,11 +77,11 @@ bool ShowTheme(
 	if (!controller) {
 		return false;
 	}
-	const auto clickFromMessageId = context.value<FullMsgId>();
+	const auto fromMessageId = context.value<ClickHandlerContext>().itemId;
 	Core::App().hideMediaView();
 	controller->session().data().cloudThemes().resolve(
 		match->captured(1),
-		clickFromMessageId);
+		fromMessageId);
 	return true;
 }
 
@@ -280,7 +281,7 @@ bool ResolveUsername(
 		startToken = gameParam;
 		post = ShowAtGameShareMsgId;
 	}
-	const auto clickFromMessageId = context.value<FullMsgId>();
+	const auto fromMessageId = context.value<ClickHandlerContext>().itemId;
 	using Navigation = Window::SessionNavigation;
 	controller->showPeerByLink(Navigation::PeerByLinkInfo{
 		.usernameOrId = domain,
@@ -295,7 +296,7 @@ bool ResolveUsername(
 			}
 			: Navigation::RepliesByLinkInfo{ v::null },
 		.startToken = startToken,
-		.clickFromMessageId = clickFromMessageId,
+		.clickFromMessageId = fromMessageId,
 	});
 	return true;
 }
@@ -319,7 +320,7 @@ bool ResolvePrivatePost(
 	if (!channelId || !IsServerMsgId(msgId)) {
 		return false;
 	}
-	const auto clickFromMessageId = context.value<FullMsgId>();
+	const auto fromMessageId = context.value<ClickHandlerContext>().itemId;
 	using Navigation = Window::SessionNavigation;
 	controller->showPeerByLink(Navigation::PeerByLinkInfo{
 		.usernameOrId = channelId,
@@ -333,7 +334,7 @@ bool ResolvePrivatePost(
 				Navigation::ThreadId{ threadId }
 			}
 			: Navigation::RepliesByLinkInfo{ v::null },
-		.clickFromMessageId = clickFromMessageId,
+		.clickFromMessageId = fromMessageId,
 	});
 	return true;
 }
diff --git a/Telegram/SourceFiles/core/ui_integration.cpp b/Telegram/SourceFiles/core/ui_integration.cpp
index e707d2589..fec3bdd66 100644
--- a/Telegram/SourceFiles/core/ui_integration.cpp
+++ b/Telegram/SourceFiles/core/ui_integration.cpp
@@ -65,7 +65,7 @@ QString UiIntegration::timeFormat() {
 std::shared_ptr<ClickHandler> UiIntegration::createLinkHandler(
 		const EntityLinkData &data,
 		const std::any &context) {
-	const auto my = std::any_cast<Context>(&context);
+	const auto my = std::any_cast<MarkedTextContext>(&context);
 	switch (data.type) {
 	case EntityType::Url:
 		return (!data.data.isEmpty()
@@ -82,6 +82,7 @@ std::shared_ptr<ClickHandler> UiIntegration::createLinkHandler(
 		return std::make_shared<BotCommandClickHandler>(data.data);
 
 	case EntityType::Hashtag:
+		using HashtagMentionType = MarkedTextContext::HashtagMentionType;
 		if (my && my->type == HashtagMentionType::Twitter) {
 			return std::make_shared<UrlClickHandler>(
 				(qsl("https://twitter.com/hashtag/")
@@ -101,6 +102,7 @@ std::shared_ptr<ClickHandler> UiIntegration::createLinkHandler(
 		return std::make_shared<CashtagClickHandler>(data.data);
 
 	case EntityType::Mention:
+		using HashtagMentionType = MarkedTextContext::HashtagMentionType;
 		if (my && my->type == HashtagMentionType::Twitter) {
 			return std::make_shared<UrlClickHandler>(
 				qsl("https://twitter.com/") + data.data.mid(1),
diff --git a/Telegram/SourceFiles/core/ui_integration.h b/Telegram/SourceFiles/core/ui_integration.h
index c7367b802..2aac9a0aa 100644
--- a/Telegram/SourceFiles/core/ui_integration.h
+++ b/Telegram/SourceFiles/core/ui_integration.h
@@ -13,20 +13,25 @@ namespace Main {
 class Session;
 } // namespace Main
 
+namespace HistoryView {
+class ElementDelegate;
+} // namespace HistoryView
+
 namespace Core {
 
-class UiIntegration : public Ui::Integration {
-public:
+struct MarkedTextContext {
 	enum class HashtagMentionType : uchar {
 		Telegram,
 		Twitter,
 		Instagram,
 	};
-	struct Context {
-		Main::Session *session = nullptr;
-		HashtagMentionType type = HashtagMentionType::Telegram;
-	};
 
+	Main::Session *session = nullptr;
+	HashtagMentionType type = HashtagMentionType::Telegram;
+};
+
+class UiIntegration : public Ui::Integration {
+public:
 	void postponeCall(FnMut<void()> &&callable) override;
 	void registerLeaveSubscription(not_null<QWidget*> widget) override;
 	void unregisterLeaveSubscription(not_null<QWidget*> widget) override;
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 1bb0e1a8a..9653ecf01 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -600,6 +600,11 @@ bool InnerWidget::elementShownUnread(not_null<const Element*> view) {
 	return view->data()->unread();
 }
 
+void InnerWidget::elementSendBotCommand(
+	const QString &command,
+	const FullMsgId &context) {
+}
+
 void InnerWidget::saveState(not_null<SectionMemento*> memento) {
 	memento->setFilter(std::move(_filter));
 	memento->setAdmins(std::move(_admins));
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
index bf8f97f86..d402460ae 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
@@ -116,6 +116,9 @@ public:
 		not_null<const HistoryView::Element*> view) override;
 	bool elementShownUnread(
 		not_null<const HistoryView::Element*> view) override;
+	void elementSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) override;
 
 	~InnerWidget();
 
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index b94c38b6a..52720fada 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <rpl/merge.h>
 #include "core/file_utilities.h"
 #include "core/crash_reports.h"
+#include "core/click_handler_types.h"
 #include "history/history.h"
 #include "history/history_message.h"
 #include "history/view/media/history_view_media.h"
@@ -1330,7 +1331,14 @@ void HistoryInner::mouseActionFinish(
 			: FullMsgId();
 		ActivateClickHandler(window(), activated, {
 			button,
-			QVariant::fromValue(pressedItemId)
+			QVariant::fromValue(ClickHandlerContext{
+				.itemId = pressedItemId,
+				.elementDelegate = [weak = Ui::MakeWeak(this)] {
+					return weak
+						? HistoryInner::ElementDelegate().get()
+						: nullptr;
+				},
+			})
 		});
 		return;
 	}
@@ -2540,6 +2548,24 @@ bool HistoryInner::elementIsGifPaused() {
 	return _controller->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
 }
 
+void HistoryInner::elementSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) {
+	if (auto peer = Ui::getPeerForMouseAction()) { // old way
+		auto bot = peer->isUser() ? peer->asUser() : nullptr;
+		if (!bot) {
+			if (const auto view = App::hoveredLinkItem()) {
+				// may return nullptr
+				bot = view->data()->fromOriginal()->asUser();
+			}
+		}
+		Ui::showPeerHistory(peer, ShowAtTheEndMsgId);
+		App::sendBotCommand(peer, bot, command);
+	} else {
+		App::insertBotCommand(command);
+	}
+}
+
 auto HistoryInner::getSelectionState() const
 -> HistoryView::TopBarWidget::SelectedState {
 	auto result = HistoryView::TopBarWidget::SelectedState {};
@@ -3434,6 +3460,13 @@ not_null<HistoryView::ElementDelegate*> HistoryInner::ElementDelegate() {
 		bool elementShownUnread(not_null<const Element*> view) override {
 			return view->data()->unread();
 		}
+		void elementSendBotCommand(
+				const QString &command,
+				const FullMsgId &context) {
+			if (Instance) {
+				Instance->elementSendBotCommand(command, context);
+			}
+		}
 	};
 
 	static Result result;
diff --git a/Telegram/SourceFiles/history/history_inner_widget.h b/Telegram/SourceFiles/history/history_inner_widget.h
index b671f1675..2532568f8 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.h
+++ b/Telegram/SourceFiles/history/history_inner_widget.h
@@ -92,6 +92,9 @@ public:
 		const TextWithEntities &text,
 		Fn<void()> hiddenCallback);
 	bool elementIsGifPaused();
+	void elementSendBotCommand(
+		const QString &command,
+		const FullMsgId &context);
 
 	void updateBotInfo(bool recount = true);
 
diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp
index f11299973..91f7673fb 100644
--- a/Telegram/SourceFiles/history/history_message.cpp
+++ b/Telegram/SourceFiles/history/history_message.cpp
@@ -1464,7 +1464,7 @@ void HistoryMessage::setText(const TextWithEntities &textWithEntities) {
 	}
 
 	clearIsolatedEmoji();
-	const auto context = Core::UiIntegration::Context{
+	const auto context = Core::MarkedTextContext{
 		.session = &history()->session()
 	};
 	_text.setMarkedText(
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 07cd555fc..75bd8b335 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -3405,15 +3405,9 @@ void HistoryWidget::sendBotCommand(
 
 	bool lastKeyboardUsed = (_keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId)) && (_keyboard->forMsgId() == FullMsgId(_channel, replyTo));
 
-	QString toSend = cmd;
-	if (bot && (!bot->isUser() || !bot->asUser()->isBot())) {
-		bot = nullptr;
-	}
-	QString username = bot ? bot->asUser()->username : QString();
-	int32 botStatus = _peer->isChat() ? _peer->asChat()->botStatus : (_peer->isMegagroup() ? _peer->asChannel()->mgInfo->botStatus : -1);
-	if (!replyTo && toSend.indexOf('@') < 2 && !username.isEmpty() && (botStatus == 0 || botStatus == 2)) {
-		toSend += '@' + username;
-	}
+	const auto toSend = replyTo
+		? cmd
+		: HistoryView::WrapBotCommandInChat(_peer, cmd, bot);
 
 	auto message = ApiWrap::MessageToSend(_history);
 	message.textWithTags = { toSend, TextWithTags::Tags() };
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 44b93d055..471932bd8 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -121,6 +121,11 @@ bool SimpleElementDelegate::elementShownUnread(
 	return view->data()->unread();
 }
 
+void SimpleElementDelegate::elementSendBotCommand(
+	const QString &command,
+	const FullMsgId &context) {
+}
+
 TextSelection UnshiftItemSelection(
 		TextSelection selection,
 		uint16 byLength) {
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index 800761240..1f14d0a24 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -67,6 +67,9 @@ public:
 	virtual bool elementIsGifPaused() = 0;
 	virtual bool elementHideReply(not_null<const Element*> view) = 0;
 	virtual bool elementShownUnread(not_null<const Element*> view) = 0;
+	virtual void elementSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) = 0;
 
 };
 
@@ -99,6 +102,9 @@ public:
 	bool elementIsGifPaused() override;
 	bool elementHideReply(not_null<const Element*> view) override;
 	bool elementShownUnread(not_null<const Element*> view) override;
+	void elementSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) override;
 
 private:
 	const not_null<Window::SessionController*> _controller;
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 65943d1b4..39ebdf248 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwindow.h"
 #include "mainwidget.h"
 #include "core/application.h"
+#include "core/click_handler_types.h"
 #include "apiwrap.h"
 #include "layout.h"
 #include "window/window_session_controller.h"
@@ -37,6 +38,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_media_types.h"
 #include "data/data_document.h"
 #include "data/data_peer.h"
+#include "data/data_user.h"
+#include "data/data_chat.h"
+#include "data/data_channel.h"
 #include "facades.h"
 #include "styles/style_chat.h"
 
@@ -1290,6 +1294,12 @@ bool ListWidget::elementShownUnread(not_null<const Element*> view) {
 	return _delegate->listElementShownUnread(view);
 }
 
+void ListWidget::elementSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) {
+	return _delegate->listSendBotCommand(command, context);
+}
+
 void ListWidget::saveState(not_null<ListMemento*> memento) {
 	memento->setAroundPosition(_aroundPosition);
 	auto state = countScrollState();
@@ -2186,7 +2196,14 @@ void ListWidget::mouseActionFinish(
 		mouseActionCancel();
 		ActivateClickHandler(window(), activated, {
 			button,
-			QVariant::fromValue(pressState.itemId)
+			QVariant::fromValue(ClickHandlerContext{
+				.itemId = pressState.itemId,
+				.elementDelegate = [weak = Ui::MakeWeak(this)] {
+					return weak
+						? (ElementDelegate*)weak
+						: nullptr;
+				},
+			})
 		});
 		return;
 	}
@@ -2786,4 +2803,34 @@ void ConfirmSendNowSelectedItems(not_null<ListWidget*> widget) {
 		[=] { navigation->showBackFromStack(); });
 }
 
+QString WrapBotCommandInChat(
+		not_null<PeerData*> peer,
+		const QString &command,
+		const FullMsgId &context) {
+	auto result = command;
+	if (const auto item = peer->owner().message(context)) {
+		if (const auto user = item->fromOriginal()->asUser()) {
+			return WrapBotCommandInChat(peer, command, user);
+		}
+	}
+	return result;
+}
+
+QString WrapBotCommandInChat(
+		not_null<PeerData*> peer,
+		const QString &command,
+		not_null<UserData*> bot) {
+	if (!bot->isBot() || bot->username.isEmpty()) {
+		return command;
+	}
+	const auto botStatus = peer->isChat()
+		? peer->asChat()->botStatus
+		: peer->isMegagroup()
+		? peer->asChannel()->mgInfo->botStatus
+		: -1;
+	return ((command.indexOf('@') < 2) && (botStatus == 0 || botStatus == 2))
+		? command + '@' + bot->username
+		: command;
+}
+
 } // 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 38ecc163c..103416658 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -87,6 +87,9 @@ public:
 	virtual bool listElementShownUnread(not_null<const Element*> view) = 0;
 	virtual bool listIsGoodForAroundPosition(
 		not_null<const Element*> view) = 0;
+	virtual void listSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) = 0;
 
 };
 
@@ -233,6 +236,9 @@ public:
 	bool elementIsGifPaused() override;
 	bool elementHideReply(not_null<const Element*> view) override;
 	bool elementShownUnread(not_null<const Element*> view) override;
+	void elementSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) override;
 
 	~ListWidget();
 
@@ -556,4 +562,13 @@ void ConfirmDeleteSelectedItems(not_null<ListWidget*> widget);
 void ConfirmForwardSelectedItems(not_null<ListWidget*> widget);
 void ConfirmSendNowSelectedItems(not_null<ListWidget*> widget);
 
+[[nodiscard]] QString WrapBotCommandInChat(
+	not_null<PeerData*> peer,
+	const QString &command,
+	const FullMsgId &context);
+[[nodiscard]] QString WrapBotCommandInChat(
+	not_null<PeerData*> peer,
+	const QString &command,
+	not_null<UserData*> bot);
+
 } // 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 5b64324ad..a2902fd39 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -639,6 +639,11 @@ bool PinnedWidget::listIsGoodForAroundPosition(
 	return IsServerMsgId(view->data()->id);
 }
 
+void PinnedWidget::listSendBotCommand(
+	const QString &command,
+	const FullMsgId &context) {
+}
+
 void PinnedWidget::confirmDeleteSelected() {
 	ConfirmDeleteSelectedItems(_inner);
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.h b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
index 8025e2bc4..bfc8517de 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -93,6 +93,9 @@ public:
 	bool listElementHideReply(not_null<const Element*> view) override;
 	bool listElementShownUnread(not_null<const Element*> view) override;
 	bool listIsGoodForAroundPosition(not_null<const Element*> view) override;
+	void listSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) override;
 
 protected:
 	void resizeEvent(QResizeEvent *e) override;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 9f931c52e..1d53ed665 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -47,6 +47,7 @@ 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_replies_list.h"
 #include "data/data_changes.h"
@@ -445,11 +446,7 @@ void RepliesWidget::setupComposeControls() {
 		if (showSlowmodeError()) {
 			return;
 		}
-		auto message = ApiWrap::MessageToSend(_history);
-		message.textWithTags = { command };
-		message.action.replyTo = replyToId();
-		session().api().sendMessage(std::move(message));
-		finishSending();
+		listSendBotCommand(command, FullMsgId());
 	}, lifetime());
 
 	const auto saveEditMsgRequestId = lifetime().make_state<mtpRequestId>(0);
@@ -1766,6 +1763,17 @@ bool RepliesWidget::listIsGoodForAroundPosition(
 	return IsServerMsgId(view->data()->id);
 }
 
+void RepliesWidget::listSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) {
+	const auto text = WrapBotCommandInChat(_history->peer, command, context);
+	auto message = ApiWrap::MessageToSend(_history);
+	message.textWithTags = { text };
+	message.action.replyTo = replyToId();
+	session().api().sendMessage(std::move(message));
+	finishSending();
+}
+
 void RepliesWidget::confirmDeleteSelected() {
 	ConfirmDeleteSelectedItems(_inner);
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index a22b5d92f..63e055abc 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -126,6 +126,9 @@ public:
 	bool listElementHideReply(not_null<const Element*> view) override;
 	bool listElementShownUnread(not_null<const Element*> view) override;
 	bool listIsGoodForAroundPosition(not_null<const Element*> view) override;
+	void listSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) override;
 
 protected:
 	void resizeEvent(QResizeEvent *e) override;
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 0a2e506b5..57a1680a8 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -182,15 +182,7 @@ void ScheduledWidget::setupComposeControls() {
 
 	_composeControls->sendCommandRequests(
 	) | rpl::start_with_next([=](const QString &command) {
-		const auto callback = [=](Api::SendOptions options) {
-			auto message = ApiWrap::MessageToSend(_history);
-			message.textWithTags = { command };
-			message.action.options = options;
-			session().api().sendMessage(std::move(message));
-		};
-		Ui::show(
-			PrepareScheduleBox(this, sendMenuType(), callback),
-			Ui::LayerOption::KeepOther);
+		listSendBotCommand(command, FullMsgId());
 	}, lifetime());
 
 	const auto saveEditMsgRequestId = lifetime().make_state<mtpRequestId>(0);
@@ -1185,6 +1177,21 @@ bool ScheduledWidget::listIsGoodForAroundPosition(
 	return true;
 }
 
+void ScheduledWidget::listSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) {
+	const auto callback = [=](Api::SendOptions options) {
+		const auto text = WrapBotCommandInChat(_history->peer, command, context);
+		auto message = ApiWrap::MessageToSend(_history);
+		message.textWithTags = { text };
+		message.action.options = options;
+		session().api().sendMessage(std::move(message));
+	};
+	Ui::show(
+		PrepareScheduleBox(this, sendMenuType(), callback),
+		Ui::LayerOption::KeepOther);
+}
+
 void ScheduledWidget::confirmSendNowSelected() {
 	ConfirmSendNowSelectedItems(_inner);
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index ad7b55a56..5d564f9cb 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -110,6 +110,9 @@ public:
 	bool listElementHideReply(not_null<const Element*> view) override;
 	bool listElementShownUnread(not_null<const Element*> view) override;
 	bool listIsGoodForAroundPosition(not_null<const Element *> view) override;
+	void listSendBotCommand(
+		const QString &command,
+		const FullMsgId &context) override;
 
 protected:
 	void resizeEvent(QResizeEvent *e) override;
diff --git a/Telegram/SourceFiles/history/view/media/history_view_game.cpp b/Telegram/SourceFiles/history/view/media/history_view_game.cpp
index af6f8a282..cda894a14 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_game.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_game.cpp
@@ -33,7 +33,7 @@ Game::Game(
 , _title(st::msgMinWidth - st::webPageLeft)
 , _description(st::msgMinWidth - st::webPageLeft) {
 	if (!consumed.text.isEmpty()) {
-		const auto context = Core::UiIntegration::Context{
+		const auto context = Core::MarkedTextContext{
 			.session = &history()->session()
 		};
 		_description.setMarkedText(
@@ -418,7 +418,7 @@ void Game::parentTextUpdated() {
 	if (const auto media = _parent->data()->media()) {
 		const auto consumed = media->consumedMessageText();
 		if (!consumed.text.isEmpty()) {
-			const auto context = Core::UiIntegration::Context{
+			const auto context = Core::MarkedTextContext{
 				.session = &history()->session()
 			};
 			_description.setMarkedText(
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.cpp b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
index 64eb1ff5d..b72638f3b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
@@ -139,7 +139,7 @@ Ui::Text::String Media::createCaption(
 		- st::msgPadding.left()
 		- st::msgPadding.right();
 	auto result = Ui::Text::String(minResizeWidth);
-	const auto context = Core::UiIntegration::Context{
+	const auto context = Core::MarkedTextContext{
 		.session = &history()->session()
 	};
 	result.setMarkedText(
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 52a6a76ed..87b096b22 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -201,11 +201,12 @@ QSize WebPage::countOptimalSize() {
 				- st::msgPadding.right()
 				- st::webPageLeft);
 		}
-		auto context = Core::UiIntegration::Context();
+		auto context = Core::MarkedTextContext();
+		using MarkedTextContext = Core::MarkedTextContext;
 		if (_data->siteName == qstr("Twitter")) {
-			context.type = Core::UiIntegration::HashtagMentionType::Twitter;
+			context.type = MarkedTextContext::HashtagMentionType::Twitter;
 		} else if (_data->siteName == qstr("Instagram")) {
-			context.type = Core::UiIntegration::HashtagMentionType::Instagram;
+			context.type = MarkedTextContext::HashtagMentionType::Instagram;
 		}
 		_description.setMarkedText(
 			st::webPageDescriptionStyle,
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index e7d4fce54..0f3f1a5f8 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -2018,7 +2018,7 @@ void OverlayWidget::refreshCaption(HistoryItem *item) {
 	const auto base = duration
 		? DocumentTimestampLinkBase(_document, item->fullId())
 		: QString();
-	const auto context = Core::UiIntegration::Context{
+	const auto context = Core::MarkedTextContext{
 		.session = &item->history()->session()
 	};
 	_caption.setMarkedText(

From a8564b166b5da5e38729d405f308881b0bf8cb67 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 10 Nov 2020 20:26:41 +0300
Subject: [PATCH 091/370] Add inline bots to ComposeControls.

---
 .../history_view_compose_controls.cpp         | 211 +++++++++++++++++-
 .../controls/history_view_compose_controls.h  |  27 ++-
 2 files changed, 227 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 8f164e219..b9c2d4237 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -22,10 +22,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_messages.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "data/data_channel.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_web_page.h"
 #include "storage/storage_account.h"
 #include "facades.h"
+#include "apiwrap.h"
 #include "boxes/confirm_box.h"
 #include "history/history.h"
 #include "history/history_item.h"
@@ -537,6 +539,7 @@ ComposeControls::ComposeControls(
 
 ComposeControls::~ComposeControls() {
 	setTabbedPanel(nullptr);
+	session().api().request(_inlineBotResolveRequestId).cancel();
 }
 
 Main::Session &ComposeControls::session() const {
@@ -559,6 +562,7 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 	_window->tabbedSelector()->setCurrentPeer(
 		history ? history->peer.get() : nullptr);
 	initWebpageProcess();
+	updateFieldPlaceholder();
 }
 
 void ComposeControls::move(int x, int y) {
@@ -757,8 +761,7 @@ void ComposeControls::checkAutocomplete() {
 	}
 
 	const auto peer = _history->peer;
-	const auto isInlineBot = false;// _inlineBot && !_inlineLookingUpBot;
-	const auto autocomplete = isInlineBot
+	const auto autocomplete = _isInlineBot
 		? AutocompleteQuery()
 		: ParseMentionHashtagBotCommandQuery(_field);
 	if (!autocomplete.query.isEmpty()) {
@@ -878,7 +881,7 @@ void ComposeControls::setTextFromEditingMessage(not_null<HistoryItem*> item) {
 
 void ComposeControls::initField() {
 	_field->setMaxHeight(st::historyComposeFieldMaxHeight);
-	_field->setSubmitSettings(Core::App().settings().sendSubmitWay());
+	updateSubmitSettings();
 	//Ui::Connect(_field, &Ui::InputField::submitted, [=] { send(); });
 	Ui::Connect(_field, &Ui::InputField::cancelled, [=] { escape(); });
 	Ui::Connect(_field, &Ui::InputField::tabbed, [=] { fieldTabbed(); });
@@ -895,6 +898,13 @@ void ComposeControls::initField() {
 	InitSpellchecker(_window, _field);
 }
 
+void ComposeControls::updateSubmitSettings() {
+	const auto settings = _isInlineBot
+		? Ui::InputField::SubmitSettings::None
+		: Core::App().settings().sendSubmitWay();
+	_field->setSubmitSettings(settings);
+}
+
 void ComposeControls::initAutocomplete() {
 	const auto insertHashtagOrBotCommand = [=](
 			const QString &string,
@@ -1001,9 +1011,39 @@ void ComposeControls::updateStickersByEmoji() {
 	_autocomplete->showStickers(emoji);
 }
 
+void ComposeControls::updateFieldPlaceholder() {
+	if (!isEditingMessage() && _isInlineBot) {
+		_field->setPlaceholder(
+			rpl::single(_inlineBot->botInfo->inlinePlaceholder.mid(1)),
+			_inlineBot->username.size() + 2);
+		return;
+	}
+
+	_field->setPlaceholder([&] {
+		if (isEditingMessage()) {
+			return tr::lng_edit_message_text();
+		} else if (!_history) {
+			return tr::lng_message_ph();
+		} else if (const auto channel = _history->peer->asChannel()) {
+			if (channel->isBroadcast()) {
+				return session().data().notifySilentPosts(channel)
+					? tr::lng_broadcast_silent_ph()
+					: tr::lng_broadcast_ph();
+			} else if (channel->adminRights() & ChatAdminRight::f_anonymous) {
+				return tr::lng_send_anonymous_ph();
+			} else {
+				return tr::lng_message_ph();
+			}
+		} else {
+			return tr::lng_message_ph();
+		}
+	}());
+	updateSendButtonType();
+}
+
 void ComposeControls::fieldChanged() {
-	if (/*!_inlineBot
-		&& */!_header->isEditingMessage()
+	if (!_inlineBot
+		&& !_header->isEditingMessage()
 		&& (_textUpdateEvents & TextUpdateEvent::SendTyping)) {
 		_sendActionUpdates.fire({ Api::SendProgressType::Typing });
 	}
@@ -1012,6 +1052,7 @@ void ComposeControls::fieldChanged() {
 		//_previewCancelled = false;
 	}
 	InvokeQueued(_autocomplete.get(), [=] {
+		updateInlineBotQuery();
 		updateStickersByEmoji();
 	});
 }
@@ -1073,6 +1114,81 @@ void ComposeControls::initSendButton() {
 	}, _send->lifetime());
 
 	_send->finishAnimating();
+
+	_send->clicks(
+	) | rpl::filter([=] {
+		return (_send->type() == Ui::SendButton::Type::Cancel);
+	}) | rpl::start_with_next([=] {
+		cancelInlineBot();
+	}, _send->lifetime());
+}
+
+void ComposeControls::inlineBotResolveDone(
+		const MTPcontacts_ResolvedPeer &result) {
+	Expects(result.type() == mtpc_contacts_resolvedPeer);
+
+	_inlineBotResolveRequestId = 0;
+	const auto &data = result.c_contacts_resolvedPeer();
+	const auto resolvedBot = [&]() -> UserData* {
+		if (const auto result = session().data().processUsers(data.vusers())) {
+			if (result->isBot()
+				&& !result->botInfo->inlinePlaceholder.isEmpty()) {
+				return result;
+			}
+		}
+		return nullptr;
+	}();
+	session().data().processChats(data.vchats());
+
+	const auto query = ParseInlineBotQuery(&session(), _field);
+	if (_inlineBotUsername == query.username) {
+		applyInlineBotQuery(
+			query.lookingUpBot ? resolvedBot : query.bot,
+			query.query);
+	} else {
+		clearInlineBot();
+	}
+}
+
+void ComposeControls::inlineBotResolveFail(
+		const RPCError &error,
+		const QString &username) {
+	_inlineBotResolveRequestId = 0;
+	if (username == _inlineBotUsername) {
+		clearInlineBot();
+	}
+}
+
+void ComposeControls::cancelInlineBot() {
+	auto &textWithTags = _field->getTextWithTags();
+	if (textWithTags.text.size() > _inlineBotUsername.size() + 2) {
+		setText({ '@' + _inlineBotUsername + ' ', TextWithTags::Tags() });
+	} else {
+		setText({});
+	}
+}
+
+void ComposeControls::clearInlineBot() {
+	if (_inlineBot || _inlineLookingUpBot) {
+		_inlineBot = nullptr;
+		_inlineLookingUpBot = false;
+		inlineBotChanged();
+		_field->finishAnimating();
+	}
+	if (_inlineResults) {
+		_inlineResults->clearInlineBot();
+	}
+	checkAutocomplete();
+}
+
+void ComposeControls::inlineBotChanged() {
+	const auto isInlineBot = (_inlineBot && !_inlineLookingUpBot);
+	if (_isInlineBot != isInlineBot) {
+		_isInlineBot = isInlineBot;
+		updateFieldPlaceholder();
+		updateSubmitSettings();
+		checkAutocomplete();
+	}
 }
 
 void ComposeControls::initWriteRestriction() {
@@ -1155,8 +1271,8 @@ void ComposeControls::updateSendButtonType() {
 	const auto type = [&] {
 		if (_header->isEditingMessage()) {
 			return Type::Save;
-		//} else if (_isInlineBot) {
-		//	return Type::Cancel;
+		} else if (_isInlineBot) {
+			return Type::Cancel;
 		} else if (showRecordButton()) {
 			return Type::Record;
 		}
@@ -1319,6 +1435,7 @@ void ComposeControls::editMessage(FullMsgId id) {
 	if (_autocomplete) {
 		InvokeQueued(_autocomplete.get(), [=] { checkAutocomplete(); });
 	}
+	updateFieldPlaceholder();
 }
 
 void ComposeControls::cancelEditMessage() {
@@ -1326,6 +1443,7 @@ void ComposeControls::cancelEditMessage() {
 	if (_autocomplete) {
 		InvokeQueued(_autocomplete.get(), [=] { checkAutocomplete(); });
 	}
+	updateFieldPlaceholder();
 }
 
 void ComposeControls::replyToMessage(FullMsgId id) {
@@ -1338,7 +1456,10 @@ void ComposeControls::cancelReplyMessage() {
 }
 
 bool ComposeControls::handleCancelRequest() {
-	if (isEditingMessage()) {
+	if (_isInlineBot) {
+		cancelInlineBot();
+		return true;
+	} else if (isEditingMessage()) {
 		cancelEditMessage();
 		return true;
 	} else if (_autocomplete && !_autocomplete->isHidden()) {
@@ -1490,6 +1611,7 @@ void ComposeControls::initWebpageProcess() {
 	}) | rpl::start_with_next([=] {
 		checkPreview();
 		updateStickersByEmoji();
+		updateFieldPlaceholder();
 	}, lifetime);
 
 	_window->session().downloaderTaskFinished(
@@ -1557,4 +1679,77 @@ bool ComposeControls::isRecording() const {
 	return _voiceRecordBar->isRecording();
 }
 
+void ComposeControls::updateInlineBotQuery() {
+	if (!_history) {
+		return;
+	}
+	const auto query = ParseInlineBotQuery(&session(), _field);
+	if (_inlineBotUsername != query.username) {
+		_inlineBotUsername = query.username;
+		auto &api = session().api();
+		if (_inlineBotResolveRequestId) {
+			api.request(_inlineBotResolveRequestId).cancel();
+			_inlineBotResolveRequestId = 0;
+		}
+		if (query.lookingUpBot) {
+			_inlineBot = nullptr;
+			_inlineLookingUpBot = true;
+			const auto username = _inlineBotUsername;
+			_inlineBotResolveRequestId = api.request(
+				MTPcontacts_ResolveUsername(MTP_string(username))
+			).done([=](const MTPcontacts_ResolvedPeer &result) {
+				inlineBotResolveDone(result);
+			}).fail([=](const RPCError &error) {
+				inlineBotResolveFail(error, username);
+			}).send();
+		} else {
+			applyInlineBotQuery(query.bot, query.query);
+		}
+	} else if (query.lookingUpBot) {
+		if (!_inlineLookingUpBot) {
+			applyInlineBotQuery(_inlineBot, query.query);
+		}
+	} else {
+		applyInlineBotQuery(query.bot, query.query);
+	}
+}
+
+void ComposeControls::applyInlineBotQuery(
+		UserData *bot,
+		const QString &query) {
+	if (_history && bot) {
+		if (_inlineBot != bot) {
+			_inlineBot = bot;
+			_inlineLookingUpBot = false;
+			inlineBotChanged();
+		}
+		if (!_inlineResults) {
+			_inlineResults = std::make_unique<InlineBots::Layout::Widget>(
+				_parent,
+				_window);
+			_inlineResults->setResultSelectedCallback([=](
+					InlineBots::Result *result,
+					UserData *bot,
+					Api::SendOptions options) {
+				_inlineResultChosen.fire(InlineChosen{
+					.result = result,
+					.bot = bot,
+					.options = options,
+				});
+			});
+			_inlineResults->requesting(
+			) | rpl::start_with_next([=](bool requesting) {
+				_tabbedSelectorToggle->setLoading(requesting);
+			}, _inlineResults->lifetime());
+			updateOuterGeometry(_wrap->geometry());
+		}
+		_inlineResults->queryInlineBot(_inlineBot, _history->peer, query);
+		if (!_autocomplete->isHidden()) {
+			_autocomplete->hideAnimated();
+		}
+	} else {
+		clearInlineBot();
+	}
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index d7c6cc3ce..cfb6f7fa2 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -67,6 +67,7 @@ class ComposeControls final {
 public:
 	using FileChosen = ChatHelpers::TabbedSelector::FileChosen;
 	using PhotoChosen = ChatHelpers::TabbedSelector::PhotoChosen;
+	using InlineChosen = ChatHelpers::TabbedSelector::InlineChosen;
 
 	using MessageToEdit = Controls::MessageToEdit;
 	using VoiceToSend = Controls::VoiceToSend;
@@ -105,8 +106,7 @@ public:
 	[[nodiscard]] rpl::producer<PhotoChosen> photoChosen() const;
 	[[nodiscard]] rpl::producer<Data::MessagePosition> scrollRequests() const;
 	[[nodiscard]] rpl::producer<not_null<QKeyEvent*>> keyEvents() const;
-	[[nodiscard]] auto inlineResultChosen() const
-		-> rpl::producer<ChatHelpers::TabbedSelector::InlineChosen>;
+	[[nodiscard]] rpl::producer<InlineChosen> inlineResultChosen() const;
 	[[nodiscard]] rpl::producer<SendActionUpdate> sendActionUpdates() const;
 
 	using MimeDataHook = Fn<bool(
@@ -161,6 +161,7 @@ private:
 	void initWriteRestriction();
 	void initVoiceRecordBar();
 	void initAutocomplete();
+	void updateSubmitSettings();
 	void updateSendButtonType();
 	void updateHeight();
 	void updateWrappingVisibility();
@@ -172,6 +173,7 @@ private:
 	void orderControls();
 	void checkAutocomplete();
 	void updateStickersByEmoji();
+	void updateFieldPlaceholder();
 
 	void escape();
 	void fieldChanged();
@@ -186,6 +188,19 @@ private:
 	void drawRestrictedWrite(Painter &p, const QString &error);
 	void updateOverStates(QPoint pos);
 
+	void cancelInlineBot();
+	void clearInlineBot();
+	void inlineBotChanged();
+
+	// Look in the _field for the inline bot and query string.
+	void updateInlineBotQuery();
+
+	// Request to show results in the emoji panel.
+	void applyInlineBotQuery(UserData *bot, const QString &query);
+
+	void inlineBotResolveDone(const MTPcontacts_ResolvedPeer &result);
+	void inlineBotResolveFail(const RPCError &error, const QString &username);
+
 	const not_null<QWidget*> _parent;
 	const not_null<Window::SessionController*> _window;
 	History *_history = nullptr;
@@ -213,7 +228,7 @@ private:
 	rpl::event_stream<> _cancelRequests;
 	rpl::event_stream<FileChosen> _fileChosen;
 	rpl::event_stream<PhotoChosen> _photoChosen;
-	rpl::event_stream<ChatHelpers::TabbedSelector::InlineChosen> _inlineResultChosen;
+	rpl::event_stream<InlineChosen> _inlineResultChosen;
 	rpl::event_stream<SendActionUpdate> _sendActionUpdates;
 	rpl::event_stream<QString> _sendCommandRequests;
 
@@ -223,6 +238,12 @@ private:
 	//bool _inReplyEditForward = false;
 	//bool _inClickable = false;
 
+	UserData *_inlineBot = nullptr;
+	QString _inlineBotUsername;
+	bool _inlineLookingUpBot = false;
+	mtpRequestId _inlineBotResolveRequestId = 0;
+	bool _isInlineBot = false;
+
 	rpl::lifetime _uploaderSubscriptions;
 
 	Fn<void()> _raiseEmojiSuggestions;

From 10adbecb9c2b4ccd62c0d5a49ca99775d4c025c5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 10 Nov 2020 20:54:43 +0300
Subject: [PATCH 092/370] Support creating polls in RepliesSection.

---
 .../view/history_view_replies_section.cpp      |  5 +++++
 .../view/history_view_replies_section.h        |  2 ++
 .../view/history_view_top_bar_widget.cpp       | 18 +++++++++++-------
 Telegram/SourceFiles/mainwidget.cpp            |  4 +++-
 Telegram/SourceFiles/window/section_widget.h   |  4 ++++
 .../SourceFiles/window/window_peer_menu.cpp    |  3 ++-
 Telegram/SourceFiles/window/window_peer_menu.h |  1 +
 7 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 1d53ed665..33a088c85 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1398,6 +1398,11 @@ bool RepliesWidget::replyToMessage(not_null<HistoryItem*> item) {
 	return true;
 }
 
+MsgId RepliesWidget::currentReplyToIdFor(
+		not_null<History*> history) const {
+	return (_history == history) ? replyToId() : 0;
+}
+
 void RepliesWidget::saveState(not_null<RepliesMemento*> memento) {
 	memento->setReplies(_replies);
 	memento->setReplyReturns(_replyReturns);
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 63e055abc..18acc6030 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -88,6 +88,8 @@ public:
 		const Window::SectionShow &params,
 		MsgId messageId) override;
 	bool replyToMessage(not_null<HistoryItem*> item) override;
+	MsgId currentReplyToIdFor(
+		not_null<History*> history) const override;
 
 	void setInternalState(
 		const QRect &geometry,
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 6de1fb644..a4edc14ef 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -238,9 +238,11 @@ void TopBarWidget::showMenu() {
 			peer,
 			FilterId(),
 			addAction,
-			(_section == Section::Scheduled)
+			(_section == Section::Scheduled
 				? Window::PeerMenuSource::ScheduledSection
-				: Window::PeerMenuSource::History);
+				: (_section == Section::Replies)
+				? Window::PeerMenuSource::RepliesSection
+				: Window::PeerMenuSource::History));
 	} else if (const auto folder = _activeChat.folder()) {
 		Window::FillFolderMenu(
 			_controller,
@@ -686,12 +688,14 @@ void TopBarWidget::updateControlsVisibility() {
 		_unreadBadge->show();
 	}
 	const auto historyMode = (_section == Section::History);
-	const auto scheduledMode = (_section == Section::Scheduled);
-	const auto showInScheduledMode = (_activeChat.peer()
-		&& _activeChat.peer()->canSendPolls());
+	const auto hasPollsMenu = _activeChat.peer()
+		&& _activeChat.peer()->canSendPolls();
+	const auto hasMenu = !_activeChat.folder()
+		&& ((_section == Section::Scheduled || _section == Section::Replies)
+			? hasPollsMenu
+			: historyMode);
 	updateSearchVisibility();
-	_menuToggle->setVisible(!_activeChat.folder()
-		&& (scheduledMode ? showInScheduledMode : historyMode));
+	_menuToggle->setVisible(hasMenu);
 	_infoToggle->setVisible(historyMode
 		&& !_activeChat.folder()
 		&& !Adaptive::OneColumn()
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 63a1f13e4..e74d2118d 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -820,7 +820,9 @@ crl::time MainWidget::highlightStartTime(not_null<const HistoryItem*> item) cons
 }
 
 MsgId MainWidget::currentReplyToIdFor(not_null<History*> history) const {
-	if (_history->history() == history) {
+	if (_mainSection) {
+		return _mainSection->currentReplyToIdFor(history);
+	} else if (_history->history() == history) {
 		return _history->replyToId();
 	} else if (const auto localDraft = history->localDraft()) {
 		return localDraft->msgId;
diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h
index 6d5f3b7fd..664fe9710 100644
--- a/Telegram/SourceFiles/window/section_widget.h
+++ b/Telegram/SourceFiles/window/section_widget.h
@@ -128,6 +128,10 @@ public:
 	virtual bool replyToMessage(not_null<HistoryItem*> item) {
 		return false;
 	}
+	[[nodiscard]] virtual MsgId currentReplyToIdFor(
+			not_null<History*> history) const {
+		return 0;
+	}
 
 	// Create a memento of that section to store it in the history stack.
 	// This method may modify the section ("take" heavy items).
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index d105b7428..90088b65e 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -650,7 +650,8 @@ void Filler::addPollAction(not_null<PeerData*> peer) {
 }
 
 void Filler::fill() {
-	if (_source == PeerMenuSource::ScheduledSection) {
+	if (_source == PeerMenuSource::ScheduledSection
+		|| _source == PeerMenuSource::RepliesSection) {
 		addPollAction(_peer);
 		return;
 	}
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index e733211a4..f5c9f1a2e 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -37,6 +37,7 @@ enum class PeerMenuSource {
 	History,
 	Profile,
 	ScheduledSection,
+	RepliesSection,
 };
 
 using PeerMenuCallback = Fn<QAction*(

From 4f22171dd66650dd28c50893570c5b1d792838e7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 10 Nov 2020 21:51:20 +0300
Subject: [PATCH 093/370] Add start bot command and handle via@ links.

---
 .../admin_log/history_admin_log_inner.cpp     |  3 +
 .../admin_log/history_admin_log_inner.h       |  1 +
 .../history/history_inner_widget.cpp          | 11 ++-
 .../history/history_inner_widget.h            |  1 +
 .../history/history_item_components.cpp       | 11 ++-
 .../history_view_compose_controls.cpp         | 72 +++++++++++++++++--
 .../controls/history_view_compose_controls.h  |  4 ++
 .../history/view/history_view_element.cpp     |  3 +
 .../history/view/history_view_element.h       |  2 +
 .../history/view/history_view_list_widget.cpp |  6 +-
 .../history/view/history_view_list_widget.h   |  2 +
 .../view/history_view_pinned_section.cpp      |  3 +
 .../view/history_view_pinned_section.h        |  1 +
 .../view/history_view_replies_section.cpp     |  4 ++
 .../view/history_view_replies_section.h       |  1 +
 .../view/history_view_scheduled_section.cpp   |  4 ++
 .../view/history_view_scheduled_section.h     |  1 +
 Telegram/lib_base                             |  2 +-
 Telegram/lib_ui                               |  2 +-
 19 files changed, 122 insertions(+), 12 deletions(-)

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 9653ecf01..bf383ddec 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -605,6 +605,9 @@ void InnerWidget::elementSendBotCommand(
 	const FullMsgId &context) {
 }
 
+void InnerWidget::elementHandleViaClick(not_null<UserData*> bot) {
+}
+
 void InnerWidget::saveState(not_null<SectionMemento*> memento) {
 	memento->setFilter(std::move(_filter));
 	memento->setAdmins(std::move(_admins));
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
index d402460ae..32a6fcf42 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
@@ -119,6 +119,7 @@ public:
 	void elementSendBotCommand(
 		const QString &command,
 		const FullMsgId &context) override;
+	void elementHandleViaClick(not_null<UserData*> bot) override;
 
 	~InnerWidget();
 
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 52720fada..9e96faf10 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -2566,6 +2566,10 @@ void HistoryInner::elementSendBotCommand(
 	}
 }
 
+void HistoryInner::elementHandleViaClick(not_null<UserData*> bot) {
+	App::insertBotCommand('@' + bot->username);
+}
+
 auto HistoryInner::getSelectionState() const
 -> HistoryView::TopBarWidget::SelectedState {
 	auto result = HistoryView::TopBarWidget::SelectedState {};
@@ -3462,11 +3466,16 @@ not_null<HistoryView::ElementDelegate*> HistoryInner::ElementDelegate() {
 		}
 		void elementSendBotCommand(
 				const QString &command,
-				const FullMsgId &context) {
+				const FullMsgId &context) override {
 			if (Instance) {
 				Instance->elementSendBotCommand(command, context);
 			}
 		}
+		void elementHandleViaClick(not_null<UserData*> bot) override {
+			if (Instance) {
+				Instance->elementHandleViaClick(bot);
+			}
+		}
 	};
 
 	static Result result;
diff --git a/Telegram/SourceFiles/history/history_inner_widget.h b/Telegram/SourceFiles/history/history_inner_widget.h
index 2532568f8..8e5f5d6f3 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.h
+++ b/Telegram/SourceFiles/history/history_inner_widget.h
@@ -95,6 +95,7 @@ public:
 	void elementSendBotCommand(
 		const QString &command,
 		const FullMsgId &context);
+	void elementHandleViaClick(not_null<UserData*> bot);
 
 	void updateBotInfo(bool recount = true);
 
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 4215341c9..a1292c6bb 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_message.h"
 #include "history/view/history_view_service_message.h"
 #include "history/view/media/history_view_document.h"
+#include "core/click_handler_types.h"
 #include "mainwindow.h"
 #include "media/audio/media_audio.h"
 #include "media/player/media_player_instance.h"
@@ -45,7 +46,8 @@ void HistoryMessageVia::create(
 	bot = owner->user(userId);
 	maxWidth = st::msgServiceNameFont->width(
 		tr::lng_inline_bot_via(tr::now, lt_inline_bot, '@' + bot->username));
-	link = std::make_shared<LambdaClickHandler>([bot = this->bot] {
+	link = std::make_shared<LambdaClickHandler>([bot = this->bot](
+			ClickContext context) {
 		if (QGuiApplication::keyboardModifiers() == Qt::ControlModifier) {
 			if (const auto window = App::wnd()) {
 				if (const auto controller = window->sessionController()) {
@@ -54,7 +56,12 @@ void HistoryMessageVia::create(
 				}
 			}
 		}
-		App::insertBotCommand('@' + bot->username);
+		const auto my = context.other.value<ClickHandlerContext>();
+		if (const auto delegate = my.elementDelegate ? my.elementDelegate() : nullptr) {
+			delegate->elementHandleViaClick(bot);
+		} else {
+			App::insertBotCommand('@' + bot->username);
+		}
 	});
 }
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index b9c2d4237..97189d361 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_messages.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "data/data_chat.h"
 #include "data/data_channel.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_web_page.h"
@@ -521,6 +522,9 @@ ComposeControls::ComposeControls(
 		st::historyComposeField,
 		Ui::InputField::Mode::MultiLine,
 		tr::lng_message_ph()))
+, _botCommandStart(Ui::CreateChild<Ui::IconButton>(
+	_wrap.get(),
+	st::historyBotCommandStart))
 , _autocomplete(std::make_unique<FieldAutocomplete>(
 		parent,
 		window))
@@ -562,7 +566,21 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 	_window->tabbedSelector()->setCurrentPeer(
 		history ? history->peer.get() : nullptr);
 	initWebpageProcess();
+	updateBotCommandShown();
+	updateControlsGeometry(_wrap->size());
+	updateControlsVisibility();
 	updateFieldPlaceholder();
+	if (!_history) {
+		return;
+	}
+	const auto peer = _history->peer;
+	if (peer->isChat() && peer->asChat()->noParticipantInfo()) {
+		session().api().requestFullPeer(peer);
+	} else if (const auto channel = peer->asMegagroup()) {
+		if (!channel->mgInfo->botStatus) {
+			session().api().requestBots(channel);
+		}
+	}
 }
 
 void ComposeControls::move(int x, int y) {
@@ -791,6 +809,8 @@ void ComposeControls::init() {
 	initWriteRestriction();
 	initVoiceRecordBar();
 
+	_botCommandStart->setClickedCallback([=] { setText({ "/" }); });
+
 	_wrap->sizeValue(
 	) | rpl::start_with_next([=](QSize size) {
 		updateControlsGeometry(size);
@@ -1051,6 +1071,10 @@ void ComposeControls::fieldChanged() {
 	if (showRecordButton()) {
 		//_previewCancelled = false;
 	}
+	if (updateBotCommandShown()) {
+		updateControlsVisibility();
+		updateControlsGeometry(_wrap->size());
+	}
 	InvokeQueued(_autocomplete.get(), [=] {
 		updateInlineBotQuery();
 		updateStickersByEmoji();
@@ -1297,13 +1321,14 @@ void ComposeControls::finishAnimating() {
 
 void ComposeControls::updateControlsGeometry(QSize size) {
 	// _attachToggle -- _inlineResults ------ _tabbedPanel -- _fieldBarCancel
-	// (_attachDocument|_attachPhoto) _field _tabbedSelectorToggle _send
+	// (_attachDocument|_attachPhoto) _field _botCommandStart _tabbedSelectorToggle _send
 
 	const auto fieldWidth = size.width()
 		- _attachToggle->width()
 		- st::historySendRight
 		- _send->width()
-		- _tabbedSelectorToggle->width();
+		- _tabbedSelectorToggle->width()
+		- (_botCommandShown ? _botCommandStart->width() : 0);
 	_field->resizeToWidth(fieldWidth);
 
 	const auto buttonsTop = size.height() - _attachToggle->height();
@@ -1324,6 +1349,8 @@ void ComposeControls::updateControlsGeometry(QSize size) {
 	_send->moveToRight(right, buttonsTop);
 	right += _send->width();
 	_tabbedSelectorToggle->moveToRight(right, buttonsTop);
+	right += _tabbedSelectorToggle->width();
+	_botCommandStart->moveToRight(right, buttonsTop);
 
 	_voiceRecordBar->resizeToWidth(size.width());
 	_voiceRecordBar->moveToLeft(
@@ -1331,6 +1358,28 @@ void ComposeControls::updateControlsGeometry(QSize size) {
 		size.height() - _voiceRecordBar->height());
 }
 
+void ComposeControls::updateControlsVisibility() {
+	_botCommandStart->setVisible(_botCommandShown);
+}
+
+bool ComposeControls::updateBotCommandShown() {
+	auto shown = false;
+	const auto peer = _history ? _history->peer.get() : nullptr;
+	if (peer
+		&& ((peer->isChat() && peer->asChat()->botStatus > 0)
+			|| (peer->isMegagroup() && peer->asChannel()->mgInfo->botStatus > 0)
+			|| (peer->isUser() && peer->asUser()->isBot()))) {
+		if (!HasSendText(_field)) {
+			shown = true;
+		}
+	}
+	if (_botCommandShown != shown) {
+		_botCommandShown = shown;
+		return true;
+	}
+	return false;
+}
+
 void ComposeControls::updateOuterGeometry(QRect rect) {
 	if (_inlineResults) {
 		_inlineResults->moveBottom(rect.y());
@@ -1604,7 +1653,7 @@ void ComposeControls::initWebpageProcess() {
 		getWebPagePreview();
 	});
 
-	_window->session().changes().peerUpdates(
+	session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::Rights
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer.get() == peer);
@@ -1614,7 +1663,18 @@ void ComposeControls::initWebpageProcess() {
 		updateFieldPlaceholder();
 	}, lifetime);
 
-	_window->session().downloaderTaskFinished(
+	base::ObservableViewer(
+		session().api().fullPeerUpdated()
+	) | rpl::filter([=](PeerData *peer) {
+		return _history && (_history->peer == peer);
+	}) | rpl::start_with_next([=] {
+		if (updateBotCommandShown()) {
+			updateControlsVisibility();
+			updateControlsGeometry(_wrap->size());
+		}
+	}, lifetime);
+
+	session().downloaderTaskFinished(
 	) | rpl::filter([=] {
 		return (*previewData)
 			&& ((*previewData)->document || (*previewData)->photo);
@@ -1622,7 +1682,7 @@ void ComposeControls::initWebpageProcess() {
 		requestRepaint
 	), lifetime);
 
-	_window->session().data().webPageUpdates(
+	session().data().webPageUpdates(
 	) | rpl::filter([=](not_null<WebPageData*> page) {
 		return (*previewData == page.get());
 	}) | rpl::start_with_next([=] {
@@ -1652,7 +1712,7 @@ WebPageId ComposeControls::webPageId() const {
 rpl::producer<Data::MessagePosition> ComposeControls::scrollRequests() const {
 	return _header->scrollToItemRequests(
 		) | rpl::map([=](FullMsgId id) -> Data::MessagePosition {
-			if (const auto item = _window->session().data().message(id)) {
+			if (const auto item = session().data().message(id)) {
 				return item->position();
 			}
 			return {};
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index cfb6f7fa2..b04a68b31 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -187,6 +187,7 @@ private:
 	bool showRecordButton() const;
 	void drawRestrictedWrite(Painter &p, const QString &error);
 	void updateOverStates(QPoint pos);
+	bool updateBotCommandShown();
 
 	void cancelInlineBot();
 	void clearInlineBot();
@@ -217,6 +218,8 @@ private:
 	const not_null<Ui::IconButton*> _attachToggle;
 	const not_null<Ui::EmojiButton*> _tabbedSelectorToggle;
 	const not_null<Ui::InputField*> _field;
+	const not_null<Ui::IconButton*> _botCommandStart;
+
 	std::unique_ptr<InlineBots::Layout::Widget> _inlineResults;
 	std::unique_ptr<ChatHelpers::TabbedPanel> _tabbedPanel;
 	std::unique_ptr<FieldAutocomplete> _autocomplete;
@@ -243,6 +246,7 @@ private:
 	bool _inlineLookingUpBot = false;
 	mtpRequestId _inlineBotResolveRequestId = 0;
 	bool _isInlineBot = false;
+	bool _botCommandShown = false;
 
 	rpl::lifetime _uploaderSubscriptions;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 471932bd8..97d128ba0 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -126,6 +126,9 @@ void SimpleElementDelegate::elementSendBotCommand(
 	const FullMsgId &context) {
 }
 
+void SimpleElementDelegate::elementHandleViaClick(not_null<UserData*> bot) {
+}
+
 TextSelection UnshiftItemSelection(
 		TextSelection selection,
 		uint16 byLength) {
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index 1f14d0a24..fe64bdf3e 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -70,6 +70,7 @@ public:
 	virtual void elementSendBotCommand(
 		const QString &command,
 		const FullMsgId &context) = 0;
+	virtual void elementHandleViaClick(not_null<UserData*> bot) = 0;
 
 };
 
@@ -105,6 +106,7 @@ public:
 	void elementSendBotCommand(
 		const QString &command,
 		const FullMsgId &context) override;
+	void elementHandleViaClick(not_null<UserData*> bot) override;
 
 private:
 	const not_null<Window::SessionController*> _controller;
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 39ebdf248..15f02c0af 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -1297,7 +1297,11 @@ bool ListWidget::elementShownUnread(not_null<const Element*> view) {
 void ListWidget::elementSendBotCommand(
 		const QString &command,
 		const FullMsgId &context) {
-	return _delegate->listSendBotCommand(command, context);
+	_delegate->listSendBotCommand(command, context);
+}
+
+void ListWidget::elementHandleViaClick(not_null<UserData*> bot) {
+	_delegate->listHandleViaClick(bot);
 }
 
 void ListWidget::saveState(not_null<ListMemento*> memento) {
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.h b/Telegram/SourceFiles/history/view/history_view_list_widget.h
index 103416658..dff78abba 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.h
@@ -90,6 +90,7 @@ public:
 	virtual void listSendBotCommand(
 		const QString &command,
 		const FullMsgId &context) = 0;
+	virtual void listHandleViaClick(not_null<UserData*> bot) = 0;
 
 };
 
@@ -239,6 +240,7 @@ public:
 	void elementSendBotCommand(
 		const QString &command,
 		const FullMsgId &context) override;
+	void elementHandleViaClick(not_null<UserData*> bot) override;
 
 	~ListWidget();
 
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index a2902fd39..9699c13f0 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -644,6 +644,9 @@ void PinnedWidget::listSendBotCommand(
 	const FullMsgId &context) {
 }
 
+void PinnedWidget::listHandleViaClick(not_null<UserData*> bot) {
+}
+
 void PinnedWidget::confirmDeleteSelected() {
 	ConfirmDeleteSelectedItems(_inner);
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.h b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
index bfc8517de..ec4250346 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -96,6 +96,7 @@ public:
 	void listSendBotCommand(
 		const QString &command,
 		const FullMsgId &context) override;
+	void listHandleViaClick(not_null<UserData*> bot) override;
 
 protected:
 	void resizeEvent(QResizeEvent *e) override;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 33a088c85..76755b0b3 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1779,6 +1779,10 @@ void RepliesWidget::listSendBotCommand(
 	finishSending();
 }
 
+void RepliesWidget::listHandleViaClick(not_null<UserData*> bot) {
+	_composeControls->setText({ '@' + bot->username + ' ' });
+}
+
 void RepliesWidget::confirmDeleteSelected() {
 	ConfirmDeleteSelectedItems(_inner);
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 18acc6030..308368438 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -131,6 +131,7 @@ public:
 	void listSendBotCommand(
 		const QString &command,
 		const FullMsgId &context) override;
+	void listHandleViaClick(not_null<UserData*> bot) override;
 
 protected:
 	void resizeEvent(QResizeEvent *e) override;
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 57a1680a8..f1c14871a 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -1192,6 +1192,10 @@ void ScheduledWidget::listSendBotCommand(
 		Ui::LayerOption::KeepOther);
 }
 
+void ScheduledWidget::listHandleViaClick(not_null<UserData*> bot) {
+	_composeControls->setText({ '@' + bot->username + ' ' });
+}
+
 void ScheduledWidget::confirmSendNowSelected() {
 	ConfirmSendNowSelectedItems(_inner);
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 5d564f9cb..31716aaee 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -113,6 +113,7 @@ public:
 	void listSendBotCommand(
 		const QString &command,
 		const FullMsgId &context) override;
+	void listHandleViaClick(not_null<UserData*> bot) override;
 
 protected:
 	void resizeEvent(QResizeEvent *e) override;
diff --git a/Telegram/lib_base b/Telegram/lib_base
index ee68d3a63..4f22126e7 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit ee68d3a63b4f1e550e7f93c1f8d6e8e372bc0f33
+Subproject commit 4f22126e7e855b517857408abf2467cba163a6f2
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 77b6e43b1..f06346fbf 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 77b6e43b17df43d64354ba7198e6a7695a636627
+Subproject commit f06346fbf03900c278e1d59717e1387bffc03f39

From 4a8b59b788dad173d408e07df27320f71cf24c66 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 11 Nov 2020 23:47:40 +0300
Subject: [PATCH 094/370] Pass reply info to Window::PeerMenu.

---
 .../dialogs/dialogs_inner_widget.cpp          |  15 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    |   6 +-
 Telegram/SourceFiles/facades.cpp              |   8 +-
 .../SourceFiles/history/history_widget.cpp    |  27 ++--
 Telegram/SourceFiles/history/history_widget.h |   1 +
 .../view/history_view_pinned_section.cpp      |   6 +-
 .../view/history_view_replies_section.cpp     |  29 ++--
 .../view/history_view_replies_section.h       |   4 +-
 .../view/history_view_scheduled_section.cpp   |   6 +-
 .../view/history_view_top_bar_widget.cpp      | 151 ++++++++++--------
 .../view/history_view_top_bar_widget.h        |  13 +-
 .../SourceFiles/info/info_wrap_widget.cpp     |   9 +-
 Telegram/SourceFiles/mainwidget.cpp           |  11 --
 Telegram/SourceFiles/mainwidget.h             |   2 -
 Telegram/SourceFiles/window/section_widget.h  |   4 -
 .../SourceFiles/window/window_peer_menu.cpp   | 105 ++++++------
 .../SourceFiles/window/window_peer_menu.h     |  36 +++--
 17 files changed, 236 insertions(+), 197 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 5aa666cc9..86066c2e0 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1817,20 +1817,21 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 	} else if (const auto history = row.key.history()) {
 		Window::FillPeerMenu(
 			_controller,
-			history->peer,
-			_filterId,
+			Window::PeerMenuRequest{
+				.peer = history->peer,
+				.source = Window::PeerMenuRequest::Source::ChatsList,
+				.filterId = _filterId,
+			},
 			[&](const QString &text, Fn<void()> callback) {
 				return _menu->addAction(text, std::move(callback));
-			},
-			Window::PeerMenuSource::ChatsList);
+			});
 	} else if (const auto folder = row.key.folder()) {
 		Window::FillFolderMenu(
 			_controller,
-			folder,
+			Window::FolderMenuRequest{ folder },
 			[&](const QString &text, Fn<void()> callback) {
 				return _menu->addAction(text, std::move(callback));
-			},
-			Window::PeerMenuSource::ChatsList);
+			});
 	}
 	connect(_menu.get(), &QObject::destroyed, [=] {
 		if (_menuRow.key) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 5e82e23b9..c41aeb2d3 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -523,8 +523,10 @@ void Widget::refreshFolderTopBar() {
 			updateControlsGeometry();
 		}
 		_folderTopBar->setActiveChat(
-			_openedFolder,
-			HistoryView::TopBarWidget::Section::History,
+			HistoryView::TopBarWidget::ActiveChat{
+				.key = _openedFolder,
+				.section = HistoryView::TopBarWidget::Section::Dialogs,
+			},
 			nullptr);
 	} else {
 		_folderTopBar.destroy();
diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp
index bf3c6989c..c672f9072 100644
--- a/Telegram/SourceFiles/facades.cpp
+++ b/Telegram/SourceFiles/facades.cpp
@@ -171,7 +171,13 @@ void activateBotCommand(
 			}
 		}
 		if (const auto m = CheckMainWidget(&msg->history()->session())) {
-			Window::PeerMenuCreatePoll(m->controller(), msg->history()->peer, chosen, disabled);
+			const auto replyToId = MsgId(0);
+			Window::PeerMenuCreatePoll(
+				m->controller(),
+				msg->history()->peer,
+				replyToId,
+				chosen,
+				disabled);
 		}
 	} break;
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 75bd8b335..122792c35 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -707,6 +707,16 @@ void HistoryWidget::setGeometryWithTopMoved(
 	_topDelta = 0;
 }
 
+void HistoryWidget::refreshTopBarActiveChat() {
+	_topBar->setActiveChat(
+		HistoryView::TopBarWidget::ActiveChat{
+			.key = _history,
+			.section = HistoryView::TopBarWidget::Section::History,
+			.currentReplyToId = replyToId(),
+		},
+		_history->sendActionPainter());
+}
+
 void HistoryWidget::refreshTabbedPanel() {
 	if (_peer && controller()->hasTabbedSelectorOwnership()) {
 		createTabbedPanel();
@@ -1588,6 +1598,7 @@ void HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 			updateControlsVisibility();
 			updateControlsGeometry();
 		}
+		refreshTopBarActiveChat();
 		return;
 	}
 
@@ -1607,7 +1618,7 @@ void HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	}
 	updateControlsVisibility();
 	updateControlsGeometry();
-
+	refreshTopBarActiveChat();
 	if (_editMsgId || _replyToId) {
 		updateReplyEditTexts();
 		if (!_replyEditMsg) {
@@ -1825,10 +1836,7 @@ void HistoryWidget::showHistory(
 		}
 		_history->setFakeUnreadWhileOpened(true);
 
-		_topBar->setActiveChat(
-			_history,
-			HistoryView::TopBarWidget::Section::History,
-			_history->sendActionPainter());
+		refreshTopBarActiveChat();
 		updateTopBarSelection();
 
 		if (_channel) {
@@ -1915,10 +1923,7 @@ void HistoryWidget::showHistory(
 		unreadCountUpdated(); // set _historyDown badge.
 		showAboutTopPromotion();
 	} else {
-		_topBar->setActiveChat(
-			Dialogs::Key(),
-			HistoryView::TopBarWidget::Section::History,
-			nullptr);
+		refreshTopBarActiveChat();
 		updateTopBarSelection();
 
 		clearFieldText();
@@ -4763,6 +4768,7 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) {
 			updateMouseTracking();
 		}
 	}
+	refreshTopBarActiveChat();
 	updateControlsGeometry();
 	update();
 }
@@ -5479,6 +5485,7 @@ void HistoryWidget::replyToMessage(not_null<HistoryItem*> item) {
 		updateReplyToName();
 		updateControlsGeometry();
 		updateField();
+		refreshTopBarActiveChat();
 	}
 
 	_saveDraftText = true;
@@ -5605,7 +5612,7 @@ bool HistoryWidget::cancelReply(bool lastKeyboardUsed) {
 		}
 
 		updateBotKeyboard();
-
+		refreshTopBarActiveChat();
 		updateControlsGeometry();
 		update();
 	} else if (auto localDraft = (_history ? _history->localDraft() : nullptr)) {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 57c964f03..b05e6fb36 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -353,6 +353,7 @@ private:
 	void createTabbedPanel();
 	void setTabbedPanel(std::unique_ptr<TabbedPanel> panel);
 	void updateField();
+	void refreshTopBarActiveChat();
 
 	void requestMessageData(MsgId msgId);
 	void messageDataReceived(ChannelData *channel, MsgId msgId);
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 9699c13f0..2d8d2fa92 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -102,8 +102,10 @@ PinnedWidget::PinnedWidget(
 	st::historyComposeButton))
 , _scrollDown(_scroll.get(), st::historyToDown) {
 	_topBar->setActiveChat(
-		_history,
-		TopBarWidget::Section::Pinned,
+		TopBarWidget::ActiveChat{
+			.key = _history,
+			.section = TopBarWidget::Section::Pinned,
+		},
 		nullptr);
 
 	_topBar->move(0, 0);
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 76755b0b3..18fe048d0 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -167,10 +167,7 @@ RepliesWidget::RepliesWidget(
 
 	session().api().requestFullPeer(_history->peer);
 
-	_topBar->setActiveChat(
-		_history,
-		TopBarWidget::Section::Replies,
-		_sendAction.get());
+	refreshTopBarActiveChat();
 
 	_topBar->move(0, 0);
 	_topBar->resizeToWidth(width());
@@ -220,7 +217,7 @@ RepliesWidget::RepliesWidget(
 
 	_inner->replyToMessageRequested(
 	) | rpl::start_with_next([=](auto fullId) {
-		_composeControls->replyToMessage(fullId);
+		replyToMessage(fullId);
 	}, _inner->lifetime());
 
 	_composeControls->sendActionUpdates(
@@ -714,6 +711,7 @@ void RepliesWidget::sendingFilesConfirmed(
 	}
 	if (_composeControls->replyingToMessage().msg == replyTo) {
 		_composeControls->cancelReplyMessage();
+		refreshTopBarActiveChat();
 	}
 }
 
@@ -1138,6 +1136,17 @@ SendMenu::Type RepliesWidget::sendMenuType() const {
 		: SendMenu::Type::Scheduled;
 }
 
+void RepliesWidget::refreshTopBarActiveChat() {
+	_topBar->setActiveChat(
+		TopBarWidget::ActiveChat{
+			.key = _history,
+			.section = TopBarWidget::Section::Replies,
+			.rootId = _rootId,
+			.currentReplyToId = replyToId(),
+		},
+		_sendAction.get());
+}
+
 MsgId RepliesWidget::replyToId() const {
 	const auto custom = _composeControls->replyingToMessage().msg;
 	return custom ? custom : _rootId;
@@ -1181,6 +1190,7 @@ void RepliesWidget::finishSending() {
 	//if (_previewData && _previewData->pendingTill) previewCancel();
 	doSetInnerFocus();
 	showAtEnd();
+	refreshTopBarActiveChat();
 }
 
 void RepliesWidget::showAtPosition(
@@ -1394,13 +1404,13 @@ bool RepliesWidget::replyToMessage(not_null<HistoryItem*> item) {
 	if (item->history() != _history || item->replyToTop() != _rootId) {
 		return false;
 	}
-	_composeControls->replyToMessage(item->fullId());
+	replyToMessage(item->fullId());
 	return true;
 }
 
-MsgId RepliesWidget::currentReplyToIdFor(
-		not_null<History*> history) const {
-	return (_history == history) ? replyToId() : 0;
+void RepliesWidget::replyToMessage(FullMsgId itemId) {
+	_composeControls->replyToMessage(itemId);
+	refreshTopBarActiveChat();
 }
 
 void RepliesWidget::saveState(not_null<RepliesMemento*> memento) {
@@ -1626,6 +1636,7 @@ void RepliesWidget::listCancelRequest() {
 		clearSelected();
 		return;
 	} else if (_composeControls->handleCancelRequest()) {
+		refreshTopBarActiveChat();
 		return;
 	}
 	controller()->showBackFromStack();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 308368438..66e8b7eb0 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -88,8 +88,6 @@ public:
 		const Window::SectionShow &params,
 		MsgId messageId) override;
 	bool replyToMessage(not_null<HistoryItem*> item) override;
-	MsgId currentReplyToIdFor(
-		not_null<History*> history) const override;
 
 	void setInternalState(
 		const QRect &geometry,
@@ -200,6 +198,8 @@ private:
 	void restoreReplyReturns(const std::vector<MsgId> &list);
 	void checkReplyReturns();
 	void recountChatWidth();
+	void replyToMessage(FullMsgId itemId);
+	void refreshTopBarActiveChat();
 
 	void uploadFile(const QByteArray &fileContent, SendMediaType type);
 	bool confirmSendingFiles(
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index f1c14871a..9c5f32ca5 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -100,8 +100,10 @@ ScheduledWidget::ScheduledWidget(
 	ComposeControls::Mode::Scheduled))
 , _scrollDown(_scroll, st::historyToDown) {
 	_topBar->setActiveChat(
-		_history,
-		TopBarWidget::Section::Scheduled,
+		TopBarWidget::ActiveChat{
+			.key = _history,
+			.section = TopBarWidget::Section::Scheduled,
+		},
 		nullptr);
 
 	_topBar->move(0, 0);
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 a4edc14ef..432694aaa 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -115,7 +115,7 @@ TopBarWidget::TopBarWidget(
 		using AnimationUpdate = Data::Session::SendActionAnimationUpdate;
 		session().data().sendActionAnimationUpdated(
 		) | rpl::filter([=](const AnimationUpdate &update) {
-			return (update.history == _activeChat.history());
+			return (update.history == _activeChat.key.history());
 		}) | rpl::start_with_next([=] {
 			update();
 		}, lifetime());
@@ -191,13 +191,13 @@ void TopBarWidget::refreshLang() {
 }
 
 void TopBarWidget::onSearch() {
-	if (_activeChat) {
-		_controller->content()->searchInChat(_activeChat);
+	if (_activeChat.key) {
+		_controller->content()->searchInChat(_activeChat.key);
 	}
 }
 
 void TopBarWidget::onCall() {
-	if (const auto peer = _activeChat.peer()) {
+	if (const auto peer = _activeChat.key.peer()) {
 		if (const auto user = peer->asUser()) {
 			Core::App().calls().startOutgoingCall(user, false);
 		}
@@ -205,7 +205,7 @@ void TopBarWidget::onCall() {
 }
 
 void TopBarWidget::showMenu() {
-	if (!_activeChat || _menu) {
+	if (!_activeChat.key || _menu) {
 		return;
 	}
 	_menu.create(parentWidget());
@@ -228,27 +228,31 @@ void TopBarWidget::showMenu() {
 	}));
 	_menuToggle->installEventFilter(_menu);
 	const auto addAction = [&](
-		const QString & text,
+		const QString &text,
 		Fn<void()> callback) {
 		return _menu->addAction(text, std::move(callback));
 	};
-	if (const auto peer = _activeChat.peer()) {
+	if (const auto peer = _activeChat.key.peer()) {
+		using Source = Window::PeerMenuRequest::Source;
+		const auto source = (_activeChat.section == Section::Scheduled)
+			? Source::ScheduledSection
+			: (_activeChat.section == Section::Replies)
+			? Source::RepliesSection
+			: Source::History;
 		Window::FillPeerMenu(
 			_controller,
-			peer,
-			FilterId(),
-			addAction,
-			(_section == Section::Scheduled
-				? Window::PeerMenuSource::ScheduledSection
-				: (_section == Section::Replies)
-				? Window::PeerMenuSource::RepliesSection
-				: Window::PeerMenuSource::History));
-	} else if (const auto folder = _activeChat.folder()) {
+			Window::PeerMenuRequest{
+				.peer = peer,
+				.source = source,
+				.rootId = _activeChat.rootId,
+				.currentReplyToId = _activeChat.currentReplyToId,
+			},
+			addAction);
+	} else if (const auto folder = _activeChat.key.folder()) {
 		Window::FillFolderMenu(
 			_controller,
-			folder,
-			addAction,
-			Window::PeerMenuSource::History);
+			Window::FolderMenuRequest{ folder },
+			addAction);
 	} else {
 		Unexpected("Empty active chat in TopBarWidget::showMenu.");
 	}
@@ -265,13 +269,13 @@ void TopBarWidget::toggleInfoSection() {
 		&& (Core::App().settings().thirdSectionInfoEnabled()
 			|| Core::App().settings().tabbedReplacedWithInfo())) {
 		_controller->closeThirdSection();
-	} else if (_activeChat.peer()) {
+	} else if (_activeChat.key.peer()) {
 		if (_controller->canShowThirdSection()) {
 			Core::App().settings().setThirdSectionInfoEnabled(true);
 			Core::App().saveSettingsDelayed();
 			if (Adaptive::ThreeColumn()) {
 				_controller->showSection(
-					Info::Memento::Default(_activeChat.peer()),
+					Info::Memento::Default(_activeChat.key.peer()),
 					Window::SectionShow().withThirdColumn());
 			} else {
 				_controller->resizeForThirdSection();
@@ -325,7 +329,7 @@ void TopBarWidget::paintEvent(QPaintEvent *e) {
 }
 
 void TopBarWidget::paintTopBar(Painter &p) {
-	if (!_activeChat) {
+	if (!_activeChat.key) {
 		return;
 	}
 	auto nameleft = _leftTaken;
@@ -333,18 +337,18 @@ void TopBarWidget::paintTopBar(Painter &p) {
 	auto statustop = st::topBarHeight - st::topBarArrowPadding.bottom() - st::dialogsTextFont->height;
 	auto availableWidth = width() - _rightTaken - nameleft;
 
-	const auto history = _activeChat.history();
-	const auto folder = _activeChat.folder();
+	const auto history = _activeChat.key.history();
+	const auto folder = _activeChat.key.folder();
 	if (folder
 		|| history->peer->sharedMediaInfo()
-		|| (_section == Section::Scheduled)
-		|| (_section == Section::Pinned)) {
+		|| (_activeChat.section == Section::Scheduled)
+		|| (_activeChat.section == Section::Pinned)) {
 		// #TODO feed name emoji.
-		auto text = (_section == Section::Scheduled)
+		auto text = (_activeChat.section == Section::Scheduled)
 			? ((history && history->peer->isSelf())
 				? tr::lng_reminder_messages(tr::now)
 				: tr::lng_scheduled_messages(tr::now))
-			: (_section == Section::Pinned)
+			: (_activeChat.section == Section::Pinned)
 			? _customTitleText
 			: folder
 			? folder->chatListName()
@@ -362,7 +366,7 @@ void TopBarWidget::paintTopBar(Painter &p) {
 			(height() - st::historySavedFont->height) / 2,
 			width(),
 			text);
-	} else if (_section == Section::Replies) {
+	} else if (_activeChat.section == Section::Replies) {
 		p.setPen(st::dialogsNameFg);
 		p.setFont(st::semiboldFont);
 		p.drawTextLeft(
@@ -384,7 +388,7 @@ void TopBarWidget::paintTopBar(Painter &p) {
 			p.setPen(st::historyStatusFg);
 			p.drawTextLeft(nameleft, statustop, width(), _customTitleText);
 		}
-	} else if (const auto history = _activeChat.history()) {
+	} else if (const auto history = _activeChat.key.history()) {
 		const auto peer = history->peer;
 		const auto &text = peer->topBarNameText();
 		const auto badgeStyle = Ui::PeerBadgeStyle{
@@ -483,29 +487,30 @@ void TopBarWidget::mousePressEvent(QMouseEvent *e) {
 }
 
 void TopBarWidget::infoClicked() {
-	if (!_activeChat) {
+	const auto key = _activeChat.key;
+	if (!key) {
 		return;
-	} else if (_activeChat.folder()) {
+	} else if (key.folder()) {
 		_controller->closeFolder();
 	//} else if (const auto feed = _activeChat.feed()) { // #feed
 	//	_controller->showSection(Info::Memento(
 	//		feed,
 	//		Info::Section(Info::Section::Type::Profile)));
-	} else if (_activeChat.peer()->isSelf()) {
+	} else if (key.peer()->isSelf()) {
 		_controller->showSection(Info::Memento(
-			_activeChat.peer(),
+			key.peer(),
 			Info::Section(Storage::SharedMediaType::Photo)));
-	} else if (_activeChat.peer()->isRepliesChat()) {
+	} else if (key.peer()->isRepliesChat()) {
 		_controller->showSection(Info::Memento(
-			_activeChat.peer(),
+			key.peer(),
 			Info::Section(Storage::SharedMediaType::Photo)));
 	} else {
-		_controller->showPeerInfo(_activeChat.peer());
+		_controller->showPeerInfo(key.peer());
 	}
 }
 
 void TopBarWidget::backClicked() {
-	if (_activeChat.folder()) {
+	if (_activeChat.key.folder()) {
 		_controller->closeFolder();
 	} else {
 		_controller->showBackFromStack();
@@ -513,14 +518,14 @@ void TopBarWidget::backClicked() {
 }
 
 void TopBarWidget::setActiveChat(
-		Dialogs::Key chat,
-		Section section,
+		ActiveChat activeChat,
 		SendActionPainter *sendAction) {
-	if (_activeChat == chat && _section == section) {
+	if (_activeChat.key == activeChat.key
+		&& _activeChat.section == activeChat.section) {
+		_activeChat = activeChat;
 		return;
 	}
-	_activeChat = chat;
-	_section = section;
+	_activeChat = activeChat;
 	_sendAction = sendAction;
 	_back->clearState();
 	update();
@@ -544,7 +549,7 @@ void TopBarWidget::setCustomTitle(const QString &title) {
 }
 
 void TopBarWidget::refreshInfoButton() {
-	if (const auto peer = _activeChat.peer()) {
+	if (const auto peer = _activeChat.key.peer()) {
 		auto info = object_ptr<Ui::UserpicButton>(
 			this,
 			_controller,
@@ -577,14 +582,14 @@ int TopBarWidget::countSelectedButtonsTop(float64 selectedShown) {
 }
 
 void TopBarWidget::updateSearchVisibility() {
-	const auto historyMode = (_section == Section::History);
-	const auto smallDialogsColumn = _activeChat.folder()
+	const auto historyMode = (_activeChat.section == Section::History);
+	const auto smallDialogsColumn = _activeChat.key.folder()
 		&& (width() < _back->width() + _search->width());
 	_search->setVisible(historyMode && !smallDialogsColumn);
 }
 
 void TopBarWidget::updateControlsGeometry() {
-	if (!_activeChat) {
+	if (!_activeChat.key) {
 		return;
 	}
 	auto hasSelected = (_selectedCount > 0);
@@ -621,7 +626,7 @@ void TopBarWidget::updateControlsGeometry() {
 	if (_back->isHidden()) {
 		_leftTaken = st::topBarArrowPadding.right();
 	} else {
-		const auto smallDialogsColumn = _activeChat.folder()
+		const auto smallDialogsColumn = _activeChat.key.folder()
 			&& (width() < _back->width() + _search->width());
 		_leftTaken = smallDialogsColumn ? (width() - _back->width()) / 2 : 0;
 		_back->moveToLeft(_leftTaken, otherButtonsTop);
@@ -666,7 +671,7 @@ void TopBarWidget::setAnimatingMode(bool enabled) {
 }
 
 void TopBarWidget::updateControlsVisibility() {
-	if (!_activeChat) {
+	if (!_activeChat.key) {
 		return;
 	} else if (_animatingMode) {
 		hideChildren();
@@ -679,7 +684,7 @@ void TopBarWidget::updateControlsVisibility() {
 
 	auto backVisible = Adaptive::OneColumn()
 		|| !_controller->content()->stackIsEmpty()
-		|| _activeChat.folder();
+		|| _activeChat.key.folder();
 	_back->setVisible(backVisible);
 	if (_info) {
 		_info->setVisible(Adaptive::OneColumn());
@@ -687,21 +692,22 @@ void TopBarWidget::updateControlsVisibility() {
 	if (_unreadBadge) {
 		_unreadBadge->show();
 	}
-	const auto historyMode = (_section == Section::History);
-	const auto hasPollsMenu = _activeChat.peer()
-		&& _activeChat.peer()->canSendPolls();
-	const auto hasMenu = !_activeChat.folder()
-		&& ((_section == Section::Scheduled || _section == Section::Replies)
+	const auto section = _activeChat.section;
+	const auto historyMode = (section == Section::History);
+	const auto hasPollsMenu = _activeChat.key.peer()
+		&& _activeChat.key.peer()->canSendPolls();
+	const auto hasMenu = !_activeChat.key.folder()
+		&& ((section == Section::Scheduled || section == Section::Replies)
 			? hasPollsMenu
 			: historyMode);
 	updateSearchVisibility();
 	_menuToggle->setVisible(hasMenu);
 	_infoToggle->setVisible(historyMode
-		&& !_activeChat.folder()
+		&& !_activeChat.key.folder()
 		&& !Adaptive::OneColumn()
 		&& _controller->canShowThirdSection());
 	const auto callsEnabled = [&] {
-		if (const auto peer = _activeChat.peer()) {
+		if (const auto peer = _activeChat.key.peer()) {
 			if (const auto user = peer->asUser()) {
 				return session().serverConfig().phoneCallsEnabled.current()
 					&& user->hasCalls();
@@ -719,7 +725,7 @@ void TopBarWidget::updateControlsVisibility() {
 
 void TopBarWidget::updateMembersShowArea() {
 	const auto membersShowAreaNeeded = [&] {
-		const auto peer = _activeChat.peer();
+		const auto peer = _activeChat.key.peer();
 		if ((_selectedCount > 0) || !peer) {
 			return false;
 		} else if (const auto chat = peer->asChat()) {
@@ -805,7 +811,7 @@ void TopBarWidget::updateAdaptiveLayout() {
 }
 
 void TopBarWidget::refreshUnreadBadge() {
-	if (!Adaptive::OneColumn() && !_activeChat.folder()) {
+	if (!Adaptive::OneColumn() && !_activeChat.key.folder()) {
 		_unreadBadge.destroy();
 		return;
 	} else if (_unreadBadge) {
@@ -834,8 +840,9 @@ void TopBarWidget::refreshUnreadBadge() {
 void TopBarWidget::updateUnreadBadge() {
 	if (!_unreadBadge) return;
 
-	const auto muted = session().data().unreadBadgeMutedIgnoreOne(_activeChat);
-	const auto counter = session().data().unreadBadgeIgnoreOne(_activeChat);
+	const auto key = _activeChat.key;
+	const auto muted = session().data().unreadBadgeMutedIgnoreOne(key);
+	const auto counter = session().data().unreadBadgeIgnoreOne(key);
 	const auto text = [&] {
 		if (!counter) {
 			return QString();
@@ -862,12 +869,15 @@ void TopBarWidget::updateInfoToggleActive() {
 }
 
 void TopBarWidget::updateOnlineDisplay() {
-	if (!_activeChat.peer()) return;
+	const auto peer = _activeChat.key.peer();
+	if (!peer) {
+		return;
+	}
 
 	QString text;
 	const auto now = base::unixtime::now();
 	bool titlePeerTextOnline = false;
-	if (const auto user = _activeChat.peer()->asUser()) {
+	if (const auto user = peer->asUser()) {
 		if (session().supportMode()
 			&& !session().supportHelper().infoCurrent(user).text.empty()) {
 			text = QString::fromUtf8("\xe2\x9a\xa0\xef\xb8\x8f check info");
@@ -876,7 +886,7 @@ void TopBarWidget::updateOnlineDisplay() {
 			text = Data::OnlineText(user, now);
 			titlePeerTextOnline = Data::OnlineTextActive(user, now);
 		}
-	} else if (const auto chat = _activeChat.peer()->asChat()) {
+	} else if (const auto chat = peer->asChat()) {
 		if (!chat->amIn()) {
 			text = tr::lng_chat_status_unaccessible(tr::now);
 		} else if (chat->participants.empty()) {
@@ -907,7 +917,7 @@ void TopBarWidget::updateOnlineDisplay() {
 				text = tr::lng_group_status(tr::now);
 			}
 		}
-	} else if (const auto channel = _activeChat.peer()->asChannel()) {
+	} else if (const auto channel = peer->asChannel()) {
 		if (channel->isMegagroup()
 			&& (channel->membersCount() > 0)
 			&& (channel->membersCount()
@@ -954,7 +964,10 @@ void TopBarWidget::updateOnlineDisplay() {
 }
 
 void TopBarWidget::updateOnlineDisplayTimer() {
-	if (!_activeChat.peer()) return;
+	const auto peer = _activeChat.key.peer();
+	if (!peer) {
+		return;
+	}
 
 	const auto now = base::unixtime::now();
 	auto minTimeout = crl::time(86400);
@@ -962,13 +975,13 @@ void TopBarWidget::updateOnlineDisplayTimer() {
 		auto hisTimeout = Data::OnlineChangeTimeout(user, now);
 		accumulate_min(minTimeout, hisTimeout);
 	};
-	if (const auto user = _activeChat.peer()->asUser()) {
+	if (const auto user = peer->asUser()) {
 		handleUser(user);
-	} else if (auto chat = _activeChat.peer()->asChat()) {
+	} else if (const auto chat = peer->asChat()) {
 		for (const auto user : chat->participants) {
 			handleUser(user);
 		}
-	} else if (_activeChat.peer()->isChannel()) {
+	} else if (peer->isChannel()) {
 	}
 	updateOnlineDisplayIn(minTimeout);
 }
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 770929d0e..bff509316 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
@@ -45,10 +45,17 @@ public:
 	};
 	enum class Section {
 		History,
+		Dialogs, // For folder view in dialogs list.
 		Scheduled,
 		Pinned,
 		Replies,
 	};
+	struct ActiveChat {
+		Dialogs::Key key;
+		Section section = Section::History;
+		MsgId rootId = 0;
+		MsgId currentReplyToId = 0;
+	};
 
 	TopBarWidget(
 		QWidget *parent,
@@ -66,8 +73,7 @@ public:
 	void setAnimatingMode(bool enabled);
 
 	void setActiveChat(
-		Dialogs::Key chat,
-		Section section,
+		ActiveChat activeChat,
 		SendActionPainter *sendAction);
 	void setCustomTitle(const QString &title);
 
@@ -131,8 +137,7 @@ private:
 	void updateUnreadBadge();
 
 	const not_null<Window::SessionController*> _controller;
-	Dialogs::Key _activeChat;
-	Section _section = Section::History;
+	ActiveChat _activeChat;
 	QString _customTitleText;
 
 	int _selectedCount = 0;
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 4190ed4a8..023742cec 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -577,10 +577,11 @@ void WrapWidget::showTopBarMenu() {
 	if (const auto peer = key().peer()) {
 		Window::FillPeerMenu(
 			_controller->parentController(),
-			peer,
-			FilterId(),
-			addAction,
-			Window::PeerMenuSource::Profile);
+			Window::PeerMenuRequest{
+				.peer = peer,
+				.source = Window::PeerMenuRequest::Source::Profile,
+			},
+			addAction);
 	//} else if (const auto feed = key().feed()) { // #feed
 	//	Window::FillFeedMenu(
 	//		_controller->parentController(),
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index e74d2118d..8c67fcfcc 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -819,17 +819,6 @@ crl::time MainWidget::highlightStartTime(not_null<const HistoryItem*> item) cons
 	return _history->highlightStartTime(item);
 }
 
-MsgId MainWidget::currentReplyToIdFor(not_null<History*> history) const {
-	if (_mainSection) {
-		return _mainSection->currentReplyToIdFor(history);
-	} else if (_history->history() == history) {
-		return _history->replyToId();
-	} else if (const auto localDraft = history->localDraft()) {
-		return localDraft->msgId;
-	}
-	return 0;
-}
-
 void MainWidget::sendBotCommand(
 		not_null<PeerData*> peer,
 		UserData *bot,
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index c2d0e6adc..cca639af3 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -175,8 +175,6 @@ public:
 	// While HistoryInner is not HistoryView::ListWidget.
 	crl::time highlightStartTime(not_null<const HistoryItem*> item) const;
 
-	MsgId currentReplyToIdFor(not_null<History*> history) const;
-
 	void sendBotCommand(
 		not_null<PeerData*> peer,
 		UserData *bot,
diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h
index 664fe9710..6d5f3b7fd 100644
--- a/Telegram/SourceFiles/window/section_widget.h
+++ b/Telegram/SourceFiles/window/section_widget.h
@@ -128,10 +128,6 @@ public:
 	virtual bool replyToMessage(not_null<HistoryItem*> item) {
 		return false;
 	}
-	[[nodiscard]] virtual MsgId currentReplyToIdFor(
-			not_null<History*> history) const {
-		return 0;
-	}
 
 	// Create a memento of that section to store it in the history stack.
 	// This method may modify the section ("take" heavy items).
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 90088b65e..fd25686f4 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -107,13 +107,13 @@ class Filler {
 public:
 	Filler(
 		not_null<SessionController*> controller,
-		not_null<PeerData*> peer,
-		FilterId filterId,
-		const PeerMenuCallback &addAction,
-		PeerMenuSource source);
+		PeerMenuRequest request,
+		const PeerMenuCallback &addAction);
 	void fill();
 
 private:
+	using Source = PeerMenuRequest::Source;
+
 	[[nodiscard]] bool showInfo();
 	[[nodiscard]] bool showHidePromotion();
 	[[nodiscard]] bool showToggleArchived();
@@ -132,10 +132,9 @@ private:
 	void addPollAction(not_null<PeerData*> peer);
 
 	not_null<SessionController*> _controller;
+	PeerMenuRequest _request;
 	not_null<PeerData*> _peer;
-	FilterId _filterId = 0;
 	const PeerMenuCallback &_addAction;
-	PeerMenuSource _source;
 
 };
 
@@ -143,9 +142,8 @@ class FolderFiller {
 public:
 	FolderFiller(
 		not_null<SessionController*> controller,
-		not_null<Data::Folder*> folder,
-		const PeerMenuCallback &addAction,
-		PeerMenuSource source);
+		FolderMenuRequest request,
+		const PeerMenuCallback &addAction);
 	void fill();
 
 private:
@@ -158,9 +156,9 @@ private:
 	//void addUngroup();
 
 	not_null<SessionController*> _controller;
+	FolderMenuRequest _request;
 	not_null<Data::Folder*> _folder;
 	const PeerMenuCallback &_addAction;
-	PeerMenuSource _source;
 
 };
 
@@ -279,19 +277,16 @@ void TogglePinnedDialog(
 
 Filler::Filler(
 	not_null<SessionController*> controller,
-	not_null<PeerData*> peer,
-	FilterId filterId,
-	const PeerMenuCallback &addAction,
-	PeerMenuSource source)
+	PeerMenuRequest request,
+	const PeerMenuCallback &addAction)
 : _controller(controller)
-, _peer(peer)
-, _filterId(filterId)
-, _addAction(addAction)
-, _source(source) {
+, _request(request)
+, _peer(request.peer)
+, _addAction(addAction) {
 }
 
 bool Filler::showInfo() {
-	if (_source == PeerMenuSource::Profile
+	if (_request.source == Source::Profile
 		|| _peer->isSelf()
 		|| _peer->isRepliesChat()) {
 		return false;
@@ -307,7 +302,7 @@ bool Filler::showInfo() {
 }
 
 bool Filler::showHidePromotion() {
-	if (_source != PeerMenuSource::ChatsList) {
+	if (_request.source != Source::ChatsList) {
 		return false;
 	}
 	const auto history = _peer->owner().historyLoaded(_peer);
@@ -317,7 +312,7 @@ bool Filler::showHidePromotion() {
 }
 
 bool Filler::showToggleArchived() {
-	if (_source != PeerMenuSource::ChatsList) {
+	if (_request.source != Source::ChatsList) {
 		return false;
 	}
 	const auto history = _peer->owner().historyLoaded(_peer);
@@ -330,7 +325,7 @@ bool Filler::showToggleArchived() {
 }
 
 bool Filler::showTogglePin() {
-	if (_source != PeerMenuSource::ChatsList) {
+	if (_request.source != Source::ChatsList) {
 		return false;
 	}
 	const auto history = _peer->owner().historyLoaded(_peer);
@@ -349,7 +344,7 @@ void Filler::addHidePromotion() {
 
 void Filler::addTogglePin() {
 	const auto controller = _controller;
-	const auto filterId = _filterId;
+	const auto filterId = _request.filterId;
 	const auto peer = _peer;
 	const auto history = peer->owner().history(peer);
 	const auto pinText = [=] {
@@ -479,7 +474,7 @@ void Filler::addBlockUser(not_null<UserData*> user) {
 void Filler::addUserActions(not_null<UserData*> user) {
 	const auto controller = _controller;
 	const auto window = &_controller->window();
-	if (_source != PeerMenuSource::ChatsList) {
+	if (_request.source != Source::ChatsList) {
 		if (user->session().supportMode()) {
 			_addAction("Edit support info", [=] {
 				user->session().supportHelper().editInfo(controller, user);
@@ -527,13 +522,13 @@ void Filler::addUserActions(not_null<UserData*> user) {
 	if (!user->isInaccessible()
 		&& user != user->session().user()
 		&& !user->isRepliesChat()
-		&& _source != PeerMenuSource::ChatsList) {
+		&& _request.source != Source::ChatsList) {
 		addBlockUser(user);
 	}
 }
 
 void Filler::addChatActions(not_null<ChatData*> chat) {
-	if (_source != PeerMenuSource::ChatsList) {
+	if (_request.source != Source::ChatsList) {
 		const auto controller = _controller;
 		if (EditPeerInfoBox::Available(chat)) {
 			const auto text = tr::lng_manage_group_title(tr::now);
@@ -573,7 +568,7 @@ void Filler::addChannelActions(not_null<ChannelData*> channel) {
 	//			[=] { ToggleChannelGrouping(channel, !grouped); });
 	//	}
 	//}
-	if (_source != PeerMenuSource::ChatsList) {
+	if (_request.source != Source::ChatsList) {
 		if (channel->isBroadcast()) {
 			if (const auto chat = channel->linkedChat()) {
 				_addAction(tr::lng_profile_view_discussion(tr::now), [=] {
@@ -623,7 +618,7 @@ void Filler::addChannelActions(not_null<ChannelData*> channel) {
 			text,
 			[=] { channel->session().api().joinChannel(channel); });
 	}
-	if (_source != PeerMenuSource::ChatsList) {
+	if (_request.source != Source::ChatsList) {
 		const auto needReport = !channel->amCreator()
 			&& (!isGroup || channel->isPublic());
 		if (needReport) {
@@ -639,19 +634,26 @@ void Filler::addPollAction(not_null<PeerData*> peer) {
 		return;
 	}
 	const auto controller = _controller;
-	const auto source = (_source == PeerMenuSource::ScheduledSection)
+	const auto source = (_request.source == Source::ScheduledSection)
 		? Api::SendType::Scheduled
 		: Api::SendType::Normal;
 	const auto flag = PollData::Flags();
+	const auto replyToId = _request.currentReplyToId;
 	auto callback = [=] {
-		PeerMenuCreatePoll(controller, peer, flag, flag, source);
+		PeerMenuCreatePoll(
+			controller,
+			peer,
+			replyToId,
+			flag,
+			flag,
+			source);
 	};
 	_addAction(tr::lng_polls_create(tr::now), std::move(callback));
 }
 
 void Filler::fill() {
-	if (_source == PeerMenuSource::ScheduledSection
-		|| _source == PeerMenuSource::RepliesSection) {
+	if (_request.source == Source::ScheduledSection
+		|| _request.source == Source::RepliesSection) {
 		addPollAction(_peer);
 		return;
 	}
@@ -667,10 +669,10 @@ void Filler::fill() {
 	if (showInfo()) {
 		addInfo();
 	}
-	if (_source != PeerMenuSource::Profile && !_peer->isSelf()) {
+	if (_request.source != Source::Profile && !_peer->isSelf()) {
 		PeerMenuAddMuteAction(_peer, _addAction);
 	}
-	if (_source == PeerMenuSource::ChatsList) {
+	if (_request.source == Source::ChatsList) {
 		//addSearch();
 		addToggleUnreadMark();
 	}
@@ -686,19 +688,16 @@ void Filler::fill() {
 
 FolderFiller::FolderFiller(
 	not_null<SessionController*> controller,
-	not_null<Data::Folder*> folder,
-	const PeerMenuCallback &addAction,
-	PeerMenuSource source)
+	FolderMenuRequest request,
+	const PeerMenuCallback &addAction)
 : _controller(controller)
-, _folder(folder)
-, _addAction(addAction)
-, _source(source) {
+, _request(request)
+, _folder(request.folder)
+, _addAction(addAction) {
 }
 
 void FolderFiller::fill() {
-	if (_source == PeerMenuSource::ChatsList) {
-		addTogglesForArchive();
-	}
+	addTogglesForArchive();
 }
 
 void FolderFiller::addTogglesForArchive() {
@@ -838,6 +837,7 @@ void PeerMenuShareContactBox(
 void PeerMenuCreatePoll(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer,
+		MsgId replyToId,
 		PollData::Flags chosen,
 		PollData::Flags disabled,
 		Api::SendType sendType) {
@@ -859,9 +859,7 @@ void PeerMenuCreatePoll(
 		auto action = Api::SendAction(peer->owner().history(peer));
 		action.clearDraft = false;
 		action.options = result.options;
-		if (const auto id = controller->content()->currentReplyToIdFor(action.history)) {
-			action.replyTo = id;
-		}
+		action.replyTo = replyToId;
 		if (const auto localDraft = action.history->localDraft()) {
 			action.clearDraft = localDraft->textWithTags.text.isEmpty();
 		}
@@ -1314,20 +1312,17 @@ Fn<void()> DeleteAndLeaveHandler(not_null<PeerData*> peer) {
 
 void FillPeerMenu(
 		not_null<SessionController*> controller,
-		not_null<PeerData*> peer,
-		FilterId filterId,
-		const PeerMenuCallback &callback,
-		PeerMenuSource source) {
-	Filler filler(controller, peer, filterId, callback, source);
+		PeerMenuRequest request,
+		const PeerMenuCallback &callback) {
+	Filler filler(controller, request, callback);
 	filler.fill();
 }
 
 void FillFolderMenu(
 		not_null<SessionController*> controller,
-		not_null<Data::Folder*> folder,
-		const PeerMenuCallback &callback,
-		PeerMenuSource source) {
-	FolderFiller filler(controller, folder, callback, source);
+		FolderMenuRequest request,
+		const PeerMenuCallback &callback) {
+	FolderFiller filler(controller, request, callback);
 	filler.fill();
 }
 
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index f5c9f1a2e..a7944da05 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -32,12 +32,24 @@ class Controller;
 class SessionController;
 class SessionNavigation;
 
-enum class PeerMenuSource {
-	ChatsList,
-	History,
-	Profile,
-	ScheduledSection,
-	RepliesSection,
+struct PeerMenuRequest {
+	enum class Source {
+		ChatsList,
+		History,
+		Profile,
+		ScheduledSection,
+		RepliesSection,
+	};
+
+	not_null<PeerData*> peer;
+	Source source = Source::ChatsList;
+	FilterId filterId = 0;
+	MsgId rootId = 0;
+	MsgId currentReplyToId = 0;
+};
+
+struct FolderMenuRequest {
+	not_null<Data::Folder*> folder;
 };
 
 using PeerMenuCallback = Fn<QAction*(
@@ -46,15 +58,12 @@ using PeerMenuCallback = Fn<QAction*(
 
 void FillPeerMenu(
 	not_null<SessionController*> controller,
-	not_null<PeerData*> peer,
-	FilterId filterId,
-	const PeerMenuCallback &addAction,
-	PeerMenuSource source);
+	PeerMenuRequest request,
+	const PeerMenuCallback &addAction);
 void FillFolderMenu(
 	not_null<SessionController*> controller,
-	not_null<Data::Folder*> folder,
-	const PeerMenuCallback &addAction,
-	PeerMenuSource source);
+	FolderMenuRequest request,
+	const PeerMenuCallback &addAction);
 
 void PeerMenuAddMuteAction(
 	not_null<PeerData*> peer,
@@ -80,6 +89,7 @@ void PeerMenuAddChannelMembers(
 void PeerMenuCreatePoll(
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer,
+	MsgId replyToId = 0,
 	PollData::Flags chosen = PollData::Flags(),
 	PollData::Flags disabled = PollData::Flags(),
 	Api::SendType sendType = Api::SendType::Normal);

From f04b3da76a1347c60f7ac6900d3ae7dda288b106 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 12 Nov 2020 18:46:17 +0300
Subject: [PATCH 095/370] Add return from bot switch_pm to Scheduled/Replies.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../chat_helpers/tabbed_selector.h            |   8 +-
 Telegram/SourceFiles/data/data_session.cpp    |   2 +-
 Telegram/SourceFiles/data/data_user.h         |   3 +-
 .../dialogs/dialogs_inner_widget.cpp          |  17 +-
 Telegram/SourceFiles/dialogs/dialogs_key.h    |  17 +
 .../SourceFiles/dialogs/dialogs_widget.cpp    |   2 +-
 Telegram/SourceFiles/facades.cpp              |   2 +-
 .../SourceFiles/history/history_widget.cpp    |  94 ++-
 Telegram/SourceFiles/history/history_widget.h |   9 +-
 .../history_view_compose_controls.cpp         |  21 +-
 .../controls/history_view_compose_controls.h  |   4 +
 .../view/history_view_pinned_section.cpp      |   2 +-
 .../view/history_view_replies_section.cpp     |  16 +-
 .../view/history_view_scheduled_section.cpp   |  12 +-
 .../view/history_view_top_bar_widget.cpp      |  28 +-
 .../view/history_view_top_bar_widget.h        |  15 +-
 .../SourceFiles/info/info_wrap_widget.cpp     |   8 +-
 .../inline_bots/inline_bot_result.h           |   8 +
 .../inline_bots/inline_results_inner.cpp      | 769 +++++++++++++++++
 .../inline_bots/inline_results_inner.h        | 186 +++++
 .../inline_bots/inline_results_widget.cpp     | 779 +-----------------
 .../inline_bots/inline_results_widget.h       | 163 +---
 .../SourceFiles/window/window_peer_menu.cpp   | 101 +--
 .../SourceFiles/window/window_peer_menu.h     |  29 +-
 25 files changed, 1158 insertions(+), 1139 deletions(-)
 create mode 100644 Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
 create mode 100644 Telegram/SourceFiles/inline_bots/inline_results_inner.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 2decd8466..b2b7236a3 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -647,6 +647,8 @@ PRIVATE
     inline_bots/inline_bot_result.h
     inline_bots/inline_bot_send_data.cpp
     inline_bots/inline_bot_send_data.h
+    inline_bots/inline_results_inner.cpp
+    inline_bots/inline_results_inner.h
     inline_bots/inline_results_widget.cpp
     inline_bots/inline_results_widget.h
     intro/intro_code.cpp
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index 2c1fa9f96..d20c67c1d 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/object_ptr.h"
 
 namespace InlineBots {
-class Result;
+struct ResultSelected;
 } // namespace InlineBots
 
 namespace Main {
@@ -60,11 +60,7 @@ public:
 		not_null<PhotoData*> photo;
 		Api::SendOptions options;
 	};
-	struct InlineChosen {
-		not_null<InlineBots::Result*> result;
-		not_null<UserData*> bot;
-		Api::SendOptions options;
-	};
+	using InlineChosen = InlineBots::ResultSelected;
 	enum class Mode {
 		Full,
 		EmojiOnly
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 8ae6619a8..f5fe90f92 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -89,7 +89,7 @@ void CheckForSwitchInlineButton(not_null<HistoryItem*> item) {
 		return;
 	}
 	if (const auto user = item->history()->peer->asUser()) {
-		if (!user->isBot() || !user->botInfo->inlineReturnPeerId) {
+		if (!user->isBot() || !user->botInfo->inlineReturnTo.key) {
 			return;
 		}
 		if (const auto markup = item->Get<HistoryMessageReplyMarkup>()) {
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index bff3be7ec..39665a968 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "data/data_peer.h"
+#include "dialogs/dialogs_key.h"
 
 class BotCommand {
 public:
@@ -34,7 +35,7 @@ struct BotInfo {
 	Ui::Text::String text = { int(st::msgMinWidth) }; // description
 
 	QString startToken, startGroupToken, shareGameShortName;
-	PeerId inlineReturnPeerId = 0;
+	Dialogs::EntryState inlineReturnTo;
 };
 
 class UserData : public PeerData {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 86066c2e0..169d13e83 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1814,24 +1814,17 @@ void InnerWidget::contextMenuEvent(QContextMenuEvent *e) {
 		} else {
 			fillArchiveSearchMenu(_menu.get());
 		}
-	} else if (const auto history = row.key.history()) {
-		Window::FillPeerMenu(
+	} else {
+		Window::FillDialogsEntryMenu(
 			_controller,
-			Window::PeerMenuRequest{
-				.peer = history->peer,
-				.source = Window::PeerMenuRequest::Source::ChatsList,
+			Dialogs::EntryState{
+				.key = row.key,
+				.section = Dialogs::EntryState::Section::ChatsList,
 				.filterId = _filterId,
 			},
 			[&](const QString &text, Fn<void()> callback) {
 				return _menu->addAction(text, std::move(callback));
 			});
-	} else if (const auto folder = row.key.folder()) {
-		Window::FillFolderMenu(
-			_controller,
-			Window::FolderMenuRequest{ folder },
-			[&](const QString &text, Fn<void()> callback) {
-				return _menu->addAction(text, std::move(callback));
-			});
 	}
 	connect(_menu.get(), &QObject::destroyed, [=] {
 		if (_menuRow.key) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_key.h b/Telegram/SourceFiles/dialogs/dialogs_key.h
index 223488d21..2f5967b45 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_key.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_key.h
@@ -109,4 +109,21 @@ inline bool operator>=(const RowDescriptor &a, const RowDescriptor &b) {
 	return !(a < b);
 }
 
+struct EntryState {
+	enum class Section {
+		History,
+		Profile,
+		ChatsList,
+		Scheduled,
+		Pinned,
+		Replies,
+	};
+
+	Key key;
+	Section section = Section::History;
+	FilterId filterId = 0;
+	MsgId rootId = 0;
+	MsgId currentReplyToId = 0;
+};
+
 } // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index c41aeb2d3..624e67f6c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -525,7 +525,7 @@ void Widget::refreshFolderTopBar() {
 		_folderTopBar->setActiveChat(
 			HistoryView::TopBarWidget::ActiveChat{
 				.key = _openedFolder,
-				.section = HistoryView::TopBarWidget::Section::Dialogs,
+				.section = Dialogs::EntryState::Section::ChatsList,
 			},
 			nullptr);
 	} else {
diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp
index c672f9072..bc542e29e 100644
--- a/Telegram/SourceFiles/facades.cpp
+++ b/Telegram/SourceFiles/facades.cpp
@@ -191,7 +191,7 @@ void activateBotCommand(
 					if (samePeer) {
 						Notify::switchInlineBotButtonReceived(session, QString::fromUtf8(button->data), bot, msg->id);
 						return true;
-					} else if (bot->isBot() && bot->botInfo->inlineReturnPeerId) {
+					} else if (bot->isBot() && bot->botInfo->inlineReturnTo.key) {
 						if (Notify::switchInlineBotButtonReceived(session, QString::fromUtf8(button->data))) {
 							return true;
 						}
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 122792c35..6de4d1f96 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -707,14 +707,20 @@ void HistoryWidget::setGeometryWithTopMoved(
 	_topDelta = 0;
 }
 
+Dialogs::EntryState HistoryWidget::computeDialogsEntryState() const {
+	return Dialogs::EntryState{
+		.key = _history,
+		.section = Dialogs::EntryState::Section::History,
+		.currentReplyToId = replyToId(),
+	};
+}
+
 void HistoryWidget::refreshTopBarActiveChat() {
-	_topBar->setActiveChat(
-		HistoryView::TopBarWidget::ActiveChat{
-			.key = _history,
-			.section = HistoryView::TopBarWidget::Section::History,
-			.currentReplyToId = replyToId(),
-		},
-		_history->sendActionPainter());
+	const auto state = computeDialogsEntryState();
+	_topBar->setActiveChat(state, _history->sendActionPainter());
+	if (_inlineResults) {
+		_inlineResults->setCurrentDialogsEntryState(state);
+	}
 }
 
 void HistoryWidget::refreshTabbedPanel() {
@@ -830,7 +836,7 @@ void HistoryWidget::initTabbedSelector() {
 	) | rpl::filter([=] {
 		return !isHidden();
 	}) | rpl::start_with_next([=](TabbedSelector::InlineChosen data) {
-		sendInlineResult(data.result, data.bot, data.options);
+		sendInlineResult(data);
 	}, lifetime());
 
 	selector->setSendMenuType([=] { return sendMenuType(); });
@@ -1195,11 +1201,11 @@ void HistoryWidget::applyInlineBotQuery(UserData *bot, const QString &query) {
 		if (!_inlineResults) {
 			_inlineResults.create(this, controller());
 			_inlineResults->setResultSelectedCallback([=](
-					InlineBots::Result *result,
-					UserData *bot,
-					Api::SendOptions options) {
-				sendInlineResult(result, bot, options);
+					InlineBots::ResultSelected result) {
+				sendInlineResult(result);
 			});
+			_inlineResults->setCurrentDialogsEntryState(
+				computeDialogsEntryState());
 			_inlineResults->requesting(
 			) | rpl::start_with_next([=](bool requesting) {
 				_tabbedSelectorToggle->setLoading(requesting);
@@ -1460,22 +1466,37 @@ bool HistoryWidget::notify_switchInlineBotButtonReceived(const QString &query, U
 			applyDraft();
 			return true;
 		}
-	} else if (auto bot = _peer ? _peer->asUser() : nullptr) {
-		const auto toPeerId = bot->isBot()
-			? bot->botInfo->inlineReturnPeerId
-			: PeerId(0);
-		if (!toPeerId) {
+	} else if (const auto bot = _peer ? _peer->asUser() : nullptr) {
+		const auto to = bot->isBot()
+			? bot->botInfo->inlineReturnTo
+			: Dialogs::EntryState();
+		const auto history = to.key.history();
+		if (!history) {
 			return false;
 		}
-		bot->botInfo->inlineReturnPeerId = 0;
-		const auto h = bot->owner().history(toPeerId);
+		bot->botInfo->inlineReturnTo = Dialogs::EntryState();
+		using Section = Dialogs::EntryState::Section;
+
 		TextWithTags textWithTags = { '@' + bot->username + ' ' + query, TextWithTags::Tags() };
 		MessageCursor cursor = { textWithTags.text.size(), textWithTags.text.size(), QFIXED_MAX };
-		h->setLocalDraft(std::make_unique<Data::Draft>(textWithTags, 0, cursor, false));
-		if (h == _history) {
-			applyDraft();
+		auto draft = std::make_unique<Data::Draft>(
+			textWithTags,
+			to.currentReplyToId,
+			cursor,
+			false);
+
+		if (to.section == Section::Replies) {
+			controller()->showRepliesForMessage(history, to.rootId);
 		} else {
-			Ui::showPeerHistory(h->peer, ShowAtUnreadMsgId);
+			history->setLocalDraft(std::move(draft));
+			if (to.section == Section::Scheduled) {
+				controller()->showSection(
+					HistoryView::ScheduledMemento(history));
+			} else if (history == _history) {
+				applyDraft();
+			} else {
+				Ui::showPeerHistory(history->peer, ShowAtUnreadMsgId);
+			}
 		}
 		return true;
 	}
@@ -1657,9 +1678,7 @@ void HistoryWidget::showHistory(
 	_pinnedClickedId = FullMsgId();
 	_minPinnedId = std::nullopt;
 
-	MsgId wasMsgId = _showAtMsgId;
-	History *wasHistory = _history;
-
+	const auto wasDialogsEntryState = computeDialogsEntryState();
 	const auto startBot = (showAtMsgId == ShowAndStartBotMsgId);
 	if (startBot) {
 		showAtMsgId = ShowAtTheEndMsgId;
@@ -1719,8 +1738,8 @@ void HistoryWidget::showHistory(
 			if (const auto user = _peer->asUser()) {
 				if (const auto &info = user->botInfo) {
 					if (startBot) {
-						if (wasHistory) {
-							info->inlineReturnPeerId = wasHistory->peer->id;
+						if (wasDialogsEntryState.key) {
+							info->inlineReturnTo = wasDialogsEntryState;
 						}
 						sendBotStartCommand();
 						_history->clearLocalDraft();
@@ -1894,8 +1913,8 @@ void HistoryWidget::showHistory(
 		if (const auto user = _peer->asUser()) {
 			if (const auto &info = user->botInfo) {
 				if (startBot) {
-					if (wasHistory) {
-						info->inlineReturnPeerId = wasHistory->peer->id;
+					if (wasDialogsEntryState.key) {
+						info->inlineReturnTo = wasDialogsEntryState;
 					}
 					sendBotStartCommand();
 				}
@@ -5078,17 +5097,14 @@ void HistoryWidget::onFieldTabbed() {
 	}
 }
 
-void HistoryWidget::sendInlineResult(
-		not_null<InlineBots::Result*> result,
-		not_null<UserData*> bot,
-		Api::SendOptions options) {
+void HistoryWidget::sendInlineResult(InlineBots::ResultSelected result) {
 	if (!_peer || !_peer->canWrite()) {
 		return;
 	} else if (showSlowmodeError()) {
 		return;
 	}
 
-	auto errorText = result->getErrorOnSend(_history);
+	auto errorText = result.result->getErrorOnSend(_history);
 	if (!errorText.isEmpty()) {
 		Ui::show(Box<InformBox>(errorText));
 		return;
@@ -5096,9 +5112,9 @@ void HistoryWidget::sendInlineResult(
 
 	auto action = Api::SendAction(_history);
 	action.replyTo = replyToId();
-	action.options = std::move(options);
+	action.options = std::move(result.options);
 	action.generateLocal = true;
-	session().api().sendInlineResult(bot, result, action);
+	session().api().sendInlineResult(result.bot, result.result, action);
 
 	clearFieldText();
 	_saveDraftText = true;
@@ -5106,14 +5122,14 @@ void HistoryWidget::sendInlineResult(
 	onDraftSave();
 
 	auto &bots = cRefRecentInlineBots();
-	const auto index = bots.indexOf(bot);
+	const auto index = bots.indexOf(result.bot);
 	if (index) {
 		if (index > 0) {
 			bots.removeAt(index);
 		} else if (bots.size() >= RecentInlineBotsLimit) {
 			bots.resize(RecentInlineBotsLimit - 1);
 		}
-		bots.push_front(bot);
+		bots.push_front(result.bot);
 		session().local().writeRecentHashtagsAndBots();
 	}
 
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index b05e6fb36..bad3b769d 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -38,7 +38,7 @@ namespace Layout {
 class ItemBase;
 class Widget;
 } // namespace Layout
-class Result;
+struct ResultSelected;
 } // namespace InlineBots
 
 namespace Data {
@@ -353,6 +353,8 @@ private:
 	void createTabbedPanel();
 	void setTabbedPanel(std::unique_ptr<TabbedPanel> panel);
 	void updateField();
+
+	[[nodiscard]] Dialogs::EntryState computeDialogsEntryState() const;
 	void refreshTopBarActiveChat();
 
 	void requestMessageData(MsgId msgId);
@@ -485,10 +487,7 @@ private:
 		int wasScrollTop,
 		int nowScrollTop);
 
-	void sendInlineResult(
-		not_null<InlineBots::Result*> result,
-		not_null<UserData*> bot,
-		Api::SendOptions options);
+	void sendInlineResult(InlineBots::ResultSelected result);
 
 	void drawField(Painter &p, const QRect &rect);
 	void paintEditHeader(
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 97189d361..fd852a95d 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -35,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/controls/history_view_voice_record_bar.h"
 #include "history/view/history_view_webpage_preview.h"
 #include "inline_bots/inline_results_widget.h"
+#include "inline_bots/inline_bot_result.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "media/audio/media_audio_capture.h"
@@ -583,6 +584,13 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 	}
 }
 
+void ComposeControls::setCurrentDialogsEntryState(Dialogs::EntryState state) {
+	_currentDialogsEntryState = state;
+	if (_inlineResults) {
+		_inlineResults->setCurrentDialogsEntryState(state);
+	}
+}
+
 void ComposeControls::move(int x, int y) {
 	_wrap->move(x, y);
 	_writeRestricted->move(x, y);
@@ -1523,6 +1531,7 @@ bool ComposeControls::handleCancelRequest() {
 
 void ComposeControls::initWebpageProcess() {
 	Expects(_history);
+
 	const auto peer = _history->peer;
 	auto &lifetime = _wrap->lifetime();
 	const auto requestRepaint = crl::guard(_header.get(), [=] {
@@ -1787,15 +1796,11 @@ void ComposeControls::applyInlineBotQuery(
 			_inlineResults = std::make_unique<InlineBots::Layout::Widget>(
 				_parent,
 				_window);
+			_inlineResults->setCurrentDialogsEntryState(
+				_currentDialogsEntryState);
 			_inlineResults->setResultSelectedCallback([=](
-					InlineBots::Result *result,
-					UserData *bot,
-					Api::SendOptions options) {
-				_inlineResultChosen.fire(InlineChosen{
-					.result = result,
-					.bot = bot,
-					.options = options,
-				});
+					InlineBots::ResultSelected result) {
+				_inlineResultChosen.fire_copy(result);
 			});
 			_inlineResults->requesting(
 			) | rpl::start_with_next([=](bool requesting) {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index b04a68b31..5b6200862 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/required.h"
 #include "api/api_common.h"
 #include "base/unique_qptr.h"
+#include "dialogs/dialogs_key.h"
 #include "history/view/controls/compose_controls_common.h"
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
@@ -87,6 +88,8 @@ public:
 
 	[[nodiscard]] Main::Session &session() const;
 	void setHistory(SetHistoryArgs &&args);
+	void setCurrentDialogsEntryState(Dialogs::EntryState state);
+
 	void finishAnimating();
 
 	void move(int x, int y);
@@ -237,6 +240,7 @@ private:
 
 	TextWithTags _localSavedText;
 	TextUpdateEvents _textUpdateEvents;
+	Dialogs::EntryState _currentDialogsEntryState;
 
 	//bool _inReplyEditForward = false;
 	//bool _inClickable = false;
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 2d8d2fa92..8ea4d512f 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -104,7 +104,7 @@ PinnedWidget::PinnedWidget(
 	_topBar->setActiveChat(
 		TopBarWidget::ActiveChat{
 			.key = _history,
-			.section = TopBarWidget::Section::Pinned,
+			.section = Dialogs::EntryState::Section::Pinned,
 		},
 		nullptr);
 
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 18fe048d0..b7135f1be 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1137,14 +1137,14 @@ SendMenu::Type RepliesWidget::sendMenuType() const {
 }
 
 void RepliesWidget::refreshTopBarActiveChat() {
-	_topBar->setActiveChat(
-		TopBarWidget::ActiveChat{
-			.key = _history,
-			.section = TopBarWidget::Section::Replies,
-			.rootId = _rootId,
-			.currentReplyToId = replyToId(),
-		},
-		_sendAction.get());
+	const auto state = Dialogs::EntryState{
+		.key = _history,
+		.section = Dialogs::EntryState::Section::Replies,
+		.rootId = _rootId,
+		.currentReplyToId = replyToId(),
+	};
+	_topBar->setActiveChat(state, _sendAction.get());
+	_composeControls->setCurrentDialogsEntryState(state);
 }
 
 MsgId RepliesWidget::replyToId() const {
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 9c5f32ca5..15741b1d8 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -99,12 +99,12 @@ ScheduledWidget::ScheduledWidget(
 	controller,
 	ComposeControls::Mode::Scheduled))
 , _scrollDown(_scroll, st::historyToDown) {
-	_topBar->setActiveChat(
-		TopBarWidget::ActiveChat{
-			.key = _history,
-			.section = TopBarWidget::Section::Scheduled,
-		},
-		nullptr);
+	const auto state = Dialogs::EntryState{
+		.key = _history,
+		.section = Dialogs::EntryState::Section::Scheduled,
+	};
+	_topBar->setActiveChat(state, nullptr);
+	_composeControls->setCurrentDialogsEntryState(state);
 
 	_topBar->move(0, 0);
 	_topBar->resizeToWidth(width());
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 432694aaa..c5eee7f76 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -232,30 +232,10 @@ void TopBarWidget::showMenu() {
 		Fn<void()> callback) {
 		return _menu->addAction(text, std::move(callback));
 	};
-	if (const auto peer = _activeChat.key.peer()) {
-		using Source = Window::PeerMenuRequest::Source;
-		const auto source = (_activeChat.section == Section::Scheduled)
-			? Source::ScheduledSection
-			: (_activeChat.section == Section::Replies)
-			? Source::RepliesSection
-			: Source::History;
-		Window::FillPeerMenu(
-			_controller,
-			Window::PeerMenuRequest{
-				.peer = peer,
-				.source = source,
-				.rootId = _activeChat.rootId,
-				.currentReplyToId = _activeChat.currentReplyToId,
-			},
-			addAction);
-	} else if (const auto folder = _activeChat.key.folder()) {
-		Window::FillFolderMenu(
-			_controller,
-			Window::FolderMenuRequest{ folder },
-			addAction);
-	} else {
-		Unexpected("Empty active chat in TopBarWidget::showMenu.");
-	}
+	Window::FillDialogsEntryMenu(
+		_controller,
+		_activeChat,
+		addAction);
 	if (_menu->actions().empty()) {
 		_menu.destroy();
 	} else {
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 bff509316..988758b46 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
@@ -43,19 +43,8 @@ public:
 		int canForwardCount = 0;
 		int canSendNowCount = 0;
 	};
-	enum class Section {
-		History,
-		Dialogs, // For folder view in dialogs list.
-		Scheduled,
-		Pinned,
-		Replies,
-	};
-	struct ActiveChat {
-		Dialogs::Key key;
-		Section section = Section::History;
-		MsgId rootId = 0;
-		MsgId currentReplyToId = 0;
-	};
+	using ActiveChat = Dialogs::EntryState;
+	using Section = ActiveChat::Section;
 
 	TopBarWidget(
 		QWidget *parent,
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 023742cec..22ab43419 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -575,11 +575,11 @@ void WrapWidget::showTopBarMenu() {
 		return _topBarMenu->addAction(text, std::move(callback));
 	};
 	if (const auto peer = key().peer()) {
-		Window::FillPeerMenu(
+		Window::FillDialogsEntryMenu(
 			_controller->parentController(),
-			Window::PeerMenuRequest{
-				.peer = peer,
-				.source = Window::PeerMenuRequest::Source::Profile,
+			Dialogs::EntryState{
+				.key = peer->owner().history(peer),
+				.section = Dialogs::EntryState::Section::Profile,
 			},
 			addAction);
 	//} else if (const auto feed = key().feed()) { // #feed
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.h b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
index 8a086f47c..4969959dd 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.h
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.h
@@ -8,9 +8,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "data/data_cloud_file.h"
+#include "api/api_common.h"
 
 class FileLoader;
 class History;
+class UserData;
 
 namespace Data {
 class LocationPoint;
@@ -125,4 +127,10 @@ private:
 
 };
 
+struct ResultSelected {
+	not_null<Result*> result;
+	not_null<UserData*> bot;
+	Api::SendOptions options;
+};
+
 } // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
new file mode 100644
index 000000000..6074ab1f3
--- /dev/null
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
@@ -0,0 +1,769 @@
+/*
+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 "inline_bots/inline_results_inner.h"
+
+#include "api/api_common.h"
+#include "chat_helpers/send_context_menu.h" // SendMenu::FillSendMenu
+#include "data/data_file_origin.h"
+#include "data/data_user.h"
+#include "data/data_changes.h"
+#include "inline_bots/inline_bot_result.h"
+#include "inline_bots/inline_bot_layout_item.h"
+#include "lang/lang_keys.h"
+#include "mainwindow.h"
+#include "facades.h"
+#include "main/main_session.h"
+#include "window/window_session_controller.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "history/view/history_view_cursor_state.h"
+#include "styles/style_chat_helpers.h"
+
+#include <QtWidgets/QApplication>
+
+namespace InlineBots {
+namespace Layout {
+
+Inner::Inner(
+	QWidget *parent,
+	not_null<Window::SessionController*> controller)
+: RpWidget(parent)
+, _controller(controller)
+, _updateInlineItems([=] { updateInlineItems(); })
+, _previewTimer([=] { showPreview(); }) {
+	resize(st::emojiPanWidth - st::emojiScroll.width - st::buttonRadius, st::inlineResultsMinHeight);
+
+	setMouseTracking(true);
+	setAttribute(Qt::WA_OpaquePaintEvent);
+
+	_controller->session().downloaderTaskFinished(
+	) | rpl::start_with_next([=] {
+		update();
+	}, lifetime());
+
+	subscribe(controller->gifPauseLevelChanged(), [this] {
+		if (!_controller->isGifPausedAtLeastFor(Window::GifPauseReason::InlineResults)) {
+			update();
+		}
+	});
+
+	_controller->session().changes().peerUpdates(
+		Data::PeerUpdate::Flag::Rights
+	) | rpl::filter([=](const Data::PeerUpdate &update) {
+		return (update.peer.get() == _inlineQueryPeer);
+	}) | rpl::start_with_next([=] {
+		auto isRestricted = (_restrictedLabel != nullptr);
+		if (isRestricted != isRestrictedView()) {
+			auto h = countHeight();
+			if (h != height()) resize(width(), h);
+		}
+	}, lifetime());
+}
+
+void Inner::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	_visibleBottom = visibleBottom;
+	if (_visibleTop != visibleTop) {
+		_visibleTop = visibleTop;
+		_lastScrolled = crl::now();
+	}
+}
+
+void Inner::checkRestrictedPeer() {
+	if (_inlineQueryPeer) {
+		const auto error = Data::RestrictionError(
+			_inlineQueryPeer,
+			ChatRestriction::f_send_inline);
+		if (error) {
+			if (!_restrictedLabel) {
+				_restrictedLabel.create(this, *error, st::stickersRestrictedLabel);
+				_restrictedLabel->show();
+				_restrictedLabel->move(st::inlineResultsLeft - st::buttonRadius, st::stickerPanPadding);
+				_restrictedLabel->resizeToNaturalWidth(width() - (st::inlineResultsLeft - st::buttonRadius) * 2);
+				if (_switchPmButton) {
+					_switchPmButton->hide();
+				}
+				update();
+			}
+			return;
+		}
+	}
+	if (_restrictedLabel) {
+		_restrictedLabel.destroy();
+		if (_switchPmButton) {
+			_switchPmButton->show();
+		}
+		update();
+	}
+}
+
+bool Inner::isRestrictedView() {
+	checkRestrictedPeer();
+	return (_restrictedLabel != nullptr);
+}
+
+int Inner::countHeight() {
+	if (isRestrictedView()) {
+		return st::stickerPanPadding + _restrictedLabel->height() + st::stickerPanPadding;
+	} else if (_rows.isEmpty() && !_switchPmButton) {
+		return st::stickerPanPadding + st::normalFont->height + st::stickerPanPadding;
+	}
+	auto result = st::stickerPanPadding;
+	if (_switchPmButton) {
+		result += _switchPmButton->height() + st::inlineResultsSkip;
+	}
+	for (int i = 0, l = _rows.count(); i < l; ++i) {
+		result += _rows[i].height;
+	}
+	return result + st::stickerPanPadding;
+}
+
+QString Inner::tooltipText() const {
+	if (const auto lnk = ClickHandler::getActive()) {
+		return lnk->tooltip();
+	}
+	return QString();
+}
+
+QPoint Inner::tooltipPos() const {
+	return _lastMousePos;
+}
+
+bool Inner::tooltipWindowActive() const {
+	return Ui::AppInFocus() && Ui::InFocusChain(window());
+}
+
+rpl::producer<> Inner::inlineRowsCleared() const {
+	return _inlineRowsCleared.events();
+}
+
+Inner::~Inner() = default;
+
+void Inner::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	QRect r = e ? e->rect() : rect();
+	if (r != rect()) {
+		p.setClipRect(r);
+	}
+	p.fillRect(r, st::emojiPanBg);
+
+	paintInlineItems(p, r);
+}
+
+void Inner::paintInlineItems(Painter &p, const QRect &r) {
+	if (_restrictedLabel) {
+		return;
+	}
+	if (_rows.isEmpty() && !_switchPmButton) {
+		p.setFont(st::normalFont);
+		p.setPen(st::noContactsColor);
+		p.drawText(QRect(0, 0, width(), (height() / 3) * 2 + st::normalFont->height), tr::lng_inline_bot_no_results(tr::now), style::al_center);
+		return;
+	}
+	auto gifPaused = _controller->isGifPausedAtLeastFor(Window::GifPauseReason::InlineResults);
+	InlineBots::Layout::PaintContext context(crl::now(), false, gifPaused, false);
+
+	auto top = st::stickerPanPadding;
+	if (_switchPmButton) {
+		top += _switchPmButton->height() + st::inlineResultsSkip;
+	}
+
+	auto fromx = rtl() ? (width() - r.x() - r.width()) : r.x();
+	auto tox = rtl() ? (width() - r.x()) : (r.x() + r.width());
+	for (auto row = 0, rows = _rows.size(); row != rows; ++row) {
+		auto &inlineRow = _rows[row];
+		if (top >= r.top() + r.height()) break;
+		if (top + inlineRow.height > r.top()) {
+			auto left = st::inlineResultsLeft - st::buttonRadius;
+			if (row == rows - 1) context.lastRow = true;
+			for (int col = 0, cols = inlineRow.items.size(); col < cols; ++col) {
+				if (left >= tox) break;
+
+				auto item = inlineRow.items.at(col);
+				auto w = item->width();
+				if (left + w > fromx) {
+					p.translate(left, top);
+					item->paint(p, r.translated(-left, -top), &context);
+					p.translate(-left, -top);
+				}
+				left += w;
+				if (item->hasRightSkip()) {
+					left += st::inlineResultsSkip;
+				}
+			}
+		}
+		top += inlineRow.height;
+	}
+}
+
+void Inner::mousePressEvent(QMouseEvent *e) {
+	if (e->button() != Qt::LeftButton) {
+		return;
+	}
+	_lastMousePos = e->globalPos();
+	updateSelected();
+
+	_pressed = _selected;
+	ClickHandler::pressed();
+	_previewTimer.callOnce(QApplication::startDragTime());
+}
+
+void Inner::mouseReleaseEvent(QMouseEvent *e) {
+	_previewTimer.cancel();
+
+	auto pressed = std::exchange(_pressed, -1);
+	auto activated = ClickHandler::unpressed();
+
+	if (_previewShown) {
+		_previewShown = false;
+		return;
+	}
+
+	_lastMousePos = e->globalPos();
+	updateSelected();
+
+	if (_selected < 0 || _selected != pressed || !activated) {
+		return;
+	}
+
+	if (dynamic_cast<InlineBots::Layout::SendClickHandler*>(activated.get())) {
+		int row = _selected / MatrixRowShift, column = _selected % MatrixRowShift;
+		selectInlineResult(row, column);
+	} else {
+		ActivateClickHandler(window(), activated, e->button());
+	}
+}
+
+void Inner::selectInlineResult(int row, int column) {
+	selectInlineResult(row, column, Api::SendOptions());
+}
+
+void Inner::selectInlineResult(
+		int row,
+		int column,
+		Api::SendOptions options) {
+	if (row >= _rows.size() || column >= _rows.at(row).items.size()) {
+		return;
+	}
+
+	auto item = _rows[row].items[column];
+	if (const auto inlineResult = item->getResult()) {
+		if (inlineResult->onChoose(item)) {
+			_resultSelectedCallback({
+				.result = inlineResult,
+				.bot = _inlineBot,
+				.options = std::move(options)
+			});
+		}
+	}
+}
+
+void Inner::mouseMoveEvent(QMouseEvent *e) {
+	_lastMousePos = e->globalPos();
+	updateSelected();
+}
+
+void Inner::leaveEventHook(QEvent *e) {
+	clearSelection();
+	Ui::Tooltip::Hide();
+}
+
+void Inner::leaveToChildEvent(QEvent *e, QWidget *child) {
+	clearSelection();
+}
+
+void Inner::enterFromChildEvent(QEvent *e, QWidget *child) {
+	_lastMousePos = QCursor::pos();
+	updateSelected();
+}
+
+void Inner::contextMenuEvent(QContextMenuEvent *e) {
+	if (_selected < 0 || _pressed >= 0) {
+		return;
+	}
+	const auto row = _selected / MatrixRowShift;
+	const auto column = _selected % MatrixRowShift;
+	const auto type = SendMenu::Type::Scheduled;
+
+	_menu = base::make_unique_q<Ui::PopupMenu>(this);
+
+	const auto send = [=](Api::SendOptions options) {
+		selectInlineResult(row, column, options);
+	};
+	SendMenu::FillSendMenu(
+		_menu,
+		[&] { return type; },
+		SendMenu::DefaultSilentCallback(send),
+		SendMenu::DefaultScheduleCallback(this, type, send));
+
+	if (!_menu->actions().empty()) {
+		_menu->popup(QCursor::pos());
+	}
+}
+
+void Inner::clearSelection() {
+	if (_selected >= 0) {
+		int srow = _selected / MatrixRowShift, scol = _selected % MatrixRowShift;
+		Assert(srow >= 0 && srow < _rows.size() && scol >= 0 && scol < _rows.at(srow).items.size());
+		ClickHandler::clearActive(_rows.at(srow).items.at(scol));
+		setCursor(style::cur_default);
+	}
+	_selected = _pressed = -1;
+	update();
+}
+
+void Inner::hideFinished() {
+	clearHeavyData();
+}
+
+void Inner::clearHeavyData() {
+	clearInlineRows(false);
+	for (const auto &[result, layout] : _inlineLayouts) {
+		layout->unloadHeavyPart();
+	}
+}
+
+bool Inner::inlineRowsAddItem(Result *result, Row &row, int32 &sumWidth) {
+	auto layout = layoutPrepareInlineResult(result, (_rows.size() * MatrixRowShift) + row.items.size());
+	if (!layout) return false;
+
+	layout->preload();
+	if (inlineRowFinalize(row, sumWidth, layout->isFullLine())) {
+		layout->setPosition(_rows.size() * MatrixRowShift);
+	}
+
+	sumWidth += layout->maxWidth();
+	if (!row.items.isEmpty() && row.items.back()->hasRightSkip()) {
+		sumWidth += st::inlineResultsSkip;
+	}
+
+	row.items.push_back(layout);
+	return true;
+}
+
+bool Inner::inlineRowFinalize(Row &row, int32 &sumWidth, bool force) {
+	if (row.items.isEmpty()) return false;
+
+	auto full = (row.items.size() >= kInlineItemsMaxPerRow);
+	auto big = (sumWidth >= st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft);
+	if (full || big || force) {
+		_rows.push_back(layoutInlineRow(row, (full || big) ? sumWidth : 0));
+		row = Row();
+		row.items.reserve(kInlineItemsMaxPerRow);
+		sumWidth = 0;
+		return true;
+	}
+	return false;
+}
+
+void Inner::inlineBotChanged() {
+	refreshInlineRows(nullptr, nullptr, nullptr, true);
+}
+
+void Inner::clearInlineRows(bool resultsDeleted) {
+	if (resultsDeleted) {
+		_selected = _pressed = -1;
+	} else {
+		clearSelection();
+		for_const (auto &row, _rows) {
+			for_const (auto &item, row.items) {
+				item->setPosition(-1);
+			}
+		}
+	}
+	_rows.clear();
+}
+
+ItemBase *Inner::layoutPrepareInlineResult(Result *result, int32 position) {
+	auto it = _inlineLayouts.find(result);
+	if (it == _inlineLayouts.cend()) {
+		if (auto layout = ItemBase::createLayout(this, result, _inlineWithThumb)) {
+			it = _inlineLayouts.emplace(result, std::move(layout)).first;
+			it->second->initDimensions();
+		} else {
+			return nullptr;
+		}
+	}
+	if (!it->second->maxWidth()) {
+		return nullptr;
+	}
+
+	it->second->setPosition(position);
+	return it->second.get();
+}
+
+void Inner::deleteUnusedInlineLayouts() {
+	if (_rows.isEmpty()) { // delete all
+		_inlineLayouts.clear();
+	} else {
+		for (auto i = _inlineLayouts.begin(); i != _inlineLayouts.cend();) {
+			if (i->second->position() < 0) {
+				i = _inlineLayouts.erase(i);
+			} else {
+				++i;
+			}
+		}
+	}
+}
+
+Inner::Row &Inner::layoutInlineRow(Row &row, int32 sumWidth) {
+	auto count = int(row.items.size());
+	Assert(count <= kInlineItemsMaxPerRow);
+
+	// enumerate items in the order of growing maxWidth()
+	// for that sort item indices by maxWidth()
+	int indices[kInlineItemsMaxPerRow];
+	for (auto i = 0; i != count; ++i) {
+		indices[i] = i;
+	}
+	std::sort(indices, indices + count, [&row](int a, int b) -> bool {
+		return row.items.at(a)->maxWidth() < row.items.at(b)->maxWidth();
+	});
+
+	row.height = 0;
+	int availw = width() - (st::inlineResultsLeft - st::buttonRadius);
+	for (int i = 0; i < count; ++i) {
+		int index = indices[i];
+		int w = sumWidth ? (row.items.at(index)->maxWidth() * availw / sumWidth) : row.items.at(index)->maxWidth();
+		int actualw = qMax(w, int(st::inlineResultsMinWidth));
+		row.height = qMax(row.height, row.items.at(index)->resizeGetHeight(actualw));
+		if (sumWidth) {
+			availw -= actualw;
+			sumWidth -= row.items.at(index)->maxWidth();
+			if (index > 0 && row.items.at(index - 1)->hasRightSkip()) {
+				availw -= st::inlineResultsSkip;
+				sumWidth -= st::inlineResultsSkip;
+			}
+		}
+	}
+	return row;
+}
+
+void Inner::preloadImages() {
+	for (auto row = 0, rows = _rows.size(); row != rows; ++row) {
+		for (auto col = 0, cols = _rows[row].items.size(); col != cols; ++col) {
+			_rows[row].items[col]->preload();
+		}
+	}
+}
+
+void Inner::hideInlineRowsPanel() {
+	clearInlineRows(false);
+}
+
+void Inner::clearInlineRowsPanel() {
+	clearInlineRows(false);
+}
+
+void Inner::refreshSwitchPmButton(const CacheEntry *entry) {
+	if (!entry || entry->switchPmText.isEmpty()) {
+		_switchPmButton.destroy();
+		_switchPmStartToken.clear();
+	} else {
+		if (!_switchPmButton) {
+			_switchPmButton.create(this, nullptr, st::switchPmButton);
+			_switchPmButton->show();
+			_switchPmButton->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+			_switchPmButton->addClickHandler([=] { switchPm(); });
+		}
+		_switchPmButton->setText(rpl::single(entry->switchPmText));
+		_switchPmStartToken = entry->switchPmStartToken;
+		const auto buttonTop = st::stickerPanPadding;
+		_switchPmButton->move(st::inlineResultsLeft - st::buttonRadius, buttonTop);
+		if (isRestrictedView()) {
+			_switchPmButton->hide();
+		}
+	}
+	update();
+}
+
+int Inner::refreshInlineRows(PeerData *queryPeer, UserData *bot, const CacheEntry *entry, bool resultsDeleted) {
+	_inlineBot = bot;
+	_inlineQueryPeer = queryPeer;
+	refreshSwitchPmButton(entry);
+	auto clearResults = [&] {
+		if (!entry) {
+			return true;
+		}
+		if (entry->results.empty() && entry->switchPmText.isEmpty()) {
+			return true;
+		}
+		return false;
+	};
+	auto clearResultsResult = clearResults(); // Clang workaround.
+	if (clearResultsResult) {
+		if (resultsDeleted) {
+			clearInlineRows(true);
+			deleteUnusedInlineLayouts();
+		}
+		_inlineRowsCleared.fire({});
+		return 0;
+	}
+
+	clearSelection();
+
+	Assert(_inlineBot != 0);
+
+	auto count = int(entry->results.size());
+	auto from = validateExistingInlineRows(entry->results);
+	auto added = 0;
+
+	if (count) {
+		_rows.reserve(count);
+		auto row = Row();
+		row.items.reserve(kInlineItemsMaxPerRow);
+		auto sumWidth = 0;
+		for (auto i = from; i != count; ++i) {
+			if (inlineRowsAddItem(entry->results[i].get(), row, sumWidth)) {
+				++added;
+			}
+		}
+		inlineRowFinalize(row, sumWidth, true);
+	}
+
+	auto h = countHeight();
+	if (h != height()) resize(width(), h);
+	update();
+
+	_lastMousePos = QCursor::pos();
+	updateSelected();
+
+	return added;
+}
+
+int Inner::validateExistingInlineRows(const Results &results) {
+	int count = results.size(), until = 0, untilrow = 0, untilcol = 0;
+	for (; until < count;) {
+		if (untilrow >= _rows.size() || _rows[untilrow].items[untilcol]->getResult() != results[until].get()) {
+			break;
+		}
+		++until;
+		if (++untilcol == _rows[untilrow].items.size()) {
+			++untilrow;
+			untilcol = 0;
+		}
+	}
+	if (until == count) { // all items are layed out
+		if (untilrow == _rows.size()) { // nothing changed
+			return until;
+		}
+
+		for (int i = untilrow, l = _rows.size(), skip = untilcol; i < l; ++i) {
+			for (int j = 0, s = _rows[i].items.size(); j < s; ++j) {
+				if (skip) {
+					--skip;
+				} else {
+					_rows[i].items[j]->setPosition(-1);
+				}
+			}
+		}
+		if (!untilcol) { // all good rows are filled
+			_rows.resize(untilrow);
+			return until;
+		}
+		_rows.resize(untilrow + 1);
+		_rows[untilrow].items.resize(untilcol);
+		_rows[untilrow] = layoutInlineRow(_rows[untilrow]);
+		return until;
+	}
+	if (untilrow && !untilcol) { // remove last row, maybe it is not full
+		--untilrow;
+		untilcol = _rows[untilrow].items.size();
+	}
+	until -= untilcol;
+
+	for (int i = untilrow, l = _rows.size(); i < l; ++i) {
+		for (int j = 0, s = _rows[i].items.size(); j < s; ++j) {
+			_rows[i].items[j]->setPosition(-1);
+		}
+	}
+	_rows.resize(untilrow);
+
+	if (_rows.isEmpty()) {
+		_inlineWithThumb = false;
+		for (int i = until; i < count; ++i) {
+			if (results.at(i)->hasThumbDisplay()) {
+				_inlineWithThumb = true;
+				break;
+			}
+		}
+	}
+	return until;
+}
+
+void Inner::inlineItemLayoutChanged(const ItemBase *layout) {
+	if (_selected < 0 || !isVisible()) {
+		return;
+	}
+
+	int row = _selected / MatrixRowShift, col = _selected % MatrixRowShift;
+	if (row < _rows.size() && col < _rows.at(row).items.size()) {
+		if (layout == _rows.at(row).items.at(col)) {
+			updateSelected();
+		}
+	}
+}
+
+void Inner::inlineItemRepaint(const ItemBase *layout) {
+	auto ms = crl::now();
+	if (_lastScrolled + 100 <= ms) {
+		update();
+	} else {
+		_updateInlineItems.callOnce(_lastScrolled + 100 - ms);
+	}
+}
+
+bool Inner::inlineItemVisible(const ItemBase *layout) {
+	int32 position = layout->position();
+	if (position < 0 || !isVisible()) {
+		return false;
+	}
+
+	int row = position / MatrixRowShift, col = position % MatrixRowShift;
+	Assert((row < _rows.size()) && (col < _rows[row].items.size()));
+
+	auto &inlineItems = _rows[row].items;
+	int top = st::stickerPanPadding;
+	for (int32 i = 0; i < row; ++i) {
+		top += _rows.at(i).height;
+	}
+
+	return (top < _visibleBottom) && (top + _rows[row].items[col]->height() > _visibleTop);
+}
+
+Data::FileOrigin Inner::inlineItemFileOrigin() {
+	return Data::FileOrigin();
+}
+
+void Inner::updateSelected() {
+	if (_pressed >= 0 && !_previewShown) {
+		return;
+	}
+
+	auto newSelected = -1;
+	auto p = mapFromGlobal(_lastMousePos);
+
+	int sx = (rtl() ? width() - p.x() : p.x()) - (st::inlineResultsLeft - st::buttonRadius);
+	int sy = p.y() - st::stickerPanPadding;
+	if (_switchPmButton) {
+		sy -= _switchPmButton->height() + st::inlineResultsSkip;
+	}
+	int row = -1, col = -1, sel = -1;
+	ClickHandlerPtr lnk;
+	ClickHandlerHost *lnkhost = nullptr;
+	HistoryView::CursorState cursor = HistoryView::CursorState::None;
+	if (sy >= 0) {
+		row = 0;
+		for (int rows = _rows.size(); row < rows; ++row) {
+			if (sy < _rows[row].height) {
+				break;
+			}
+			sy -= _rows[row].height;
+		}
+	}
+	if (sx >= 0 && row >= 0 && row < _rows.size()) {
+		auto &inlineItems = _rows[row].items;
+		col = 0;
+		for (int cols = inlineItems.size(); col < cols; ++col) {
+			int width = inlineItems.at(col)->width();
+			if (sx < width) {
+				break;
+			}
+			sx -= width;
+			if (inlineItems.at(col)->hasRightSkip()) {
+				sx -= st::inlineResultsSkip;
+			}
+		}
+		if (col < inlineItems.size()) {
+			sel = row * MatrixRowShift + col;
+			auto result = inlineItems[col]->getState(
+				QPoint(sx, sy),
+				HistoryView::StateRequest());
+			lnk = result.link;
+			cursor = result.cursor;
+			lnkhost = inlineItems[col];
+		} else {
+			row = col = -1;
+		}
+	} else {
+		row = col = -1;
+	}
+	int srow = (_selected >= 0) ? (_selected / MatrixRowShift) : -1;
+	int scol = (_selected >= 0) ? (_selected % MatrixRowShift) : -1;
+	if (_selected != sel) {
+		if (srow >= 0 && scol >= 0) {
+			Assert(srow >= 0 && srow < _rows.size() && scol >= 0 && scol < _rows.at(srow).items.size());
+			_rows[srow].items[scol]->update();
+		}
+		_selected = sel;
+		if (row >= 0 && col >= 0) {
+			Assert(row >= 0 && row < _rows.size() && col >= 0 && col < _rows.at(row).items.size());
+			_rows[row].items[col]->update();
+		}
+		if (_previewShown && _selected >= 0 && _pressed != _selected) {
+			_pressed = _selected;
+			if (row >= 0 && col >= 0) {
+				auto layout = _rows.at(row).items.at(col);
+				if (const auto w = App::wnd()) {
+					if (const auto previewDocument = layout->getPreviewDocument()) {
+						w->showMediaPreview(
+							Data::FileOrigin(),
+							previewDocument);
+					} else if (auto previewPhoto = layout->getPreviewPhoto()) {
+						w->showMediaPreview(Data::FileOrigin(), previewPhoto);
+					}
+				}
+			}
+		}
+	}
+	if (ClickHandler::setActive(lnk, lnkhost)) {
+		setCursor(lnk ? style::cur_pointer : style::cur_default);
+		Ui::Tooltip::Hide();
+	}
+	if (lnk) {
+		Ui::Tooltip::Show(1000, this);
+	}
+}
+
+void Inner::showPreview() {
+	if (_pressed < 0) return;
+
+	int row = _pressed / MatrixRowShift, col = _pressed % MatrixRowShift;
+	if (row < _rows.size() && col < _rows.at(row).items.size()) {
+		auto layout = _rows.at(row).items.at(col);
+		if (const auto w = App::wnd()) {
+			if (const auto previewDocument = layout->getPreviewDocument()) {
+				_previewShown = w->showMediaPreview(Data::FileOrigin(), previewDocument);
+			} else if (const auto previewPhoto = layout->getPreviewPhoto()) {
+				_previewShown = w->showMediaPreview(Data::FileOrigin(), previewPhoto);
+			}
+		}
+	}
+}
+
+void Inner::updateInlineItems() {
+	auto ms = crl::now();
+	if (_lastScrolled + 100 <= ms) {
+		update();
+	} else {
+		_updateInlineItems.callOnce(_lastScrolled + 100 - ms);
+	}
+}
+
+void Inner::switchPm() {
+	if (_inlineBot && _inlineBot->isBot()) {
+		_inlineBot->botInfo->startToken = _switchPmStartToken;
+		_inlineBot->botInfo->inlineReturnTo = _currentDialogsEntryState;
+		Ui::showPeerHistory(_inlineBot, ShowAndStartBotMsgId);
+	}
+}
+
+} // namespace Layout
+} // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.h b/Telegram/SourceFiles/inline_bots/inline_results_inner.h
new file mode 100644
index 000000000..6f2e1ab3a
--- /dev/null
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.h
@@ -0,0 +1,186 @@
+/*
+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/abstract_button.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/panel_animation.h"
+#include "dialogs/dialogs_key.h"
+#include "base/timer.h"
+#include "mtproto/sender.h"
+#include "inline_bots/inline_bot_layout_item.h"
+
+namespace Api {
+struct SendOptions;
+} // namespace Api
+
+namespace Ui {
+class ScrollArea;
+class IconButton;
+class LinkButton;
+class RoundButton;
+class FlatLabel;
+class RippleAnimation;
+class PopupMenu;
+} // namespace Ui
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace InlineBots {
+class Result;
+struct ResultSelected;
+} // namespace InlineBots
+
+namespace InlineBots {
+namespace Layout {
+
+constexpr int kInlineItemsMaxPerRow = 5;
+
+class ItemBase;
+using Results = std::vector<std::unique_ptr<Result>>;
+
+struct CacheEntry {
+	QString nextOffset;
+	QString switchPmText, switchPmStartToken;
+	Results results;
+};
+
+class Inner
+	: public Ui::RpWidget
+	, public Ui::AbstractTooltipShower
+	, public Context
+	, private base::Subscriber {
+
+public:
+	Inner(QWidget *parent, not_null<Window::SessionController*> controller);
+
+	void hideFinished();
+
+	void clearSelection();
+
+	int refreshInlineRows(PeerData *queryPeer, UserData *bot, const CacheEntry *results, bool resultsDeleted);
+	void inlineBotChanged();
+	void hideInlineRowsPanel();
+	void clearInlineRowsPanel();
+
+	void preloadImages();
+
+	void inlineItemLayoutChanged(const ItemBase *layout) override;
+	void inlineItemRepaint(const ItemBase *layout) override;
+	bool inlineItemVisible(const ItemBase *layout) override;
+	Data::FileOrigin inlineItemFileOrigin() override;
+
+	int countHeight();
+
+	void setResultSelectedCallback(Fn<void(ResultSelected)> callback) {
+		_resultSelectedCallback = std::move(callback);
+	}
+	void setCurrentDialogsEntryState(Dialogs::EntryState state) {
+		_currentDialogsEntryState = state;
+	}
+
+	// Ui::AbstractTooltipShower interface.
+	QString tooltipText() const override;
+	QPoint tooltipPos() const override;
+	bool tooltipWindowActive() const override;
+
+	rpl::producer<> inlineRowsCleared() const;
+
+	~Inner();
+
+protected:
+	void visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) override;
+
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+	void leaveToChildEvent(QEvent *e, QWidget *child) override;
+	void enterFromChildEvent(QEvent *e, QWidget *child) override;
+	void contextMenuEvent(QContextMenuEvent *e) override;
+
+private:
+	static constexpr bool kRefreshIconsScrollAnimation = true;
+	static constexpr bool kRefreshIconsNoAnimation = false;
+
+	struct Row {
+		int height = 0;
+		QVector<ItemBase*> items;
+	};
+
+	void switchPm();
+
+	void updateSelected();
+	void checkRestrictedPeer();
+	bool isRestrictedView();
+	void clearHeavyData();
+
+	void paintInlineItems(Painter &p, const QRect &r);
+
+	void refreshSwitchPmButton(const CacheEntry *entry);
+
+	void showPreview();
+	void updateInlineItems();
+	void clearInlineRows(bool resultsDeleted);
+	ItemBase *layoutPrepareInlineResult(Result *result, int32 position);
+
+	bool inlineRowsAddItem(Result *result, Row &row, int32 &sumWidth);
+	bool inlineRowFinalize(Row &row, int32 &sumWidth, bool force = false);
+
+	Row &layoutInlineRow(Row &row, int32 sumWidth = 0);
+	void deleteUnusedInlineLayouts();
+
+	int validateExistingInlineRows(const Results &results);
+	void selectInlineResult(int row, int column);
+	void selectInlineResult(int row, int column, Api::SendOptions options);
+
+	not_null<Window::SessionController*> _controller;
+
+	int _visibleTop = 0;
+	int _visibleBottom = 0;
+
+	UserData *_inlineBot = nullptr;
+	PeerData *_inlineQueryPeer = nullptr;
+	crl::time _lastScrolled = 0;
+	base::Timer _updateInlineItems;
+	bool _inlineWithThumb = false;
+
+	object_ptr<Ui::RoundButton> _switchPmButton = { nullptr };
+	QString _switchPmStartToken;
+	Dialogs::EntryState _currentDialogsEntryState;
+
+	object_ptr<Ui::FlatLabel> _restrictedLabel = { nullptr };
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
+	QVector<Row> _rows;
+
+	std::map<Result*, std::unique_ptr<ItemBase>> _inlineLayouts;
+
+	rpl::event_stream<> _inlineRowsCleared;
+
+	int _selected = -1;
+	int _pressed = -1;
+	QPoint _lastMousePos;
+
+	base::Timer _previewTimer;
+	bool _previewShown = false;
+
+	Fn<void(ResultSelected)> _resultSelectedCallback;
+
+};
+
+} // namespace Layout
+} // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
index c3184fbb9..7f94c480a 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
@@ -7,783 +7,26 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "inline_bots/inline_results_widget.h"
 
-#include "api/api_common.h"
-#include "chat_helpers/send_context_menu.h" // SendMenu::FillSendMenu
-#include "data/data_photo.h"
-#include "data/data_document.h"
-#include "data/data_channel.h"
 #include "data/data_user.h"
 #include "data/data_session.h"
-#include "data/data_file_origin.h"
-#include "data/data_changes.h"
-#include "ui/widgets/buttons.h"
-#include "ui/widgets/popup_menu.h"
-#include "ui/widgets/shadow.h"
-#include "ui/effects/ripple_animation.h"
-#include "ui/image/image_prepare.h"
-#include "boxes/confirm_box.h"
 #include "inline_bots/inline_bot_result.h"
-#include "inline_bots/inline_bot_layout_item.h"
-#include "dialogs/dialogs_layout.h"
-#include "storage/localstorage.h"
-#include "lang/lang_keys.h"
-#include "mainwindow.h"
-#include "mainwidget.h"
+#include "inline_bots/inline_results_inner.h"
 #include "main/main_session.h"
 #include "window/window_session_controller.h"
+#include "ui/widgets/shadow.h"
 #include "ui/widgets/scroll_area.h"
-#include "ui/widgets/labels.h"
+#include "ui/image/image_prepare.h"
 #include "ui/cached_round_corners.h"
-#include "history/view/history_view_cursor_state.h"
-#include "facades.h"
 #include "styles/style_chat_helpers.h"
 
-#include <QtWidgets/QApplication>
-
 namespace InlineBots {
 namespace Layout {
-namespace internal {
 namespace {
 
 constexpr auto kInlineBotRequestDelay = 400;
 
 } // namespace
 
-Inner::Inner(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller)
-: RpWidget(parent)
-, _controller(controller)
-, _updateInlineItems([=] { updateInlineItems(); })
-, _previewTimer([=] { showPreview(); }) {
-	resize(st::emojiPanWidth - st::emojiScroll.width - st::buttonRadius, st::inlineResultsMinHeight);
-
-	setMouseTracking(true);
-	setAttribute(Qt::WA_OpaquePaintEvent);
-
-	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
-		update();
-	}, lifetime());
-
-	subscribe(controller->gifPauseLevelChanged(), [this] {
-		if (!_controller->isGifPausedAtLeastFor(Window::GifPauseReason::InlineResults)) {
-			update();
-		}
-	});
-
-	_controller->session().changes().peerUpdates(
-		Data::PeerUpdate::Flag::Rights
-	) | rpl::filter([=](const Data::PeerUpdate &update) {
-		return (update.peer.get() == _inlineQueryPeer);
-	}) | rpl::start_with_next([=] {
-		auto isRestricted = (_restrictedLabel != nullptr);
-		if (isRestricted != isRestrictedView()) {
-			auto h = countHeight();
-			if (h != height()) resize(width(), h);
-		}
-	}, lifetime());
-}
-
-void Inner::visibleTopBottomUpdated(
-		int visibleTop,
-		int visibleBottom) {
-	_visibleBottom = visibleBottom;
-	if (_visibleTop != visibleTop) {
-		_visibleTop = visibleTop;
-		_lastScrolled = crl::now();
-	}
-}
-
-void Inner::checkRestrictedPeer() {
-	if (_inlineQueryPeer) {
-		const auto error = Data::RestrictionError(
-			_inlineQueryPeer,
-			ChatRestriction::f_send_inline);
-		if (error) {
-			if (!_restrictedLabel) {
-				_restrictedLabel.create(this, *error, st::stickersRestrictedLabel);
-				_restrictedLabel->show();
-				_restrictedLabel->move(st::inlineResultsLeft - st::buttonRadius, st::stickerPanPadding);
-				_restrictedLabel->resizeToNaturalWidth(width() - (st::inlineResultsLeft - st::buttonRadius) * 2);
-				if (_switchPmButton) {
-					_switchPmButton->hide();
-				}
-				update();
-			}
-			return;
-		}
-	}
-	if (_restrictedLabel) {
-		_restrictedLabel.destroy();
-		if (_switchPmButton) {
-			_switchPmButton->show();
-		}
-		update();
-	}
-}
-
-bool Inner::isRestrictedView() {
-	checkRestrictedPeer();
-	return (_restrictedLabel != nullptr);
-}
-
-int Inner::countHeight() {
-	if (isRestrictedView()) {
-		return st::stickerPanPadding + _restrictedLabel->height() + st::stickerPanPadding;
-	} else if (_rows.isEmpty() && !_switchPmButton) {
-		return st::stickerPanPadding + st::normalFont->height + st::stickerPanPadding;
-	}
-	auto result = st::stickerPanPadding;
-	if (_switchPmButton) {
-		result += _switchPmButton->height() + st::inlineResultsSkip;
-	}
-	for (int i = 0, l = _rows.count(); i < l; ++i) {
-		result += _rows[i].height;
-	}
-	return result + st::stickerPanPadding;
-}
-
-QString Inner::tooltipText() const {
-	if (const auto lnk = ClickHandler::getActive()) {
-		return lnk->tooltip();
-	}
-	return QString();
-}
-
-QPoint Inner::tooltipPos() const {
-	return _lastMousePos;
-}
-
-bool Inner::tooltipWindowActive() const {
-	return Ui::AppInFocus() && Ui::InFocusChain(window());
-}
-
-rpl::producer<> Inner::inlineRowsCleared() const {
-	return _inlineRowsCleared.events();
-}
-
-Inner::~Inner() = default;
-
-void Inner::paintEvent(QPaintEvent *e) {
-	Painter p(this);
-	QRect r = e ? e->rect() : rect();
-	if (r != rect()) {
-		p.setClipRect(r);
-	}
-	p.fillRect(r, st::emojiPanBg);
-
-	paintInlineItems(p, r);
-}
-
-void Inner::paintInlineItems(Painter &p, const QRect &r) {
-	if (_restrictedLabel) {
-		return;
-	}
-	if (_rows.isEmpty() && !_switchPmButton) {
-		p.setFont(st::normalFont);
-		p.setPen(st::noContactsColor);
-		p.drawText(QRect(0, 0, width(), (height() / 3) * 2 + st::normalFont->height), tr::lng_inline_bot_no_results(tr::now), style::al_center);
-		return;
-	}
-	auto gifPaused = _controller->isGifPausedAtLeastFor(Window::GifPauseReason::InlineResults);
-	InlineBots::Layout::PaintContext context(crl::now(), false, gifPaused, false);
-
-	auto top = st::stickerPanPadding;
-	if (_switchPmButton) {
-		top += _switchPmButton->height() + st::inlineResultsSkip;
-	}
-
-	auto fromx = rtl() ? (width() - r.x() - r.width()) : r.x();
-	auto tox = rtl() ? (width() - r.x()) : (r.x() + r.width());
-	for (auto row = 0, rows = _rows.size(); row != rows; ++row) {
-		auto &inlineRow = _rows[row];
-		if (top >= r.top() + r.height()) break;
-		if (top + inlineRow.height > r.top()) {
-			auto left = st::inlineResultsLeft - st::buttonRadius;
-			if (row == rows - 1) context.lastRow = true;
-			for (int col = 0, cols = inlineRow.items.size(); col < cols; ++col) {
-				if (left >= tox) break;
-
-				auto item = inlineRow.items.at(col);
-				auto w = item->width();
-				if (left + w > fromx) {
-					p.translate(left, top);
-					item->paint(p, r.translated(-left, -top), &context);
-					p.translate(-left, -top);
-				}
-				left += w;
-				if (item->hasRightSkip()) {
-					left += st::inlineResultsSkip;
-				}
-			}
-		}
-		top += inlineRow.height;
-	}
-}
-
-void Inner::mousePressEvent(QMouseEvent *e) {
-	if (e->button() != Qt::LeftButton) {
-		return;
-	}
-	_lastMousePos = e->globalPos();
-	updateSelected();
-
-	_pressed = _selected;
-	ClickHandler::pressed();
-	_previewTimer.callOnce(QApplication::startDragTime());
-}
-
-void Inner::mouseReleaseEvent(QMouseEvent *e) {
-	_previewTimer.cancel();
-
-	auto pressed = std::exchange(_pressed, -1);
-	auto activated = ClickHandler::unpressed();
-
-	if (_previewShown) {
-		_previewShown = false;
-		return;
-	}
-
-	_lastMousePos = e->globalPos();
-	updateSelected();
-
-	if (_selected < 0 || _selected != pressed || !activated) {
-		return;
-	}
-
-	if (dynamic_cast<InlineBots::Layout::SendClickHandler*>(activated.get())) {
-		int row = _selected / MatrixRowShift, column = _selected % MatrixRowShift;
-		selectInlineResult(row, column);
-	} else {
-		ActivateClickHandler(window(), activated, e->button());
-	}
-}
-
-void Inner::selectInlineResult(int row, int column) {
-	selectInlineResult(row, column, Api::SendOptions());
-}
-
-void Inner::selectInlineResult(
-		int row,
-		int column,
-		Api::SendOptions options) {
-	if (row >= _rows.size() || column >= _rows.at(row).items.size()) {
-		return;
-	}
-
-	auto item = _rows[row].items[column];
-	if (const auto inlineResult = item->getResult()) {
-		if (inlineResult->onChoose(item)) {
-			_resultSelectedCallback(
-				inlineResult,
-				_inlineBot,
-				std::move(options));
-		}
-	}
-}
-
-void Inner::mouseMoveEvent(QMouseEvent *e) {
-	_lastMousePos = e->globalPos();
-	updateSelected();
-}
-
-void Inner::leaveEventHook(QEvent *e) {
-	clearSelection();
-	Ui::Tooltip::Hide();
-}
-
-void Inner::leaveToChildEvent(QEvent *e, QWidget *child) {
-	clearSelection();
-}
-
-void Inner::enterFromChildEvent(QEvent *e, QWidget *child) {
-	_lastMousePos = QCursor::pos();
-	updateSelected();
-}
-
-void Inner::contextMenuEvent(QContextMenuEvent *e) {
-	if (_selected < 0 || _pressed >= 0) {
-		return;
-	}
-	const auto row = _selected / MatrixRowShift;
-	const auto column = _selected % MatrixRowShift;
-	const auto type = SendMenu::Type::Scheduled;
-
-	_menu = base::make_unique_q<Ui::PopupMenu>(this);
-
-	const auto send = [=](Api::SendOptions options) {
-		selectInlineResult(row, column, options);
-	};
-	SendMenu::FillSendMenu(
-		_menu,
-		[&] { return type; },
-		SendMenu::DefaultSilentCallback(send),
-		SendMenu::DefaultScheduleCallback(this, type, send));
-
-	if (!_menu->actions().empty()) {
-		_menu->popup(QCursor::pos());
-	}
-}
-
-void Inner::clearSelection() {
-	if (_selected >= 0) {
-		int srow = _selected / MatrixRowShift, scol = _selected % MatrixRowShift;
-		Assert(srow >= 0 && srow < _rows.size() && scol >= 0 && scol < _rows.at(srow).items.size());
-		ClickHandler::clearActive(_rows.at(srow).items.at(scol));
-		setCursor(style::cur_default);
-	}
-	_selected = _pressed = -1;
-	update();
-}
-
-void Inner::hideFinished() {
-	clearHeavyData();
-}
-
-void Inner::clearHeavyData() {
-	clearInlineRows(false);
-	for (const auto &[result, layout] : _inlineLayouts) {
-		layout->unloadHeavyPart();
-	}
-}
-
-bool Inner::inlineRowsAddItem(Result *result, Row &row, int32 &sumWidth) {
-	auto layout = layoutPrepareInlineResult(result, (_rows.size() * MatrixRowShift) + row.items.size());
-	if (!layout) return false;
-
-	layout->preload();
-	if (inlineRowFinalize(row, sumWidth, layout->isFullLine())) {
-		layout->setPosition(_rows.size() * MatrixRowShift);
-	}
-
-	sumWidth += layout->maxWidth();
-	if (!row.items.isEmpty() && row.items.back()->hasRightSkip()) {
-		sumWidth += st::inlineResultsSkip;
-	}
-
-	row.items.push_back(layout);
-	return true;
-}
-
-bool Inner::inlineRowFinalize(Row &row, int32 &sumWidth, bool force) {
-	if (row.items.isEmpty()) return false;
-
-	auto full = (row.items.size() >= kInlineItemsMaxPerRow);
-	auto big = (sumWidth >= st::emojiPanWidth - st::emojiScroll.width - st::inlineResultsLeft);
-	if (full || big || force) {
-		_rows.push_back(layoutInlineRow(row, (full || big) ? sumWidth : 0));
-		row = Row();
-		row.items.reserve(kInlineItemsMaxPerRow);
-		sumWidth = 0;
-		return true;
-	}
-	return false;
-}
-
-void Inner::inlineBotChanged() {
-	refreshInlineRows(nullptr, nullptr, nullptr, true);
-}
-
-void Inner::clearInlineRows(bool resultsDeleted) {
-	if (resultsDeleted) {
-		_selected = _pressed = -1;
-	} else {
-		clearSelection();
-		for_const (auto &row, _rows) {
-			for_const (auto &item, row.items) {
-				item->setPosition(-1);
-			}
-		}
-	}
-	_rows.clear();
-}
-
-ItemBase *Inner::layoutPrepareInlineResult(Result *result, int32 position) {
-	auto it = _inlineLayouts.find(result);
-	if (it == _inlineLayouts.cend()) {
-		if (auto layout = ItemBase::createLayout(this, result, _inlineWithThumb)) {
-			it = _inlineLayouts.emplace(result, std::move(layout)).first;
-			it->second->initDimensions();
-		} else {
-			return nullptr;
-		}
-	}
-	if (!it->second->maxWidth()) {
-		return nullptr;
-	}
-
-	it->second->setPosition(position);
-	return it->second.get();
-}
-
-void Inner::deleteUnusedInlineLayouts() {
-	if (_rows.isEmpty()) { // delete all
-		_inlineLayouts.clear();
-	} else {
-		for (auto i = _inlineLayouts.begin(); i != _inlineLayouts.cend();) {
-			if (i->second->position() < 0) {
-				i = _inlineLayouts.erase(i);
-			} else {
-				++i;
-			}
-		}
-	}
-}
-
-Inner::Row &Inner::layoutInlineRow(Row &row, int32 sumWidth) {
-	auto count = int(row.items.size());
-	Assert(count <= kInlineItemsMaxPerRow);
-
-	// enumerate items in the order of growing maxWidth()
-	// for that sort item indices by maxWidth()
-	int indices[kInlineItemsMaxPerRow];
-	for (auto i = 0; i != count; ++i) {
-		indices[i] = i;
-	}
-	std::sort(indices, indices + count, [&row](int a, int b) -> bool {
-		return row.items.at(a)->maxWidth() < row.items.at(b)->maxWidth();
-	});
-
-	row.height = 0;
-	int availw = width() - (st::inlineResultsLeft - st::buttonRadius);
-	for (int i = 0; i < count; ++i) {
-		int index = indices[i];
-		int w = sumWidth ? (row.items.at(index)->maxWidth() * availw / sumWidth) : row.items.at(index)->maxWidth();
-		int actualw = qMax(w, int(st::inlineResultsMinWidth));
-		row.height = qMax(row.height, row.items.at(index)->resizeGetHeight(actualw));
-		if (sumWidth) {
-			availw -= actualw;
-			sumWidth -= row.items.at(index)->maxWidth();
-			if (index > 0 && row.items.at(index - 1)->hasRightSkip()) {
-				availw -= st::inlineResultsSkip;
-				sumWidth -= st::inlineResultsSkip;
-			}
-		}
-	}
-	return row;
-}
-
-void Inner::preloadImages() {
-	for (auto row = 0, rows = _rows.size(); row != rows; ++row) {
-		for (auto col = 0, cols = _rows[row].items.size(); col != cols; ++col) {
-			_rows[row].items[col]->preload();
-		}
-	}
-}
-
-void Inner::hideInlineRowsPanel() {
-	clearInlineRows(false);
-}
-
-void Inner::clearInlineRowsPanel() {
-	clearInlineRows(false);
-}
-
-void Inner::refreshSwitchPmButton(const CacheEntry *entry) {
-	if (!entry || entry->switchPmText.isEmpty()) {
-		_switchPmButton.destroy();
-		_switchPmStartToken.clear();
-	} else {
-		if (!_switchPmButton) {
-			_switchPmButton.create(this, nullptr, st::switchPmButton);
-			_switchPmButton->show();
-			_switchPmButton->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-			_switchPmButton->addClickHandler([=] { onSwitchPm(); });
-		}
-		_switchPmButton->setText(rpl::single(entry->switchPmText));
-		_switchPmStartToken = entry->switchPmStartToken;
-		const auto buttonTop = st::stickerPanPadding;
-		_switchPmButton->move(st::inlineResultsLeft - st::buttonRadius, buttonTop);
-		if (isRestrictedView()) {
-			_switchPmButton->hide();
-		}
-	}
-	update();
-}
-
-int Inner::refreshInlineRows(PeerData *queryPeer, UserData *bot, const CacheEntry *entry, bool resultsDeleted) {
-	_inlineBot = bot;
-	_inlineQueryPeer = queryPeer;
-	refreshSwitchPmButton(entry);
-	auto clearResults = [&] {
-		if (!entry) {
-			return true;
-		}
-		if (entry->results.empty() && entry->switchPmText.isEmpty()) {
-			return true;
-		}
-		return false;
-	};
-	auto clearResultsResult = clearResults(); // Clang workaround.
-	if (clearResultsResult) {
-		if (resultsDeleted) {
-			clearInlineRows(true);
-			deleteUnusedInlineLayouts();
-		}
-		_inlineRowsCleared.fire({});
-		return 0;
-	}
-
-	clearSelection();
-
-	Assert(_inlineBot != 0);
-
-	auto count = int(entry->results.size());
-	auto from = validateExistingInlineRows(entry->results);
-	auto added = 0;
-
-	if (count) {
-		_rows.reserve(count);
-		auto row = Row();
-		row.items.reserve(kInlineItemsMaxPerRow);
-		auto sumWidth = 0;
-		for (auto i = from; i != count; ++i) {
-			if (inlineRowsAddItem(entry->results[i].get(), row, sumWidth)) {
-				++added;
-			}
-		}
-		inlineRowFinalize(row, sumWidth, true);
-	}
-
-	auto h = countHeight();
-	if (h != height()) resize(width(), h);
-	update();
-
-	_lastMousePos = QCursor::pos();
-	updateSelected();
-
-	return added;
-}
-
-int Inner::validateExistingInlineRows(const Results &results) {
-	int count = results.size(), until = 0, untilrow = 0, untilcol = 0;
-	for (; until < count;) {
-		if (untilrow >= _rows.size() || _rows[untilrow].items[untilcol]->getResult() != results[until].get()) {
-			break;
-		}
-		++until;
-		if (++untilcol == _rows[untilrow].items.size()) {
-			++untilrow;
-			untilcol = 0;
-		}
-	}
-	if (until == count) { // all items are layed out
-		if (untilrow == _rows.size()) { // nothing changed
-			return until;
-		}
-
-		for (int i = untilrow, l = _rows.size(), skip = untilcol; i < l; ++i) {
-			for (int j = 0, s = _rows[i].items.size(); j < s; ++j) {
-				if (skip) {
-					--skip;
-				} else {
-					_rows[i].items[j]->setPosition(-1);
-				}
-			}
-		}
-		if (!untilcol) { // all good rows are filled
-			_rows.resize(untilrow);
-			return until;
-		}
-		_rows.resize(untilrow + 1);
-		_rows[untilrow].items.resize(untilcol);
-		_rows[untilrow] = layoutInlineRow(_rows[untilrow]);
-		return until;
-	}
-	if (untilrow && !untilcol) { // remove last row, maybe it is not full
-		--untilrow;
-		untilcol = _rows[untilrow].items.size();
-	}
-	until -= untilcol;
-
-	for (int i = untilrow, l = _rows.size(); i < l; ++i) {
-		for (int j = 0, s = _rows[i].items.size(); j < s; ++j) {
-			_rows[i].items[j]->setPosition(-1);
-		}
-	}
-	_rows.resize(untilrow);
-
-	if (_rows.isEmpty()) {
-		_inlineWithThumb = false;
-		for (int i = until; i < count; ++i) {
-			if (results.at(i)->hasThumbDisplay()) {
-				_inlineWithThumb = true;
-				break;
-			}
-		}
-	}
-	return until;
-}
-
-void Inner::inlineItemLayoutChanged(const ItemBase *layout) {
-	if (_selected < 0 || !isVisible()) {
-		return;
-	}
-
-	int row = _selected / MatrixRowShift, col = _selected % MatrixRowShift;
-	if (row < _rows.size() && col < _rows.at(row).items.size()) {
-		if (layout == _rows.at(row).items.at(col)) {
-			updateSelected();
-		}
-	}
-}
-
-void Inner::inlineItemRepaint(const ItemBase *layout) {
-	auto ms = crl::now();
-	if (_lastScrolled + 100 <= ms) {
-		update();
-	} else {
-		_updateInlineItems.callOnce(_lastScrolled + 100 - ms);
-	}
-}
-
-bool Inner::inlineItemVisible(const ItemBase *layout) {
-	int32 position = layout->position();
-	if (position < 0 || !isVisible()) {
-		return false;
-	}
-
-	int row = position / MatrixRowShift, col = position % MatrixRowShift;
-	Assert((row < _rows.size()) && (col < _rows[row].items.size()));
-
-	auto &inlineItems = _rows[row].items;
-	int top = st::stickerPanPadding;
-	for (int32 i = 0; i < row; ++i) {
-		top += _rows.at(i).height;
-	}
-
-	return (top < _visibleBottom) && (top + _rows[row].items[col]->height() > _visibleTop);
-}
-
-Data::FileOrigin Inner::inlineItemFileOrigin() {
-	return Data::FileOrigin();
-}
-
-void Inner::updateSelected() {
-	if (_pressed >= 0 && !_previewShown) {
-		return;
-	}
-
-	auto newSelected = -1;
-	auto p = mapFromGlobal(_lastMousePos);
-
-	int sx = (rtl() ? width() - p.x() : p.x()) - (st::inlineResultsLeft - st::buttonRadius);
-	int sy = p.y() - st::stickerPanPadding;
-	if (_switchPmButton) {
-		sy -= _switchPmButton->height() + st::inlineResultsSkip;
-	}
-	int row = -1, col = -1, sel = -1;
-	ClickHandlerPtr lnk;
-	ClickHandlerHost *lnkhost = nullptr;
-	HistoryView::CursorState cursor = HistoryView::CursorState::None;
-	if (sy >= 0) {
-		row = 0;
-		for (int rows = _rows.size(); row < rows; ++row) {
-			if (sy < _rows[row].height) {
-				break;
-			}
-			sy -= _rows[row].height;
-		}
-	}
-	if (sx >= 0 && row >= 0 && row < _rows.size()) {
-		auto &inlineItems = _rows[row].items;
-		col = 0;
-		for (int cols = inlineItems.size(); col < cols; ++col) {
-			int width = inlineItems.at(col)->width();
-			if (sx < width) {
-				break;
-			}
-			sx -= width;
-			if (inlineItems.at(col)->hasRightSkip()) {
-				sx -= st::inlineResultsSkip;
-			}
-		}
-		if (col < inlineItems.size()) {
-			sel = row * MatrixRowShift + col;
-			auto result = inlineItems[col]->getState(
-				QPoint(sx, sy),
-				HistoryView::StateRequest());
-			lnk = result.link;
-			cursor = result.cursor;
-			lnkhost = inlineItems[col];
-		} else {
-			row = col = -1;
-		}
-	} else {
-		row = col = -1;
-	}
-	int srow = (_selected >= 0) ? (_selected / MatrixRowShift) : -1;
-	int scol = (_selected >= 0) ? (_selected % MatrixRowShift) : -1;
-	if (_selected != sel) {
-		if (srow >= 0 && scol >= 0) {
-			Assert(srow >= 0 && srow < _rows.size() && scol >= 0 && scol < _rows.at(srow).items.size());
-			_rows[srow].items[scol]->update();
-		}
-		_selected = sel;
-		if (row >= 0 && col >= 0) {
-			Assert(row >= 0 && row < _rows.size() && col >= 0 && col < _rows.at(row).items.size());
-			_rows[row].items[col]->update();
-		}
-		if (_previewShown && _selected >= 0 && _pressed != _selected) {
-			_pressed = _selected;
-			if (row >= 0 && col >= 0) {
-				auto layout = _rows.at(row).items.at(col);
-				if (const auto w = App::wnd()) {
-					if (const auto previewDocument = layout->getPreviewDocument()) {
-						w->showMediaPreview(
-							Data::FileOrigin(),
-							previewDocument);
-					} else if (auto previewPhoto = layout->getPreviewPhoto()) {
-						w->showMediaPreview(Data::FileOrigin(), previewPhoto);
-					}
-				}
-			}
-		}
-	}
-	if (ClickHandler::setActive(lnk, lnkhost)) {
-		setCursor(lnk ? style::cur_pointer : style::cur_default);
-		Ui::Tooltip::Hide();
-	}
-	if (lnk) {
-		Ui::Tooltip::Show(1000, this);
-	}
-}
-
-void Inner::showPreview() {
-	if (_pressed < 0) return;
-
-	int row = _pressed / MatrixRowShift, col = _pressed % MatrixRowShift;
-	if (row < _rows.size() && col < _rows.at(row).items.size()) {
-		auto layout = _rows.at(row).items.at(col);
-		if (const auto w = App::wnd()) {
-			if (const auto previewDocument = layout->getPreviewDocument()) {
-				_previewShown = w->showMediaPreview(Data::FileOrigin(), previewDocument);
-			} else if (const auto previewPhoto = layout->getPreviewPhoto()) {
-				_previewShown = w->showMediaPreview(Data::FileOrigin(), previewPhoto);
-			}
-		}
-	}
-}
-
-void Inner::updateInlineItems() {
-	auto ms = crl::now();
-	if (_lastScrolled + 100 <= ms) {
-		update();
-	} else {
-		_updateInlineItems.callOnce(_lastScrolled + 100 - ms);
-	}
-}
-
-void Inner::onSwitchPm() {
-	if (_inlineBot && _inlineBot->isBot()) {
-		_inlineBot->botInfo->startToken = _switchPmStartToken;
-		Ui::showPeerHistory(_inlineBot, ShowAndStartBotMsgId);
-	}
-}
-
-} // namespace internal
-
 Widget::Widget(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller)
@@ -801,7 +44,7 @@ Widget::Widget(
 	_scroll->resize(st::emojiPanWidth - st::buttonRadius, _contentHeight);
 
 	_scroll->move(verticalRect().topLeft());
-	_inner = _scroll->setOwnedWidget(object_ptr<internal::Inner>(this, controller));
+	_inner = _scroll->setOwnedWidget(object_ptr<Inner>(this, controller));
 
 	_inner->moveToLeft(0, 0, _scroll->width());
 
@@ -990,6 +233,14 @@ QImage Widget::grabForPanelAnimation() {
 	return result;
 }
 
+void Widget::setResultSelectedCallback(Fn<void(ResultSelected)> callback) {
+	_inner->setResultSelectedCallback(std::move(callback));
+}
+
+void Widget::setCurrentDialogsEntryState(Dialogs::EntryState state) {
+	_inner->setCurrentDialogsEntryState(state);
+}
+
 void Widget::hideAnimated() {
 	if (isHidden()) return;
 	if (_hiding) return;
@@ -1103,7 +354,7 @@ void Widget::inlineResultsDone(const MTPmessages_BotResults &result) {
 		if (it == _inlineCache.cend()) {
 			it = _inlineCache.emplace(
 				_inlineQuery,
-				std::make_unique<internal::CacheEntry>()).first;
+				std::make_unique<CacheEntry>()).first;
 		}
 		auto entry = it->second.get();
 		entry->nextOffset = qs(d.vnext_offset().value_or_empty());
@@ -1163,7 +414,7 @@ void Widget::queryInlineBot(UserData *bot, PeerData *peer, QString query) {
 			showInlineRows(true);
 		} else {
 			_inlineNextQuery = query;
-			_inlineRequestTimer.callOnce(internal::kInlineBotRequestDelay);
+			_inlineRequestTimer.callOnce(kInlineBotRequestDelay);
 		}
 	}
 }
@@ -1199,7 +450,7 @@ void Widget::onInlineRequest() {
 
 bool Widget::refreshInlineRows(int *added) {
 	auto it = _inlineCache.find(_inlineQuery);
-	const internal::CacheEntry *entry = nullptr;
+	const CacheEntry *entry = nullptr;
 	if (it != _inlineCache.cend()) {
 		if (!it->second->results.empty() || !it->second->switchPmText.isEmpty()) {
 			entry = it->second.get();
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.h b/Telegram/SourceFiles/inline_bots/inline_results_widget.h
index e7369759e..62c4acd4f 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.h
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.h
@@ -30,161 +30,29 @@ class RippleAnimation;
 class PopupMenu;
 } // namespace Ui
 
+namespace Dialogs {
+struct EntryState;
+} // namespace Dialogs
+
 namespace Window {
 class SessionController;
 } // namespace Window
 
 namespace InlineBots {
-
 class Result;
+struct ResultSelected;
+} // namespace InlineBots
 
+namespace InlineBots {
 namespace Layout {
 
-class ItemBase;
-
-namespace internal {
-
-constexpr int kInlineItemsMaxPerRow = 5;
-
-using Results = std::vector<std::unique_ptr<Result>>;
-using ResultSelected = Fn<void(Result *, UserData *, Api::SendOptions)>;
-
-struct CacheEntry {
-	QString nextOffset;
-	QString switchPmText, switchPmStartToken;
-	Results results;
-};
-
-class Inner
-	: public Ui::RpWidget
-	, public Ui::AbstractTooltipShower
-	, public Context
-	, private base::Subscriber {
-
-public:
-	Inner(QWidget *parent, not_null<Window::SessionController*> controller);
-
-	void hideFinished();
-
-	void clearSelection();
-
-	int refreshInlineRows(PeerData *queryPeer, UserData *bot, const CacheEntry *results, bool resultsDeleted);
-	void inlineBotChanged();
-	void hideInlineRowsPanel();
-	void clearInlineRowsPanel();
-
-	void preloadImages();
-
-	void inlineItemLayoutChanged(const ItemBase *layout) override;
-	void inlineItemRepaint(const ItemBase *layout) override;
-	bool inlineItemVisible(const ItemBase *layout) override;
-	Data::FileOrigin inlineItemFileOrigin() override;
-
-	int countHeight();
-
-	void setResultSelectedCallback(ResultSelected callback) {
-		_resultSelectedCallback = std::move(callback);
-	}
-
-	// Ui::AbstractTooltipShower interface.
-	QString tooltipText() const override;
-	QPoint tooltipPos() const override;
-	bool tooltipWindowActive() const override;
-
-	rpl::producer<> inlineRowsCleared() const;
-
-	~Inner();
-
-protected:
-	void visibleTopBottomUpdated(
-		int visibleTop,
-		int visibleBottom) override;
-
-	void mousePressEvent(QMouseEvent *e) override;
-	void mouseReleaseEvent(QMouseEvent *e) override;
-	void mouseMoveEvent(QMouseEvent *e) override;
-	void paintEvent(QPaintEvent *e) override;
-	void leaveEventHook(QEvent *e) override;
-	void leaveToChildEvent(QEvent *e, QWidget *child) override;
-	void enterFromChildEvent(QEvent *e, QWidget *child) override;
-	void contextMenuEvent(QContextMenuEvent *e) override;
-
-private:
-	static constexpr bool kRefreshIconsScrollAnimation = true;
-	static constexpr bool kRefreshIconsNoAnimation = false;
-
-	struct Row {
-		int height = 0;
-		QVector<ItemBase*> items;
-	};
-
-	void onSwitchPm();
-
-	void updateSelected();
-	void checkRestrictedPeer();
-	bool isRestrictedView();
-	void clearHeavyData();
-
-	void paintInlineItems(Painter &p, const QRect &r);
-
-	void refreshSwitchPmButton(const CacheEntry *entry);
-
-	void showPreview();
-	void updateInlineItems();
-	void clearInlineRows(bool resultsDeleted);
-	ItemBase *layoutPrepareInlineResult(Result *result, int32 position);
-
-	bool inlineRowsAddItem(Result *result, Row &row, int32 &sumWidth);
-	bool inlineRowFinalize(Row &row, int32 &sumWidth, bool force = false);
-
-	Row &layoutInlineRow(Row &row, int32 sumWidth = 0);
-	void deleteUnusedInlineLayouts();
-
-	int validateExistingInlineRows(const Results &results);
-	void selectInlineResult(int row, int column);
-	void selectInlineResult(int row, int column, Api::SendOptions options);
-
-	not_null<Window::SessionController*> _controller;
-
-	int _visibleTop = 0;
-	int _visibleBottom = 0;
-
-	UserData *_inlineBot = nullptr;
-	PeerData *_inlineQueryPeer = nullptr;
-	crl::time _lastScrolled = 0;
-	base::Timer _updateInlineItems;
-	bool _inlineWithThumb = false;
-
-	object_ptr<Ui::RoundButton> _switchPmButton = { nullptr };
-	QString _switchPmStartToken;
-
-	object_ptr<Ui::FlatLabel> _restrictedLabel = { nullptr };
-
-	base::unique_qptr<Ui::PopupMenu> _menu;
-
-	QVector<Row> _rows;
-
-	std::map<Result*, std::unique_ptr<ItemBase>> _inlineLayouts;
-
-	rpl::event_stream<> _inlineRowsCleared;
-
-	int _selected = -1;
-	int _pressed = -1;
-	QPoint _lastMousePos;
-
-	base::Timer _previewTimer;
-	bool _previewShown = false;
-
-	ResultSelected _resultSelectedCallback;
-
-};
-
-} // namespace internal
+struct CacheEntry;
+class Inner;
 
 class Widget : public Ui::RpWidget {
-
 public:
 	Widget(QWidget *parent, not_null<Window::SessionController*> controller);
+	~Widget();
 
 	void moveBottom(int bottom);
 
@@ -201,16 +69,13 @@ public:
 	void showAnimated();
 	void hideAnimated();
 
-	void setResultSelectedCallback(internal::ResultSelected callback) {
-		_inner->setResultSelectedCallback(std::move(callback));
-	}
+	void setResultSelectedCallback(Fn<void(ResultSelected)> callback);
+	void setCurrentDialogsEntryState(Dialogs::EntryState state);
 
 	[[nodiscard]] rpl::producer<bool> requesting() const {
 		return _requesting.events();
 	}
 
-	~Widget();
-
 protected:
 	void paintEvent(QPaintEvent *e) override;
 
@@ -273,9 +138,9 @@ private:
 	bool _inPanelGrab = false;
 
 	object_ptr<Ui::ScrollArea> _scroll;
-	QPointer<internal::Inner> _inner;
+	QPointer<Inner> _inner;
 
-	std::map<QString, std::unique_ptr<internal::CacheEntry>> _inlineCache;
+	std::map<QString, std::unique_ptr<CacheEntry>> _inlineCache;
 	base::Timer _inlineRequestTimer;
 
 	UserData *_inlineBot = nullptr;
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index fd25686f4..660026281 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -107,12 +107,12 @@ class Filler {
 public:
 	Filler(
 		not_null<SessionController*> controller,
-		PeerMenuRequest request,
+		Dialogs::EntryState request,
 		const PeerMenuCallback &addAction);
 	void fill();
 
 private:
-	using Source = PeerMenuRequest::Source;
+	using Section = Dialogs::EntryState::Section;
 
 	[[nodiscard]] bool showInfo();
 	[[nodiscard]] bool showHidePromotion();
@@ -128,36 +128,14 @@ private:
 	void addBlockUser(not_null<UserData*> user);
 	void addChatActions(not_null<ChatData*> chat);
 	void addChannelActions(not_null<ChannelData*> channel);
+	void addTogglesForArchive();
 
 	void addPollAction(not_null<PeerData*> peer);
 
 	not_null<SessionController*> _controller;
-	PeerMenuRequest _request;
-	not_null<PeerData*> _peer;
-	const PeerMenuCallback &_addAction;
-
-};
-
-class FolderFiller {
-public:
-	FolderFiller(
-		not_null<SessionController*> controller,
-		FolderMenuRequest request,
-		const PeerMenuCallback &addAction);
-	void fill();
-
-private:
-	void addTogglesForArchive();
-	//bool showInfo();
-	//void addTogglePin();
-	//void addInfo();
-	//void addSearch();
-	//void addNotifications();
-	//void addUngroup();
-
-	not_null<SessionController*> _controller;
-	FolderMenuRequest _request;
-	not_null<Data::Folder*> _folder;
+	Dialogs::EntryState _request;
+	PeerData *_peer = nullptr;
+	Data::Folder *_folder = nullptr;
 	const PeerMenuCallback &_addAction;
 
 };
@@ -277,16 +255,17 @@ void TogglePinnedDialog(
 
 Filler::Filler(
 	not_null<SessionController*> controller,
-	PeerMenuRequest request,
+	Dialogs::EntryState request,
 	const PeerMenuCallback &addAction)
 : _controller(controller)
 , _request(request)
-, _peer(request.peer)
+, _peer(request.key.peer())
+, _folder(request.key.folder())
 , _addAction(addAction) {
 }
 
 bool Filler::showInfo() {
-	if (_request.source == Source::Profile
+	if (_request.section == Section::Profile
 		|| _peer->isSelf()
 		|| _peer->isRepliesChat()) {
 		return false;
@@ -302,7 +281,7 @@ bool Filler::showInfo() {
 }
 
 bool Filler::showHidePromotion() {
-	if (_request.source != Source::ChatsList) {
+	if (_request.section != Section::ChatsList) {
 		return false;
 	}
 	const auto history = _peer->owner().historyLoaded(_peer);
@@ -312,7 +291,7 @@ bool Filler::showHidePromotion() {
 }
 
 bool Filler::showToggleArchived() {
-	if (_request.source != Source::ChatsList) {
+	if (_request.section != Section::ChatsList) {
 		return false;
 	}
 	const auto history = _peer->owner().historyLoaded(_peer);
@@ -325,7 +304,7 @@ bool Filler::showToggleArchived() {
 }
 
 bool Filler::showTogglePin() {
-	if (_request.source != Source::ChatsList) {
+	if (_request.section != Section::ChatsList) {
 		return false;
 	}
 	const auto history = _peer->owner().historyLoaded(_peer);
@@ -474,7 +453,7 @@ void Filler::addBlockUser(not_null<UserData*> user) {
 void Filler::addUserActions(not_null<UserData*> user) {
 	const auto controller = _controller;
 	const auto window = &_controller->window();
-	if (_request.source != Source::ChatsList) {
+	if (_request.section != Section::ChatsList) {
 		if (user->session().supportMode()) {
 			_addAction("Edit support info", [=] {
 				user->session().supportHelper().editInfo(controller, user);
@@ -522,13 +501,13 @@ void Filler::addUserActions(not_null<UserData*> user) {
 	if (!user->isInaccessible()
 		&& user != user->session().user()
 		&& !user->isRepliesChat()
-		&& _request.source != Source::ChatsList) {
+		&& _request.section != Section::ChatsList) {
 		addBlockUser(user);
 	}
 }
 
 void Filler::addChatActions(not_null<ChatData*> chat) {
-	if (_request.source != Source::ChatsList) {
+	if (_request.section != Section::ChatsList) {
 		const auto controller = _controller;
 		if (EditPeerInfoBox::Available(chat)) {
 			const auto text = tr::lng_manage_group_title(tr::now);
@@ -568,7 +547,7 @@ void Filler::addChannelActions(not_null<ChannelData*> channel) {
 	//			[=] { ToggleChannelGrouping(channel, !grouped); });
 	//	}
 	//}
-	if (_request.source != Source::ChatsList) {
+	if (_request.section != Section::ChatsList) {
 		if (channel->isBroadcast()) {
 			if (const auto chat = channel->linkedChat()) {
 				_addAction(tr::lng_profile_view_discussion(tr::now), [=] {
@@ -618,7 +597,7 @@ void Filler::addChannelActions(not_null<ChannelData*> channel) {
 			text,
 			[=] { channel->session().api().joinChannel(channel); });
 	}
-	if (_request.source != Source::ChatsList) {
+	if (_request.section != Section::ChatsList) {
 		const auto needReport = !channel->amCreator()
 			&& (!isGroup || channel->isPublic());
 		if (needReport) {
@@ -634,7 +613,7 @@ void Filler::addPollAction(not_null<PeerData*> peer) {
 		return;
 	}
 	const auto controller = _controller;
-	const auto source = (_request.source == Source::ScheduledSection)
+	const auto source = (_request.section == Section::Scheduled)
 		? Api::SendType::Scheduled
 		: Api::SendType::Normal;
 	const auto flag = PollData::Flags();
@@ -652,8 +631,11 @@ void Filler::addPollAction(not_null<PeerData*> peer) {
 }
 
 void Filler::fill() {
-	if (_request.source == Source::ScheduledSection
-		|| _request.source == Source::RepliesSection) {
+	if (_folder) {
+		addTogglesForArchive();
+		return;
+	} else if (_request.section == Section::Scheduled
+		|| _request.section == Section::Replies) {
 		addPollAction(_peer);
 		return;
 	}
@@ -669,10 +651,10 @@ void Filler::fill() {
 	if (showInfo()) {
 		addInfo();
 	}
-	if (_request.source != Source::Profile && !_peer->isSelf()) {
+	if (_request.section != Section::Profile && !_peer->isSelf()) {
 		PeerMenuAddMuteAction(_peer, _addAction);
 	}
-	if (_request.source == Source::ChatsList) {
+	if (_request.section == Section::ChatsList) {
 		//addSearch();
 		addToggleUnreadMark();
 	}
@@ -686,21 +668,9 @@ void Filler::fill() {
 	}
 }
 
-FolderFiller::FolderFiller(
-	not_null<SessionController*> controller,
-	FolderMenuRequest request,
-	const PeerMenuCallback &addAction)
-: _controller(controller)
-, _request(request)
-, _folder(request.folder)
-, _addAction(addAction) {
-}
+void Filler::addTogglesForArchive() {
+	Expects(_folder != nullptr);
 
-void FolderFiller::fill() {
-	addTogglesForArchive();
-}
-
-void FolderFiller::addTogglesForArchive() {
 	if (_folder->id() != Data::Folder::kId) {
 		return;
 	}
@@ -1310,20 +1280,11 @@ Fn<void()> DeleteAndLeaveHandler(not_null<PeerData*> peer) {
 	};
 }
 
-void FillPeerMenu(
+void FillDialogsEntryMenu(
 		not_null<SessionController*> controller,
-		PeerMenuRequest request,
+		Dialogs::EntryState request,
 		const PeerMenuCallback &callback) {
-	Filler filler(controller, request, callback);
-	filler.fill();
-}
-
-void FillFolderMenu(
-		not_null<SessionController*> controller,
-		FolderMenuRequest request,
-		const PeerMenuCallback &callback) {
-	FolderFiller filler(controller, request, callback);
-	filler.fill();
+	Filler(controller, request, callback).fill();
 }
 
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index a7944da05..fdaf60363 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -24,6 +24,7 @@ class Session;
 
 namespace Dialogs {
 class MainList;
+struct EntryState;
 } // namespace Dialogs
 
 namespace Window {
@@ -32,37 +33,13 @@ class Controller;
 class SessionController;
 class SessionNavigation;
 
-struct PeerMenuRequest {
-	enum class Source {
-		ChatsList,
-		History,
-		Profile,
-		ScheduledSection,
-		RepliesSection,
-	};
-
-	not_null<PeerData*> peer;
-	Source source = Source::ChatsList;
-	FilterId filterId = 0;
-	MsgId rootId = 0;
-	MsgId currentReplyToId = 0;
-};
-
-struct FolderMenuRequest {
-	not_null<Data::Folder*> folder;
-};
-
 using PeerMenuCallback = Fn<QAction*(
 	const QString &text,
 	Fn<void()> handler)>;
 
-void FillPeerMenu(
+void FillDialogsEntryMenu(
 	not_null<SessionController*> controller,
-	PeerMenuRequest request,
-	const PeerMenuCallback &addAction);
-void FillFolderMenu(
-	not_null<SessionController*> controller,
-	FolderMenuRequest request,
+	Dialogs::EntryState request,
 	const PeerMenuCallback &addAction);
 
 void PeerMenuAddMuteAction(

From 4a0efb9114caf8fba9cf4e517709e6c6efaec41a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 12 Nov 2020 19:19:04 +0300
Subject: [PATCH 096/370] Remove Q_OBJECT from HistoryWidget.

---
 .../SourceFiles/history/history_widget.cpp    | 187 ++++++++++--------
 Telegram/SourceFiles/history/history_widget.h |  79 ++++----
 .../history_view_compose_controls.cpp         |   8 +-
 .../controls/history_view_compose_controls.h  |   2 +-
 .../view/history_view_replies_section.cpp     |   8 -
 .../view/history_view_scheduled_section.cpp   |   8 -
 Telegram/SourceFiles/mainwidget.cpp           |   6 +-
 7 files changed, 150 insertions(+), 148 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 6de4d1f96..325f18aae 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -38,6 +38,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/send_button.h"
 #include "inline_bots/inline_bot_result.h"
 #include "base/event_filter.h"
+#include "base/qt_signal_producer.h"
 #include "base/unixtime.h"
 #include "base/call_delayed.h"
 #include "data/data_changes.h"
@@ -171,6 +172,7 @@ HistoryWidget::HistoryWidget(
 , _previewTimer([=] { requestPreview(); })
 , _topBar(this, controller)
 , _scroll(this, st::historyScroll, false)
+, _updateHistoryItems([=] { updateHistoryItemsByTimer(); })
 , _historyDown(_scroll, st::historyToDown)
 , _unreadMentions(_scroll, st::historyUnreadMentions)
 , _fieldAutocomplete(this, controller)
@@ -204,6 +206,10 @@ HistoryWidget::HistoryWidget(
 	Ui::InputField::Mode::MultiLine,
 	tr::lng_message_ph())
 , _kbScroll(this, st::botKbScroll)
+, _membersDropdownShowTimer([=] { showMembersDropdown(); })
+, _scrollTimer([=] { scrollByTimer(); })
+, _saveDraftTimer([=] { saveDraft(); })
+, _saveCloudDraftTimer([=] { saveCloudDraft(); })
 , _topShadow(this) {
 	setAcceptDrops(true);
 
@@ -212,7 +218,9 @@ HistoryWidget::HistoryWidget(
 		update();
 	}, lifetime());
 
-	connect(_scroll, SIGNAL(scrolled()), this, SLOT(onScroll()));
+	connect(_scroll, &Ui::ScrollArea::scrolled, [=] {
+		handleScroll();
+	});
 	_historyDown->addClickHandler([=] { historyDownClicked(); });
 	_unreadMentions->addClickHandler([=] { showNextUnreadMention(); });
 	_fieldBarCancel->addClickHandler([=] { cancelFieldAreaState(); });
@@ -235,12 +243,21 @@ HistoryWidget::HistoryWidget(
 	connect(_field, &Ui::InputField::cancelled, [=] {
 		escape();
 	});
-	connect(_field, SIGNAL(tabbed()), this, SLOT(onFieldTabbed()));
-	connect(_field, SIGNAL(resized()), this, SLOT(onFieldResize()));
-	connect(_field, SIGNAL(focused()), this, SLOT(onFieldFocused()));
-	connect(_field, SIGNAL(changed()), this, SLOT(onTextChange()));
-	connect(App::wnd()->windowHandle(), SIGNAL(visibleChanged(bool)), this, SLOT(onWindowVisibleChanged()));
-	connect(&_scrollTimer, SIGNAL(timeout()), this, SLOT(onScrollTimer()));
+	connect(_field, &Ui::InputField::tabbed, [=] {
+		fieldTabbed();
+	});
+	connect(_field, &Ui::InputField::resized, [=] {
+		fieldResized();
+	});
+	connect(_field, &Ui::InputField::focused, [=] {
+		fieldFocused();
+	});
+	connect(_field, &Ui::InputField::changed, [=] {
+		fieldChanged();
+	});
+	connect(App::wnd()->windowHandle(), &QWindow::visibleChanged, this, [=] {
+		windowIsVisibleChanged();
+	});
 
 	initTabbedSelector();
 
@@ -249,26 +266,21 @@ HistoryWidget::HistoryWidget(
 		this,
 		[=] { chooseAttach(); }));
 
-	_updateHistoryItems.setSingleShot(true);
-	connect(&_updateHistoryItems, SIGNAL(timeout()), this, SLOT(onUpdateHistoryItems()));
-
-	_scrollTimer.setSingleShot(false);
-
 	_highlightTimer.setCallback([this] { updateHighlightedMessage(); });
 
-	_membersDropdownShowTimer.setSingleShot(true);
-	connect(&_membersDropdownShowTimer, SIGNAL(timeout()), this, SLOT(onMembersDropdownShow()));
-
-	_saveDraftTimer.setSingleShot(true);
-	connect(&_saveDraftTimer, SIGNAL(timeout()), this, SLOT(onDraftSave()));
-	_saveCloudDraftTimer.setSingleShot(true);
-	connect(&_saveCloudDraftTimer, SIGNAL(timeout()), this, SLOT(onCloudDraftSave()));
-	_field->scrollTop().changes(
+	const auto rawTextEdit = _field->rawTextEdit().get();
+	rpl::merge(
+		_field->scrollTop().changes() | rpl::to_empty,
+		base::qt_signal_producer(
+			rawTextEdit,
+			&QTextEdit::cursorPositionChanged)
 	) | rpl::start_with_next([=] {
-		onDraftSaveDelayed();
+		saveDraftDelayed();
 	}, _field->lifetime());
-	connect(_field->rawTextEdit(), SIGNAL(cursorPositionChanged()), this, SLOT(onDraftSaveDelayed()));
-	connect(_field->rawTextEdit(), SIGNAL(cursorPositionChanged()), this, SLOT(onCheckFieldAutocomplete()), Qt::QueuedConnection);
+
+	connect(rawTextEdit, &QTextEdit::cursorPositionChanged, this, [=] {
+		checkFieldAutocomplete();
+	}, Qt::QueuedConnection);
 
 	_fieldBarCancel->hide();
 
@@ -289,17 +301,17 @@ HistoryWidget::HistoryWidget(
 
 	_fieldAutocomplete->mentionChosen(
 	) | rpl::start_with_next([=](FieldAutocomplete::MentionChosen data) {
-		onMentionInsert(data.user);
+		insertMention(data.user);
 	}, lifetime());
 
 	_fieldAutocomplete->hashtagChosen(
 	) | rpl::start_with_next([=](FieldAutocomplete::HashtagChosen data) {
-		onHashtagOrBotCommandInsert(data.hashtag, data.method);
+		insertHashtagOrBotCommand(data.hashtag, data.method);
 	}, lifetime());
 
 	_fieldAutocomplete->botCommandChosen(
 	) | rpl::start_with_next([=](FieldAutocomplete::BotCommandChosen data) {
-		onHashtagOrBotCommandInsert(data.command, data.method);
+		insertHashtagOrBotCommand(data.command, data.method);
 	}, lifetime());
 
 	_fieldAutocomplete->stickerChosen(
@@ -459,7 +471,7 @@ HistoryWidget::HistoryWidget(
 		return _peer && (_peer == user || !_peer->isUser());
 	}) | rpl::start_with_next([=](not_null<UserData*> user) {
 		if (_fieldAutocomplete->clearFilteredBotCommands()) {
-			onCheckFieldAutocomplete();
+			checkFieldAutocomplete();
 		}
 	}, lifetime());
 
@@ -676,7 +688,7 @@ HistoryWidget::HistoryWidget(
 		} else {
 			fastShowAtEnd(action.history);
 			if (cancelReply(lastKeyboardUsed) && !action.clearDraft) {
-				onCloudDraftSave();
+				saveCloudDraft();
 			}
 		}
 		if (action.options.handleSupportSwitch) {
@@ -1126,7 +1138,7 @@ void HistoryWidget::start() {
 	});
 }
 
-void HistoryWidget::onMentionInsert(UserData *user) {
+void HistoryWidget::insertMention(UserData *user) {
 	QString replacement, entityTag;
 	if (user->username.isEmpty()) {
 		replacement = user->firstName;
@@ -1140,7 +1152,7 @@ void HistoryWidget::onMentionInsert(UserData *user) {
 	_field->insertTag(replacement, entityTag);
 }
 
-void HistoryWidget::onHashtagOrBotCommandInsert(
+void HistoryWidget::insertHashtagOrBotCommand(
 		QString str,
 		FieldAutocomplete::ChooseMethod method) {
 	if (!_peer) {
@@ -1270,7 +1282,7 @@ void HistoryWidget::updateStickersByEmoji() {
 	_fieldAutocomplete->showStickers(emoji);
 }
 
-void HistoryWidget::onTextChange() {
+void HistoryWidget::fieldChanged() {
 	InvokeQueued(this, [=] {
 		updateInlineBotQuery();
 		updateStickersByEmoji();
@@ -1295,16 +1307,16 @@ void HistoryWidget::onTextChange() {
 		updateControlsGeometry();
 	}
 
-	_saveCloudDraftTimer.stop();
+	_saveCloudDraftTimer.cancel();
 	if (!_peer || !(_textUpdateEvents & TextUpdateEvent::SaveDraft)) {
 		return;
 	}
 
 	_saveDraftText = true;
-	onDraftSave(true);
+	saveDraft(true);
 }
 
-void HistoryWidget::onDraftSaveDelayed() {
+void HistoryWidget::saveDraftDelayed() {
 	if (!_peer || !(_textUpdateEvents & TextUpdateEvent::SaveDraft)) {
 		return;
 	}
@@ -1315,18 +1327,18 @@ void HistoryWidget::onDraftSaveDelayed() {
 			return;
 		}
 	}
-	onDraftSave(true);
+	saveDraft(true);
 }
 
-void HistoryWidget::onDraftSave(bool delayed) {
+void HistoryWidget::saveDraft(bool delayed) {
 	if (!_peer) return;
 	if (delayed) {
 		auto ms = crl::now();
 		if (!_saveDraftStart) {
 			_saveDraftStart = ms;
-			return _saveDraftTimer.start(kSaveDraftTimeout);
+			return _saveDraftTimer.callOnce(kSaveDraftTimeout);
 		} else if (ms - _saveDraftStart < kSaveDraftAnywayTimeout) {
-			return _saveDraftTimer.start(kSaveDraftTimeout);
+			return _saveDraftTimer.callOnce(kSaveDraftTimeout);
 		}
 	}
 	writeDrafts(nullptr, nullptr);
@@ -1347,7 +1359,7 @@ void HistoryWidget::saveFieldToHistoryLocalDraft() {
 	}
 }
 
-void HistoryWidget::onCloudDraftSave() {
+void HistoryWidget::saveCloudDraft() {
 	controller()->session().api().saveCurrentDraftToCloud();
 }
 
@@ -1357,7 +1369,7 @@ void HistoryWidget::writeDrafts(Data::Draft **localDraft, Data::Draft **editDraf
 
 	bool save = _peer && (_saveDraftStart > 0);
 	_saveDraftStart = 0;
-	_saveDraftTimer.stop();
+	_saveDraftTimer.cancel();
 	if (_saveDraftText) {
 		if (save) {
 			Storage::MessageDraft storedLocalDraft, storedEditDraft;
@@ -1421,7 +1433,7 @@ void HistoryWidget::writeDrafts(Data::Draft **localDraft, Data::Draft **editDraf
 	}
 
 	if (!_editMsgId && !_inlineBot) {
-		_saveCloudDraftTimer.start(kSaveCloudDraftIdleTimeout);
+		_saveCloudDraftTimer.callOnce(kSaveCloudDraftIdleTimeout);
 	}
 }
 
@@ -1800,7 +1812,7 @@ void HistoryWidget::showHistory(
 	_previewCache.clear();
 	_fieldBarCancel->hide();
 
-	_membersDropdownShowTimer.stop();
+	_membersDropdownShowTimer.cancel();
 	_scroll->takeWidget<HistoryInner>().destroy();
 
 	clearInlineBot();
@@ -1883,7 +1895,7 @@ void HistoryWidget::showHistory(
 			object_ptr<HistoryInner>(this, _scroll, controller(), _history));
 		_list->show();
 
-		_updateHistoryItems.stop();
+		_updateHistoryItems.cancel();
 
 		setupPinnedTracker();
 		if (_history->scrollTopItem
@@ -2174,7 +2186,7 @@ void HistoryWidget::updateControlsVisibility() {
 			update();
 		}
 	} else if (editingMessage() || _canSendMessages) {
-		onCheckFieldAutocomplete();
+		checkFieldAutocomplete();
 		_unblock->hide();
 		_botStart->hide();
 		_joinChannel->hide();
@@ -2351,7 +2363,7 @@ void HistoryWidget::unreadCountUpdated() {
 		crl::on_main(this, [=, history = _history] {
 			if (history == _history) {
 				controller()->showBackFromStack();
-				emit cancelled();
+				_cancelRequests.fire({});
 			}
 		});
 	} else {
@@ -2784,7 +2796,7 @@ void HistoryWidget::delayedShowAt(MsgId showAtMsgId) {
 	});
 }
 
-void HistoryWidget::onScroll() {
+void HistoryWidget::handleScroll() {
 	preloadHistoryIfNeeded();
 	visibleAreaUpdated();
 	updatePinnedViewer();
@@ -2892,7 +2904,7 @@ void HistoryWidget::checkReplyReturns() {
 	}
 }
 
-void HistoryWidget::onInlineBotCancel() {
+void HistoryWidget::cancelInlineBot() {
 	auto &textWithTags = _field->getTextWithTags();
 	if (textWithTags.text.size() > _inlineBotUsername.size() + 2) {
 		setFieldText(
@@ -2906,8 +2918,10 @@ void HistoryWidget::onInlineBotCancel() {
 	}
 }
 
-void HistoryWidget::onWindowVisibleChanged() {
-	QTimer::singleShot(0, this, SLOT(preloadHistoryIfNeeded()));
+void HistoryWidget::windowIsVisibleChanged() {
+	InvokeQueued(this, [=] {
+		preloadHistoryIfNeeded();
+	});
 }
 
 void HistoryWidget::historyDownClicked() {
@@ -3100,7 +3114,7 @@ void HistoryWidget::send(Api::SendOptions options) {
 	clearFieldText();
 	_saveDraftText = true;
 	_saveDraftStart = crl::now();
-	onDraftSave();
+	saveDraft();
 
 	hideSelectorControlsAnimated();
 
@@ -3376,7 +3390,7 @@ void HistoryWidget::chooseAttach() {
 void HistoryWidget::sendButtonClicked() {
 	const auto type = _send->type();
 	if (type == Ui::SendButton::Type::Cancel) {
-		onInlineBotCancel();
+		cancelInlineBot();
 	} else if (type != Ui::SendButton::Type::Record) {
 		send({});
 	}
@@ -3444,7 +3458,7 @@ void HistoryWidget::sendBotCommand(
 	if (replyTo) {
 		if (_replyToId == replyTo) {
 			cancelReply();
-			onCloudDraftSave();
+			saveCloudDraft();
 		}
 		if (_keyboard->singleUse() && _keyboard->hasMarkup() && lastKeyboardUsed) {
 			if (_kbShown) toggleKeyboard(false);
@@ -3462,7 +3476,7 @@ void HistoryWidget::hideSingleUseKeyboard(PeerData *peer, MsgId replyTo) {
 	if (replyTo) {
 		if (_replyToId == replyTo) {
 			cancelReply();
-			onCloudDraftSave();
+			saveCloudDraft();
 		}
 		if (_keyboard->singleUse() && _keyboard->hasMarkup() && lastKeyboardUsed) {
 			if (_kbShown) toggleKeyboard(false);
@@ -3795,20 +3809,20 @@ void HistoryWidget::startBotCommand() {
 
 void HistoryWidget::setMembersShowAreaActive(bool active) {
 	if (!active) {
-		_membersDropdownShowTimer.stop();
+		_membersDropdownShowTimer.cancel();
 	}
 	if (active && _peer && (_peer->isChat() || _peer->isMegagroup())) {
 		if (_membersDropdown) {
 			_membersDropdown->otherEnter();
 		} else if (!_membersDropdownShowTimer.isActive()) {
-			_membersDropdownShowTimer.start(kShowMembersDropdownTimeoutMs);
+			_membersDropdownShowTimer.callOnce(kShowMembersDropdownTimeoutMs);
 		}
 	} else if (_membersDropdown) {
 		_membersDropdown->otherLeave();
 	}
 }
 
-void HistoryWidget::onMembersDropdownShow() {
+void HistoryWidget::showMembersDropdown() {
 	if (!_peer) {
 		return;
 	}
@@ -3981,7 +3995,7 @@ void HistoryWidget::clearInlineBot() {
 	if (_inlineResults) {
 		_inlineResults->clearInlineBot();
 	}
-	onCheckFieldAutocomplete();
+	checkFieldAutocomplete();
 }
 
 void HistoryWidget::inlineBotChanged() {
@@ -3994,19 +4008,19 @@ void HistoryWidget::inlineBotChanged() {
 	}
 }
 
-void HistoryWidget::onFieldResize() {
+void HistoryWidget::fieldResized() {
 	moveFieldControls();
 	updateHistoryGeometry();
 	updateField();
 }
 
-void HistoryWidget::onFieldFocused() {
+void HistoryWidget::fieldFocused() {
 	if (_list) {
 		_list->clearSelected(true);
 	}
 }
 
-void HistoryWidget::onCheckFieldAutocomplete() {
+void HistoryWidget::checkFieldAutocomplete() {
 	if (!_history || _a_show.animating()) {
 		return;
 	}
@@ -4357,19 +4371,22 @@ bool HistoryWidget::skipItemRepaint() {
 	if (_lastScrolled + kSkipRepaintWhileScrollMs <= ms) {
 		return false;
 	}
-	_updateHistoryItems.start(
+	_updateHistoryItems.callOnce(
 		_lastScrolled + kSkipRepaintWhileScrollMs - ms);
 	return true;
 }
 
-void HistoryWidget::onUpdateHistoryItems() {
-	if (!_list) return;
+void HistoryWidget::updateHistoryItemsByTimer() {
+	if (!_list) {
+		return;
+	}
 
 	auto ms = crl::now();
 	if (_lastScrolled + kSkipRepaintWhileScrollMs <= ms) {
 		_list->update();
 	} else {
-		_updateHistoryItems.start(_lastScrolled + kSkipRepaintWhileScrollMs - ms);
+		_updateHistoryItems.callOnce(
+			_lastScrolled + kSkipRepaintWhileScrollMs - ms);
 	}
 }
 
@@ -4945,7 +4962,7 @@ void HistoryWidget::keyPressEvent(QKeyEvent *e) {
 		e->ignore();
 	} else if (e->key() == Qt::Key_Back) {
 		controller()->showBackFromStack();
-		emit cancelled();
+		_cancelRequests.fire({});
 	} else if (e->key() == Qt::Key_PageDown) {
 		_scroll->keyPressEvent(e);
 	} else if (e->key() == Qt::Key_PageUp) {
@@ -5089,7 +5106,7 @@ bool HistoryWidget::showSlowmodeError() {
 	return true;
 }
 
-void HistoryWidget::onFieldTabbed() {
+void HistoryWidget::fieldTabbed() {
 	if (_supportAutocomplete) {
 		_supportAutocomplete->activate(_field.data());
 	} else if (!_fieldAutocomplete->isHidden()) {
@@ -5119,7 +5136,7 @@ void HistoryWidget::sendInlineResult(InlineBots::ResultSelected result) {
 	clearFieldText();
 	_saveDraftText = true;
 	_saveDraftStart = crl::now();
-	onDraftSave();
+	saveDraft();
 
 	auto &bots = cRefRecentInlineBots();
 	const auto index = bots.indexOf(result.bot);
@@ -5368,8 +5385,8 @@ bool HistoryWidget::sendExistingDocument(
 		clearFieldText();
 		//_saveDraftText = true;
 		//_saveDraftStart = crl::now();
-		//onDraftSave();
-		onCloudDraftSave(); // won't be needed if SendInlineBotResult will clear the cloud draft
+		//saveDraft();
+		saveCloudDraft(); // won't be needed if SendInlineBotResult will clear the cloud draft
 	}
 
 	hideSelectorControlsAnimated();
@@ -5506,7 +5523,7 @@ void HistoryWidget::replyToMessage(not_null<HistoryItem*> item) {
 
 	_saveDraftText = true;
 	_saveDraftStart = crl::now();
-	onDraftSave();
+	saveDraft();
 
 	_field->setFocus();
 }
@@ -5572,7 +5589,7 @@ void HistoryWidget::editMessage(not_null<HistoryItem*> item) {
 
 	_saveDraftText = true;
 	_saveDraftStart = crl::now();
-	onDraftSave();
+	saveDraft();
 
 	_field->setFocus();
 }
@@ -5643,7 +5660,7 @@ bool HistoryWidget::cancelReply(bool lastKeyboardUsed) {
 	if (wasReply) {
 		_saveDraftText = true;
 		_saveDraftStart = crl::now();
-		onDraftSave();
+		saveDraft();
 	}
 	if (!_editMsgId
 		&& _keyboard->singleUse()
@@ -5658,7 +5675,7 @@ bool HistoryWidget::cancelReply(bool lastKeyboardUsed) {
 
 void HistoryWidget::cancelReplyAfterMediaSend(bool lastKeyboardUsed) {
 	if (cancelReply(lastKeyboardUsed)) {
-		onCloudDraftSave();
+		saveCloudDraft();
 	}
 }
 
@@ -5686,7 +5703,7 @@ void HistoryWidget::cancelEdit() {
 
 	_saveDraftText = true;
 	_saveDraftStart = crl::now();
-	onDraftSave();
+	saveDraft();
 
 	mouseMoveEvent(nullptr);
 	if (!readyToForward() && (!_previewData || _previewData->pendingTill < 0) && !replyToId()) {
@@ -5696,7 +5713,7 @@ void HistoryWidget::cancelEdit() {
 
 	auto old = _textUpdateEvents;
 	_textUpdateEvents = 0;
-	onTextChange();
+	fieldChanged();
 	_textUpdateEvents = old;
 
 	if (!canWriteMessage()) {
@@ -5718,7 +5735,7 @@ void HistoryWidget::cancelFieldAreaState() {
 
 		_saveDraftText = true;
 		_saveDraftStart = crl::now();
-		onDraftSave();
+		saveDraft();
 	} else if (_editMsgId) {
 		cancelEdit();
 	} else if (readyToForward()) {
@@ -5878,7 +5895,7 @@ void HistoryWidget::fullPeerUpdated(PeerData *peer) {
 			refreshSilentToggle();
 			refresh = true;
 		}
-		onCheckFieldAutocomplete();
+		checkFieldAutocomplete();
 		_list->updateBotInfo();
 
 		handlePeerUpdate();
@@ -5967,7 +5984,7 @@ void HistoryWidget::escape() {
 	if (_nonEmptySelection && _list) {
 		clearSelected();
 	} else if (_isInlineBot) {
-		onInlineBotCancel();
+		cancelInlineBot();
 	} else if (_editMsgId) {
 		if (_replyEditMsg
 			&& PrepareEditText(_replyEditMsg) != _field->getTextWithTags()) {
@@ -5989,7 +6006,7 @@ void HistoryWidget::escape() {
 	} else if (_replyToId && _field->getTextWithTags().text.isEmpty()) {
 		cancelReply();
 	} else {
-		emit cancelled();
+		_cancelRequests.fire({});
 	}
 }
 
@@ -6460,8 +6477,10 @@ QPoint HistoryWidget::clampMousePosition(QPoint point) {
 	return point;
 }
 
-void HistoryWidget::onScrollTimer() {
-	auto d = (_scrollDelta > 0) ? qMin(_scrollDelta * 3 / 20 + 1, int32(Ui::kMaxScrollSpeed)) : qMax(_scrollDelta * 3 / 20 - 1, -int32(Ui::kMaxScrollSpeed));
+void HistoryWidget::scrollByTimer() {
+	const auto d = (_scrollDelta > 0)
+		? qMin(_scrollDelta * 3 / 20 + 1, int32(Ui::kMaxScrollSpeed))
+		: qMax(_scrollDelta * 3 / 20 - 1, -int32(Ui::kMaxScrollSpeed));
 	_scroll->scrollToY(_scroll->scrollTop() + d);
 }
 
@@ -6474,14 +6493,14 @@ void HistoryWidget::checkSelectingScroll(QPoint point) {
 		_scrollDelta = 0;
 	}
 	if (_scrollDelta) {
-		_scrollTimer.start(15);
+		_scrollTimer.callEach(15);
 	} else {
-		_scrollTimer.stop();
+		_scrollTimer.cancel();
 	}
 }
 
 void HistoryWidget::noSelectingScroll() {
-	_scrollTimer.stop();
+	_scrollTimer.cancel();
 }
 
 bool HistoryWidget::touchScroll(const QPoint &delta) {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index bad3b769d..0f6b22add 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -108,8 +108,6 @@ class HistoryInner;
 struct HistoryMessageMarkupButton;
 
 class HistoryWidget final : public Window::AbstractSectionWidget {
-	Q_OBJECT
-
 public:
 	using FieldHistoryAction = Ui::InputField::HistoryAction;
 	using RecordLock = HistoryView::Controls::RecordLock;
@@ -241,7 +239,11 @@ public:
 
 	void updateFieldSubmitSettings();
 
+	void activate();
 	void setInnerFocus();
+	[[nodiscard]] rpl::producer<> cancelRequests() const {
+		return _cancelRequests.events();
+	}
 
 	void updateNotifyControls();
 
@@ -290,40 +292,6 @@ protected:
 	void mouseReleaseEvent(QMouseEvent *e) override;
 	void mouseMoveEvent(QMouseEvent *e) override;
 
-signals:
-	void cancelled();
-
-public slots:
-	void onScroll();
-
-	void activate();
-	void onTextChange();
-
-	void onFieldTabbed();
-
-	void onWindowVisibleChanged();
-
-	void onFieldFocused();
-	void onFieldResize();
-	void onCheckFieldAutocomplete();
-	void onScrollTimer();
-
-	void onDraftSaveDelayed();
-	void onDraftSave(bool delayed = false);
-	void onCloudDraftSave();
-
-	void onUpdateHistoryItems();
-
-	// checks if we are too close to the top or to the bottom
-	// in the scroll area and preloads history if needed
-	void preloadHistoryIfNeeded();
-
-private slots:
-	void onHashtagOrBotCommandInsert(QString str, FieldAutocomplete::ChooseMethod method);
-	void onMentionInsert(UserData *user);
-	void onInlineBotCancel();
-	void onMembersDropdownShow();
-
 private:
 	using TabbedPanel = ChatHelpers::TabbedPanel;
 	using TabbedSelector = ChatHelpers::TabbedSelector;
@@ -353,6 +321,30 @@ private:
 	void createTabbedPanel();
 	void setTabbedPanel(std::unique_ptr<TabbedPanel> panel);
 	void updateField();
+	void fieldChanged();
+	void fieldTabbed();
+	void fieldFocused();
+	void fieldResized();
+
+	void insertHashtagOrBotCommand(
+		QString str,
+		FieldAutocomplete::ChooseMethod method);
+	void insertMention(UserData *user);
+	void cancelInlineBot();
+	void saveDraft(bool delayed = false);
+	void saveCloudDraft();
+	void saveDraftDelayed();
+	void checkFieldAutocomplete();
+	void showMembersDropdown();
+	void windowIsVisibleChanged();
+
+	// Checks if we are too close to the top or to the bottom
+	// in the scroll area and preloads history if needed.
+	void preloadHistoryIfNeeded();
+
+	void handleScroll();
+	void scrollByTimer();
+	void updateHistoryItemsByTimer();
 
 	[[nodiscard]] Dialogs::EntryState computeDialogsEntryState() const;
 	void refreshTopBarActiveChat();
@@ -580,6 +572,8 @@ private:
 	void setupScheduledToggle();
 	void refreshScheduledToggle();
 
+	bool kbWasHidden() const;
+
 	MTP::Sender _api;
 	MsgId _replyToId = 0;
 	Ui::Text::String _replyToName;
@@ -648,7 +642,7 @@ private:
 
 	int _lastScrollTop = 0; // gifs optimization
 	crl::time _lastScrolled = 0;
-	QTimer _updateHistoryItems;
+	base::Timer _updateHistoryItems;
 
 	crl::time _lastUserScrolled = 0;
 	bool _synteticScrollEvent = false;
@@ -692,15 +686,13 @@ private:
 	bool _inReplyEditForward = false;
 	bool _inClickable = false;
 
-	bool kbWasHidden() const;
-
 	bool _kbShown = false;
 	HistoryItem *_kbReplyTo = nullptr;
 	object_ptr<Ui::ScrollArea> _kbScroll;
 	QPointer<BotKeyboard> _keyboard;
 
 	object_ptr<Ui::InnerDropdown> _membersDropdown = { nullptr };
-	QTimer _membersDropdownShowTimer;
+	base::Timer _membersDropdownShowTimer;
 
 	object_ptr<InlineBots::Layout::Widget> _inlineResults = { nullptr };
 	std::unique_ptr<TabbedPanel> _tabbedPanel;
@@ -719,7 +711,7 @@ private:
 	Window::SlideDirection _showDirection;
 	QPixmap _cacheUnder, _cacheOver;
 
-	QTimer _scrollTimer;
+	base::Timer _scrollTimer;
 	int32 _scrollDelta = 0;
 
 	MsgId _highlightedMessageId = 0;
@@ -729,7 +721,8 @@ private:
 
 	crl::time _saveDraftStart = 0;
 	bool _saveDraftText = false;
-	QTimer _saveDraftTimer, _saveCloudDraftTimer;
+	base::Timer _saveDraftTimer;
+	base::Timer _saveCloudDraftTimer;
 
 	base::weak_ptr<Ui::Toast::Instance> _topToast;
 
@@ -738,4 +731,6 @@ private:
 
 	int _topDelta = 0;
 
+	rpl::event_stream<> _cancelRequests;
+
 };
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index fd852a95d..ba71b97f3 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -762,8 +762,8 @@ void ComposeControls::setText(const TextWithTags &textWithTags) {
 	auto cursor = _field->textCursor();
 	cursor.movePosition(QTextCursor::End);
 	_field->setTextCursor(cursor);
-	_textUpdateEvents = /*TextUpdateEvent::SaveDraft
-		| */TextUpdateEvent::SendTyping;
+	_textUpdateEvents = TextUpdateEvent::SaveDraft
+		| TextUpdateEvent::SendTyping;
 
 	//previewCancel();
 	//_previewCancelled = false;
@@ -978,8 +978,8 @@ void ComposeControls::initAutocomplete() {
 		setText({});
 		//_saveDraftText = true;
 		//_saveDraftStart = crl::now();
-		//onDraftSave();
-		//onCloudDraftSave(); // won't be needed if SendInlineBotResult will clear the cloud draft
+		//saveDraft();
+		//saveCloudDraft(); // won't be needed if SendInlineBotResult will clear the cloud draft
 		_fileChosen.fire(FileChosen{
 			.document = data.sticker,
 			.options = data.options,
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 5b6200862..01e148585 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -150,7 +150,7 @@ public:
 
 private:
 	enum class TextUpdateEvent {
-		//SaveDraft = (1 << 0),
+		SaveDraft = (1 << 0),
 		SendTyping = (1 << 1),
 	};
 	using TextUpdateEvents = base::flags<TextUpdateEvent>;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index b7135f1be..a076837d6 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1034,14 +1034,6 @@ bool RepliesWidget::sendExistingDocument(
 	message.action.options = options;
 	Api::SendExistingDocument(std::move(message), document);
 
-	//if (_fieldAutocomplete->stickersShown()) {
-	//	clearFieldText();
-	//	//_saveDraftText = true;
-	//	//_saveDraftStart = crl::now();
-	//	//onDraftSave();
-	//	onCloudDraftSave(); // won't be needed if SendInlineBotResult will clear the cloud draft
-	//}
-
 	_composeControls->cancelReplyMessage();
 	finishSending();
 	return true;
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 15741b1d8..4e09b1040 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -673,14 +673,6 @@ bool ScheduledWidget::sendExistingDocument(
 	message.action.options = options;
 	Api::SendExistingDocument(std::move(message), document);
 
-	//if (_fieldAutocomplete->stickersShown()) {
-	//	clearFieldText();
-	//	//_saveDraftText = true;
-	//	//_saveDraftStart = crl::now();
-	//	//onDraftSave();
-	//	onCloudDraftSave(); // won't be needed if SendInlineBotResult will clear the cloud draft
-	//}
-
 	_composeControls->hidePanelsAnimated();
 	_composeControls->focus();
 	return true;
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 8c67fcfcc..4c47f3421 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -244,7 +244,11 @@ MainWidget::MainWidget(
 	setupConnectingWidget();
 
 	connect(_dialogs, SIGNAL(cancelled()), this, SLOT(dialogsCancelled()));
-	connect(_history, &HistoryWidget::cancelled, [=] { handleHistoryBack(); });
+
+	_history->cancelRequests(
+	) | rpl::start_with_next([=] {
+		handleHistoryBack();
+	}, lifetime());
 
 	Core::App().calls().currentCallValue(
 	) | rpl::start_with_next([=](Calls::Call *call) {

From b3eb7858e61254734ffb95652a7264cad72fde8e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 13 Nov 2020 20:27:08 +0300
Subject: [PATCH 097/370] Save local drafts in scheduled / replies sections.

Fix inline bot switch inline in scheduled / replies sections.
---
 Telegram/SourceFiles/apiwrap.cpp              |  16 +-
 Telegram/SourceFiles/data/data_drafts.h       |  71 +++
 Telegram/SourceFiles/history/history.cpp      |  98 ++--
 Telegram/SourceFiles/history/history.h        |  49 +-
 .../SourceFiles/history/history_widget.cpp    | 148 +++---
 Telegram/SourceFiles/history/history_widget.h |   9 +-
 .../history_view_compose_controls.cpp         | 431 ++++++++++++++---
 .../controls/history_view_compose_controls.h  |  46 +-
 .../view/history_view_replies_section.cpp     |   2 +-
 Telegram/SourceFiles/mainwidget.cpp           |   4 +-
 .../platform/win/window_title_win.cpp         |   2 +
 .../platform/win/windows_event_filter.cpp     |  58 ++-
 .../SourceFiles/storage/storage_account.cpp   | 442 ++++++++++++------
 .../SourceFiles/storage/storage_account.h     |  35 +-
 .../SourceFiles/window/window_peer_menu.cpp   |   4 +-
 15 files changed, 1025 insertions(+), 390 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index d21aec624..0f6ee2581 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -2441,16 +2441,14 @@ void ApiWrap::saveCurrentDraftToCloud() {
 	Core::App().saveCurrentDraftsToHistories();
 
 	for (const auto controller : _session->windows()) {
-		if (const auto peer = controller->activeChatCurrent().peer()) {
-			if (const auto history = _session->data().historyLoaded(peer)) {
-				_session->local().writeDrafts(history);
+		if (const auto history = controller->activeChatCurrent().history()) {
+			_session->local().writeDrafts(history);
 
-				const auto localDraft = history->localDraft();
-				const auto cloudDraft = history->cloudDraft();
-				if (!Data::draftsAreEqual(localDraft, cloudDraft)
-					&& !_session->supportMode()) {
-					saveDraftToCloudDelayed(history);
-				}
+			const auto localDraft = history->localDraft();
+			const auto cloudDraft = history->cloudDraft();
+			if (!Data::draftsAreEqual(localDraft, cloudDraft)
+				&& !_session->supportMode()) {
+				saveDraftToCloudDelayed(history);
 			}
 		}
 	}
diff --git a/Telegram/SourceFiles/data/data_drafts.h b/Telegram/SourceFiles/data/data_drafts.h
index 57428e62e..b797cb3d3 100644
--- a/Telegram/SourceFiles/data/data_drafts.h
+++ b/Telegram/SourceFiles/data/data_drafts.h
@@ -48,6 +48,77 @@ struct Draft {
 	mtpRequestId saveRequestId = 0;
 };
 
+class DraftKey {
+public:
+	[[nodiscard]] static DraftKey None() {
+		return 0;
+	}
+	[[nodiscard]] static DraftKey Local() {
+		return kLocalDraftIndex;
+	}
+	[[nodiscard]] static DraftKey LocalEdit() {
+		return kLocalDraftIndex + kEditDraftShift;
+	}
+	[[nodiscard]] static DraftKey Cloud() {
+		return kCloudDraftIndex;
+	}
+	[[nodiscard]] static DraftKey Scheduled() {
+		return kScheduledDraftIndex;
+	}
+	[[nodiscard]] static DraftKey ScheduledEdit() {
+		return kScheduledDraftIndex + kEditDraftShift;
+	}
+	[[nodiscard]] static DraftKey Replies(MsgId rootId) {
+		return rootId;
+	}
+	[[nodiscard]] static DraftKey RepliesEdit(MsgId rootId) {
+		return rootId + kEditDraftShift;
+	}
+
+	[[nodiscard]] static DraftKey FromSerialized(int32 value) {
+		return value;
+	}
+	[[nodiscard]] int32 serialize() const {
+		return _value;
+	}
+
+	inline bool operator<(const DraftKey &other) const {
+		return _value < other._value;
+	}
+	inline bool operator==(const DraftKey &other) const {
+		return _value == other._value;
+	}
+	inline bool operator>(const DraftKey &other) const {
+		return (other < *this);
+	}
+	inline bool operator<=(const DraftKey &other) const {
+		return !(other < *this);
+	}
+	inline bool operator>=(const DraftKey &other) const {
+		return !(*this < other);
+	}
+	inline bool operator!=(const DraftKey &other) const {
+		return !(*this == other);
+	}
+	inline explicit operator bool() const {
+		return _value != 0;
+	}
+
+private:
+	DraftKey(int value) : _value(value) {
+	}
+
+	static constexpr auto kLocalDraftIndex = -1;
+	static constexpr auto kCloudDraftIndex = -2;
+	static constexpr auto kScheduledDraftIndex = -3;
+	static constexpr auto kEditDraftShift = ServerMaxMsgId;
+
+	int _value = 0;
+
+};
+
+using HistoryDrafts = base::flat_map<DraftKey, std::unique_ptr<Draft>>;
+
 inline bool draftStringIsEmpty(const QString &text) {
 	for_const (auto ch, text) {
 		if (!ch.isSpace()) {
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 8e999053b..9cc17dac8 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -179,22 +179,22 @@ void History::itemVanished(not_null<HistoryItem*> item) {
 	}
 }
 
-void History::setLocalDraft(std::unique_ptr<Data::Draft> &&draft) {
-	_localDraft = std::move(draft);
-}
-
-void History::takeLocalDraft(History *from) {
-	if (auto &draft = from->_localDraft) {
-		if (!draft->textWithTags.text.isEmpty() && !_localDraft) {
-			_localDraft = std::move(draft);
-
-			// Edit and reply to drafts can't migrate.
-			// Cloud drafts do not migrate automatically.
-			_localDraft->msgId = 0;
-		}
-		from->clearLocalDraft();
-		session().api().saveDraftToCloudDelayed(from);
+void History::takeLocalDraft(not_null<History*> from) {
+	const auto i = from->_drafts.find(Data::DraftKey::Local());
+	if (i == end(from->_drafts)) {
+		return;
 	}
+	auto &draft = i->second;
+	if (!draft->textWithTags.text.isEmpty()
+		&& !_drafts.contains(Data::DraftKey::Local())) {
+		// Edit and reply to drafts can't migrate.
+		// Cloud drafts do not migrate automatically.
+		draft->msgId = 0;
+
+		setLocalDraft(std::move(draft));
+	}
+	from->clearLocalDraft();
+	session().api().saveDraftToCloudDelayed(from);
 }
 
 void History::createLocalDraftFromCloud() {
@@ -227,9 +227,51 @@ void History::createLocalDraftFromCloud() {
 	}
 }
 
-void History::setCloudDraft(std::unique_ptr<Data::Draft> &&draft) {
-	_cloudDraft = std::move(draft);
-	cloudDraftTextCache.clear();
+Data::Draft *History::draft(Data::DraftKey key) const {
+	if (!key) {
+		return nullptr;
+	}
+	const auto i = _drafts.find(key);
+	return (i != _drafts.end()) ? i->second.get() : nullptr;
+}
+
+void History::setDraft(Data::DraftKey key, std::unique_ptr<Data::Draft> &&draft) {
+	if (!key) {
+		return;
+	}
+	const auto changingCloudDraft = (key == Data::DraftKey::Cloud());
+	if (changingCloudDraft) {
+		cloudDraftTextCache.clear();
+	}
+	if (draft) {
+		_drafts[key] = std::move(draft);
+	} else if (_drafts.remove(key) && changingCloudDraft) {
+		updateChatListSortPosition();
+	}
+}
+
+const Data::HistoryDrafts &History::draftsMap() const {
+	return _drafts;
+}
+
+void History::setDraftsMap(Data::HistoryDrafts &&map) {
+	for (auto &[key, draft] : _drafts) {
+		map[key] = std::move(draft);
+	}
+	_drafts = std::move(map);
+}
+
+void History::clearDraft(Data::DraftKey key) {
+	setDraft(key, nullptr);
+}
+
+void History::clearDrafts() {
+	const auto changingCloudDraft = _drafts.contains(Data::DraftKey::Cloud());
+	_drafts.clear();
+	if (changingCloudDraft) {
+		cloudDraftTextCache.clear();
+		updateChatListSortPosition();
+	}
 }
 
 Data::Draft *History::createCloudDraft(const Data::Draft *fromDraft) {
@@ -287,22 +329,6 @@ void History::clearSentDraftText(const QString &text) {
 	accumulate_max(_lastSentDraftTime, base::unixtime::now());
 }
 
-void History::setEditDraft(std::unique_ptr<Data::Draft> &&draft) {
-	_editDraft = std::move(draft);
-}
-
-void History::clearLocalDraft() {
-	_localDraft = nullptr;
-}
-
-void History::clearCloudDraft() {
-	if (_cloudDraft) {
-		_cloudDraft = nullptr;
-		cloudDraftTextCache.clear();
-		updateChatListSortPosition();
-	}
-}
-
 void History::applyCloudDraft() {
 	if (session().supportMode()) {
 		updateChatListEntry();
@@ -314,10 +340,6 @@ void History::applyCloudDraft() {
 	}
 }
 
-void History::clearEditDraft() {
-	_editDraft = nullptr;
-}
-
 void History::draftSavedToCloud() {
 	updateChatListEntry();
 	session().local().writeDrafts(this);
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index ebb5e0181..9c9f92055 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "data/data_types.h"
 #include "data/data_peer.h"
+#include "data/data_drafts.h"
 #include "dialogs/dialogs_entry.h"
 #include "history/view/history_view_send_action.h"
 #include "base/observer.h"
@@ -302,31 +303,48 @@ public:
 	void eraseFromUnreadMentions(MsgId msgId);
 	void addUnreadMentionsSlice(const MTPmessages_Messages &result);
 
+	Data::Draft *draft(Data::DraftKey key) const;
+	void setDraft(Data::DraftKey key, std::unique_ptr<Data::Draft> &&draft);
+	void clearDraft(Data::DraftKey key);
+
+	[[nodiscard]] const Data::HistoryDrafts &draftsMap() const;
+	void setDraftsMap(Data::HistoryDrafts &&map);
+
 	Data::Draft *localDraft() const {
-		return _localDraft.get();
+		return draft(Data::DraftKey::Local());
+	}
+	Data::Draft *localEditDraft() const {
+		return draft(Data::DraftKey::LocalEdit());
 	}
 	Data::Draft *cloudDraft() const {
-		return _cloudDraft.get();
+		return draft(Data::DraftKey::Cloud());
 	}
-	Data::Draft *editDraft() const {
-		return _editDraft.get();
+	void setLocalDraft(std::unique_ptr<Data::Draft> &&draft) {
+		setDraft(Data::DraftKey::Local(), std::move(draft));
 	}
-	void setLocalDraft(std::unique_ptr<Data::Draft> &&draft);
-	void takeLocalDraft(History *from);
-	void setCloudDraft(std::unique_ptr<Data::Draft> &&draft);
+	void setLocalEditDraft(std::unique_ptr<Data::Draft> &&draft) {
+		setDraft(Data::DraftKey::LocalEdit(), std::move(draft));
+	}
+	void setCloudDraft(std::unique_ptr<Data::Draft> &&draft) {
+		setDraft(Data::DraftKey::Cloud(), std::move(draft));
+	}
+	void clearLocalDraft() {
+		clearDraft(Data::DraftKey::Local());
+	}
+	void clearCloudDraft() {
+		clearDraft(Data::DraftKey::Cloud());
+	}
+	void clearLocalEditDraft() {
+		clearDraft(Data::DraftKey::LocalEdit());
+	}
+	void clearDrafts();
 	Data::Draft *createCloudDraft(const Data::Draft *fromDraft);
 	bool skipCloudDraft(const QString &text, MsgId replyTo, TimeId date) const;
 	void setSentDraftText(const QString &text);
 	void clearSentDraftText(const QString &text);
-	void setEditDraft(std::unique_ptr<Data::Draft> &&draft);
-	void clearLocalDraft();
-	void clearCloudDraft();
+	void takeLocalDraft(not_null<History*> from);
 	void applyCloudDraft();
-	void clearEditDraft();
 	void draftSavedToCloud();
-	Data::Draft *draft() {
-		return _editDraft ? editDraft() : localDraft();
-	}
 
 	const MessageIdsList &forwardDraft() const {
 		return _forwardDraft;
@@ -560,8 +578,7 @@ private:
 	};
 	std::unique_ptr<BuildingBlock> _buildingFrontBlock;
 
-	std::unique_ptr<Data::Draft> _localDraft, _cloudDraft;
-	std::unique_ptr<Data::Draft> _editDraft;
+	Data::HistoryDrafts _drafts;
 	std::optional<QString> _lastSentDraftText;
 	TimeId _lastSentDraftTime = 0;
 	MessageIdsList _forwardDraft;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 325f18aae..b9b47f918 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1331,8 +1331,9 @@ void HistoryWidget::saveDraftDelayed() {
 }
 
 void HistoryWidget::saveDraft(bool delayed) {
-	if (!_peer) return;
-	if (delayed) {
+	if (!_peer) {
+		return;
+	} else if (delayed) {
 		auto ms = crl::now();
 		if (!_saveDraftStart) {
 			_saveDraftStart = ms;
@@ -1341,21 +1342,21 @@ void HistoryWidget::saveDraft(bool delayed) {
 			return _saveDraftTimer.callOnce(kSaveDraftTimeout);
 		}
 	}
-	writeDrafts(nullptr, nullptr);
+	writeDrafts();
 }
 
 void HistoryWidget::saveFieldToHistoryLocalDraft() {
 	if (!_history) return;
 
 	if (_editMsgId) {
-		_history->setEditDraft(std::make_unique<Data::Draft>(_field, _editMsgId, _previewCancelled, _saveEditMsgRequestId));
+		_history->setLocalEditDraft(std::make_unique<Data::Draft>(_field, _editMsgId, _previewCancelled, _saveEditMsgRequestId));
 	} else {
 		if (_replyToId || !_field->empty()) {
 			_history->setLocalDraft(std::make_unique<Data::Draft>(_field, _replyToId, _previewCancelled));
 		} else {
 			_history->clearLocalDraft();
 		}
-		_history->clearEditDraft();
+		_history->clearLocalEditDraft();
 	}
 }
 
@@ -1363,74 +1364,47 @@ void HistoryWidget::saveCloudDraft() {
 	controller()->session().api().saveCurrentDraftToCloud();
 }
 
-void HistoryWidget::writeDrafts(Data::Draft **localDraft, Data::Draft **editDraft) {
-	Data::Draft *historyLocalDraft = _history ? _history->localDraft() : nullptr;
-	if (!localDraft && _editMsgId) localDraft = &historyLocalDraft;
+void HistoryWidget::writeDraftTexts() {
+	Expects(_history != nullptr);
 
-	bool save = _peer && (_saveDraftStart > 0);
+	session().local().writeDrafts(
+		_history,
+		_editMsgId ? Data::DraftKey::LocalEdit() : Data::DraftKey::Local(),
+		Storage::MessageDraft{
+			_editMsgId ? _editMsgId : _replyToId,
+			_field->getTextWithTags(),
+			_previewCancelled,
+		});
+	if (_migrated) {
+		_migrated->clearDrafts();
+		session().local().writeDrafts(_migrated);
+	}
+}
+
+void HistoryWidget::writeDraftCursors() {
+	Expects(_history != nullptr);
+
+	session().local().writeDraftCursors(
+		_history,
+		_editMsgId ? Data::DraftKey::LocalEdit() : Data::DraftKey::Local(),
+		MessageCursor(_field));
+	if (_migrated) {
+		_migrated->clearDrafts();
+		session().local().writeDraftCursors(_migrated);
+	}
+}
+
+void HistoryWidget::writeDrafts() {
+	const auto save = (_history != nullptr) && (_saveDraftStart > 0);
 	_saveDraftStart = 0;
 	_saveDraftTimer.cancel();
-	if (_saveDraftText) {
-		if (save) {
-			Storage::MessageDraft storedLocalDraft, storedEditDraft;
-			if (localDraft) {
-				if (*localDraft) {
-					storedLocalDraft = Storage::MessageDraft{
-						(*localDraft)->msgId,
-						(*localDraft)->textWithTags,
-						(*localDraft)->previewCancelled
-					};
-				}
-			} else {
-				storedLocalDraft = Storage::MessageDraft{
-					_replyToId,
-					_field->getTextWithTags(),
-					_previewCancelled
-				};
-			}
-			if (editDraft) {
-				if (*editDraft) {
-					storedEditDraft = Storage::MessageDraft{
-						(*editDraft)->msgId,
-						(*editDraft)->textWithTags,
-						(*editDraft)->previewCancelled
-					};
-				}
-			} else if (_editMsgId) {
-				storedEditDraft = Storage::MessageDraft{
-					_editMsgId,
-					_field->getTextWithTags(),
-					_previewCancelled
-				};
-			}
-			session().local().writeDrafts(_peer->id, storedLocalDraft, storedEditDraft);
-			if (_migrated) {
-				session().local().writeDrafts(_migrated->peer->id, {}, {});
-			}
-		}
-		_saveDraftText = false;
-	}
 	if (save) {
-		MessageCursor localCursor, editCursor;
-		if (localDraft) {
-			if (*localDraft) {
-				localCursor = (*localDraft)->cursor;
-			}
-		} else {
-			localCursor = MessageCursor(_field);
-		}
-		if (editDraft) {
-			if (*editDraft) {
-				editCursor = (*editDraft)->cursor;
-			}
-		} else if (_editMsgId) {
-			editCursor = MessageCursor(_field);
-		}
-		session().local().writeDraftCursors(_peer->id, localCursor, editCursor);
-		if (_migrated) {
-			session().local().writeDraftCursors(_migrated->peer->id, {}, {});
+		if (_saveDraftText) {
+			writeDraftTexts();
 		}
+		writeDraftCursors();
 	}
+	_saveDraftText = false;
 
 	if (!_editMsgId && !_inlineBot) {
 		_saveCloudDraftTimer.callOnce(kSaveCloudDraftIdleTimeout);
@@ -1498,13 +1472,17 @@ bool HistoryWidget::notify_switchInlineBotButtonReceived(const QString &query, U
 			false);
 
 		if (to.section == Section::Replies) {
+			history->setDraft(
+				Data::DraftKey::Replies(to.rootId),
+				std::move(draft));
 			controller()->showRepliesForMessage(history, to.rootId);
+		} else if (to.section == Section::Scheduled) {
+			history->setDraft(Data::DraftKey::Scheduled(), std::move(draft));
+			controller()->showSection(
+				HistoryView::ScheduledMemento(history));
 		} else {
 			history->setLocalDraft(std::move(draft));
-			if (to.section == Section::Scheduled) {
-				controller()->showSection(
-					HistoryView::ScheduledMemento(history));
-			} else if (history == _history) {
+			if (history == _history) {
 				applyDraft();
 			} else {
 				Ui::showPeerHistory(history->peer, ShowAtUnreadMsgId);
@@ -1619,9 +1597,13 @@ void HistoryWidget::fastShowAtEnd(not_null<History*> history) {
 void HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	InvokeQueued(this, [=] { updateStickersByEmoji(); });
 
-	auto draft = _history ? _history->draft() : nullptr;
+	auto draft = !_history
+		? nullptr
+		: _history->localEditDraft()
+		? _history->localEditDraft()
+		: _history->localDraft();
 	auto fieldAvailable = canWriteMessage();
-	if (!draft || (!_history->editDraft() && !fieldAvailable)) {
+	if (!draft || (!_history->localEditDraft() && !fieldAvailable)) {
 		auto fieldWillBeHiddenAfterEdit = (!fieldAvailable && _editMsgId != 0);
 		clearFieldText(0, fieldHistoryAction);
 		_field->setFocus();
@@ -1642,7 +1624,7 @@ void HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	_textUpdateEvents = TextUpdateEvent::SaveDraft | TextUpdateEvent::SendTyping;
 	_previewCancelled = draft->previewCancelled;
 	_replyEditMsg = nullptr;
-	if (auto editDraft = _history->editDraft()) {
+	if (const auto editDraft = _history->localEditDraft()) {
 		_editMsgId = editDraft->msgId;
 		_replyToId = 0;
 	} else {
@@ -1778,8 +1760,7 @@ void HistoryWidget::showHistory(
 		}
 		controller()->session().api().saveCurrentDraftToCloud();
 		if (_migrated) {
-			_migrated->clearLocalDraft(); // use migrated draft only once
-			_migrated->clearEditDraft();
+			_migrated->clearDrafts(); // use migrated draft only once
 		}
 
 		_history->showAtMsgId = _showAtMsgId;
@@ -1910,11 +1891,6 @@ void HistoryWidget::showHistory(
 		handlePeerUpdate();
 
 		session().local().readDraftsWithCursors(_history);
-		if (_migrated) {
-			session().local().readDraftsWithCursors(_migrated);
-			_migrated->clearEditDraft();
-			_history->takeLocalDraft(_migrated);
-		}
 		applyDraft();
 		_send->finishAnimating();
 
@@ -3006,16 +2982,16 @@ void HistoryWidget::saveEditMsg() {
 				cancelEdit();
 			}
 		})();
-		if (auto editDraft = history->editDraft()) {
+		if (const auto editDraft = history->localEditDraft()) {
 			if (editDraft->saveRequestId == requestId) {
-				history->clearEditDraft();
+				history->clearLocalEditDraft();
 				history->session().local().writeDrafts(history);
 			}
 		}
 	};
 
 	const auto fail = [=](const RPCError &error, mtpRequestId requestId) {
-		if (const auto editDraft = history->editDraft()) {
+		if (const auto editDraft = history->localEditDraft()) {
 			if (editDraft->saveRequestId == requestId) {
 				editDraft->saveRequestId = 0;
 			}
@@ -5563,7 +5539,7 @@ void HistoryWidget::editMessage(not_null<HistoryItem*> item) {
 		editData.text.size(),
 		QFIXED_MAX
 	};
-	_history->setEditDraft(std::make_unique<Data::Draft>(
+	_history->setLocalEditDraft(std::make_unique<Data::Draft>(
 		editData,
 		item->id,
 		cursor,
@@ -5693,7 +5669,7 @@ void HistoryWidget::cancelEdit() {
 
 	_replyEditMsg = nullptr;
 	_editMsgId = 0;
-	_history->clearEditDraft();
+	_history->clearLocalEditDraft();
 	applyDraft();
 
 	if (_saveEditMsgRequestId) {
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 0f6b22add..73d967fc7 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -41,10 +41,6 @@ class Widget;
 struct ResultSelected;
 } // namespace InlineBots
 
-namespace Data {
-struct Draft;
-} // namespace Data
-
 namespace Support {
 class Autocomplete;
 struct Contact;
@@ -526,8 +522,9 @@ private:
 	// This one is syntetic.
 	void synteticScrollToY(int y);
 
-	void writeDrafts(Data::Draft **localDraft, Data::Draft **editDraft);
-	void writeDrafts(History *history);
+	void writeDrafts();
+	void writeDraftTexts();
+	void writeDraftCursors();
 	void setFieldText(
 		const TextWithTags &textWithTags,
 		TextUpdateEvents events = 0,
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index ba71b97f3..fdd5d198d 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "data/data_changes.h"
+#include "data/data_drafts.h"
 #include "data/data_messages.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -54,6 +55,8 @@ namespace HistoryView {
 namespace {
 
 constexpr auto kRecordingUpdateDelta = crl::time(100);
+constexpr auto kSaveDraftTimeout = crl::time(1000);
+constexpr auto kSaveDraftAnywayTimeout = 5 * crl::time(1000);
 constexpr auto kMouseEvents = {
 	QEvent::MouseMove,
 	QEvent::MouseButtonPress,
@@ -107,12 +110,24 @@ public:
 	[[nodiscard]] MessageToEdit queryToEdit();
 	[[nodiscard]] WebPageId webPageId() const;
 
+	[[nodiscard]] MsgId getDraftMessageId() const;
+	[[nodiscard]] rpl::producer<> editCancelled() const {
+		return _editCancelled.events();
+	}
+	[[nodiscard]] rpl::producer<> replyCancelled() const {
+		return _replyCancelled.events();
+	}
+	[[nodiscard]] rpl::producer<> previewCancelled() const {
+		return _previewCancelled.events();
+	}
+
 	[[nodiscard]] rpl::producer<bool> visibleChanged();
 
 private:
 	void updateControlsGeometry(QSize size);
 	void updateVisible();
 	void setShownMessage(HistoryItem *message);
+	void resolveMessageData();
 	void updateShownMessageText();
 
 	void paintWebPage(Painter &p);
@@ -122,12 +137,16 @@ private:
 		WebPageData *data = nullptr;
 		Ui::Text::String title;
 		Ui::Text::String description;
+		bool cancelled = false;
 	};
 
 	rpl::variable<QString> _title;
 	rpl::variable<QString> _description;
 
 	Preview _preview;
+	rpl::event_stream<> _editCancelled;
+	rpl::event_stream<> _replyCancelled;
+	rpl::event_stream<> _previewCancelled;
 
 	bool hasPreview() const;
 
@@ -202,10 +221,10 @@ void FieldHeader::init() {
 	}) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
 		if (update.flags & Data::MessageUpdate::Flag::Destroyed) {
 			if (_editMsgId.current() == update.item->fullId()) {
-				editMessage({});
+				_editCancelled.fire({});
 			}
 			if (_replyToId.current() == update.item->fullId()) {
-				replyToMessage({});
+				_replyCancelled.fire({});
 			}
 		} else {
 			updateShownMessageText();
@@ -215,13 +234,14 @@ void FieldHeader::init() {
 	_cancel->addClickHandler([=] {
 		if (hasPreview()) {
 			_preview = {};
-			update();
+			_previewCancelled.fire({});
 		} else if (_editMsgId.current()) {
-			editMessage({});
+			_editCancelled.fire({});
 		} else if (_replyToId.current()) {
-			replyToMessage({});
+			_replyCancelled.fire({});
 		}
 		updateVisible();
+		update();
 	});
 
 	_title.value(
@@ -308,6 +328,7 @@ void FieldHeader::setShownMessage(HistoryItem *item) {
 		}
 	} else {
 		_shownMessageText.clear();
+		resolveMessageData();
 	}
 	if (isEditingMessage()) {
 		_shownMessageName.setText(
@@ -322,6 +343,34 @@ void FieldHeader::setShownMessage(HistoryItem *item) {
 	update();
 }
 
+void FieldHeader::resolveMessageData() {
+	const auto id = (isEditingMessage() ? _editMsgId : _replyToId).current();
+	if (!id) {
+		return;
+	}
+	const auto channel = id.channel
+		? _data->channel(id.channel).get()
+		: nullptr;
+	const auto callback = [=](ChannelData *channel, MsgId msgId) {
+		const auto now = (isEditingMessage()
+			? _editMsgId
+			: _replyToId).current();
+		if (now == id && !_shownMessage) {
+			if (const auto message = _data->message(channel, msgId)) {
+				setShownMessage(message);
+			} else if (isEditingMessage()) {
+				_editCancelled.fire({});
+			} else {
+				_replyCancelled.fire({});
+			}
+		}
+	};
+	_data->session().api().requestMessageData(
+		channel,
+		id.msg,
+		crl::guard(this, callback));
+}
+
 void FieldHeader::previewRequested(
 	rpl::producer<QString> title,
 	rpl::producer<QString> description,
@@ -329,19 +378,25 @@ void FieldHeader::previewRequested(
 
 	std::move(
 		title
-	) | rpl::start_with_next([=](const QString &t) {
+	) | rpl::filter([=] {
+		return !_preview.cancelled;
+	}) | start_with_next([=](const QString &t) {
 		_title = t;
 	}, lifetime());
 
 	std::move(
 		description
-	) | rpl::start_with_next([=](const QString &d) {
+	) | rpl::filter([=] {
+		return !_preview.cancelled;
+	}) | rpl::start_with_next([=](const QString &d) {
 		_description = d;
 	}, lifetime());
 
 	std::move(
 		page
-	) | rpl::start_with_next([=](WebPageData *p) {
+	) | rpl::filter([=] {
+		return !_preview.cancelled;
+	}) | rpl::start_with_next([=](WebPageData *p) {
 		_preview.data = p;
 		updateVisible();
 	}, lifetime());
@@ -392,14 +447,26 @@ void FieldHeader::paintWebPage(Painter &p) {
 }
 
 void FieldHeader::paintEditOrReplyToMessage(Painter &p) {
-	Expects(_shownMessage != nullptr);
-
 	const auto replySkip = st::historyReplySkip;
 	const auto availableWidth = width()
 		- replySkip
 		- _cancel->width()
 		- st::msgReplyPadding.right();
 
+	if (!_shownMessage) {
+		p.setFont(st::msgDateFont);
+		p.setPen(st::historyComposeAreaFgService);
+		const auto top = (st::msgReplyPadding.top()
+			+ (st::msgReplyBarSize.height() - st::msgDateFont->height) / 2);
+		p.drawText(
+			replySkip,
+			top + st::msgDateFont->ascent,
+			st::msgDateFont->elided(
+				tr::lng_profile_loading(tr::now),
+				availableWidth));
+		return;
+	}
+
 	if (!isEditingMessage()) {
 		const auto user = _shownMessage->displayFrom()
 			? _shownMessage->displayFrom()
@@ -460,6 +527,10 @@ WebPageId FieldHeader::webPageId() const {
 	return hasPreview() ? _preview.data->id : CancelledWebPageId;
 }
 
+MsgId FieldHeader::getDraftMessageId() const {
+	return (isEditingMessage() ? _editMsgId : _replyToId).current().msg;
+}
+
 void FieldHeader::updateControlsGeometry(QSize size) {
 	_cancel->moveToRight(0, 0);
 	_clickableRect = QRect(
@@ -538,11 +609,12 @@ ComposeControls::ComposeControls(
 		window,
 		_send,
 		st::historySendSize.height()))
-, _textUpdateEvents(TextUpdateEvent::SendTyping) {
+, _saveDraftTimer([=] { saveDraft(); }) {
 	init();
 }
 
 ComposeControls::~ComposeControls() {
+	saveFieldToHistoryLocalDraft();
 	setTabbedPanel(nullptr);
 	session().api().request(_inlineBotResolveRequestId).cancel();
 }
@@ -582,6 +654,8 @@ void ComposeControls::setHistory(SetHistoryArgs &&args) {
 			session().api().requestBots(channel);
 		}
 	}
+	session().local().readDraftsWithCursors(_history);
+	applyDraft();
 }
 
 void ComposeControls::setCurrentDialogsEntryState(Dialogs::EntryState state) {
@@ -752,21 +826,52 @@ TextWithTags ComposeControls::getTextWithAppliedMarkdown() const {
 }
 
 void ComposeControls::clear() {
-	setText(TextWithTags());
+	setText({});
 	cancelReplyMessage();
 }
 
 void ComposeControls::setText(const TextWithTags &textWithTags) {
-	_textUpdateEvents = TextUpdateEvents();
-	_field->setTextWithTags(textWithTags, Ui::InputField::HistoryAction::Clear/*fieldHistoryAction*/);
+	setFieldText(textWithTags);
+}
+
+void ComposeControls::setFieldText(
+		const TextWithTags &textWithTags,
+		TextUpdateEvents events,
+		FieldHistoryAction fieldHistoryAction) {
+	_textUpdateEvents = events;
+	_field->setTextWithTags(textWithTags, fieldHistoryAction);
 	auto cursor = _field->textCursor();
 	cursor.movePosition(QTextCursor::End);
 	_field->setTextCursor(cursor);
 	_textUpdateEvents = TextUpdateEvent::SaveDraft
 		| TextUpdateEvent::SendTyping;
 
-	//previewCancel();
-	//_previewCancelled = false;
+	_previewCancel();
+	_previewCancelled = false;
+}
+
+void ComposeControls::saveFieldToHistoryLocalDraft() {
+	const auto key = draftKeyCurrent();
+	if (!_history || key == Data::DraftKey::None()) {
+		return;
+	}
+	const auto id = _header->getDraftMessageId();
+	if (id || !_field->empty()) {
+		_history->setDraft(
+			draftKeyCurrent(),
+			std::make_unique<Data::Draft>(
+				_field,
+				_header->getDraftMessageId(),
+				_previewCancelled));
+	} else {
+		_history->clearDraft(draftKeyCurrent());
+	}
+}
+
+void ComposeControls::clearFieldText(
+		TextUpdateEvents events,
+		FieldHistoryAction fieldHistoryAction) {
+	setFieldText({}, events, fieldHistoryAction);
 }
 
 void ComposeControls::hidePanelsAnimated() {
@@ -836,15 +941,27 @@ void ComposeControls::init() {
 
 	_header->editMsgId(
 	) | rpl::start_with_next([=](const auto &id) {
-		if (_header->isEditingMessage()) {
-			setTextFromEditingMessage(session().data().message(id));
-		} else {
-			setText(_localSavedText);
-			_localSavedText = {};
-		}
 		updateSendButtonType();
 	}, _wrap->lifetime());
 
+	_header->previewCancelled(
+	) | rpl::start_with_next([=] {
+		_previewCancelled = true;
+		_saveDraftText = true;
+		_saveDraftStart = crl::now();
+		saveDraft();
+	}, _wrap->lifetime());
+
+	_header->editCancelled(
+	) | rpl::start_with_next([=] {
+		cancelEditMessage();
+	}, _wrap->lifetime());
+
+	_header->replyCancelled(
+	) | rpl::start_with_next([=] {
+		cancelReplyMessage();
+	}, _wrap->lifetime());
+
 	_header->visibleChanged(
 	) | rpl::start_with_next([=] {
 		updateHeight();
@@ -894,19 +1011,6 @@ void ComposeControls::drawRestrictedWrite(Painter &p, const QString &error) {
 		style::al_center);
 }
 
-void ComposeControls::setTextFromEditingMessage(not_null<HistoryItem*> item) {
-	if (!_header->isEditingMessage()) {
-		return;
-	}
-	_localSavedText = getTextWithAppliedMarkdown();
-	const auto t = item->originalText();
-	const auto text = TextWithTags{
-		t.text,
-		TextUtilities::ConvertEntitiesToTextTags(t.entities)
-	};
-	setText(text);
-}
-
 void ComposeControls::initField() {
 	_field->setMaxHeight(st::historyComposeFieldMaxHeight);
 	updateSubmitSettings();
@@ -924,6 +1028,16 @@ void ComposeControls::initField() {
 		&_window->session());
 	_raiseEmojiSuggestions = [=] { suggestions->raise(); };
 	InitSpellchecker(_window, _field);
+
+	const auto rawTextEdit = _field->rawTextEdit().get();
+	rpl::merge(
+		_field->scrollTop().changes() | rpl::to_empty,
+		base::qt_signal_producer(
+			rawTextEdit,
+			&QTextEdit::cursorPositionChanged)
+	) | rpl::start_with_next([=] {
+		saveDraftDelayed();
+	}, _field->lifetime());
 }
 
 void ComposeControls::updateSubmitSettings() {
@@ -1077,7 +1191,7 @@ void ComposeControls::fieldChanged() {
 	}
 	updateSendButtonType();
 	if (showRecordButton()) {
-		//_previewCancelled = false;
+		_previewCancelled = false;
 	}
 	if (updateBotCommandShown()) {
 		updateControlsVisibility();
@@ -1087,6 +1201,133 @@ void ComposeControls::fieldChanged() {
 		updateInlineBotQuery();
 		updateStickersByEmoji();
 	});
+
+	if (!(_textUpdateEvents & TextUpdateEvent::SaveDraft)) {
+		return;
+	}
+	_saveDraftText = true;
+	saveDraft(true);
+}
+
+void ComposeControls::saveDraftDelayed() {
+	if (!(_textUpdateEvents & TextUpdateEvent::SaveDraft)) {
+		return;
+	}
+	saveDraft(true);
+}
+
+Data::DraftKey ComposeControls::draftKey(DraftType type) const {
+	using Section = Dialogs::EntryState::Section;
+	using Key = Data::DraftKey;
+
+	switch (_currentDialogsEntryState.section) {
+	case Section::History:
+		return (type == DraftType::Edit) ? Key::LocalEdit() : Key::Local();
+	case Section::Scheduled:
+		return (type == DraftType::Edit)
+			? Key::ScheduledEdit()
+			: Key::Scheduled();
+	case Section::Replies:
+		return (type == DraftType::Edit)
+			? Key::RepliesEdit(_currentDialogsEntryState.rootId)
+			: Key::Replies(_currentDialogsEntryState.rootId);
+	}
+	return Key::None();
+}
+
+Data::DraftKey ComposeControls::draftKeyCurrent() const {
+	return draftKey(isEditingMessage() ? DraftType::Edit : DraftType::Normal);
+}
+
+void ComposeControls::saveDraft(bool delayed) {
+	if (delayed) {
+		const auto now = crl::now();
+		if (!_saveDraftStart) {
+			_saveDraftStart = now;
+			return _saveDraftTimer.callOnce(kSaveDraftTimeout);
+		} else if (now - _saveDraftStart < kSaveDraftAnywayTimeout) {
+			return _saveDraftTimer.callOnce(kSaveDraftTimeout);
+		}
+	}
+	writeDrafts();
+}
+
+void ComposeControls::writeDraftTexts() {
+	Expects(_history != nullptr);
+
+	session().local().writeDrafts(
+		_history,
+		draftKeyCurrent(),
+		Storage::MessageDraft{
+			_header->getDraftMessageId(),
+			_field->getTextWithTags(),
+			_previewCancelled,
+		});
+}
+
+void ComposeControls::writeDraftCursors() {
+	Expects(_history != nullptr);
+
+	session().local().writeDraftCursors(
+		_history,
+		draftKeyCurrent(),
+		MessageCursor(_field));
+}
+
+void ComposeControls::writeDrafts() {
+	const auto save = (_history != nullptr)
+		&& (_saveDraftStart > 0)
+		&& (draftKeyCurrent() != Data::DraftKey::None());
+	_saveDraftStart = 0;
+	_saveDraftTimer.cancel();
+	if (save) {
+		if (_saveDraftText) {
+			writeDraftTexts();
+		}
+		writeDraftCursors();
+	}
+	_saveDraftText = false;
+
+	//if (!isEditingMessage() && !_inlineBot) {
+	//	_saveCloudDraftTimer.callOnce(kSaveCloudDraftIdleTimeout);
+	//}
+}
+
+void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
+	Expects(_history != nullptr);
+
+	InvokeQueued(_autocomplete.get(), [=] { updateStickersByEmoji(); });
+	const auto guard = gsl::finally([&] {
+		updateSendButtonType();
+		updateControlsVisibility();
+		updateControlsGeometry(_wrap->size());
+	});
+
+	const auto editDraft = _history->draft(draftKey(DraftType::Edit));
+	const auto draft = editDraft
+		? editDraft
+		: _history->draft(draftKey(DraftType::Normal));
+	if (!draft) {
+		clearFieldText(0, fieldHistoryAction);
+		_field->setFocus();
+		_header->editMessage({});
+		_header->replyToMessage({});
+		return;
+	}
+
+	_textUpdateEvents = 0;
+	setFieldText(draft->textWithTags, 0, fieldHistoryAction);
+	_field->setFocus();
+	draft->cursor.applyTo(_field);
+	_textUpdateEvents = TextUpdateEvent::SaveDraft | TextUpdateEvent::SendTyping;
+	_previewCancelled = draft->previewCancelled;
+	if (draft == editDraft) {
+		_header->editMessage({ _history->channelId(), draft->msgId });
+		_header->replyToMessage({});
+	} else {
+		_header->replyToMessage({ _history->channelId(), draft->msgId });
+		_header->editMessage({});
+	}
 }
 
 void ComposeControls::fieldTabbed() {
@@ -1192,11 +1433,16 @@ void ComposeControls::inlineBotResolveFail(
 }
 
 void ComposeControls::cancelInlineBot() {
-	auto &textWithTags = _field->getTextWithTags();
+	const auto &textWithTags = _field->getTextWithTags();
 	if (textWithTags.text.size() > _inlineBotUsername.size() + 2) {
-		setText({ '@' + _inlineBotUsername + ' ', TextWithTags::Tags() });
+		setFieldText(
+			{ '@' + _inlineBotUsername + ' ', TextWithTags::Tags() },
+			TextUpdateEvent::SaveDraft,
+			Ui::InputField::HistoryAction::NewEntry);
 	} else {
-		setText({});
+		clearFieldText(
+			TextUpdateEvent::SaveDraft,
+			Ui::InputField::HistoryAction::NewEntry);
 	}
 }
 
@@ -1487,29 +1733,101 @@ void ComposeControls::updateHeight() {
 }
 
 void ComposeControls::editMessage(FullMsgId id) {
-	cancelEditMessage();
-	_header->editMessage(id);
+	if (const auto item = session().data().message(id)) {
+		editMessage(item);
+	}
+}
+
+void ComposeControls::editMessage(not_null<HistoryItem*> item) {
+	Expects(_history != nullptr);
+	Expects(draftKeyCurrent() != Data::DraftKey::None());
+
+	if (!isEditingMessage()) {
+		saveFieldToHistoryLocalDraft();
+	}
+	const auto editData = PrepareEditText(item);
+	const auto cursor = MessageCursor{
+		editData.text.size(),
+		editData.text.size(),
+		QFIXED_MAX
+	};
+	_history->setDraft(
+		draftKey(DraftType::Edit),
+		std::make_unique<Data::Draft>(
+			editData,
+			item->id,
+			cursor,
+			false));
+	applyDraft();
+
 	if (_autocomplete) {
 		InvokeQueued(_autocomplete.get(), [=] { checkAutocomplete(); });
 	}
-	updateFieldPlaceholder();
 }
 
 void ComposeControls::cancelEditMessage() {
-	_header->editMessage({});
-	if (_autocomplete) {
-		InvokeQueued(_autocomplete.get(), [=] { checkAutocomplete(); });
-	}
-	updateFieldPlaceholder();
+	Expects(_history != nullptr);
+	Expects(draftKeyCurrent() != Data::DraftKey::None());
+
+	_history->clearDraft(draftKey(DraftType::Edit));
+	applyDraft();
+
+	_saveDraftText = true;
+	_saveDraftStart = crl::now();
+	saveDraft();
 }
 
 void ComposeControls::replyToMessage(FullMsgId id) {
-	cancelReplyMessage();
-	_header->replyToMessage(id);
+	Expects(_history != nullptr);
+	Expects(draftKeyCurrent() != Data::DraftKey::None());
+
+	if (!id) {
+		cancelReplyMessage();
+		return;
+	}
+	if (isEditingMessage()) {
+		const auto key = draftKey(DraftType::Normal);
+		if (const auto localDraft = _history->draft(key)) {
+			localDraft->msgId = id.msg;
+		} else {
+			_history->setDraft(
+				key,
+				std::make_unique<Data::Draft>(
+					TextWithTags(),
+					id.msg,
+					MessageCursor(),
+					false));
+		}
+	} else {
+		_header->replyToMessage(id);
+	}
+
+	_saveDraftText = true;
+	_saveDraftStart = crl::now();
+	saveDraft();
 }
 
 void ComposeControls::cancelReplyMessage() {
+	Expects(_history != nullptr);
+	Expects(draftKeyCurrent() != Data::DraftKey::None());
+
+	const auto wasReply = replyingToMessage();
 	_header->replyToMessage({});
+	const auto key = draftKey(DraftType::Normal);
+	if (const auto localDraft = _history->draft(key)) {
+		if (localDraft->msgId) {
+			if (localDraft->textWithTags.text.isEmpty()) {
+				_history->clearDraft(key);
+			} else {
+				localDraft->msgId = 0;
+			}
+		}
+	}
+	if (wasReply) {
+		_saveDraftText = true;
+		_saveDraftStart = crl::now();
+		saveDraft();
+	}
 }
 
 bool ComposeControls::handleCancelRequest() {
@@ -1544,7 +1862,6 @@ void ComposeControls::initWebpageProcess() {
 	using PreviewCache = std::map<QString, WebPageId>;
 	const auto previewCache = lifetime.make_state<PreviewCache>();
 	const auto previewRequest = lifetime.make_state<mtpRequestId>(0);
-	const auto previewCancelled = lifetime.make_state<bool>(false);
 	const auto mtpSender =
 		lifetime.make_state<MTP::Sender>(&_window->session().mtp());
 
@@ -1591,7 +1908,7 @@ void ComposeControls::initWebpageProcess() {
 			if (till > 0 && till <= base::unixtime::now()) {
 				till = -1;
 			}
-			if (links == *previewLinks && !*previewCancelled) {
+			if (links == *previewLinks && !_previewCancelled) {
 				*previewData = (page->id && page->pendingTill >= 0)
 					? page.get()
 					: nullptr;
@@ -1599,7 +1916,7 @@ void ComposeControls::initWebpageProcess() {
 			}
 		}, [=](const MTPDmessageMediaEmpty &d) {
 			previewCache->insert({ links, 0 });
-			if (links == *previewLinks && !*previewCancelled) {
+			if (links == *previewLinks && !_previewCancelled) {
 				*previewData = nullptr;
 				updatePreview();
 			}
@@ -1607,7 +1924,7 @@ void ComposeControls::initWebpageProcess() {
 		});
 	});
 
-	const auto previewCancel = [=] {
+	_previewCancel = [=] {
 		mtpSender->request(base::take(*previewRequest)).cancel();
 		*previewData = nullptr;
 		previewLinks->clear();
@@ -1628,8 +1945,8 @@ void ComposeControls::initWebpageProcess() {
 	const auto checkPreview = crl::guard(_wrap.get(), [=] {
 		const auto previewRestricted = peer
 			&& peer->amRestricted(ChatRestriction::f_embed_links);
-		if (/*_previewCancelled ||*/ previewRestricted) {
-			previewCancel();
+		if (_previewCancelled || previewRestricted) {
+			_previewCancel();
 			return;
 		}
 		const auto newLinks = parsedLinks->join(' ');
@@ -1640,7 +1957,7 @@ void ComposeControls::initWebpageProcess() {
 		*previewLinks = newLinks;
 		if (previewLinks->isEmpty()) {
 			if (ShowWebPagePreview(*previewData)) {
-				previewCancel();
+				_previewCancel();
 			}
 		} else {
 			const auto i = previewCache->find(*previewLinks);
@@ -1650,7 +1967,7 @@ void ComposeControls::initWebpageProcess() {
 				*previewData = _history->owner().webpage(i->second);
 				updatePreview();
 			} else if (ShowWebPagePreview(*previewData)) {
-				previewCancel();
+				_previewCancel();
 			}
 		}
 	});
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 01e148585..109a318a0 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/required.h"
 #include "api/api_common.h"
 #include "base/unique_qptr.h"
+#include "base/timer.h"
 #include "dialogs/dialogs_key.h"
 #include "history/view/controls/compose_controls_common.h"
 #include "ui/rp_widget.h"
@@ -27,6 +28,8 @@ class TabbedSelector;
 
 namespace Data {
 struct MessagePosition;
+struct Draft;
+class DraftKey;
 } // namespace Data
 
 namespace InlineBots {
@@ -74,6 +77,7 @@ public:
 	using VoiceToSend = Controls::VoiceToSend;
 	using SendActionUpdate = Controls::SendActionUpdate;
 	using SetHistoryArgs = Controls::SetHistoryArgs;
+	using FieldHistoryAction = Ui::InputField::HistoryAction;
 
 	enum class Mode {
 		Normal,
@@ -148,11 +152,18 @@ public:
 	[[nodiscard]] bool isLockPresent() const;
 	[[nodiscard]] bool isRecording() const;
 
+	void applyDraft(
+		FieldHistoryAction fieldHistoryAction = FieldHistoryAction::Clear);
+
 private:
 	enum class TextUpdateEvent {
 		SaveDraft = (1 << 0),
 		SendTyping = (1 << 1),
 	};
+	enum class DraftType {
+		Normal,
+		Edit,
+	};
 	using TextUpdateEvents = base::flags<TextUpdateEvent>;
 	friend inline constexpr bool is_flag_type(TextUpdateEvent) { return true; };
 
@@ -177,6 +188,7 @@ private:
 	void checkAutocomplete();
 	void updateStickersByEmoji();
 	void updateFieldPlaceholder();
+	void editMessage(not_null<HistoryItem*> item);
 
 	void escape();
 	void fieldChanged();
@@ -185,11 +197,8 @@ private:
 	void createTabbedPanel();
 	void setTabbedPanel(std::unique_ptr<ChatHelpers::TabbedPanel> panel);
 
-	void setTextFromEditingMessage(not_null<HistoryItem*> item);
-
 	bool showRecordButton() const;
 	void drawRestrictedWrite(Painter &p, const QString &error);
-	void updateOverStates(QPoint pos);
 	bool updateBotCommandShown();
 
 	void cancelInlineBot();
@@ -205,6 +214,24 @@ private:
 	void inlineBotResolveDone(const MTPcontacts_ResolvedPeer &result);
 	void inlineBotResolveFail(const RPCError &error, const QString &username);
 
+	[[nodiscard]] Data::DraftKey draftKey(
+		DraftType type = DraftType::Normal) const;
+	[[nodiscard]] Data::DraftKey draftKeyCurrent() const;
+	void saveDraft(bool delayed = false);
+	void saveDraftDelayed();
+
+	void writeDrafts();
+	void writeDraftTexts();
+	void writeDraftCursors();
+	void setFieldText(
+		const TextWithTags &textWithTags,
+		TextUpdateEvents events = 0,
+		FieldHistoryAction fieldHistoryAction = FieldHistoryAction::Clear);
+	void clearFieldText(
+		TextUpdateEvents events = 0,
+		FieldHistoryAction fieldHistoryAction = FieldHistoryAction::Clear);
+	void saveFieldToHistoryLocalDraft();
+
 	const not_null<QWidget*> _parent;
 	const not_null<Window::SessionController*> _window;
 	History *_history = nullptr;
@@ -238,12 +265,14 @@ private:
 	rpl::event_stream<SendActionUpdate> _sendActionUpdates;
 	rpl::event_stream<QString> _sendCommandRequests;
 
-	TextWithTags _localSavedText;
-	TextUpdateEvents _textUpdateEvents;
+	TextUpdateEvents _textUpdateEvents = TextUpdateEvents()
+		| TextUpdateEvent::SaveDraft
+		| TextUpdateEvent::SendTyping;
 	Dialogs::EntryState _currentDialogsEntryState;
 
-	//bool _inReplyEditForward = false;
-	//bool _inClickable = false;
+	crl::time _saveDraftStart = 0;
+	bool _saveDraftText = false;
+	base::Timer _saveDraftTimer;
 
 	UserData *_inlineBot = nullptr;
 	QString _inlineBotUsername;
@@ -252,6 +281,9 @@ private:
 	bool _isInlineBot = false;
 	bool _botCommandShown = false;
 
+	Fn<void()> _previewCancel;
+	bool _previewCancelled = false;
+
 	rpl::lifetime _uploaderSubscriptions;
 
 	Fn<void()> _raiseEmojiSuggestions;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index a076837d6..e5a976a57 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1133,7 +1133,7 @@ void RepliesWidget::refreshTopBarActiveChat() {
 		.key = _history,
 		.section = Dialogs::EntryState::Section::Replies,
 		.rootId = _rootId,
-		.currentReplyToId = replyToId(),
+		.currentReplyToId = _composeControls->replyingToMessage().msg,
 	};
 	_topBar->setActiveChat(state, _sendAction.get());
 	_composeControls->setCurrentDialogsEntryState(state);
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 4c47f3421..d17c8af27 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -533,7 +533,7 @@ bool MainWidget::shareUrl(
 	auto history = peer->owner().history(peer);
 	history->setLocalDraft(
 		std::make_unique<Data::Draft>(textWithTags, 0, cursor, false));
-	history->clearEditDraft();
+	history->clearLocalEditDraft();
 	if (_history->peer() == peer) {
 		_history->applyDraft();
 	} else {
@@ -562,7 +562,7 @@ bool MainWidget::inlineSwitchChosen(PeerId peerId, const QString &botAndQuery) {
 	TextWithTags textWithTags = { botAndQuery, TextWithTags::Tags() };
 	MessageCursor cursor = { botAndQuery.size(), botAndQuery.size(), QFIXED_MAX };
 	h->setLocalDraft(std::make_unique<Data::Draft>(textWithTags, 0, cursor, false));
-	h->clearEditDraft();
+	h->clearLocalEditDraft();
 	const auto opened = _history->peer() && (_history->peer() == peer);
 	if (opened) {
 		_history->applyDraft();
diff --git a/Telegram/SourceFiles/platform/win/window_title_win.cpp b/Telegram/SourceFiles/platform/win/window_title_win.cpp
index 80df1d90d..a1c51f491 100644
--- a/Telegram/SourceFiles/platform/win/window_title_win.cpp
+++ b/Telegram/SourceFiles/platform/win/window_title_win.cpp
@@ -42,6 +42,8 @@ TitleWidget::TitleWidget(QWidget *parent)
 	});
 	_close->setPointerCursor(false);
 
+	window()->windowHandle()->setFlag(Qt::FramelessWindowHint, true);
+
 	setAttribute(Qt::WA_OpaquePaintEvent);
 	resize(width(), _st.height);
 }
diff --git a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp
index bdd55b957..0cd10f60d 100644
--- a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp
+++ b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp
@@ -142,30 +142,42 @@ bool EventFilter::customWindowFrameEvent(
 		if (result) *result = 0;
 	} return true;
 
+	case WM_SHOWWINDOW: {
+		SetWindowLongPtr(
+			hWnd,
+			GWL_STYLE,
+			WS_POPUP
+			| WS_THICKFRAME
+			| WS_CAPTION
+			| WS_SYSMENU
+			| WS_MAXIMIZEBOX
+			| WS_MINIMIZEBOX);
+	} return false;
+
 	case WM_NCCALCSIZE: {
-		WINDOWPLACEMENT wp;
-		wp.length = sizeof(WINDOWPLACEMENT);
-		if (GetWindowPlacement(hWnd, &wp) && wp.showCmd == SW_SHOWMAXIMIZED) {
-			LPNCCALCSIZE_PARAMS params = (LPNCCALCSIZE_PARAMS)lParam;
-			LPRECT r = (wParam == TRUE) ? &params->rgrc[0] : (LPRECT)lParam;
-			HMONITOR hMonitor = MonitorFromPoint({ (r->left + r->right) / 2, (r->top + r->bottom) / 2 }, MONITOR_DEFAULTTONEAREST);
-			if (hMonitor) {
-				MONITORINFO mi;
-				mi.cbSize = sizeof(mi);
-				if (GetMonitorInfo(hMonitor, &mi)) {
-					*r = mi.rcWork;
-					UINT uEdge = (UINT)-1;
-					if (IsTaskbarAutoHidden(&mi.rcMonitor, &uEdge)) {
-						switch (uEdge) {
-						case ABE_LEFT: r->left += 1; break;
-						case ABE_RIGHT: r->right -= 1; break;
-						case ABE_TOP: r->top += 1; break;
-						case ABE_BOTTOM: r->bottom -= 1; break;
-						}
-					}
-				}
-			}
-		}
+		//WINDOWPLACEMENT wp;
+		//wp.length = sizeof(WINDOWPLACEMENT);
+		//if (GetWindowPlacement(hWnd, &wp) && wp.showCmd == SW_SHOWMAXIMIZED) {
+		//	LPNCCALCSIZE_PARAMS params = (LPNCCALCSIZE_PARAMS)lParam;
+		//	LPRECT r = (wParam == TRUE) ? &params->rgrc[0] : (LPRECT)lParam;
+		//	HMONITOR hMonitor = MonitorFromPoint({ (r->left + r->right) / 2, (r->top + r->bottom) / 2 }, MONITOR_DEFAULTTONEAREST);
+		//	if (hMonitor) {
+		//		MONITORINFO mi;
+		//		mi.cbSize = sizeof(mi);
+		//		if (GetMonitorInfo(hMonitor, &mi)) {
+		//			*r = mi.rcWork;
+		//			UINT uEdge = (UINT)-1;
+		//			if (IsTaskbarAutoHidden(&mi.rcMonitor, &uEdge)) {
+		//				switch (uEdge) {
+		//				case ABE_LEFT: r->left += 1; break;
+		//				case ABE_RIGHT: r->right -= 1; break;
+		//				case ABE_TOP: r->top += 1; break;
+		//				case ABE_BOTTOM: r->bottom -= 1; break;
+		//				}
+		//			}
+		//		}
+		//	}
+		//}
 		if (result) *result = 0;
 		return true;
 	}
diff --git a/Telegram/SourceFiles/storage/storage_account.cpp b/Telegram/SourceFiles/storage/storage_account.cpp
index 0a541a023..ee882fc6a 100644
--- a/Telegram/SourceFiles/storage/storage_account.cpp
+++ b/Telegram/SourceFiles/storage/storage_account.cpp
@@ -51,6 +51,7 @@ constexpr auto kSinglePeerTypeChat = qint32(2);
 constexpr auto kSinglePeerTypeChannel = qint32(3);
 constexpr auto kSinglePeerTypeSelf = qint32(4);
 constexpr auto kSinglePeerTypeEmpty = qint32(0);
+constexpr auto kMultiDraftTag = quint64(0xFFFFFFFFFFFFFF01ULL);
 
 enum { // Local Storage Keys
 	lskUserMap = 0x00,
@@ -936,80 +937,200 @@ std::unique_ptr<MTP::Config> Account::readMtpConfig() {
 	return MTP::Config::FromSerialized(serialized);
 }
 
-void Account::writeDrafts(not_null<History*> history) {
-	Storage::MessageDraft storedLocalDraft, storedEditDraft;
-	MessageCursor localCursor, editCursor;
-	if (const auto localDraft = history->localDraft()) {
-		if (_owner->session().supportMode()
-			|| !Data::draftsAreEqual(localDraft, history->cloudDraft())) {
-			storedLocalDraft = Storage::MessageDraft{
-				localDraft->msgId,
-				localDraft->textWithTags,
-				localDraft->previewCancelled
-			};
-			localCursor = localDraft->cursor;
+template <typename Callback>
+void EnumerateDrafts(
+		const Data::HistoryDrafts &map,
+		Data::Draft *cloudDraft,
+		bool supportMode,
+		Data::DraftKey replaceKey,
+		const MessageDraft &replaceDraft,
+		const MessageCursor &replaceCursor,
+		Callback &&callback) {
+	for (const auto &[key, draft] : map) {
+		if (key == Data::DraftKey::Cloud() || key == replaceKey) {
+			continue;
+		} else if (key == Data::DraftKey::Local()
+			&& !supportMode
+			&& Data::draftsAreEqual(draft.get(), cloudDraft)) {
+			continue;
 		}
+		callback(
+			key,
+			draft->msgId,
+			draft->textWithTags,
+			draft->previewCancelled,
+			draft->cursor);
 	}
-	if (const auto editDraft = history->editDraft()) {
-		storedEditDraft = Storage::MessageDraft{
-			editDraft->msgId,
-			editDraft->textWithTags,
-			editDraft->previewCancelled
-		};
-		editCursor = editDraft->cursor;
+	if (replaceKey
+		&& (replaceDraft.msgId
+			|| !replaceDraft.textWithTags.text.isEmpty()
+			|| replaceCursor != MessageCursor())) {
+		callback(
+			replaceKey,
+			replaceDraft.msgId,
+			replaceDraft.textWithTags,
+			replaceDraft.previewCancelled,
+			replaceCursor);
 	}
-	writeDrafts(
-		history->peer->id,
-		storedLocalDraft,
-		storedEditDraft);
-	writeDraftCursors(history->peer->id, localCursor, editCursor);
 }
 
 void Account::writeDrafts(
-		const PeerId &peer,
-		const MessageDraft &localDraft,
-		const MessageDraft &editDraft) {
-	if (localDraft.msgId <= 0 && localDraft.textWithTags.text.isEmpty() && editDraft.msgId <= 0) {
-		auto i = _draftsMap.find(peer);
+		not_null<History*> history,
+		Data::DraftKey replaceKey,
+		MessageDraft replaceDraft) {
+	const auto peerId = history->peer->id;
+	const auto &map = history->draftsMap();
+	const auto cloudIt = map.find(Data::DraftKey::Cloud());
+	const auto cloudDraft = (cloudIt != end(map))
+		? cloudIt->second.get()
+		: nullptr;
+	const auto supportMode = _owner->session().supportMode();
+	auto count = 0;
+	EnumerateDrafts(
+		map,
+		cloudDraft,
+		supportMode,
+		replaceKey,
+		replaceDraft,
+		MessageCursor(),
+		[&](auto&&...) { ++count; });
+	if (!count) {
+		auto i = _draftsMap.find(peerId);
 		if (i != _draftsMap.cend()) {
 			ClearKey(i->second, _basePath);
 			_draftsMap.erase(i);
 			writeMapDelayed();
 		}
 
-		_draftsNotReadMap.remove(peer);
-	} else {
-		auto i = _draftsMap.find(peer);
-		if (i == _draftsMap.cend()) {
-			i = _draftsMap.emplace(peer, GenerateKey(_basePath)).first;
-			writeMapQueued();
-		}
-
-		auto msgTags = TextUtilities::SerializeTags(
-			localDraft.textWithTags.tags);
-		auto editTags = TextUtilities::SerializeTags(
-			editDraft.textWithTags.tags);
-
-		int size = sizeof(quint64);
-		size += Serialize::stringSize(localDraft.textWithTags.text) + Serialize::bytearraySize(msgTags) + 2 * sizeof(qint32);
-		size += Serialize::stringSize(editDraft.textWithTags.text) + Serialize::bytearraySize(editTags) + 2 * sizeof(qint32);
-
-		EncryptedDescriptor data(size);
-		data.stream << quint64(peer);
-		data.stream << localDraft.textWithTags.text << msgTags;
-		data.stream << qint32(localDraft.msgId) << qint32(localDraft.previewCancelled ? 1 : 0);
-		data.stream << editDraft.textWithTags.text << editTags;
-		data.stream << qint32(editDraft.msgId) << qint32(editDraft.previewCancelled ? 1 : 0);
-
-		FileWriteDescriptor file(i->second, _basePath);
-		file.writeEncrypted(data, _localKey);
-
-		_draftsNotReadMap.remove(peer);
+		_draftsNotReadMap.remove(peerId);
+		return;
 	}
+
+	auto i = _draftsMap.find(peerId);
+	if (i == _draftsMap.cend()) {
+		i = _draftsMap.emplace(peerId, GenerateKey(_basePath)).first;
+		writeMapQueued();
+	}
+
+	auto size = int(sizeof(quint64) * 2 + sizeof(quint32));
+	const auto sizeCallback = [&](
+			auto&&, // key
+			MsgId, // msgId
+			const TextWithTags &text,
+			bool, // previewCancelled
+			auto&&) { // cursor
+		size += sizeof(qint32) // key
+			+ Serialize::stringSize(text.text)
+			+ sizeof(quint32) + TextUtilities::SerializeTagsSize(text.tags)
+			+ 2 * sizeof(qint32); // msgId, previewCancelled
+	};
+	EnumerateDrafts(
+		map,
+		cloudDraft,
+		supportMode,
+		replaceKey,
+		replaceDraft,
+		MessageCursor(),
+		sizeCallback);
+
+	EncryptedDescriptor data(size);
+	data.stream
+		<< quint64(kMultiDraftTag)
+		<< quint64(peerId)
+		<< quint32(count);
+
+	const auto writeCallback = [&](
+			const Data::DraftKey &key,
+			MsgId msgId,
+			const TextWithTags &text,
+			bool previewCancelled,
+			auto&&) { // cursor
+		data.stream
+			<< key.serialize()
+			<< text.text
+			<< TextUtilities::SerializeTags(text.tags)
+			<< qint32(msgId)
+			<< qint32(previewCancelled ? 1 : 0);
+	};
+	EnumerateDrafts(
+		map,
+		cloudDraft,
+		supportMode,
+		replaceKey,
+		replaceDraft,
+		MessageCursor(),
+		writeCallback);
+
+	FileWriteDescriptor file(i->second, _basePath);
+	file.writeEncrypted(data, _localKey);
+
+	_draftsNotReadMap.remove(peerId);
 }
 
-void Account::clearDraftCursors(const PeerId &peer) {
-	const auto i = _draftCursorsMap.find(peer);
+void Account::writeDraftCursors(
+		not_null<History*> history,
+		Data::DraftKey replaceKey,
+		MessageCursor replaceCursor) {
+	const auto peerId = history->peer->id;
+	const auto &map = history->draftsMap();
+	const auto cloudIt = map.find(Data::DraftKey::Cloud());
+	const auto cloudDraft = (cloudIt != end(map))
+		? cloudIt->second.get()
+		: nullptr;
+	const auto supportMode = _owner->session().supportMode();
+	auto count = 0;
+	EnumerateDrafts(
+		map,
+		cloudDraft,
+		supportMode,
+		replaceKey,
+		MessageDraft(),
+		replaceCursor,
+		[&](auto&&...) { ++count; });
+	if (!count) {
+		clearDraftCursors(peerId);
+		return;
+	}
+	auto i = _draftCursorsMap.find(peerId);
+	if (i == _draftCursorsMap.cend()) {
+		i = _draftCursorsMap.emplace(peerId, GenerateKey(_basePath)).first;
+		writeMapQueued();
+	}
+
+	auto size = int(sizeof(quint64) * 2 + sizeof(quint32) * 4);
+
+	EncryptedDescriptor data(size);
+	data.stream
+		<< quint64(kMultiDraftTag)
+		<< quint64(peerId)
+		<< quint32(count);
+
+	const auto writeCallback = [&](
+			auto&&, // key
+			MsgId, // msgId
+			auto&&, // text
+			bool, // previewCancelled
+			const MessageCursor &cursor) { // cursor
+		data.stream
+			<< qint32(cursor.position)
+			<< qint32(cursor.anchor)
+			<< qint32(cursor.scroll);
+	};
+	EnumerateDrafts(
+		map,
+		cloudDraft,
+		supportMode,
+		replaceKey,
+		MessageDraft(),
+		replaceCursor,
+		writeCallback);
+
+	FileWriteDescriptor file(i->second, _basePath);
+	file.writeEncrypted(data, _localKey);
+}
+
+void Account::clearDraftCursors(PeerId peerId) {
+	const auto i = _draftCursorsMap.find(peerId);
 	if (i != _draftCursorsMap.cend()) {
 		ClearKey(i->second, _basePath);
 		_draftCursorsMap.erase(i);
@@ -1017,21 +1138,44 @@ void Account::clearDraftCursors(const PeerId &peer) {
 	}
 }
 
-void Account::readDraftCursors(
-		const PeerId &peer,
-		MessageCursor &localCursor,
-		MessageCursor &editCursor) {
-	const auto j = _draftCursorsMap.find(peer);
+void Account::readDraftCursors(PeerId peerId, Data::HistoryDrafts &map) {
+	const auto j = _draftCursorsMap.find(peerId);
 	if (j == _draftCursorsMap.cend()) {
 		return;
 	}
 
 	FileReadDescriptor draft;
 	if (!ReadEncryptedFile(draft, j->second, _basePath, _localKey)) {
-		clearDraftCursors(peer);
+		clearDraftCursors(peerId);
 		return;
 	}
-	quint64 draftPeer;
+	quint64 tag = 0;
+	draft.stream >> tag;
+	if (tag != kMultiDraftTag) {
+		readDraftCursorsLegacy(peerId, draft, tag, map);
+		return;
+	}
+	quint64 draftPeer = 0;
+	quint32 count = 0;
+	draft.stream >> draftPeer >> count;
+	if (!count || count > 1000 || draftPeer != peerId) {
+		clearDraftCursors(peerId);
+		return;
+	}
+	for (auto i = 0; i != count; ++i) {
+		qint32 position = 0, anchor = 0, scroll = QFIXED_MAX;
+		draft.stream >> position >> anchor >> scroll;
+		if (const auto i = map.find(Data::DraftKey::Local()); i != end(map)) {
+			i->second->cursor = MessageCursor(position, anchor, scroll);
+		}
+	}
+}
+
+void Account::readDraftCursorsLegacy(
+		PeerId peerId,
+		details::FileReadDescriptor &draft,
+		quint64 draftPeer,
+		Data::HistoryDrafts &map) {
 	qint32 localPosition = 0, localAnchor = 0, localScroll = QFIXED_MAX;
 	qint32 editPosition = 0, editAnchor = 0, editScroll = QFIXED_MAX;
 	draft.stream >> draftPeer >> localPosition >> localAnchor >> localScroll;
@@ -1039,40 +1183,109 @@ void Account::readDraftCursors(
 		draft.stream >> editPosition >> editAnchor >> editScroll;
 	}
 
-	if (draftPeer != peer) {
-		clearDraftCursors(peer);
+	if (draftPeer != peerId) {
+		clearDraftCursors(peerId);
 		return;
 	}
 
-	localCursor = MessageCursor(localPosition, localAnchor, localScroll);
-	editCursor = MessageCursor(editPosition, editAnchor, editScroll);
+	if (const auto i = map.find(Data::DraftKey::Local()); i != end(map)) {
+		i->second->cursor = MessageCursor(
+			localPosition,
+			localAnchor,
+			localScroll);
+	}
+	if (const auto i = map.find(Data::DraftKey::LocalEdit()); i != end(map)) {
+		i->second->cursor = MessageCursor(
+			editPosition,
+			editAnchor,
+			editScroll);
+	}
 }
 
 void Account::readDraftsWithCursors(not_null<History*> history) {
-	PeerId peer = history->peer->id;
-	if (!_draftsNotReadMap.remove(peer)) {
-		clearDraftCursors(peer);
+	const auto guard = gsl::finally([&] {
+		if (const auto migrated = history->migrateFrom()) {
+			readDraftsWithCursors(migrated);
+			migrated->clearLocalEditDraft();
+			history->takeLocalDraft(migrated);
+		}
+	});
+
+	PeerId peerId = history->peer->id;
+	if (!_draftsNotReadMap.remove(peerId)) {
+		clearDraftCursors(peerId);
 		return;
 	}
 
-	const auto j = _draftsMap.find(peer);
+	const auto j = _draftsMap.find(peerId);
 	if (j == _draftsMap.cend()) {
-		clearDraftCursors(peer);
+		clearDraftCursors(peerId);
 		return;
 	}
 	FileReadDescriptor draft;
 	if (!ReadEncryptedFile(draft, j->second, _basePath, _localKey)) {
 		ClearKey(j->second, _basePath);
 		_draftsMap.erase(j);
-		clearDraftCursors(peer);
+		clearDraftCursors(peerId);
 		return;
 	}
 
+	quint64 tag = 0;
+	draft.stream >> tag;
+	if (tag != kMultiDraftTag) {
+		readDraftsWithCursorsLegacy(history, draft, tag);
+		return;
+	}
+	quint32 count = 0;
 	quint64 draftPeer = 0;
+	draft.stream >> draftPeer >> count;
+	if (!count || count > 1000 || draftPeer != peerId) {
+		ClearKey(j->second, _basePath);
+		_draftsMap.erase(j);
+		clearDraftCursors(peerId);
+		return;
+	}
+	auto map = Data::HistoryDrafts();
+	for (auto i = 0; i != count; ++i) {
+		TextWithTags data;
+		QByteArray tagsSerialized;
+		qint32 keyValue = 0, messageId = 0, previewCancelled = 0;
+		draft.stream
+			>> keyValue
+			>> data.text
+			>> tagsSerialized
+			>> messageId
+			>> previewCancelled;
+		data.tags = TextUtilities::DeserializeTags(
+			tagsSerialized,
+			data.text.size());
+		const auto key = Data::DraftKey::FromSerialized(keyValue);
+		if (key && key != Data::DraftKey::Cloud()) {
+			map.emplace(key, std::make_unique<Data::Draft>(
+				data,
+				messageId,
+				MessageCursor(),
+				previewCancelled));
+		}
+	}
+	if (draft.stream.status() != QDataStream::Ok) {
+		ClearKey(j->second, _basePath);
+		_draftsMap.erase(j);
+		clearDraftCursors(peerId);
+		return;
+	}
+	readDraftCursors(peerId, map);
+	history->setDraftsMap(std::move(map));
+}
+
+void Account::readDraftsWithCursorsLegacy(
+		not_null<History*> history,
+		details::FileReadDescriptor &draft,
+		quint64 draftPeer) {
 	TextWithTags msgData, editData;
 	QByteArray msgTagsSerialized, editTagsSerialized;
 	qint32 msgReplyTo = 0, msgPreviewCancelled = 0, editMsgId = 0, editPreviewCancelled = 0;
-	draft.stream >> draftPeer >> msgData.text;
+	draft.stream >> msgData.text;
 	if (draft.version >= 9048) {
 		draft.stream >> msgTagsSerialized;
 	}
@@ -1089,10 +1302,14 @@ void Account::readDraftsWithCursors(not_null<History*> history) {
 			}
 		}
 	}
-	if (draftPeer != peer) {
-		ClearKey(j->second, _basePath);
-		_draftsMap.erase(j);
-		clearDraftCursors(peer);
+	const auto peerId = history->peer->id;
+	if (draftPeer != peerId) {
+		const auto j = _draftsMap.find(peerId);
+		if (j != _draftsMap.cend()) {
+			ClearKey(j->second, _basePath);
+			_draftsMap.erase(j);
+		}
+		clearDraftCursors(peerId);
 		return;
 	}
 
@@ -1103,65 +1320,30 @@ void Account::readDraftsWithCursors(not_null<History*> history) {
 		editTagsSerialized,
 		editData.text.size());
 
-	MessageCursor msgCursor, editCursor;
-	readDraftCursors(peer, msgCursor, editCursor);
-
-	if (!history->localDraft()) {
-		if (msgData.text.isEmpty() && !msgReplyTo) {
-			history->clearLocalDraft();
-		} else {
-			history->setLocalDraft(std::make_unique<Data::Draft>(
-				msgData,
-				msgReplyTo,
-				msgCursor,
-				msgPreviewCancelled));
-		}
+	auto map = base::flat_map<Data::DraftKey, std::unique_ptr<Data::Draft>>();
+	if (!msgData.text.isEmpty() || msgReplyTo) {
+		map.emplace(Data::DraftKey::Local(), std::make_unique<Data::Draft>(
+			msgData,
+			msgReplyTo,
+			MessageCursor(),
+			msgPreviewCancelled));
 	}
-	if (!editMsgId) {
-		history->clearEditDraft();
-	} else {
-		history->setEditDraft(std::make_unique<Data::Draft>(
+	if (editMsgId) {
+		map.emplace(Data::DraftKey::LocalEdit(), std::make_unique<Data::Draft>(
 			editData,
 			editMsgId,
-			editCursor,
+			MessageCursor(),
 			editPreviewCancelled));
 	}
+	readDraftCursors(peerId, map);
+	history->setDraftsMap(std::move(map));
 }
 
-void Account::writeDraftCursors(
-		const PeerId &peer,
-		const MessageCursor &msgCursor,
-		const MessageCursor &editCursor) {
-	if (msgCursor == MessageCursor() && editCursor == MessageCursor()) {
-		clearDraftCursors(peer);
-	} else {
-		auto i = _draftCursorsMap.find(peer);
-		if (i == _draftCursorsMap.cend()) {
-			i = _draftCursorsMap.emplace(peer, GenerateKey(_basePath)).first;
-			writeMapQueued();
-		}
-
-		EncryptedDescriptor data(sizeof(quint64) + sizeof(qint32) * 3);
-		data.stream
-			<< quint64(peer)
-			<< qint32(msgCursor.position)
-			<< qint32(msgCursor.anchor)
-			<< qint32(msgCursor.scroll);
-		data.stream
-			<< qint32(editCursor.position)
-			<< qint32(editCursor.anchor)
-			<< qint32(editCursor.scroll);
-
-		FileWriteDescriptor file(i->second, _basePath);
-		file.writeEncrypted(data, _localKey);
-	}
-}
-
-bool Account::hasDraftCursors(const PeerId &peer) {
+bool Account::hasDraftCursors(PeerId peer) {
 	return _draftCursorsMap.contains(peer);
 }
 
-bool Account::hasDraft(const PeerId &peer) {
+bool Account::hasDraft(PeerId peer) {
 	return _draftsMap.contains(peer);
 }
 
diff --git a/Telegram/SourceFiles/storage/storage_account.h b/Telegram/SourceFiles/storage/storage_account.h
index d40e4638b..1aeb64d0b 100644
--- a/Telegram/SourceFiles/storage/storage_account.h
+++ b/Telegram/SourceFiles/storage/storage_account.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "storage/cache/storage_cache_database.h"
 #include "data/stickers/data_stickers_set.h"
+#include "data/data_drafts.h"
 
 class History;
 
@@ -39,6 +40,7 @@ using AuthKeyPtr = std::shared_ptr<AuthKey>;
 namespace Storage {
 namespace details {
 struct ReadSettingsContext;
+struct FileReadDescriptor;
 } // namespace details
 
 class EncryptionKey;
@@ -76,18 +78,17 @@ public:
 	void writeMtpData();
 	void writeMtpConfig();
 
-	void writeDrafts(not_null<History*> history);
 	void writeDrafts(
-		const PeerId &peer,
-		const MessageDraft &localDraft,
-		const MessageDraft &editDraft);
+		not_null<History*> history,
+		Data::DraftKey replaceKey = Data::DraftKey::None(),
+		MessageDraft replaceDraft = MessageDraft());
 	void readDraftsWithCursors(not_null<History*> history);
 	void writeDraftCursors(
-		const PeerId &peer,
-		const MessageCursor &localCursor,
-		const MessageCursor &editCursor);
-	[[nodiscard]] bool hasDraftCursors(const PeerId &peer);
-	[[nodiscard]] bool hasDraft(const PeerId &peer);
+		not_null<History*> history,
+		Data::DraftKey replaceKey = Data::DraftKey::None(),
+		MessageCursor replaceCursor = MessageCursor());
+	[[nodiscard]] bool hasDraftCursors(PeerId peerId);
+	[[nodiscard]] bool hasDraft(PeerId peerId);
 
 	void writeFileLocation(MediaKey location, const Core::FileLocation &local);
 	[[nodiscard]] Core::FileLocation readFileLocation(MediaKey location);
@@ -182,11 +183,17 @@ private:
 	std::unique_ptr<Main::SessionSettings> applyReadContext(
 		details::ReadSettingsContext &&context);
 
-	void readDraftCursors(
-		const PeerId &peer,
-		MessageCursor &localCursor,
-		MessageCursor &editCursor);
-	void clearDraftCursors(const PeerId &peer);
+	void readDraftCursors(PeerId peerId, Data::HistoryDrafts &map);
+	void readDraftCursorsLegacy(
+		PeerId peerId,
+		details::FileReadDescriptor &draft,
+		quint64 draftPeer,
+		Data::HistoryDrafts &map);
+	void clearDraftCursors(PeerId peerId);
+	void readDraftsWithCursorsLegacy(
+		not_null<History*> history,
+		details::FileReadDescriptor &draft,
+		quint64 draftPeer);
 
 	void writeStickerSet(
 		QDataStream &stream,
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 660026281..02218bd02 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -617,7 +617,9 @@ void Filler::addPollAction(not_null<PeerData*> peer) {
 		? Api::SendType::Scheduled
 		: Api::SendType::Normal;
 	const auto flag = PollData::Flags();
-	const auto replyToId = _request.currentReplyToId;
+	const auto replyToId = _request.currentReplyToId
+		? _request.currentReplyToId
+		: _request.rootId;
 	auto callback = [=] {
 		PeerMenuCreatePoll(
 			controller,

From 81723a5d19fcec395c1dc846a39dee9b6810ef28 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 12 Nov 2020 16:04:21 +0300
Subject: [PATCH 098/370] Slightly improved voice lock design.

---
 .../{lock => voice_lock}/record_lock_body.png | Bin
 .../record_lock_body@2x.png                   | Bin
 .../record_lock_body@3x.png                   | Bin
 .../record_lock_body_shadow.png               | Bin
 .../record_lock_body_shadow@2x.png            | Bin
 .../record_lock_body_shadow@3x.png            | Bin
 .../record_lock_bottom.png                    | Bin
 .../record_lock_bottom@2x.png                 | Bin
 .../record_lock_bottom@3x.png                 | Bin
 .../record_lock_bottom_shadow.png             | Bin
 .../record_lock_bottom_shadow@2x.png          | Bin
 .../record_lock_bottom_shadow@3x.png          | Bin
 .../{lock => voice_lock}/record_lock_top.png  | Bin
 .../record_lock_top@2x.png                    | Bin
 .../record_lock_top@3x.png                    | Bin
 .../record_lock_top_shadow.png                | Bin
 .../record_lock_top_shadow@2x.png             | Bin
 .../record_lock_top_shadow@3x.png             | Bin
 .../icons/voice_lock/voice_arrow.png          | Bin 0 -> 354 bytes
 .../icons/voice_lock/voice_arrow@2x.png       | Bin 0 -> 544 bytes
 .../icons/voice_lock/voice_arrow@3x.png       | Bin 0 -> 818 bytes
 Telegram/SourceFiles/ui/chat/chat.style       |  20 +++++++++---------
 22 files changed, 10 insertions(+), 10 deletions(-)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_body.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_body@2x.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_body@3x.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_body_shadow.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_body_shadow@2x.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_body_shadow@3x.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_bottom.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_bottom@2x.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_bottom@3x.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_bottom_shadow.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_bottom_shadow@2x.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_bottom_shadow@3x.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_top.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_top@2x.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_top@3x.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_top_shadow.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_top_shadow@2x.png (100%)
 rename Telegram/Resources/icons/{lock => voice_lock}/record_lock_top_shadow@3x.png (100%)
 create mode 100644 Telegram/Resources/icons/voice_lock/voice_arrow.png
 create mode 100644 Telegram/Resources/icons/voice_lock/voice_arrow@2x.png
 create mode 100644 Telegram/Resources/icons/voice_lock/voice_arrow@3x.png

diff --git a/Telegram/Resources/icons/lock/record_lock_body.png b/Telegram/Resources/icons/voice_lock/record_lock_body.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_body.png
rename to Telegram/Resources/icons/voice_lock/record_lock_body.png
diff --git a/Telegram/Resources/icons/lock/record_lock_body@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_body@2x.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_body@2x.png
rename to Telegram/Resources/icons/voice_lock/record_lock_body@2x.png
diff --git a/Telegram/Resources/icons/lock/record_lock_body@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_body@3x.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_body@3x.png
rename to Telegram/Resources/icons/voice_lock/record_lock_body@3x.png
diff --git a/Telegram/Resources/icons/lock/record_lock_body_shadow.png b/Telegram/Resources/icons/voice_lock/record_lock_body_shadow.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_body_shadow.png
rename to Telegram/Resources/icons/voice_lock/record_lock_body_shadow.png
diff --git a/Telegram/Resources/icons/lock/record_lock_body_shadow@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@2x.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_body_shadow@2x.png
rename to Telegram/Resources/icons/voice_lock/record_lock_body_shadow@2x.png
diff --git a/Telegram/Resources/icons/lock/record_lock_body_shadow@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@3x.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_body_shadow@3x.png
rename to Telegram/Resources/icons/voice_lock/record_lock_body_shadow@3x.png
diff --git a/Telegram/Resources/icons/lock/record_lock_bottom.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_bottom.png
rename to Telegram/Resources/icons/voice_lock/record_lock_bottom.png
diff --git a/Telegram/Resources/icons/lock/record_lock_bottom@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom@2x.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_bottom@2x.png
rename to Telegram/Resources/icons/voice_lock/record_lock_bottom@2x.png
diff --git a/Telegram/Resources/icons/lock/record_lock_bottom@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom@3x.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_bottom@3x.png
rename to Telegram/Resources/icons/voice_lock/record_lock_bottom@3x.png
diff --git a/Telegram/Resources/icons/lock/record_lock_bottom_shadow.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_bottom_shadow.png
rename to Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow.png
diff --git a/Telegram/Resources/icons/lock/record_lock_bottom_shadow@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@2x.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_bottom_shadow@2x.png
rename to Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@2x.png
diff --git a/Telegram/Resources/icons/lock/record_lock_bottom_shadow@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@3x.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_bottom_shadow@3x.png
rename to Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@3x.png
diff --git a/Telegram/Resources/icons/lock/record_lock_top.png b/Telegram/Resources/icons/voice_lock/record_lock_top.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_top.png
rename to Telegram/Resources/icons/voice_lock/record_lock_top.png
diff --git a/Telegram/Resources/icons/lock/record_lock_top@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_top@2x.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_top@2x.png
rename to Telegram/Resources/icons/voice_lock/record_lock_top@2x.png
diff --git a/Telegram/Resources/icons/lock/record_lock_top@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_top@3x.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_top@3x.png
rename to Telegram/Resources/icons/voice_lock/record_lock_top@3x.png
diff --git a/Telegram/Resources/icons/lock/record_lock_top_shadow.png b/Telegram/Resources/icons/voice_lock/record_lock_top_shadow.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_top_shadow.png
rename to Telegram/Resources/icons/voice_lock/record_lock_top_shadow.png
diff --git a/Telegram/Resources/icons/lock/record_lock_top_shadow@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@2x.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_top_shadow@2x.png
rename to Telegram/Resources/icons/voice_lock/record_lock_top_shadow@2x.png
diff --git a/Telegram/Resources/icons/lock/record_lock_top_shadow@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@3x.png
similarity index 100%
rename from Telegram/Resources/icons/lock/record_lock_top_shadow@3x.png
rename to Telegram/Resources/icons/voice_lock/record_lock_top_shadow@3x.png
diff --git a/Telegram/Resources/icons/voice_lock/voice_arrow.png b/Telegram/Resources/icons/voice_lock/voice_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..e42af30b0712ad405631d5553f840fbb26d246f3
GIT binary patch
literal 354
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6-QsS%!O
zzP=1vKsE;hV|yk83y{SK#8N=az`(SC2`(bBfEmFCNgn(gJ{?G1^>lFz@!)+s#g?x{
zLBOq0SSv3fJ^7L03!A>V;uB8Kj3{Ih<~k%>5XK`>UvSWOMTyXyw3_@sJ!u?@GyFIG
zQc;fnpv|H7XG6!UU2an@CFmSy{4C4DpUmUqdzl4@o|~Vk_>r_>`nKF;)%~n_#fL?m
z8iKOEx_GT)js9WL7a+nK63QBM%35gu0rv8p_omEYjlI5Bde>RmJ71+I?OmXATH%iR
z#VF@_&-aP%7Z-49DCRqCpfl6@MyR=e(zD<D*n2*DPPi%keA+U(Z~DK~kC-n?$U3R~
Yiz!#%N4Zdj+Y{tbPgg&ebxsLQ0H1+$&;S4c

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/voice_lock/voice_arrow@2x.png b/Telegram/Resources/icons/voice_lock/voice_arrow@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8196558adb12b620e4b737ecc1627bc5513655f
GIT binary patch
literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G|u)CkWs
zUtb0-Ae)1Mu|1Q41;}CqVksbIU|?Fn1Q#(_z>HvnB!B$(GXpA~?CIhdlEM0Rx^GvD
zfk5l!dB^vve_+~sm3haf=R8e6iaFmuJ*KSj!tdmad3+|u!jmIB*%r14aClz*eQ&e#
zZ-tf%$#=ee%v=3OSBCMQwWAM%FoRXYdVvcL9}0aKauhc(s4<ub)W`@kM04mQ=r)@8
zp0wyokzf-#ZW!?FXW=*7gpw_}-uClr?`Mj*x>eU?Y}20CY|x=|I>%uK^NU@5uSL&Q
z&YRt4z`Q_dUa(|a1M{Dn=Q}TKzNx^%^T4MjG<3`RYQ=WNj@JxEAKxtdU~}H=h$(~U
z$3Lq!^DN|FpnQ+9Mecy;$7zaJ7!@ArI;~(d@m1dAdn5NS>#8%G?jQMR@3nlMi~^5y
z@*~R!l1H}XUin@d%3<jcIjx@Qh1L0^pMUZwc?uOXoPYjVoFQZnj}iw{F~ge3*y|;+
z;a0xFx?N6NcU-cY#$ucjDQ0zkbJ*YGw>y(3*}E$jxqOuRboZC_x+~Y2E=*7P-?G);
z>-VMo)(Q>U%Ux>?7$+L9yJpB3?$`Y*fk`PnW^FRlx;bKB53;zN+Yz<DmMOmbq|Ksb
SG9sWTX7F_Nb6Mw<&;$US+RUi{

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/voice_lock/voice_arrow@3x.png b/Telegram/Resources/icons/voice_lock/voice_arrow@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..83b3cfb88fcfd6764ab740c7809ef50c86518f51
GIT binary patch
literal 818
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Ea{HEjtmSN`?>!lvI6-QsS%!O
zzP=1vKsE;hV|yk83y{SK#8N=az`(SC2`=KXfEmFCNpAj`auuj#si%u$NCo5DoBO+7
zIY_X6xOw{MF>wK%ErMG%Y!cma?b^9(htfA}-~2&TNB4;Oh7H>;#Oa70@e2vL@?PyU
zTi&#@^DK;K&U_@zky!jG{m<J-a}{|fj!$B8f=u;F+de<jXJlgvO;BKCVp4d<W+))Q
zU})aa*uc=S(~*aT#o-KZl7a$5Ql0=aBcniZvjhi6!wl&o4h{@Q?m)FLF4(VNF82I$
zW#HPdqkrqfKmUw*^SwIxx|{f?_}>w+ReR+s4Mch#fAn};cKg+wf5scTjb-?lr(d|m
zzB)upPvItW*CEa&=bjsHjncjCQPv>f*YKrk?~2=RZ@C!pi-;c=RN3tC{*gsP3ZIAA
zaid9+3ZXLH9w(WP9<`L=d-DIe)8P-|<(nJ|3%A|Y73E@Gbv3KRYVHI<Nf$4^7qN35
zyt`_+B&8vxP{!pF|B|l95|iQ-VlDU-Uov0neataQZo!fQ8HXTtFDanOQWG?RCVz5h
zKFDzI!cS`!^TvbiA+h_5=U;hQ5+XnK1f!`GueJqaUd)o$U%ied1+sebWmwI1Qn-7T
zv!JOoW=Y-te7TH`5r4R*n4GirSbWh#%H!AG8$~<6Jp1wa#@n(*aqGLkR{j0VC$;_8
z`i@y=mwlMW<T9^xYm{qRA(Q6a7(MrYuV=nL98$c8Uu;(SmHD^RHZLr(lD+l)_r?d$
zKeQe=w~%}4>C{hk&GX-H`SaZ3@y8iPGkr4Vm!Dg{D}QCkqMJEx+i&;kP3QJi6F!x;
z+3WMqAG4-xpCrFB#LGsG|Do;TiT0hxl>h#;nScJg>(?z&4I%0eKYhFue@U-iV{UP>
j!h(|y#6>rb6!NIv_V&EfYTub8Knd5=)z4*}Q$iB}Yj#SR

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 7fead3ef5..b3a0f30ee 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -362,26 +362,26 @@ historyRecordTextLeft: 15px;
 historyRecordTextRight: 25px;
 
 historyRecordLockShowDuration: historyToDownDuration;
-historyRecordLockSize: size(75px, 150px);
+historyRecordLockSize: size(75px, 133px);
 
 historyRecordLockIconFg: historyToDownFg;
-historyRecordLockIconSize: size(14px, 18px);
+historyRecordLockIconSize: size(14px, 17px);
 historyRecordLockIconBottomHeight: 9px;
 historyRecordLockIconLineHeight: 2px;
 historyRecordLockIconLineSkip: 3px;
 historyRecordLockIconLineWidth: 2px;
 historyRecordLockIconArcHeight: 4px;
 
-historyRecordLockTopShadow: icon {{ "lock/record_lock_top_shadow", historyToDownShadow }};
-historyRecordLockTop: icon {{ "lock/record_lock_top", historyToDownBg }};
-historyRecordLockBottomShadow: icon {{ "lock/record_lock_bottom_shadow", historyToDownShadow }};
-historyRecordLockBottom: icon {{ "lock/record_lock_bottom", historyToDownBg }};
-historyRecordLockBodyShadow: icon {{ "lock/record_lock_body_shadow", historyToDownShadow }};
-historyRecordLockBody: icon {{ "lock/record_lock_body", historyToDownBg }};
+historyRecordLockTopShadow: icon {{ "voice_lock/record_lock_top_shadow", historyToDownShadow }};
+historyRecordLockTop: icon {{ "voice_lock/record_lock_top", historyToDownBg }};
+historyRecordLockBottomShadow: icon {{ "voice_lock/record_lock_bottom_shadow", historyToDownShadow }};
+historyRecordLockBottom: icon {{ "voice_lock/record_lock_bottom", historyToDownBg }};
+historyRecordLockBodyShadow: icon {{ "voice_lock/record_lock_body_shadow", historyToDownShadow }};
+historyRecordLockBody: icon {{ "voice_lock/record_lock_body", historyToDownBg }};
 historyRecordLockMargin: margins(4px, 4px, 4px, 4px);
-historyRecordLockArrow: icon {{ "history_down_arrow-flip_vertical", historyToDownFg }};
+historyRecordLockArrow: icon {{ "voice_lock/voice_arrow", historyToDownFg }};
 
-historyRecordLockPosition: historyToDownPosition;
+historyRecordLockPosition: point(7px, 35px);
 
 historySilentToggle: IconButton(historyBotKeyboardShow) {
 	icon: icon {{ "send_control_silent_off", historyComposeIconFg }};

From 131c2e1c565f6feae153b164700b1a16192faeba Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 5 Nov 2020 11:16:11 +0300
Subject: [PATCH 099/370] Slightly refactored waveform paint in voice messages.

---
 .../view/media/history_view_document.cpp      | 158 +++++++++++-------
 1 file changed, 100 insertions(+), 58 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 3795e115f..da4f6ad6a 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -61,6 +61,85 @@ constexpr auto kAudioVoiceMsgUpdateView = crl::time(100);
 	return result;
 }
 
+void PaintWaveform(
+		Painter &p,
+		const VoiceData *voiceData,
+		int availableWidth,
+		bool selected,
+		bool outbg,
+		float64 progress) {
+	const auto wf = [&]() -> const VoiceWaveform* {
+		if (!voiceData) {
+			return nullptr;
+		}
+		if (voiceData->waveform.isEmpty()) {
+			return nullptr;
+		} else if (voiceData->waveform.at(0) < 0) {
+			return nullptr;
+		}
+		return &voiceData->waveform;
+	}();
+
+	// Rescale waveform by going in waveform.size * bar_count 1D grid.
+	const auto active = outbg
+		? (selected
+			? st::msgWaveformOutActiveSelected
+			: st::msgWaveformOutActive)
+		: (selected
+			? st::msgWaveformInActiveSelected
+			: st::msgWaveformInActive);
+	const auto inactive = outbg
+		? (selected
+			? st::msgWaveformOutInactiveSelected
+			: st::msgWaveformOutInactive)
+		: (selected
+			? st::msgWaveformInInactiveSelected
+			: st::msgWaveformInInactive);
+	const auto wfSize = wf
+		? wf->size()
+		: ::Media::Player::kWaveformSamplesCount;
+	const auto activeWidth = std::round(availableWidth * progress);
+
+	const auto &barWidth = st::msgWaveformBar;
+	const auto barCount = std::min(
+		availableWidth / (barWidth + st::msgWaveformSkip),
+		wfSize);
+	const auto barNormValue = (wf ? voiceData->wavemax : 0) + 1;
+	const auto maxDelta = st::msgWaveformMax - st::msgWaveformMin;
+	const auto &bottom = st::msgWaveformMax;
+	p.setPen(Qt::NoPen);
+	for (auto i = 0, barLeft = 0, sum = 0, maxValue = 0; i < wfSize; ++i) {
+		const auto value = wf ? wf->at(i) : 0;
+		if (sum + barCount < wfSize) {
+			maxValue = std::max(maxValue, value);
+			sum += barCount;
+			continue;
+		}
+		// Draw bar.
+		sum = sum + barCount - wfSize;
+		if (sum < (barCount + 1) / 2) {
+			maxValue = std::max(maxValue, value);
+		}
+		const auto barValue = ((maxValue * maxDelta) + (barNormValue / 2))
+			/ barNormValue;
+		const auto barHeight = st::msgWaveformMin + barValue;
+		const auto barTop = bottom - barValue;
+
+		if ((barLeft < activeWidth) && (barLeft + barWidth > activeWidth)) {
+			const auto leftWidth = activeWidth - barLeft;
+			const auto rightWidth = barWidth - leftWidth;
+			p.fillRect(barLeft, barTop, leftWidth, barHeight, active);
+			p.fillRect(activeWidth, barTop, rightWidth, barHeight, inactive);
+		} else {
+			const auto &color = (barLeft >= activeWidth) ? inactive : active;
+			p.fillRect(barLeft, barTop, barWidth, barHeight, color);
+		}
+		barLeft += barWidth + st::msgWaveformSkip;
+
+		maxValue = (sum < (barCount + 1) / 2) ? 0 : value;
+	}
+}
+
 } // namespace
 
 Document::Document(
@@ -418,79 +497,42 @@ void Document::draw(
 	if (const auto voice = Get<HistoryDocumentVoice>()) {
 		ensureDataMediaCreated();
 
-		const VoiceWaveform *wf = nullptr;
-		uchar norm_value = 0;
 		if (const auto voiceData = _data->voice()) {
-			wf = &voiceData->waveform;
-			if (wf->isEmpty()) {
-				wf = nullptr;
+			if (voiceData->waveform.isEmpty()) {
 				if (loaded) {
 					Local::countVoiceWaveform(_dataMedia.get());
 				}
-			} else if (wf->at(0) < 0) {
-				wf = nullptr;
-			} else {
-				norm_value = voiceData->wavemax;
 			}
 		}
-		auto progress = ([voice] {
+
+		const auto progress = [&] {
+			if (!outbg
+				&& !voice->_playback
+				&& _realParent->hasUnreadMediaFlag()) {
+				return 1.;
+			}
 			if (voice->seeking()) {
 				return voice->seekingCurrent();
 			} else if (voice->_playback) {
 				return voice->_playback->progress.current();
 			}
 			return 0.;
-		})();
+		}();
 		if (voice->seeking()) {
-			voiceStatusOverride = Ui::FormatPlayedText(qRound(progress * voice->_lastDurationMs) / 1000, voice->_lastDurationMs / 1000);
+			voiceStatusOverride = Ui::FormatPlayedText(
+				std::round(progress * voice->_lastDurationMs) / 1000,
+				voice->_lastDurationMs / 1000);
 		}
 
-		// rescale waveform by going in waveform.size * bar_count 1D grid
-		auto active = outbg ? (selected ? st::msgWaveformOutActiveSelected : st::msgWaveformOutActive) : (selected ? st::msgWaveformInActiveSelected : st::msgWaveformInActive);
-		auto inactive = outbg ? (selected ? st::msgWaveformOutInactiveSelected : st::msgWaveformOutInactive) : (selected ? st::msgWaveformInInactiveSelected : st::msgWaveformInInactive);
-		auto wf_size = wf ? wf->size() : ::Media::Player::kWaveformSamplesCount;
-		auto availw = namewidth + st::msgWaveformSkip;
-		auto activew = qRound(availw * progress);
-		if (!outbg
-			&& !voice->_playback
-			&& _realParent->hasUnreadMediaFlag()) {
-			activew = availw;
-		}
-		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.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;
-			if (sum_i + bar_count >= wf_size) { // draw bar
-				sum_i = sum_i + bar_count - wf_size;
-				if (sum_i < (bar_count + 1) / 2) {
-					if (max_value < value) max_value = value;
-				}
-				auto bar_value = ((max_value * max_delta) + ((norm_value + 1) / 2)) / (norm_value + 1);
-
-				if (bar_x >= activew) {
-					p.fillRect(nameleft + bar_x, bottom - bar_value, st::msgWaveformBar, st::msgWaveformMin + bar_value, inactive);
-				} else if (bar_x + st::msgWaveformBar <= activew) {
-					p.fillRect(nameleft + bar_x, bottom - bar_value, st::msgWaveformBar, st::msgWaveformMin + bar_value, active);
-				} else {
-					p.fillRect(nameleft + bar_x, bottom - bar_value, activew - bar_x, st::msgWaveformMin + bar_value, active);
-					p.fillRect(nameleft + activew, bottom - bar_value, st::msgWaveformBar - (activew - bar_x), st::msgWaveformMin + bar_value, inactive);
-				}
-				bar_x += st::msgWaveformBar + st::msgWaveformSkip;
-
-				if (sum_i < (bar_count + 1) / 2) {
-					max_value = 0;
-				} else {
-					max_value = value;
-				}
-			} else {
-				if (max_value < value) max_value = value;
-
-				sum_i += bar_count;
-			}
-		}
+		p.save();
+		p.translate(nameleft, st.padding.top() - topMinus);
+		PaintWaveform(p,
+			_data->voice(),
+			namewidth + st::msgWaveformSkip,
+			selected,
+			outbg,
+			progress);
+		p.restore();
 	} else if (auto named = Get<HistoryDocumentNamed>()) {
 		p.setFont(st::semiboldFont);
 		p.setPen(outbg ? (selected ? st::historyFileNameOutFgSelected : st::historyFileNameOutFg) : (selected ? st::historyFileNameInFgSelected : st::historyFileNameInFg));

From 647cbc546424de316b4dc61a745129e77fa4a39f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 6 Nov 2020 21:29:51 +0300
Subject: [PATCH 100/370] Added initial ability to delete recorded voice data.

---
 .../history_view_voice_record_bar.cpp         | 170 ++++++++++++++++--
 .../controls/history_view_voice_record_bar.h  |  14 +-
 Telegram/SourceFiles/ui/chat/chat.style       |   5 +
 3 files changed, 175 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 29a765397..ec98faa41 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/event_filter.h"
 #include "boxes/confirm_box.h"
 #include "core/application.h"
+#include "data/data_document.h"
 #include "history/view/controls/history_view_voice_record_button.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
@@ -60,14 +61,93 @@ enum class FilterType {
 		.arg(decimalPart);
 }
 
+[[nodiscard]] std::unique_ptr<VoiceData> ProcessCaptureResult(
+		const ::Media::Capture::Result &data) {
+	auto voiceData = std::make_unique<VoiceData>();
+	voiceData->duration = Duration(data.samples);
+	voiceData->waveform = data.waveform;
+	voiceData->wavemax = voiceData->waveform.empty()
+		? uchar(0)
+		: *ranges::max_element(voiceData->waveform);
+	return voiceData;
+}
+
 } // namespace
 
+class ListenWrap final {
+public:
+	ListenWrap(
+		not_null<Ui::RpWidget*> parent,
+		const ::Media::Capture::Result &data);
+
+	void requestPaintProgress(float64 progress);
+	rpl::producer<> stopRequests() const;
+
+	rpl::lifetime &lifetime();
+
+private:
+	void init();
+
+	not_null<Ui::RpWidget*> _parent;
+
+	const std::unique_ptr<VoiceData> _voiceData;
+	const style::IconButton &_stDelete;
+	base::unique_qptr<Ui::IconButton> _delete;
+
+	rpl::variable<float64> _showProgress = 0.;
+
+	rpl::lifetime _lifetime;
+
+};
+
+ListenWrap::ListenWrap(
+	not_null<Ui::RpWidget*> parent,
+	const ::Media::Capture::Result &data)
+: _parent(parent)
+, _voiceData(ProcessCaptureResult(data))
+, _stDelete(st::historyRecordDelete)
+, _delete(base::make_unique_q<Ui::IconButton>(parent, _stDelete)) {
+	init();
+}
+
+void ListenWrap::init() {
+	auto deleteShow = _showProgress.value(
+	) | rpl::map([](auto value) {
+		return value == 1.;
+	}) | rpl::distinct_until_changed();
+	_delete->showOn(std::move(deleteShow));
+
+	_parent->paintRequest(
+	) | rpl::start_with_next([=](const QRect &clip) {
+		const auto progress = _showProgress.current();
+		if (progress == 0. || progress == 1.) {
+			return;
+		}
+		Painter p(_parent);
+		p.setOpacity(progress);
+		_stDelete.icon.paint(p, _stDelete.iconPosition, _parent->width());
+	}, _lifetime);
+}
+
+void ListenWrap::requestPaintProgress(float64 progress) {
+	_showProgress = progress;
+}
+
+rpl::producer<> ListenWrap::stopRequests() const {
+	return _delete->clicks() | rpl::to_empty;
+}
+
+rpl::lifetime &ListenWrap::lifetime() {
+	return _lifetime;
+}
+
 class RecordLock final : public Ui::RpWidget {
 public:
 	RecordLock(not_null<Ui::RpWidget*> parent);
 
 	void requestPaintProgress(float64 progress);
 
+	[[nodiscard]] rpl::producer<> stops() const;
 	[[nodiscard]] rpl::producer<> locks() const;
 	[[nodiscard]] bool isLocked() const;
 
@@ -102,10 +182,11 @@ RecordLock::RecordLock(not_null<Ui::RpWidget*> parent)
 }
 
 void RecordLock::init() {
-	setAttribute(Qt::WA_TransparentForMouseEvents);
 	shownValue(
 	) | rpl::start_with_next([=](bool shown) {
 		if (!shown) {
+			setCursor(style::cur_default);
+			setAttribute(Qt::WA_TransparentForMouseEvents, true);
 			_lockAnimation.stop();
 			_lockEnderAnimation.stop();
 			_progress = 0.;
@@ -129,8 +210,17 @@ void RecordLock::init() {
 
 	locks(
 	) | rpl::start_with_next([=] {
-		const auto duration = st::historyRecordVoiceShowDuration;
-		_lockAnimation.start([=] { update(); }, 0., 1., duration);
+		const auto &duration = st::historyRecordVoiceShowDuration;
+		const auto from = 0.;
+		const auto to = 1.;
+		auto callback = [=](auto value) {
+			update();
+			if (value == to) {
+				setCursor(style::cur_pointer);
+				setAttribute(Qt::WA_TransparentForMouseEvents, false);
+			}
+		};
+		_lockAnimation.start(std::move(callback), from, to, duration);
 	}, lifetime());
 }
 
@@ -282,6 +372,15 @@ rpl::producer<> RecordLock::locks() const {
 	) | rpl::filter([=] { return isLocked(); }) | rpl::to_empty;
 }
 
+rpl::producer<> RecordLock::stops() const {
+	return events(
+	) | rpl::filter([=](not_null<QEvent*> e) {
+		return isLocked()
+			&& (_lockAnimation.value(1.) == 1.)
+			&& (e->type() == QEvent::MouseButtonRelease);
+	}) | rpl::to_empty;
+}
+
 VoiceRecordBar::VoiceRecordBar(
 	not_null<Ui::RpWidget*> parent,
 	not_null<Ui::RpWidget*> sectionWidget,
@@ -313,7 +412,7 @@ VoiceRecordBar::VoiceRecordBar(
 
 VoiceRecordBar::~VoiceRecordBar() {
 	if (isRecording()) {
-		stopRecording(false);
+		stopRecording(StopType::Cancel);
 	}
 }
 
@@ -395,6 +494,7 @@ void VoiceRecordBar::init() {
 		}
 		p.fillRect(clip, st::historyComposeAreaBg);
 
+		p.setOpacity(std::min(p.opacity(), 1. - showListenAnimationRatio()));
 		if (clip.intersects(_messageRect)) {
 			// The message should be painted first to avoid flickering.
 			drawMessage(p, activeAnimationRatio());
@@ -430,6 +530,29 @@ void VoiceRecordBar::init() {
 		_showLockAnimation.start(std::move(callback), from, to, duration);
 	}, lifetime());
 
+	_lock->stops(
+	) | rpl::start_with_next([=] {
+		::Media::Capture::instance()->startedChanges(
+		) | rpl::filter([](auto capturing) {
+			return !capturing;
+		}) | rpl::take(1) | rpl::start_with_next([=] {
+			Assert(_listen != nullptr);
+
+			_lockShowing = false;
+
+			const auto to = 1.;
+			const auto &duration = st::historyRecordVoiceShowDuration;
+			auto callback = [=](auto value) {
+				_listen->requestPaintProgress(value);
+				_level->requestPaintProgress(to - value);
+				update();
+			};
+			_showListenAnimation.start(std::move(callback), 0., to, duration);
+		}, lifetime());
+
+		stopRecording(StopType::Listen);
+	}, lifetime());
+
 	_lock->locks(
 	) | rpl::start_with_next([=] {
 		installClickOutsideFilter();
@@ -504,7 +627,11 @@ void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
 	const auto from = show ? 0. : 1.;
 	const auto duration = st::historyRecordVoiceShowDuration;
 	auto animationCallback = [=, callback = std::move(callback)](auto value) {
-		_level->requestPaintProgress(value);
+		if (!_listen) {
+			_level->requestPaintProgress(value);
+		} else {
+			_listen->requestPaintProgress(value);
+		}
 		update();
 		if ((show && value == 1.) || (!show && value == 0.)) {
 			if (callback) {
@@ -621,7 +748,7 @@ void VoiceRecordBar::stop(bool send) {
 	auto disappearanceCallback = [=] {
 		hide();
 
-		stopRecording(send);
+		stopRecording(send ? StopType::Send : StopType::Cancel);
 	};
 	_lockShowing = false;
 	visibilityAnimate(false, std::move(disappearanceCallback));
@@ -637,6 +764,8 @@ void VoiceRecordBar::finish() {
 
 	_showAnimation.stop();
 
+	_listen = nullptr;
+
 	_sendActionUpdates.fire({ Api::SendProgressType::RecordVoice, -1 });
 	_controller->widget()->setInnerFocus();
 }
@@ -645,12 +774,12 @@ void VoiceRecordBar::hideFast() {
 	hide();
 	_lock->hide();
 	_level->hide();
-	stopRecording(false);
+	stopRecording(StopType::Cancel);
 }
 
-void VoiceRecordBar::stopRecording(bool send) {
+void VoiceRecordBar::stopRecording(StopType type) {
 	using namespace ::Media::Capture;
-	if (!send) {
+	if (type == StopType::Cancel) {
 		instance()->stop();
 		return;
 	}
@@ -661,7 +790,17 @@ void VoiceRecordBar::stopRecording(bool send) {
 
 		Window::ActivateWindow(_controller);
 		const auto duration = Duration(data.samples);
-		_sendVoiceRequests.fire({ data.bytes, data.waveform, duration });
+		if (type == StopType::Send) {
+			_sendVoiceRequests.fire({ data.bytes, data.waveform, duration });
+		} else if (type == StopType::Listen) {
+			_listen = std::make_unique<ListenWrap>(this, data);
+			_listen->stopRequests(
+			) | rpl::take(1) | rpl::start_with_next([=] {
+				visibilityAnimate(false, [=] { hide(); });
+			}, _listen->lifetime());
+
+			_lockShowing = false;
+		}
 	}));
 }
 
@@ -693,11 +832,12 @@ void VoiceRecordBar::drawRedCircle(Painter &p) {
 	p.setPen(Qt::NoPen);
 	p.setBrush(st::historyRecordVoiceFgInactive);
 
-	p.setOpacity(1. - _redCircleProgress);
+	const auto opacity = p.opacity();
+	p.setOpacity(opacity * (1. - _redCircleProgress));
 	const int radii = st::historyRecordSignalRadius * showAnimationRatio();
 	const auto center = _redCircleRect.center() + QPoint(1, 1);
 	p.drawEllipse(center, radii, radii);
-	p.setOpacity(1.);
+	p.setOpacity(opacity);
 }
 
 void VoiceRecordBar::drawMessage(Painter &p, float64 recordActive) {
@@ -761,6 +901,10 @@ float64 VoiceRecordBar::showAnimationRatio() const {
 	return _showAnimation.value(1.);
 }
 
+float64 VoiceRecordBar::showListenAnimationRatio() const {
+	return _showListenAnimation.value(_listen ? 1. : 0.);
+}
+
 void VoiceRecordBar::computeAndSetLockProgress(QPoint globalPos) {
 	const auto localPos = mapFromGlobal(globalPos);
 	const auto lower = _lock->height();
@@ -817,7 +961,7 @@ void VoiceRecordBar::installClickOutsideFilter() {
 		} else if (type == QEvent::ContextMenu || type == QEvent::Shortcut) {
 			return Type::ShowBox;
 		} else if (type == QEvent::MouseButtonPress) {
-			return (noBox && !_inField.current())
+			return (noBox && !_inField.current() && !_lock->underMouse())
 				? Type::ShowBox
 				: Type::Continue;
 		}
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 16b7447d3..fe4d50f86 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -13,6 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/animations.h"
 #include "ui/rp_widget.h"
 
+struct VoiceData;
+
 namespace Ui {
 class SendButton;
 } // namespace Ui
@@ -24,6 +26,7 @@ class SessionController;
 namespace HistoryView::Controls {
 
 class VoiceRecordButton;
+class ListenWrap;
 class RecordLock;
 
 class VoiceRecordBar final : public Ui::RpWidget {
@@ -64,6 +67,12 @@ public:
 	[[nodiscard]] bool isLockPresent() const;
 
 private:
+	enum class StopType {
+		Cancel,
+		Send,
+		Listen,
+	};
+
 	void init();
 
 	void updateMessageGeometry();
@@ -74,7 +83,7 @@ private:
 	bool recordingAnimationCallback(crl::time now);
 
 	void stop(bool send);
-	void stopRecording(bool send);
+	void stopRecording(StopType type);
 	void visibilityAnimate(bool show, Fn<void()> &&callback);
 
 	bool showRecordButton() const;
@@ -92,6 +101,7 @@ private:
 
 	void activeAnimate(bool active);
 	float64 showAnimationRatio() const;
+	float64 showListenAnimationRatio() const;
 	float64 activeAnimationRatio() const;
 
 	void computeAndSetLockProgress(QPoint globalPos);
@@ -101,6 +111,7 @@ private:
 	const std::shared_ptr<Ui::SendButton> _send;
 	const std::unique_ptr<RecordLock> _lock;
 	const std::unique_ptr<VoiceRecordButton> _level;
+	std::unique_ptr<ListenWrap> _listen;
 
 	base::Timer _startTimer;
 
@@ -129,6 +140,7 @@ private:
 	rpl::variable<bool> _lockShowing = false;
 
 	Ui::Animations::Simple _showLockAnimation;
+	Ui::Animations::Simple _showListenAnimation;
 	Ui::Animations::Simple _activeAnimation;
 	Ui::Animations::Simple _showAnimation;
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index b3a0f30ee..e5792f13e 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -381,6 +381,11 @@ historyRecordLockBody: icon {{ "voice_lock/record_lock_body", historyToDownBg }}
 historyRecordLockMargin: margins(4px, 4px, 4px, 4px);
 historyRecordLockArrow: icon {{ "voice_lock/voice_arrow", historyToDownFg }};
 
+historyRecordDelete: IconButton(historyAttach) {
+	icon: icon {{ "info_media_delete", historyComposeIconFg }};
+	iconOver: icon {{ "info_media_delete", historyComposeIconFgOver }};
+}
+
 historyRecordLockPosition: point(7px, 35px);
 
 historySilentToggle: IconButton(historyBotKeyboardShow) {

From a19e3ca3dcf503d3f0da8a7f7379c46a834f3892 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 7 Nov 2020 21:02:08 +0300
Subject: [PATCH 101/370] Added initial ability to send recorded voice data
 from listen state.

---
 .../SourceFiles/history/history_widget.cpp    |  6 ++
 .../history_view_compose_controls.cpp         |  6 ++
 .../history_view_voice_record_bar.cpp         | 84 +++++++++++++++----
 .../controls/history_view_voice_record_bar.h  |  6 +-
 4 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index b9b47f918..23cf33d08 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -804,6 +804,11 @@ void HistoryWidget::initVoiceRecordBar() {
 		updateUnreadMentionsVisibility();
 	}, lifetime());
 
+	_voiceRecordBar->updateSendButtonTypeRequests(
+	) | rpl::start_with_next([=] {
+		updateSendButtonType();
+	}, lifetime());
+
 	_voiceRecordBar->hideFast();
 }
 
@@ -3639,6 +3644,7 @@ bool HistoryWidget::isMuteUnmute() const {
 
 bool HistoryWidget::showRecordButton() const {
 	return Media::Capture::instance()->available()
+		&& !_voiceRecordBar->isListenState()
 		&& !HasSendText(_field)
 		&& !readyToForward()
 		&& !_editMsgId;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index fdd5d198d..f2961d993 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -994,6 +994,7 @@ void ComposeControls::orderControls() {
 
 bool ComposeControls::showRecordButton() const {
 	return ::Media::Capture::instance()->available()
+		&& !_voiceRecordBar->isListenState()
 		&& !HasSendText(_field)
 		//&& !readyToForward()
 		&& !isEditingMessage();
@@ -1533,6 +1534,11 @@ void ComposeControls::initVoiceRecordBar() {
 	_voiceRecordBar->setEscFilter([=] {
 		return (isEditingMessage() || replyingToMessage());
 	});
+
+	_voiceRecordBar->updateSendButtonTypeRequests(
+	) | rpl::start_with_next([=] {
+		updateSendButtonType();
+	}, _wrap->lifetime());
 }
 
 void ComposeControls::updateWrappingVisibility() {
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index ec98faa41..4f3ac5146 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -78,10 +78,11 @@ class ListenWrap final {
 public:
 	ListenWrap(
 		not_null<Ui::RpWidget*> parent,
-		const ::Media::Capture::Result &data);
+		::Media::Capture::Result &&data);
 
 	void requestPaintProgress(float64 progress);
 	rpl::producer<> stopRequests() const;
+	::Media::Capture::Result *data() const;
 
 	rpl::lifetime &lifetime();
 
@@ -90,7 +91,8 @@ private:
 
 	not_null<Ui::RpWidget*> _parent;
 
-	const std::unique_ptr<VoiceData> _voiceData;
+	const std::unique_ptr<::Media::Capture::Result> _data;
+	// const std::unique_ptr<VoiceData> _voiceData;
 	const style::IconButton &_stDelete;
 	base::unique_qptr<Ui::IconButton> _delete;
 
@@ -102,9 +104,10 @@ private:
 
 ListenWrap::ListenWrap(
 	not_null<Ui::RpWidget*> parent,
-	const ::Media::Capture::Result &data)
+	::Media::Capture::Result &&data)
 : _parent(parent)
-, _voiceData(ProcessCaptureResult(data))
+, _data(std::make_unique<::Media::Capture::Result>(std::move(data)))
+// , _voiceData(ProcessCaptureResult(_data))
 , _stDelete(st::historyRecordDelete)
 , _delete(base::make_unique_q<Ui::IconButton>(parent, _stDelete)) {
 	init();
@@ -137,6 +140,10 @@ rpl::producer<> ListenWrap::stopRequests() const {
 	return _delete->clicks() | rpl::to_empty;
 }
 
+::Media::Capture::Result *ListenWrap::data() const {
+	return _data.get();
+}
+
 rpl::lifetime &ListenWrap::lifetime() {
 	return _lifetime;
 }
@@ -533,11 +540,9 @@ void VoiceRecordBar::init() {
 	_lock->stops(
 	) | rpl::start_with_next([=] {
 		::Media::Capture::instance()->startedChanges(
-		) | rpl::filter([](auto capturing) {
-			return !capturing;
+		) | rpl::filter([=](auto capturing) {
+			return !capturing && _listen;
 		}) | rpl::take(1) | rpl::start_with_next([=] {
-			Assert(_listen != nullptr);
-
 			_lockShowing = false;
 
 			const auto to = 1.;
@@ -605,6 +610,50 @@ void VoiceRecordBar::init() {
 			_startTimer.cancel();
 		}
 	}, lifetime());
+
+	_listenChanges.events(
+	) | rpl::filter([=] {
+		return _listen != nullptr;
+	}) | rpl::start_with_next([=] {
+		_listen->stopRequests(
+		) | rpl::take(1) | rpl::start_with_next([=] {
+			visibilityAnimate(false, [=] { hide(); });
+		}, _listen->lifetime());
+
+		_listen->lifetime().add([=] { _listenChanges.fire({}); });
+
+		auto filterCallback = [=](not_null<QEvent*> e) {
+			using Result = base::EventFilterResult;
+			if (_send->type() != Ui::SendButton::Type::Send
+				&& _send->type() != Ui::SendButton::Type::Schedule) {
+				return Result::Continue;
+			}
+			switch(e->type()) {
+			case QEvent::MouseButtonRelease: {
+				auto callback = [=] {
+					const auto data = _listen->data();
+					_sendVoiceRequests.fire({
+						data->bytes,
+						data->waveform,
+						Duration(data->samples) });
+					hide();
+				};
+				visibilityAnimate(false, std::move(callback));
+				_send->clearState();
+				return Result::Cancel;
+			}
+			default: return Result::Continue;
+			}
+		};
+
+		auto filter = base::install_event_filter(
+			_send.get(),
+			std::move(filterCallback));
+
+		_listen->lifetime().make_state<base::unique_qptr<QObject>>(
+		std::move(filter));
+
+	}, lifetime());
 }
 
 void VoiceRecordBar::activeAnimate(bool active) {
@@ -783,8 +832,10 @@ void VoiceRecordBar::stopRecording(StopType type) {
 		instance()->stop();
 		return;
 	}
-	instance()->stop(crl::guard(this, [=](const Result &data) {
+	instance()->stop(crl::guard(this, [=](Result &&data) {
 		if (data.bytes.isEmpty()) {
+			// Close everything.
+			stop(false);
 			return;
 		}
 
@@ -793,11 +844,8 @@ void VoiceRecordBar::stopRecording(StopType type) {
 		if (type == StopType::Send) {
 			_sendVoiceRequests.fire({ data.bytes, data.waveform, duration });
 		} else if (type == StopType::Listen) {
-			_listen = std::make_unique<ListenWrap>(this, data);
-			_listen->stopRequests(
-			) | rpl::take(1) | rpl::start_with_next([=] {
-				visibilityAnimate(false, [=] { hide(); });
-			}, _listen->lifetime());
+			_listen = std::make_unique<ListenWrap>(this, std::move(data));
+			_listenChanges.fire({});
 
 			_lockShowing = false;
 		}
@@ -879,10 +927,18 @@ rpl::producer<bool> VoiceRecordBar::lockShowStarts() const {
 	return _lockShowing.changes();
 }
 
+rpl::producer<> VoiceRecordBar::updateSendButtonTypeRequests() const {
+	return _listenChanges.events();
+}
+
 bool VoiceRecordBar::isLockPresent() const {
 	return _lockShowing.current();
 }
 
+bool VoiceRecordBar::isListenState() const {
+	return _listen != nullptr;
+}
+
 bool VoiceRecordBar::isTypeRecord() const {
 	return (_send->type() == Ui::SendButton::Type::Record);
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index fe4d50f86..1df147775 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -57,6 +57,7 @@ public:
 	[[nodiscard]] rpl::producer<VoiceToSend> sendVoiceRequests() const;
 	[[nodiscard]] rpl::producer<bool> recordingStateChanges() const;
 	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
+	[[nodiscard]] rpl::producer<> updateSendButtonTypeRequests() const;
 
 	void setLockBottom(rpl::producer<int> &&bottom);
 	void setSendButtonGeometryValue(rpl::producer<QRect> &&geometry);
@@ -65,6 +66,7 @@ public:
 
 	[[nodiscard]] bool isRecording() const;
 	[[nodiscard]] bool isLockPresent() const;
+	[[nodiscard]] bool isListenState() const;
 
 private:
 	enum class StopType {
@@ -117,6 +119,7 @@ private:
 
 	rpl::event_stream<SendActionUpdate> _sendActionUpdates;
 	rpl::event_stream<VoiceToSend> _sendVoiceRequests;
+	rpl::event_stream<> _listenChanges;
 
 	int _centerY = 0;
 	QRect _redCircleRect;
@@ -130,6 +133,7 @@ private:
 
 	rpl::variable<bool> _recording = false;
 	rpl::variable<bool> _inField = false;
+	rpl::variable<bool> _lockShowing = false;
 	int _recordingSamples = 0;
 	float64 _redCircleProgress = 0.;
 
@@ -137,8 +141,6 @@ private:
 
 	rpl::lifetime _recordingLifetime;
 
-	rpl::variable<bool> _lockShowing = false;
-
 	Ui::Animations::Simple _showLockAnimation;
 	Ui::Animations::Simple _showListenAnimation;
 	Ui::Animations::Simple _activeAnimation;

From 8b2bb722de283716a6c95e7a60cf9852de6d8fea Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 7 Nov 2020 22:38:03 +0300
Subject: [PATCH 102/370] Added ability to send and cancel recorded voice data
 with keys.

---
 .../history_view_voice_record_bar.cpp         | 111 +++++++++++++-----
 .../controls/history_view_voice_record_bar.h  |   1 +
 2 files changed, 81 insertions(+), 31 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 4f3ac5146..d5ef93345 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -622,37 +622,7 @@ void VoiceRecordBar::init() {
 
 		_listen->lifetime().add([=] { _listenChanges.fire({}); });
 
-		auto filterCallback = [=](not_null<QEvent*> e) {
-			using Result = base::EventFilterResult;
-			if (_send->type() != Ui::SendButton::Type::Send
-				&& _send->type() != Ui::SendButton::Type::Schedule) {
-				return Result::Continue;
-			}
-			switch(e->type()) {
-			case QEvent::MouseButtonRelease: {
-				auto callback = [=] {
-					const auto data = _listen->data();
-					_sendVoiceRequests.fire({
-						data->bytes,
-						data->waveform,
-						Duration(data->samples) });
-					hide();
-				};
-				visibilityAnimate(false, std::move(callback));
-				_send->clearState();
-				return Result::Cancel;
-			}
-			default: return Result::Continue;
-			}
-		};
-
-		auto filter = base::install_event_filter(
-			_send.get(),
-			std::move(filterCallback));
-
-		_listen->lifetime().make_state<base::unique_qptr<QObject>>(
-		std::move(filter));
-
+		installListenStateFilter();
 	}, lifetime());
 }
 
@@ -1045,4 +1015,83 @@ void VoiceRecordBar::installClickOutsideFilter() {
 		std::move(filter));
 }
 
+void VoiceRecordBar::installListenStateFilter() {
+	const auto close = [=](bool send) {
+		auto callback = [=] {
+			if (send) {
+				const auto data = _listen->data();
+				_sendVoiceRequests.fire({
+					data->bytes,
+					data->waveform,
+					Duration(data->samples) });
+			}
+			hide();
+		};
+		visibilityAnimate(false, std::move(callback));
+	};
+
+	const auto isSend = [=] {
+		return _send->type() == Ui::SendButton::Type::Send
+			|| _send->type() == Ui::SendButton::Type::Schedule;
+	};
+
+	auto mouseFilterCallback = [=](not_null<QEvent*> e) {
+		using Result = base::EventFilterResult;
+		if (!isSend()) {
+			return Result::Continue;
+		}
+		switch(e->type()) {
+		case QEvent::MouseButtonRelease: {
+			close(true);
+			_send->clearState();
+			return Result::Cancel;
+		}
+		default: return Result::Continue;
+		}
+	};
+
+	auto sendFilter = base::install_event_filter(
+		_send.get(),
+		std::move(mouseFilterCallback));
+
+	_listen->lifetime().make_state<base::unique_qptr<QObject>>(
+	std::move(sendFilter));
+
+	auto keyFilterCallback = [=](not_null<QEvent*> e) {
+		using Result = base::EventFilterResult;
+		if (!isSend()) {
+			return Result::Continue;
+		}
+		switch(e->type()) {
+		case QEvent::KeyPress: {
+			const auto key = static_cast<QKeyEvent*>(e.get())->key();
+			const auto isEsc = (key == Qt::Key_Escape);
+			const auto isEnter = (key == Qt::Key_Enter
+				|| key == Qt::Key_Return);
+			if (isEnter) {
+				close(true);
+				return Result::Cancel;
+			}
+			if (isEsc) {
+				if (_escFilter && _escFilter()) {
+					return Result::Continue;
+				} else {
+					close(false);
+					return Result::Cancel;
+				}
+			}
+			return Result::Continue;
+		}
+		default: return Result::Continue;
+		}
+	};
+
+	auto keyFilter = base::install_event_filter(
+		QCoreApplication::instance(),
+		std::move(keyFilterCallback));
+
+	_listen->lifetime().make_state<base::unique_qptr<QObject>>(
+		std::move(keyFilter));
+}
+
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 1df147775..0968e6e52 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -95,6 +95,7 @@ private:
 
 	void startRedCircleAnimation();
 	void installClickOutsideFilter();
+	void installListenStateFilter();
 
 	bool isTypeRecord() const;
 	bool hasDuration() const;

From 189c9407109a35ae5cab76f81466db48153f99bb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 8 Nov 2020 05:04:50 +0300
Subject: [PATCH 103/370] Added waveform display of recorded voice data.

---
 .../history_view_voice_record_bar.cpp         | 77 +++++++++++++++++--
 Telegram/SourceFiles/ui/chat/chat.style       |  2 +
 2 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index d5ef93345..4243ffb5d 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/confirm_box.h"
 #include "core/application.h"
 #include "data/data_document.h"
+#include "history/history_item_components.h"
 #include "history/view/controls/history_view_voice_record_button.h"
 #include "lang/lang_keys.h"
 #include "mainwindow.h"
@@ -91,11 +92,13 @@ private:
 
 	not_null<Ui::RpWidget*> _parent;
 
+	const std::unique_ptr<VoiceData> _voiceData;
 	const std::unique_ptr<::Media::Capture::Result> _data;
-	// const std::unique_ptr<VoiceData> _voiceData;
 	const style::IconButton &_stDelete;
 	base::unique_qptr<Ui::IconButton> _delete;
 
+	QRect _waveformBgRect;
+
 	rpl::variable<float64> _showProgress = 0.;
 
 	rpl::lifetime _lifetime;
@@ -106,8 +109,8 @@ ListenWrap::ListenWrap(
 	not_null<Ui::RpWidget*> parent,
 	::Media::Capture::Result &&data)
 : _parent(parent)
+, _voiceData(ProcessCaptureResult(data))
 , _data(std::make_unique<::Media::Capture::Result>(std::move(data)))
-// , _voiceData(ProcessCaptureResult(_data))
 , _stDelete(st::historyRecordDelete)
 , _delete(base::make_unique_q<Ui::IconButton>(parent, _stDelete)) {
 	init();
@@ -120,15 +123,75 @@ void ListenWrap::init() {
 	}) | rpl::distinct_until_changed();
 	_delete->showOn(std::move(deleteShow));
 
+	_parent->sizeValue(
+	) | rpl::start_with_next([=](QSize size) {
+		const auto left = _stDelete.width + st::historyRecordWaveformLeftSkip;
+		_waveformBgRect = QRect({ 0, 0 }, size)
+			.marginsRemoved(st::historyRecordWaveformBgMargins);
+	}, _lifetime);
+
 	_parent->paintRequest(
 	) | rpl::start_with_next([=](const QRect &clip) {
-		const auto progress = _showProgress.current();
-		if (progress == 0. || progress == 1.) {
-			return;
-		}
 		Painter p(_parent);
+		PainterHighQualityEnabler hq(p);
+		const auto progress = _showProgress.current();
 		p.setOpacity(progress);
-		_stDelete.icon.paint(p, _stDelete.iconPosition, _parent->width());
+		if (progress > 0. && progress < 1.) {
+			_stDelete.icon.paint(p, _stDelete.iconPosition, _parent->width());
+		}
+
+		{
+			const auto deleteIconLeft = _stDelete.iconPosition.x();
+			const auto bgRectRight = anim::interpolate(
+				deleteIconLeft,
+				_stDelete.width,
+				progress);
+			const auto bgRectLeft = anim::interpolate(
+				_parent->width() - deleteIconLeft - _waveformBgRect.height(),
+				_stDelete.width,
+				progress);
+			const auto bgRectMargins = style::margins(
+				bgRectLeft,
+				0,
+				bgRectRight,
+				0);
+			const auto bgRect = _waveformBgRect.marginsRemoved(bgRectMargins);
+
+			const auto horizontalMargin = bgRect.width() - bgRect.height();
+			const auto bgLeftCircleRect = bgRect.marginsRemoved(
+				style::margins(0, 0, horizontalMargin, 0));
+			const auto bgRightCircleRect = bgRect.marginsRemoved(
+				style::margins(horizontalMargin, 0, 0, 0));
+
+			const auto halfHeight = bgRect.height() / 2;
+			const auto bgCenterRect = bgRect.marginsRemoved(
+				style::margins(halfHeight, 0, halfHeight, 0));
+
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::historyRecordCancelActive);
+			p.drawEllipse(bgLeftCircleRect);
+			p.drawEllipse(bgRightCircleRect);
+			p.fillRect(bgCenterRect, st::historyRecordCancelActive);
+
+			// Waveform paint.
+			{
+				const auto top =
+					(bgCenterRect.height() - st::msgWaveformMax) / 2;
+				const auto rect = bgCenterRect.marginsRemoved(
+					style::margins(halfHeight, top, halfHeight, top));
+				if (rect.width() > 0) {
+					p.translate(rect.topLeft());
+					HistoryDocumentVoice::PaintWaveform(
+						p,
+						_voiceData.get(),
+						rect.width(),
+						false,
+						false,
+						0.);
+					p.resetTransform();
+				}
+			}
+		}
 	}, _lifetime);
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index e5792f13e..277722678 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -385,6 +385,8 @@ historyRecordDelete: IconButton(historyAttach) {
 	icon: icon {{ "info_media_delete", historyComposeIconFg }};
 	iconOver: icon {{ "info_media_delete", historyComposeIconFgOver }};
 }
+historyRecordWaveformLeftSkip: 5px;
+historyRecordWaveformBgMargins: margins(5px, 7px, 5px, 7px);
 
 historyRecordLockPosition: point(7px, 35px);
 

From 7826d0246df63c2eb0353f212a6f26169a9dd8f4 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 9 Nov 2020 21:56:05 +0300
Subject: [PATCH 104/370] Added duration display of recorded voice data.

const qptr
---
 .../history_view_voice_record_bar.cpp         | 42 ++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 4243ffb5d..e8171167a 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -79,7 +79,8 @@ class ListenWrap final {
 public:
 	ListenWrap(
 		not_null<Ui::RpWidget*> parent,
-		::Media::Capture::Result &&data);
+		::Media::Capture::Result &&data,
+		const style::font &font);
 
 	void requestPaintProgress(float64 progress);
 	rpl::producer<> stopRequests() const;
@@ -95,9 +96,13 @@ private:
 	const std::unique_ptr<VoiceData> _voiceData;
 	const std::unique_ptr<::Media::Capture::Result> _data;
 	const style::IconButton &_stDelete;
-	base::unique_qptr<Ui::IconButton> _delete;
+	const base::unique_qptr<Ui::IconButton> _delete;
+	const style::font &_durationFont;
+	const QString _duration;
+	const int _durationWidth;
 
 	QRect _waveformBgRect;
+	QRect _durationRect;
 
 	rpl::variable<float64> _showProgress = 0.;
 
@@ -107,12 +112,17 @@ private:
 
 ListenWrap::ListenWrap(
 	not_null<Ui::RpWidget*> parent,
-	::Media::Capture::Result &&data)
+	::Media::Capture::Result &&data,
+	const style::font &font)
 : _parent(parent)
 , _voiceData(ProcessCaptureResult(data))
 , _data(std::make_unique<::Media::Capture::Result>(std::move(data)))
 , _stDelete(st::historyRecordDelete)
-, _delete(base::make_unique_q<Ui::IconButton>(parent, _stDelete)) {
+, _delete(base::make_unique_q<Ui::IconButton>(parent, _stDelete))
+, _durationFont(font)
+, _duration(Ui::FormatDurationText(
+	float64(_data->samples) / ::Media::Player::kDefaultFrequency))
+, _durationWidth(_durationFont->width(_duration)) {
 	init();
 }
 
@@ -173,12 +183,29 @@ void ListenWrap::init() {
 			p.drawEllipse(bgRightCircleRect);
 			p.fillRect(bgCenterRect, st::historyRecordCancelActive);
 
+			// Duration paint.
+			{
+				p.setFont(_durationFont);
+				p.setPen(st::historyRecordVoiceFgActiveIcon);
+
+				const auto top = computeTopMargin(_durationFont->ascent);
+				const auto rect = bgCenterRect.marginsRemoved(
+					style::margins(
+						bgCenterRect.width() - _durationWidth,
+						top,
+						0,
+						top));
+				p.drawText(rect, style::al_left, _duration);
+			}
+
 			// Waveform paint.
 			{
 				const auto top =
 					(bgCenterRect.height() - st::msgWaveformMax) / 2;
+				const auto right = st::historyRecordWaveformLeftSkip
+					+ _durationWidth;
 				const auto rect = bgCenterRect.marginsRemoved(
-					style::margins(halfHeight, top, halfHeight, top));
+					style::margins(halfHeight, top, right, top));
 				if (rect.width() > 0) {
 					p.translate(rect.topLeft());
 					HistoryDocumentVoice::PaintWaveform(
@@ -877,7 +904,10 @@ void VoiceRecordBar::stopRecording(StopType type) {
 		if (type == StopType::Send) {
 			_sendVoiceRequests.fire({ data.bytes, data.waveform, duration });
 		} else if (type == StopType::Listen) {
-			_listen = std::make_unique<ListenWrap>(this, std::move(data));
+			_listen = std::make_unique<ListenWrap>(
+				this,
+				std::move(data),
+				_cancelFont);
 			_listenChanges.fire({});
 
 			_lockShowing = false;

From 5eba6804836e5ed821a2abb3e04085f6289686e8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 10 Nov 2020 16:52:17 +0300
Subject: [PATCH 105/370] Added play button for recorded voice data.

---
 .../history_view_voice_record_bar.cpp         | 134 +++++++++++++++++-
 Telegram/SourceFiles/mainwidget.cpp           |   8 +-
 Telegram/SourceFiles/mainwidget.h             |   1 +
 3 files changed, 136 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index e8171167a..9e43687b7 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -9,17 +9,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_send_progress.h"
 #include "base/event_filter.h"
+#include "base/unixtime.h"
 #include "boxes/confirm_box.h"
 #include "core/application.h"
 #include "data/data_document.h"
+#include "data/data_document_media.h"
+#include "data/data_session.h"
 #include "history/history_item_components.h"
 #include "history/view/controls/history_view_voice_record_button.h"
 #include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "mainwidget.h" // MainWidget::stopAndClosePlayer
 #include "mainwindow.h"
 #include "media/audio/media_audio.h"
 #include "media/audio/media_audio_capture.h"
+#include "media/player/media_player_button.h"
+#include "media/player/media_player_instance.h"
 #include "styles/style_chat.h"
 #include "styles/style_layers.h"
+#include "styles/style_media_player.h"
 #include "ui/controls/send_button.h"
 #include "ui/text/format_values.h"
 #include "window/window_session_controller.h"
@@ -73,12 +81,29 @@ enum class FilterType {
 	return voiceData;
 }
 
+[[nodiscard]] not_null<DocumentData*> DummyDocument(
+		not_null<Data::Session*> owner) {
+	return owner->document(
+		rand_value<DocumentId>(),
+		uint64(0),
+		QByteArray(),
+		base::unixtime::now(),
+		QVector<MTPDocumentAttribute>(),
+		QString(),
+		QByteArray(),
+		ImageWithLocation(),
+		ImageWithLocation(),
+		owner->session().mainDcId(),
+		int32(0));
+}
+
 } // namespace
 
 class ListenWrap final {
 public:
 	ListenWrap(
 		not_null<Ui::RpWidget*> parent,
+		not_null<Window::SessionController*> controller,
 		::Media::Capture::Result &&data,
 		const style::font &font);
 
@@ -90,19 +115,29 @@ public:
 
 private:
 	void init();
+	void initPlayButton();
+
+	int computeTopMargin(int height) const;
 
 	not_null<Ui::RpWidget*> _parent;
 
+	const not_null<Window::SessionController*> _controller;
+	const not_null<DocumentData*> _document;
 	const std::unique_ptr<VoiceData> _voiceData;
+	const std::shared_ptr<Data::DocumentMedia> _mediaView;
 	const std::unique_ptr<::Media::Capture::Result> _data;
 	const style::IconButton &_stDelete;
 	const base::unique_qptr<Ui::IconButton> _delete;
 	const style::font &_durationFont;
 	const QString _duration;
 	const int _durationWidth;
+	const style::MediaPlayerButton &_playPauseSt;
+	const base::unique_qptr<Ui::AbstractButton> _playPauseButton;
 
 	QRect _waveformBgRect;
-	QRect _durationRect;
+	QRect _waveformBgFinalCenterRect;
+
+	::Media::Player::PlayButtonLayout _playPause;
 
 	rpl::variable<float64> _showProgress = 0.;
 
@@ -112,17 +147,24 @@ private:
 
 ListenWrap::ListenWrap(
 	not_null<Ui::RpWidget*> parent,
+	not_null<Window::SessionController*> controller,
 	::Media::Capture::Result &&data,
 	const style::font &font)
 : _parent(parent)
+, _controller(controller)
+, _document(DummyDocument(&_controller->session().data()))
 , _voiceData(ProcessCaptureResult(data))
+, _mediaView(_document->createMediaView())
 , _data(std::make_unique<::Media::Capture::Result>(std::move(data)))
 , _stDelete(st::historyRecordDelete)
 , _delete(base::make_unique_q<Ui::IconButton>(parent, _stDelete))
 , _durationFont(font)
 , _duration(Ui::FormatDurationText(
 	float64(_data->samples) / ::Media::Player::kDefaultFrequency))
-, _durationWidth(_durationFont->width(_duration)) {
+, _durationWidth(_durationFont->width(_duration))
+, _playPauseSt(st::mediaPlayerButton)
+, _playPauseButton(base::make_unique_q<Ui::AbstractButton>(parent))
+, _playPause(_playPauseSt, [=] { _playPauseButton->update(); }) {
 	init();
 }
 
@@ -135,9 +177,20 @@ void ListenWrap::init() {
 
 	_parent->sizeValue(
 	) | rpl::start_with_next([=](QSize size) {
-		const auto left = _stDelete.width + st::historyRecordWaveformLeftSkip;
 		_waveformBgRect = QRect({ 0, 0 }, size)
 			.marginsRemoved(st::historyRecordWaveformBgMargins);
+		{
+			const auto m = _stDelete.width + _waveformBgRect.height() / 2;
+			_waveformBgFinalCenterRect = _waveformBgRect.marginsRemoved(
+				style::margins(m, 0, m, 0));
+		}
+		{
+			const auto &play = _playPauseSt.playOuter;
+			const auto &final = _waveformBgFinalCenterRect;
+			_playPauseButton->moveToLeft(
+				final.x() - (final.height() - play.width()) / 2,
+				final.y());
+		}
 	}, _lifetime);
 
 	_parent->paintRequest(
@@ -200,12 +253,13 @@ void ListenWrap::init() {
 
 			// Waveform paint.
 			{
-				const auto top =
-					(bgCenterRect.height() - st::msgWaveformMax) / 2;
+				const auto &play = _playPauseSt.playOuter;
+				const auto top = computeTopMargin(st::msgWaveformMax);
+				const auto left = play.width() / 2 + halfHeight;
 				const auto right = st::historyRecordWaveformLeftSkip
 					+ _durationWidth;
 				const auto rect = bgCenterRect.marginsRemoved(
-					style::margins(halfHeight, top, right, top));
+					style::margins(left, top, right, top));
 				if (rect.width() > 0) {
 					p.translate(rect.topLeft());
 					HistoryDocumentVoice::PaintWaveform(
@@ -220,6 +274,73 @@ void ListenWrap::init() {
 			}
 		}
 	}, _lifetime);
+
+	initPlayButton();
+}
+
+void ListenWrap::initPlayButton() {
+	using namespace ::Media::Player;
+	using State = TrackState;
+
+	_mediaView->setBytes(_data->bytes);
+	_document->type = VoiceDocument;
+
+	const auto &play = _playPauseSt.playOuter;
+	const auto &width = _waveformBgFinalCenterRect.height();
+	_playPauseButton->resize(width, width);
+	_playPauseButton->show();
+
+	_playPauseButton->paintRequest(
+	) | rpl::start_with_next([=](const QRect &clip) {
+		Painter p(_playPauseButton);
+
+		const auto progress = _showProgress.current();
+		p.translate(width / 2, width / 2);
+		if (progress < 1.) {
+			p.scale(progress, progress);
+		}
+		p.translate(-play.width() / 2, -play.height() / 2);
+		_playPause.paint(p, st::historyRecordVoiceFgActiveIcon);
+	}, _playPauseButton->lifetime());
+
+	_playPauseButton->setClickedCallback([=] {
+		instance()->playPause({ _document, FullMsgId() });
+	});
+
+	const auto showPause = _lifetime.make_state<rpl::variable<bool>>(false);
+	showPause->changes(
+	) | rpl::start_with_next([=](bool pause) {
+		_playPause.setState(pause
+			? PlayButtonLayout::State::Pause
+			: PlayButtonLayout::State::Play);
+	}, _lifetime);
+
+	instance()->updatedNotifier(
+	) | rpl::start_with_next([=](const State &state) {
+		if (state.id.audio() == _document) {
+			*showPause = ShowPauseIcon(state.state);
+		} else if (showPause->current()) {
+			*showPause = false;
+		}
+	}, _lifetime);
+
+	instance()->stops(
+		AudioMsgId::Type::Voice
+	) | rpl::start_with_next([=] {
+		*showPause = false;
+	}, _lifetime);
+
+	const auto weak = Ui::MakeWeak(_controller->content().get());
+	_lifetime.add([=] {
+		const auto voiceState = instance()->getState(AudioMsgId::Type::Voice);
+		if (weak && voiceState.id && (voiceState.id.audio() == _document)) {
+			weak->stopAndClosePlayer();
+		}
+	});
+}
+
+int ListenWrap::computeTopMargin(int height) const {
+	return (_waveformBgRect.height() - height) / 2;
 }
 
 void ListenWrap::requestPaintProgress(float64 progress) {
@@ -906,6 +1027,7 @@ void VoiceRecordBar::stopRecording(StopType type) {
 		} else if (type == StopType::Listen) {
 			_listen = std::make_unique<ListenWrap>(
 				this,
+				_controller,
 				std::move(data),
 				_cancelFont);
 			_listenChanges.fire({});
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index d17c8af27..c3b2a27f9 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -483,7 +483,7 @@ void MainWidget::floatPlayerClosed(FullMsgId itemId) {
 		const auto voiceData = Media::Player::instance()->current(
 			AudioMsgId::Type::Voice);
 		if (voiceData.contextId() == itemId) {
-			_player->entity()->stopAndClose();
+			stopAndClosePlayer();
 		}
 	}
 }
@@ -882,6 +882,12 @@ void MainWidget::closeBothPlayers() {
 	Shortcuts::ToggleMediaShortcuts(false);
 }
 
+void MainWidget::stopAndClosePlayer() {
+	if (_player) {
+		_player->entity()->stopAndClose();
+	}
+}
+
 void MainWidget::createPlayer() {
 	if (!_player) {
 		_player.create(
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index cca639af3..67f62919b 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -220,6 +220,7 @@ public:
 	using FloatDelegate::floatPlayerAreaUpdated;
 
 	void closeBothPlayers();
+	void stopAndClosePlayer();
 
 public slots:
 	void inlineResultLoadProgress(FileLoader *loader);

From 26686197582e32a7ee6b01db1137ac0d24e9d3a4 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 10 Nov 2020 21:06:22 +0300
Subject: [PATCH 106/370] Added ability to seek recorded voice data.

---
 .../history_view_voice_record_bar.cpp         | 155 ++++++++++++++++--
 1 file changed, 142 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 9e43687b7..5a51b66d5 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -39,6 +39,7 @@ namespace {
 using SendActionUpdate = VoiceRecordBar::SendActionUpdate;
 using VoiceToSend = VoiceRecordBar::VoiceToSend;
 
+constexpr auto kAudioVoiceUpdateView = crl::time(200);
 constexpr auto kLockDelay = crl::time(100);
 constexpr auto kRecordingUpdateDelta = crl::time(100);
 constexpr auto kAudioVoiceMaxLength = 100 * 60; // 100 minutes
@@ -55,6 +56,10 @@ enum class FilterType {
 	Cancel,
 };
 
+[[nodiscard]] auto Progress(int low, int high) {
+	return std::clamp(float64(low) / high, 0., 1.);
+}
+
 [[nodiscard]] auto Duration(int samples) {
 	return samples / ::Media::Player::kDefaultFrequency;
 }
@@ -116,6 +121,10 @@ public:
 private:
 	void init();
 	void initPlayButton();
+	void initPlayProgress();
+
+	bool isInPlayer(const ::Media::Player::TrackState &state) const;
+	bool isInPlayer() const;
 
 	int computeTopMargin(int height) const;
 
@@ -136,9 +145,12 @@ private:
 
 	QRect _waveformBgRect;
 	QRect _waveformBgFinalCenterRect;
+	QRect _waveformFgRect;
 
 	::Media::Player::PlayButtonLayout _playPause;
 
+	anim::value _playProgress;
+
 	rpl::variable<float64> _showProgress = 0.;
 
 	rpl::lifetime _lifetime;
@@ -253,13 +265,19 @@ void ListenWrap::init() {
 
 			// Waveform paint.
 			{
-				const auto &play = _playPauseSt.playOuter;
-				const auto top = computeTopMargin(st::msgWaveformMax);
-				const auto left = play.width() / 2 + halfHeight;
-				const auto right = st::historyRecordWaveformLeftSkip
-					+ _durationWidth;
-				const auto rect = bgCenterRect.marginsRemoved(
-					style::margins(left, top, right, top));
+				const auto computeRect = [&] {
+					const auto &play = _playPauseSt.playOuter;
+					const auto top = computeTopMargin(st::msgWaveformMax);
+					const auto left = play.width() / 2 + halfHeight;
+					const auto right = st::historyRecordWaveformLeftSkip
+						+ _durationWidth;
+					_waveformFgRect = bgCenterRect.marginsRemoved(
+						style::margins(left, top, right, top));
+					return _waveformFgRect;
+				};
+				const auto rect = (progress == 1.)
+					? _waveformFgRect
+					: computeRect();
 				if (rect.width() > 0) {
 					p.translate(rect.topLeft());
 					HistoryDocumentVoice::PaintWaveform(
@@ -268,7 +286,7 @@ void ListenWrap::init() {
 						rect.width(),
 						false,
 						false,
-						0.);
+						_playProgress.current());
 					p.resetTransform();
 				}
 			}
@@ -276,6 +294,7 @@ void ListenWrap::init() {
 	}, _lifetime);
 
 	initPlayButton();
+	initPlayProgress();
 }
 
 void ListenWrap::initPlayButton() {
@@ -317,7 +336,7 @@ void ListenWrap::initPlayButton() {
 
 	instance()->updatedNotifier(
 	) | rpl::start_with_next([=](const State &state) {
-		if (state.id.audio() == _document) {
+		if (isInPlayer(state)) {
 			*showPause = ShowPauseIcon(state.state);
 		} else if (showPause->current()) {
 			*showPause = false;
@@ -332,13 +351,124 @@ void ListenWrap::initPlayButton() {
 
 	const auto weak = Ui::MakeWeak(_controller->content().get());
 	_lifetime.add([=] {
-		const auto voiceState = instance()->getState(AudioMsgId::Type::Voice);
-		if (weak && voiceState.id && (voiceState.id.audio() == _document)) {
+		if (weak && isInPlayer()) {
 			weak->stopAndClosePlayer();
 		}
 	});
 }
 
+void ListenWrap::initPlayProgress() {
+	using namespace ::Media::Player;
+	using State = TrackState;
+
+	const auto animation = _lifetime.make_state<Ui::Animations::Basic>();
+	const auto isPointer = _lifetime.make_state<rpl::variable<bool>>(false);
+	const auto &voice = AudioMsgId::Type::Voice;
+
+	const auto updateCursor = [=](const QPoint &p) {
+		*isPointer = isInPlayer() ? _waveformFgRect.contains(p) : false;
+	};
+
+	rpl::merge(
+		instance()->startsPlay(voice) | rpl::map_to(true),
+		instance()->stops(voice) | rpl::map_to(false)
+	) | rpl::start_with_next([=](bool play) {
+		_parent->setMouseTracking(isInPlayer() && play);
+		updateCursor(_parent->mapFromGlobal(QCursor::pos()));
+	}, _lifetime);
+
+	instance()->updatedNotifier(
+	) | rpl::start_with_next([=](const State &state) {
+		if (!isInPlayer(state)) {
+			return;
+		}
+		const auto progress = state.length
+			? Progress(state.position, state.length)
+			: 0.;
+		if (IsStopped(state.state)) {
+			_playProgress = anim::value();
+		} else {
+			_playProgress.start(progress);
+		}
+		animation->start();
+	}, _lifetime);
+
+	auto animationCallback = [=](crl::time now) {
+		if (anim::Disabled()) {
+			now += kAudioVoiceUpdateView;
+		}
+
+		const auto dt = (now - animation->started())
+			/ float64(kAudioVoiceUpdateView);
+		if (dt >= 1.) {
+			animation->stop();
+			_playProgress.finish();
+		} else {
+			_playProgress.update(std::min(dt, 1.), anim::linear);
+		}
+		_parent->update();
+		return (dt < 1.);
+	};
+	animation->init(std::move(animationCallback));
+
+	const auto isPressed = _lifetime.make_state<bool>(false);
+
+	isPointer->changes(
+	) | rpl::start_with_next([=](bool pointer) {
+		_parent->setCursor(pointer ? style::cur_pointer : style::cur_default);
+	}, _lifetime);
+
+	_parent->events(
+	) | rpl::filter([=](not_null<QEvent*> e) {
+		return (e->type() == QEvent::MouseMove
+			|| e->type() == QEvent::MouseButtonPress
+			|| e->type() == QEvent::MouseButtonRelease);
+	}) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		if (!isInPlayer()) {
+			return;
+		}
+
+		const auto type = e->type();
+		const auto isMove = (type == QEvent::MouseMove);
+		const auto &pos = static_cast<QMouseEvent*>(e.get())->pos();
+		if (*isPressed) {
+			*isPointer = true;
+		} else if (isMove) {
+			updateCursor(pos);
+		}
+		if (type == QEvent::MouseButtonPress) {
+			if (isPointer->current() && !(*isPressed)) {
+				instance()->startSeeking(voice);
+				*isPressed = true;
+			}
+		} else if (*isPressed) {
+			const auto &rect = _waveformFgRect;
+			const auto left = float64(pos.x() - rect.x());
+			const auto progress = Progress(left, rect.width());
+			const auto isRelease = (type == QEvent::MouseButtonRelease);
+			if (isRelease || isMove) {
+				_playProgress = anim::value(progress, progress);
+				_parent->update();
+				if (isRelease) {
+					instance()->finishSeeking(voice, progress);
+					*isPressed = false;
+				}
+			}
+		}
+
+	}, _lifetime);
+}
+
+
+bool ListenWrap::isInPlayer(const ::Media::Player::TrackState &state) const {
+	return (state.id && (state.id.audio() == _document));
+}
+
+bool ListenWrap::isInPlayer() const {
+	using Type = AudioMsgId::Type;
+	return isInPlayer(::Media::Player::instance()->getState(Type::Voice));
+}
+
 int ListenWrap::computeTopMargin(int height) const {
 	return (_waveformBgRect.height() - height) / 2;
 }
@@ -1150,8 +1280,7 @@ void VoiceRecordBar::computeAndSetLockProgress(QPoint globalPos) {
 	const auto localPos = mapFromGlobal(globalPos);
 	const auto lower = _lock->height();
 	const auto higher = 0;
-	const auto progress = localPos.y() / (float64)(higher - lower);
-	_lock->requestPaintProgress(std::clamp(progress, 0., 1.));
+	_lock->requestPaintProgress(Progress(localPos.y(), higher - lower));
 }
 
 void VoiceRecordBar::orderControls() {

From 6ecc446a8a1939ee2811c38c9806fb47dac4afc8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 10 Nov 2020 23:32:13 +0300
Subject: [PATCH 107/370] Added ability to schedule and send without sound
 recorded voice data.

---
 .../SourceFiles/history/history_widget.cpp    |  6 ++
 .../view/controls/compose_controls_common.h   |  1 +
 .../history_view_voice_record_bar.cpp         | 66 ++++++-------------
 .../controls/history_view_voice_record_bar.h  |  3 +
 4 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 23cf33d08..8db4b16a6 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -791,6 +791,7 @@ void HistoryWidget::initVoiceRecordBar() {
 
 		auto action = Api::SendAction(_history);
 		action.replyTo = replyToId();
+		action.options = data.options;
 		session().api().sendVoiceMessage(
 			data.bytes,
 			data.waveform,
@@ -3064,6 +3065,11 @@ void HistoryWidget::send(Api::SendOptions options) {
 		return;
 	}
 
+	if (_voiceRecordBar && _voiceRecordBar->isListenState()) {
+		_voiceRecordBar->requestToSendWithOptions(options);
+		return;
+	}
+
 	const auto webPageId = _previewCancelled
 		? CancelledWebPageId
 		: ((_previewData && _previewData->pendingTill >= 0)
diff --git a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
index d34621c1e..355070749 100644
--- a/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
+++ b/Telegram/SourceFiles/history/view/controls/compose_controls_common.h
@@ -25,6 +25,7 @@ struct VoiceToSend {
 	QByteArray bytes;
 	VoiceWaveform waveform;
 	int duration = 0;
+	Api::SendOptions options;
 };
 struct SendActionUpdate {
 	Api::SendProgressType type = Api::SendProgressType();
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 5a51b66d5..7bd43d9d7 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -958,7 +958,7 @@ void VoiceRecordBar::init() {
 	}) | rpl::start_with_next([=] {
 		_listen->stopRequests(
 		) | rpl::take(1) | rpl::start_with_next([=] {
-			visibilityAnimate(false, [=] { hide(); });
+			hideAnimated();
 		}, _listen->lifetime());
 
 		_listen->lifetime().add([=] { _listenChanges.fire({}); });
@@ -1218,6 +1218,18 @@ void VoiceRecordBar::drawMessage(Painter &p, float64 recordActive) {
 		style::al_center);
 }
 
+void VoiceRecordBar::requestToSendWithOptions(Api::SendOptions options) {
+	if (isListenState()) {
+		const auto data = _listen->data();
+		_sendVoiceRequests.fire({
+			data->bytes,
+			data->waveform,
+			Duration(data->samples),
+			options });
+		hideAnimated();
+	}
+}
+
 rpl::producer<SendActionUpdate> VoiceRecordBar::sendActionUpdates() const {
 	return _sendActionUpdates.events();
 }
@@ -1230,6 +1242,10 @@ bool VoiceRecordBar::isRecording() const {
 	return _recording.current();
 }
 
+void VoiceRecordBar::hideAnimated() {
+	visibilityAnimate(false, [=] { hide(); });
+}
+
 void VoiceRecordBar::finishAnimating() {
 	_showAnimation.stop();
 }
@@ -1360,50 +1376,10 @@ void VoiceRecordBar::installClickOutsideFilter() {
 }
 
 void VoiceRecordBar::installListenStateFilter() {
-	const auto close = [=](bool send) {
-		auto callback = [=] {
-			if (send) {
-				const auto data = _listen->data();
-				_sendVoiceRequests.fire({
-					data->bytes,
-					data->waveform,
-					Duration(data->samples) });
-			}
-			hide();
-		};
-		visibilityAnimate(false, std::move(callback));
-	};
-
-	const auto isSend = [=] {
-		return _send->type() == Ui::SendButton::Type::Send
-			|| _send->type() == Ui::SendButton::Type::Schedule;
-	};
-
-	auto mouseFilterCallback = [=](not_null<QEvent*> e) {
-		using Result = base::EventFilterResult;
-		if (!isSend()) {
-			return Result::Continue;
-		}
-		switch(e->type()) {
-		case QEvent::MouseButtonRelease: {
-			close(true);
-			_send->clearState();
-			return Result::Cancel;
-		}
-		default: return Result::Continue;
-		}
-	};
-
-	auto sendFilter = base::install_event_filter(
-		_send.get(),
-		std::move(mouseFilterCallback));
-
-	_listen->lifetime().make_state<base::unique_qptr<QObject>>(
-	std::move(sendFilter));
-
 	auto keyFilterCallback = [=](not_null<QEvent*> e) {
 		using Result = base::EventFilterResult;
-		if (!isSend()) {
+		if (!(_send->type() == Ui::SendButton::Type::Send
+			|| _send->type() == Ui::SendButton::Type::Schedule)) {
 			return Result::Continue;
 		}
 		switch(e->type()) {
@@ -1413,14 +1389,14 @@ void VoiceRecordBar::installListenStateFilter() {
 			const auto isEnter = (key == Qt::Key_Enter
 				|| key == Qt::Key_Return);
 			if (isEnter) {
-				close(true);
+				requestToSendWithOptions({});
 				return Result::Cancel;
 			}
 			if (isEsc) {
 				if (_escFilter && _escFilter()) {
 					return Result::Continue;
 				} else {
-					close(false);
+					hideAnimated();
 					return Result::Cancel;
 				}
 			}
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 0968e6e52..59f2d891f 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -59,6 +59,8 @@ public:
 	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
 	[[nodiscard]] rpl::producer<> updateSendButtonTypeRequests() const;
 
+	void requestToSendWithOptions(Api::SendOptions options);
+
 	void setLockBottom(rpl::producer<int> &&bottom);
 	void setSendButtonGeometryValue(rpl::producer<QRect> &&geometry);
 	void setEscFilter(Fn<bool()> &&callback);
@@ -100,6 +102,7 @@ private:
 	bool isTypeRecord() const;
 	bool hasDuration() const;
 
+	void hideAnimated();
 	void finish();
 
 	void activeAnimate(bool active);

From e0cc3791ff01edfe08b3875ff56a6f844f22715e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 11 Nov 2020 00:50:22 +0300
Subject: [PATCH 108/370] Added edit message prevent when there is unsent
 recorded voice data.

---
 Telegram/Resources/langs/lang.strings                        | 1 +
 Telegram/SourceFiles/history/history_widget.cpp              | 4 ++++
 .../history/view/controls/history_view_compose_controls.cpp  | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d6c0eac12..086802bfa 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -184,6 +184,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "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.";
 "lng_edit_caption_attach" = "Sorry, you can't attach a new media while you're editing your message.";
+"lng_edit_caption_voice" = "Sorry, you can't edit your message while you're having an unsent voice message.";
 
 "lng_intro_about" = "Welcome to the official Telegram Desktop app.\nIt's fast and secure.";
 "lng_start_msgs" = "START MESSAGING";
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 8db4b16a6..9d9878ead 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5523,6 +5523,10 @@ void HistoryWidget::editMessage(FullMsgId itemId) {
 }
 
 void HistoryWidget::editMessage(not_null<HistoryItem*> item) {
+	if (_voiceRecordBar && _voiceRecordBar->isListenState()) {
+		Ui::show(Box<InformBox>(tr::lng_edit_caption_voice(tr::now)));
+		return;
+	}
 	if (const auto media = item->media()) {
 		if (media->allowsEditCaption()) {
 			Ui::show(Box<EditCaptionBox>(controller(), item));
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index f2961d993..61a308db1 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1748,6 +1748,11 @@ void ComposeControls::editMessage(not_null<HistoryItem*> item) {
 	Expects(_history != nullptr);
 	Expects(draftKeyCurrent() != Data::DraftKey::None());
 
+	if (_voiceRecordBar && _voiceRecordBar->isListenState()) {
+		Ui::show(Box<InformBox>(tr::lng_edit_caption_voice(tr::now)));
+		return;
+	}
+
 	if (!isEditingMessage()) {
 		saveFieldToHistoryLocalDraft();
 	}

From d2defabd4b4a3b84eefd6e538a5b12462c6bb0e6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 11 Nov 2020 16:50:00 +0300
Subject: [PATCH 109/370] Improved waveform display of recorded voice data.

---
 .../history_view_voice_record_bar.cpp         | 130 +++++++++++++++---
 Telegram/SourceFiles/ui/chat/chat.style       |   4 +-
 2 files changed, 117 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 7bd43d9d7..37baecfa9 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -46,6 +46,8 @@ constexpr auto kAudioVoiceMaxLength = 100 * 60; // 100 minutes
 constexpr auto kMaxSamples =
 	::Media::Player::kDefaultFrequency * kAudioVoiceMaxLength;
 
+constexpr auto kInactiveWaveformBarAlpha = int(255 * 0.6);
+
 constexpr auto kPrecision = 10;
 
 constexpr auto kLockArcAngle = 15.;
@@ -56,6 +58,10 @@ enum class FilterType {
 	Cancel,
 };
 
+[[nodiscard]] auto InactiveColor(const QColor &c) {
+	return QColor(c.red(), c.green(), c.blue(), kInactiveWaveformBarAlpha);
+}
+
 [[nodiscard]] auto Progress(int low, int high) {
 	return std::clamp(float64(low) / high, 0., 1.);
 }
@@ -102,6 +108,91 @@ enum class FilterType {
 		int32(0));
 }
 
+void PaintWaveform(
+		Painter &p,
+		not_null<const VoiceData*> voiceData,
+		int availableWidth,
+		const QColor &active,
+		const QColor &inactive,
+		float64 progress) {
+	const auto wf = [&]() -> const VoiceWaveform* {
+		if (voiceData->waveform.isEmpty()) {
+			return nullptr;
+		} else if (voiceData->waveform.at(0) < 0) {
+			return nullptr;
+		}
+		return &voiceData->waveform;
+	}();
+
+	const auto samplesCount = wf
+		? wf->size()
+		: ::Media::Player::kWaveformSamplesCount;
+	const auto activeWidth = std::round(availableWidth * progress);
+
+	const auto &barWidth = st::historyRecordWaveformBar;
+	const auto barFullWidth = barWidth + st::msgWaveformSkip;
+	const auto totalBarsCountF = (float)availableWidth / barFullWidth;
+	const auto totalBarsCount = int(totalBarsCountF);
+	const auto samplesPerBar = samplesCount / totalBarsCountF;
+	const auto barNormValue = (wf ? voiceData->wavemax : 0) + 1;
+	const auto maxDelta = st::msgWaveformMax - st::msgWaveformMin;
+	const auto &bottom = st::msgWaveformMax;
+
+	p.setPen(Qt::NoPen);
+	int barNum = 0;
+	const auto paintBar = [&](const auto &barValue) {
+		const auto barHeight = st::msgWaveformMin + barValue;
+		const auto barTop = (bottom - barHeight) / 2.;
+		const auto barLeft = barNum * barFullWidth;
+		const auto rect = [&](const auto &l, const auto &w) {
+			return QRectF(l, barTop, w, barHeight);
+		};
+
+		if ((barLeft < activeWidth) && (barLeft + barWidth > activeWidth)) {
+			const auto leftWidth = activeWidth - barLeft;
+			const auto rightWidth = barWidth - leftWidth;
+			p.fillRect(rect(barLeft, leftWidth), active);
+			p.fillRect(rect(activeWidth, rightWidth), inactive);
+		} else {
+			const auto &color = (barLeft >= activeWidth) ? inactive : active;
+			p.fillRect(rect(barLeft, barWidth), color);
+		}
+		barNum++;
+	};
+
+	auto barCounter = 0.;
+	auto nextBarNum = 0;
+
+	auto sum = 0;
+	auto maxValue = 0;
+
+	for (auto i = 0; i < samplesCount; i++) {
+		const auto value = wf ? wf->at(i) : 0;
+		if (i != nextBarNum) {
+			maxValue = std::max(maxValue, value);
+			sum += totalBarsCount;
+			continue;
+		}
+
+		// Compute height.
+		sum += totalBarsCount - samplesCount;
+		const auto isSumSmaller = (sum < (totalBarsCount + 1) / 2);
+		if (isSumSmaller) {
+			maxValue = std::max(maxValue, value);
+		}
+		const auto barValue = ((maxValue * maxDelta) + (barNormValue / 2))
+			/ barNormValue;
+		maxValue = isSumSmaller ? 0 : value;
+
+		const auto lastBarNum = nextBarNum;
+		while (lastBarNum == nextBarNum) {
+			barCounter += samplesPerBar;
+			nextBarNum = (int)barCounter;
+			paintBar(barValue);
+		}
+	}
+}
+
 } // namespace
 
 class ListenWrap final {
@@ -127,6 +218,7 @@ private:
 	bool isInPlayer() const;
 
 	int computeTopMargin(int height) const;
+	QRect computeWaveformRect(const QRect &centerRect) const;
 
 	not_null<Ui::RpWidget*> _parent;
 
@@ -142,6 +234,8 @@ private:
 	const int _durationWidth;
 	const style::MediaPlayerButton &_playPauseSt;
 	const base::unique_qptr<Ui::AbstractButton> _playPauseButton;
+	const QColor _activeWaveformBar;
+	const QColor _inactiveWaveformBar;
 
 	QRect _waveformBgRect;
 	QRect _waveformBgFinalCenterRect;
@@ -176,6 +270,8 @@ ListenWrap::ListenWrap(
 , _durationWidth(_durationFont->width(_duration))
 , _playPauseSt(st::mediaPlayerButton)
 , _playPauseButton(base::make_unique_q<Ui::AbstractButton>(parent))
+, _activeWaveformBar(st::historyRecordVoiceFgActiveIcon->c)
+, _inactiveWaveformBar(InactiveColor(_activeWaveformBar))
 , _playPause(_playPauseSt, [=] { _playPauseButton->update(); }) {
 	init();
 }
@@ -203,6 +299,7 @@ void ListenWrap::init() {
 				final.x() - (final.height() - play.width()) / 2,
 				final.y());
 		}
+		_waveformFgRect = computeWaveformRect(_waveformBgFinalCenterRect);
 	}, _lifetime);
 
 	_parent->paintRequest(
@@ -265,27 +362,17 @@ void ListenWrap::init() {
 
 			// Waveform paint.
 			{
-				const auto computeRect = [&] {
-					const auto &play = _playPauseSt.playOuter;
-					const auto top = computeTopMargin(st::msgWaveformMax);
-					const auto left = play.width() / 2 + halfHeight;
-					const auto right = st::historyRecordWaveformLeftSkip
-						+ _durationWidth;
-					_waveformFgRect = bgCenterRect.marginsRemoved(
-						style::margins(left, top, right, top));
-					return _waveformFgRect;
-				};
 				const auto rect = (progress == 1.)
 					? _waveformFgRect
-					: computeRect();
+					: computeWaveformRect(bgCenterRect);
 				if (rect.width() > 0) {
 					p.translate(rect.topLeft());
-					HistoryDocumentVoice::PaintWaveform(
+					PaintWaveform(
 						p,
 						_voiceData.get(),
 						rect.width(),
-						false,
-						false,
+						_activeWaveformBar,
+						_inactiveWaveformBar,
 						_playProgress.current());
 					p.resetTransform();
 				}
@@ -406,7 +493,7 @@ void ListenWrap::initPlayProgress() {
 		} else {
 			_playProgress.update(std::min(dt, 1.), anim::linear);
 		}
-		_parent->update();
+		_parent->update(_waveformFgRect);
 		return (dt < 1.);
 	};
 	animation->init(std::move(animationCallback));
@@ -448,7 +535,7 @@ void ListenWrap::initPlayProgress() {
 			const auto isRelease = (type == QEvent::MouseButtonRelease);
 			if (isRelease || isMove) {
 				_playProgress = anim::value(progress, progress);
-				_parent->update();
+				_parent->update(_waveformFgRect);
 				if (isRelease) {
 					instance()->finishSeeking(voice, progress);
 					*isPressed = false;
@@ -469,6 +556,14 @@ bool ListenWrap::isInPlayer() const {
 	return isInPlayer(::Media::Player::instance()->getState(Type::Voice));
 }
 
+QRect ListenWrap::computeWaveformRect(const QRect &centerRect) const {
+	const auto top = computeTopMargin(st::msgWaveformMax);
+	const auto left = (_playPauseSt.playOuter.width() + centerRect.height())
+		/ 2;
+	const auto right = st::historyRecordWaveformRightSkip + _durationWidth;
+	return centerRect.marginsRemoved(style::margins(left, top, right, top));
+}
+
 int ListenWrap::computeTopMargin(int height) const {
 	return (_waveformBgRect.height() - height) / 2;
 }
@@ -892,6 +987,9 @@ void VoiceRecordBar::init() {
 				_listen->requestPaintProgress(value);
 				_level->requestPaintProgress(to - value);
 				update();
+				if (to == value) {
+					_recordingLifetime.destroy();
+				}
 			};
 			_showListenAnimation.start(std::move(callback), 0., to, duration);
 		}, lifetime());
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 277722678..0b9f67f03 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -385,9 +385,11 @@ historyRecordDelete: IconButton(historyAttach) {
 	icon: icon {{ "info_media_delete", historyComposeIconFg }};
 	iconOver: icon {{ "info_media_delete", historyComposeIconFgOver }};
 }
-historyRecordWaveformLeftSkip: 5px;
+historyRecordWaveformRightSkip: 10px;
 historyRecordWaveformBgMargins: margins(5px, 7px, 5px, 7px);
 
+historyRecordWaveformBar: 3px;
+
 historyRecordLockPosition: point(7px, 35px);
 
 historySilentToggle: IconButton(historyBotKeyboardShow) {

From 7dac42b523113a2ff51857ecdd083cd304956e26 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 11 Nov 2020 20:27:02 +0300
Subject: [PATCH 110/370] Added ability to play/pause recorded voice data with
 Space key.

---
 .../controls/history_view_voice_record_bar.cpp     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 37baecfa9..bdd887c41 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -207,6 +207,8 @@ public:
 	rpl::producer<> stopRequests() const;
 	::Media::Capture::Result *data() const;
 
+	void playPause();
+
 	rpl::lifetime &lifetime();
 
 private:
@@ -556,6 +558,10 @@ bool ListenWrap::isInPlayer() const {
 	return isInPlayer(::Media::Player::instance()->getState(Type::Voice));
 }
 
+void ListenWrap::playPause() {
+	_playPauseButton->clicked(Qt::NoModifier, Qt::LeftButton);
+}
+
 QRect ListenWrap::computeWaveformRect(const QRect &centerRect) const {
 	const auto top = computeTopMargin(st::msgWaveformMax);
 	const auto left = (_playPauseSt.playOuter.width() + centerRect.height())
@@ -1482,10 +1488,16 @@ void VoiceRecordBar::installListenStateFilter() {
 		}
 		switch(e->type()) {
 		case QEvent::KeyPress: {
-			const auto key = static_cast<QKeyEvent*>(e.get())->key();
+			const auto keyEvent = static_cast<QKeyEvent*>(e.get());
+			const auto key = keyEvent->key();
+			const auto isSpace = (key == Qt::Key_Space);
 			const auto isEsc = (key == Qt::Key_Escape);
 			const auto isEnter = (key == Qt::Key_Enter
 				|| key == Qt::Key_Return);
+			if (isSpace && !keyEvent->isAutoRepeat() && _listen) {
+				_listen->playPause();
+				return Result::Cancel;
+			}
 			if (isEnter) {
 				requestToSendWithOptions({});
 				return Result::Cancel;

From fb2924f2d6a1697e2d69f36e97fe1de44ae48de9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 11 Nov 2020 23:13:57 +0300
Subject: [PATCH 111/370] Fixed size and position of lock/stop button at end of
 animation.

---
 .../controls/history_view_voice_record_bar.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index bdd887c41..ff7531982 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -623,16 +623,15 @@ RecordLock::RecordLock(not_null<Ui::RpWidget*> parent)
 	Qt::SolidLine,
 	Qt::SquareCap,
 	Qt::RoundJoin) {
-	resize(
-		st::historyRecordLockTopShadow.width(),
-		st::historyRecordLockSize.height());
-	// resize(st::historyRecordLockSize);
 	init();
 }
 
 void RecordLock::init() {
 	shownValue(
 	) | rpl::start_with_next([=](bool shown) {
+		resize(
+			st::historyRecordLockTopShadow.width(),
+			st::historyRecordLockSize.height());
 		if (!shown) {
 			setCursor(style::cur_default);
 			setAttribute(Qt::WA_TransparentForMouseEvents, true);
@@ -667,6 +666,10 @@ void RecordLock::init() {
 			if (value == to) {
 				setCursor(style::cur_pointer);
 				setAttribute(Qt::WA_TransparentForMouseEvents, false);
+
+				resize(
+					st::historyRecordLockTopShadow.width(),
+					st::historyRecordLockTopShadow.width());
 			}
 		};
 		_lockAnimation.start(std::move(callback), from, to, duration);
@@ -1115,9 +1118,10 @@ void VoiceRecordBar::setStartRecordingFilter(Fn<bool()> &&callback) {
 }
 
 void VoiceRecordBar::setLockBottom(rpl::producer<int> &&bottom) {
-	std::move(
-		bottom
-	) | rpl::start_with_next([=](int value) {
+	rpl::combine(
+		std::move(bottom),
+		_lock->sizeValue() | rpl::map_to(true) // Dummy value.
+	) | rpl::start_with_next([=](int value, bool dummy) {
 		_lock->moveToLeft(_lock->x(), value - _lock->height());
 	}, lifetime());
 }

From eadd952e6658a1a4ad40e2d5be06c62feeb5c0e7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 13 Nov 2020 02:23:36 +0300
Subject: [PATCH 112/370] Added animation for recorded voice data delete.

---
 .../history_view_voice_record_bar.cpp         | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index ff7531982..534651f1e 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -52,6 +52,8 @@ constexpr auto kPrecision = 10;
 
 constexpr auto kLockArcAngle = 15.;
 
+constexpr auto kHideWaveformBgOffset = 50;
+
 enum class FilterType {
 	Continue,
 	ShowBox,
@@ -239,6 +241,8 @@ private:
 	const QColor _activeWaveformBar;
 	const QColor _inactiveWaveformBar;
 
+	bool _isShowAnimation = true;
+
 	QRect _waveformBgRect;
 	QRect _waveformBgFinalCenterRect;
 	QRect _waveformFgRect;
@@ -315,19 +319,22 @@ void ListenWrap::init() {
 		}
 
 		{
+			const auto hideOffset = _isShowAnimation
+				? 0
+				: anim::interpolate(kHideWaveformBgOffset, 0, progress);
 			const auto deleteIconLeft = _stDelete.iconPosition.x();
 			const auto bgRectRight = anim::interpolate(
 				deleteIconLeft,
 				_stDelete.width,
-				progress);
+				_isShowAnimation ? progress : 1.);
 			const auto bgRectLeft = anim::interpolate(
 				_parent->width() - deleteIconLeft - _waveformBgRect.height(),
 				_stDelete.width,
-				progress);
+				_isShowAnimation ? progress : 1.);
 			const auto bgRectMargins = style::margins(
-				bgRectLeft,
+				bgRectLeft - hideOffset,
 				0,
-				bgRectRight,
+				bgRectRight + hideOffset,
 				0);
 			const auto bgRect = _waveformBgRect.marginsRemoved(bgRectMargins);
 
@@ -341,11 +348,17 @@ void ListenWrap::init() {
 			const auto bgCenterRect = bgRect.marginsRemoved(
 				style::margins(halfHeight, 0, halfHeight, 0));
 
+			if (!_isShowAnimation) {
+				p.setOpacity(progress);
+			}
 			p.setPen(Qt::NoPen);
 			p.setBrush(st::historyRecordCancelActive);
-			p.drawEllipse(bgLeftCircleRect);
-			p.drawEllipse(bgRightCircleRect);
-			p.fillRect(bgCenterRect, st::historyRecordCancelActive);
+			QPainterPath path;
+			path.setFillRule(Qt::WindingFill);
+			path.addEllipse(bgLeftCircleRect);
+			path.addEllipse(bgRightCircleRect);
+			path.addRect(bgCenterRect);
+			p.drawPath(path);
 
 			// Duration paint.
 			{
@@ -575,6 +588,7 @@ int ListenWrap::computeTopMargin(int height) const {
 }
 
 void ListenWrap::requestPaintProgress(float64 progress) {
+	_isShowAnimation = (_showProgress.current() < progress);
 	_showProgress = progress;
 }
 

From c9314e5e5e5fd1352cc5b1ad5b41f7c45389de01 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 13 Nov 2020 05:13:49 +0300
Subject: [PATCH 113/370] Added ripple animation to stop recording voice
 button.

---
 .../history_view_voice_record_bar.cpp         | 47 ++++++++++++++-----
 Telegram/SourceFiles/ui/chat/chat.style       |  1 +
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 534651f1e..4d24c2900 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 #include "styles/style_media_player.h"
 #include "ui/controls/send_button.h"
+#include "ui/effects/ripple_animation.h"
 #include "ui/text/format_values.h"
 #include "window/window_session_controller.h"
 
@@ -604,15 +605,19 @@ rpl::lifetime &ListenWrap::lifetime() {
 	return _lifetime;
 }
 
-class RecordLock final : public Ui::RpWidget {
+class RecordLock final : public Ui::RippleButton {
 public:
 	RecordLock(not_null<Ui::RpWidget*> parent);
 
 	void requestPaintProgress(float64 progress);
 
-	[[nodiscard]] rpl::producer<> stops() const;
 	[[nodiscard]] rpl::producer<> locks() const;
 	[[nodiscard]] bool isLocked() const;
+	[[nodiscard]] bool isStopState() const;
+
+protected:
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
 
 private:
 	void init();
@@ -621,6 +626,7 @@ private:
 	void setProgress(float64 progress);
 	void startLockingAnimation(float64 to);
 
+	const QRect _rippleRect;
 	const QPen _arcPen;
 
 	Ui::Animations::Simple _lockAnimation;
@@ -630,7 +636,13 @@ private:
 };
 
 RecordLock::RecordLock(not_null<Ui::RpWidget*> parent)
-: RpWidget(parent)
+: RippleButton(parent, st::defaultRippleAnimation)
+, _rippleRect(QRect(
+	0,
+	0,
+	st::historyRecordLockTopShadow.width(),
+	st::historyRecordLockTopShadow.width())
+		.marginsRemoved(st::historyRecordLockRippleMargin))
 , _arcPen(
 	st::historyRecordLockIconFg,
 	st::historyRecordLockIconLineWidth,
@@ -755,6 +767,9 @@ void RecordLock::drawProgress(Painter &p) {
 		arrow.paintInCenter(p, arrowRect);
 		p.setOpacity(1.);
 	}
+	if (isLocked()) {
+		paintRipple(p, _rippleRect.x(), _rippleRect.y());
+	}
 	{
 		PainterHighQualityEnabler hq(p);
 		const auto &size = st::historyRecordLockIconSize;
@@ -833,18 +848,21 @@ bool RecordLock::isLocked() const {
 	return _progress.current() == 1.;
 }
 
+bool RecordLock::isStopState() const {
+	return isLocked() && (_lockAnimation.value(1.) == 1.);
+}
+
 rpl::producer<> RecordLock::locks() const {
 	return _progress.changes(
 	) | rpl::filter([=] { return isLocked(); }) | rpl::to_empty;
 }
 
-rpl::producer<> RecordLock::stops() const {
-	return events(
-	) | rpl::filter([=](not_null<QEvent*> e) {
-		return isLocked()
-			&& (_lockAnimation.value(1.) == 1.)
-			&& (e->type() == QEvent::MouseButtonRelease);
-	}) | rpl::to_empty;
+QImage RecordLock::prepareRippleMask() const {
+	return Ui::RippleAnimation::ellipseMask(_rippleRect.size());
+}
+
+QPoint RecordLock::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos()) - _rippleRect.topLeft();
 }
 
 VoiceRecordBar::VoiceRecordBar(
@@ -996,8 +1014,11 @@ void VoiceRecordBar::init() {
 		_showLockAnimation.start(std::move(callback), from, to, duration);
 	}, lifetime());
 
-	_lock->stops(
-	) | rpl::start_with_next([=] {
+	_lock->setClickedCallback([=] {
+		if (!_lock->isStopState()) {
+			return;
+		}
+
 		::Media::Capture::instance()->startedChanges(
 		) | rpl::filter([=](auto capturing) {
 			return !capturing && _listen;
@@ -1018,7 +1039,7 @@ void VoiceRecordBar::init() {
 		}, lifetime());
 
 		stopRecording(StopType::Listen);
-	}, lifetime());
+	});
 
 	_lock->locks(
 	) | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 0b9f67f03..a44df79c1 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -380,6 +380,7 @@ historyRecordLockBodyShadow: icon {{ "voice_lock/record_lock_body_shadow", histo
 historyRecordLockBody: icon {{ "voice_lock/record_lock_body", historyToDownBg }};
 historyRecordLockMargin: margins(4px, 4px, 4px, 4px);
 historyRecordLockArrow: icon {{ "voice_lock/voice_arrow", historyToDownFg }};
+historyRecordLockRippleMargin: margins(5px, 5px, 5px, 5px);
 
 historyRecordDelete: IconButton(historyAttach) {
 	icon: icon {{ "info_media_delete", historyComposeIconFg }};

From 92298316ab32153deb2c0c78aee2931c93db3874 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 13 Nov 2020 05:37:27 +0300
Subject: [PATCH 114/370] Added transform animation from lock to stop icon for
 recording voice.

---
 .../history_view_voice_record_bar.cpp         | 47 +++++++++++++++----
 Telegram/SourceFiles/ui/chat/chat.style       |  1 +
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 4d24c2900..74124766a 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -61,6 +61,10 @@ enum class FilterType {
 	Cancel,
 };
 
+inline float64 InterpolateF(int a, int b, float64 b_ratio) {
+	return a + float64(b - a) * b_ratio;
+}
+
 [[nodiscard]] auto InactiveColor(const QColor &c) {
 	return QColor(c.red(), c.green(), c.blue(), kInactiveWaveformBarAlpha);
 }
@@ -772,26 +776,51 @@ void RecordLock::drawProgress(Painter &p) {
 	}
 	{
 		PainterHighQualityEnabler hq(p);
+		const auto lockToStopProgress =
+			_lockAnimation.value(isLocked() ? 1. : 0);
+		const auto &arcOffset = st::historyRecordLockIconLineSkip;
 		const auto &size = st::historyRecordLockIconSize;
+
+		const auto arcWidth = size.width() - arcOffset * 2;
+		const auto &arcHeight = st::historyRecordLockIconArcHeight;
+
 		const auto &blockHeight = st::historyRecordLockIconBottomHeight;
-		const auto blockRect = QRect(
-			0,
-			size.height() - blockHeight,
+
+		const auto blockRectWidth = InterpolateF(
 			size.width(),
-			blockHeight);
+			st::historyRecordStopIconWidth,
+			lockToStopProgress);
+		const auto blockRectHeight = InterpolateF(
+			blockHeight,
+			st::historyRecordStopIconWidth,
+			lockToStopProgress);
+		const auto blockRectTop = InterpolateF(
+			size.height() - blockHeight,
+			std::round((size.height() - blockRectHeight) / 2.),
+			lockToStopProgress);
+
+		const auto blockRect = QRectF(
+			(size.width() - blockRectWidth) / 2,
+			blockRectTop,
+			blockRectWidth,
+			blockRectHeight);
 		const auto &lineHeight = st::historyRecordLockIconLineHeight;
-		const auto &offset = st::historyRecordLockIconLineSkip;
 
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::historyRecordLockIconFg);
 		p.translate(
 			inner.x() + (inner.width() - size.width()) / 2,
 			inner.y() + (originTop.height() * 2 - size.height()) / 2);
-		p.drawRoundedRect(blockRect, 2, 3);
+		{
+			const auto xRadius = anim::interpolate(2, 3, lockToStopProgress);
+			p.drawRoundedRect(blockRect, xRadius, 3);
+		}
 
+		const auto offsetTranslate = lockToStopProgress *
+			(lineHeight + arcHeight + _arcPen.width() * 2);
 		p.translate(
-			size.width() - offset,
-			blockRect.y());
+			size.width() - arcOffset,
+			blockRect.y() + offsetTranslate);
 
 		if (progress < 1. && progress > 0.) {
 			p.rotate(kLockArcAngle * progress);
@@ -801,8 +830,6 @@ void RecordLock::drawProgress(Painter &p) {
 		const auto rLine = QLineF(0, 0, 0, -lineHeight);
 		p.drawLine(rLine);
 
-		const auto arcWidth = size.width() - offset * 2;
-		const auto &arcHeight = st::historyRecordLockIconArcHeight;
 		p.drawArc(
 			-arcWidth,
 			rLine.dy() - arcHeight - _arcPen.width() + rLine.y1(),
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index a44df79c1..8f893aa1c 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -371,6 +371,7 @@ historyRecordLockIconLineHeight: 2px;
 historyRecordLockIconLineSkip: 3px;
 historyRecordLockIconLineWidth: 2px;
 historyRecordLockIconArcHeight: 4px;
+historyRecordStopIconWidth: 12px;
 
 historyRecordLockTopShadow: icon {{ "voice_lock/record_lock_top_shadow", historyToDownShadow }};
 historyRecordLockTop: icon {{ "voice_lock/record_lock_top", historyToDownBg }};

From 79cc4da626440588d8fe252d5f94e90dcabfa127 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 16 Nov 2020 16:21:36 +0300
Subject: [PATCH 115/370] Reduced block size for voice record lock.

---
 .../icons/voice_lock/record_lock_body.png     | Bin 107 -> 1956 bytes
 .../icons/voice_lock/record_lock_body@2x.png  | Bin 122 -> 1961 bytes
 .../icons/voice_lock/record_lock_body@3x.png  | Bin 176 -> 1972 bytes
 .../voice_lock/record_lock_body_shadow.png    | Bin 122 -> 1983 bytes
 .../voice_lock/record_lock_body_shadow@2x.png | Bin 199 -> 2008 bytes
 .../voice_lock/record_lock_body_shadow@3x.png | Bin 341 -> 2016 bytes
 .../icons/voice_lock/record_lock_bottom.png   | Bin 369 -> 2393 bytes
 .../voice_lock/record_lock_bottom@2x.png      | Bin 657 -> 2693 bytes
 .../voice_lock/record_lock_bottom@3x.png      | Bin 1012 -> 3014 bytes
 .../voice_lock/record_lock_bottom_shadow.png  | Bin 576 -> 2774 bytes
 .../record_lock_bottom_shadow@2x.png          | Bin 2265 -> 3510 bytes
 .../record_lock_bottom_shadow@3x.png          | Bin 4705 -> 4285 bytes
 .../icons/voice_lock/record_lock_top.png      | Bin 359 -> 2386 bytes
 .../icons/voice_lock/record_lock_top@2x.png   | Bin 661 -> 2685 bytes
 .../icons/voice_lock/record_lock_top@3x.png   | Bin 1010 -> 2995 bytes
 .../voice_lock/record_lock_top_shadow.png     | Bin 557 -> 2629 bytes
 .../voice_lock/record_lock_top_shadow@2x.png  | Bin 2244 -> 3380 bytes
 .../voice_lock/record_lock_top_shadow@3x.png  | Bin 4604 -> 4139 bytes
 .../history_view_voice_record_bar.cpp         |  13 ++++++++-----
 Telegram/SourceFiles/ui/chat/chat.style       |   6 +++---
 20 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_body.png b/Telegram/Resources/icons/voice_lock/record_lock_body.png
index 6204b88ce44654acc312fcb73389f27b3dda9807..e6e25e290348d8a4e09042f3acb10ef1b5aa85ec 100644
GIT binary patch
literal 1956
zcmbVNTWl0n7@lRJ6dJUZ$Ss<T)1bXLJ2PizFEe4ebhok#ZmG*AU_-EH&Yay2?9L1`
z)9#i8>=uk*&@_f{iw``MzL<C+`a}Xnh17(b5|sxZc)+5GiBA#}W9pf`S!zMzCbK&;
z=R4p3{ontee~<R|Y+kl>%~Fb@mL=k`6!~o<*Mi0c<on!*OZHHd=S3|V?cJmr3Z_$=
zyXZDSlEUo-cN6vZ1Jl`O;b;2$r>=LlFSQD(BS(&<`ZwI1ygGS}YB>7!l|}D)JnQM9
z-3NDfcpLs0dbiXPd*k~>r>|^Wb9alct;6%}n<IDH)_xv7T`GM;P2KQu?bJK|8=mvs
z@1MW?>oR)iwfLBS?7+gQ>8)>n^6|)>MDv5?%@-PfUPAxb6h9!Jy8e|XxcG|`o=>-?
zIyXK5;rlDoEAT}2c-yMJzP^s|#J!i!bu8Sm;^g@Biq7Kn+WRY?y|;4hiSY^QyRIJ>
zH;gvFb+-97wdb>2>RCWt@gDwNYJTqGF(uoqG>+}+OE+KuRxh7!y>_bg^5or1$4jN3
zp6<FfezF8hPkFsF>BFbayx=`FvflgUMTwfcy6vyka&Q+hZiyLx-KMCf<?iL7&U~<n
zq880)>7CBb<f}3=@;>O==_}?<f~Kf-8;T}Gd$B_+IIHOq=C=!%7+O;!%#J{kPnuCY
zpvCuFc>DgIG}^xxNh-5pJ-x0d6M{T;AYIJobXzV)m@=<S?%mfMLzf}W-Uw5v-_B$&
z9W^XW2Yf*m2_jF2B%cuE#encK4R|5M@d1txvb-SkVHpT?^}~>8mYR`Mu~(|G$Ww$F
za2!+SxI&@eEBJkemE}lpNE{D109b-x?P1-4MOL?4YYZ`LBTF+K&CqF=5h})@6Jdzb
zN(y<iPOIBhn}}gt5t^Lf<K2|XKo!+-=Ae};2Uih?b2yK6$0k^zjx`4i$FK*CM^M+7
z9|}OMO(yFx=GBtV*F)G&_Yg^=YRJ53J3VY-E`@Dl&_cL-h{$YpvoYnUg`s0uX~W3X
z3e{VaOh=<`VZwA<5+Y4^^Jt&73&)^?BMjgH&k6!7h-o1p1HTM{oo)^J3N&e`T4s0-
zG?*6rvOg^I!b4EfH!5`Ce}YvcXACP3N!D5(W-({#S%$8ADMyW*VUfT@oqzWG1Q{ll
zk<oHwVeU{Vt4${5gl;=fM>r9SFvK9Arm3<dhG8HOR9GmgAy$+yWF?4sHY0@~zz9GH
zq}u+Nfd<_+aQ9bEglZtd@sGMtC<KB^NMV75AR7?HAS)>nU||3Qgv6ktX2crXHcKOi
z66R*Jx~f#d2t<rCNL5)y2m@9G{tO#dG72kUBn5E>pb!kZtzYgYIj-5H&coHiv>orO
z-sLp9+(0r!?!kyK$n6NMGS%1GJbpY;<m&#y04Ai5X_88G+sHTtXyHv+;$5vekMBh8
zQ5o29=<)iWtezENbM*habN{#gszGP~>RC+YEyuVSaqeWQl!u#Jx$@eqDOQ7%(dgdR
zXEJ%HPj##lYKzQl@nG>6GVfO>Vw=*9KOmJlG&3{fztzM8FgjH_zlv&UY4AQDyS>Hz
OS4edC#6IfkAN?Cn<#>1i

literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^IzY_C!2~4NIII)^Qk(@Ik;M!QddeWoSh3W;3@9k;
z>EaktaVt3?A>qfLpP&CTGC8c4RCw_B_jl&k91IF?er3L9C}069WbkzLb6Mw<&;$Ve
CE*@L}

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_body@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_body@2x.png
index cf955e2914fe6d14b625be80f406dff2084a863f..2ac328fef0867cf5ecc278fcbf00a680666fe12b 100644
GIT binary patch
literal 1961
zcmbVNTWl0n7@nmUO0imOYzrDPPJ{O1?A-P`VcXK(N>|)cmQAP)!Ja*Hb~|==W|*0F
zw<Ks6Fa-mo7}A!;L=v&_$qUgZ5@^+uniTL74G%u>fW-$BeSw&$sb}_PsRfCX%*>f{
zzVrRxe>wl0=;_{BRk@{-Ac(49S0IevJ@_uIScjhz3Fc{nustXH{XIJ*HHyga&JMDX
z^Ljl^1krc{_V@Fec~D1B_V+JbYiX*~Q{m&sPlo&3Zp>btT_nm+d^KNo+GcAdhY!4d
zpt+>{_u*5SO@UW`C_6XbzU9_S_Qq!0w{MKzY~1#l=UgW94Y6?D&NLBk3D<2GJKw%I
z_e&Kyyr*ki7(ZOPu(WIJ<Bvvf2CMJYR9~w2c?0>!#;(KS)U_{duJxZ!*gn}6ZfU>A
zd+yXlYSB#mY-4?2UthCl=JxaNH<#|KoxHGA+mc?|cBk&C+jZL}F3b?$cl@}%{7Chi
z=c~UXUi<WG={!%&mmIt6t$yb6$!NSfS~0%AFH(+pesj%I!{SuK-0ZC@XET|fp6FP-
zFqr|F$4g3<BgdwupDj5$+FJ6(WiK&%b@yMJMb~~DxD8s@D+WPqtg&tzG5t<GL6j}a
zkzTVm^s)%mq#an{w5O9AMia#LwzLM|ATr4)ipz?R`t{Nkij*ZEwa*!1Lz*8A$X$nY
zwD(YV1RffMUWsaJCAX(VOprt-Ak)c&Vu)!UmE{%j*qUZ2G7B*WeN--gy`dh`uj+_&
z+Fdl{94zVf+Bp~NaB?q@Jj=Nm*2%Cgn&m{+Bk~-XzbI@?mttZ#@M7K;{_;@+rm2Yx
zlS-xRDZ#GlaR%3hmtlE^=V^?fjS<BJX<9KF3Jd{cKwZ{MSyf1j5k%D?(??;YITw;z
zkybJCVZs4p(m-Q4J8QX=1xm1p(}wg!*0=;2lt4+Om<GmjMXWZUnyN9NK7hKoe4hav
z+EA!yV@)l|WYL6Sb`E1V@&Q>BZA3;i#DtNd4(Ske4r7@OmN%N{*AXyPJ))|KLZW&K
zl1abcN{okW3;`%BmLE+kcA)?;k&oh8o~1dC<{S~uDe{6S@GVvj*&H;aN^)#u71R~s
zFwQLsuKS?4ZX{rW{{%}=jH!AOV6WvQh$BW*;uKkorRY}^s*Vj~b;8Q|AZ{kQ8j}-v
zVRci<sttw2pkkOnfhZX8Q8++$S(ZdM=K#PX@icU}5$%v1F*+K963w~=#K)pM>jtsH
z{(uUHtTM3n=T3yALd@}xI;Q|70Anm2bs~=Dy$&Z01Qya9E5sz1Gb(xAjsn|mUB-tJ
zBv!IoswB+FdpxWYK}fS6E=oJNm_SF}$cd#P5M_ZIdU(Mq{cJUfU9y4mJd!_5d(pxC
zC?S*C0ulkV4u+3{Rz)C*%1_H{#N&}H=l7=u5GH*{k>so!YRpUl9qowY*cGz#@JeJJ
z<beT(AFlt=@|hF1O8>tr_kZip2M7)TC5~{vWhl!d#_CMD^f0S4mt9-Y#R_oT8m(cm
zC*zM|S4Rq_)^X3?Go?wm-){{Dc0}<1Q)*wgyu2K*KRtTp%%-`mcYpg}Y;1DOHvQgX
VW!>){{nPq21UtI}A9nN~`5UKyeO3Sf

literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^5kSns!2~2*cjvzcQk(@Ik;M!QddeWoSh3W;3@E7M
z>EaktaVt52q1k`F-Cy~M4?aIX&vW9ze-1Vc#*aYu#Ri5(^Za`~AJ#B39NYD}#WRED
QH&7pgr>mdKI;Vst0GTQ$zyJUM

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_body@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_body@3x.png
index 1da493f530811593190d65746028aca617b5d1e4..0f12933eb4605a51d271538ecfd292cf534f62d2 100644
GIT binary patch
literal 1972
zcmbVNTTC2P7@n1KDGiDx0wu<bLr^Zx&TVIynRKDB3*EIY#qB0V(o|+=4$H{y%yed8
z7m_O5*0eR%pdl@7d>|2d^wQ{qY0^@aiV5_h(e%NXK2+KV6CaFC6Jzkq-lRyeagv!i
zbIy0Z|NAfJpOd{kyDQ4;$`J&q2nPIN_)fvQr0g;HJnmlhAc*TZ)#vN&Q1mE3!@E1t
zMoJL)CIo4`CJzkIhJDBc+Xn^~ms^_3&1Cq*iBsW$_G|N3=9iF?liw~BzvFVXp`!<1
zKiFJUa)0#g^ppNqe=I(`u&eIYi|)o|*LQDB+-z+4oIjgR-#`|xx``&_E#|80eAj#D
zFaKJBj=mh2WF`-9SzOt3{F9F-ZU!swRaIUnySo+rb6eoBIKBL}i!1%|wCmG7;g((Z
zX#P%3q#De{rW$Me`}>>ux!ccw*t}(b^_kg~>Xy_>!=0L^Zr3!No}EK}==`a)<VfY4
zGnL;XuYGo1nW2$|qGNvul}}$h6^&I!%O(%>M@j%q@2Fa-Uz)DJJb&xbR67036P-)5
zXVOyo@uH&D$g$~j&lVk>Xe;{aqJYd_+56WHkvjkbx77%|Vj;-3D(7|~=iaYHkm6M}
z(r5RDUJ_+J;g+0mx>E@Qq7h_gd&-dHVPK<C5K}cT_S=O^7^*5>Y(E<!Lxv9wsey45
z>>KZi$m7GZpkVE7=+2Y~2@=4T&{QI>Sz^kIWq3t6cBTmo%|Ps7FP6<;U#J)L=_Wu~
zH;2oVheTTiH^q@2mU;oDNvf3~S%Tznk`hT?q$xCaVbGeX42ofYcg`04@?t}_ZHNSs
zOeWn)#;uz%0@j8=kTgNlI7Hyqm}W~UT(j!)41QqArfS%#uAvU26xBy;F9wxnT}T)O
zTFuIZ2?mTvNd`f=NynuOP>~BbW5kSSj4Lt$;vfMu+k#lCfHj76TepVvhfo)mA20wz
z8wwR{Y^WuXD44M9u2JYlE+8ACt;m=Gh%m795mN?TqflnO<BcKuOd#318PWB4K2g1S
z$*9lgB!)*DLz1j&jvq~Hb^*U+120CCG>KCbPI)2}E7FX}a4k*_$t*OaE9&6bIw%*R
z9Gu8L2!(Z{NVfE!U_}-Obu%GBuhoPU1B9W)FtiX$(Wl3C6B>r<n6>jk*i1})P>sWd
z^-U$CHWU(rnq^Cx41#_y1_R_)RYjyYz_toN!6}*LaSy}NxWEkxI41#GiAo&BD0F_m
zUzbOmGH~{1PlTe&kmDb9Bu}%XAk#SO5Rt8(D9$sqjFU9W2o%pUJV)i(_L?d@lu~>x
ztD{PRj8TeZJOZqA0HQ4J0VKeAQdV$*Vpu`o1eWvgPU&Z=NerkK%=1|8Fzo|}a-+D4
zW(r7@WanUbG1;jIpkTRab%S_3lI7g~<Pd<Qn-odbx}^`=Ny!8qF&Mjib~dj>;$a?G
z(&*;;A1$9*Ve9n&yK?`x{#=0MAxVn?*l!8U@rZCbQ#L)s`pjk4)^xEv9JWShSm?>{
zqtMlX2B}Thv%hGH-iQ6ZDd_Kr1iq1#d1Q5UHC9_Z<?8P4w%@%m@l3^C_$dCs<*mD3
b@11cSRkoM@{QJD^{3U{2J^qh62afy=izs{1

literal 176
zcmeAS@N?(olHy`uVBq!ia0vp^EkMl1!2~3G;}$9dDb50q$YKTtJs?|8nXzK2eHl<t
zvcxr_Bsf2<q&%@GmBBG3KPgqgGdD3kH7GSPrLyp3str()t*47)NX4z>goZ|bdAmRI
ztR?IR64DQ_%(ttR;+6W<e15)ta%a!Q0!a-6DamGQBe(9Ajv+q1VGo$&8kre(ZoL$o
T`_b|<&>#j+S3j3^P6<r_OaU~d

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_body_shadow.png b/Telegram/Resources/icons/voice_lock/record_lock_body_shadow.png
index ee20e6c70a894d17582967d278dd54cf1f320728..884d7a81c541dfbe82b4a133310c0c3b4058179f 100644
GIT binary patch
literal 1983
zcmbVNTWl0n7@lQmxrtO8xy6TZ8nhQ@=d!c63ER@{R(8Rqb=id45bW7AXLiT#&I~it
z-7N{iVvW?GsfKWi4?G~gp&~vJp;c*WQZCY{Jovx^79UJ}Q8YopGkddCK;kB|J2U4y
z-~avJ|DS(Hd$(*{zI5$Uf*_VhBjGsyW%0FO@dEt)?$xOrK{%dOLZRMHNlPL!zOjpJ
z<^lnK3qdqrh64k<ZtXPClLG@&7u#Bv8u|GC{RiR$9hb)^$ES(<(XTJmz2k7SlerzQ
z?Pzt@|B-vU_(b@X@9K_T*s%8cCRcN-<LaKh*P7RT=0932enU)MaxpE$TkcDa)7|f#
zp7?n=nR_WR<{sO<aB6n*n;(C)_gb{!R%652#Xl_}Z!e4N7LQ!~%Hdt~#UaNho8xU8
zZt?z`s}d{G$<)E-)&2ebt^SiYp8KG6;kK2BPt2}tE6lFDx$3DKtJWPlagzA9>xV`4
z`x@Rj-Y`SFdgh9BoF^_gM}7-5Jbms!GS!e=Jhr_*QIB|jP2+6S^pU2C@$2Ug7K=Zw
z=$bxpxCn}mJDqnEBS(%s<9vN@yYtI)0b+cz=dU%QcRMz2i5_{`B#32=_T?asy}z0u
z>h3CuKC3VGq6oFD3)ptL3RxYa31WRmK?iUUS!5EW6g5cwa`rq$DpHWz=83T}J%rLq
zWS4=q?%I-oy9QxEqB`2i^#u_VWRV5PLN=qCVj)PCctw0~zh)@11hEE#RJneAv0gHy
z8Hn__yfowlmh=T&oR<|m-18*Qaz2LjFszqmIg#~?JV#bO6pm&{vKSA)P>F?~f>heF
zbdh25`MfLdc4<b6!Mzb+Sf1f|8Y5_PShYZbR?Vg=Ll~LRP;^VtRMKVyNo~jqQdns@
zg{)qqRn3Y`*f6F5bcS=Wc1k6n1Zy~b$jFp}OOQbsltrp#Vk}p~>S@i=%(V6Z>e})>
z0kE~PSS`kVwPdrk5T@0g!)a6uxi8vG4C{!ABU2kPAnMLxnN4;!x)?GLurwo~X_;!F
zdaIJjP{=NfpKOi+sHk=xEpv9EFtAXN;#r=hIgaLp1m_WXx5&BM>>9FVXiSq7d3YYw
zo8T}GSJ`(D6!(n;EbyOT35v32WC6}v$$}JObTvhhH7~`GmeC9x7^`#7eILcc#L#3V
zgBRuxm6F<6OpL0g1yqQl;UI+#aw&==2BZMXdnHIC9`dx{<9&31hZ5}(l2G<Zem~*^
z)%{@&4%uyB?=PPSNrRZ<A9YE|%kh4Jr#%w%(gGAbbP@m`jaZh22qa}Mi>horhJp_z
z$joK6RY{o9BY9Y_%(Ar4?FO{KB7si2{W1+?w~rN|8@YMOZv9d>i4n!bbsnx9rmbja
z<u0R;r3MlKv=2s*f_6tBiK@I-?&HTJMXv16rx7N7NRyPKo0@Fpfq^<x*t=?V9^Q$}
zgEBBd?&10$t)69J^Ys6_bN{#gia{_9)D*(=mZ9v77<)36%frmCTxo626syAVXtZx@
zGZ{bBraDqFwSi}L$ETYjc-{-qaA#um43r3`EX%oEuD!jzvvXqb`%~PNWobqEe9zrG
pGavSJ?78#j?cbT+kx?+_Aar5H!pDA{JY)Z1M7y_yPjwCK`x|CTg%1D#

literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^CP2)@!2~2{SZ445Db50q$YKTtJ!KGPtXOJa1{Bos
zba4!+xRspXz+`4-7QH?1ue}39hUo=Ho*fO%&4=IJ-OYZg&|!5WpF<fx!*b?dGuQqt
RJrC5!;OXk;vd$@?2>@AiB1ZrK

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@2x.png
index 3b01ea846d4ba0f185d942490c5c4856bfa24cf5..f2173f10dec1c232d6478294a44747cf1ae72c49 100644
GIT binary patch
literal 2008
zcmbVNeQXnD7{9s?1_T|V<0F2YHz)hxdLM1CcNfaX+PPKen570>2=wiHZ@ZKB?zp?H
z9R{U{3I@%B1U4{XF}VK}A(EJoz)&F=`8FD2G{FRifB5m2glH7sYr8roAhF4{clZ9@
z-}8HZ&+|Ur-qqPYW7@oF1VPLQcZ8z&H;%8$n)~qgU;E#$CkWS5YB1QfRM8WNjJCIu
zjhrNjO$5<+9>(LmVQ(<egYo$3vn@^2%xrYqwjI&<;`5`YM$Zt{+dn^9^_I)Ei0oVY
z(%R;V>KlD;=4Xc1eO)zla>=|a&$t_#U6)?oe7UjVh&YtbUnEYSb2ClE8=iBn!)-ec
zpZIA8+4pS6fM;M+<>|3yuYY)O^W|{u^;xw?Ykr(c{xQ8{lRS9#GnX*slijXE%c3ny
zuJhux*|9n_lG@ccr@OnmSsb}K|GnnQRdss~jMcT|#u~28e)#I_hTR87h_70|ol?D}
z_SNCqFNqgEx}Xg6#L0@Sze%-^9NUpd)h22N)^x|J5zo(^HCBISu>Qp8mE*he`5zu=
zJ#%1B9^~(@sJI#1I=J_VidQx-s`&JnM2wzV@#kDwSc8q5YIHnr5ybRa&gCNZzB7j)
zs&1;W)%NPhavACwH*oB9=Q0LH6U4&BIRn7;$R-mgrD_4{*Q3WNQdI)fDqn<+7(vvd
zc5F1!%8i{dxN$v{6l(Dza$!!!1Q}!lGM7nfmYfSv1zs87JFgjvEI{n_0jgNP)sZeT
zsGErNxdj?>UY7JrZcbpmK5hZYvz(t{eGDtmEGM&~%yVSvL*Zzql9Z#Nr%SQ$Q-JER
zZ9`_5Y&Pr8dfd91VsLLr49hb-Ph$ja^=mfB(VA61&JaQtG*!b^b&YfwK|=4f0~A(T
zOd(^GX*H{46E=*=0fXV(tdmj!sK7GL=rz-Y;0k0=8fB1XTNulgu||(>>sF6`2kP?j
zEdj8#kw`hlZM9@F<q($L)`!z58FE{+73((;6GfKZYeLl4hh^3~*%)%rM8MX~n69VC
z3)M9)nG6P<!iZ#J1VB}D@@Sf{3x$A<0u;~kEX{E==Z$ebnfJ(EPm5DSwg`>rikj@7
z1QlW&#$nK{P~0~Pu)%+V6(}clGXrqeY6hebV`wRgEPE*j^|Wr{z*wDU;`=ZjCZ?WL
z(|BR>P${U5MC7n$*+7FR912j_Ah)V2G7BXD1jy0AlVEADAR#&dl78Bwa3aV1S&rv?
z<NHH8>~-3}*<U;niViWyKk7IU`Z*yf&{9HzG=N@?77-9=4@x9>Yyc0FWwsTjiVr17
zPh@peDVWih5R;Mz3ABi}&|a?}(vl$gX~hqCUVtL!6?{(X7rIIAP%T{N{?cJui8hq(
z(kfYKAQ?dCU<4@WbOchU(rfiLe%w>!(*A4@!lZX;l45jAPuf{vqNOS9-FS8G-igee
zGO$43-SyvFJ&VF7>Hl}<{%`#ygJ2KPQV7pmhH^4uoXJ!y4>P%Pg|!J&Y#fe9qjOuH
z$@rl>)scp&O+2$-TU9rP=Y1p`S{f6-_<7*ORD!Fie0zA#zC$<VOUoZ>+nJj8@%ir;
zR@YtkZQ611v0o~Q(39^<^F8Yh9{J|+nKPgJ?!|TchK{y}lE?P1%{O;d{mx%-wJ(o9
U+JB>ef%8uiZtDzv&>G+JH|{EorT_o{

literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^89>a!!2~4Vdc3_3q&N#aB8wRq^pruEv0|xx8Bnm&
z)5S5Q;?~nk2YDF;1zHnDFLYe!U!cb+C8Q;2bzmRUw}kIj@9o;(pEvksc5dgCOA^9P
z8cV<2yB^hk-~fwQ%7KIKEK3r;g9O)XH9QveS|a(qucFM115G?TiunX5JSw(`SvDmq
td&!}*mX7BvtKV<E_Wy9;?;WQL_#Y{~nj&(}z8vTX22WQ%mvv4FO#n#FOm_eP

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_body_shadow@3x.png
index cef5497898e4494ec4a026972d259b640f5162da..cfefa592cbf8fddb277ca556b68250179702022f 100644
GIT binary patch
literal 2016
zcmbVNTWl0n7@l=YDG*?h$W0%{sc0|G&UG&{vXpkWvMX*W%Nnpj?Ae*K+p)Vd!_2h1
zC8Av}5eSmT5N^>(BJ>e~Xd(fjphYxX6awLaXk(!GAn{2wAqLOv%~Ao0lg!MSbH4Na
z-+wv(Y-w*>JazKC$ry%Bjf6un^d3NWb<Gp#`N`A$hcV3Yyb=tyH_KWA;<3docpW1M
z{(20nyC`*bvbwd#fKPUIo;}}KKiSB}HgDb*>ukC>bY|!rR=wrh;R)Lvj)i#d>UUN*
zIII8ceLp`V^ybwGdxjUy8+pZD*WkGHZvVBq`Jemu<nupZXD_&^dTc9q!EvPZgCnPY
zor?D^3lDGu>#EL<E_v_Jr~TI=t~)bb$7+6=gx{SKUMKE8|Fy$A@$^o|;U%%gMR!>L
zt=aKea4@x_Zcax>M}vRx#tR1;s#eU}wSRP0V{UZ*t=UiAm_2{z{z2?Y%k_!X>s_1n
zxh`XGefGV)kHv<a8-EvE&z#tnNVyU<1FJgX)sSW9&K#{hx4ZV#(8$Rh`TWi4E$8;{
z%7gqgr}JKX<L<rBIydw$bbfV0z=qB&{cEo1U4;TSNe{nnV%U_K_U*v-emDoiCfrlv
zE3K8$S4Bz7xPcu`cP^tNG=?o`%IQGrh8CWHDMbwsza2YC;EEg|R(PUxR1d-~CA`*v
z%h$HWrM2CXAQMds@dY^%5oDkR@LVRXnqn?M6nI56wx=lqFF>sB08z}}%4j<t)C`Dw
z++I>*cpCQ!ZpKUV9_B@yr5PVZdnnpV(u_#^MV7%!7lEu9a#D<iUM|@}Ujd@avUHK6
zve~RV%egfpMWNadD4L~MmP82B>{Bg}BUQ7u%n*X6WGK3&Xew?qf`ry%1qh_H=t4%X
z(5hxBOekPf4(Jr)rfruBKv}Bb^d2K!FfL0JOv4OREfZmx3RdsZEY0lF9ztDNzRv&(
zZ8Tc3@jxw^OvQw0we})6N&$Hw+Kl(<kcvT5>oFwQ+KXh?+TQ45(15_wjJT$y%ZX|)
zOU8piJ28H|E(#<?wf(3cvkQiR1p@?2voy&tB*VuUkH~T&FErXYq>Ip~CM(IlaZqoZ
z;Y3aldGCEtR5voPz<+{eNla=+1|YAM3`jvrS5pLDiKQ6S(wcz`BX!)^`3PzzhL%*)
zXkmO)DX5J`#fWNJK$T!56d+K5+=?QL30~kC*$2sl2LO_1Se{G>9+s56evaXj66>Qu
zd4EWgdh9Z=_ZLrutVxLDA9WJsIoZdsBqIx6Qeb$V^aGkD{k#Mi$tMdO^px3_8VWj;
zAU&4VRwW}w*3TiZCrSD|UY<moWm52?L?k4R;W);RXlT3i3)Lis6%*yTuXLD}!!@N*
zTEPniBm&7k7y&}ED+0<yX<B(eJRZw(X@9m0BGN|`NzuBgC9NzlU~>w^uAH4mS0eQ=
z4@}VeX#J0u&!Vt#`u|<I|66}4KvEY_QxNrAim*MR?9Nn74>dk>g|#tVtPDr3(H>TM
zGWw`=b*Lh01NH2Kr*ZpN`&uN_91nkU`!X|a2(Q@$n!oEgevkQL`=$2NBR^j|5dG12
z{QRb-*h{V%+^stVv0~YkFOyeCK4Q*vbYD2?J9_sGg81X@VgL2i&5xT8{S>6DoK+ic
ZJFahjZhE-7mA3yVk=C}*!IsYTe*-(Oltlml

literal 341
zcmV-b0jmCqP)<h;3K|Lk000e1NJLTq005i-000IE0ssI2xhG&h00009a7bBm001r{
z001r{0eGc9b^rhX8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0OCnR
zK~#9!?bOGOgJ2XzVY8qBpa()1q)rf_8bs&>321{*1fc-J2K!6_GvkGky!dYcZ}A=J
zJtRqb{61Nh6-Ci?-L~x@2+}mIs;cX{X_~feyRPdgcEf;$7i6dbhaG$p5P}>;`6Jm+
z(0`+<s%jX9<2Yd$W?5F(b>H{%Jn#E1^zR$IAVUo}>`@fCu1g4Vd?u=Cnq1^=p65-|
z48yQ2%W)in{=UHrGSq;>9>=lgd4%|6R4#J2D2ldi$8i)<@7{Ty>$*Y>cv+T7lK8%F
nS(c`0BC3e`MpW^Bzdz~={`1fTlQJPq00000NkvXXu0mjf;{A)_

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_bottom.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom.png
index 8be9d5e19ed3df9ea6edea42c605cab82e866671..882e925e6603113ddf36fcff5c43f08750db3fc4 100644
GIT binary patch
literal 2393
zcmb_dYitx%7@blm1q8ReA&A5BuoPzJx!aksTMFGmSJ+aPMW7Pw-I=@X(A}M3cD4@;
zkMgEsLjZY22qr-IBLY!0B5jd^s0BpABWeT%3yF}L5J42dJKOCF6_5}&nccg0&i%gg
zo$uUxR}~ga=-zc;R}90tyYpRM^qY>J-l-kXw>IqBbqq@yq2%Tkj+IqE#Jv;7;pwy>
z@FNlKlvG^IXvSO}_AD+weqz+fu6l)c<;vCG;xVThjx{u4DXYFX+Nm}vDH|`Jy<m1m
za?0=JZ&jzcUO(4q^U<7vmtL`@XC!^IaM6YI;UDswtE*3A$4}bGkys6TGHHL_+Wm*G
zcgM@8<ga1Z%<p)-dE$z_?=QOGw%qDvIhcB_3;t)f{Q2Uh6OBoZ&Yx{a+BeZVD(4o%
zU+w4X3wM>QPw!t;RFuK*y7JP_jE>X$Zrst_cT{Eb@T>j$T<JG_!;W3p*>T@@PFZYO
zw%u|DoAbff@^%J0n!NNk!7`|BwZFvTPhB&s$d>{cW<amzp-r2H9&Wf)zrMQq=jX>Y
z?buiis(U0S-}f!uv}H*0l116cN9qKu;n?KA28fPXNVqOq{>%u5b?aq5N!XTm`eRti
zX~j3gnBkcuN@~akOgU|pAq}B1ENe`q2Bb1*;C@)5gq_xwgY{Nik)77*b`Ryza$%{G
zKTn5K=N0&*d1aCyTgPPMS(PFR5P}B4D?`C>M67gLV{t_^Hm6A|9)lQVPHSubW_Swm
zTvdm--R2-9nxpVc!A3hM&Q6cU8H&y%DLY9y2#OXdUSw!I{;{HLx*QO_uJQ3)=%3SC
zY8aYGk`)ydwhGp!>Ln!dhCosb$uI;$5Rs~|0V;`bWN2Fi7mP@{q8W-B#?6SpuSN~0
z6)|lsA*3b3h9hyAkYHpb&`8=wnI*-5vXsDSQ9T$-E=wc~!VnA_5rm}^Sglkw)JUoN
zn9zyW4<$g-dOV37kK_^xB~nC;ymC}VT#!eiBfcsPl3o~5qq+q1$`Q?>W;L3at3zO@
zx=&SuZH+2yqm1X~nvLP{bPte}uvy2*2UbBBFrd@QPz*)TG(mGd+AcDz$T&usJ)~Np
z9#vKXRqdb-AI*uJL*(oaL6L7{V1WMw%aRyS^$<W+D<Mz<NiAGr#S>bJxoS|=QDVf7
zeQ@554ijAsC_(h1{h<<L>+y*0aKr#%3A$ZQD-y`2D6+`Nj6g$5BA^Ta!Et~i{5+5e
z8rTIpD>-CVlG@h0R4HoOz+B(DBV<)VG5%p^r!oO8`TYbXp^%cy34{R9hz+2?JnyG@
zK(|GktSe|!g5ZNuO;$3B$U}RkBOr5x%+UhDQ8YvFH0vh-<p4Y)#Zv)bT0iC{F<*(G
zK3Byz(^NP&J_;&$%s?WL%#Go+N~R;AY>iJVkI>_(GRN0fltL8r2_|XH9#I2E1<>Kx
z5~N*Qcb@D-@^KYJK>3sT(=r1bKwt@$5|DDTOcMeN1tODW?Mx;uOMIr#R)0JG$hoY@
zG9t&dIro|Q#|4r~LAV5>^Om$edqq#@&{nGduBhE!{GTf#&9k=EaAbQg#@;<}E~A#l
zrqE$;4imQw`jfb)U>J#|qg$vEoZE<Qu)A*8SYQ6<H{RaY!<A!MF4*5a)VOYUbfDS{
zd_nG~K3Q0oolCuQZ?8Bp;*B56TTTX}3n9F9zv=q*z3+K$W*yv9cDih4-%~e#)xJA_
znJ*eYEN4*Gb4v#7#pY_~qk)DFjfYp$?4|vqcSbE8fB7VPWv7lg-eYIDvr*4hn*}>m
z=Q*=pl<?a6-O4~QqiOQQw7j$z`Zu@K4*81dni1@CwS_O3()+v@q`nqyxl?!Xz>R6X
z8HWo$YDt^t{(-u)C}YmO%T?0BSC^go<L;X;FDGgSpX+T~Fm2kGn`^M8TMN3(JdizD
ya=6#>wMVE=)o&L@3NPN?bgydLi<27bKi*b@ty?y|XXZuoDtG4<xb}=IUi>$gfGIox

literal 369
zcmV-%0gnEOP)<h;3K|Lk000e1NJLTq001li000&U0ssI2GzaOO00009a7bBm001r{
z001r{0eGc9b^rhYBS}O-RCwCemc5QeP!xr?hIk33f=(fV2jIPEMXTWn6cTDrpwX!n
z5{(#il9`nmnM~%-ojV-4Uv;pp^%W;MhlpqxhUbfzritEY+x9AnuIo05x~{L1K=me(
zW!Y5{sNN)e-@i%%)tiLlI9ExadXo?YVH`*H1}Noup5BS$n7u@jB=iwY)7VR(ls-|G
zB})U;(N`2jVJV@iDt${31Z)gYL_fiCT+=jX8=wM3^b3+C&GUSo!Llr<pj`~ZSl9Io
z1H>YnZbaAh!_RjFB9{JyEX!3@9c6$h1kxQ~`-EZme*=W<?8IG6)6DbyzWSml@H-ua
zWm!=a^?iR!H^wk*+cuqnD2lG@dY+f2DK160oISmQ1s?GdpD=(idN^JHEqfIavgoe0
P00000NkvXXu0mjfYHpb=

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_bottom@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom@2x.png
index 99296c69fa9b0609179b8d42f8875ce50839e244..bad5a987a06d3d78a0b98aa90c3c47c29886a2a4 100644
GIT binary patch
literal 2693
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
Un{!IL<i9=HS&L0?XWFa&18%9osQ>@~

literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq003A3001lq0ssI2Zbay`00009a7bBm001r{
z001r{0eGc9b^rhZLrFwIRCwC$nmw<<P#DLbgu&)z5=|r`G1to%VQ1=Co3%cKPoN<d
zVi0B}9k56&Y(_~VF?fr`z5m?1+~Qttakb~%--NX1JpW(X<LOC>J~$i>Z@fZZSuU4+
zT3D~wCK2=boKF#kVVFcrCKEnI%w{u_h;FybrwC2cOd?cO<x>QLn?xvz!lwuXH;G86
z(|n3RaFd8=G|Hz41g8@giv@2M5Sh+tG#b2#K;#P|BuU~;1R`G$Aqc|pc;v?d!iGX2
zx`?jp{D?qU`VLu^`4N%N=f4%<_xpFd9S;@|6JhBGIO(-dJL_{qQDlC}M8J4FPFLx4
zI&6zTK)QuQBEj%QfoREOl5V6@sjw=dTCLLU1cSlVYQ>%fghDj>6-@RN2t~ie<#LTi
zBbF>64nmOyVzJm}vth#mf*=lACYQ^xAp$|@PD-Vc(=8wZ-4E`oR;%S)3+;B>;?i)A
z*Xtb&22QkqvQa!e5In1m$75$%K*3iYF|FbA`7}*)iUpL4g6T<kJf3E=X@3hS5~b2p
z!NOzn{}Gh;u+{M@*=*K^y%tJBVf4qKQ5z12w(6ko>K*UF?RFOmg_m!0q5zbEV(7Jm
z!{J)3_L99EOp2*d0NICBDuo{Ik9XWKDcKWI6wBrEQ*W02ey^%3CL;S22n1wV)^+`X
z_X~!?fEX5olj9HsL6W3;y>9uP1DuG{F$jhtHi$$bnM_7e6kOQ7UT->`8iujmZa)L#
r1HR(Ne!q_cip3%h#wqmAKd<2(0y9^$CoXzt00000NkvXXu0mjf52+w#

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_bottom@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom@3x.png
index bd1cd6a8a296d49a9a9bf0ff58c41640bfc5fbf8..ce162a65dd9c8d55cc454ea13b10f735694a5e39 100644
GIT binary patch
literal 3014
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
U!l#uHuK$hd=vdXqQOQgG4Wy!F^Z)<=

literal 1012
zcmV<Q0}K3#P)<h;3K|Lk000e1NJLTq004vl002S=0ssI28JFo<00009a7bBm001r{
z001r{0eGc9b^rhX8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?1A$3I
zK~#9!?VLMLDnS^Azon#+M6n_iYADo%#>!x$7FuWr(ZU!@ZKc;jjkiW^)x=II3?#M+
z`~Yt>`Uf<z5R6)=h3C8pImt;}beG*3R`z`=F3Zk0&zoi0nOQ{s@rN`B`O5S2Grj2N
z<>kdBjHjn3s?iU$n}l(He@`{~fp(KHN~IFj=;!+S+9Zs#voosE&*|x@Nf?<-hHCV4
zbaZ4A#@gB%)#wM>O~RO+ouwN6K)Xp8qobo#qaSED2_qVfQjLC~T}*j=e54(nK)BQ*
zpU+c}P9VHy82mxyiJwwc#>U1dNGA|pGmN&jw$IN`I?@AFx3;#*H=LiJQ<EN`TE1s_
zd6}B@u(Y)FLl}uff|~RI)jxz02n0B>p#eySYWb0^tu4w@4J3;d`uqDSOEr*eDGb9f
zZf|etOC8V)$zqZD`FSc+2lR?{!r}1y`#Y_v0Ait6Y;kaKKyfO7Sg}h_PY;JiR1AUi
z_V!90WV2c7bC+B$C-o7J$9ZtLdsy`K^-0}u{f>(qA0LYoVzJoA#|J$+2O1$$9J0B&
zNtMolMsZF{OUuK<18q710z;vYxWeS*B!xNw0>wp6PEP2wKA=wAB@&60%VnCi3#37v
zxK1jSqFlQ`nkZs_f1iG>16`tyU@&-fbw$fofGFq^rF3+3@Z@3TRMFYlDH<3Y9OP`r
zH$V;)i8iLDrYOA@)6>(UnT3S~djHDe;-WMJ4qGW1fT|C}Fm`r!m_Ze&u(9StQ63u`
z8%zSnM1zyy`J)QDFP>s%X2yrpQ0Ou`E*@lPXvkOBgXrw=@UVCmT%TWFUiu*kbQ7Hw
zj}r_A_xARhegshYxRZ+{lgXz1%0j0Uj*6=z5{Wd~{2;ocWTr?P6B83nu$}>3aCsiP
zQG`MvToe7$fnJo2;$2(Y;SsvJx-yx}FIq2(Qc*C<mS!a$k7u)4k4J*?a=9Ez6+h73
z-MzcJ`}X$cwHQzm3PX9~H`?3V)9Lih&5ajgKp7|oC5fLg3?q?9Y;SKj<o<Isil$M3
zSH@gDLLd+r7#LVtS-H5lP<m3q&d~%KLUWexjQ2U=aCm%te06oTSS(g573Tq9Cxt=*
zJH&2n-``07CmM~8jEv09&8@GmA08g&^Z8P#ba!`GE|*_lU#q(D08jBE-oggh3>)Jk
i_+ZWd0VISFVu!y_Fv)P)Kp4va0000<MNUMnLSTXbe$A->

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow.png
index efa0930639db7a235b4a5404120334dafdfc679f..b675e122cb5022a24fca487a5a68758910f6cc94 100644
GIT binary patch
literal 2774
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

literal 576
zcmV-G0>Ax<P)<h;3K|Lk000e1NJLTq001-q000^Y0ssI2cf9EO00009a7bBm001r{
z001r{0eGc9b^rhY@<~KNRCwC$mOqaHK^VqIWpy?Zt*sPV<x043K*yr-NffB)@c|^e
zHSzDF7KPGR5E=~)iMwB1BbSU_ZjHO-p33gdJijMnX5LqbD`hg7>2&(>B7r7=kSU!`
zPbQOJ8qPG$e!u^!aD%}hl}bs&C6h_pwoj*%`eZ;I$02|;Ts$7{bUKH_L47!&pa~!i
z7mY@%)#`S;RUZy0XaY#Xg+if9rLtPB)Q1BKngHU4I4{HDP<=R{w~p$UVzF4W+1%}R
zDwBZ&3fd)HFc`EfYq?yi3<nM<XyK|vBEiAg@Aqnw0Rjh9c#)=Q`FwsppQ{N62pmx1
zQT+Y2T5Y{vKRX!+K<>NkT7f`-Qr7GBo_Zl;4gwH3ahJGqa=F}iJU$+e&q#(X<{(_|
zHkou?FPF=++06HR7-EY#2=TBYkw~dj8jVIi9$u_4#1?b$LxscPY&Og0@a249f)$3?
z3SY#wVB6N~^~GZG@DehS>5WDMs|WYljq__5MxjvXcDr2Y6rA(<>?IS!7|awVG98n<
z&!+b!<SM7sPzov4v=W=mh9&vdpYq5{J~4n{tyZg8EHcsO1(VfZu1%T<njD(2cDqdz
zOOyS65kGk3C7&3;Fa~?7o4zk3?IG<e?KSQH+eQ4~k(Yc@u~h&1Yx)E#<CGJOK(Y1!
O0000<MNUMnLSTXr2m|H-

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@2x.png
index 2804459cdc810835cbfa919cfeed615da8f09fd0..073d169d5b9d5ae8503b64f37c6d97da8297b198 100644
GIT binary patch
literal 3510
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
SjgR&J6GE1U39FV#w)`7-Q!=6e

literal 2265
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

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_bottom_shadow@3x.png
index 5421949809ff69580454065f6ba8ba7d618d93a8..3da36093391d03742423618223783e47c50955cf 100644
GIT binary patch
literal 4285
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

literal 4705
zcmai22T+q+(+*9%(vcudA%G&0-UOtEL=t)^ib#iGh*aqU3Iq{C??C|}ia^kS^dbr>
zy-B-tq^dMgq&NQ;%Rl#iGv9ofIeBN^$vL}c_t|}(O_Y&=Hq!~76Ce<X35A3k1J6ug
z862kuzAeN)s{xO{JdoGCKp+XBqebPPr|t{9<n~6Gdz-jBdHdPj!hkd#-R&^~C|A21
z7-Ni`V}NHHMg;_7`+|aNn);8fJP0%z9OP{2mqG{Z!k9$o&OS&YaZpop7i!r;Jo=9z
z7-{LxnOyKLp(i@BpU1TkStDp=c<jUU1=Wb~pfw{#1jjriR3MU|`sKiKYh3n5K@oko
z(($#iyPnLiKTO^Xe)YOy(_+srdvUO6$mGY}^@aW$Qw^bywd1oDTt`WWXnO~TveHrl
zf#5b??YTNxe^*z_^>IZ-MP()D0O&)tr-QBSR8jFOoU^kM_Pqc+Aky&%*p%IjU0y*}
zwydPYh`nMg8fRxWy}Z1<y88Og!EW&0CYXa`U|;}ABKw4-w?ghjl9+fESkdpmz4!RY
zY=h(D<85sVS$>mIQBgbJTKIdiRWC%5zj$tau@X3`4rhD8!OHrz{X#LT6`9S<#^yt3
zXJ>D3Z%>aT6p90Wd!swEkV0`9e0{j9ODc||8ouQB1(dPf*4i2w7iV4V0r5n5L++Q7
za9Hf;g@ud<50n)Zw|93bR&~BxUncSmvdGV#xi~xTeD6^|OEn-3Vz3r?q!z5Ksv0~|
z>%+h)MpX8J!UX6^=g%(o8>&AqD!OTJZ}0BDIy+nD)b*geynKIue`%=r!>i!Ec=f{s
zTBGEGDY~_&lOnz=qhM}sCHF}cVU6Q+8XOqJU~jLqf<k3QMb;%hH-CSB9i8?U4lNYx
z`qA<6{k_%Ky3_>@tm0F2x2&zLaX1_tPWv?x1WC}MBjIk|<mKib86Nfz47|JEtBpdT
zYHDic=jW^3CX(Q0{U9;_P)1w`{`597gtax78com0WsAjPU0qkEr(f7N5yHd6weB-p
z)p{4^=1w0T>?MH~xkBh96EvATN@)21Vx?9}0ay5~P9E%T@Tvt>r>3Spd^lE$>6n?B
zxpTPliQ$yQz~CUtDt7mQ=~rs*0TBJApRUoMQ`l2~Y_5zAH8j|E5~YjlH!VCoN)%0@
z5)x14pDw4Ju=O!T{oBwP(GejyM&)~_ES{c)^ApSA;bF=U$4EKZ%*@Obn^b^<1~)P|
z_V$EKjEry}d3J`94kPs~_VLE@$hUWQ$5A45Vs6J!o{~tU!a~#{ZUDVY&G}M;Gf#3j
zG@kbOx39_c2n5)Q$!BP;ExG>X%PSPi3?k8g{c~?=sZ8M&W1Cc3YXLmZl<gxq=f2iN
zA^wq`^HAuR3^=_Yb$ntXUBaps(~(9)&s-AwV{^>iWueb57sqm3^Mv`ItKVnhjbLRd
zPT~NkGRVoxw|z`YOLH00)YP0Yf1Q&P@>23NCwVr6wPcD;rhtmscS?u~cAhl!7y+(G
zdi6?8X`->wZt`V7(beL~8m~{^W?PCaYhat{aRR1+%OK;1uv4u$#}tq568|h|6he-O
zh^VYoP|9*0?C(#u-X3#*ohK<FE?yt--Rb7dqLfgx)WFcc{<)1sz1{s$flK%L%ei&n
z^t#&Gi12Wi(Q?rX7j*Y&VT)JHCUcJ>c1*sZkvT}%-!XN78C?_6a7sPY!`pj(V<R>u
zMo(8)2oc$QxxE3}SwBRvqWOieXunxxPL4T&0G0Xb)uVdD!9fd_(`|r6wzjoF&;vt5
zy7DFDMQdB@m;PwJou5dlYpsWJnx%!d#PVMB`l#0jb8%UotPezS$ji(3^(K*-lgLFy
znmQ9e;Q>i09WT;B&&!r<gWv7%d>0ZFOiE7vzP5IL5SxZNZCnC9`4mJeB=sj3S5>wu
z4Nb2xxnQx1o-=S3miVm?cWp9ZDJdx>RUhgDub#MqdBYK6OZ!yO3-lB1bW4+Qk%03F
z5G`!Dm8IqW!9kN@nn9+b=f<KLS_0KLIxR&f!1ezDtq${X*M@_+&97cf58j(kx7l1<
zJHf;h8z0}(-TiR~aDDb#a`)CHsgPsJpfEO~0Nt-ZUC0g`6DJ@48>ls2F0PV5!$)eW
zQc_aN%DeaZ?<fYW3Exxf89mtB%CmKKCsONs%h=MMLsI>U0pY&0Hhg8Gu1ZlxPFgxc
z2Gf4sy}klB2qmlnB}4cgydXewpl8n6+ZeKOX8Y~x4EAf{{cW8n=xyF_eG#9q%`w~n
zAkk=ao$pF}PtOfqtc%NB&08Z;Yj6}=Ba{IP27_mYavEqwZGm$87X4%sH=u?_lmNw?
zF48(YOnlNKTLE;A=hv%@%YcRzm!0}4P9Mf@*0_7zQsdIyLlsctalM3}IP$4`Q;sLK
zho#2(FAu+Xau^Z<B3G1`%kezxNSEw)nW*zK)OkY?wmveOL-Q-TgsS`%rhaAu^a6fk
zef?b_WMyD&z60puOF)AU3kz#+*D16&E>Xj|xp5X7Xwqv)QJZ8kgjHD~ic3lDTh9Q>
z^7ZxI+}L1ZVKLOvQ4ZRc;=SYQ`aC6^pK{&<9&Bo1aYF7r6>Cfbt#e?Y$zY@oX|+E;
zUeWe}lwH`vhu4uvq@ErlSc&(Qq9O;%yl;blNhr~uicTUYl=&xMVASq`ekK^iyhIwn
zUVL&`*3_!3tkYwc#Jwyn#|_mFOwG-a?B}W?b<EjIyRJalB_lz9b|0m3l3BN36W!FM
zqHkegL9)N)>G|#Z_vpyT;TI0{JK>e7!sC5?f?1~z>u2Z~JTz#}dr&cXgE%(WkW@u6
z5~oj@{XJQd2Q>X_*ROXZNgZ&`TVA_%&B`ik*z&9rMkEYG^>fp;nIo`{geqK4CACA(
z$wU+u7CwLeJUxAgo<FE0;QPmzn3!Y{!!+Q<&``AO^qDioBt>dEjRtByR;m-08Z@Ut
zjl<Ks$W+pro--C3SvlC(*Voq8*3u#(CKjXiU}9!@qzphxY;5cRo$9r#x#w9mJXc2L
zOF;DS5b9I!HAHw!Y=NRAvsDb?A(N9vm9hNl*^>d&Z|-q?9;<Q(ibMhmB?(shEM18g
zkHE}Juxg+!Eg3ndLXI0vQS*FubazO(3crTNpon4mHa0dc6yOsY8k(4xSZ+hlaz@4P
z3t#tor+;cZS|CJFM1)?ffr>5X-IWu{AZUianHYH+WAWqg0CC^J!9n)s-(s6TBwuaM
z0A!lq3}7?};1m;+<o6ZYW|ymDW~*6fjX<<NPk^(~DAV1&`gZ`SJx*vC9Kn1V=j7Df
ztsc0!d{#FtXlFhhh@^HLUt`|l;$n94{rNJ9xLGw;4Jy_@S62=i$gxH@dD7N}RaRC4
zE(45QUtgb}|EX^ERWz@tsHmWIAo7e`vJWDLnu_Ch!aSlbK813?Fr>;}Gmf`JgZjhC
zz*PhSk?6~OS{a_9u`~4ky}*)Jwv_WdZBk&Per6MfuO(O@gj&FsZJyE&Hmfg?v2uRo
z<L!MphAVV|nVETVa#AJRMHoohfIb}^-MZ36_ens|1iYCn=$H(g<zb#V*F7Wi59enx
zHRst2%uPoauI4U%oqj7WCI+ZA6%~~*JYN0BzL(Ap(3b!Wv<uWDp!~YJx(xN8X?d2J
zZ{+#j{mUVO@08ENEL%k^#f7(88q=O~anj%6+f36DvsJoYcXD#NbLX%r`qWJvu0W_Z
z5SnIKQ;j#Nj=)z(mHkNvJeWX6n+8}l9qMFk_3291)YZ|`(gy8+Yw`5-Tv%8DqH4;z
zth}+YAqe(sNdVs>q(lq-$0;x3$%g0+0@UWBv$Hc3w~XUJ0Xq4d{sU=;W`IPrw6rd|
z3~Q_;WMu_^?99+jmzb#b#NXKO&bl;#O;26PA;x~I4*AbBjS61MESjP*wS>b|&avU)
z?WR*UnSe&lRPrjI8F6Mmd2(xI%nxXHNlEP4-)d`X0koHi`y8C|ojJ?%)LzQTK}BMJ
ztwZu(u1YRx4|ZABliFK~6y150Zp|@BzLfG=G$ltgG&C5h?aTqvT1Qv+G5pCh+Y4ke
zndBC3dh_PZq0VN(5B6s++e42zC^XMf$4xOCO#e!3siLg0UyN^d!P>XcVjFc;RaKn&
zt{X2e?^+T-QGkN;r_9dIZY_^^&9$=K4gnMpM7%B~a+H#gfG7p`iYjx)yfbBNc8M`W
zBF*c3#lK8(P^JakX2c|B{YBnk^9j(vjK{gT5S{#7t@}xd&z?QY%*=G^$*#xtl1fUX
z6mp+D5r$q)GPkpXh*M#nL|Q1SHP>IM^dmS%qqrghxS|TVVn(=L1LVcmc={KD(40|T
z69!rnC{iV=X;}ggT5@u7Pnhz>=4$TjtyC>^y?y%@Wdqa?(C}auI`IG#D2SskC$7V%
zd`DNK%;OLU(Qs}qJPKy;+xHf_KZkd9qiW(!On0s-mnH-Q!W9r5HvqBz@#E#^)!qxn
zJat_UFN%nWn0P0Q3{xa5t3Br1Qx_L;w~ysgkR8xfH_YjLWEo7C6XVR-z!=jg%=lL2
zA2zZSs781E`SAs7bz<}QVT``MzK9-CV}^vXDY2z`A}A;b0Azi_?*qos(Fo6{e&=OD
zK>;u#kVs+6A_Hf+`&Lh)NG;%<8Y`aYr5g151HGnjy$j`zkTeH$T60KdCf||Cled27
zIc!+dlict7UP5^BgWpIao<6x$OiT>BkeQVQnO|C}b8KUOutg*iUB@a{#%q$j{kFeO
z@9ziYO5|$EJh>Ep2LQf_$;l0dBvw0_jC*~q5!=?t)~4|{vE$vsN0vM0V7f<^pO)rv
zSiHWY+9V$Fmy$FXFU>panfu-EJ>@L!VZz|R07qXRr~y0kE-EfAt{7nG@ft6DSeV-W
z*S9@tdoHuhv9<`SQhp}2y3s<D{3(Mgj*qk=fRQL!1f5q|dFA}X@G!DdzKuz3E$@AN
zM>X+!b>dh?cp)*tIV1C|dE~r#N}jZUoSZk%IEdkP#QTXvLL>3{<HvZ0cxjEggo3pj
z1k$I_xJV0GS=mwFOPA^v`tt*C-)66dKp+>cQY_1y^Z`kE@k7vCN?LZd0i))R&%KWW
z0s<m6@c`9W8XLnhA?)(FfPfuvO{4a!IUCCcjAf_zc<YMZ8&kd3a=mVLv3Iw`+WWXd
zj!*@lR!~`*t4uU<z;A6x9FdA~$S8-4Gwqf2r~$Jd?1w>*wqtc|?d`z8y`7y<;_$(G
zzv0mH>)MR2z{I$>xdISJ9WY7(3lM)Se2NW++M}IaU1vYW9mU}6j~Qx-S$ntX%WgN=
zpW4HoVs53`{sI7~vw=(Rja27bWN*j`r8?#|iXiS`xY(wJxVU(5a4-!GjWJ)MrmN^c
zo|pgku8W^KGiW^5Aao3k;fw%X0z+{DQ16^GVrpt?($a~w5o)(u@QwUIbGnC3be7Hk
zO1xMj49I=+Z;LPd)HWT*RN<*VdQT3#+Yyx390NM0l#q}Rp%a);Ev{c58yz+FO=6jt
zm;eSU>`75;Y8o0m9xv*cCTU|(kZWRYJ`DYz!JR2L+_CwzX@m|ua8DSAPf@2ZF;<5&
z>}9-o@uH?iX(z!qEbWm3n>3I#r|wJ?<cQB%SXg{DlRmwkJI240bk~zA-BY^CL#Rsj
zFB54<zl@S@32VoT^SaURQ!t~H&gV;n-T0=INUOz8Dw<=T7Z+if26x{@vI$>y6woq`
zi{qA!aB;?9?!h<;%K4J#|J#uXksT7ow5rae!}=#-@`w{uw6_JLg5%barn&bI@zP%#
zb4c7`7q`#9IyL0+4{zG(F;%nu2k_JgVX`n;P8gjBiGnhrOr4P=9WC~aC{8mT!>1*E
d{%@M^f^=T)awpZMR{?(yflvqoI0a@K_J7ma=|cbj

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_top.png b/Telegram/Resources/icons/voice_lock/record_lock_top.png
index a4ee1db1b2904f7416c09930e3e4923960849cae..198615edf623f82cc3e3defae843d4e81c168d06 100644
GIT binary patch
literal 2386
zcmb_ddr%a09N!B>e4qqA0Ci?v#1P%v$36CL^ANZrx#)bH=cuU2-tO;UgS$O;7dRXr
zK;|oKlu<yZ8pj7SHJN4lN24iZsLi0HO=V4*Gb%V~Q&u{aS^f4nE+sX`>1Ou!x4+-#
z_kDc6pWpYlVa}|X2}9F{A_$V;EO5BtI}<*m;-7;5!AaL{Ac$_VXt&SF6(lb}-81vh
zOv-AtOo6y=zNCZ>s+BTGDk(X2dg_#+a*cca`bKxjjPCXm?OjORhEF;Ny{gk?qt(T$
zinC(key!eA|FmP-7lXEU=A>PEUZ0tzJGZ*-d}hWW%l7*Ev&gA4dSVK)(Qrn0AiwEA
z$BhKEdTzmH!{(K-r+Nz4y}Q5eyfg83a^m6mYeUdG!wOcit*1ZMnFoK=tb4D}JvHYx
zZRs8B83Wo%w`Qgk6%}P!+O9maH!F6*n3g>~W2T0BGJ403zA`qWc~2YidEPgJ;~ElQ
z-kJCr^5Vfyg`G6g8MEe=HF5mWMsI1NH-7VyB2OHk>D1(&^sd(Qj`mB(w$|5Q9huj)
zr=^~&9}yGtmuF4uj)^fZ)n&&VKWatVPt3lX%9@uz;)VnZ7AXiaELnSW$d1=i5G3xb
z=vk;PbiKgxl3&khbm~L?AVed`^ckTb$Cm>Y^@36{V8ebmd<;WH!G<j`xky*g4$8!W
z<uaJJe3pk_Ud~$uY(_RZJ;Xu-exPz_$X^jq*pLki+hyTcn<g+c3{lH%SYQ1Xy5^vE
zNd~A%Z^n7bNTQ5YPnk)hiJFGeB*hS<i6G55NwK7br71M>!=N`=@Ud>ka}i(g%Z8Py
zYLF#}nwlDYjX^KTr3BQ5l^|(?rg4bCmD+&Hh46rq-fzJH6kZmCswf3e%_8TOs#F^W
zBkfDUAB>s}C=r?<VMK@v5|p0QQVIhFK8g!g$rWMe0#ASn;0FO!fmkYv4VFo&q?Aby
zF&$mL&jF;?<%;@vU@U%r)P<tvSHm<Sggg+fcxr=ya05lEl6jC{4Z}>=vI(+w8E~p3
zdnBo%zfg1fLq_d(tuPie)5Y;(K+9vwJ-dK|Q-KYmNt(nd3a5-7%EZzJmNrk-YDo4$
zU6LUBY6n2g9?HlX8J05K2Zg#3IF<WPu)woEN%nIvYthe@0wNeF#n331tX-;*Wat=1
zXSjFX37d&5`NRsiFtDkFqjkAhXFyT801uoF8wLr|i=x0%j91{Tln*z14FYa7kR<M<
zj2u)kMbV6f<9(E+f4@WGt27yC`}<CWAo0+~KhZHfWAvG=Uff4BG;Sr0G|tfiz^%Yb
zF$R-afM)xx&6Y)YD7lJzt!hyT&>~<Aj0wOKL-_<46=P*^jyIWc18)JG#mE5CXw{@2
zRufwwDzMJAk;60(R7OS>A{rJD%kkR5uwlHW2q0jQY4HJkJeKFk{+coXjXpvoeclzx
zr`B*X$SsB3^;hT7N+ceZfx=ZkI(`e|h1?qeP63X?jYa{MLGbc8!;y@aw^&U)!}aGs
zAbzM^sBjwgr+(!=ar_a2_%bd~3Shq_uqV&x@f6w@>c2A@a2EgPj0mmQ_6d#{sKxNw
zJ$)ILG&}{Hy*7;AGVmjMPk{g=ONO^l?uXqM;SF}n>B#jIoV?n6c!VQo)Y|XeO|8|*
z#g2WuZu*LSX-Tgy_z~IYAFXb@JQDkAQ)g@8`^)TCx_;~Gv`)MJZD`3z(3s&&I$4>r
zc7N*h72OB@i<>igk6dTBNiAT}{P~wH=O)JIq%@4q+@1N>^&PPtiNlY)dC>oCx6*_h
z-{R={?#`;Yqb4OZq1);XiD~Xw_fna!+}d@k{9<pp{)7F4@2r&9I>*iI{o_PS`Y)UA
zzMZsZ``xb_cI{p~ymQus?0xHh%F&(muF$s_T@y~8y|86x-8FmT8+_Ziz^?h@W9w6I
yPA=*!R7~xYi&n?}eza!kmvy0(xbB~W2Hl_87Y?p_Wp9Uehdc9UIo`=DY4{s<@Fg$+

literal 359
zcmV-t0hs=YP)<h;3K|Lk000e1NJLTq001li000&U0ssI2GzaOO00009a7bBm001r{
z001r{0eGc9b^rhY8A(JzRCwCemaVFVKomxgMe!w!2BSelv*2?HR?QaQz#!Ot0*lRT
z5G?*TVV^GyT<+!E^Q$wQ)pYjkwc=bZUx%uyp63NYkY!n2*In1m^E{4Y+qU?`PaI(Y
zW2fj{*G-b7?|XUzjA0m84%0i1QxpZg1uo+Hrv-5w)5l=Rn|fW>tE!@dz$z?!t-!LZ
zVHoI8un=pXEwF8S-*-9zti|%j1)8R<>q@7wZ5tH#3M5HtnubmW3W)xVh@yzN0MYFN
z!!U>=(A|hA%aUgVbbkv>(<JUd`YR$$Q~nW<{uC&RGEEcz2uNjFW)Z&clOUjG5n&jL
zih!C$<asVC0%{h4N0F!qs96MFX`&*aW)aJ>h>Cz30avy76x-*8si*(|002ovPDHLk
FV1ig0m5l%Z

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_top@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_top@2x.png
index b578b31059c3132800c1fc8c2b856a61b9f07b8c..06ce004e2eb557d9b593ccfb9abb3229eb72a8c5 100644
GIT binary patch
literal 2685
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
Jv_HjK{%@hnyEOm+

literal 661
zcmV;G0&4w<P)<h;3K|Lk000e1NJLTq003A3001lq0ssI2Zbay`00009a7bBm001r{
z001r{0eGc9b^rhZM@d9MRCwC$nor9yQ5=S!Vqu4!C@Ft-N_>*pV`XP{wtNUa08PqD
zO2(d=1vad(QFfxF49bGvd)HHMjr8)&YyO?{Tw62e-1jv)&dm7w`sEjEh(scSAe75x
zNs@-c;e0;dZnwwdk%+F>>wdpqtyZ(y3?JbD9EO8&3M1u%!C)?ztJmx6^_p~n6B~^N
z2EkCy>+kpbMNw1~<#xN#hq&MG7!bo^a0e(zCX={;m&=6=1A}7<Ok`69nM|hF>*2bQ
zDPSU5mNBV~6okX!R;y*2f(IR#8UZX;;C8!9rPBF)CQCs8#6TEpEW~25@pw$O0b%0t
zxY-u6*{rInWHS&6!Aw%%a=EJ2D%qG?t%i`sTJU&0olb{r4?-fUQ5JkY-(WBxhk&RE
zY{+JDI-QcEK;RE=L%m+_Xfz@Rg4hWEvDLBL?UG}`e)ltLr_FyO-T@W<*8=W;i3#%g
zynYLbMB;Qhu^|FQP)Fy|Fquq<Ay7xpVo@v>i8(}3{F#M7AaFPw*b{+LsP+R9&1RDr
z1=ZfQkWQy9dCFqivz&LIYss=qOw;f8Ut36}QVf3`{(dP?^MwdWl86IP^TjQup-<xN
z18V;3#+1pugPuKwqA2``K-uROLZJ}z%jCn7`TTuqp->>sK;<VQ+U+)PB2f8>h|Olh
zn+Q~Xv=EI(iAzviBSH`aK1HCoMnt7j;Zp>P^SHBqz1McoE3D6g;u;Z)#ez=}%jHrd
vVz=AzDFVecBEJ9c$RVn#YD5snd>i-!9z0f8tbs7&00000NkvXXu0mjfRwXgS

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_top@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_top@3x.png
index c8d63fe3c127d7f74b84fa49489a09a67afb148e..00998824e402f025196a0a209a96062b0772c13a 100644
GIT binary patch
literal 2995
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
T>SDI}Phx0bgraO#+?rnjA<S2g

literal 1010
zcmV<O0}cF%P)<h;3K|Lk000e1NJLTq004vl002S=0ssI28JFo<00009a7bBm001r{
z001r{0eGc9b^rhX8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?1Aj?G
zK~#9!?VP($DnS@Wg-!}J0v!|>36TP7#7YZ8ft86SG`3hmjV3fGYyq*-#9k@DL|UcS
zf<WUxAS4tT1BnC@9e=quxw((!BJ9rW>pPVX*qu2?V3}Q<n<EH<AQa>EdbhW?4-XIX
z`TW(@RlQzswOZ|V`}Os;-|w>@;0t_<AL3WI0d9sH<1V-(?oJM8XL)&fXJ_Z+<OEuw
zm?;Ju!KSc5Y!(|Q!xOOE?U6_%o6SBxK7M|FGH!f)d^|inU`N;;c1q^|08)y@;`8$}
z6ApHYU9YdNTfKqX?M|gqPft%w2VfW&42ER641qx4{QP_{7%-iIAz@%^YipLs5DJBE
zZf@|b&2$W2u`oys)wCH_S69pBvd%O7l>`IEuuYX=X=zE4q~UPL3<!pe!D9+$D6zl4
z-|cpp!NC+T5d&xNcs#XQjhP5c2a_^hiQV1ZmzNi2I`B>&Q!`A4`T6<F%S&czFhPgI
zq4yF#pRdtqFbjZbVzT-zv9+~j%BQArV6vF99!ne?92oTARSBcf2ou*=iA*NLEDWZv
ziwriKEuYUb%Tp*6phDvkXJ=<r;wMm{We@y0P=nu*BuSeRM@L6w|6h)ek42YABobWD
zj2arq5m#b!bJK!Hu~RMdLXn6PD=RCOdS^HD5*9@9E#YuDEVA06%6bXk^()h_0II&8
z$Z=Ji{7ws(^>&ZPqso<i7JTtg|9q6m&e@6N_V!lI5_@}l<Wva|s7{H6g#{B_QJ^gl
zxVX5eLJUcg$fhoqt^9ufXfz^~%7I46R21X-`kFkdMY&v7bX_d12C4{ThQr|*V^k^?
zGN>-qYIT+p!C;Uc7Cast5Ic2@i;D|##{-C+`ZGoE@9!jz2N3IWxu%GbPN&HlKcIJt
z7&`f!omqk2@0N%}BIJuV-~D`Tu~;NoyeXARlS|m`_D-imvUt;Ow<rHUfQ^j}G9`v+
zG&&(hE|()sVu0!iG3eqCVL<i&N;sWPS^^QdGy>scW5nZeawHN69~<NJ^ppgN1j5J0
zsMqTxNF)$GHU?cpD;NluFX8oi$&PsBFL8^-Vx&eq&@K}rnM{%z@jyErO6mK6imuAh
z1ZbCuaeseLYQ%GQcPA60)oPI%@id!FnHY2$LldA~CdS*_8>tZww9CZk^?Ia6JpF!O
gCI)%YieCx70KdJ*Y!AUGEC2ui07*qoM6N<$f)m-hCIA2c

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_top_shadow.png b/Telegram/Resources/icons/voice_lock/record_lock_top_shadow.png
index 30d0aa4ec92cf5805f4a3e12dcab5c0686d967f2..69bf37e51ebe9971eae3925dd27da499ff1fab55 100644
GIT binary patch
literal 2629
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
Cs+aiy

literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq001-q000^Y0ssI2cf9EO00009a7bBm001r{
z001r{0eGc9b^rhY-$_J4RCwC$m%Xk5Q51!#&=C_Yl|o5L!XwZjCJ`?}LFWN@0fpMX
zL`^f@cmy&U#f*l;xnFf7a{Zq<x3RjJv-esnbM`rVkH_=H7hlMM-|vq^BJp@Ul}cqY
znOrWH&1Tc-bTXObB})XT_T=;VqR}Wms?}<}Uhi}|{eFKq9M0$S*=#l#40z-vO9T)`
zFe$Fv3Iqa)M50_Sx7+RUcx;-cWm$*A;dDBQ3-HKGmIxq>U{XjV-7ROaSgcekb-P`|
zF!uZX`Fs{nfG~ndA(3=Qyk4*54@M=mTCLS;W!tuR3nY>b2~^TPVK5lX=kvW@Z?oBm
zkFniup@I<FPn~I+R;g4blZoRvLK2{Y5ZZ7!{JyhLD5UH9VzD?Lk3uRSgcfon-mJ4i
zp)j3Jr91oe2RRZi*B=LpvZXjA?&hESiv&WionNlaX0s{f1l$J_2qE`EQz{mV%jHri
z0Yb<<+vvE;xiDSb(5uZw4$-IjCas1GT_^-{h(7MWY(K4#hNIFPa)>^zJjNbcwNQ@H
zXoU2GyRBBMt=DVy<`6~t-kryI*l09%yPbM-h$4-Fo8}l_IXH}B>dhgFGzM;(W7=kj
vy_y`=08ykdaMK+B0ZiNCpMW$5F8%xfX+W6Sp^+#300000NkvXXu0mjfZC(2-

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@2x.png b/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@2x.png
index bc3943e4e0ece9ac5c056b06a8539e59a809f2de..f35d3240c73224c4af30c2b26125243ca3f99e2a 100644
GIT binary patch
literal 3380
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

literal 2244
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

diff --git a/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@3x.png b/Telegram/Resources/icons/voice_lock/record_lock_top_shadow@3x.png
index 5aca3269ce1e0848e2c861ff870787e77a7c444d..96660d2d26ff54f68321769ff8083fe597d71fe6 100644
GIT binary patch
literal 4139
zcmb_f30PBC77hjw*+h{bE+qz$fMj1t0s#rZ0un?-6a?fYc_ArFAc<_PNFXc%Dp-vH
z#0{#5Rm)-#Q9%%k6<M?@0xHPrDB^|-3Y`~3rsH%v^UXK!`(ECA_nv#sfBy5|bHD8H
z_WIgDcabg(1~YJXWBWkQ9O!n_nFakS-JhI-!8BHgTwJ`J`C=}J^!b{FL=)(Anl%iD
zZsmo95Tj(#5^#P<NYjm#*1D2dpNx!bpAe_kx~p}~Fzp@J8nt$5XgDHcf)j&n;M(tE
zcFO0mx7^XnYh1Oc#{-MD(YU!isRM0!mX;@%x5JuRusCa2CaFcE+;va+<);S7n00PB
zq?~P<O@nLFe>#)Y;coQC*r-Nlcn<P|p4&Et>c$lf>g;-@M%fylm8;$mX+x&I2=G|w
zUi89%fB+lXv3{!`Y&16__7@K#R>lol4w;(tn_4Q1kHK!Ux@T)A8>JpLx&`~DvW<V3
z2y28Z#^^>%E@g8=jkr2FfdRhSAdzThJZRCZvbbE=Q@d9#ADGK(F5WK(<c4tg@4gCE
z{xWz<k|Vs~5*=1|b?t;1gBl1CHz&%?UkZci8LMv%SpI>9Fqn3`$aj-$6UURm6GvbH
zHJ#YFh$zS!26J$VivoCIpbW_cLq(BH)M!mD3Mt|<Q5z{7JSWNp6pGvuB;fi4FJE3l
z7>~|JIXNO7;uw&F2v7zf<08T%rHnWxYRWGIdRGtQP{=70Sr`-bseYR{-bfd*1VmD>
zR1A+m#v|?MSOOJKrVwnAL_EO`ho|81R1BWLz|$B+0&@C7LD3|90mFyAdO8;L#Y72Z
zvM2@)7aJRkjU{2ll29C^4LS}_#1V-Y$O0pckCXv%m`JI`XAf*p%9DtqWFm1SQtc7o
zinq#`C<y7N6e6N#+(t^LX@UsD#Q{+`0v4}MY08k#o3V@9DhZzo&gbF4a4-Ullu035
z!i;T{P%INmh2nqXdS?2c0zlMqI5RQ+6iY<JObDsWH3mv!nvg%Wmiop=fjA#fD&8vL
zfvzzSObc~3Q4ALe2*|_|U$Hp+bD_LHLq@u|s0%|wqB#Ih6sgX``VXr>HXs9;C?cMS
z#}Eh@0@;^9VGv0SGJU1GhWJmW95G)ci2uTr>PsLqC<Lg=|6~g3h7ZVq|7gtTF$7{s
z1OR0%iU2}ETvTKz3OU0i!$lk}mOz0abfiCyyF<-HA{L0kp@}b>$`o1-hv6P6l>w1F
z(4EahK?Gq%B0htRx1-o`Ndyd)jHh78L=qnZ2)F=7KqFHHG_D==06wp0i+NksGElGo
zv?KUp9^~U6=(qrd$F;K~VJI{n8AGL$K@1n*0T>#WLL$;A1Ui8$`0Q=1L<DV0ApDPB
z)u{N8M-rV1fB+4|P<V7Z2o;`$0eDnChAP0@@jyEokxt{Qr9Y)6hMPzV)j588Gpz@s
zr{BUw$SDCa0G@hdFi||UB0xTBdRX))eEe6Dr`N{{LCEP}h~!grsaPP31tg$zD8$|8
z>io45asMs@DG>A5_(75#nLq}~7(ACu!jSQNK88ktn4^GXIvs?{LdWwy=l=zMNV%jb
z<x)N?_kYGeO%P8AM23P;zr~^c_l*8Kg?@tiuNi%@7yr*0;ncnMli+Y)YH@1r4}BRb
z>C_O^?A5O`rwsHlb54Pg5LpuF6cR}Wt6;F%E$(b*-?+|^0~|NspoPDP`%3c6_o=p|
zQqS9XTwh?lqdcPy?Lx>ptfNr6>do2M-hyz(ezYm^!zd80Y}cDt9qUr%k4kNmk1l6b
z6n|Iv!0AC%LwxHmh0;;xtAPW*KavPmk2X8hzIPg;o4*ZE=0aEd_JDahnw|^xxTPsI
z1PeG?sjX=ZfN?&}-u>nVv-G^Z!UZ4ps)m0U$utRQc{S8(4!4a_d<>~rM+kM(O}xB3
zneEhYp>)>nL3!<Q^OqmzBZBe%NIKa8=F&B3nw)tdzvp@KjvbjtQ1&n9TFm0r<yiF5
z$8n;{6Na9--@CXB(t%+!xB9f~CG`03u4x(TnzZhaUvcWo=4hGBdzJmup{$zT<QJ}u
zn}0pUKjEXAlX?L4>yi3w=FcIhbD76YbTr>lCyL>up$BU+mM<|R864y2|3bsP=}3+y
zBT_OoEbRBJ7Kub42)epz?HU*uh>wql&enU|Q*TYaJ6T;_eed4Ax1$eh<6jMqbXCz3
zKfcQyy0YX2w%J_giF;y>(S5wGmD!lrr0%+QCAXx_U>rzD82>q<Ytf=bF(aKDf`Tr7
zbK9oX{P9rhp)*@*6DL2uZ)$4l=;)}gpViA|e?_!?Y`EJTBP<~8^_*P2R2B8HKPmHW
z=h?8`OX!lGI(cVjKo=uHOK;b%U5-%f$%zjSFKyFXv;4}{8jfiN4fg%Os)Nc?m6hc4
zg}J$9+kc-_DwW$lyg9NoCH&Qgx1+tiy*06;j@!l;j5Id7va%vyH6I1eZh}h>H-6Z0
zxP0-GJExuu57VL_X<jhdf78sdMmp58bFtmA<Htn-WNP~I6RG~5a=PggeJhE=!^5NH
zAXCrR-`_v_(0bLOL$iOD%jIhiIbyIo@H~C1ihOfH8GJ>N>*B05ewCh{9xm`)+nqaz
zf~P|^YYhzyf-WYEUEhzR+GroFxa~mtUSo~%t{{inojHgIYxKMAN8Z?P8-Lx?6A~1(
zG?-I)FZ#RU(o!4MS7`+*RgQs1p_OK3bIOz1SMSR8ZPF0lw}1OBur_hx-HX1wyga{I
zdgf=!%I3MY_4hAlP{-|W!aaJ89xSdXfg9gEDn%aA@}iv%tS&!!@?=d-&AD?O9`j91
zOwLwS4Gj)nN*K$uZ7VT)S!a8`PQkM+K=fe>{Nm%^-zcz~yOdEJR_3I9MX`^0+Hvt)
zJMH@qYqxI<#6GXH&8*{Fa2*Yf;U4!~PN|B#-+3;&XkR6Z($(3?pisu1-M9DmdwngN
zwuyu{!vHH3410UrmP^^+2`#Iin;4oqX6L^dxW4~yStX}ck7pxt5hIw_T^mmaIy(z7
z7DvkO{{%Etgtq>cTSB^}@0p4Kl!b-&A3ogebv+=a^FsV9C1&$MhxlY5FId2kzu53&
zknx^*1kOq)r{CX<bQu^J+#zm2FX*h6TB#<+$Fg=)n0sR=j>a*(OG$*vVXy0sDC5EY
z{=-*RfgmPqpHhipI>tR;HAoV>h?sSJIRBC@yS2Nkt0wzmBfhIrbgLnK?tMR4yVjsX
z;bl*LNZ<wA5191sbBPn<y}dxy<!lE2Lld7RkY(#m{&r%$U*;T&&fj`Xaly}l;!p+i
z?$T#TFM{@m56&s-TeBbQZ+)V(v-8?Dcm0!?cIqque_LL?Ik<PDr=qB@yuAF|x6e)m
zU+nbQaHF|7WYa`%Lwc&^M8)!QY~N2$uVozXdo+%}H))n;HoyLC*j=AIgyPJ@TeniY
zI|$3JC%*P#Ucccey=$F&g7S{l(4uH-%rY&=&;N1n#^~s1KfgOoO&Q@?`#i=jJB>cm
z^-RAOSI`X+)_Q=>6W(K?jf@`QACVGGd@C9hZ{~YleLFS=>BP);c_4aGdRm&oG<Z|D
zWmsn^`_jYtrwa}^#J}t)<E0s&s;{qyHutXGyX|k?^tXHo$93H$+vr?Pcs;x>IQXFa
ziZCVyk#eB*kQ46Xz94dESKLzr2V!PIDcf-+3u+8@l?v9TmO}eqWV~W4>1NCG@D<%9
zVWU>zA`u~+|4l@MYldo~T%QV+W}{}ip-WLw5!}B$DR<6g=ZxWu7jU9$Rkd_st;o~{
zjTVN5k$exN8ZGnIT*xCb4ZjaEx%O^R(N1=Ue_;<R!w9`XW@u_PzI9=(id!2k5FE1}
zFiBmtEU>alb*1Fga87%DSy@^1jeLrBTBcFS#c$sd-?w2Zk`k(&x0HE2D2MuCj`!X6
zqOTtxvcKpWQ1<%yGd$YKX?yEIrgqACBdq4mIYnQkzo?88a5$V}`LUZHS_oMIna#82
zt)tWQm#TmsKb`!P1{7D?i)Re6%*@Ov6pD7z=4C>ir8|G!;HOXXU7{TJThw1zT3Y(C
zJ8l`6dU%=46My?mi4MCtUD?0dU~Ft`#rOk78=)$*w`hc5`Eo!zelfgxE`D+~G1I?&
z%|4+yv>m@;jdFAf+ko+t?D`*zi?1}BCm>kqFkR8(ALl>b!bUG3M!&Vt^p4A76s})i
zsgDn;^NqZBBH+$-EG2!<xb6VkXcjtfa~Wy`yERDGVY6~2$yse5Q{lB`!_lW-ZGldP
z6~l=NnC{TvR^^y%4@J6Ua>!m`nSADG3SDcYTi7im{s2vr0Jh}Wod%V8M()~lYnG&N
l{`>Wd(?v2>!ffpcJ=we;SZ|9{&#3>Ly1RO@PqRXj{|+!IjSm0-

literal 4604
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
Y;O2AA$#g7k;GY|is<I}mR1p#SFU~xlR{#J2

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 74124766a..01dbed3c4 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -851,12 +851,15 @@ void RecordLock::drawProgress(Painter &p) {
 
 void RecordLock::startLockingAnimation(float64 to) {
 	auto callback = [=](auto value) { setProgress(value); };
-	const auto duration = st::historyRecordVoiceShowDuration;
+	const auto &duration = st::historyRecordVoiceShowDuration;
 	_lockEnderAnimation.start(std::move(callback), 0., to, duration);
 }
 
 void RecordLock::requestPaintProgress(float64 progress) {
-	if (isHidden() || isLocked() || _lockEnderAnimation.animating()) {
+	if (isHidden()
+		|| isLocked()
+		|| _lockEnderAnimation.animating()
+		|| (_progress.current() == progress)) {
 		return;
 	}
 	if (!_progress.current() && (progress > .3)) {
@@ -1028,7 +1031,7 @@ void VoiceRecordBar::init() {
 	) | rpl::start_with_next([=](bool show) {
 		const auto to = show ? 1. : 0.;
 		const auto from = show ? 0. : 1.;
-		const auto duration = st::historyRecordLockShowDuration;
+		const auto &duration = st::historyRecordLockShowDuration;
 		_lock->show();
 		auto callback = [=](auto value) {
 			updateLockGeometry();
@@ -1138,7 +1141,7 @@ void VoiceRecordBar::init() {
 
 void VoiceRecordBar::activeAnimate(bool active) {
 	const auto to = active ? 1. : 0.;
-	const auto duration = st::historyRecordVoiceDuration;
+	const auto &duration = st::historyRecordVoiceDuration;
 	if (_activeAnimation.animating()) {
 		_activeAnimation.change(to, duration);
 	} else {
@@ -1154,7 +1157,7 @@ void VoiceRecordBar::activeAnimate(bool active) {
 void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
 	const auto to = show ? 1. : 0.;
 	const auto from = show ? 0. : 1.;
-	const auto duration = st::historyRecordVoiceShowDuration;
+	const auto &duration = st::historyRecordVoiceShowDuration;
 	auto animationCallback = [=, callback = std::move(callback)](auto value) {
 		if (!_listen) {
 			_level->requestPaintProgress(value);
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 8f893aa1c..efdd96ce6 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -325,6 +325,7 @@ historyScheduledToggle: IconButton(historyAttach) {
 	};
 	iconPosition: point(-1px, -1px);
 }
+
 historyRecordVoiceFg: historyComposeIconFg;
 historyRecordVoiceFgOver: historyComposeIconFgOver;
 historyRecordVoiceFgInactive: attentionButtonFg;
@@ -350,7 +351,6 @@ historyRecordMinorAmplitudeRadius: 7px;
 historyRecordRandomAddition: 8px;
 historyRecordRadiusDiff: 50px;
 historyRecordRadiusDiffMin: 10px;
-historyRecordLevelMinRadius: 38px;
 historyRecordLevelMaxRadius: 70px;
 
 historyRecordTextStyle: TextStyle(defaultTextStyle) {
@@ -381,7 +381,7 @@ historyRecordLockBodyShadow: icon {{ "voice_lock/record_lock_body_shadow", histo
 historyRecordLockBody: icon {{ "voice_lock/record_lock_body", historyToDownBg }};
 historyRecordLockMargin: margins(4px, 4px, 4px, 4px);
 historyRecordLockArrow: icon {{ "voice_lock/voice_arrow", historyToDownFg }};
-historyRecordLockRippleMargin: margins(5px, 5px, 5px, 5px);
+historyRecordLockRippleMargin: margins(6px, 6px, 6px, 6px);
 
 historyRecordDelete: IconButton(historyAttach) {
 	icon: icon {{ "info_media_delete", historyComposeIconFg }};
@@ -392,7 +392,7 @@ historyRecordWaveformBgMargins: margins(5px, 7px, 5px, 7px);
 
 historyRecordWaveformBar: 3px;
 
-historyRecordLockPosition: point(7px, 35px);
+historyRecordLockPosition: point(1px, 35px);
 
 historySilentToggle: IconButton(historyBotKeyboardShow) {
 	icon: icon {{ "send_control_silent_off", historyComposeIconFg }};

From ab38ddc21d83b682df00279d0e0c4b8b074b9d1b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 16 Nov 2020 19:01:37 +0300
Subject: [PATCH 116/370] Added ability to fill send context menu in
 ComposeControls.

---
 .../history_view_compose_controls.cpp         | 70 +++++++++++++++----
 .../controls/history_view_compose_controls.h  | 19 ++++-
 .../view/history_view_replies_section.cpp     | 21 +++---
 .../view/history_view_replies_section.h       |  6 +-
 .../view/history_view_scheduled_section.cpp   |  3 +-
 5 files changed, 92 insertions(+), 27 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 61a308db1..eadde1509 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "chat_helpers/emoji_suggestions_widget.h"
 #include "chat_helpers/message_field.h"
+#include "chat_helpers/send_context_menu.h"
 #include "chat_helpers/tabbed_panel.h"
 #include "chat_helpers/tabbed_section.h"
 #include "chat_helpers/tabbed_selector.h"
@@ -34,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/view/controls/history_view_voice_record_bar.h"
+#include "history/view/history_view_schedule_box.h" // HistoryView::PrepareScheduleBox
 #include "history/view/history_view_webpage_preview.h"
 #include "inline_bots/inline_results_widget.h"
 #include "inline_bots/inline_bot_result.h"
@@ -575,7 +577,8 @@ MessageToEdit FieldHeader::queryToEdit() {
 ComposeControls::ComposeControls(
 	not_null<Ui::RpWidget*> parent,
 	not_null<Window::SessionController*> window,
-	Mode mode)
+	Mode mode,
+	SendMenu::Type sendMenuType)
 : _parent(parent)
 , _window(window)
 , _mode(mode)
@@ -609,6 +612,7 @@ ComposeControls::ComposeControls(
 		window,
 		_send,
 		st::historySendSize.height()))
+, _sendMenuType(sendMenuType)
 , _saveDraftTimer([=] { saveDraft(); }) {
 	init();
 }
@@ -717,19 +721,21 @@ rpl::producer<not_null<QKeyEvent*>> ComposeControls::keyEvents() const {
 	});
 }
 
-rpl::producer<> ComposeControls::sendRequests() const {
+rpl::producer<Api::SendOptions> ComposeControls::sendRequests() const {
 	auto filter = rpl::filter([=] {
 		const auto type = (_mode == Mode::Normal)
 			? Ui::SendButton::Type::Send
 			: Ui::SendButton::Type::Schedule;
 		return (_send->type() == type);
 	});
+	auto map = rpl::map_to(Api::SendOptions());
 	auto submits = base::qt_signal_producer(
 		_field.get(),
 		&Ui::InputField::submitted);
 	return rpl::merge(
-		_send->clicks() | filter | rpl::to_empty,
-		std::move(submits) | filter | rpl::to_empty);
+		_send->clicks() | filter | map,
+		std::move(submits) | filter | map,
+		_sendCustomRequests.events());
 }
 
 rpl::producer<VoiceToSend> ComposeControls::sendVoiceRequests() const {
@@ -1395,6 +1401,12 @@ void ComposeControls::initSendButton() {
 	}) | rpl::start_with_next([=] {
 		cancelInlineBot();
 	}, _send->lifetime());
+
+	SendMenu::SetupMenuAndShortcuts(
+		_send.get(),
+		[=] { return sendButtonMenuType(); },
+		[=] { sendSilent(); },
+		[=] { sendScheduled(); });
 }
 
 void ComposeControls::inlineBotResolveDone(
@@ -1550,18 +1562,32 @@ void ComposeControls::updateWrappingVisibility() {
 	}
 }
 
+auto ComposeControls::computeSendButtonType() const {
+	using Type = Ui::SendButton::Type;
+
+	if (_header->isEditingMessage()) {
+		return Type::Save;
+	} else if (_isInlineBot) {
+		return Type::Cancel;
+	} else if (showRecordButton()) {
+		return Type::Record;
+	}
+	return (_mode == Mode::Normal) ? Type::Send : Type::Schedule;
+}
+
+SendMenu::Type ComposeControls::sendMenuType() const {
+	return !_history ? SendMenu::Type::Disabled : _sendMenuType;
+}
+
+SendMenu::Type ComposeControls::sendButtonMenuType() const {
+	return (computeSendButtonType() == Ui::SendButton::Type::Send)
+		? sendMenuType()
+		: SendMenu::Type::Disabled;
+}
+
 void ComposeControls::updateSendButtonType() {
 	using Type = Ui::SendButton::Type;
-	const auto type = [&] {
-		if (_header->isEditingMessage()) {
-			return Type::Save;
-		} else if (_isInlineBot) {
-			return Type::Cancel;
-		} else if (showRecordButton()) {
-			return Type::Record;
-		}
-		return (_mode == Mode::Normal) ? Type::Send : Type::Schedule;
-	}();
+	const auto type = computeSendButtonType();
 	_send->setType(type);
 
 	const auto delay = [&] {
@@ -2076,6 +2102,22 @@ bool ComposeControls::isRecording() const {
 	return _voiceRecordBar->isRecording();
 }
 
+void ComposeControls::sendSilent() {
+	_sendCustomRequests.fire({ .silent = true });
+}
+
+void ComposeControls::sendScheduled() {
+	auto callback = [=](Api::SendOptions options) {
+		_sendCustomRequests.fire(std::move(options));
+	};
+	Ui::show(
+		HistoryView::PrepareScheduleBox(
+			_wrap.get(),
+			sendMenuType(),
+			std::move(callback)),
+		Ui::LayerOption::KeepOther);
+}
+
 void ComposeControls::updateInlineBotQuery() {
 	if (!_history) {
 		return;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 109a318a0..fbdce2296 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -21,6 +21,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 class History;
 class FieldAutocomplete;
 
+namespace SendMenu {
+enum class Type;
+} // namespace SendMenu
+
 namespace ChatHelpers {
 class TabbedPanel;
 class TabbedSelector;
@@ -87,7 +91,8 @@ public:
 	ComposeControls(
 		not_null<Ui::RpWidget*> parent,
 		not_null<Window::SessionController*> window,
-		Mode mode);
+		Mode mode,
+		SendMenu::Type sendMenuType);
 	~ComposeControls();
 
 	[[nodiscard]] Main::Session &session() const;
@@ -104,7 +109,7 @@ public:
 
 	bool focus();
 	[[nodiscard]] rpl::producer<> cancelRequests() const;
-	[[nodiscard]] rpl::producer<> sendRequests() const;
+	[[nodiscard]] rpl::producer<Api::SendOptions> sendRequests() const;
 	[[nodiscard]] rpl::producer<VoiceToSend> sendVoiceRequests() const;
 	[[nodiscard]] rpl::producer<QString> sendCommandRequests() const;
 	[[nodiscard]] rpl::producer<MessageToEdit> editRequests() const;
@@ -184,6 +189,13 @@ private:
 	void updateOuterGeometry(QRect rect);
 	void paintBackground(QRect clip);
 
+	[[nodiscard]] auto computeSendButtonType() const;
+	[[nodiscard]] SendMenu::Type sendMenuType() const;
+	[[nodiscard]] SendMenu::Type sendButtonMenuType() const;
+
+	void sendSilent();
+	void sendScheduled();
+
 	void orderControls();
 	void checkAutocomplete();
 	void updateStickersByEmoji();
@@ -258,6 +270,9 @@ private:
 	const std::unique_ptr<FieldHeader> _header;
 	const std::unique_ptr<Controls::VoiceRecordBar> _voiceRecordBar;
 
+	const SendMenu::Type _sendMenuType;
+
+	rpl::event_stream<Api::SendOptions> _sendCustomRequests;
 	rpl::event_stream<> _cancelRequests;
 	rpl::event_stream<FileChosen> _fileChosen;
 	rpl::event_stream<PhotoChosen> _photoChosen;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index e5a976a57..4be479126 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -158,7 +158,8 @@ RepliesWidget::RepliesWidget(
 , _composeControls(std::make_unique<ComposeControls>(
 	this,
 	controller,
-	ComposeControls::Mode::Normal))
+	ComposeControls::Mode::Normal,
+	SendMenu::Type::SilentOnly))
 , _scroll(std::make_unique<Ui::ScrollArea>(this, st::historyScroll, false))
 , _scrollDown(_scroll.get(), st::historyToDown)
 , _readRequestTimer([=] { sendReadTillRequest(); }) {
@@ -429,13 +430,13 @@ void RepliesWidget::setupComposeControls() {
 	}, lifetime());
 
 	_composeControls->sendRequests(
-	) | rpl::start_with_next([=] {
-		send();
+	) | rpl::start_with_next([=](Api::SendOptions options) {
+		send(options);
 	}, lifetime());
 
 	_composeControls->sendVoiceRequests(
 	) | rpl::start_with_next([=](ComposeControls::VoiceToSend &&data) {
-		sendVoice(data.bytes, data.waveform, data.duration);
+		sendVoice(std::move(data));
 	}, lifetime());
 
 	_composeControls->sendCommandRequests(
@@ -878,13 +879,15 @@ void RepliesWidget::send() {
 	//	Ui::LayerOption::KeepOther);
 }
 
-void RepliesWidget::sendVoice(
-		QByteArray bytes,
-		VoiceWaveform waveform,
-		int duration) {
+void RepliesWidget::sendVoice(ComposeControls::VoiceToSend &&data) {
 	auto action = Api::SendAction(_history);
 	action.replyTo = replyToId();
-	session().api().sendVoiceMessage(bytes, waveform, duration, action);
+	action.options = data.options;
+	session().api().sendVoiceMessage(
+		data.bytes,
+		data.waveform,
+		data.duration,
+		std::move(action));
 }
 
 void RepliesWidget::send(Api::SendOptions options) {
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 66e8b7eb0..93ea4fbb1 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -52,6 +52,10 @@ class RepliesList;
 
 namespace HistoryView {
 
+namespace Controls {
+struct VoiceToSend;
+} // namespace Controls
+
 class Element;
 class TopBarWidget;
 class RepliesMemento;
@@ -180,7 +184,7 @@ private:
 
 	void send();
 	void send(Api::SendOptions options);
-	void sendVoice(QByteArray bytes, VoiceWaveform waveform, int duration);
+	void sendVoice(Controls::VoiceToSend &&data);
 	void edit(
 		not_null<HistoryItem*> item,
 		Api::SendOptions options,
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 4e09b1040..8fca948b2 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -97,7 +97,8 @@ ScheduledWidget::ScheduledWidget(
 , _composeControls(std::make_unique<ComposeControls>(
 	this,
 	controller,
-	ComposeControls::Mode::Scheduled))
+	ComposeControls::Mode::Scheduled,
+	SendMenu::Type::Disabled))
 , _scrollDown(_scroll, st::historyToDown) {
 	const auto state = Dialogs::EntryState{
 		.key = _history,

From 024a35d77096f18ef00f956685a3b37f252683f2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 16 Nov 2020 19:54:47 +0300
Subject: [PATCH 117/370] Added ability to send recorded voice data from
 ComposeControls.

---
 .../controls/history_view_compose_controls.cpp  | 17 +++++++++++++++--
 .../controls/history_view_compose_controls.h    |  6 ++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index eadde1509..e5b232f36 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -721,12 +721,15 @@ rpl::producer<not_null<QKeyEvent*>> ComposeControls::keyEvents() const {
 	});
 }
 
-rpl::producer<Api::SendOptions> ComposeControls::sendRequests() const {
+auto ComposeControls::sendContentRequests(SendRequestType requestType) const {
 	auto filter = rpl::filter([=] {
 		const auto type = (_mode == Mode::Normal)
 			? Ui::SendButton::Type::Send
 			: Ui::SendButton::Type::Schedule;
-		return (_send->type() == type);
+		const auto sendRequestType = _voiceRecordBar->isListenState()
+			? SendRequestType::Voice
+			: SendRequestType::Text;
+		return (_send->type() == type) && (sendRequestType == requestType);
 	});
 	auto map = rpl::map_to(Api::SendOptions());
 	auto submits = base::qt_signal_producer(
@@ -738,6 +741,10 @@ rpl::producer<Api::SendOptions> ComposeControls::sendRequests() const {
 		_sendCustomRequests.events());
 }
 
+rpl::producer<Api::SendOptions> ComposeControls::sendRequests() const {
+	return sendContentRequests(SendRequestType::Text);
+}
+
 rpl::producer<VoiceToSend> ComposeControls::sendVoiceRequests() const {
 	return _voiceRecordBar->sendVoiceRequests();
 }
@@ -973,6 +980,12 @@ void ComposeControls::init() {
 		updateHeight();
 	}, _wrap->lifetime());
 
+	sendContentRequests(
+		SendRequestType::Voice
+	) | rpl::start_with_next([=](Api::SendOptions options) {
+		_voiceRecordBar->requestToSendWithOptions(options);
+	}, _wrap->lifetime());
+
 	{
 		const auto lastMsgId = _wrap->lifetime().make_state<FullMsgId>();
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index fbdce2296..926975cd7 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -169,6 +169,10 @@ private:
 		Normal,
 		Edit,
 	};
+	enum class SendRequestType {
+		Text,
+		Voice,
+	};
 	using TextUpdateEvents = base::flags<TextUpdateEvent>;
 	friend inline constexpr bool is_flag_type(TextUpdateEvent) { return true; };
 
@@ -195,6 +199,8 @@ private:
 
 	void sendSilent();
 	void sendScheduled();
+	[[nodiscard]] auto sendContentRequests(
+		SendRequestType requestType = SendRequestType::Text) const;
 
 	void orderControls();
 	void checkAutocomplete();

From 980ce9fba3505c6b41b82d90c726705ac46b4679 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 16 Nov 2020 20:08:18 +0300
Subject: [PATCH 118/370] Replaced auto types with explicit types in
 VoiceRecordBar's lambdas.

---
 .../view/controls/history_view_voice_record_bar.cpp    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 01dbed3c4..186a09c9e 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -691,7 +691,7 @@ void RecordLock::init() {
 		const auto &duration = st::historyRecordVoiceShowDuration;
 		const auto from = 0.;
 		const auto to = 1.;
-		auto callback = [=](auto value) {
+		auto callback = [=](float64 value) {
 			update();
 			if (value == to) {
 				setCursor(style::cur_pointer);
@@ -850,7 +850,7 @@ void RecordLock::drawProgress(Painter &p) {
 }
 
 void RecordLock::startLockingAnimation(float64 to) {
-	auto callback = [=](auto value) { setProgress(value); };
+	auto callback = [=](float64 value) { setProgress(value); };
 	const auto &duration = st::historyRecordVoiceShowDuration;
 	_lockEnderAnimation.start(std::move(callback), 0., to, duration);
 }
@@ -1033,7 +1033,7 @@ void VoiceRecordBar::init() {
 		const auto from = show ? 0. : 1.;
 		const auto &duration = st::historyRecordLockShowDuration;
 		_lock->show();
-		auto callback = [=](auto value) {
+		auto callback = [=](float64 value) {
 			updateLockGeometry();
 			if (value == 0. && !show) {
 				_lock->hide();
@@ -1050,14 +1050,14 @@ void VoiceRecordBar::init() {
 		}
 
 		::Media::Capture::instance()->startedChanges(
-		) | rpl::filter([=](auto capturing) {
+		) | rpl::filter([=](bool capturing) {
 			return !capturing && _listen;
 		}) | rpl::take(1) | rpl::start_with_next([=] {
 			_lockShowing = false;
 
 			const auto to = 1.;
 			const auto &duration = st::historyRecordVoiceShowDuration;
-			auto callback = [=](auto value) {
+			auto callback = [=](float64 value) {
 				_listen->requestPaintProgress(value);
 				_level->requestPaintProgress(to - value);
 				update();

From 04c068d8b3b92c335eaada13ed42f2b7330a1454 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 16 Nov 2020 21:09:53 +0300
Subject: [PATCH 119/370] Added filling send context menu to TabbedSelector
 from ComposeControls.

---
 .../history/view/controls/history_view_compose_controls.cpp | 2 ++
 .../history/view/history_view_replies_section.cpp           | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index e5b232f36..bc753817b 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1396,6 +1396,8 @@ void ComposeControls::initTabbedSelector() {
 
 	selector->inlineResultChosen(
 	) | rpl::start_to_stream(_inlineResultChosen, wrap->lifetime());
+
+	selector->setSendMenuType([=] { return sendMenuType(); });
 }
 
 void ComposeControls::initSendButton() {
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 4be479126..9e7e59245 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -470,17 +470,17 @@ void RepliesWidget::setupComposeControls() {
 
 	_composeControls->fileChosen(
 	) | rpl::start_with_next([=](Selector::FileChosen chosen) {
-		sendExistingDocument(chosen.document);
+		sendExistingDocument(chosen.document, chosen.options);
 	}, lifetime());
 
 	_composeControls->photoChosen(
 	) | rpl::start_with_next([=](Selector::PhotoChosen chosen) {
-		sendExistingPhoto(chosen.photo);
+		sendExistingPhoto(chosen.photo, chosen.options);
 	}, lifetime());
 
 	_composeControls->inlineResultChosen(
 	) | rpl::start_with_next([=](Selector::InlineChosen chosen) {
-		sendInlineResult(chosen.result, chosen.bot);
+		sendInlineResult(chosen.result, chosen.bot, chosen.options);
 	}, lifetime());
 
 	_composeControls->scrollRequests(

From facbaecf302dd1e78986da224db89a25e1d5f9cd Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 17 Nov 2020 14:05:26 +0400
Subject: [PATCH 120/370] Add -Werror to actions

---
 .github/workflows/linux.yml | 3 ++-
 .github/workflows/mac.yml   | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index ef2a521e7..1caa8d3ba 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -102,7 +102,8 @@ jobs:
           fi
 
           ./configure.sh \
-          -D CMAKE_CXX_FLAGS="-s" \
+          -D CMAKE_C_FLAGS="-Werror -s" \
+          -D CMAKE_CXX_FLAGS="-Werror -s" \
           -D TDESKTOP_API_TEST=ON \
           -D DESKTOP_APP_USE_PACKAGED=OFF \
           -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 26a625dca..94c164fcf 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -515,6 +515,8 @@ jobs:
           fi
 
           ./configure.sh \
+          -D CMAKE_C_FLAGS="-Werror" \
+          -D CMAKE_CXX_FLAGS="-Werror" \
           -D TDESKTOP_API_TEST=ON \
           -D DESKTOP_APP_USE_PACKAGED=OFF \
           -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \

From 985956e62568f7109f9e435522512c1a44ed2ef6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 17 Nov 2020 14:13:18 +0400
Subject: [PATCH 121/370] Update lib_base

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

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 4f22126e7..c14879d8d 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 4f22126e7e855b517857408abf2467cba163a6f2
+Subproject commit c14879d8d0753f4e3a20890f7559d7dcffa37dd4

From c52e9140602732e5d8300d2b523b1368e680fc63 Mon Sep 17 00:00:00 2001
From: Newbyte <newbie13xd@gmail.com>
Date: Mon, 16 Nov 2020 13:29:24 +0100
Subject: [PATCH 122/370] Fix WebRTC licence link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 379bf9ffa..60e7598d5 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Version **1.8.15** was the last that supports older systems
 
 * Qt 5.12.8, 5.6.2 and 5.3.2 slightly patched ([LGPL](http://doc.qt.io/qt-5/lgpl.html))
 * OpenSSL 1.1.1 and 1.0.1 ([OpenSSL License](https://www.openssl.org/source/license.html))
-* WebRTC ([New BSD License](https://github.com/desktop-app/tg_owt/blob/master/src/LICENSE))
+* WebRTC ([New BSD License](https://github.com/desktop-app/tg_owt/blob/master/LICENSE))
 * zlib 1.2.11 ([zlib License](http://www.zlib.net/zlib_license.html))
 * LZMA SDK 9.20 ([public domain](http://www.7-zip.org/sdk.html))
 * liblzma ([public domain](http://tukaani.org/xz/))

From c0142726f895926d82d2a7ef4a7fc5a57f6c76b0 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 16 Nov 2020 16:29:02 +0400
Subject: [PATCH 123/370] Remove unneeded Xi and Xrender from docker build and
 add repo with new git

---
 Telegram/build/docker/centos_env/Dockerfile | 27 +--------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 0bb9d3650..55e04f5c2 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -9,6 +9,7 @@ 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 https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-1.7-1.x86_64.rpm
 RUN yum -y install centos-release-scl
 
 RUN yum -y install git cmake3 zlib-devel gtk3-devel libICE-devel \
@@ -177,28 +178,6 @@ RUN 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 ./autogen.sh --enable-static
-RUN make -j$(nproc)
-RUN 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 ./autogen.sh --enable-static
-RUN make -j$(nproc)
-RUN make DESTDIR="$LibrariesPath/libXrender-cache" install
-
-WORKDIR ..
-RUN rm -rf libxrender
-
 FROM builder AS wayland
 COPY --from=libffi ${LibrariesPath}/libffi-cache /
 
@@ -417,8 +396,6 @@ COPY --from=xcb-keysyms ${LibrariesPath}/xcb-keysyms-cache /
 COPY --from=xcb-render-util ${LibrariesPath}/xcb-render-util-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 /
@@ -548,8 +525,6 @@ COPY --from=xcb-keysyms ${LibrariesPath}/xcb-keysyms-cache /
 COPY --from=xcb-render-util ${LibrariesPath}/xcb-render-util-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 /

From 96b2e26f4265920dd7221afcff0a659d3ca84067 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Thu, 12 Nov 2020 00:18:18 +0100
Subject: [PATCH 124/370] Build wayland support optionally

---
 Telegram/CMakeLists.txt                       |  28 +++--
 .../linux/linux_wayland_integration.cpp       | 116 ++++++++++++++++++
 .../linux/linux_wayland_integration.h         |  27 ++++
 .../linux/linux_wayland_integration_dummy.cpp |  34 +++++
 .../platform/linux/specific_linux.cpp         |  96 ++-------------
 cmake                                         |   2 +-
 6 files changed, 207 insertions(+), 96 deletions(-)
 create mode 100644 Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
 create mode 100644 Telegram/SourceFiles/platform/linux/linux_wayland_integration.h
 create mode 100644 Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index b2b7236a3..2320bd52c 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -70,7 +70,6 @@ PRIVATE
 if (LINUX)
     target_link_libraries(Telegram
     PRIVATE
-        desktop-app::external_materialdecoration
         desktop-app::external_nimf_qt5
         desktop-app::external_qt5ct_support
         desktop-app::external_xcb_screensaver
@@ -89,14 +88,22 @@ if (LINUX)
         )
     endif()
 
-    if (DESKTOP_APP_USE_PACKAGED AND Qt5WaylandClient_VERSION VERSION_LESS 5.13.0)
-        find_package(PkgConfig REQUIRED)
-        pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client)
-
-        target_include_directories(Telegram
+    if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
+        target_link_libraries(Telegram
         PRIVATE
-            ${WAYLAND_CLIENT_INCLUDE_DIRS}
+            desktop-app::external_materialdecoration
         )
+
+        if (DESKTOP_APP_USE_PACKAGED
+            AND Qt5WaylandClient_VERSION VERSION_LESS 5.13.0)
+            find_package(PkgConfig REQUIRED)
+            pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client)
+
+            target_include_directories(Telegram
+            PRIVATE
+                ${WAYLAND_CLIENT_INCLUDE_DIRS}
+            )
+        endif()
     endif()
 
     if (NOT TDESKTOP_DISABLE_GTK_INTEGRATION)
@@ -803,6 +810,8 @@ PRIVATE
     platform/linux/linux_gdk_helper.h
     platform/linux/linux_libs.cpp
     platform/linux/linux_libs.h
+    platform/linux/linux_wayland_integration.cpp
+    platform/linux/linux_wayland_integration.h
     platform/linux/linux_xlib_helper.cpp
     platform/linux/linux_xlib_helper.h
     platform/linux/file_utilities_linux.cpp
@@ -1088,6 +1097,11 @@ if (NOT LINUX)
     )
 endif()
 
+if (LINUX AND DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
+    remove_target_sources(Telegram ${src_loc} platform/linux/linux_wayland_integration.cpp)
+    nice_target_sources(Telegram ${src_loc} PRIVATE platform/linux/linux_wayland_integration_dummy.cpp)
+endif()
+
 if (NOT DESKTOP_APP_USE_PACKAGED)
     nice_target_sources(Telegram ${src_loc} PRIVATE platform/mac/mac_iconv_helper.c)
 endif()
diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
new file mode 100644
index 000000000..1df54e3da
--- /dev/null
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
@@ -0,0 +1,116 @@
+/*
+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/linux/linux_wayland_integration.h"
+
+#include "base/platform/base_platform_info.h"
+
+#include <QtGui/QWindow>
+
+#include <private/qwaylanddisplay_p.h>
+#include <private/qwaylandwindow_p.h>
+#include <private/qwaylandshellsurface_p.h>
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) && !defined DESKTOP_APP_QT_PATCHED
+#include <wayland-client.h>
+#endif // Qt < 5.13 && !DESKTOP_APP_QT_PATCHED
+
+using QtWaylandClient::QWaylandWindow;
+
+namespace Platform {
+namespace internal {
+
+namespace {
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) && !defined DESKTOP_APP_QT_PATCHED
+enum wl_shell_surface_resize WlResizeFromEdges(Qt::Edges edges) {
+	if (edges == (Qt::TopEdge | Qt::LeftEdge))
+		return WL_SHELL_SURFACE_RESIZE_TOP_LEFT;
+	if (edges == Qt::TopEdge)
+		return WL_SHELL_SURFACE_RESIZE_TOP;
+	if (edges == (Qt::TopEdge | Qt::RightEdge))
+		return WL_SHELL_SURFACE_RESIZE_TOP_RIGHT;
+	if (edges == Qt::RightEdge)
+		return WL_SHELL_SURFACE_RESIZE_RIGHT;
+	if (edges == (Qt::RightEdge | Qt::BottomEdge))
+		return WL_SHELL_SURFACE_RESIZE_BOTTOM_RIGHT;
+	if (edges == Qt::BottomEdge)
+		return WL_SHELL_SURFACE_RESIZE_BOTTOM;
+	if (edges == (Qt::BottomEdge | Qt::LeftEdge))
+		return WL_SHELL_SURFACE_RESIZE_BOTTOM_LEFT;
+	if (edges == Qt::LeftEdge)
+		return WL_SHELL_SURFACE_RESIZE_LEFT;
+
+	return WL_SHELL_SURFACE_RESIZE_NONE;
+}
+#endif // Qt < 5.13 && !DESKTOP_APP_QT_PATCHED
+
+} // namespace
+
+WaylandIntegration::WaylandIntegration() {
+}
+
+WaylandIntegration *WaylandIntegration::Instance() {
+	static WaylandIntegration instance;
+	return &instance;
+}
+
+bool WaylandIntegration::startMove(QWindow *window) {
+	// There are startSystemMove on Qt 5.15
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) && !defined DESKTOP_APP_QT_PATCHED
+	if (const auto waylandWindow = static_cast<QWaylandWindow*>(
+		window->handle())) {
+		if (const auto seat = waylandWindow->display()->lastInputDevice()) {
+			if (const auto shellSurface = waylandWindow->shellSurface()) {
+				return shellSurface->move(seat);
+			}
+		}
+	}
+#endif // Qt < 5.15 && !DESKTOP_APP_QT_PATCHED
+
+	return false;
+}
+
+bool WaylandIntegration::startResize(QWindow *window, Qt::Edges edges) {
+	// There are startSystemResize on Qt 5.15
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) && !defined DESKTOP_APP_QT_PATCHED
+	if (const auto waylandWindow = static_cast<QWaylandWindow*>(
+		window->handle())) {
+		if (const auto seat = waylandWindow->display()->lastInputDevice()) {
+			if (const auto shellSurface = waylandWindow->shellSurface()) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
+				shellSurface->resize(seat, edges);
+				return true;
+#else // Qt >= 5.13
+				shellSurface->resize(seat, WlResizeFromEdges(edges));
+				return true;
+#endif // Qt < 5.13
+			}
+		}
+	}
+#endif // Qt < 5.15 && !DESKTOP_APP_QT_PATCHED
+
+	return false;
+}
+
+bool WaylandIntegration::showWindowMenu(QWindow *window) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0) || defined DESKTOP_APP_QT_PATCHED
+	if (const auto waylandWindow = static_cast<QWaylandWindow*>(
+		window->handle())) {
+		if (const auto seat = waylandWindow->display()->lastInputDevice()) {
+			if (const auto shellSurface = waylandWindow->shellSurface()) {
+				return shellSurface->showWindowMenu(seat);
+			}
+		}
+	}
+#endif // Qt >= 5.13 || DESKTOP_APP_QT_PATCHED
+
+	return false;
+}
+
+} // namespace internal
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.h b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.h
new file mode 100644
index 000000000..73486fef7
--- /dev/null
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.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
+
+class QWindow;
+
+namespace Platform {
+namespace internal {
+
+class WaylandIntegration {
+public:
+	static WaylandIntegration *Instance();
+	bool startMove(QWindow *window);
+	bool startResize(QWindow *window, Qt::Edges edges);
+	bool showWindowMenu(QWindow *window);
+
+private:
+	WaylandIntegration();
+};
+
+} // namespace internal
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp
new file mode 100644
index 000000000..f6c6b39fe
--- /dev/null
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp
@@ -0,0 +1,34 @@
+/*
+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/linux/linux_wayland_integration.h"
+
+namespace Platform {
+namespace internal {
+
+WaylandIntegration::WaylandIntegration() {
+}
+
+WaylandIntegration *WaylandIntegration::Instance() {
+	static WaylandIntegration instance;
+	return &instance;
+}
+
+bool WaylandIntegration::startMove(QWindow *window) {
+	return false;
+}
+
+bool WaylandIntegration::startResize(QWindow *window, Qt::Edges edges) {
+	return false;
+}
+
+bool WaylandIntegration::showWindowMenu(QWindow *window) {
+	return false;
+}
+
+} // namespace internal
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index ec80da17a..6cb1d00f3 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwindow.h"
 #include "platform/linux/linux_desktop_environment.h"
 #include "platform/linux/file_utilities_linux.h"
+#include "platform/linux/linux_wayland_integration.h"
 #include "platform/platform_notifications_manager.h"
 #include "storage/localstorage.h"
 #include "core/crash_reports.h"
@@ -31,10 +32,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtCore/QLibraryInfo>
 #include <QtGui/QWindow>
 
-#include <private/qwaylanddisplay_p.h>
-#include <private/qwaylandwindow_p.h>
-#include <private/qwaylandshellsurface_p.h>
-
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusConnection>
@@ -47,10 +44,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <xcb/xcb.h>
 #include <xcb/screensaver.h>
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) && !defined DESKTOP_APP_QT_PATCHED
-#include <wayland-client.h>
-#endif // Qt < 5.13 && !DESKTOP_APP_QT_PATCHED
-
 #include <glib.h>
 
 extern "C" {
@@ -70,7 +63,7 @@ extern "C" {
 
 using namespace Platform;
 using Platform::File::internal::EscapeShell;
-using QtWaylandClient::QWaylandWindow;
+using Platform::internal::WaylandIntegration;
 
 namespace Platform {
 namespace {
@@ -367,29 +360,6 @@ uint XCBMoveResizeFromEdges(Qt::Edges edges) {
 	return 0;
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) && !defined DESKTOP_APP_QT_PATCHED
-enum wl_shell_surface_resize WlResizeFromEdges(Qt::Edges edges) {
-	if (edges == (Qt::TopEdge | Qt::LeftEdge))
-		return WL_SHELL_SURFACE_RESIZE_TOP_LEFT;
-	if (edges == Qt::TopEdge)
-		return WL_SHELL_SURFACE_RESIZE_TOP;
-	if (edges == (Qt::TopEdge | Qt::RightEdge))
-		return WL_SHELL_SURFACE_RESIZE_TOP_RIGHT;
-	if (edges == Qt::RightEdge)
-		return WL_SHELL_SURFACE_RESIZE_RIGHT;
-	if (edges == (Qt::RightEdge | Qt::BottomEdge))
-		return WL_SHELL_SURFACE_RESIZE_BOTTOM_RIGHT;
-	if (edges == Qt::BottomEdge)
-		return WL_SHELL_SURFACE_RESIZE_BOTTOM;
-	if (edges == (Qt::BottomEdge | Qt::LeftEdge))
-		return WL_SHELL_SURFACE_RESIZE_BOTTOM_LEFT;
-	if (edges == Qt::LeftEdge)
-		return WL_SHELL_SURFACE_RESIZE_LEFT;
-
-	return WL_SHELL_SURFACE_RESIZE_NONE;
-}
-#endif // Qt < 5.13 && !DESKTOP_APP_QT_PATCHED
-
 bool StartXCBMoveResize(QWindow *window, int edges) {
 	const auto connection = base::Platform::XCB::GetConnectionFromQt();
 	if (!connection) {
@@ -482,59 +452,6 @@ bool ShowXCBWindowMenu(QWindow *window) {
 	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
-	if (const auto waylandWindow = static_cast<QWaylandWindow*>(
-		window->handle())) {
-		if (const auto seat = waylandWindow->display()->lastInputDevice()) {
-			if (const auto shellSurface = waylandWindow->shellSurface()) {
-				return shellSurface->move(seat);
-			}
-		}
-	}
-#endif // Qt < 5.15 && !DESKTOP_APP_QT_PATCHED
-
-	return false;
-}
-
-bool StartWaylandResize(QWindow *window, Qt::Edges edges) {
-	// There are startSystemResize on Qt 5.15
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) && !defined DESKTOP_APP_QT_PATCHED
-	if (const auto waylandWindow = static_cast<QWaylandWindow*>(
-		window->handle())) {
-		if (const auto seat = waylandWindow->display()->lastInputDevice()) {
-			if (const auto shellSurface = waylandWindow->shellSurface()) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
-				shellSurface->resize(seat, edges);
-				return true;
-#else // Qt >= 5.13
-				shellSurface->resize(seat, WlResizeFromEdges(edges));
-				return true;
-#endif // Qt < 5.13
-			}
-		}
-	}
-#endif // Qt < 5.15 && !DESKTOP_APP_QT_PATCHED
-
-	return false;
-}
-
-bool ShowWaylandWindowMenu(QWindow *window) {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0) || defined DESKTOP_APP_QT_PATCHED
-	if (const auto waylandWindow = static_cast<QWaylandWindow*>(
-		window->handle())) {
-		if (const auto seat = waylandWindow->display()->lastInputDevice()) {
-			if (const auto shellSurface = waylandWindow->shellSurface()) {
-				return shellSurface->showWindowMenu(seat);
-			}
-		}
-	}
-#endif // Qt >= 5.13 || DESKTOP_APP_QT_PATCHED
-
-	return false;
-}
-
 bool XCBFrameExtentsSupported() {
 	const auto connection = base::Platform::XCB::GetConnectionFromQt();
 	if (!connection) {
@@ -893,7 +810,8 @@ bool SkipTaskbarSupported() {
 
 bool StartSystemMove(QWindow *window) {
 	if (IsWayland()) {
-		return StartWaylandMove(window);
+		const auto integration = WaylandIntegration::Instance();
+		return integration->startMove(window);
 	} else {
 		return StartXCBMoveResize(window, 16);
 	}
@@ -901,7 +819,8 @@ bool StartSystemMove(QWindow *window) {
 
 bool StartSystemResize(QWindow *window, Qt::Edges edges) {
 	if (IsWayland()) {
-		return StartWaylandResize(window, edges);
+		const auto integration = WaylandIntegration::Instance();
+		return integration->startResize(window, edges);
 	} else {
 		return StartXCBMoveResize(window, edges);
 	}
@@ -909,7 +828,8 @@ bool StartSystemResize(QWindow *window, Qt::Edges edges) {
 
 bool ShowWindowMenu(QWindow *window) {
 	if (IsWayland()) {
-		return ShowWaylandWindowMenu(window);
+		const auto integration = WaylandIntegration::Instance();
+		return integration->showWindowMenu(window);
 	} else {
 		return ShowXCBWindowMenu(window);
 	}
diff --git a/cmake b/cmake
index d9e8a608c..4436815d1 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit d9e8a608c21ca175ed118955d83010580fb46e65
+Subproject commit 4436815d19035aaba79cb69b7e2d599ae286297d

From 17e8e0a7b06c42e86541912af09b4360b7e29953 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Thu, 12 Nov 2020 00:27:10 +0100
Subject: [PATCH 125/370] Add workflow for
 DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION

---
 .github/workflows/linux.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 1caa8d3ba..0a528c0d4 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -62,6 +62,7 @@ jobs:
         defines:
           - ""
           - "DESKTOP_APP_DISABLE_DBUS_INTEGRATION"
+          - "DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION"
           - "TDESKTOP_DISABLE_GTK_INTEGRATION"
 
     env:

From 0563e1f8781abeed98c3eb757811a86800f55b87 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 12 Nov 2020 00:54:09 +0100
Subject: [PATCH 126/370] Have the wayland build-time toggle affect the native
 window title

---
 Telegram/CMakeLists.txt                       |  1 +
 .../platform/linux/window_title_linux.cpp     | 38 +++++++++++++++++++
 .../platform/linux/window_title_linux.h       | 12 +-----
 3 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 Telegram/SourceFiles/platform/linux/window_title_linux.cpp

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 2320bd52c..215698590 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -824,6 +824,7 @@ PRIVATE
     platform/linux/notifications_manager_linux.h
     platform/linux/specific_linux.cpp
     platform/linux/specific_linux.h
+    platform/linux/window_title_linux.cpp
     platform/linux/window_title_linux.h
     platform/mac/file_utilities_mac.mm
     platform/mac/file_utilities_mac.h
diff --git a/Telegram/SourceFiles/platform/linux/window_title_linux.cpp b/Telegram/SourceFiles/platform/linux/window_title_linux.cpp
new file mode 100644
index 000000000..95e8b6449
--- /dev/null
+++ b/Telegram/SourceFiles/platform/linux/window_title_linux.cpp
@@ -0,0 +1,38 @@
+/*
+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/linux/window_title_linux.h"
+
+#include "platform/linux/linux_desktop_environment.h"
+#include "base/platform/base_platform_info.h"
+
+namespace Platform {
+namespace {
+
+bool SystemMoveResizeSupported() {
+#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION || QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) || defined DESKTOP_APP_QT_PATCHED
+	return true;
+#else // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION || Qt >= 5.15 || DESKTOP_APP_QT_PATCHED
+	return !IsWayland();
+#endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION || Qt >= 5.15 || DESKTOP_APP_QT_PATCHED
+}
+
+} // namespace
+
+bool AllowNativeWindowFrameToggle() {
+	return SystemMoveResizeSupported()
+		// https://gitlab.gnome.org/GNOME/mutter/-/issues/217
+		&& !(DesktopEnvironment::IsGnome() && IsWayland());
+}
+
+object_ptr<Window::TitleWidget> CreateTitleWidget(QWidget *parent) {
+	return SystemMoveResizeSupported()
+		? object_ptr<Window::TitleWidgetQt>(parent)
+		: object_ptr<Window::TitleWidgetQt>{ nullptr };
+}
+
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/window_title_linux.h b/Telegram/SourceFiles/platform/linux/window_title_linux.h
index 4e5f68e02..c493976c2 100644
--- a/Telegram/SourceFiles/platform/linux/window_title_linux.h
+++ b/Telegram/SourceFiles/platform/linux/window_title_linux.h
@@ -8,8 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "platform/platform_window_title.h"
-#include "platform/linux/linux_desktop_environment.h"
-#include "base/platform/base_platform_info.h"
 #include "base/object_ptr.h"
 
 namespace Window {
@@ -23,14 +21,8 @@ void DefaultPreviewWindowFramePaint(QImage &preview, const style::palette &palet
 
 namespace Platform {
 
-inline bool AllowNativeWindowFrameToggle() {
-	// https://gitlab.gnome.org/GNOME/mutter/-/issues/217
-	return !(DesktopEnvironment::IsGnome() && IsWayland());
-}
-
-inline object_ptr<Window::TitleWidget> CreateTitleWidget(QWidget *parent) {
-	return object_ptr<Window::TitleWidgetQt>(parent);
-}
+bool AllowNativeWindowFrameToggle();
+object_ptr<Window::TitleWidget> CreateTitleWidget(QWidget *parent);
 
 inline bool NativeTitleRequiresShadow() {
 	return false;

From 4ed6918a5e0920f3c820d82ebf99f2b0d630ae3b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 13 Nov 2020 14:31:17 +0100
Subject: [PATCH 127/370] Disable some static plugins when building without
 wayland

---
 Telegram/SourceFiles/qt_static_plugins.cpp | 30 ++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp
index 5dffd6a7a..21c0980f2 100644
--- a/Telegram/SourceFiles/qt_static_plugins.cpp
+++ b/Telegram/SourceFiles/qt_static_plugins.cpp
@@ -21,19 +21,7 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
 Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
 Q_IMPORT_PLUGIN(QGenericEnginePlugin)
 #elif defined Q_OS_UNIX // Q_OS_WIN | Q_OS_MAC
-Q_IMPORT_PLUGIN(ShmServerBufferPlugin)
-Q_IMPORT_PLUGIN(DmaBufServerBufferPlugin)
-Q_IMPORT_PLUGIN(DrmEglServerBufferPlugin)
-Q_IMPORT_PLUGIN(QWaylandEglClientBufferPlugin)
-Q_IMPORT_PLUGIN(QWaylandIviShellIntegrationPlugin)
-Q_IMPORT_PLUGIN(QWaylandWlShellIntegrationPlugin)
-Q_IMPORT_PLUGIN(QWaylandXdgShellV5IntegrationPlugin)
-Q_IMPORT_PLUGIN(QWaylandXdgShellV6IntegrationPlugin)
-Q_IMPORT_PLUGIN(QWaylandXdgShellIntegrationPlugin)
-Q_IMPORT_PLUGIN(QWaylandBradientDecorationPlugin)
 Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
-Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin)
-Q_IMPORT_PLUGIN(QWaylandEglPlatformIntegrationPlugin)
 Q_IMPORT_PLUGIN(QGenericEnginePlugin)
 Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
 Q_IMPORT_PLUGIN(QSvgPlugin)
@@ -44,18 +32,34 @@ Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin)
 Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin)
 Q_IMPORT_PLUGIN(QXdgDesktopPortalThemePlugin)
 #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#ifndef DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
+Q_IMPORT_PLUGIN(ShmServerBufferPlugin)
+Q_IMPORT_PLUGIN(DmaBufServerBufferPlugin)
+Q_IMPORT_PLUGIN(DrmEglServerBufferPlugin)
+Q_IMPORT_PLUGIN(QWaylandEglClientBufferPlugin)
+Q_IMPORT_PLUGIN(QWaylandIviShellIntegrationPlugin)
+Q_IMPORT_PLUGIN(QWaylandWlShellIntegrationPlugin)
+Q_IMPORT_PLUGIN(QWaylandXdgShellV5IntegrationPlugin)
+Q_IMPORT_PLUGIN(QWaylandXdgShellV6IntegrationPlugin)
+Q_IMPORT_PLUGIN(QWaylandXdgShellIntegrationPlugin)
+Q_IMPORT_PLUGIN(QWaylandBradientDecorationPlugin)
+Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin)
+Q_IMPORT_PLUGIN(QWaylandEglPlatformIntegrationPlugin)
+#endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
 #endif // Q_OS_WIN | Q_OS_MAC | Q_OS_UNIX
 #endif // !DESKTOP_APP_USE_PACKAGED
 
 #if defined Q_OS_UNIX && !defined Q_OS_MAC
 #if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY
-Q_IMPORT_PLUGIN(QWaylandMaterialDecorationPlugin)
 Q_IMPORT_PLUGIN(NimfInputContextPlugin)
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin)
 Q_IMPORT_PLUGIN(QFcitx5PlatformInputContextPlugin)
 Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
 #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#ifndef DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
+Q_IMPORT_PLUGIN(QWaylandMaterialDecorationPlugin)
+#endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
 #endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY
 
 #if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES

From 49480001f73be83d16506bf0759660927a1cab53 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Fri, 13 Nov 2020 17:05:54 +0100
Subject: [PATCH 128/370] Move IsWayland() checks into WaylandIntegration

---
 .../platform/linux/linux_wayland_integration.cpp         | 1 +
 .../platform/linux/linux_wayland_integration_dummy.cpp   | 3 +++
 Telegram/SourceFiles/platform/linux/specific_linux.cpp   | 9 +++------
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
index 1df54e3da..e6af77b70 100644
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
@@ -55,6 +55,7 @@ WaylandIntegration::WaylandIntegration() {
 }
 
 WaylandIntegration *WaylandIntegration::Instance() {
+	if (!IsWayland()) return nullptr;
 	static WaylandIntegration instance;
 	return &instance;
 }
diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp
index f6c6b39fe..e79fd2d95 100644
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "platform/linux/linux_wayland_integration.h"
 
+#include "base/platform/base_platform_info.h"
+
 namespace Platform {
 namespace internal {
 
@@ -14,6 +16,7 @@ WaylandIntegration::WaylandIntegration() {
 }
 
 WaylandIntegration *WaylandIntegration::Instance() {
+	if (!IsWayland()) return nullptr;
 	static WaylandIntegration instance;
 	return &instance;
 }
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 6cb1d00f3..2f9f3d35b 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -809,8 +809,7 @@ bool SkipTaskbarSupported() {
 }
 
 bool StartSystemMove(QWindow *window) {
-	if (IsWayland()) {
-		const auto integration = WaylandIntegration::Instance();
+	if (const auto integration = WaylandIntegration::Instance()) {
 		return integration->startMove(window);
 	} else {
 		return StartXCBMoveResize(window, 16);
@@ -818,8 +817,7 @@ bool StartSystemMove(QWindow *window) {
 }
 
 bool StartSystemResize(QWindow *window, Qt::Edges edges) {
-	if (IsWayland()) {
-		const auto integration = WaylandIntegration::Instance();
+	if (const auto integration = WaylandIntegration::Instance()) {
 		return integration->startResize(window, edges);
 	} else {
 		return StartXCBMoveResize(window, edges);
@@ -827,8 +825,7 @@ bool StartSystemResize(QWindow *window, Qt::Edges edges) {
 }
 
 bool ShowWindowMenu(QWindow *window) {
-	if (IsWayland()) {
-		const auto integration = WaylandIntegration::Instance();
+	if (const auto integration = WaylandIntegration::Instance()) {
 		return integration->showWindowMenu(window);
 	} else {
 		return ShowXCBWindowMenu(window);

From ed50aa0d8ebf3cd122c9e10125dfcdf723744132 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 17 Nov 2020 17:14:21 +0300
Subject: [PATCH 129/370] Fix build with Qt < 5.14.

---
 Telegram/SourceFiles/storage/localimageloader.cpp | 5 ++---
 Telegram/lib_base                                 | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp
index 0a67661e7..d9c53522f 100644
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/file_utilities.h"
 #include "core/mime_type.h"
 #include "base/unixtime.h"
+#include "base/qt_adapters.h"
 #include "media/audio/media_audio.h"
 #include "media/clip/media_clip_reader.h"
 #include "mtproto/facade.h"
@@ -33,7 +34,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtCore/QBuffer>
 #include <QtGui/QImageWriter>
-#include <QtGui/QColorSpace>
 
 namespace {
 
@@ -882,8 +882,7 @@ void FileLoadTask::process(Args &&args) {
 					// We have an example of dark .png image that when being sent without
 					// removing its color space is displayed fine on tdesktop, but with
 					// a light gray background on mobile apps.
-					full.setColorSpace(QColorSpace());
-
+					base::QClearColorSpace(full);
 					QBuffer buffer(&filedata);
 					QImageWriter writer(&buffer, "JPEG");
 					writer.setQuality(87);
diff --git a/Telegram/lib_base b/Telegram/lib_base
index c14879d8d..707bdc849 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit c14879d8d0753f4e3a20890f7559d7dcffa37dd4
+Subproject commit 707bdc84918eddfd8c08e776d328dab03dc04b25

From 4f6f654e34e001eebd8dfa6fb80133f1a797dbe4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 17 Nov 2020 18:05:35 +0300
Subject: [PATCH 130/370] Check replies_pts before applying.

Fixes #9062.
---
 Telegram/SourceFiles/api/api_updates.cpp         |  4 ++++
 Telegram/SourceFiles/api/api_updates.h           |  2 ++
 Telegram/SourceFiles/history/history_message.cpp | 16 +++++++++++++++-
 Telegram/SourceFiles/history/history_message.h   |  2 ++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 4b853a1e2..f365ecce8 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -791,6 +791,10 @@ void Updates::mtpUpdateReceived(const MTPUpdates &updates) {
 	}
 }
 
+int32 Updates::pts() const {
+	return _ptsWaiter.current();
+}
+
 void Updates::updateOnline() {
 	updateOnline(false);
 }
diff --git a/Telegram/SourceFiles/api/api_updates.h b/Telegram/SourceFiles/api/api_updates.h
index 98bd13d60..b65744f51 100644
--- a/Telegram/SourceFiles/api/api_updates.h
+++ b/Telegram/SourceFiles/api/api_updates.h
@@ -33,6 +33,8 @@ public:
 	void applyUpdatesNoPtsCheck(const MTPUpdates &updates);
 	void applyUpdateNoPtsCheck(const MTPUpdate &update);
 
+	[[nodiscard]] int32 pts() const;
+
 	void updateOnline();
 	[[nodiscard]] bool isIdle() const;
 	void checkIdleFinish();
diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp
index 91f7673fb..59f165f47 100644
--- a/Telegram/SourceFiles/history/history_message.cpp
+++ b/Telegram/SourceFiles/history/history_message.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_media.h" // AddTimestampLinks.
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "main/main_session.h"
+#include "api/api_updates.h"
 #include "boxes/share_box.h"
 #include "boxes/confirm_box.h"
 #include "ui/toast/toast.h"
@@ -1083,6 +1084,17 @@ void HistoryMessage::createComponents(const CreateConfig &config) {
 	_fromNameVersion = from ? from->nameVersion : 1;
 }
 
+bool HistoryMessage::checkRepliesPts(const MTPMessageReplies &data) const {
+	const auto channel = history()->peer->asChannel();
+	const auto pts = channel
+		? channel->pts()
+		: history()->session().updates().pts();
+	const auto repliesPts = data.match([&](const MTPDmessageReplies &data) {
+		return data.vreplies_pts().v;
+	});
+	return (repliesPts >= pts);
+}
+
 void HistoryMessage::setupForwardedComponent(const CreateConfig &config) {
 	const auto forwarded = Get<HistoryMessageForwarded>();
 	if (!forwarded) {
@@ -1317,7 +1329,9 @@ void HistoryMessage::applyEdition(const MTPDmessage &message) {
 	setForwardsCount(message.vforwards().value_or(-1));
 	setText(_media ? textWithEntities : EnsureNonEmpty(textWithEntities));
 	if (const auto replies = message.vreplies()) {
-		setReplies(*replies);
+		if (checkRepliesPts(*replies)) {
+			setReplies(*replies);
+		}
 	} else {
 		clearReplies();
 	}
diff --git a/Telegram/SourceFiles/history/history_message.h b/Telegram/SourceFiles/history/history_message.h
index 17d308ec9..610b6044f 100644
--- a/Telegram/SourceFiles/history/history_message.h
+++ b/Telegram/SourceFiles/history/history_message.h
@@ -236,6 +236,8 @@ private:
 		const TextWithEntities &textWithEntities) const;
 	void reapplyText();
 
+	[[nodiscard]] bool checkRepliesPts(const MTPMessageReplies &data) const;
+
 	QString _timeText;
 	int _timeWidth = 0;
 

From 91b8ad171aea46828456fd4f43cdcc1fd41db1a2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 17 Nov 2020 18:20:22 +0300
Subject: [PATCH 131/370] Beta version 2.4.10.

- Use inline bots and sticker by emoji suggestions
in channel comments.
- Lock voice message recording,
listen to your voice message before sending.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/changelogs.cpp     | 6 ++++++
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/SourceFiles/data/data_types.h       | 6 ++++++
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 5 +++++
 8 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 0318c74bd..7b1bbb799 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.9.0" />
+    Version="2.4.10.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 5cf4fdcb7..bfe8187b3 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,9,0
- PRODUCTVERSION 2,4,9,0
+ FILEVERSION 2,4,10,0
+ PRODUCTVERSION 2,4,10,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.9.0"
+            VALUE "FileVersion", "2.4.10.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.9.0"
+            VALUE "ProductVersion", "2.4.10.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 8be2c6186..095ec4ddd 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,9,0
- PRODUCTVERSION 2,4,9,0
+ FILEVERSION 2,4,10,0
+ PRODUCTVERSION 2,4,10,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.9.0"
+            VALUE "FileVersion", "2.4.10.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.9.0"
+            VALUE "ProductVersion", "2.4.10.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index aa9457047..5bdf0176d 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -89,6 +89,12 @@ std::map<int, const char*> BetaLogs() {
 		2004008,
 		"- Upgrade several third party libraries to latest versions.\n"
 	},
+	{
+		2004010,
+		"- Use inline bots and sticker by emoji suggestions in channel comments.\n"
+
+		"- Lock voice message recording, listen to your voice message before sending.\n"
+	},
 	};
 };
 
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 4d81de3c5..d51fc19bf 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 = 2004009;
-constexpr auto AppVersionStr = "2.4.9";
+constexpr auto AppVersion = 2004010;
+constexpr auto AppVersionStr = "2.4.10";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index 7b0360b1a..ffed002f9 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -434,6 +434,12 @@ inline bool operator==(
 		&& (a.scroll == b.scroll);
 }
 
+inline bool operator!=(
+		const MessageCursor &a,
+		const MessageCursor &b) {
+	return !(a == b);
+}
+
 class FileClickHandler : public LeftButtonClickHandler {
 public:
 	FileClickHandler(
diff --git a/Telegram/build/version b/Telegram/build/version
index ad3eafa56..36009be61 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2004009
+AppVersion         2004010
 AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.9
-AppVersionStr      2.4.9
+AppVersionStrSmall 2.4.10
+AppVersionStr      2.4.10
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 2.4.9.beta
+AppVersionOriginal 2.4.10.beta
diff --git a/changelog.txt b/changelog.txt
index f6702ef31..c0249e7a5 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+2.4.10 beta (17.11.20)
+
+- Use inline bots and sticker by emoji suggestions in channel comments.
+- Lock voice message recording, listen to your voice message before sending.
+
 2.4.9 beta (06.11.20)
 
 - Fix crash in tray icon removing. (macOS only)

From 4a73bb7872dc0d52f10306e75f58a572b5e8f249 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 18 Nov 2020 13:32:28 +0300
Subject: [PATCH 132/370] Fix main window on Windows.

Fixes #9089, fixes #9090.
---
 .../platform/win/window_title_win.cpp         |  2 -
 .../platform/win/windows_event_filter.cpp     | 58 ++++++++-----------
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/Telegram/SourceFiles/platform/win/window_title_win.cpp b/Telegram/SourceFiles/platform/win/window_title_win.cpp
index a1c51f491..80df1d90d 100644
--- a/Telegram/SourceFiles/platform/win/window_title_win.cpp
+++ b/Telegram/SourceFiles/platform/win/window_title_win.cpp
@@ -42,8 +42,6 @@ TitleWidget::TitleWidget(QWidget *parent)
 	});
 	_close->setPointerCursor(false);
 
-	window()->windowHandle()->setFlag(Qt::FramelessWindowHint, true);
-
 	setAttribute(Qt::WA_OpaquePaintEvent);
 	resize(width(), _st.height);
 }
diff --git a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp
index 0cd10f60d..bdd55b957 100644
--- a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp
+++ b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp
@@ -142,42 +142,30 @@ bool EventFilter::customWindowFrameEvent(
 		if (result) *result = 0;
 	} return true;
 
-	case WM_SHOWWINDOW: {
-		SetWindowLongPtr(
-			hWnd,
-			GWL_STYLE,
-			WS_POPUP
-			| WS_THICKFRAME
-			| WS_CAPTION
-			| WS_SYSMENU
-			| WS_MAXIMIZEBOX
-			| WS_MINIMIZEBOX);
-	} return false;
-
 	case WM_NCCALCSIZE: {
-		//WINDOWPLACEMENT wp;
-		//wp.length = sizeof(WINDOWPLACEMENT);
-		//if (GetWindowPlacement(hWnd, &wp) && wp.showCmd == SW_SHOWMAXIMIZED) {
-		//	LPNCCALCSIZE_PARAMS params = (LPNCCALCSIZE_PARAMS)lParam;
-		//	LPRECT r = (wParam == TRUE) ? &params->rgrc[0] : (LPRECT)lParam;
-		//	HMONITOR hMonitor = MonitorFromPoint({ (r->left + r->right) / 2, (r->top + r->bottom) / 2 }, MONITOR_DEFAULTTONEAREST);
-		//	if (hMonitor) {
-		//		MONITORINFO mi;
-		//		mi.cbSize = sizeof(mi);
-		//		if (GetMonitorInfo(hMonitor, &mi)) {
-		//			*r = mi.rcWork;
-		//			UINT uEdge = (UINT)-1;
-		//			if (IsTaskbarAutoHidden(&mi.rcMonitor, &uEdge)) {
-		//				switch (uEdge) {
-		//				case ABE_LEFT: r->left += 1; break;
-		//				case ABE_RIGHT: r->right -= 1; break;
-		//				case ABE_TOP: r->top += 1; break;
-		//				case ABE_BOTTOM: r->bottom -= 1; break;
-		//				}
-		//			}
-		//		}
-		//	}
-		//}
+		WINDOWPLACEMENT wp;
+		wp.length = sizeof(WINDOWPLACEMENT);
+		if (GetWindowPlacement(hWnd, &wp) && wp.showCmd == SW_SHOWMAXIMIZED) {
+			LPNCCALCSIZE_PARAMS params = (LPNCCALCSIZE_PARAMS)lParam;
+			LPRECT r = (wParam == TRUE) ? &params->rgrc[0] : (LPRECT)lParam;
+			HMONITOR hMonitor = MonitorFromPoint({ (r->left + r->right) / 2, (r->top + r->bottom) / 2 }, MONITOR_DEFAULTTONEAREST);
+			if (hMonitor) {
+				MONITORINFO mi;
+				mi.cbSize = sizeof(mi);
+				if (GetMonitorInfo(hMonitor, &mi)) {
+					*r = mi.rcWork;
+					UINT uEdge = (UINT)-1;
+					if (IsTaskbarAutoHidden(&mi.rcMonitor, &uEdge)) {
+						switch (uEdge) {
+						case ABE_LEFT: r->left += 1; break;
+						case ABE_RIGHT: r->right -= 1; break;
+						case ABE_TOP: r->top += 1; break;
+						case ABE_BOTTOM: r->bottom -= 1; break;
+						}
+					}
+				}
+			}
+		}
 		if (result) *result = 0;
 		return true;
 	}

From b2047c955853c2b7a412625373a1ef9b6f0af423 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 18 Nov 2020 14:11:23 +0300
Subject: [PATCH 133/370] Fix first media viewer open zoom.

---
 .../media/view/media_view_overlay_widget.cpp   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 0f3f1a5f8..792d0a3d2 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -965,9 +965,9 @@ void OverlayWidget::resizeContentByScreenSize() {
 	const auto availableWidth = width();
 	const auto availableHeight = height() - 2 * skipHeight;
 	const auto countZoomFor = [&](int outerw, int outerh) {
-		auto result = float64(outerw) / _w;
-		if (_h * result > outerh) {
-			result = float64(outerh) / _h;
+		auto result = float64(outerw) / _width;
+		if (_height * result > outerh) {
+			result = float64(outerh) / _height;
 		}
 		if (result >= 1.) {
 			result -= 1.;
@@ -976,7 +976,7 @@ void OverlayWidget::resizeContentByScreenSize() {
 		}
 		return result;
 	};
-	if (_w > 0 && _h > 0) {
+	if (_width > 0 && _height > 0) {
 		_zoomToDefault = countZoomFor(availableWidth, availableHeight);
 		_zoomToScreen = countZoomFor(width(), height());
 	} else {
@@ -984,15 +984,15 @@ void OverlayWidget::resizeContentByScreenSize() {
 	}
 	const auto usew = _fullScreenVideo ? width() : availableWidth;
 	const auto useh = _fullScreenVideo ? height() : availableHeight;
-	if ((_w > usew) || (_h > useh) || _fullScreenVideo) {
+	if ((_width > usew) || (_height > useh) || _fullScreenVideo) {
 		const auto use = _fullScreenVideo ? _zoomToScreen : _zoomToDefault;
 		_zoom = kZoomToScreenLevel;
 		if (use >= 0) {
-			_w = qRound(_w * (use + 1));
-			_h = qRound(_h * (use + 1));
+			_w = qRound(_width * (use + 1));
+			_h = qRound(_height * (use + 1));
 		} else {
-			_w = qRound(_w / (-use + 1));
-			_h = qRound(_h / (-use + 1));
+			_w = qRound(_width / (-use + 1));
+			_h = qRound(_height / (-use + 1));
 		}
 	} else {
 		_zoom = 0;

From 76a7cc922958149f41d2ae75d2dba710eb4f94be Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 18 Nov 2020 03:46:03 +0400
Subject: [PATCH 134/370] Don't set screen for media viewer on Wayland

---
 .../SourceFiles/media/view/media_view_overlay_widget.cpp   | 7 ++++++-
 1 file changed, 6 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 792d0a3d2..fd5faa3d9 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -441,7 +441,12 @@ void OverlayWidget::moveToScreen() {
 		: nullptr;
 	const auto activeWindowScreen = widgetScreen(window);
 	const auto myScreen = widgetScreen(this);
-	if (activeWindowScreen && myScreen && myScreen != activeWindowScreen) {
+	// Wayland doesn't support positioning, but Qt emits screenChanged anyway
+	// and geometry of the widget become broken
+	if (activeWindowScreen
+		&& myScreen
+		&& myScreen != activeWindowScreen
+		&& !Platform::IsWayland()) {
 		windowHandle()->setScreen(activeWindowScreen);
 	}
 }

From c3b0e6c503f714ea53a8175fba785ddbf0045cea Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 18 Nov 2020 04:55:38 +0400
Subject: [PATCH 135/370] Move -s to CMAKE_EXE_LINKER_FLAGS

---
 .github/workflows/linux.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 0a528c0d4..1da535e15 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -103,8 +103,9 @@ jobs:
           fi
 
           ./configure.sh \
-          -D CMAKE_C_FLAGS="-Werror -s" \
-          -D CMAKE_CXX_FLAGS="-Werror -s" \
+          -D CMAKE_C_FLAGS="-Werror" \
+          -D CMAKE_CXX_FLAGS="-Werror" \
+          -D CMAKE_EXE_LINKER_FLAGS="-s" \
           -D TDESKTOP_API_TEST=ON \
           -D DESKTOP_APP_USE_PACKAGED=OFF \
           -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF \

From c98a3825a55d131bf1099e7cffd7ed24d988f27e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 18 Nov 2020 14:49:42 +0300
Subject: [PATCH 136/370] Fix sending bot commands from autocomplete.

---
 Telegram/SourceFiles/history/history_widget.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 9d9878ead..342199b28 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -3430,7 +3430,8 @@ void HistoryWidget::sendBotCommand(
 
 	bool lastKeyboardUsed = (_keyboard->forMsgId() == FullMsgId(_channel, _history->lastKeyboardId)) && (_keyboard->forMsgId() == FullMsgId(_channel, replyTo));
 
-	const auto toSend = replyTo
+	// 'bot' may be nullptr in case of sending from FieldAutocomplete.
+	const auto toSend = (replyTo || !bot)
 		? cmd
 		: HistoryView::WrapBotCommandInChat(_peer, cmd, bot);
 

From 1affb8172f144886d6eda6f297f6c7090329305a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 18 Nov 2020 19:15:26 +0300
Subject: [PATCH 137/370] Fix hime_qt build with -Werror.

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 55e04f5c2..f3e8278fb 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -12,7 +12,7 @@ RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
 RUN yum -y install https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-1.7-1.x86_64.rpm
 RUN yum -y install centos-release-scl
 
-RUN yum -y install git cmake3 zlib-devel gtk3-devel libICE-devel \
+RUN yum -y install git cmake3 zlib-devel gtk2-devel gtk3-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 \

From 00504b61cd595cb0889e27e7b31a0f0767f2dae4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 19 Nov 2020 16:23:51 +0300
Subject: [PATCH 138/370] Allow all messages silent in support mode.

---
 Telegram/SourceFiles/api/api_sending.cpp      |  8 ++---
 Telegram/SourceFiles/apiwrap.cpp              | 26 +++++-----------
 .../SourceFiles/history/history_message.cpp   | 31 +++++++++++++------
 .../SourceFiles/history/history_message.h     |  4 +++
 .../main/main_session_settings.cpp            |  6 ++++
 .../SourceFiles/main/main_session_settings.h  |  7 +++++
 .../platform/mac/specific_mac_p.mm            | 12 ++++---
 .../SourceFiles/settings/settings_chat.cpp    | 14 +++++++++
 8 files changed, 70 insertions(+), 38 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index 3ee6026f6..e2e370145 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -86,8 +86,7 @@ void SendExistingMedia(
 		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to_msg_id;
 	}
 	const auto anonymousPost = peer->amAnonymous();
-	const auto silentPost = message.action.options.silent
-		|| (peer->isBroadcast() && session->data().notifySilentPosts(peer));
+	const auto silentPost = ShouldSendSilent(peer, message.action.options);
 	InnerFillMessagePostFlags(message.action.options, peer, flags);
 	if (silentPost) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
@@ -261,8 +260,7 @@ bool SendDice(Api::MessageToSend &message) {
 	}
 	const auto replyHeader = NewMessageReplyHeader(message.action);
 	const auto anonymousPost = peer->amAnonymous();
-	const auto silentPost = message.action.options.silent
-		|| (peer->isBroadcast() && session->data().notifySilentPosts(peer));
+	const auto silentPost = ShouldSendSilent(peer, message.action.options);
 	InnerFillMessagePostFlags(message.action.options, peer, flags);
 	if (silentPost) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
@@ -403,7 +401,7 @@ void SendConfirmedFile(
 	}
 	const auto replyHeader = NewMessageReplyHeader(action);
 	const auto anonymousPost = peer->amAnonymous();
-	const auto silentPost = file->to.options.silent;
+	const auto silentPost = ShouldSendSilent(peer, file->to.options);
 	Api::FillMessagePostFlags(action, peer, flags);
 	if (silentPost) {
 		flags |= MTPDmessage::Flag::f_silent;
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 0f6ee2581..fb1a263e4 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3955,8 +3955,7 @@ void ApiWrap::forwardMessages(
 	histories.readInbox(history);
 
 	const auto anonymousPost = peer->amAnonymous();
-	const auto silentPost = action.options.silent
-		|| (peer->isBroadcast() && _session->data().notifySilentPosts(peer));
+	const auto silentPost = ShouldSendSilent(peer, action.options);
 
 	auto flags = MTPDmessage::Flags(0);
 	auto clientFlags = MTPDmessage_ClientFlags();
@@ -4155,11 +4154,7 @@ void ApiWrap::sendSharedContact(
 		MTP_string(firstName),
 		MTP_string(lastName),
 		MTP_string(vcard));
-	auto options = action.options;
-	if (_session->data().notifySilentPosts(peer)) {
-		options.silent = true;
-	}
-	sendMedia(item, media, options);
+	sendMedia(item, media, action.options);
 
 	_session->data().sendHistoryChangeNotifications();
 	_session->changes().historyUpdated(
@@ -4374,8 +4369,7 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 			flags |= MTPDmessage::Flag::f_media;
 		}
 		const auto anonymousPost = peer->amAnonymous();
-		const auto silentPost = action.options.silent
-			|| (peer->isBroadcast() && _session->data().notifySilentPosts(peer));
+		const auto silentPost = ShouldSendSilent(peer, action.options);
 		FillMessagePostFlags(action, peer, flags);
 		if (silentPost) {
 			sendFlags |= MTPmessages_SendMessage::Flag::f_silent;
@@ -4516,8 +4510,7 @@ void ApiWrap::sendInlineResult(
 		sendFlags |= MTPmessages_SendInlineBotResult::Flag::f_reply_to_msg_id;
 	}
 	const auto anonymousPost = peer->amAnonymous();
-	const auto silentPost = action.options.silent
-		|| (peer->isBroadcast() && _session->data().notifySilentPosts(peer));
+	const auto silentPost = ShouldSendSilent(peer, action.options);
 	FillMessagePostFlags(action, peer, flags);
 	if (silentPost) {
 		sendFlags |= MTPmessages_SendInlineBotResult::Flag::f_silent;
@@ -4683,7 +4676,7 @@ void ApiWrap::sendMediaWithRandomId(
 		| (replyTo
 			? MTPmessages_SendMedia::Flag::f_reply_to_msg_id
 			: MTPmessages_SendMedia::Flag(0))
-		| (options.silent
+		| (ShouldSendSilent(history->peer, options)
 			? MTPmessages_SendMedia::Flag::f_silent
 			: MTPmessages_SendMedia::Flag(0))
 		| (!sentEntities.v.isEmpty()
@@ -4790,7 +4783,7 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 		| (replyTo
 			? MTPmessages_SendMultiMedia::Flag::f_reply_to_msg_id
 			: MTPmessages_SendMultiMedia::Flag(0))
-		| (album->options.silent
+		| (ShouldSendSilent(history->peer, album->options)
 			? MTPmessages_SendMultiMedia::Flag::f_silent
 			: MTPmessages_SendMultiMedia::Flag(0))
 		| (album->options.scheduled
@@ -4828,10 +4821,6 @@ void ApiWrap::sendAlbumIfReady(not_null<SendingAlbum*> album) {
 
 FileLoadTo ApiWrap::fileLoadTaskOptions(const SendAction &action) const {
 	const auto peer = action.history->peer;
-	auto options = action.options;
-	if (_session->data().notifySilentPosts(peer)) {
-		options.silent = true;
-	}
 	return FileLoadTo(peer->id, action.options, action.replyTo);
 }
 
@@ -5261,8 +5250,7 @@ void ApiWrap::createPoll(
 		history->clearLocalDraft();
 		history->clearCloudDraft();
 	}
-	const auto silentPost = action.options.silent
-		|| (peer->isBroadcast() && _session->data().notifySilentPosts(peer));
+	const auto silentPost = ShouldSendSilent(peer, action.options);
 	if (silentPost) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
 	}
diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp
index 59f165f47..0185d871d 100644
--- a/Telegram/SourceFiles/history/history_message.cpp
+++ b/Telegram/SourceFiles/history/history_message.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_media.h" // AddTimestampLinks.
 #include "chat_helpers/stickers_emoji_pack.h"
 #include "main/main_session.h"
+#include "main/main_session_settings.h"
 #include "api/api_updates.h"
 #include "boxes/share_box.h"
 #include "boxes/confirm_box.h"
@@ -277,11 +278,8 @@ void FastShareMessage(not_null<HistoryItem*> item) {
 			return;
 		}
 
-		const auto sendFlags = MTPmessages_ForwardMessages::Flag(0)
+		const auto commonSendFlags = MTPmessages_ForwardMessages::Flag(0)
 			| MTPmessages_ForwardMessages::Flag::f_with_my_score
-			| (options.silent
-				? MTPmessages_ForwardMessages::Flag::f_silent
-				: MTPmessages_ForwardMessages::Flag(0))
 			| (options.scheduled
 				? MTPmessages_ForwardMessages::Flag::f_schedule_date
 				: MTPmessages_ForwardMessages::Flag(0));
@@ -311,13 +309,17 @@ void FastShareMessage(not_null<HistoryItem*> item) {
 			}
 			histories.sendRequest(history, requestType, [=](Fn<void()> finish) {
 				auto &api = history->session().api();
+				const auto sendFlags = commonSendFlags
+					| (ShouldSendSilent(peer, options)
+						? MTPmessages_ForwardMessages::Flag::f_silent
+						: MTPmessages_ForwardMessages::Flag(0));
 				history->sendRequestId = api.request(MTPmessages_ForwardMessages(
-						MTP_flags(sendFlags),
-						data->peer->input,
-						MTP_vector<MTPint>(msgIds),
-						MTP_vector<MTPlong>(generateRandom()),
-						peer->input,
-						MTP_int(options.scheduled)
+					MTP_flags(sendFlags),
+					data->peer->input,
+					MTP_vector<MTPint>(msgIds),
+					MTP_vector<MTPlong>(generateRandom()),
+					peer->input,
+					MTP_int(options.scheduled)
 				)).done([=](const MTPUpdates &updates, mtpRequestId requestId) {
 					history->session().api().applyUpdates(updates);
 					data->requests.remove(requestId);
@@ -375,6 +377,15 @@ MTPDmessage::Flags NewMessageFlags(not_null<PeerData*> peer) {
 	return result;
 }
 
+bool ShouldSendSilent(
+		not_null<PeerData*> peer,
+		const Api::SendOptions &options) {
+	return options.silent
+		|| (peer->isBroadcast() && peer->owner().notifySilentPosts(peer))
+		|| (peer->session().supportMode()
+			&& peer->session().settings().supportAllSilent());
+}
+
 MsgId LookupReplyToTop(not_null<History*> history, MsgId replyToId) {
 	const auto &owner = history->owner();
 	if (const auto item = owner.message(history->channelId(), replyToId)) {
diff --git a/Telegram/SourceFiles/history/history_message.h b/Telegram/SourceFiles/history/history_message.h
index 610b6044f..5bfc295d7 100644
--- a/Telegram/SourceFiles/history/history_message.h
+++ b/Telegram/SourceFiles/history/history_message.h
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Api {
 struct SendAction;
+struct SendOptions;
 } // namespace Api
 
 namespace HistoryView {
@@ -24,6 +25,9 @@ struct HistoryMessageViews;
 [[nodiscard]] Fn<void(ChannelData*, MsgId)> HistoryDependentItemCallback(
 	not_null<HistoryItem*> item);
 [[nodiscard]] MTPDmessage::Flags NewMessageFlags(not_null<PeerData*> peer);
+[[nodiscard]] bool ShouldSendSilent(
+	not_null<PeerData*> peer,
+	const Api::SendOptions &options);
 [[nodiscard]] MTPDmessage_ClientFlags NewMessageClientFlags();
 [[nodiscard]] MsgId LookupReplyToTop(
 	not_null<History*> history,
diff --git a/Telegram/SourceFiles/main/main_session_settings.cpp b/Telegram/SourceFiles/main/main_session_settings.cpp
index e97770cbf..f38f2e3e4 100644
--- a/Telegram/SourceFiles/main/main_session_settings.cpp
+++ b/Telegram/SourceFiles/main/main_session_settings.cpp
@@ -69,6 +69,7 @@ QByteArray SessionSettings::serialize() const {
 			stream << quint64(key) << qint32(value);
 		}
 		stream << qint32(_dialogsFiltersEnabled ? 1 : 0);
+		stream << qint32(_supportAllSilent ? 1 : 0);
 	}
 	return result;
 }
@@ -127,6 +128,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	qint32 appAutoDownloadDictionaries = app.autoDownloadDictionaries() ? 1 : 0;
 	base::flat_map<PeerId, MsgId> hiddenPinnedMessages;
 	qint32 dialogsFiltersEnabled = _dialogsFiltersEnabled ? 1 : 0;
+	qint32 supportAllSilent = _supportAllSilent ? 1 : 0;
 
 	stream >> versionTag;
 	if (versionTag == kVersionTag) {
@@ -321,6 +323,9 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> dialogsFiltersEnabled;
 	}
+	if (!stream.atEnd()) {
+		stream >> supportAllSilent;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for SessionSettings::addFromSerialized()"));
@@ -362,6 +367,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	_mediaLastPlaybackPosition = std::move(mediaLastPlaybackPosition);
 	_hiddenPinnedMessages = std::move(hiddenPinnedMessages);
 	_dialogsFiltersEnabled = (dialogsFiltersEnabled == 1);
+	_supportAllSilent = (supportAllSilent == 1);
 
 	if (version < 2) {
 		app.setLastSeenWarningSeen(appLastSeenWarningSeen == 1);
diff --git a/Telegram/SourceFiles/main/main_session_settings.h b/Telegram/SourceFiles/main/main_session_settings.h
index e8c8b1552..2cd331e7e 100644
--- a/Telegram/SourceFiles/main/main_session_settings.h
+++ b/Telegram/SourceFiles/main/main_session_settings.h
@@ -51,6 +51,12 @@ public:
 	void setSupportAllSearchResults(bool all);
 	[[nodiscard]] bool supportAllSearchResults() const;
 	[[nodiscard]] rpl::producer<bool> supportAllSearchResultsValue() const;
+	void setSupportAllSilent(bool enabled) {
+		_supportAllSilent = enabled;
+	}
+	[[nodiscard]] bool supportAllSilent() const {
+		return _supportAllSilent;
+	}
 
 	[[nodiscard]] ChatHelpers::SelectorTab selectorTab() const {
 		return _selectorTab;
@@ -131,6 +137,7 @@ private:
 	Support::SwitchSettings _supportSwitch;
 	bool _supportFixChatsOrder = true;
 	bool _supportTemplatesAutocomplete = true;
+	bool _supportAllSilent = false;
 	rpl::variable<int> _supportChatsTimeSlice
 		= kDefaultSupportChatsLimitSlice;
 	rpl::variable<bool> _supportAllSearchResults = false;
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
index e53afe424..5fdf9397a 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
@@ -158,11 +158,15 @@ ApplicationDelegate *_sharedDelegate = nil;
 	if (!Core::IsAppLaunched()) {
 		return;
 	}
-	Core::App().checkLocalTime();
+	Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+		Core::App().checkLocalTime();
 
-	LOG(("Audio Info: "
-		"-receiveWakeNote: received, scheduling detach from audio device"));
-	Media::Audio::ScheduleDetachFromDeviceSafe();
+		LOG(("Audio Info: "
+			"-receiveWakeNote: received, scheduling detach from audio device"));
+		Media::Audio::ScheduleDetachFromDeviceSafe();
+
+		Core::App().settings().setSystemDarkMode(Platform::IsDarkMode());
+	});
 }
 
 - (void) setWatchingMediaKeys:(bool)watching {
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index a27a33f60..ac92f78cb 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -1419,6 +1419,20 @@ void SetupSupport(
 		controller->session().saveSettingsDelayed();
 	}, inner->lifetime());
 
+	inner->add(
+		object_ptr<Ui::Checkbox>(
+			inner,
+			"Send all messages without sound",
+			controller->session().settings().supportAllSilent(),
+			st::settingsCheckbox),
+		st::settingsSendTypePadding
+	)->checkedChanges(
+	) | rpl::start_with_next([=](bool checked) {
+		controller->session().settings().setSupportAllSilent(
+			checked);
+		controller->session().saveSettingsDelayed();
+	}, inner->lifetime());
+
 	AddSkip(inner, st::settingsCheckboxesSkip);
 
 	AddSubsectionTitle(inner, rpl::single(qsl("Load chats for a period")));

From 639e6d8e280a13cd8fb4c751236d366ab9c681ad Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 19 Nov 2020 15:37:23 +0300
Subject: [PATCH 139/370] Fix sending albums in slowmode groups.

Fixes #9106.
---
 Telegram/SourceFiles/boxes/send_files_box.cpp            | 9 +++++----
 Telegram/SourceFiles/media/audio/media_audio_capture.cpp | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index e7d1f80be..0a943a356 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -280,8 +280,9 @@ void SendFilesBox::enqueueNextPrepare() {
 	}
 	while (!_list.filesToProcess.empty()
 		&& _list.filesToProcess.front().information) {
-		addFile(std::move(_list.filesToProcess.front()));
+		auto file = std::move(_list.filesToProcess.front());
 		_list.filesToProcess.pop_front();
+		addFile(std::move(file));
 	}
 	if (_list.filesToProcess.empty()) {
 		return;
@@ -638,9 +639,6 @@ void SendFilesBox::setupSendWayControls() {
 }
 
 void SendFilesBox::updateSendWayControlsVisibility() {
-	if (_sendLimit == SendLimit::One) {
-		return;
-	}
 	const auto onlyOne = (_sendLimit == SendLimit::One);
 	_groupFiles->setVisible(_list.hasGroupOption(onlyOne));
 	_sendImagesAsPhotos->setVisible(
@@ -817,10 +815,13 @@ void SendFilesBox::addPreparedAsyncFile(Ui::PreparedFile &&file) {
 }
 
 void SendFilesBox::addFile(Ui::PreparedFile &&file) {
+	// canBeSentInSlowmode checks for non empty filesToProcess.
+	auto saved = base::take(_list.filesToProcess);
 	_list.files.push_back(std::move(file));
 	if (_sendLimit == SendLimit::One && !_list.canBeSentInSlowmode()) {
 		_list.files.pop_back();
 	}
+	_list.filesToProcess = std::move(saved);
 }
 
 void SendFilesBox::refreshTitleText() {
diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
index 06df89bb2..a5965e0d1 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
@@ -63,7 +63,7 @@ private:
 	Fn<void()> _error;
 
 	struct Private;
-	std::unique_ptr<Private> d;
+	const std::unique_ptr<Private> d;
 	base::Timer _timer;
 	QByteArray _captured;
 

From a086afb152ff3c702751998f3d5f22e8ba301fa0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 19 Nov 2020 16:47:12 +0300
Subject: [PATCH 140/370] Fix legacy group service message in chats list.

---
 Telegram/SourceFiles/history/history_service.cpp          | 5 +++--
 Telegram/SourceFiles/platform/linux/main_window_linux.cpp | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index bda13ceac..69460be8d 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -818,8 +818,9 @@ void HistoryService::updateDependentText() {
 
 	setServiceText(text);
 	history()->owner().requestItemResize(this);
-	if (history()->textCachedFor == this) {
-		history()->textCachedFor = nullptr;
+	const auto inDialogsHistory = history()->migrateToOrMe();
+	if (inDialogsHistory->textCachedFor == this) {
+		inDialogsHistory->textCachedFor = nullptr;
 	}
 	//if (const auto feed = history()->peer->feed()) { // #TODO archive
 	//	if (feed->textCachedFor == this) {
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index a85bdbab0..45d4b7736 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -579,8 +579,6 @@ void MainWindow::psTrayMenuUpdated() {
 
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 void MainWindow::setSNITrayIcon(int counter, bool muted) {
-	const auto iconName = GetTrayIconName(counter, muted);
-
 	if (IsIndicatorApplication()) {
 		if (!IsIconRegenerationNeeded(counter, muted)
 			&& _trayIconFile

From b1ed15447b4e8618c4a241186d4e9c5234460485 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 19 Nov 2020 17:01:50 +0300
Subject: [PATCH 141/370] Scroll to bottom when sending a poll.

---
 Telegram/SourceFiles/apiwrap.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index fb1a263e4..29a91fb31 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -5273,6 +5273,11 @@ void ApiWrap::createPoll(
 			MTP_int(action.options.scheduled)
 		)).done([=](const MTPUpdates &result) mutable {
 			applyUpdates(result);
+			_session->changes().historyUpdated(
+				history,
+				(action.options.scheduled
+					? Data::HistoryUpdate::Flag::ScheduledSent
+					: Data::HistoryUpdate::Flag::MessageSent));
 			done();
 			finish();
 		}).fail([=](const RPCError &error) mutable {

From fff2ee2758365489ad1e1a6f3b120cfa3eb163cf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 19 Nov 2020 17:16:25 +0300
Subject: [PATCH 142/370] Use 'Next' in send media box in Scheduled section.

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

diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 0a943a356..041ae00e5 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -330,7 +330,11 @@ void SendFilesBox::setupShadows() {
 }
 
 void SendFilesBox::prepare() {
-	_send = addButton(tr::lng_send_button(), [=] { send({}); });
+	_send = addButton(
+		(_sendType == Api::SendType::Normal
+			? tr::lng_send_button()
+			: tr::lng_create_group_next()),
+		[=] { send({}); });
 	if (_sendType == Api::SendType::Normal) {
 		SendMenu::SetupMenuAndShortcuts(
 			_send,

From 51f960442ec3dfd9a9b5040ded6993a738dade72 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 19 Nov 2020 17:42:57 +0300
Subject: [PATCH 143/370] Make caption area height bigger.

---
 Telegram/SourceFiles/boxes/boxes.style | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 2269c450d..95e70e64b 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -446,7 +446,7 @@ autoDownloadLimitPadding: margins(22px, 8px, 22px, 8px);
 
 confirmCaptionArea: InputField(defaultInputField) {
 	textMargins: margins(1px, 26px, 31px, 4px);
-	heightMax: 78px;
+	heightMax: 158px;
 }
 confirmBg: windowBgOver;
 confirmMaxHeight: 245px;

From e29ee439cf97ad4dbaf1aba424c16a2503c8c732 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 19 Nov 2020 17:59:43 +0300
Subject: [PATCH 144/370] Improve media viewer hiding workaround on macOS.

---
 .../media/view/media_view_overlay_widget.cpp  | 42 ++++++++++---------
 .../media/view/media_view_overlay_widget.h    |  2 +
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index fd5faa3d9..1036ae393 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -4295,8 +4295,31 @@ bool OverlayWidget::eventFilter(QObject *obj, QEvent *e) {
 	return OverlayParent::eventFilter(obj, e);
 }
 
+void OverlayWidget::applyHideWindowWorkaround() {
+#ifdef USE_OPENGL_OVERLAY_WIDGET
+	// QOpenGLWidget can't properly destroy a child widget if
+	// it is hidden exactly after that, so it must be repainted
+	// before it is hidden without the child widget.
+	if (!isHidden()) {
+		_dropdown->hideFast();
+		hideChildren();
+		_wasRepainted = false;
+		repaint();
+		if (!_wasRepainted) {
+			// Qt has some optimization to prevent too frequent repaints.
+			// If the previous repaint was less than 1/60 second it silently
+			// converts repaint() call to an update() call. But we have to
+			// repaint right now, before hide(), with _streamingControls destroyed.
+			auto event = QEvent(QEvent::UpdateRequest);
+			QApplication::sendEvent(this, &event);
+		}
+	}
+#endif // USE_OPENGL_OVERLAY_WIDGET
+}
+
 void OverlayWidget::setVisibleHook(bool visible) {
 	if (!visible) {
+		applyHideWindowWorkaround();
 		_sharedMedia = nullptr;
 		_sharedMediaData = std::nullopt;
 		_sharedMediaDataKey = std::nullopt;
@@ -4313,25 +4336,6 @@ void OverlayWidget::setVisibleHook(bool visible) {
 		_controlsOpacity = anim::value(1, 1);
 		_groupThumbs = nullptr;
 		_groupThumbsRect = QRect();
-#ifdef USE_OPENGL_OVERLAY_WIDGET
-		// QOpenGLWidget can't properly destroy a child widget if
-		// it is hidden exactly after that, so it must be repainted
-		// before it is hidden without the child widget.
-		if (!isHidden()) {
-			_dropdown->hideFast();
-			hideChildren();
-			_wasRepainted = false;
-			repaint();
-			if (!_wasRepainted) {
-				// Qt has some optimization to prevent too frequent repaints.
-				// If the previous repaint was less than 1/60 second it silently
-				// converts repaint() call to an update() call. But we have to
-				// repaint right now, before hide(), with _streamingControls destroyed.
-				auto event = QEvent(QEvent::UpdateRequest);
-				QApplication::sendEvent(this, &event);
-			}
-		}
-#endif // USE_OPENGL_OVERLAY_WIDGET
 	}
 	OverlayParent::setVisibleHook(visible);
 	if (visible) {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 194659f40..88e0b663e 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -372,6 +372,8 @@ private:
 	void clearStreaming(bool savePosition = true);
 	bool canInitStreaming() const;
 
+	void applyHideWindowWorkaround();
+
 	QBrush _transparentBrush;
 
 	Main::Session *_session = nullptr;

From 1758f0fd8f44a1cce54feaefd7f53fb468e14b04 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 19 Nov 2020 00:44:17 +0300
Subject: [PATCH 145/370] Added send icon to VoiceRecordButton.

---
 Telegram/Resources/langs/lang.strings         |  2 +-
 .../history_view_voice_record_bar.cpp         |  4 +-
 .../history_view_voice_record_button.cpp      | 47 +++++++++++++++++--
 .../history_view_voice_record_button.h        |  8 ++++
 Telegram/SourceFiles/ui/chat/chat.style       |  1 +
 5 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 086802bfa..b6dddb980 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1342,7 +1342,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_broadcast_silent_ph" = "Silent broadcast...";
 "lng_send_anonymous_ph" = "Send anonymously...";
 "lng_record_cancel" = "Release outside this field to cancel";
-"lng_record_lock_cancel" = "Click outside of microphone button to cancel";
+"lng_record_lock_cancel" = "Click outside of circle to cancel";
 "lng_record_lock_cancel_sure" = "Are you sure you want to stop recording and discard your voice message?";
 "lng_record_lock_discard" = "Discard";
 "lng_will_be_notified" = "Members will be notified when you post";
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 186a09c9e..d16acb2d0 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1074,6 +1074,7 @@ void VoiceRecordBar::init() {
 	_lock->locks(
 	) | rpl::start_with_next([=] {
 		installClickOutsideFilter();
+		_level->setType(VoiceRecordButton::Type::Send);
 
 		_level->clicks(
 		) | rpl::start_with_next([=] {
@@ -1102,7 +1103,8 @@ void VoiceRecordBar::init() {
 			TextParseOptions{ TextParseMultiline, 0, 0, direction });
 
 		updateMessageGeometry();
-		update(_messageRect);
+		// Update a whole widget to clear a previous text.
+		update();
 	}, lifetime());
 
 	_send->events(
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index 64ef1e235..a8bcc7036 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -213,8 +213,6 @@ private:
 	void initEnterIdleAnimation(rpl::producer<crl::time> animationTicked);
 	void initFlingAnimation(rpl::producer<crl::time> animationTicked);
 
-	Ui::Animations::Simple _flingAnimation;
-
 	const std::unique_ptr<CircleBezier> _circleBezier;
 
 	const float _rotationOffset;
@@ -652,6 +650,10 @@ void VoiceRecordButton::requestPaintLevel(quint16 level) {
 void VoiceRecordButton::init() {
 	const auto hasProgress = [](auto value) { return value != 0.; };
 
+	const auto stateChangedAnimation =
+		lifetime().make_state<Ui::Animations::Simple>();
+	const auto currentState = lifetime().make_state<Type>(_state.current());
+
 	paintRequest(
 	) | rpl::start_with_next([=](const QRect &clip) {
 		Painter p(this);
@@ -674,8 +676,29 @@ void VoiceRecordButton::init() {
 		if (!complete) {
 			p.setOpacity(progress);
 		}
-		st::historyRecordVoiceActive.paintInCenter(p, rect());
 
+		// Paint icon.
+		{
+			const auto stateProgress = stateChangedAnimation->value(0.);
+			const auto scale = (std::cos(M_PI * 2 * stateProgress) + 1.) * .5;
+			p.translate(_center, _center);
+			if (scale < 1.) {
+				p.scale(scale, scale);
+			}
+			const auto state = *currentState;
+			const auto icon = (state == Type::Send)
+				? st::historySendIcon
+				: st::historyRecordVoiceActive;
+			const auto position = (state == Type::Send)
+				? st::historyRecordSendIconPosition
+				: QPoint(0, 0);
+			icon.paint(
+				p,
+				-icon.width() / 2 + position.x(),
+				-icon.height() / 2 + position.y(),
+				0,
+				st::historyRecordVoiceFgActiveIcon->c);
+		}
 	}, lifetime());
 
 	rpl::merge(
@@ -689,6 +712,7 @@ void VoiceRecordButton::init() {
 			_recordingAnimation.stop();
 			_showProgress = 0.;
 			_recordCircle->reset();
+			_state = Type::Record;
 		} else {
 			if (!_recordingAnimation.animating()) {
 				_recordingAnimation.start();
@@ -701,6 +725,19 @@ void VoiceRecordButton::init() {
 	) | rpl::start_with_next([=](bool active) {
 		setPointerCursor(active);
 	}, lifetime());
+
+	_state.changes(
+	) | rpl::start_with_next([=](Type newState) {
+		const auto to = 1.;
+		auto callback = [=](float64 value) {
+			if (value >= (to * .5)) {
+				*currentState = newState;
+			}
+			update();
+		};
+		const auto duration = st::historyRecordVoiceDuration * 2;
+		stateChangedAnimation->start(std::move(callback), 0., to, duration);
+	}, lifetime());
 }
 
 rpl::producer<bool> VoiceRecordButton::actives() const {
@@ -745,4 +782,8 @@ void VoiceRecordButton::requestPaintColor(float64 progress) {
 	update();
 }
 
+void VoiceRecordButton::setType(Type state) {
+	_state = state;
+}
+
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
index 27d0068eb..beb96d0d4 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
@@ -22,6 +22,13 @@ public:
 		rpl::producer<> leaveWindowEventProducer);
 	~VoiceRecordButton();
 
+	enum class Type {
+		Send,
+		Record,
+	};
+
+	void setType(Type state);
+
 	void requestPaintColor(float64 progress);
 	void requestPaintProgress(float64 progress);
 	void requestPaintLevel(quint16 level);
@@ -41,6 +48,7 @@ private:
 	rpl::variable<float64> _showProgress = 0.;
 	rpl::variable<float64> _colorProgress = 0.;
 	rpl::variable<bool> _inCircle = false;
+	rpl::variable<Type> _state = Type::Record;
 
 	// This can animate for a very long time (like in music playing),
 	// so it should be a Basic, not a Simple animation.
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index efdd96ce6..f7ca7a972 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -336,6 +336,7 @@ historyRecordVoiceDuration: 120;
 historyRecordVoice: icon {{ "send_control_record", historyRecordVoiceFg }};
 historyRecordVoiceOver: icon {{ "send_control_record", historyRecordVoiceFgOver }};
 historyRecordVoiceActive: icon {{ "send_control_record_active", historyRecordVoiceFgActiveIcon }};
+historyRecordSendIconPosition: point(2px, 0px);
 historyRecordVoiceRippleBgActive: lightButtonBgOver;
 historyRecordSignalRadius: 5px;
 historyRecordCancel: windowSubTextFg;

From cbaca6382ec43767a113e8f0877a01d9c095d800 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 19 Nov 2020 01:27:10 +0300
Subject: [PATCH 146/370] Fixed unwanted flickering of record button when
 recorded data is empty.

---
 .../history/view/controls/history_view_voice_record_bar.cpp    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index d16acb2d0..6bcca8844 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1280,6 +1280,9 @@ void VoiceRecordBar::recordUpdated(quint16 level, int samples) {
 }
 
 void VoiceRecordBar::stop(bool send) {
+	if (isHidden() && !send) {
+		return;
+	}
 	auto disappearanceCallback = [=] {
 		hide();
 

From f75fb33c29bc801f9d72c78c942e786bf0d29f3e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 19 Nov 2020 01:33:13 +0300
Subject: [PATCH 147/370] Removed delay for voice lock widget appearing.

---
 .../view/controls/history_view_voice_record_bar.cpp      | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 6bcca8844..05226bce0 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1218,19 +1218,14 @@ void VoiceRecordBar::startRecording() {
 			return;
 		}
 
-		const auto shown = _recordingLifetime.make_state<bool>(false);
+		_lockShowing = true;
+		startRedCircleAnimation();
 
 		_recording = true;
 		_controller->widget()->setInnerFocus();
 		instance()->start();
 		instance()->updated(
 		) | rpl::start_with_next_error([=](const Update &update) {
-			if (!(*shown) && !_showAnimation.animating()) {
-				// Show the lock widget after the first successful update.
-				*shown = true;
-				_lockShowing = true;
-				startRedCircleAnimation();
-			}
 			recordUpdated(update.level, update.samples);
 		}, [=] {
 			stop(false);

From a6e4ac679c09908593e11b8069e644d63a2e8040 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 19 Nov 2020 05:15:42 +0300
Subject: [PATCH 148/370] Fixed reply stuck display at sending voice in Replies
 section.

---
 .../SourceFiles/history/view/history_view_replies_section.cpp  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 9e7e59245..b8b780501 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -888,6 +888,9 @@ void RepliesWidget::sendVoice(ComposeControls::VoiceToSend &&data) {
 		data.waveform,
 		data.duration,
 		std::move(action));
+
+	_composeControls->cancelReplyMessage();
+	finishSending();
 }
 
 void RepliesWidget::send(Api::SendOptions options) {

From e1017380ec96bac6c67005d01d96cd836c8c62df Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 19 Nov 2020 05:58:23 +0300
Subject: [PATCH 149/370] Fixed filling menu with send options for inline bots
 and autocomplete.

---
 .../chat_helpers/field_autocomplete.cpp          | 16 +++++++++++++++-
 .../chat_helpers/field_autocomplete.h            |  6 ++++++
 .../controls/history_view_compose_controls.cpp   |  3 +++
 .../inline_bots/inline_results_inner.cpp         |  8 +++++++-
 .../inline_bots/inline_results_inner.h           |  6 ++++++
 .../inline_bots/inline_results_widget.cpp        |  4 ++++
 .../inline_bots/inline_results_widget.h          |  5 +++++
 7 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 3c6100de8..95b68324b 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -68,6 +68,7 @@ public:
 		Api::SendOptions options = Api::SendOptions()) const;
 
 	void setRecentInlineBotsInRows(int32 bots);
+	void setSendMenuType(Fn<SendMenu::Type()> &&callback);
 	void rowsUpdated();
 
 	rpl::producer<FieldAutocomplete::MentionChosen> mentionChosen() const;
@@ -121,6 +122,8 @@ private:
 
 	bool _previewShown = false;
 
+	Fn<SendMenu::Type()> _sendMenuType;
+
 	rpl::event_stream<FieldAutocomplete::MentionChosen> _mentionChosen;
 	rpl::event_stream<FieldAutocomplete::HashtagChosen> _hashtagChosen;
 	rpl::event_stream<FieldAutocomplete::BotCommandChosen> _botCommandChosen;
@@ -686,6 +689,10 @@ bool FieldAutocomplete::chooseSelected(ChooseMethod method) const {
 	return _inner->chooseSelected(method);
 }
 
+void FieldAutocomplete::setSendMenuType(Fn<SendMenu::Type()> &&callback) {
+	_inner->setSendMenuType(std::move(callback));
+}
+
 bool FieldAutocomplete::eventFilter(QObject *obj, QEvent *e) {
 	auto hidden = isHidden();
 	auto moderate = Core::App().settings().moderateModeEnabled();
@@ -1116,7 +1123,9 @@ void FieldAutocomplete::Inner::contextMenuEvent(QContextMenuEvent *e) {
 		return;
 	}
 	const auto index = _sel;
-	const auto type = SendMenu::Type::Scheduled;
+	const auto type = _sendMenuType
+		? _sendMenuType()
+		: SendMenu::Type::Disabled;
 	const auto method = FieldAutocomplete::ChooseMethod::ByClick;
 	_menu = base::make_unique_q<Ui::PopupMenu>(this);
 
@@ -1301,6 +1310,11 @@ void FieldAutocomplete::Inner::showPreview() {
 	}
 }
 
+void FieldAutocomplete::Inner::setSendMenuType(
+		Fn<SendMenu::Type()> &&callback) {
+	_sendMenuType = std::move(callback);
+}
+
 auto FieldAutocomplete::Inner::mentionChosen() const
 -> rpl::producer<FieldAutocomplete::MentionChosen> {
 	return _mentionChosen.events();
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
index 8adbaa2c3..cbd593275 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
@@ -33,6 +33,11 @@ class DocumentMedia;
 class CloudImageView;
 } // namespace Data
 
+namespace SendMenu {
+enum class Type;
+} // namespace SendMenu
+
+
 class FieldAutocomplete final : public Ui::RpWidget {
 public:
 	FieldAutocomplete(
@@ -98,6 +103,7 @@ public:
 	void setModerateKeyActivateCallback(Fn<bool(int)> callback) {
 		_moderateKeyActivateCallback = std::move(callback);
 	}
+	void setSendMenuType(Fn<SendMenu::Type()> &&callback);
 
 	void hideFast();
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index bc753817b..74af9ba30 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1120,6 +1120,8 @@ void ComposeControls::initAutocomplete() {
 		});
 	}, _autocomplete->lifetime());
 
+	_autocomplete->setSendMenuType([=] { return sendMenuType(); });
+
 	//_autocomplete->setModerateKeyActivateCallback([=](int key) {
 	//	return _keyboard->isHidden()
 	//		? false
@@ -2187,6 +2189,7 @@ void ComposeControls::applyInlineBotQuery(
 					InlineBots::ResultSelected result) {
 				_inlineResultChosen.fire_copy(result);
 			});
+			_inlineResults->setSendMenuType([=] { return sendMenuType(); });
 			_inlineResults->requesting(
 			) | rpl::start_with_next([=](bool requesting) {
 				_tabbedSelectorToggle->setLoading(requesting);
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
index 6074ab1f3..e36111c43 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
@@ -290,7 +290,9 @@ void Inner::contextMenuEvent(QContextMenuEvent *e) {
 	}
 	const auto row = _selected / MatrixRowShift;
 	const auto column = _selected % MatrixRowShift;
-	const auto type = SendMenu::Type::Scheduled;
+	const auto type = _sendMenuType
+		? _sendMenuType()
+		: SendMenu::Type::Disabled;
 
 	_menu = base::make_unique_q<Ui::PopupMenu>(this);
 
@@ -765,5 +767,9 @@ void Inner::switchPm() {
 	}
 }
 
+void Inner::setSendMenuType(Fn<SendMenu::Type()> &&callback) {
+	_sendMenuType = std::move(callback);
+}
+
 } // namespace Layout
 } // namespace InlineBots
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.h b/Telegram/SourceFiles/inline_bots/inline_results_inner.h
index 6f2e1ab3a..bcf58a49d 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_inner.h
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.h
@@ -40,6 +40,10 @@ class Result;
 struct ResultSelected;
 } // namespace InlineBots
 
+namespace SendMenu {
+enum class Type;
+} // namespace SendMenu
+
 namespace InlineBots {
 namespace Layout {
 
@@ -87,6 +91,7 @@ public:
 	void setCurrentDialogsEntryState(Dialogs::EntryState state) {
 		_currentDialogsEntryState = state;
 	}
+	void setSendMenuType(Fn<SendMenu::Type()> &&callback);
 
 	// Ui::AbstractTooltipShower interface.
 	QString tooltipText() const override;
@@ -179,6 +184,7 @@ private:
 	bool _previewShown = false;
 
 	Fn<void(ResultSelected)> _resultSelectedCallback;
+	Fn<SendMenu::Type()> _sendMenuType;
 
 };
 
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
index 7f94c480a..2878c3166 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
@@ -237,6 +237,10 @@ void Widget::setResultSelectedCallback(Fn<void(ResultSelected)> callback) {
 	_inner->setResultSelectedCallback(std::move(callback));
 }
 
+void Widget::setSendMenuType(Fn<SendMenu::Type()> &&callback) {
+	_inner->setSendMenuType(std::move(callback));
+}
+
 void Widget::setCurrentDialogsEntryState(Dialogs::EntryState state) {
 	_inner->setCurrentDialogsEntryState(state);
 }
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.h b/Telegram/SourceFiles/inline_bots/inline_results_widget.h
index 62c4acd4f..d8fe739bf 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.h
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.h
@@ -43,6 +43,10 @@ class Result;
 struct ResultSelected;
 } // namespace InlineBots
 
+namespace SendMenu {
+enum class Type;
+} // namespace SendMenu
+
 namespace InlineBots {
 namespace Layout {
 
@@ -70,6 +74,7 @@ public:
 	void hideAnimated();
 
 	void setResultSelectedCallback(Fn<void(ResultSelected)> callback);
+	void setSendMenuType(Fn<SendMenu::Type()> &&callback);
 	void setCurrentDialogsEntryState(Dialogs::EntryState state);
 
 	[[nodiscard]] rpl::producer<bool> requesting() const {

From a2e4403b28e6fd581784cc0bf8fd939e0f89acd1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 19 Nov 2020 06:18:45 +0300
Subject: [PATCH 150/370] Slightly refactored code for menu with send options.

---
 .../chat_helpers/field_autocomplete.cpp       |  2 +-
 .../chat_helpers/gifs_list_widget.cpp         |  2 +-
 .../chat_helpers/send_context_menu.cpp        |  6 ++---
 .../chat_helpers/send_context_menu.h          |  2 +-
 .../chat_helpers/stickers_list_widget.cpp     |  2 +-
 .../chat_helpers/tabbed_selector.h            |  2 +-
 .../history_view_compose_controls.cpp         | 25 +++++--------------
 .../inline_bots/inline_results_inner.cpp      |  2 +-
 8 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 95b68324b..6faeb1b66 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -1134,7 +1134,7 @@ void FieldAutocomplete::Inner::contextMenuEvent(QContextMenuEvent *e) {
 	};
 	SendMenu::FillSendMenu(
 		_menu,
-		[&] { return type; },
+		type,
 		SendMenu::DefaultSilentCallback(send),
 		SendMenu::DefaultScheduleCallback(this, type, send));
 
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index 7e7eaa63e..0960a8cb6 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -377,7 +377,7 @@ void GifsListWidget::fillContextMenu(
 	};
 	SendMenu::FillSendMenu(
 		menu,
-		[&] { return type; },
+		type,
 		SendMenu::DefaultSilentCallback(send),
 		SendMenu::DefaultScheduleCallback(this, type, send));
 
diff --git a/Telegram/SourceFiles/chat_helpers/send_context_menu.cpp b/Telegram/SourceFiles/chat_helpers/send_context_menu.cpp
index 0f5666dd9..08271abd6 100644
--- a/Telegram/SourceFiles/chat_helpers/send_context_menu.cpp
+++ b/Telegram/SourceFiles/chat_helpers/send_context_menu.cpp
@@ -40,13 +40,13 @@ Fn<void()> DefaultScheduleCallback(
 
 FillMenuResult FillSendMenu(
 		not_null<Ui::PopupMenu*> menu,
-		Fn<Type()> type,
+		Type type,
 		Fn<void()> silent,
 		Fn<void()> schedule) {
 	if (!silent && !schedule) {
 		return FillMenuResult::None;
 	}
-	const auto now = type();
+	const auto now = type;
 	if (now == Type::Disabled
 		|| (!silent && now == Type::SilentOnly)) {
 		return FillMenuResult::None;
@@ -76,7 +76,7 @@ void SetupMenuAndShortcuts(
 	const auto menu = std::make_shared<base::unique_qptr<Ui::PopupMenu>>();
 	const auto showMenu = [=] {
 		*menu = base::make_unique_q<Ui::PopupMenu>(button);
-		const auto result = FillSendMenu(*menu, type, silent, schedule);
+		const auto result = FillSendMenu(*menu, type(), silent, schedule);
 		const auto success = (result == FillMenuResult::Success);
 		if (success) {
 			(*menu)->popup(QCursor::pos());
diff --git a/Telegram/SourceFiles/chat_helpers/send_context_menu.h b/Telegram/SourceFiles/chat_helpers/send_context_menu.h
index ec810545e..11f9824b6 100644
--- a/Telegram/SourceFiles/chat_helpers/send_context_menu.h
+++ b/Telegram/SourceFiles/chat_helpers/send_context_menu.h
@@ -40,7 +40,7 @@ Fn<void()> DefaultScheduleCallback(
 
 FillMenuResult FillSendMenu(
 	not_null<Ui::PopupMenu*> menu,
-	Fn<Type()> type,
+	Type type,
 	Fn<void()> silent,
 	Fn<void()> schedule);
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index d2534c7ed..0cb159ae9 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -2077,7 +2077,7 @@ void StickersListWidget::fillContextMenu(
 		};
 		SendMenu::FillSendMenu(
 			menu,
-			[&] { return type; },
+			type,
 			SendMenu::DefaultSilentCallback(send),
 			SendMenu::DefaultScheduleCallback(this, type, send));
 
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
index d20c67c1d..a73e97e67 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.h
@@ -109,7 +109,7 @@ public:
 		_beforeHidingCallback = std::move(callback);
 	}
 
-	void setSendMenuType(Fn<SendMenu::Type()> callback) {
+	void setSendMenuType(Fn<SendMenu::Type()> &&callback) {
 		_sendMenuType = std::move(callback);
 	}
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 74af9ba30..98269b845 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -35,7 +35,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/view/controls/history_view_voice_record_bar.h"
-#include "history/view/history_view_schedule_box.h" // HistoryView::PrepareScheduleBox
 #include "history/view/history_view_webpage_preview.h"
 #include "inline_bots/inline_results_widget.h"
 #include "inline_bots/inline_bot_result.h"
@@ -1419,11 +1418,15 @@ void ComposeControls::initSendButton() {
 		cancelInlineBot();
 	}, _send->lifetime());
 
+	const auto send = [=](Api::SendOptions options) {
+		_sendCustomRequests.fire(std::move(options));
+	};
+
 	SendMenu::SetupMenuAndShortcuts(
 		_send.get(),
 		[=] { return sendButtonMenuType(); },
-		[=] { sendSilent(); },
-		[=] { sendScheduled(); });
+		SendMenu::DefaultSilentCallback(send),
+		SendMenu::DefaultScheduleCallback(_wrap.get(), sendMenuType(), send));
 }
 
 void ComposeControls::inlineBotResolveDone(
@@ -2119,22 +2122,6 @@ bool ComposeControls::isRecording() const {
 	return _voiceRecordBar->isRecording();
 }
 
-void ComposeControls::sendSilent() {
-	_sendCustomRequests.fire({ .silent = true });
-}
-
-void ComposeControls::sendScheduled() {
-	auto callback = [=](Api::SendOptions options) {
-		_sendCustomRequests.fire(std::move(options));
-	};
-	Ui::show(
-		HistoryView::PrepareScheduleBox(
-			_wrap.get(),
-			sendMenuType(),
-			std::move(callback)),
-		Ui::LayerOption::KeepOther);
-}
-
 void ComposeControls::updateInlineBotQuery() {
 	if (!_history) {
 		return;
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
index e36111c43..28acc81c8 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
@@ -301,7 +301,7 @@ void Inner::contextMenuEvent(QContextMenuEvent *e) {
 	};
 	SendMenu::FillSendMenu(
 		_menu,
-		[&] { return type; },
+		type,
 		SendMenu::DefaultSilentCallback(send),
 		SendMenu::DefaultScheduleCallback(this, type, send));
 

From b1b01385d0720add9c57ec0791620d8950acfb53 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 19 Nov 2020 19:34:32 +0400
Subject: [PATCH 151/370] Restore 16px tray icon size

Looks like there are support for this size since b703f4e5557053d4cc320e42861db197c0ce7790
---
 Telegram/SourceFiles/platform/linux/main_window_linux.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 45d4b7736..c33070cbe 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -202,6 +202,7 @@ QIcon TrayIconGen(int counter, bool muted) {
 	QIcon systemIcon;
 
 	static const auto iconSizes = {
+		16,
 		22,
 		24,
 		32,

From 0a0dcb90540d272e5fe52f37a4d8509ea7d8769e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 19 Nov 2020 18:11:09 +0300
Subject: [PATCH 152/370] Delegated responsibility for clearing listen state to
 sections.

---
 Telegram/SourceFiles/history/history_widget.cpp        |  1 +
 .../view/controls/history_view_compose_controls.cpp    |  4 ++++
 .../view/controls/history_view_compose_controls.h      |  1 +
 .../view/controls/history_view_voice_record_bar.cpp    | 10 +++++++++-
 .../view/controls/history_view_voice_record_bar.h      |  3 ++-
 .../history/view/history_view_replies_section.cpp      |  1 +
 .../history/view/history_view_scheduled_section.cpp    |  1 +
 7 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 342199b28..649b144d0 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -797,6 +797,7 @@ void HistoryWidget::initVoiceRecordBar() {
 			data.waveform,
 			data.duration,
 			action);
+		_voiceRecordBar->clearListenState();
 	}, lifetime());
 
 	_voiceRecordBar->lockShowStarts(
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 98269b845..5f440dc47 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1018,6 +1018,10 @@ bool ComposeControls::showRecordButton() const {
 		&& !isEditingMessage();
 }
 
+void ComposeControls::clearListenState() {
+	_voiceRecordBar->clearListenState();
+}
+
 void ComposeControls::drawRestrictedWrite(Painter &p, const QString &error) {
 	p.fillRect(_writeRestricted->rect(), st::historyReplyBg);
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 926975cd7..4da785239 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -152,6 +152,7 @@ public:
 	void setText(const TextWithTags &text);
 	void clear();
 	void hidePanelsAnimated();
+	void clearListenState();
 
 	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
 	[[nodiscard]] bool isLockPresent() const;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 05226bce0..2c0142c71 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1399,7 +1399,6 @@ void VoiceRecordBar::requestToSendWithOptions(Api::SendOptions options) {
 			data->waveform,
 			Duration(data->samples),
 			options });
-		hideAnimated();
 	}
 }
 
@@ -1416,6 +1415,9 @@ bool VoiceRecordBar::isRecording() const {
 }
 
 void VoiceRecordBar::hideAnimated() {
+	if (isHidden()) {
+		return;
+	}
 	visibilityAnimate(false, [=] { hide(); });
 }
 
@@ -1455,6 +1457,12 @@ float64 VoiceRecordBar::activeAnimationRatio() const {
 	return _activeAnimation.value(_inField.current() ? 1. : 0.);
 }
 
+void VoiceRecordBar::clearListenState() {
+	if (isListenState()) {
+		hideAnimated();
+	}
+}
+
 float64 VoiceRecordBar::showAnimationRatio() const {
 	// There is no reason to set the final value to zero,
 	// because at zero this widget is hidden.
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 59f2d891f..f976bafb8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -49,7 +49,9 @@ public:
 
 	void startRecording();
 	void finishAnimating();
+	void hideAnimated();
 	void hideFast();
+	void clearListenState();
 
 	void orderControls();
 
@@ -102,7 +104,6 @@ private:
 	bool isTypeRecord() const;
 	bool hasDuration() const;
 
-	void hideAnimated();
 	void finish();
 
 	void activeAnimate(bool active);
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index b8b780501..ea9818aef 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -890,6 +890,7 @@ void RepliesWidget::sendVoice(ComposeControls::VoiceToSend &&data) {
 		std::move(action));
 
 	_composeControls->cancelReplyMessage();
+	_composeControls->clearListenState();
 	finishSending();
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 8fca948b2..723c424c5 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -573,6 +573,7 @@ void ScheduledWidget::sendVoice(
 	auto action = Api::SendAction(_history);
 	action.options = options;
 	session().api().sendVoiceMessage(bytes, waveform, duration, action);
+	_composeControls->clearListenState();
 }
 
 void ScheduledWidget::edit(

From cc48afac1cf70bf98daf79fa2b5c4626329cd378 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 19 Nov 2020 19:05:16 +0300
Subject: [PATCH 153/370] Beta version 2.4.11.

- Improve locked voice message recording.
- Fix main window closing to tray on Windows.
- Fix crash in bot command sending.
- Fix adding additional photos when sending an album
to a group with enabled slow mode.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 ++++----
 Telegram/Resources/winrc/Updater.rc          |  8 ++++----
 Telegram/SourceFiles/core/changelogs.cpp     | 10 ++++++++++
 Telegram/SourceFiles/core/version.h          |  4 ++--
 Telegram/build/version                       |  8 ++++----
 changelog.txt                                |  7 +++++++
 7 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 7b1bbb799..5e36731ba 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.10.0" />
+    Version="2.4.11.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 bfe8187b3..4d2150713 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,10,0
- PRODUCTVERSION 2,4,10,0
+ FILEVERSION 2,4,11,0
+ PRODUCTVERSION 2,4,11,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.10.0"
+            VALUE "FileVersion", "2.4.11.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.10.0"
+            VALUE "ProductVersion", "2.4.11.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 095ec4ddd..3d3f6fda6 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,10,0
- PRODUCTVERSION 2,4,10,0
+ FILEVERSION 2,4,11,0
+ PRODUCTVERSION 2,4,11,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.10.0"
+            VALUE "FileVersion", "2.4.11.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.10.0"
+            VALUE "ProductVersion", "2.4.11.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index 5bdf0176d..279f7e7a4 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -95,6 +95,16 @@ std::map<int, const char*> BetaLogs() {
 
 		"- Lock voice message recording, listen to your voice message before sending.\n"
 	},
+	{
+		2004011,
+		"- Improve locked voice message recording.\n"
+
+		"- Fix main window closing to tray on Windows.\n"
+
+		"- Fix crash in bot command sending.\n"
+
+		"- Fix adding additional photos when sending an album to a group with enabled slow mode.\n"
+	},
 	};
 };
 
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index d51fc19bf..ab26b4e00 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 = 2004010;
-constexpr auto AppVersionStr = "2.4.10";
+constexpr auto AppVersion = 2004011;
+constexpr auto AppVersionStr = "2.4.11";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 36009be61..23d9aea34 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2004010
+AppVersion         2004011
 AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.10
-AppVersionStr      2.4.10
+AppVersionStrSmall 2.4.11
+AppVersionStr      2.4.11
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 2.4.10.beta
+AppVersionOriginal 2.4.11.beta
diff --git a/changelog.txt b/changelog.txt
index c0249e7a5..2fe67af33 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+2.4.11 beta (19.11.20)
+
+- Improve locked voice message recording.
+- Fix main window closing to tray on Windows.
+- Fix crash in bot command sending.
+- Fix adding additional photos when sending an album to a group with enabled slow mode.
+
 2.4.10 beta (17.11.20)
 
 - Use inline bots and sticker by emoji suggestions in channel comments.

From 51cdb704618c505c88cb4d9c8ff6009b6425f103 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 18 Nov 2020 00:25:47 +0300
Subject: [PATCH 154/370] Moved Issue Closer to separate Github Action.

---
 .github/workflows/issue_closer.yml | 131 +----------------------------
 1 file changed, 3 insertions(+), 128 deletions(-)

diff --git a/.github/workflows/issue_closer.yml b/.github/workflows/issue_closer.yml
index 44782fa45..d3784944f 100644
--- a/.github/workflows/issue_closer.yml
+++ b/.github/workflows/issue_closer.yml
@@ -8,132 +8,7 @@ jobs:
   comment:
     runs-on: ubuntu-latest
     steps:
-      - name: Get the latest version.
-        run: |
-          tag=$(git ls-remote --tags git://github.com/$GITHUB_REPOSITORY | cut -f 2 | tail -n1)
-          echo $tag
-          echo "LATEST_TAG=$tag" >> $GITHUB_ENV
-
-      - name: Get the latest macOS version.
-        shell: python
-        run: |
-          import subprocess;
-          from xml.dom import minidom;
-
-          url = "https://osx.telegram.org/updates/versions.xml";
-          subprocess.check_call("wget %s" % url, shell=True);
-
-          xmldoc = minidom.parse('versions.xml');
-          itemlist = xmldoc.getElementsByTagName('enclosure');
-          ver = itemlist[0].attributes['sparkle:shortVersionString'].value;
-          print(ver);
-
-          open(os.environ['GITHUB_ENV'], "a").write("LATEST_MACOS=" + ver);
-
-      - name: Check a version from an issue.
-        uses: actions/github-script@0.4.0
+      - name: Process an issue.
+        uses: desktop-app/action_issue_closer@master
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            let errorStr = "Version not found.";
-
-            function maxIndexOf(str, i) {
-              let index = str.indexOf(i);
-              return (index == -1) ? Number.MAX_SAFE_INTEGER : index;
-            }
-
-            let item1 = "Version of Telegram Desktop";
-            let item2 = "Installation source";
-            let item3 = "Used theme";
-            let item4 = "<details>";
-            let body = context.payload.issue.body;
-
-            console.log("Body of issue:\n" + body);
-            let index1 = body.indexOf(item1);
-            let index2 = Math.min(
-              Math.min(
-                maxIndexOf(body, item2),
-                maxIndexOf(body, item3)),
-              maxIndexOf(body, item4));
-
-            console.log("Index 1: " + index1);
-            console.log("Index 2: " + index2);
-
-            if (index1 == -1) {
-              console.log(errorStr);
-              return;
-            }
-
-            function parseVersion(str) {
-              let pattern = /[0-9]\.[0-9][0-9.]{0,}/g;
-              return str.match(pattern);
-            }
-            function firstNum(version) {
-              return version[0].split(".")[0];
-            }
-
-            let issueVer = parseVersion(body.substring(index1 + item1.length, index2));
-
-            if (issueVer == undefined) {
-              console.log(errorStr);
-              return;
-            }
-            console.log("Version from issue: " + issueVer[0]);
-
-            let latestVer = parseVersion(process.env.LATEST_TAG);
-
-            if (latestVer == undefined) {
-              console.log(errorStr);
-              return;
-            }
-            console.log("Version from tags: " + latestVer[0]);
-
-            let issueNum = firstNum(issueVer);
-            let latestNum = firstNum(latestVer);
-
-            let macos_ver = process.env.LATEST_MACOS;
-            console.log("Telegram for MacOS version from website: " + macos_ver);
-
-            if (issueNum <= latestNum && issueNum < macos_ver) {
-              console.log("Seems the version of this issue is fine!");
-              return;
-            }
-            if (issueNum > macos_ver) {
-              let message = `Seems like it's neither the Telegram Desktop\
-              nor the Telegram for macOS version.
-              `;
-              console.log(message);
-              return;
-            }
-
-            let message = `
-            Sorry, but according to the version you specify in this issue, \
-            you are using the [Telegram for macOS](https://macos.telegram.org), \
-            not the [Telegram Desktop](https://desktop.telegram.org).
-            You can report your issue to [the group](https://t.me/macswift) \
-            or to [the repository of Telegram for macOS](https://github.com/overtake/TelegramSwift).
-
-            **If I made a mistake and closed your issue wrongly, please reopen it. Thanks!**
-            `;
-
-            let params = {
-              owner: context.issue.owner,
-              repo: context.issue.repo,
-              issue_number: context.issue.number
-            };
-
-            github.issues.createComment({
-              ...params,
-              body: message
-            });
-
-            github.issues.addLabels({
-              ...params,
-              labels: ['TG macOS Swift']
-            });
-
-            github.issues.update({
-              ...params,
-              state: 'closed'
-            });
-
+          token: ${{ secrets.GITHUB_TOKEN }}

From e283b4895b240b3b613d39294a126ec0cb808c2f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 26 Nov 2020 17:03:51 +0300
Subject: [PATCH 155/370] Fixed vulnerability in Github Action that updates
 user-agent for DNS.

---
 .github/workflows/user_agent_updater.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/user_agent_updater.yml b/.github/workflows/user_agent_updater.yml
index eee5c8b2c..a19b3271f 100644
--- a/.github/workflows/user_agent_updater.yml
+++ b/.github/workflows/user_agent_updater.yml
@@ -44,12 +44,14 @@ jobs:
           git remote set-url origin $url
 
       - name: Delete branch.
+        env:
+          ref: ${{ github.event.pull_request.head.ref }}
         if: |
           env.isPull == '1'
             && github.event.action == 'closed'
-            && startsWith(github.head_ref, env.headBranchPrefix)
+            && startsWith(env.ref, env.headBranchPrefix)
         run: |
-          git push origin --delete ${{ github.head_ref }}
+          git push origin --delete $ref
 
       - name: Write a new version of Google Chrome to the user-agent for DNS.
         if: env.isPull == '0'

From 62eaa3f22519f477e392a00f69eee90a861236c3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 20 Nov 2020 15:57:17 +0300
Subject: [PATCH 156/370] Update API scheme to layer 121.

---
 Telegram/Resources/tl/api.tl                             | 6 ++++--
 Telegram/SourceFiles/data/data_session.cpp               | 2 ++
 Telegram/SourceFiles/export/data/export_data_types.cpp   | 6 ++++++
 Telegram/SourceFiles/ui/image/image_location_factory.cpp | 6 ++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index 06f21cc28..531ea9f51 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -124,7 +124,7 @@ userStatusLastMonth#77ebc742 = UserStatus;
 chatEmpty#9ba2d800 id:int = Chat;
 chat#3bda1bde flags:# creator:flags.0?true kicked:flags.1?true left:flags.2?true deactivated:flags.5?true id:int title:string photo:ChatPhoto participants_count:int date:int version:int migrated_to:flags.6?InputChannel admin_rights:flags.14?ChatAdminRights default_banned_rights:flags.18?ChatBannedRights = Chat;
 chatForbidden#7328bdb id:int title:string = Chat;
-channel#d31a961e flags:# creator:flags.0?true left:flags.2?true broadcast:flags.5?true verified:flags.7?true megagroup:flags.8?true restricted:flags.9?true signatures:flags.11?true min:flags.12?true scam:flags.19?true has_link:flags.20?true has_geo:flags.21?true slowmode_enabled:flags.22?true id:int access_hash:flags.13?long title:string username:flags.6?string photo:ChatPhoto date:int version:int restriction_reason:flags.9?Vector<RestrictionReason> admin_rights:flags.14?ChatAdminRights banned_rights:flags.15?ChatBannedRights default_banned_rights:flags.18?ChatBannedRights participants_count:flags.17?int = Chat;
+channel#d31a961e flags:# creator:flags.0?true left:flags.2?true broadcast:flags.5?true verified:flags.7?true megagroup:flags.8?true restricted:flags.9?true signatures:flags.11?true min:flags.12?true scam:flags.19?true has_link:flags.20?true has_geo:flags.21?true slowmode_enabled:flags.22?true call_active:flags.23?true id:int access_hash:flags.13?long title:string username:flags.6?string photo:ChatPhoto date:int version:int restriction_reason:flags.9?Vector<RestrictionReason> admin_rights:flags.14?ChatAdminRights banned_rights:flags.15?ChatBannedRights default_banned_rights:flags.18?ChatBannedRights participants_count:flags.17?int = Chat;
 channelForbidden#289da732 flags:# broadcast:flags.5?true megagroup:flags.8?true id:int access_hash:long title:string until_date:flags.16?int = Chat;
 
 chatFull#1b7c9db3 flags:# can_set_username:flags.7?true has_scheduled:flags.8?true id:int about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int = ChatFull;
@@ -194,6 +194,7 @@ photoSize#77bfb61b type:string location:FileLocation w:int h:int size:int = Phot
 photoCachedSize#e9a734fa type:string location:FileLocation w:int h:int bytes:bytes = PhotoSize;
 photoStrippedSize#e0b0bc2e type:string bytes:bytes = PhotoSize;
 photoSizeProgressive#5aa86a51 type:string location:FileLocation w:int h:int sizes:Vector<int> = PhotoSize;
+photoPathSize#d8214d41 type:string bytes:bytes = PhotoSize;
 
 geoPointEmpty#1117dd5f = GeoPoint;
 geoPoint#b2a2f663 flags:# long:double lat:double access_hash:long accuracy_radius:flags.0?int = GeoPoint;
@@ -902,6 +903,7 @@ account.webAuthorizations#ed56c9fc authorizations:Vector<WebAuthorization> users
 inputMessageID#a676a322 id:int = InputMessage;
 inputMessageReplyTo#bad88395 id:int = InputMessage;
 inputMessagePinned#86872538 = InputMessage;
+inputMessageCallbackQuery#acfa1a7e id:int query_id:long = InputMessage;
 
 inputDialogPeer#fcaafeb7 peer:InputPeer = InputDialogPeer;
 inputDialogPeerFolder#64600527 folder_id:int = InputDialogPeer;
@@ -1547,4 +1549,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 120
+// LAYER 121
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index f5fe90f92..924c61179 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -154,6 +154,8 @@ std::vector<UnavailableReason> ExtractUnavailableReasons(
 			return kInvalid;
 		}, [](const MTPDphotoStrippedSize &) {
 			return kInvalid;
+		}, [](const MTPDphotoPathSize &) {
+			return kInvalid;
 		}, [](const auto &data) {
 			return (data.vw().v * data.vh().v);
 		});
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index bbe8522cb..b5c441e8d 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -245,6 +245,8 @@ Image ParseMaxImage(
 		size.match([](const MTPDphotoSizeEmpty &) {
 		}, [](const MTPDphotoStrippedSize &) {
 			// Max image size should not be a stripped image.
+		}, [](const MTPDphotoPathSize &) {
+			// Max image size should not be a path image.
 		}, [&](const auto &data) {
 			const auto area = data.vw().v * int64(data.vh().v);
 			if (area > maxArea) {
@@ -397,6 +399,8 @@ Image ParseDocumentThumb(
 			return 0;
 		}, [](const MTPDphotoStrippedSize &) {
 			return 0;
+		}, [](const MTPDphotoPathSize &) {
+			return 0;
 		}, [](const auto &data) {
 			return data.vw().v * data.vh().v;
 		});
@@ -410,6 +414,8 @@ Image ParseDocumentThumb(
 		return Image();
 	}, [](const MTPDphotoStrippedSize &) {
 		return Image();
+	}, [](const MTPDphotoPathSize &) {
+		return Image();
 	}, [&](const auto &data) {
 		auto result = Image();
 		result.width = data.vw().v;
diff --git a/Telegram/SourceFiles/ui/image/image_location_factory.cpp b/Telegram/SourceFiles/ui/image/image_location_factory.cpp
index bc86b8c91..eefbc7157 100644
--- a/Telegram/SourceFiles/ui/image/image_location_factory.cpp
+++ b/Telegram/SourceFiles/ui/image/image_location_factory.cpp
@@ -91,6 +91,8 @@ ImageWithLocation FromPhotoSize(
 		//	.bytes = bytes,
 		//	.bytesCount = bytes.size(),
 		//};
+	}, [&](const MTPDphotoPathSize &) {
+		return ImageWithLocation();
 	}, [&](const MTPDphotoSizeEmpty &) {
 		return ImageWithLocation();
 	});
@@ -183,6 +185,8 @@ ImageWithLocation FromPhotoSize(
 		//	.bytes = bytes,
 		//	.bytesCount = bytes.size(),
 		//};
+	}, [&](const MTPDphotoPathSize &data) {
+		return ImageWithLocation();
 	}, [&](const MTPDphotoSizeEmpty &) {
 		return ImageWithLocation();
 	});
@@ -263,6 +267,8 @@ ImageWithLocation FromPhotoSize(
 		//	.bytes = bytes,
 		//	.bytesCount = bytes.size(),
 		//};
+	}, [&](const MTPDphotoPathSize &data) {
+		return ImageWithLocation();
 	}, [&](const MTPDphotoSizeEmpty &) {
 		return ImageWithLocation();
 	});

From 3aa2619a7fc75c0e23a3364978153970a5eab14c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 20 Nov 2020 18:19:31 +0300
Subject: [PATCH 157/370] Update API scheme to layer 122.

---
 Telegram/Resources/tl/api.tl                  | 31 +++++++++++++++++--
 .../export/data/export_data_types.cpp         |  4 +++
 .../SourceFiles/history/history_service.cpp   |  6 ++++
 .../history/view/history_view_send_action.cpp |  2 ++
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index 531ea9f51..7ae43c9b0 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -128,7 +128,7 @@ channel#d31a961e flags:# creator:flags.0?true left:flags.2?true broadcast:flags.
 channelForbidden#289da732 flags:# broadcast:flags.5?true megagroup:flags.8?true id:int access_hash:long title:string until_date:flags.16?int = Chat;
 
 chatFull#1b7c9db3 flags:# can_set_username:flags.7?true has_scheduled:flags.8?true id:int about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int = ChatFull;
-channelFull#f0e6672a flags:# can_view_participants:flags.3?true can_set_username:flags.6?true can_set_stickers:flags.7?true hidden_prehistory:flags.10?true can_set_location:flags.16?true has_scheduled:flags.19?true can_view_stats:flags.20?true blocked:flags.22?true id:int about:string participants_count:flags.0?int admins_count:flags.1?int kicked_count:flags.2?int banned_count:flags.2?int online_count:flags.13?int read_inbox_max_id:int read_outbox_max_id:int unread_count:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?int migrated_from_max_id:flags.4?int pinned_msg_id:flags.5?int stickerset:flags.8?StickerSet available_min_id:flags.9?int folder_id:flags.11?int linked_chat_id:flags.14?int location:flags.15?ChannelLocation slowmode_seconds:flags.17?int slowmode_next_send_date:flags.18?int stats_dc:flags.12?int pts:int = ChatFull;
+channelFull#ef3a6acd flags:# can_view_participants:flags.3?true can_set_username:flags.6?true can_set_stickers:flags.7?true hidden_prehistory:flags.10?true can_set_location:flags.16?true has_scheduled:flags.19?true can_view_stats:flags.20?true blocked:flags.22?true id:int about:string participants_count:flags.0?int admins_count:flags.1?int kicked_count:flags.2?int banned_count:flags.2?int online_count:flags.13?int read_inbox_max_id:int read_outbox_max_id:int unread_count:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?int migrated_from_max_id:flags.4?int pinned_msg_id:flags.5?int stickerset:flags.8?StickerSet available_min_id:flags.9?int folder_id:flags.11?int linked_chat_id:flags.14?int location:flags.15?ChannelLocation slowmode_seconds:flags.17?int slowmode_next_send_date:flags.18?int stats_dc:flags.12?int pts:int call:flags.21?InputGroupCall = ChatFull;
 
 chatParticipant#c8d7493e user_id:int inviter_id:int date:int = ChatParticipant;
 chatParticipantCreator#da13538a user_id:int = ChatParticipant;
@@ -182,6 +182,8 @@ messageActionSecureValuesSentMe#1b287353 values:Vector<SecureValue> credentials:
 messageActionSecureValuesSent#d95c6154 types:Vector<SecureValueType> = MessageAction;
 messageActionContactSignUp#f3f25f76 = MessageAction;
 messageActionGeoProximityReached#98e0d697 from_id:Peer to_id:Peer distance:int = MessageAction;
+messageActionGroupCall#7a0d7f42 flags:# call:InputGroupCall duration:flags.0?int = MessageAction;
+messageActionInviteToGroupCall#76b9f11a call:InputGroupCall users:Vector<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;
@@ -363,6 +365,8 @@ 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;
+updateGroupCallParticipants#f2ebdb4e call:InputGroupCall participants:Vector<GroupCallParticipant> version:int = Update;
+updateGroupCall#5724806e channel_id:int call:GroupCall = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -449,6 +453,7 @@ sendMessageChooseContactAction#628cbc6f = SendMessageAction;
 sendMessageGamePlayAction#dd6a8f48 = SendMessageAction;
 sendMessageRecordRoundAction#88f27fbc = SendMessageAction;
 sendMessageUploadRoundAction#243e1c66 progress:int = SendMessageAction;
+speakingInGroupCallAction#d92c2285 = SendMessageAction;
 
 contacts.found#b3134d9d my_results:Vector<Peer> results:Vector<Peer> chats:Vector<Chat> users:Vector<User> = contacts.Found;
 
@@ -1037,7 +1042,7 @@ chatOnlines#f041e250 onlines:int = ChatOnlines;
 
 statsURL#47a971e0 url:string = StatsURL;
 
-chatAdminRights#5fb224d5 flags:# change_info:flags.0?true post_messages:flags.1?true edit_messages:flags.2?true delete_messages:flags.3?true ban_users:flags.4?true invite_users:flags.5?true pin_messages:flags.7?true add_admins:flags.9?true anonymous:flags.10?true = ChatAdminRights;
+chatAdminRights#5fb224d5 flags:# change_info:flags.0?true post_messages:flags.1?true edit_messages:flags.2?true delete_messages:flags.3?true ban_users:flags.4?true invite_users:flags.5?true pin_messages:flags.7?true add_admins:flags.9?true anonymous:flags.10?true manage_call:flags.11?true = ChatAdminRights;
 
 chatBannedRights#9f120418 flags:# view_messages:flags.0?true send_messages:flags.1?true send_media:flags.2?true send_stickers:flags.3?true send_gifs:flags.4?true send_games:flags.5?true send_inline:flags.6?true embed_links:flags.7?true send_polls:flags.8?true change_info:flags.10?true invite_users:flags.15?true pin_messages:flags.17?true until_date:int = ChatBannedRights;
 
@@ -1179,6 +1184,17 @@ peerBlocked#e8fd8014 peer_id:Peer date:int = PeerBlocked;
 
 stats.messageStats#8999f295 views_graph:StatsGraph = stats.MessageStats;
 
+groupCallDiscarded#7780bcb4 id:long access_hash:long duration:int = GroupCall;
+groupCall#55903081 flags:# id:long access_hash:long participants_count:int params:flags.0?DataJSON version:int = GroupCall;
+
+inputGroupCall#d8aa840f id:long access_hash:long = InputGroupCall;
+
+groupCallParticipant#89a0d26c flags:# muted:flags.0?true left:flags.1?true can_self_unmute:flags.2?true user_id:int date:int source:int = GroupCallParticipant;
+
+phone.groupCall#564c9fd8 call:GroupCall sources:Vector<int> participants:Vector<GroupCallParticipant> users:Vector<User> = phone.GroupCall;
+
+phone.groupParticipants#3cdb7991 count:int participants:Vector<GroupCallParticipant> users:Vector<User> version:int = phone.GroupParticipants;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -1533,6 +1549,15 @@ phone.discardCall#b2cbc1c0 flags:# video:flags.0?true peer:InputPhoneCall durati
 phone.setCallRating#59ead627 flags:# user_initiative:flags.0?true peer:InputPhoneCall rating:int comment:string = Updates;
 phone.saveCallDebug#277add7e peer:InputPhoneCall debug:DataJSON = Bool;
 phone.sendSignalingData#ff7a9383 peer:InputPhoneCall data:bytes = Bool;
+phone.createGroupCall#e428fa02 channel:InputChannel random_id:int = Updates;
+phone.joinGroupCall#5f9c8e62 flags:# muted:flags.0?true call:InputGroupCall params:DataJSON = Updates;
+phone.leaveGroupCall#60e98e5f call:InputGroupCall = Updates;
+phone.editGroupCallMember#63146ae4 flags:# muted:flags.0?true call:InputGroupCall user_id:InputUser = Updates;
+phone.inviteToGroupCall#7b393160 call:InputGroupCall users:Vector<InputUser> = Updates;
+phone.discardGroupCall#7a777135 call:InputGroupCall = Updates;
+phone.getGroupCall#c7cb017 call:InputGroupCall = phone.GroupCall;
+phone.getGroupParticipants#de41d3b2 call:InputGroupCall max_date:int limit:int = phone.GroupParticipants;
+phone.checkGroupCall#b74a7bea call:InputGroupCall source:int = Bool;
 
 langpack.getLangPack#f2f2330a lang_pack:string lang_code:string = LangPackDifference;
 langpack.getStrings#efea3803 lang_pack:string lang_code:string keys:Vector<string> = Vector<LangPackString>;
@@ -1549,4 +1574,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 121
+// LAYER 122
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index b5c441e8d..97d917f21 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -1112,6 +1112,10 @@ ServiceAction ParseServiceAction(
 		}
 		content.distance = data.vdistance().v;
 		result.content = content;
+	}, [&](const MTPDmessageActionGroupCall &data) {
+		// #TODO calls
+	}, [&](const MTPDmessageActionInviteToGroupCall &data) {
+		// #TODO calls
 	}, [](const MTPDmessageActionEmpty &data) {});
 	return result;
 }
diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index 69460be8d..6dfafdc58 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -323,6 +323,12 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 	}, [](const MTPDmessageActionSecureValuesSentMe &) {
 		LOG(("API Error: messageActionSecureValuesSentMe received."));
 		return PreparedText{ tr::lng_message_empty(tr::now) };
+	}, [&](const MTPDmessageActionGroupCall &data) {
+		// #TODO calls
+		return PreparedText{ "Group call" };
+	}, [&](const MTPDmessageActionInviteToGroupCall &data) {
+		// #TODO calls
+		return PreparedText{ "Invite to group call" };
 	}, [](const MTPDmessageActionEmpty &) {
 		return PreparedText{ tr::lng_message_empty(tr::now) };
 	});
diff --git a/Telegram/SourceFiles/history/view/history_view_send_action.cpp b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
index 705ad5942..f62efa170 100644
--- a/Telegram/SourceFiles/history/view/history_view_send_action.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
@@ -100,6 +100,8 @@ bool SendActionPainter::updateNeedsAnimating(
 			|| (i->second.until <= now)) {
 			emplaceAction(Type::PlayGame, kStatusShowClientsidePlayGame);
 		}
+	}, [&](const MTPDspeakingInGroupCallAction &) {
+		// #TODO calls
 	}, [&](const MTPDsendMessageCancelAction &) {
 		Unexpected("CancelAction here.");
 	});

From 33941ad1b94e02fd46efe2926e70b88dbc408733 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 20 Nov 2020 22:25:35 +0300
Subject: [PATCH 158/370] Start group call bar in HistoryWidget.

---
 Telegram/CMakeLists.txt                       |   6 +
 Telegram/Resources/langs/lang.strings         |   2 +-
 Telegram/SourceFiles/api/api_updates.cpp      |   4 +-
 Telegram/SourceFiles/calls/calls_call.cpp     |   8 +-
 Telegram/SourceFiles/calls/calls_call.h       |   2 +-
 .../SourceFiles/calls/calls_group_call.cpp    | 329 ++++++++++++++++++
 Telegram/SourceFiles/calls/calls_group_call.h |  84 +++++
 Telegram/SourceFiles/calls/calls_instance.cpp |  98 +++++-
 Telegram/SourceFiles/calls/calls_instance.h   |  40 ++-
 Telegram/SourceFiles/data/data_changes.h      |   3 +-
 Telegram/SourceFiles/data/data_channel.cpp    |  33 ++
 Telegram/SourceFiles/data/data_channel.h      |  12 +
 Telegram/SourceFiles/data/data_group_call.cpp | 115 ++++++
 Telegram/SourceFiles/data/data_group_call.h   |  54 +++
 .../SourceFiles/history/history_widget.cpp    |  96 ++++-
 Telegram/SourceFiles/history/history_widget.h |  11 +-
 .../view/history_view_group_call_tracker.cpp  |  42 +++
 .../view/history_view_group_call_tracker.h    |  32 ++
 .../view/history_view_top_bar_widget.cpp      |   4 +
 .../SourceFiles/ui/chat/group_call_bar.cpp    | 182 ++++++++++
 Telegram/SourceFiles/ui/chat/group_call_bar.h |  69 ++++
 Telegram/ThirdParty/tgcalls                   |   2 +-
 Telegram/cmake/lib_tgcalls.cmake              |   3 +
 Telegram/cmake/td_ui.cmake                    |   2 +
 24 files changed, 1211 insertions(+), 22 deletions(-)
 create mode 100644 Telegram/SourceFiles/calls/calls_group_call.cpp
 create mode 100644 Telegram/SourceFiles/calls/calls_group_call.h
 create mode 100644 Telegram/SourceFiles/data/data_group_call.cpp
 create mode 100644 Telegram/SourceFiles/data/data_group_call.h
 create mode 100644 Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
 create mode 100644 Telegram/SourceFiles/history/view/history_view_group_call_tracker.h
 create mode 100644 Telegram/SourceFiles/ui/chat/group_call_bar.cpp
 create mode 100644 Telegram/SourceFiles/ui/chat/group_call_bar.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 215698590..c54dd9165 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -264,6 +264,8 @@ PRIVATE
     calls/calls_box_controller.h
     calls/calls_call.cpp
     calls/calls_call.h
+    calls/calls_group_call.cpp
+    calls/calls_group_call.h
     calls/calls_emoji_fingerprint.cpp
     calls/calls_emoji_fingerprint.h
     calls/calls_instance.cpp
@@ -385,6 +387,8 @@ PRIVATE
     data/data_file_origin.h
     data/data_flags.h
     data/data_game.h
+    data/data_group_call.cpp
+    data/data_group_call.h
     data/data_groups.cpp
     data/data_groups.h
     data/data_histories.cpp
@@ -536,6 +540,8 @@ PRIVATE
     history/view/history_view_cursor_state.h
     history/view/history_view_element.cpp
     history/view/history_view_element.h
+    history/view/history_view_group_call_tracker.cpp
+    history/view/history_view_group_call_tracker.h
     history/view/history_view_list_widget.cpp
     history/view/history_view_list_widget.h
     history/view/history_view_message.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index b6dddb980..68a98cebf 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1342,7 +1342,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_broadcast_silent_ph" = "Silent broadcast...";
 "lng_send_anonymous_ph" = "Send anonymously...";
 "lng_record_cancel" = "Release outside this field to cancel";
-"lng_record_lock_cancel" = "Click outside of circle to cancel";
+"lng_record_lock_cancel" = "Click outside of the circle to cancel";
 "lng_record_lock_cancel_sure" = "Are you sure you want to stop recording and discard your voice message?";
 "lng_record_lock_discard" = "Discard";
 "lng_will_be_notified" = "Members will be notified when you post";
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index f365ecce8..9babc7347 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -1796,7 +1796,9 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 	} break;
 
 	case mtpc_updatePhoneCall:
-	case mtpc_updatePhoneCallSignalingData: {
+	case mtpc_updatePhoneCallSignalingData:
+	case mtpc_updateGroupCallParticipants:
+	case mtpc_updateGroupCall: {
 		Core::App().calls().handleUpdate(&session(), update);
 	} break;
 
diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 4ba508eca..cb552e607 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -289,7 +289,7 @@ void Call::startIncoming() {
 }
 
 void Call::answer() {
-	_delegate->requestPermissionsOrFail(crl::guard(this, [=] {
+	_delegate->callRequestPermissionsOrFail(crl::guard(this, [=] {
 		actuallyAnswer();
 	}));
 }
@@ -776,11 +776,11 @@ void Call::createAndStartController(const MTPDphoneCall &call) {
 		auto callLogPath = callLogFolder + qsl("/last_call_log.txt");
 		auto callLogNative = QDir::toNativeSeparators(callLogPath);
 #ifdef Q_OS_WIN
-		descriptor.config.logPath = callLogNative.toStdWString();
+		descriptor.config.logPath.data = callLogNative.toStdWString();
 #else // Q_OS_WIN
 		const auto callLogUtf = QFile::encodeName(callLogNative);
-		descriptor.config.logPath.resize(callLogUtf.size());
-		ranges::copy(callLogUtf, descriptor.config.logPath.begin());
+		descriptor.config.logPath.data.resize(callLogUtf.size());
+		ranges::copy(callLogUtf, descriptor.config.logPath.data.begin());
 #endif // Q_OS_WIN
 		QFile(callLogPath).remove();
 		QDir().mkpath(callLogFolder);
diff --git a/Telegram/SourceFiles/calls/calls_call.h b/Telegram/SourceFiles/calls/calls_call.h
index 139a037ad..2075be7ab 100644
--- a/Telegram/SourceFiles/calls/calls_call.h
+++ b/Telegram/SourceFiles/calls/calls_call.h
@@ -68,7 +68,7 @@ public:
 			Ended,
 		};
 		virtual void playSound(Sound sound) = 0;
-		virtual void requestPermissionsOrFail(Fn<void()> onSuccess) = 0;
+		virtual void callRequestPermissionsOrFail(Fn<void()> onSuccess) = 0;
 		virtual auto getVideoCapture()
 			-> std::shared_ptr<tgcalls::VideoCaptureInterface> = 0;
 
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
new file mode 100644
index 000000000..0dcd19e6b
--- /dev/null
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -0,0 +1,329 @@
+/*
+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 "calls/calls_group_call.h"
+
+#include "main/main_session.h"
+//#include "main/main_account.h"
+//#include "main/main_app_config.h"
+#include "apiwrap.h"
+#include "lang/lang_keys.h"
+#include "boxes/confirm_box.h"
+//#include "boxes/rate_call_box.h"
+//#include "calls/calls_instance.h"
+//#include "base/openssl_help.h"
+//#include "mtproto/mtproto_dh_utils.h"
+//#include "mtproto/mtproto_config.h"
+//#include "core/application.h"
+//#include "core/core_settings.h"
+//#include "media/audio/media_audio_track.h"
+//#include "base/platform/base_platform_info.h"
+//#include "calls/calls_panel.h"
+//#include "webrtc/webrtc_video_track.h"
+//#include "webrtc/webrtc_media_devices.h"
+#include "data/data_channel.h"
+//#include "data/data_session.h"
+//#include "facades.h"
+
+#include <tgcalls/group/GroupInstanceImpl.h>
+
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+
+namespace tgcalls {
+class GroupInstanceImpl;
+} // namespace tgcalls
+
+namespace Calls {
+
+GroupCall::GroupCall(
+	not_null<Delegate*> delegate,
+	not_null<ChannelData*> channel,
+	const MTPInputGroupCall &inputCall)
+: _delegate(delegate)
+, _channel(channel)
+, _api(&_channel->session().mtp()) {
+	if (inputCall.c_inputGroupCall().vid().v) {
+		join(inputCall);
+	} else {
+		start();
+	}
+}
+
+GroupCall::~GroupCall() {
+	destroyController();
+}
+
+void GroupCall::start() {
+	const auto randomId = rand_value<int32>();
+	_api.request(MTPphone_CreateGroupCall(
+		_channel->inputChannel,
+		MTP_int(randomId)
+	)).done([=](const MTPUpdates &result) {
+		_channel->session().api().applyUpdates(result);
+	}).fail([=](const RPCError &error) {
+		int a = error.code();
+	}).send();
+}
+
+void GroupCall::join(const MTPInputGroupCall &inputCall) {
+	inputCall.match([&](const MTPDinputGroupCall &data) {
+		_id = data.vid().v;
+		_accessHash = data.vaccess_hash().v;
+		createAndStartController();
+		const auto weak = base::make_weak(this);
+		_instance->emitJoinPayload([=](tgcalls::GroupJoinPayload payload) {
+			crl::on_main(weak, [=, payload = std::move(payload)]{
+				auto fingerprints = QJsonArray();
+				for (const auto print : payload.fingerprints) {
+					auto object = QJsonObject();
+					object.insert("hash", QString::fromStdString(print.hash));
+					object.insert("setup", QString::fromStdString(print.setup));
+					object.insert(
+						"fingerprint",
+						QString::fromStdString(print.fingerprint));
+					fingerprints.push_back(object);
+				}
+
+				auto root = QJsonObject();
+				root.insert("ufrag", QString::fromStdString(payload.ufrag));
+				root.insert("pwd", QString::fromStdString(payload.pwd));
+				root.insert("fingerprints", fingerprints);
+				root.insert("ssrc", int(payload.ssrc));
+
+				const auto json = QJsonDocument(root).toJson(
+					QJsonDocument::Compact);
+				_api.request(MTPphone_JoinGroupCall(
+					MTP_flags(_muted.current()
+						? MTPphone_JoinGroupCall::Flag::f_muted
+						: MTPphone_JoinGroupCall::Flag(0)),
+					inputCall,
+					MTP_dataJSON(MTP_bytes(json))
+				)).done([=](const MTPUpdates &updates) {
+					_channel->session().api().applyUpdates(updates);
+				}).fail([=](const RPCError &error) {
+					int a = error.code();
+				}).send();
+			});
+		});
+	});
+}
+
+void GroupCall::setMuted(bool mute) {
+	_muted = mute;
+	if (_instance) {
+		_instance->setIsMuted(mute);
+	}
+}
+
+bool GroupCall::handleUpdate(const MTPGroupCall &call) {
+	return call.match([&](const MTPDgroupCall &data) {
+		if (_id != data.vid().v
+			|| _accessHash != data.vaccess_hash().v
+			|| !_instance) {
+			return false;
+		}
+		if (const auto params = data.vparams()) {
+			params->match([&](const MTPDdataJSON &data) {
+				auto error = QJsonParseError{ 0, QJsonParseError::NoError };
+				const auto document = QJsonDocument::fromJson(
+					data.vdata().v,
+					&error);
+				if (error.error != QJsonParseError::NoError) {
+					LOG(("API Error: "
+						"Failed to parse group call params, error: %1."
+						).arg(error.errorString()));
+					return;
+				} else if (!document.isObject()) {
+					LOG(("API Error: "
+						"Not an object received in group call params."));
+					return;
+				}
+				const auto readString = [](
+						const QJsonObject &object,
+						const char *key) {
+					return object.value(key).toString().toStdString();
+				};
+				const auto root = document.object().value("transport").toObject();
+				auto payload = tgcalls::GroupJoinResponsePayload();
+				payload.ufrag = readString(root, "ufrag");
+				payload.pwd = readString(root, "pwd");
+				const auto prints = root.value("fingerprints").toArray();
+				const auto candidates = root.value("candidates").toArray();
+				for (const auto &print : prints) {
+					const auto object = print.toObject();
+					payload.fingerprints.push_back(tgcalls::GroupJoinPayloadFingerprint{
+						.hash = readString(object, "hash"),
+						.setup = readString(object, "setup"),
+						.fingerprint = readString(object, "fingerprint"),
+					});
+				}
+				for (const auto &candidate : candidates) {
+					const auto object = candidate.toObject();
+					payload.candidates.push_back(tgcalls::GroupJoinResponseCandidate{
+						.port = readString(object, "port"),
+						.protocol = readString(object, "protocol"),
+						.network = readString(object, "network"),
+						.generation = readString(object, "generation"),
+						.id = readString(object, "id"),
+						.component = readString(object, "component"),
+						.foundation = readString(object, "foundation"),
+						.priority = readString(object, "priority"),
+						.ip = readString(object, "ip"),
+						.type = readString(object, "type"),
+						.tcpType = readString(object, "tcpType"),
+						.relAddr = readString(object, "relAddr"),
+						.relPort = readString(object, "relPort"),
+					});
+				}
+				_instance->setJoinResponsePayload(payload);
+				_api.request(MTPphone_GetGroupParticipants(
+					inputCall(),
+					MTP_int(0),
+					MTP_int(10)
+				)).done([=](const MTPphone_GroupParticipants &result) {
+					auto sources = std::vector<uint32_t>();
+					result.match([&](const MTPDphone_groupParticipants &data) {
+						for (const auto &p : data.vparticipants().v) {
+							p.match([&](const MTPDgroupCallParticipant &data) {
+								if (data.vuser_id().v != _channel->session().userId()) {
+									sources.push_back(data.vsource().v);
+								}
+							});
+						}
+					});
+					_instance->setSsrcs(std::move(sources));
+					_instance->setIsMuted(false);
+				}).fail([=](const RPCError &error) {
+					int a = error.code();
+				}).send();
+			});
+		}
+		return true;
+	}, [&](const MTPDgroupCallPrivate &data) {
+		if (_instance || _id) {
+			return false;
+		}
+		join(MTP_inputGroupCall(data.vid(), data.vaccess_hash()));
+		return true;
+	}, [&](const MTPDgroupCallDiscarded &data) {
+		if (data.vid().v != _id) {
+			return false;
+		}
+		return true;
+	});
+}
+
+void GroupCall::createAndStartController() {
+	using AudioLevels = std::vector<std::pair<uint32_t, float>>;
+
+	const auto weak = base::make_weak(this);
+	tgcalls::GroupInstanceDescriptor descriptor = {
+		.config = tgcalls::GroupConfig{
+		},
+		.networkStateUpdated = [=](bool) {
+		},
+		.audioLevelsUpdated = [=](const AudioLevels &data) {
+		},
+	};
+	if (Logs::DebugEnabled()) {
+		auto callLogFolder = cWorkingDir() + qsl("DebugLogs");
+		auto callLogPath = callLogFolder + qsl("/last_group_call_log.txt");
+		auto callLogNative = QDir::toNativeSeparators(callLogPath);
+#ifdef Q_OS_WIN
+		descriptor.config.logPath.data = callLogNative.toStdWString();
+#else // Q_OS_WIN
+		const auto callLogUtf = QFile::encodeName(callLogNative);
+		descriptor.config.logPath.data.resize(callLogUtf.size());
+		ranges::copy(callLogUtf, descriptor.config.logPath.data.begin());
+#endif // Q_OS_WIN
+		QFile(callLogPath).remove();
+		QDir().mkpath(callLogFolder);
+	}
+
+	LOG(("Call Info: Creating group instance"));
+	_instance = std::make_unique<tgcalls::GroupInstanceImpl>(
+		std::move(descriptor));
+
+	const auto raw = _instance.get();
+	if (_muted.current()) {
+		raw->setIsMuted(_muted.current());
+	}
+	//raw->setAudioOutputDuckingEnabled(settings.callAudioDuckingEnabled());
+}
+
+void GroupCall::setCurrentAudioDevice(bool input, const QString &deviceId) {
+	if (_instance) {
+		const auto id = deviceId.toStdString();
+		//if (input) {
+		//	_instance->setAudioInputDevice(id);
+		//} else {
+		//	_instance->setAudioOutputDevice(id);
+		//}
+	}
+}
+
+void GroupCall::setAudioVolume(bool input, float level) {
+	if (_instance) {
+		//if (input) {
+		//	_instance->setInputVolume(level);
+		//} else {
+		//	_instance->setOutputVolume(level);
+		//}
+	}
+}
+
+void GroupCall::setAudioDuckingEnabled(bool enabled) {
+	if (_instance) {
+		//_instance->setAudioOutputDuckingEnabled(enabled);
+	}
+}
+
+void GroupCall::handleRequestError(const RPCError &error) {
+	//if (error.type() == qstr("USER_PRIVACY_RESTRICTED")) {
+	//	Ui::show(Box<InformBox>(tr::lng_call_error_not_available(tr::now, lt_user, _user->name)));
+	//} else if (error.type() == qstr("PARTICIPANT_VERSION_OUTDATED")) {
+	//	Ui::show(Box<InformBox>(tr::lng_call_error_outdated(tr::now, lt_user, _user->name)));
+	//} else if (error.type() == qstr("CALL_PROTOCOL_LAYER_INVALID")) {
+	//	Ui::show(Box<InformBox>(Lang::Hard::CallErrorIncompatible().replace("{user}", _user->name)));
+	//}
+	//finish(FinishType::Failed);
+}
+
+void GroupCall::handleControllerError(const QString &error) {
+	if (error == u"ERROR_INCOMPATIBLE"_q) {
+		//Ui::show(Box<InformBox>(
+		//	Lang::Hard::CallErrorIncompatible().replace(
+		//		"{user}",
+		//		_user->name)));
+	} else if (error == u"ERROR_AUDIO_IO"_q) {
+		Ui::show(Box<InformBox>(tr::lng_call_error_audio_io(tr::now)));
+	}
+	//finish(FinishType::Failed);
+}
+
+MTPInputGroupCall GroupCall::inputCall() const {
+	Expects(_id != 0);
+
+	return MTP_inputGroupCall(
+		MTP_long(_id),
+		MTP_long(_accessHash));
+}
+
+void GroupCall::destroyController() {
+	if (_instance) {
+		//_instance->stop([](tgcalls::FinalState) {
+		//});
+
+		DEBUG_LOG(("Call Info: Destroying call controller.."));
+		_instance.reset();
+		DEBUG_LOG(("Call Info: Call controller destroyed."));
+	}
+}
+
+} // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
new file mode 100644
index 000000000..412a8e168
--- /dev/null
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -0,0 +1,84 @@
+/*
+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/weak_ptr.h"
+#include "base/timer.h"
+#include "base/bytes.h"
+#include "mtproto/sender.h"
+#include "mtproto/mtproto_auth_key.h"
+
+namespace tgcalls {
+class GroupInstanceImpl;
+} // namespace tgcalls
+
+namespace Calls {
+
+class GroupCall final : public base::has_weak_ptr {
+public:
+	class Delegate {
+	public:
+		virtual ~Delegate() = default;
+
+	};
+
+	GroupCall(
+		not_null<Delegate*> delegate,
+		not_null<ChannelData*> channel,
+		const MTPInputGroupCall &inputCall);
+	~GroupCall();
+
+	[[nodiscard]] not_null<ChannelData*> channel() const {
+		return _channel;
+	}
+
+	void start();
+	void join(const MTPInputGroupCall &inputCall);
+	bool handleUpdate(const MTPGroupCall &call);
+
+	void setMuted(bool mute);
+	[[nodiscard]] bool muted() const {
+		return _muted.current();
+	}
+	[[nodiscard]] rpl::producer<bool> mutedValue() const {
+		return _muted.value();
+	}
+
+	void setCurrentAudioDevice(bool input, const QString &deviceId);
+	void setAudioVolume(bool input, float level);
+	void setAudioDuckingEnabled(bool enabled);
+
+	[[nodiscard]] rpl::lifetime &lifetime() {
+		return _lifetime;
+	}
+
+private:
+	void handleRequestError(const RPCError &error);
+	void handleControllerError(const QString &error);
+	void createAndStartController();
+	void destroyController();
+
+	[[nodiscard]] MTPInputGroupCall inputCall() const;
+
+	const not_null<Delegate*> _delegate;
+	const not_null<ChannelData*> _channel;
+	MTP::Sender _api;
+	crl::time _startTime = 0;
+
+	rpl::variable<bool> _muted = false;
+
+	uint64 _id = 0;
+	uint64 _accessHash = 0;
+
+	std::unique_ptr<tgcalls::GroupInstanceImpl> _instance;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index e99958109..b0cd55288 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_call.h"
 #include "calls/calls_panel.h"
 #include "data/data_user.h"
+#include "data/data_channel.h"
 #include "data/data_session.h"
 #include "media/audio/media_audio_track.h"
 #include "platform/platform_specific.h"
@@ -39,8 +40,7 @@ Instance::Instance() = default;
 Instance::~Instance() = default;
 
 void Instance::startOutgoingCall(not_null<UserData*> user, bool video) {
-	if (alreadyInCall()) { // Already in a call.
-		_currentCallPanel->showAndActivate();
+	if (activateCurrentCall()) {
 		return;
 	}
 	if (user->callsStatus() == UserData::CallsStatus::Private) {
@@ -55,6 +55,26 @@ void Instance::startOutgoingCall(not_null<UserData*> user, bool video) {
 	}));
 }
 
+void Instance::startGroupCall(not_null<ChannelData*> channel) {
+	if (activateCurrentCall()) {
+		return;
+	}
+	requestPermissionsOrFail(crl::guard(this, [=] {
+		createGroupCall(channel, MTP_inputGroupCall(MTPlong(), MTPlong()));
+	}));
+}
+
+void Instance::joinGroupCall(
+		not_null<ChannelData*> channel,
+		const MTPInputGroupCall &call) {
+	if (activateCurrentCall()) {
+		return;
+	}
+	requestPermissionsOrFail(crl::guard(this, [=] {
+		createGroupCall(channel, call);
+	}));
+}
+
 void Instance::callFinished(not_null<Call*> call) {
 	crl::on_main(call, [=] {
 		destroyCall(call);
@@ -142,6 +162,40 @@ void Instance::createCall(not_null<UserData*> user, Call::Type type, bool video)
 	refreshDhConfig();
 }
 
+void Instance::destroyGroupCall(not_null<GroupCall*> call) {
+	if (_currentGroupCall.get() == call) {
+		//_currentCallPanel->closeBeforeDestroy();
+		//_currentCallPanel = nullptr;
+
+		auto taken = base::take(_currentGroupCall);
+		_currentGroupCallChanges.fire(nullptr);
+		taken.reset();
+
+		if (App::quitting()) {
+			LOG(("Calls::Instance doesn't prevent quit any more."));
+		}
+		Core::App().quitPreventFinished();
+	}
+}
+
+void Instance::createGroupCall(
+		not_null<ChannelData*> channel,
+		const MTPInputGroupCall &inputCall) {
+	auto call = std::make_unique<GroupCall>(
+		getGroupCallDelegate(),
+		channel,
+		inputCall);
+	const auto raw = call.get();
+
+	channel->session().account().sessionChanges(
+	) | rpl::start_with_next([=] {
+		destroyGroupCall(raw);
+	}, raw->lifetime());
+
+	_currentGroupCall = std::move(call);
+	_currentGroupCallChanges.fire_copy(raw);
+}
+
 void Instance::refreshDhConfig() {
 	Expects(_currentCall != nullptr);
 
@@ -232,6 +286,10 @@ void Instance::handleUpdate(
 		handleCallUpdate(session, data.vphone_call());
 	}, [&](const MTPDupdatePhoneCallSignalingData &data) {
 		handleSignalingData(data);
+	}, [&](const MTPDupdateGroupCall &data) {
+		handleGroupCallUpdate(session, data.vcall());
+	}, [&](const MTPDupdateGroupCallParticipants &data) {
+		handleGroupCallUpdate(session, data);
 	}, [](const auto &) {
 		Unexpected("Update type in Calls::Instance::handleUpdate.");
 	});
@@ -267,7 +325,7 @@ void Instance::handleCallUpdate(
 			LOG(("API Error: Self found in phoneCallRequested."));
 		}
 		const auto &config = session->serverConfig();
-		if (alreadyInCall() || !user || user->isSelf()) {
+		if (inCall() || inGroupCall() || !user || user->isSelf()) {
 			const auto flags = phoneCall.is_video()
 				? MTPphone_DiscardCall::Flag::f_video
 				: MTPphone_DiscardCall::Flag(0);
@@ -290,6 +348,19 @@ void Instance::handleCallUpdate(
 	}
 }
 
+void Instance::handleGroupCallUpdate(
+		not_null<Main::Session*> session,
+		const MTPGroupCall &call) {
+	if (_currentGroupCall) {
+		_currentGroupCall->handleUpdate(call);
+	}
+}
+
+void Instance::handleGroupCallUpdate(
+		not_null<Main::Session*> session,
+		const MTPDupdateGroupCallParticipants &update) {
+}
+
 void Instance::handleSignalingData(
 		const MTPDupdatePhoneCallSignalingData &data) {
 	if (!_currentCall || !_currentCall->handleSignalingData(data)) {
@@ -298,10 +369,24 @@ void Instance::handleSignalingData(
 	}
 }
 
-bool Instance::alreadyInCall() {
+bool Instance::inCall() const {
 	return (_currentCall && _currentCall->state() != Call::State::Busy);
 }
 
+bool Instance::inGroupCall() const {
+	return (_currentGroupCall != nullptr);
+}
+
+bool Instance::activateCurrentCall() {
+	if (inCall()) {
+		_currentCallPanel->showAndActivate();
+		return true;
+	} else if (inGroupCall()) {
+		return true;
+	}
+	return false;
+}
+
 Call *Instance::currentCall() const {
 	return _currentCall.get();
 }
@@ -335,9 +420,12 @@ void Instance::requestPermissionOrFail(Platform::PermissionType type, Fn<void()>
 			}
 		}));
 	} else {
-		if (alreadyInCall()) {
+		if (inCall()) {
 			_currentCall->hangup();
 		}
+		if (inGroupCall()) {
+			//_currentGroupCall->hangup(); // #TODO calls
+		}
 		Ui::show(Box<ConfirmBox>(tr::lng_no_mic_permission(tr::now), tr::lng_menu_settings(tr::now), crl::guard(this, [=] {
 			Platform::OpenSystemSettingsForPermission(type);
 			Ui::hideLayer();
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index a50f99343..390292b97 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "mtproto/sender.h"
 #include "calls/calls_call.h"
+#include "calls/calls_group_call.h"
 
 namespace Platform {
 enum class PermissionType;
@@ -30,6 +31,7 @@ class Panel;
 
 class Instance
 	: private Call::Delegate
+	, private GroupCall::Delegate
 	, private base::Subscriber
 	, public base::has_weak_ptr {
 public:
@@ -37,6 +39,10 @@ public:
 	~Instance();
 
 	void startOutgoingCall(not_null<UserData*> user, bool video);
+	void startGroupCall(not_null<ChannelData*> channel);
+	void joinGroupCall(
+		not_null<ChannelData*> channel,
+		const MTPInputGroupCall &call);
 	void handleUpdate(
 		not_null<Main::Session*> session,
 		const MTPUpdate &update);
@@ -48,20 +54,33 @@ public:
 	[[nodiscard]] bool isQuitPrevent();
 
 private:
-	not_null<Call::Delegate*> getCallDelegate() {
+	[[nodiscard]] not_null<Call::Delegate*> getCallDelegate() {
 		return static_cast<Call::Delegate*>(this);
 	}
-	DhConfig getDhConfig() const override {
+	[[nodiscard]] not_null<GroupCall::Delegate*> getGroupCallDelegate() {
+		return static_cast<GroupCall::Delegate*>(this);
+	}
+	[[nodiscard]] DhConfig getDhConfig() const override {
 		return _dhConfig;
 	}
 	void callFinished(not_null<Call*> call) override;
 	void callFailed(not_null<Call*> call) override;
 	void callRedial(not_null<Call*> call) override;
+	void callRequestPermissionsOrFail(Fn<void()> onSuccess) override {
+		requestPermissionsOrFail(std::move(onSuccess));
+	}
+
 	using Sound = Call::Delegate::Sound;
 	void playSound(Sound sound) override;
 	void createCall(not_null<UserData*> user, Call::Type type, bool video);
 	void destroyCall(not_null<Call*> call);
-	void requestPermissionsOrFail(Fn<void()> onSuccess) override;
+
+	void createGroupCall(
+		not_null<ChannelData*> channel,
+		const MTPInputGroupCall &inputCall);
+	void destroyGroupCall(not_null<GroupCall*> call);
+
+	void requestPermissionsOrFail(Fn<void()> onSuccess);
 	void requestPermissionOrFail(Platform::PermissionType type, Fn<void()> onSuccess);
 
 	void handleSignalingData(const MTPDupdatePhoneCallSignalingData &data);
@@ -70,10 +89,18 @@ private:
 	void refreshServerConfig(not_null<Main::Session*> session);
 	bytes::const_span updateDhConfig(const MTPmessages_DhConfig &data);
 
-	bool alreadyInCall();
+	bool activateCurrentCall();
+	[[nodiscard]] bool inCall() const;
+	[[nodiscard]] bool inGroupCall() const;
 	void handleCallUpdate(
 		not_null<Main::Session*> session,
 		const MTPPhoneCall &call);
+	void handleGroupCallUpdate(
+		not_null<Main::Session*> session,
+		const MTPGroupCall &call);
+	void handleGroupCallUpdate(
+		not_null<Main::Session*> session,
+		const MTPDupdateGroupCallParticipants &update);
 
 	DhConfig _dhConfig;
 
@@ -84,8 +111,9 @@ private:
 	std::unique_ptr<Call> _currentCall;
 	rpl::event_stream<Call*> _currentCallChanges;
 	std::unique_ptr<Panel> _currentCallPanel;
-	base::Observable<Call*> _currentCallChanged;
-	base::Observable<FullMsgId> _newServiceMessage;
+
+	std::unique_ptr<GroupCall> _currentGroupCall;
+	rpl::event_stream<GroupCall*> _currentGroupCallChanges;
 
 	std::unique_ptr<Media::Audio::Track> _callConnectingTrack;
 	std::unique_ptr<Media::Audio::Track> _callEndedTrack;
diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h
index 5bd443688..568840d82 100644
--- a/Telegram/SourceFiles/data/data_changes.h
+++ b/Telegram/SourceFiles/data/data_changes.h
@@ -86,9 +86,10 @@ struct PeerUpdate {
 		ChannelLinkedChat = (1 << 27),
 		ChannelLocation   = (1 << 28),
 		Slowmode          = (1 << 29),
+		GroupCall         = (1 << 30),
 
 		// For iteration
-		LastUsedBit       = (1 << 29),
+		LastUsedBit       = (1 << 30),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index 102eb637e..47a09086a 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_folder.h"
 #include "data/data_location.h"
 #include "data/data_histories.h"
+#include "data/data_group_call.h"
 #include "base/unixtime.h"
 #include "history/history.h"
 #include "main/main_session.h"
@@ -671,6 +672,32 @@ void ChannelData::privateErrorReceived() {
 	}
 }
 
+void ChannelData::setCall(const MTPInputGroupCall &call) {
+	call.match([&](const MTPDinputGroupCall &data) {
+		if (_call && _call->id() == data.vid().v) {
+			return;
+		} else if (!_call && !data.vid().v) {
+			return;
+		} else if (!data.vid().v) {
+			clearCall();
+			return;
+		}
+		_call = std::make_unique<Data::GroupCall>(
+			this,
+			data.vid().v,
+			data.vaccess_hash().v);
+		session().changes().peerUpdated(this, UpdateFlag::GroupCall);
+	});
+}
+
+void ChannelData::clearCall() {
+	if (!_call) {
+		return;
+	}
+	_call = nullptr;
+	session().changes().peerUpdated(this, UpdateFlag::GroupCall);
+}
+
 namespace Data {
 
 void ApplyMigration(
@@ -702,6 +729,12 @@ void ApplyChannelUpdate(
 	auto canViewMembers = channel->canViewMembers();
 	auto canEditStickers = channel->canEditStickers();
 
+	if (const auto call = update.vcall()) {
+		channel->setCall(*call);
+	} else {
+		channel->clearCall();
+	}
+
 	channel->setFullFlags(update.vflags().v);
 	channel->setUserpicPhoto(update.vchat_photo());
 	if (const auto migratedFrom = update.vmigrated_from_chat_id()) {
diff --git a/Telegram/SourceFiles/data/data_channel.h b/Telegram/SourceFiles/data/data_channel.h
index 418e4a724..070c42502 100644
--- a/Telegram/SourceFiles/data/data_channel.h
+++ b/Telegram/SourceFiles/data/data_channel.h
@@ -11,6 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_pts_waiter.h"
 #include "data/data_location.h"
 
+namespace Data {
+class GroupCall;
+} // namespace Data
+
 struct ChannelLocation {
 	QString address;
 	Data::LocationPoint point;
@@ -393,6 +397,12 @@ public:
 	[[nodiscard]] QString invitePeekHash() const;
 	void privateErrorReceived();
 
+	[[nodiscard]] Data::GroupCall *call() const {
+		return _call.get();
+	}
+	void setCall(const MTPInputGroupCall &call);
+	void clearCall();
+
 	// Still public data members.
 	uint64 access = 0;
 
@@ -439,6 +449,8 @@ private:
 	QString _inviteLink;
 	std::optional<ChannelData*> _linkedChat;
 
+	std::unique_ptr<Data::GroupCall> _call;
+
 	int _slowmodeSeconds = 0;
 	TimeId _slowmodeLastMessage = 0;
 
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
new file mode 100644
index 000000000..147c23ed4
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -0,0 +1,115 @@
+/*
+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_group_call.h"
+
+#include "data/data_channel.h"
+#include "data/data_changes.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+#include "apiwrap.h"
+
+namespace Data {
+namespace {
+
+constexpr auto kRequestPerPage = 30;
+
+} // namespace
+
+GroupCall::GroupCall(
+	not_null<ChannelData*> channel,
+	uint64 id,
+	uint64 accessHash)
+: _channel(channel)
+, _id(id)
+, _accessHash(accessHash) {
+}
+
+uint64 GroupCall::id() const {
+	return _id;
+}
+
+MTPInputGroupCall GroupCall::input() const {
+	return MTP_inputGroupCall(MTP_long(_id), MTP_long(_accessHash));
+}
+
+auto GroupCall::participants() const
+-> const std::vector<Participant> & {
+	return _participants;
+}
+
+void GroupCall::requestParticipants() {
+	if (_participantsRequestId) {
+		return;
+	} else if (_participants.size() >= _fullCount && _allReceived) {
+		return;
+	}
+	const auto requestFromDate = (_allReceived || _participants.empty())
+		? TimeId(0)
+		: _participants.back().date;
+	auto &api = _channel->session().api();
+	_participantsRequestId = api.request(MTPphone_GetGroupParticipants(
+		input(),
+		MTP_int(requestFromDate),
+		MTP_int(kRequestPerPage)
+	)).done([=](const MTPphone_GroupParticipants &result) {
+		result.match([&](const MTPDphone_groupParticipants &data) {
+			_fullCount = data.vcount().v;
+			_channel->owner().processUsers(data.vusers());
+			for (const auto &p : data.vparticipants().v) {
+				p.match([&](const MTPDgroupCallParticipant &data) {
+					const auto userId = data.vuser_id().v;
+					const auto user = _channel->owner().user(userId);
+					const auto value = Participant{
+						.user = user,
+						.date = data.vdate().v,
+						.source = data.vsource().v,
+						.muted = data.is_muted(),
+						.canSelfUnmute = data.is_can_self_unmute(),
+						.left = data.is_left()
+					};
+					const auto i = ranges::find(
+						_participants,
+						user,
+						&Participant::user);
+					if (i == end(_participants)) {
+						_participants.push_back(value);
+					} else {
+						*i = value;
+					}
+				});
+			}
+			if (!_allReceived
+				&& (data.vparticipants().v.size() < kRequestPerPage)) {
+				_allReceived = true;
+			}
+			if (_allReceived) {
+				_fullCount = _participants.size();
+			}
+		});
+		ranges::sort(_participants, std::greater<>(), &Participant::date);
+		_channel->session().changes().peerUpdated(
+			_channel,
+			PeerUpdate::Flag::GroupCall);
+	}).fail([=](const RPCError &error) {
+		_allReceived = true;
+		_fullCount = _participants.size();
+		_channel->session().changes().peerUpdated(
+			_channel,
+			PeerUpdate::Flag::GroupCall);
+	}).send();
+}
+
+int GroupCall::fullCount() const {
+	return _fullCount;
+}
+
+bool GroupCall::participantsLoaded() const {
+	return _allReceived;
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
new file mode 100644
index 000000000..c72c20de4
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_group_call.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
+
+class UserData;
+class ChannelData;
+
+namespace Data {
+
+class GroupCall final {
+public:
+	GroupCall(not_null<ChannelData*> channel, uint64 id, uint64 accessHash);
+
+	[[nodiscard]] uint64 id() const;
+	[[nodiscard]] MTPInputGroupCall input() const;
+
+	struct Participant {
+		not_null<UserData*> user;
+		TimeId date = 0;
+		int source = 0;
+		bool muted = false;
+		bool canSelfUnmute = false;
+		bool left = false;
+	};
+
+	[[nodiscard]] auto participants() const
+		-> const std::vector<Participant> &;
+	void requestParticipants();
+	[[nodiscard]] bool participantsLoaded() const;
+
+	[[nodiscard]] int fullCount() const;
+
+private:
+	const not_null<ChannelData*> _channel;
+	const uint64 _id = 0;
+	const uint64 _accessHash = 0;
+
+	int _version = 0;
+	UserId _adminId = 0;
+	uint64 _reflectorId = 0;
+	mtpRequestId _participantsRequestId = 0;
+
+	std::vector<Participant> _participants;
+	int _fullCount = 0;
+	bool _allReceived = false;
+
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 649b144d0..db6a3c46a 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -55,6 +55,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_scheduled_messages.h"
 #include "data/data_file_origin.h"
 #include "data/data_histories.h"
+#include "data/data_group_call.h"
 #include "data/stickers/data_stickers.h"
 #include "history/history.h"
 #include "history/history_item.h"
@@ -74,6 +75,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #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/history_view_group_call_tracker.h"
 #include "history/view/media/history_view_media.h"
 #include "profile/profile_block_group_members.h"
 #include "info/info_memento.h"
@@ -100,6 +102,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "base/qthelp_regex.h"
 #include "ui/chat/pinned_bar.h"
+#include "ui/chat/group_call_bar.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/item_text_options.h"
 #include "ui/unread_badge.h"
@@ -118,6 +121,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "support/support_common.h"
 #include "support/support_autocomplete.h"
 #include "dialogs/dialogs_key.h"
+#include "calls/calls_instance.h"
 #include "facades.h"
 #include "app.h"
 #include "styles/style_chat.h"
@@ -1775,6 +1779,8 @@ void HistoryWidget::showHistory(
 		destroyUnreadBarOnClose();
 		_pinnedBar = nullptr;
 		_pinnedTracker = nullptr;
+		_groupCallBar = nullptr;
+		_groupCallTracker = nullptr;
 		_membersDropdown.destroy();
 		_scrollToAnimation.stop();
 
@@ -1886,6 +1892,7 @@ void HistoryWidget::showHistory(
 		_updateHistoryItems.cancel();
 
 		setupPinnedTracker();
+		setupGroupCallTracker();
 		if (_history->scrollTopItem
 			|| (_migrated && _migrated->scrollTopItem)
 			|| _history->isReadyFor(_showAtMsgId)) {
@@ -2093,6 +2100,9 @@ void HistoryWidget::updateControlsVisibility() {
 	if (_pinnedBar) {
 		_pinnedBar->show();
 	}
+	if (_groupCallBar) {
+		_groupCallBar->show();
+	}
 	if (_firstLoadRequest && !_scroll->isHidden()) {
 		_scroll->hide();
 	} else if (!_firstLoadRequest && _scroll->isHidden()) {
@@ -3037,6 +3047,9 @@ void HistoryWidget::hideChildWidgets() {
 	if (_pinnedBar) {
 		_pinnedBar->hide();
 	}
+	if (_groupCallBar) {
+		_groupCallBar->hide();
+	}
 	if (_voiceRecordBar) {
 		_voiceRecordBar->hideFast();
 	}
@@ -3250,6 +3263,9 @@ void HistoryWidget::showAnimated(
 	if (_pinnedBar) {
 		_pinnedBar->finishAnimating();
 	}
+	if (_groupCallBar) {
+		_groupCallBar->finishAnimating();
+	}
 	_topShadow->setVisible(params.withTopBarShadow ? false : true);
 	_preserveScrollTop = false;
 
@@ -3278,6 +3294,9 @@ void HistoryWidget::animationCallback() {
 		if (_pinnedBar) {
 			_pinnedBar->finishAnimating();
 		}
+		if (_groupCallBar) {
+			_groupCallBar->finishAnimating();
+		}
 		_cacheUnder = _cacheOver = QPixmap();
 		doneShow();
 		synteticScrollToY(_scroll->scrollTop());
@@ -3301,6 +3320,9 @@ void HistoryWidget::doneShow() {
 	if (_pinnedBar) {
 		_pinnedBar->finishAnimating();
 	}
+	if (_groupCallBar) {
+		_groupCallBar->finishAnimating();
+	}
 	checkHistoryActivation();
 	App::wnd()->setInnerFocus();
 	_preserveScrollTop = false;
@@ -4409,7 +4431,12 @@ void HistoryWidget::updateControlsGeometry() {
 		_pinnedBar->move(0, pinnedBarTop);
 		_pinnedBar->resizeToWidth(width());
 	}
-	const auto contactStatusTop = pinnedBarTop + (_pinnedBar ? _pinnedBar->height() : 0);
+	const auto groupCallTop = pinnedBarTop + (_pinnedBar ? _pinnedBar->height() : 0);
+	if (_groupCallBar) {
+		_groupCallBar->move(0, groupCallTop);
+		_groupCallBar->resizeToWidth(width());
+	}
+	const auto contactStatusTop = groupCallTop + (_groupCallBar ? _groupCallBar->height() : 0);
 	if (_contactStatus) {
 		_contactStatus->move(0, contactStatusTop);
 	}
@@ -4572,6 +4599,9 @@ void HistoryWidget::updateHistoryGeometry(
 	if (_pinnedBar) {
 		newScrollHeight -= _pinnedBar->height();
 	}
+	if (_groupCallBar) {
+		newScrollHeight -= _groupCallBar->height();
+	}
 	if (_contactStatus) {
 		newScrollHeight -= _contactStatus->height();
 	}
@@ -4804,6 +4834,7 @@ int HistoryWidget::computeMaxFieldHeight() const {
 		- _topBar->height()
 		- (_contactStatus ? _contactStatus->height() : 0)
 		- (_pinnedBar ? _pinnedBar->height() : 0)
+		- (_groupCallBar ? _groupCallBar->height() : 0)
 		- ((_editMsgId
 			|| replyToId()
 			|| readyToForward()
@@ -5009,6 +5040,7 @@ void HistoryWidget::handlePeerMigration() {
 		_migrated = _history->migrateFrom();
 		_list->notifyMigrateUpdated();
 		setupPinnedTracker();
+		setupGroupCallTracker();
 		updateHistoryGeometry();
 	}
 	const auto from = chat->owner().historyLoaded(chat);
@@ -5341,6 +5373,68 @@ void HistoryWidget::refreshPinnedBarButton(bool many) {
 	_pinnedBar->setRightButton(std::move(button));
 }
 
+void HistoryWidget::setupGroupCallTracker() {
+	Expects(_history != nullptr);
+
+	const auto channel = _history->peer->asChannel();
+	if (!channel) {
+		_groupCallTracker = nullptr;
+		_groupCallBar = nullptr;
+		return;
+	}
+	_groupCallTracker = std::make_unique<HistoryView::GroupCallTracker>(
+		channel);
+	_groupCallBar = std::make_unique<Ui::GroupCallBar>(
+		this,
+		_groupCallTracker->content());
+
+	rpl::single(
+		rpl::empty_value()
+	) | rpl::then(
+		base::ObservableViewer(Adaptive::Changed())
+	) | rpl::map([] {
+		return Adaptive::OneColumn();
+	}) | rpl::start_with_next([=](bool one) {
+		_groupCallBar->setShadowGeometryPostprocess([=](QRect geometry) {
+			if (!one) {
+				geometry.setLeft(geometry.left() + st::lineWidth);
+			}
+			return geometry;
+		});
+	}, _groupCallBar->lifetime());
+
+	rpl::merge(
+		_groupCallBar->barClicks(),
+		_groupCallBar->joinClicks()
+	) | rpl::start_with_next([=] {
+		const auto channel = _history->peer->asChannel();
+		if (!channel) {
+			return;
+		}
+		const auto call = channel->call();
+		if (!call) {
+			return;
+		}
+		Core::App().calls().joinGroupCall(channel, call->input());
+	}, _groupCallBar->lifetime());
+
+	_groupCallBarHeight = 0;
+	_groupCallBar->heightValue(
+	) | rpl::start_with_next([=](int height) {
+		_topDelta = _preserveScrollTop ? 0 : (height - _groupCallBarHeight);
+		_groupCallBarHeight = height;
+		updateHistoryGeometry();
+		updateControlsGeometry();
+		_topDelta = 0;
+	}, _groupCallBar->lifetime());
+
+	orderWidgets();
+
+	if (_a_show.animating()) {
+		_groupCallBar->hide();
+	}
+}
+
 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 73d967fc7..62e61c5e7 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -61,6 +61,7 @@ class FlatButton;
 class LinkButton;
 class RoundButton;
 class PinnedBar;
+class GroupCallBar;
 struct PreparedList;
 class SendFilesWay;
 namespace Toast {
@@ -90,6 +91,7 @@ class TopBarWidget;
 class ContactStatus;
 class Element;
 class PinnedTracker;
+class GroupCallTracker;
 namespace Controls {
 class RecordLock;
 class VoiceRecordBar;
@@ -475,6 +477,8 @@ private:
 		int wasScrollTop,
 		int nowScrollTop);
 
+	void setupGroupCallTracker();
+
 	void sendInlineResult(InlineBots::ResultSelected result);
 
 	void drawField(Painter &p, const QRect &rect);
@@ -591,10 +595,15 @@ 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;
 
+	std::unique_ptr<HistoryView::GroupCallTracker> _groupCallTracker;
+	std::unique_ptr<Ui::GroupCallBar> _groupCallBar;
+	int _groupCallBarHeight = 0;
+
+	bool _preserveScrollTop = false;
+
 	mtpRequestId _saveEditMsgRequestId = 0;
 
 	QStringList _parsedLinks;
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
new file mode 100644
index 000000000..9712d559f
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
@@ -0,0 +1,42 @@
+/*
+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_group_call_tracker.h"
+
+#include "data/data_channel.h"
+#include "data/data_changes.h"
+#include "data/data_group_call.h"
+#include "main/main_session.h"
+#include "ui/chat/group_call_bar.h"
+
+namespace HistoryView {
+
+GroupCallTracker::GroupCallTracker(not_null<ChannelData*> channel)
+: _channel(channel) {
+}
+
+rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::content() const {
+	const auto channel = _channel;
+	return channel->session().changes().peerFlagsValue(
+		channel,
+		Data::PeerUpdate::Flag::GroupCall
+	) | rpl::map([=]() -> Ui::GroupCallBarContent {
+		const auto call = channel->call();
+		if (!call) {
+			return { .shown = false };
+		} else if (!call->fullCount() && !call->participantsLoaded()) {
+			call->requestParticipants();
+		}
+		return { .count = call->fullCount(), .shown = true };
+	});
+}
+
+rpl::producer<> GroupCallTracker::joinClicks() const {
+	return _joinClicks.events();
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h
new file mode 100644
index 000000000..1dc6c4f94
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h
@@ -0,0 +1,32 @@
+/*
+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 GroupCallBarContent;
+} // namespace Ui
+
+namespace HistoryView {
+
+class GroupCallTracker final {
+public:
+	GroupCallTracker(not_null<ChannelData*> channel);
+
+	[[nodiscard]] rpl::producer<Ui::GroupCallBarContent> content() const;
+	[[nodiscard]] rpl::producer<> joinClicks() const;
+
+private:
+	not_null<ChannelData*> _channel;
+
+	rpl::event_stream<> _joinClicks;
+
+};
+
+} // namespace HistoryView
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 c5eee7f76..1414db537 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -200,6 +200,8 @@ void TopBarWidget::onCall() {
 	if (const auto peer = _activeChat.key.peer()) {
 		if (const auto user = peer->asUser()) {
 			Core::App().calls().startOutgoingCall(user, false);
+		} else if (const auto megagroup = peer->asMegagroup()) {
+			Core::App().calls().startGroupCall(megagroup);
 		}
 	}
 }
@@ -691,6 +693,8 @@ void TopBarWidget::updateControlsVisibility() {
 			if (const auto user = peer->asUser()) {
 				return session().serverConfig().phoneCallsEnabled.current()
 					&& user->hasCalls();
+			} else if (const auto megagroup = peer->asMegagroup()) {
+				return true;
 			}
 		}
 		return false;
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
new file mode 100644
index 000000000..497120ad6
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -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
+*/
+#include "ui/chat/group_call_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 {
+
+GroupCallBar::GroupCallBar(
+	not_null<QWidget*> parent,
+	rpl::producer<GroupCallBarContent> content)
+	: _wrap(parent, object_ptr<RpWidget>(parent))
+	, _inner(_wrap.entity())
+	, _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::start_with_next([=](GroupCallBarContent &&content) {
+		_content = content;
+		_inner->update();
+	}, lifetime());
+
+	std::move(
+		copy
+	) | rpl::map([=](const GroupCallBarContent &content) {
+		return !content.shown;
+	}) | rpl::start_with_next_done([=](bool hidden) {
+		_shouldBeShown = !hidden;
+		if (!_forceHidden) {
+			_wrap.toggle(_shouldBeShown, anim::type::normal);
+		}
+	}, [=] {
+		_forceHidden = true;
+		_wrap.toggle(false, anim::type::normal);
+	}, lifetime());
+
+	setupInner();
+}
+
+GroupCallBar::~GroupCallBar() {
+}
+
+void GroupCallBar::setupInner() {
+	_inner->resize(0, st::historyReplyHeight);
+	_inner->paintRequest(
+	) | rpl::start_with_next([=](QRect rect) {
+		auto p = Painter(_inner);
+		paint(p);
+	}, _inner->lifetime());
+
+
+	// Clicks.
+	_inner->setCursor(style::cur_pointer);
+	_inner->events(
+	) | rpl::filter([=](not_null<QEvent*> event) {
+		return (event->type() == QEvent::MouseButtonPress);
+	}) | rpl::map([=] {
+		return _inner->events(
+		) | rpl::filter([=](not_null<QEvent*> event) {
+			return (event->type() == QEvent::MouseButtonRelease);
+		}) | rpl::take(1) | rpl::filter([=](not_null<QEvent*> event) {
+			return _inner->rect().contains(
+				static_cast<QMouseEvent*>(event.get())->pos());
+		});
+	}) | rpl::flatten_latest(
+	) | rpl::map([] {
+		return rpl::empty_value();
+	}) | rpl::start_to_stream(_barClicks, _inner->lifetime());
+}
+
+void GroupCallBar::paint(Painter &p) {
+	p.fillRect(_inner->rect(), st::historyComposeAreaBg);
+	p.setPen(st::defaultMessageBar.textFg);
+	p.setFont(st::defaultMessageBar.text.font);
+	p.drawText(_inner->rect(), "Voice Chat", style::al_center);
+}
+
+void GroupCallBar::updateControlsGeometry(QRect wrapGeometry) {
+	_inner->resizeToWidth(wrapGeometry.width());
+	const auto hidden = _wrap.isHidden() || !wrapGeometry.height();
+	if (_shadow->isHidden() != hidden) {
+		_shadow->setVisible(!hidden);
+	}
+}
+
+void GroupCallBar::setShadowGeometryPostprocess(Fn<QRect(QRect)> postprocess) {
+	_shadowGeometryPostprocess = std::move(postprocess);
+	updateShadowGeometry(_wrap.geometry());
+}
+
+void GroupCallBar::updateShadowGeometry(QRect wrapGeometry) {
+	const auto regular = QRect(
+		wrapGeometry.x(),
+		wrapGeometry.y() + wrapGeometry.height(),
+		wrapGeometry.width(),
+		st::lineWidth);
+	_shadow->setGeometry(_shadowGeometryPostprocess
+		? _shadowGeometryPostprocess(regular)
+		: regular);
+}
+
+void GroupCallBar::show() {
+	if (!_forceHidden) {
+		return;
+	}
+	_forceHidden = false;
+	if (_shouldBeShown) {
+		_wrap.show(anim::type::instant);
+		_shadow->show();
+	}
+}
+
+void GroupCallBar::hide() {
+	if (_forceHidden) {
+		return;
+	}
+	_forceHidden = true;
+	_wrap.hide(anim::type::instant);
+	_shadow->hide();
+}
+
+void GroupCallBar::raise() {
+	_wrap.raise();
+	_shadow->raise();
+}
+
+void GroupCallBar::finishAnimating() {
+	_wrap.finishAnimating();
+}
+
+void GroupCallBar::move(int x, int y) {
+	_wrap.move(x, y);
+}
+
+void GroupCallBar::resizeToWidth(int width) {
+	_wrap.entity()->resizeToWidth(width);
+}
+
+int GroupCallBar::height() const {
+	return !_forceHidden
+		? _wrap.height()
+		: _shouldBeShown
+		? st::historyReplyHeight
+		: 0;
+}
+
+rpl::producer<int> GroupCallBar::heightValue() const {
+	return _wrap.heightValue();
+}
+
+rpl::producer<> GroupCallBar::barClicks() const {
+	return _barClicks.events();
+}
+
+rpl::producer<> GroupCallBar::joinClicks() const {
+	return rpl::never<>();
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.h b/Telegram/SourceFiles/ui/chat/group_call_bar.h
new file mode 100644
index 000000000..fe0ec25ae
--- /dev/null
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.h
@@ -0,0 +1,69 @@
+/*
+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 "base/object_ptr.h"
+
+class Painter;
+
+namespace Ui {
+
+class PlainShadow;
+
+struct GroupCallBarContent {
+	int count = 0;
+	bool shown = false;
+	bool joined = false;
+	// #TODO calls userpics
+};
+
+class GroupCallBar final {
+public:
+	GroupCallBar(
+		not_null<QWidget*> parent,
+		rpl::producer<GroupCallBarContent> content);
+	~GroupCallBar();
+
+	void show();
+	void hide();
+	void raise();
+	void finishAnimating();
+
+	void setShadowGeometryPostprocess(Fn<QRect(QRect)> postprocess);
+
+	void move(int x, int y);
+	void resizeToWidth(int width);
+	[[nodiscard]] int height() const;
+	[[nodiscard]] rpl::producer<int> heightValue() const;
+	[[nodiscard]] rpl::producer<> barClicks() const;
+	[[nodiscard]] rpl::producer<> joinClicks() const;
+
+	[[nodiscard]] rpl::lifetime &lifetime() {
+		return _wrap.lifetime();
+	}
+
+private:
+	void updateShadowGeometry(QRect wrapGeometry);
+	void updateControlsGeometry(QRect wrapGeometry);
+	void setupInner();
+	void paint(Painter &p);
+
+	Ui::SlideWrap<> _wrap;
+	not_null<Ui::RpWidget*> _inner;
+	std::unique_ptr<Ui::PlainShadow> _shadow;
+	rpl::event_stream<> _barClicks;
+	Fn<QRect(QRect)> _shadowGeometryPostprocess;
+	bool _shouldBeShown = false;
+	bool _forceHidden = false;
+
+	GroupCallBarContent _content;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index e8e9dd893..176e5fff5 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit e8e9dd8934fdea47b2b2b0dadf2100fc3c17c914
+Subproject commit 176e5fff55478f23deec25c3bbcdaf9d0f3e19b2
diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake
index b4841e601..6e837df05 100644
--- a/Telegram/cmake/lib_tgcalls.cmake
+++ b/Telegram/cmake/lib_tgcalls.cmake
@@ -53,6 +53,9 @@ if (NOT DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION)
         VideoCaptureInterfaceImpl.h
         VideoCapturerInterface.h
 
+        group/GroupInstanceImpl.cpp
+        group/GroupInstanceImpl.h
+
         platform/PlatformInterface.h
 
         # Android
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 1c7d0888c..016c02a6d 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -78,6 +78,8 @@ PRIVATE
     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/group_call_bar.cpp
+    ui/chat/group_call_bar.h
     ui/chat/message_bar.cpp
     ui/chat/message_bar.h
     ui/chat/pinned_bar.cpp

From 25f3c14780028cc0215a3f05f6fbeef4f784075d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 24 Nov 2020 14:56:46 +0300
Subject: [PATCH 159/370] Apply group call updates.

---
 Telegram/SourceFiles/calls/calls_call.h       |   1 +
 .../SourceFiles/calls/calls_group_call.cpp    | 147 +++++++++++++---
 Telegram/SourceFiles/calls/calls_group_call.h |  37 +++-
 Telegram/SourceFiles/calls/calls_instance.cpp |  27 ++-
 Telegram/SourceFiles/calls/calls_instance.h   |   3 +
 Telegram/SourceFiles/data/data_group_call.cpp | 160 +++++++++++++++---
 Telegram/SourceFiles/data/data_group_call.h   |  22 ++-
 Telegram/SourceFiles/data/data_session.cpp    |  14 ++
 Telegram/SourceFiles/data/data_session.h      |   7 +
 9 files changed, 357 insertions(+), 61 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_call.h b/Telegram/SourceFiles/calls/calls_call.h
index 2075be7ab..7bfef7ba6 100644
--- a/Telegram/SourceFiles/calls/calls_call.h
+++ b/Telegram/SourceFiles/calls/calls_call.h
@@ -191,6 +191,7 @@ private:
 		Ended,
 		Failed,
 	};
+
 	void handleRequestError(const RPCError &error);
 	void handleControllerError(const QString &error);
 	void finish(
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 0dcd19e6b..15ff367de 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -25,7 +25,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 //#include "calls/calls_panel.h"
 //#include "webrtc/webrtc_video_track.h"
 //#include "webrtc/webrtc_media_devices.h"
+#include "data/data_changes.h"
 #include "data/data_channel.h"
+#include "data/data_group_call.h"
 //#include "data/data_session.h"
 //#include "facades.h"
 
@@ -49,6 +51,7 @@ GroupCall::GroupCall(
 , _channel(channel)
 , _api(&_channel->session().mtp()) {
 	if (inputCall.c_inputGroupCall().vid().v) {
+		_state = State::Joining;
 		join(inputCall);
 	} else {
 		start();
@@ -59,19 +62,51 @@ GroupCall::~GroupCall() {
 	destroyController();
 }
 
+void GroupCall::setState(State state) {
+	if (_state.current() == State::Failed) {
+		return;
+	} else if (_state.current() == State::FailedHangingUp
+		&& state != State::Failed) {
+		return;
+	}
+	if (_state.current() == state) {
+		return;
+	}
+	_state = state;
+
+	if (false
+		|| state == State::Ended
+		|| state == State::Failed) {
+		// Destroy controller before destroying Call Panel,
+		// so that the panel hide animation is smooth.
+		destroyController();
+	}
+	switch (state) {
+	case State::Ended:
+		_delegate->groupCallFinished(this);
+		break;
+	case State::Failed:
+		_delegate->groupCallFailed(this);
+		break;
+	}
+}
+
 void GroupCall::start() {
 	const auto randomId = rand_value<int32>();
 	_api.request(MTPphone_CreateGroupCall(
 		_channel->inputChannel,
 		MTP_int(randomId)
 	)).done([=](const MTPUpdates &result) {
+		_acceptFields = true;
 		_channel->session().api().applyUpdates(result);
+		_acceptFields = false;
 	}).fail([=](const RPCError &error) {
 		int a = error.code();
 	}).send();
 }
 
 void GroupCall::join(const MTPInputGroupCall &inputCall) {
+	setState(State::Joining);
 	inputCall.match([&](const MTPDinputGroupCall &data) {
 		_id = data.vid().v;
 		_accessHash = data.vaccess_hash().v;
@@ -91,10 +126,11 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 				}
 
 				auto root = QJsonObject();
+				const auto ssrc = payload.ssrc;
 				root.insert("ufrag", QString::fromStdString(payload.ufrag));
 				root.insert("pwd", QString::fromStdString(payload.pwd));
 				root.insert("fingerprints", fingerprints);
-				root.insert("ssrc", int(payload.ssrc));
+				root.insert("ssrc", double(payload.ssrc));
 
 				const auto json = QJsonDocument(root).toJson(
 					QJsonDocument::Compact);
@@ -105,6 +141,9 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 					inputCall,
 					MTP_dataJSON(MTP_bytes(json))
 				)).done([=](const MTPUpdates &updates) {
+					_mySsrc = ssrc;
+					setState(State::Joined);
+
 					_channel->session().api().applyUpdates(updates);
 				}).fail([=](const RPCError &error) {
 					int a = error.code();
@@ -112,6 +151,77 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 			});
 		});
 	});
+	_channel->setCall(inputCall);
+
+	_channel->session().changes().peerFlagsValue(
+		_channel,
+		Data::PeerUpdate::Flag::GroupCall
+	) | rpl::start_with_next([=] {
+		checkParticipants();
+	}, _lifetime);
+}
+
+void GroupCall::checkParticipants() {
+	if (!joined()) {
+		return;
+	}
+	const auto call = _channel->call();
+	if (!call || call->id() != _id) {
+		finish(FinishType::Ended);
+		return;
+	}
+	const auto &sources = call->sources();
+	if (sources.size() != call->fullCount() || sources.empty()) {
+		call->reload();
+		return;
+	}
+	auto ssrcs = std::vector<uint32_t>();
+	ssrcs.reserve(sources.size());
+	for (const auto source : sources) {
+		if (source != _mySsrc) {
+			ssrcs.push_back(source);
+		}
+	}
+	_instance->setSsrcs(std::move(ssrcs));
+	_instance->setIsMuted(false);
+}
+
+void GroupCall::hangup() {
+	finish(FinishType::Ended);
+}
+
+void GroupCall::finish(FinishType type) {
+	Expects(type != FinishType::None);
+
+	const auto finalState = (type == FinishType::Ended)
+		? State::Ended
+		: State::Failed;
+	const auto hangupState = (type == FinishType::Ended)
+		? State::HangingUp
+		: State::FailedHangingUp;
+	const auto state = _state.current();
+	if (state == State::HangingUp
+		|| state == State::FailedHangingUp
+		|| state == State::Ended
+		|| state == State::Failed) {
+		return;
+	}
+	if (!joined()) {
+		setState(finalState);
+		return;
+	}
+
+	setState(hangupState);
+	_api.request(MTPphone_LeaveGroupCall(
+		inputCall()
+	)).done([=](const MTPUpdates &result) {
+		// Here 'this' could be destroyed by updates, so we set Ended after
+		// updates being handled, but in a guarded way.
+		crl::on_main(this, [=] { setState(finalState); });
+		_channel->session().api().applyUpdates(result);
+	}).fail([=](const RPCError &error) {
+		setState(finalState);
+	}).send();
 }
 
 void GroupCall::setMuted(bool mute) {
@@ -123,7 +233,13 @@ void GroupCall::setMuted(bool mute) {
 
 bool GroupCall::handleUpdate(const MTPGroupCall &call) {
 	return call.match([&](const MTPDgroupCall &data) {
-		if (_id != data.vid().v
+		if (_acceptFields) {
+			if (_instance || _id) {
+				return false;
+			}
+			join(MTP_inputGroupCall(data.vid(), data.vaccess_hash()));
+			return true;
+		} else if (_id != data.vid().v
 			|| _accessHash != data.vaccess_hash().v
 			|| !_instance) {
 			return false;
@@ -182,35 +298,10 @@ bool GroupCall::handleUpdate(const MTPGroupCall &call) {
 					});
 				}
 				_instance->setJoinResponsePayload(payload);
-				_api.request(MTPphone_GetGroupParticipants(
-					inputCall(),
-					MTP_int(0),
-					MTP_int(10)
-				)).done([=](const MTPphone_GroupParticipants &result) {
-					auto sources = std::vector<uint32_t>();
-					result.match([&](const MTPDphone_groupParticipants &data) {
-						for (const auto &p : data.vparticipants().v) {
-							p.match([&](const MTPDgroupCallParticipant &data) {
-								if (data.vuser_id().v != _channel->session().userId()) {
-									sources.push_back(data.vsource().v);
-								}
-							});
-						}
-					});
-					_instance->setSsrcs(std::move(sources));
-					_instance->setIsMuted(false);
-				}).fail([=](const RPCError &error) {
-					int a = error.code();
-				}).send();
+				checkParticipants();
 			});
 		}
 		return true;
-	}, [&](const MTPDgroupCallPrivate &data) {
-		if (_instance || _id) {
-			return false;
-		}
-		join(MTP_inputGroupCall(data.vid(), data.vaccess_hash()));
-		return true;
 	}, [&](const MTPDgroupCallDiscarded &data) {
 		if (data.vid().v != _id) {
 			return false;
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 412a8e168..6286f3de5 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -25,6 +25,9 @@ public:
 	public:
 		virtual ~Delegate() = default;
 
+		virtual void groupCallFinished(not_null<GroupCall*> call) = 0;
+		virtual void groupCallFailed(not_null<GroupCall*> call) = 0;
+
 	};
 
 	GroupCall(
@@ -38,6 +41,7 @@ public:
 	}
 
 	void start();
+	void hangup();
 	void join(const MTPInputGroupCall &inputCall);
 	bool handleUpdate(const MTPGroupCall &call);
 
@@ -48,6 +52,25 @@ public:
 	[[nodiscard]] rpl::producer<bool> mutedValue() const {
 		return _muted.value();
 	}
+	[[nodiscard]] bool joined() const {
+		return _mySsrc != 0;
+	}
+
+	enum State {
+		Creating,
+		Joining,
+		Joined,
+		FailedHangingUp,
+		Failed,
+		HangingUp,
+		Ended,
+	};
+	[[nodiscard]] State state() const {
+		return _state.current();
+	}
+	[[nodiscard]] rpl::producer<State> stateValue() const {
+		return _state.value();
+	}
 
 	void setCurrentAudioDevice(bool input, const QString &deviceId);
 	void setAudioVolume(bool input, float level);
@@ -58,22 +81,34 @@ public:
 	}
 
 private:
+	enum class FinishType {
+		None,
+		Ended,
+		Failed,
+	};
+
 	void handleRequestError(const RPCError &error);
 	void handleControllerError(const QString &error);
 	void createAndStartController();
 	void destroyController();
+	void checkParticipants();
+
+	void setState(State state);
+	void finish(FinishType type);
 
 	[[nodiscard]] MTPInputGroupCall inputCall() const;
 
 	const not_null<Delegate*> _delegate;
 	const not_null<ChannelData*> _channel;
 	MTP::Sender _api;
-	crl::time _startTime = 0;
+	rpl::variable<State> _state = State::Creating;
 
 	rpl::variable<bool> _muted = false;
+	bool _acceptFields = false;
 
 	uint64 _id = 0;
 	uint64 _accessHash = 0;
+	uint32 _mySsrc = 0;
 
 	std::unique_ptr<tgcalls::GroupInstanceImpl> _instance;
 
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index b0cd55288..9dd83f4ec 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_call.h"
 #include "calls/calls_panel.h"
 #include "data/data_user.h"
+#include "data/data_group_call.h"
 #include "data/data_channel.h"
 #include "data/data_session.h"
 #include "media/audio/media_audio_track.h"
@@ -93,6 +94,18 @@ void Instance::callRedial(not_null<Call*> call) {
 	}
 }
 
+void Instance::groupCallFinished(not_null<GroupCall*> call) {
+	crl::on_main(call, [=] {
+		destroyGroupCall(call);
+	});
+}
+
+void Instance::groupCallFailed(not_null<GroupCall*> call) {
+	crl::on_main(call, [=] {
+		destroyGroupCall(call);
+	});
+}
+
 void Instance::playSound(Sound sound) {
 	switch (sound) {
 	case Sound::Busy: {
@@ -351,6 +364,12 @@ void Instance::handleCallUpdate(
 void Instance::handleGroupCallUpdate(
 		not_null<Main::Session*> session,
 		const MTPGroupCall &call) {
+	const auto callId = call.match([](const auto &data) {
+		return data.vid().v;
+	});
+	if (const auto existing = session->data().groupCall(callId)) {
+		existing->applyUpdate(call);
+	}
 	if (_currentGroupCall) {
 		_currentGroupCall->handleUpdate(call);
 	}
@@ -359,6 +378,12 @@ void Instance::handleGroupCallUpdate(
 void Instance::handleGroupCallUpdate(
 		not_null<Main::Session*> session,
 		const MTPDupdateGroupCallParticipants &update) {
+	const auto callId = update.vcall().match([](const auto &data) {
+		return data.vid().v;
+	});
+	if (const auto existing = session->data().groupCall(callId)) {
+		existing->applyUpdate(update);
+	}
 }
 
 void Instance::handleSignalingData(
@@ -424,7 +449,7 @@ void Instance::requestPermissionOrFail(Platform::PermissionType type, Fn<void()>
 			_currentCall->hangup();
 		}
 		if (inGroupCall()) {
-			//_currentGroupCall->hangup(); // #TODO calls
+			_currentGroupCall->hangup();
 		}
 		Ui::show(Box<ConfirmBox>(tr::lng_no_mic_permission(tr::now), tr::lng_menu_settings(tr::now), crl::guard(this, [=] {
 			Platform::OpenSystemSettingsForPermission(type);
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index 390292b97..2c2c2a761 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -70,6 +70,9 @@ private:
 		requestPermissionsOrFail(std::move(onSuccess));
 	}
 
+	void groupCallFinished(not_null<GroupCall*> call) override;
+	void groupCallFailed(not_null<GroupCall*> call) override;
+
 	using Sound = Call::Delegate::Sound;
 	void playSound(Sound sound) override;
 	void createCall(not_null<UserData*> user, Call::Type type, bool video);
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index 147c23ed4..97192f76d 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -29,10 +29,19 @@ GroupCall::GroupCall(
 , _accessHash(accessHash) {
 }
 
+GroupCall::~GroupCall() {
+	_channel->session().api().request(_participantsRequestId).cancel();
+	_channel->session().api().request(_reloadRequestId).cancel();
+}
+
 uint64 GroupCall::id() const {
 	return _id;
 }
 
+not_null<ChannelData*> GroupCall::channel() const {
+	return _channel;
+}
+
 MTPInputGroupCall GroupCall::input() const {
 	return MTP_inputGroupCall(MTP_long(_id), MTP_long(_accessHash));
 }
@@ -42,8 +51,12 @@ auto GroupCall::participants() const
 	return _participants;
 }
 
+const base::flat_set<uint32> &GroupCall::sources() const {
+	return _sources;
+}
+
 void GroupCall::requestParticipants() {
-	if (_participantsRequestId) {
+	if (_participantsRequestId || _reloadRequestId) {
 		return;
 	} else if (_participants.size() >= _fullCount && _allReceived) {
 		return;
@@ -58,31 +71,9 @@ void GroupCall::requestParticipants() {
 		MTP_int(kRequestPerPage)
 	)).done([=](const MTPphone_GroupParticipants &result) {
 		result.match([&](const MTPDphone_groupParticipants &data) {
-			_fullCount = data.vcount().v;
 			_channel->owner().processUsers(data.vusers());
-			for (const auto &p : data.vparticipants().v) {
-				p.match([&](const MTPDgroupCallParticipant &data) {
-					const auto userId = data.vuser_id().v;
-					const auto user = _channel->owner().user(userId);
-					const auto value = Participant{
-						.user = user,
-						.date = data.vdate().v,
-						.source = data.vsource().v,
-						.muted = data.is_muted(),
-						.canSelfUnmute = data.is_can_self_unmute(),
-						.left = data.is_left()
-					};
-					const auto i = ranges::find(
-						_participants,
-						user,
-						&Participant::user);
-					if (i == end(_participants)) {
-						_participants.push_back(value);
-					} else {
-						*i = value;
-					}
-				});
-			}
+			applyParticipantsSlice(data.vparticipants().v);
+			_fullCount = data.vcount().v;
 			if (!_allReceived
 				&& (data.vparticipants().v.size() < kRequestPerPage)) {
 				_allReceived = true;
@@ -91,16 +82,17 @@ void GroupCall::requestParticipants() {
 				_fullCount = _participants.size();
 			}
 		});
-		ranges::sort(_participants, std::greater<>(), &Participant::date);
 		_channel->session().changes().peerUpdated(
 			_channel,
 			PeerUpdate::Flag::GroupCall);
+		_participantsRequestId = 0;
 	}).fail([=](const RPCError &error) {
-		_allReceived = true;
 		_fullCount = _participants.size();
+		_allReceived = true;
 		_channel->session().changes().peerUpdated(
 			_channel,
 			PeerUpdate::Flag::GroupCall);
+		_participantsRequestId = 0;
 	}).send();
 }
 
@@ -112,4 +104,118 @@ bool GroupCall::participantsLoaded() const {
 	return _allReceived;
 }
 
+void GroupCall::applyUpdate(const MTPGroupCall &update) {
+	applyCall(update, false);
+}
+
+void GroupCall::applyCall(const MTPGroupCall &call, bool force) {
+	call.match([&](const MTPDgroupCall &data) {
+		const auto changed = (_version != data.vversion().v)
+			|| (_fullCount != data.vparticipants_count().v);
+		if (!force && !changed) {
+			return;
+		} else if (!force && _version > data.vversion().v) {
+			reload();
+			return;
+		}
+		_version = data.vversion().v;
+		_fullCount = data.vparticipants_count().v;
+	}, [&](const MTPDgroupCallDiscarded &data) {
+		const auto changed = (_duration != data.vduration().v)
+			|| !_finished;
+		if (!force && !changed) {
+			return;
+		}
+		_finished = true;
+		_duration = data.vduration().v;
+	});
+	_channel->session().changes().peerUpdated(
+		_channel,
+		PeerUpdate::Flag::GroupCall);
+}
+
+void GroupCall::reload() {
+	if (_reloadRequestId) {
+		return;
+	} else if (_participantsRequestId) {
+		_channel->session().api().request(_participantsRequestId).cancel();
+		_participantsRequestId = 0;
+	}
+	_reloadRequestId = _channel->session().api().request(
+		MTPphone_GetGroupCall(input())
+	).done([=](const MTPphone_GroupCall &result) {
+		result.match([&](const MTPDphone_groupCall &data) {
+			_channel->owner().processUsers(data.vusers());
+			_participants.clear();
+			_sources.clear();
+			applyParticipantsSlice(data.vparticipants().v);
+			for (const auto &source : data.vsources().v) {
+				_sources.emplace(source.v);
+			}
+			_fullCount = _sources.size();
+			if (_participants.size() > _fullCount) {
+				_fullCount = _participants.size();
+			}
+			_allReceived = (_fullCount == _participants.size());
+			applyCall(data.vcall(), true);
+		});
+		_reloadRequestId = 0;
+	}).fail([=](const RPCError &error) {
+		_reloadRequestId = 0;
+	}).send();
+}
+
+void GroupCall::applyParticipantsSlice(
+		const QVector<MTPGroupCallParticipant> &list) {
+	for (const auto &participant : list) {
+		participant.match([&](const MTPDgroupCallParticipant &data) {
+			const auto userId = data.vuser_id().v;
+			const auto user = _channel->owner().user(userId);
+			const auto i = ranges::find(
+				_participants,
+				user,
+				&Participant::user);
+			if (data.is_left()) {
+				if (i != end(_participants)) {
+					_sources.remove(i->source);
+					_participants.erase(i);
+				}
+				if (_fullCount > _participants.size()) {
+					--_fullCount;
+				}
+				return;
+			}
+			const auto value = Participant{
+				.user = user,
+				.date = data.vdate().v,
+				.source = uint32(data.vsource().v),
+				.muted = data.is_muted(),
+				.canSelfUnmute = data.is_can_self_unmute(),
+			};
+			if (i == end(_participants)) {
+				_participants.push_back(value);
+				++_fullCount;
+			} else {
+				*i = value;
+			}
+			_sources.emplace(uint32(data.vsource().v));
+		});
+	}
+	ranges::sort(_participants, std::greater<>(), &Participant::date);
+}
+
+void GroupCall::applyUpdate(const MTPDupdateGroupCallParticipants &update) {
+	if (update.vversion().v <= _version) {
+		return;
+	} else if (update.vversion().v != _version + 1) {
+		reload();
+		return;
+	}
+	_version = update.vversion().v;
+	applyParticipantsSlice(update.vparticipants().v);
+	_channel->session().changes().peerUpdated(
+		_channel,
+		PeerUpdate::Flag::GroupCall);
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index c72c20de4..add71d960 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -15,38 +15,52 @@ namespace Data {
 class GroupCall final {
 public:
 	GroupCall(not_null<ChannelData*> channel, uint64 id, uint64 accessHash);
+	~GroupCall();
 
 	[[nodiscard]] uint64 id() const;
+	[[nodiscard]] not_null<ChannelData*> channel() const;
 	[[nodiscard]] MTPInputGroupCall input() const;
 
 	struct Participant {
 		not_null<UserData*> user;
 		TimeId date = 0;
-		int source = 0;
+		uint32 source = 0;
 		bool muted = false;
 		bool canSelfUnmute = false;
-		bool left = false;
 	};
 
 	[[nodiscard]] auto participants() const
 		-> const std::vector<Participant> &;
+	[[nodiscard]] const base::flat_set<uint32> &sources() const;
 	void requestParticipants();
 	[[nodiscard]] bool participantsLoaded() const;
 
+	void applyUpdate(const MTPGroupCall &update);
+	void applyUpdate(const MTPDupdateGroupCallParticipants &update);
+
 	[[nodiscard]] int fullCount() const;
 
+	void reload();
+	[[nodiscard]] bool finished() const;
+	[[nodiscard]] int duration() const;
+
 private:
+	void applyCall(const MTPGroupCall &call, bool force);
+	void applyParticipantsSlice(const QVector<MTPGroupCallParticipant> &list);
+
 	const not_null<ChannelData*> _channel;
 	const uint64 _id = 0;
 	const uint64 _accessHash = 0;
 
 	int _version = 0;
-	UserId _adminId = 0;
-	uint64 _reflectorId = 0;
 	mtpRequestId _participantsRequestId = 0;
+	mtpRequestId _reloadRequestId = 0;
 
 	std::vector<Participant> _participants;
+	base::flat_set<uint32> _sources;
 	int _fullCount = 0;
+	int _duration = 0;
+	bool _finished = false;
 	bool _allReceived = false;
 
 };
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 924c61179..c0b5cedf6 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -38,6 +38,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h" // tr::lng_deleted(tr::now) in user name
 #include "data/stickers/data_stickers.h"
 #include "data/data_changes.h"
+#include "data/data_group_call.h"
 #include "data/data_media_types.h"
 #include "data/data_folder.h"
 #include "data/data_channel.h"
@@ -791,6 +792,19 @@ void Session::applyMaximumChatVersions(const MTPVector<MTPChat> &data) {
 	}
 }
 
+void Session::registerGroupCall(not_null<GroupCall*> call) {
+	_groupCalls.emplace(call->id(), call);
+}
+
+void Session::unregisterGroupCall(not_null<GroupCall*> call) {
+	_groupCalls.remove(call->id());
+}
+
+GroupCall *Session::groupCall(uint64 callId) const {
+	const auto i = _groupCalls.find(callId);
+	return (i != end(_groupCalls)) ? i->second.get() : nullptr;
+}
+
 PeerData *Session::peerByUsername(const QString &username) const {
 	const auto uname = username.trimmed();
 	for (const auto &[peerId, peer] : _peers) {
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 4474e89b5..fc2fd3b46 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -60,6 +60,7 @@ class Histories;
 class DocumentMedia;
 class PhotoMedia;
 class Stickers;
+class GroupCall;
 
 class Session final {
 public:
@@ -153,6 +154,10 @@ public:
 
 	void applyMaximumChatVersions(const MTPVector<MTPChat> &data);
 
+	void registerGroupCall(not_null<GroupCall*> call);
+	void unregisterGroupCall(not_null<GroupCall*> call);
+	GroupCall *groupCall(uint64 callId) const;
+
 	void enumerateUsers(Fn<void(not_null<UserData*>)> action) const;
 	void enumerateGroups(Fn<void(not_null<PeerData*>)> action) const;
 	void enumerateChannels(Fn<void(not_null<ChannelData*>)> action) const;
@@ -906,6 +911,8 @@ private:
 
 	base::flat_set<not_null<ViewElement*>> _heavyViewParts;
 
+	base::flat_map<uint64, not_null<GroupCall*>> _groupCalls;
+
 	History *_topPromoted = nullptr;
 
 	NotifySettings _defaultUserNotifySettings;

From 8833d3e45b9eafe822284d2f11e18b7eff140265 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 24 Nov 2020 15:54:20 +0300
Subject: [PATCH 160/370] Add empty group call panel.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/SourceFiles/calls/calls.style        |   3 +
 .../SourceFiles/calls/calls_group_panel.cpp   | 462 ++++++++++++++++++
 .../SourceFiles/calls/calls_group_panel.h     |  96 ++++
 Telegram/SourceFiles/calls/calls_instance.cpp |  22 +-
 Telegram/SourceFiles/calls/calls_instance.h   |   5 +
 6 files changed, 588 insertions(+), 2 deletions(-)
 create mode 100644 Telegram/SourceFiles/calls/calls_group_panel.cpp
 create mode 100644 Telegram/SourceFiles/calls/calls_group_panel.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index c54dd9165..a483dabc4 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -266,6 +266,8 @@ PRIVATE
     calls/calls_call.h
     calls/calls_group_call.cpp
     calls/calls_group_call.h
+    calls/calls_group_panel.cpp
+    calls/calls_group_panel.h
     calls/calls_emoji_fingerprint.cpp
     calls/calls_emoji_fingerprint.h
     calls/calls_instance.cpp
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index ae044b7c9..91441586b 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -399,3 +399,6 @@ callTitleShadow: icon {{ "calls_shadow_controls", windowShadowFg }};
 callErrorToast: Toast(defaultToast) {
 	minWidth: 240px;
 }
+
+groupCallWidth: 380px;
+groupCallHeight: 580px;
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
new file mode 100644
index 000000000..4309519e4
--- /dev/null
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -0,0 +1,462 @@
+/*
+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 "calls/calls_group_panel.h"
+
+#include "data/data_photo.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "data/data_file_origin.h"
+#include "data/data_photo_media.h"
+#include "data/data_cloud_file.h"
+#include "data/data_changes.h"
+#include "calls/calls_emoji_fingerprint.h"
+#include "calls/calls_signal_bars.h"
+#include "calls/calls_userpic.h"
+#include "calls/calls_video_bubble.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
+#include "ui/widgets/window.h"
+#include "ui/effects/ripple_animation.h"
+#include "ui/image/image.h"
+#include "ui/text/format_values.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/platform/ui_platform_utility.h"
+#include "ui/toast/toast.h"
+#include "ui/empty_userpic.h"
+#include "ui/emoji_config.h"
+#include "core/application.h"
+#include "mainwindow.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "apiwrap.h"
+#include "platform/platform_specific.h"
+#include "base/platform/base_platform_info.h"
+#include "window/main_window.h"
+#include "app.h"
+#include "webrtc/webrtc_video_track.h"
+#include "styles/style_calls.h"
+#include "styles/style_chat.h"
+
+#ifdef Q_OS_WIN
+#include "ui/platform/win/ui_window_title_win.h"
+#endif // Q_OS_WIN
+
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QApplication>
+#include <QtGui/QWindow>
+
+namespace Calls {
+
+class GroupPanel::Button final : public Ui::RippleButton {
+public:
+	Button(
+		QWidget *parent,
+		const style::CallButton &stFrom,
+		const style::CallButton *stTo = nullptr);
+
+	void setProgress(float64 progress);
+	void setText(rpl::producer<QString> text);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+	void onStateChanged(State was, StateChangeSource source) override;
+
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+private:
+	QPoint iconPosition(not_null<const style::CallButton*> st) const;
+	void mixIconMasks();
+
+	not_null<const style::CallButton*> _stFrom;
+	const style::CallButton *_stTo = nullptr;
+	float64 _progress = 0.;
+
+	object_ptr<Ui::FlatLabel> _label = { nullptr };
+
+	QImage _bgMask, _bg;
+	QPixmap _bgFrom, _bgTo;
+	QImage _iconMixedMask, _iconFrom, _iconTo, _iconMixed;
+
+};
+
+GroupPanel::Button::Button(
+	QWidget *parent,
+	const style::CallButton &stFrom,
+	const style::CallButton *stTo)
+: Ui::RippleButton(parent, stFrom.button.ripple)
+, _stFrom(&stFrom)
+, _stTo(stTo) {
+	resize(_stFrom->button.width, _stFrom->button.height);
+
+	_bgMask = prepareRippleMask();
+	_bgFrom = App::pixmapFromImageInPlace(style::colorizeImage(_bgMask, _stFrom->bg));
+	if (_stTo) {
+		Assert(_stFrom->button.width == _stTo->button.width);
+		Assert(_stFrom->button.height == _stTo->button.height);
+		Assert(_stFrom->button.rippleAreaPosition == _stTo->button.rippleAreaPosition);
+		Assert(_stFrom->button.rippleAreaSize == _stTo->button.rippleAreaSize);
+
+		_bg = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
+		_bg.setDevicePixelRatio(cRetinaFactor());
+		_bgTo = App::pixmapFromImageInPlace(style::colorizeImage(_bgMask, _stTo->bg));
+		_iconMixedMask = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
+		_iconMixedMask.setDevicePixelRatio(cRetinaFactor());
+		_iconFrom = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
+		_iconFrom.setDevicePixelRatio(cRetinaFactor());
+		_iconFrom.fill(Qt::black);
+		{
+			Painter p(&_iconFrom);
+			p.drawImage((_stFrom->button.rippleAreaSize - _stFrom->button.icon.width()) / 2, (_stFrom->button.rippleAreaSize - _stFrom->button.icon.height()) / 2, _stFrom->button.icon.instance(Qt::white));
+		}
+		_iconTo = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
+		_iconTo.setDevicePixelRatio(cRetinaFactor());
+		_iconTo.fill(Qt::black);
+		{
+			Painter p(&_iconTo);
+			p.drawImage((_stTo->button.rippleAreaSize - _stTo->button.icon.width()) / 2, (_stTo->button.rippleAreaSize - _stTo->button.icon.height()) / 2, _stTo->button.icon.instance(Qt::white));
+		}
+		_iconMixed = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
+		_iconMixed.setDevicePixelRatio(cRetinaFactor());
+	}
+}
+
+void GroupPanel::Button::setText(rpl::producer<QString> text) {
+	_label.create(this, std::move(text), _stFrom->label);
+	_label->show();
+	rpl::combine(
+		sizeValue(),
+		_label->sizeValue()
+	) | rpl::start_with_next([=](QSize my, QSize label) {
+		_label->moveToLeft(
+			(my.width() - label.width()) / 2,
+			my.height() - label.height(),
+			my.width());
+	}, _label->lifetime());
+}
+
+void GroupPanel::Button::setProgress(float64 progress) {
+	_progress = progress;
+	update();
+}
+
+void GroupPanel::Button::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+
+	auto bgPosition = myrtlpoint(_stFrom->button.rippleAreaPosition);
+	auto paintFrom = (_progress == 0.) || !_stTo;
+	auto paintTo = !paintFrom && (_progress == 1.);
+
+	if (paintFrom) {
+		p.drawPixmap(bgPosition, _bgFrom);
+	} else if (paintTo) {
+		p.drawPixmap(bgPosition, _bgTo);
+	} else {
+		style::colorizeImage(_bgMask, anim::color(_stFrom->bg, _stTo->bg, _progress), &_bg);
+		p.drawImage(bgPosition, _bg);
+	}
+
+	auto rippleColorInterpolated = QColor();
+	auto rippleColorOverride = &rippleColorInterpolated;
+	if (paintFrom) {
+		rippleColorOverride = nullptr;
+	} else if (paintTo) {
+		rippleColorOverride = &_stTo->button.ripple.color->c;
+	} else {
+		rippleColorInterpolated = anim::color(_stFrom->button.ripple.color, _stTo->button.ripple.color, _progress);
+	}
+	paintRipple(p, _stFrom->button.rippleAreaPosition.x(), _stFrom->button.rippleAreaPosition.y(), rippleColorOverride);
+
+	auto positionFrom = iconPosition(_stFrom);
+	if (paintFrom) {
+		const auto icon = &_stFrom->button.icon;
+		icon->paint(p, positionFrom, width());
+	} else {
+		auto positionTo = iconPosition(_stTo);
+		if (paintTo) {
+			_stTo->button.icon.paint(p, positionTo, width());
+		} else {
+			mixIconMasks();
+			style::colorizeImage(_iconMixedMask, st::callIconFg->c, &_iconMixed);
+			p.drawImage(myrtlpoint(_stFrom->button.rippleAreaPosition), _iconMixed);
+		}
+	}
+}
+
+QPoint GroupPanel::Button::iconPosition(not_null<const style::CallButton*> st) const {
+	auto result = st->button.iconPosition;
+	if (result.x() < 0) {
+		result.setX((width() - st->button.icon.width()) / 2);
+	}
+	if (result.y() < 0) {
+		result.setY((height() - st->button.icon.height()) / 2);
+	}
+	return result;
+}
+
+void GroupPanel::Button::mixIconMasks() {
+	_iconMixedMask.fill(Qt::black);
+
+	Painter p(&_iconMixedMask);
+	PainterHighQualityEnabler hq(p);
+	auto paintIconMask = [this, &p](const QImage &mask, float64 angle) {
+		auto skipFrom = _stFrom->button.rippleAreaSize / 2;
+		p.translate(skipFrom, skipFrom);
+		p.rotate(angle);
+		p.translate(-skipFrom, -skipFrom);
+		p.drawImage(0, 0, mask);
+	};
+	p.save();
+	paintIconMask(_iconFrom, (_stFrom->angle - _stTo->angle) * _progress);
+	p.restore();
+	p.setOpacity(_progress);
+	paintIconMask(_iconTo, (_stTo->angle - _stFrom->angle) * (1. - _progress));
+}
+
+void GroupPanel::Button::onStateChanged(State was, StateChangeSource source) {
+	RippleButton::onStateChanged(was, source);
+
+	auto over = isOver();
+	auto wasOver = static_cast<bool>(was & StateFlag::Over);
+	if (over != wasOver) {
+		update();
+	}
+}
+
+QPoint GroupPanel::Button::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos()) - _stFrom->button.rippleAreaPosition;
+}
+
+QImage GroupPanel::Button::prepareRippleMask() const {
+	return Ui::RippleAnimation::ellipseMask(QSize(_stFrom->button.rippleAreaSize, _stFrom->button.rippleAreaSize));
+}
+
+GroupPanel::GroupPanel(not_null<GroupCall*> call)
+: _call(call)
+, _channel(call->channel())
+, _window(std::make_unique<Ui::Window>(Core::App().getModalParent()))
+#ifdef Q_OS_WIN
+, _controls(std::make_unique<Ui::Platform::TitleControls>(
+	_window.get(),
+	st::callTitle,
+	[=](bool maximized) { toggleFullScreen(maximized); }))
+#endif // Q_OS_WIN
+, _settings(widget(), st::callCancel)
+, _hangup(widget(), st::callHangup)
+, _mute(widget(), st::callMicrophoneMute, &st::callMicrophoneUnmute) {
+	initWindow();
+	initWidget();
+	initControls();
+	initLayout();
+	showAndActivate();
+}
+
+GroupPanel::~GroupPanel() = default;
+
+void GroupPanel::showAndActivate() {
+	_window->raise();
+	_window->setWindowState(_window->windowState() | Qt::WindowActive);
+	_window->activateWindow();
+	_window->setFocus();
+}
+
+void GroupPanel::initWindow() {
+	_window->setAttribute(Qt::WA_OpaquePaintEvent);
+	_window->setAttribute(Qt::WA_NoSystemBackground);
+	_window->setWindowIcon(
+		QIcon(QPixmap::fromImage(Image::Empty()->original(), Qt::ColorOnly)));
+	_window->setTitle(u" "_q);
+	_window->setTitleStyle(st::callTitle);
+
+	_window->events(
+	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::Close) {
+			handleClose();
+		} else if (e->type() == QEvent::KeyPress) {
+			if ((static_cast<QKeyEvent*>(e.get())->key() == Qt::Key_Escape)
+				&& _window->isFullScreen()) {
+				_window->showNormal();
+			}
+		}
+	}, _window->lifetime());
+
+	_window->setBodyTitleArea([=](QPoint widgetPoint) {
+		using Flag = Ui::WindowTitleHitTestFlag;
+		if (!widget()->rect().contains(widgetPoint)) {
+			return Flag::None | Flag(0);
+		}
+#ifdef Q_OS_WIN
+		if (_controls->geometry().contains(widgetPoint)) {
+			return Flag::None | Flag(0);
+		}
+#endif // Q_OS_WIN
+		const auto inControls = false;
+		return inControls
+			? Flag::None
+			: (Flag::Move | Flag::FullScreen);
+	});
+
+#ifdef Q_OS_WIN
+	// On Windows we replace snap-to-top maximizing with fullscreen.
+	//
+	// We have to switch first to showNormal, so that showFullScreen
+	// will remember correct normal window geometry and next showNormal
+	// will show it instead of a moving maximized window.
+	//
+	// We have to do it in InvokeQueued, otherwise it still captures
+	// the maximized window geometry and saves it.
+	//
+	// I couldn't find a less glitchy way to do that *sigh*.
+	const auto object = _window->windowHandle();
+	const auto signal = &QWindow::windowStateChanged;
+	QObject::connect(object, signal, [=](Qt::WindowState state) {
+		if (state == Qt::WindowMaximized) {
+			InvokeQueued(object, [=] {
+				_window->showNormal();
+				_window->showFullScreen();
+			});
+		}
+	});
+#endif // Q_OS_WIN
+}
+
+void GroupPanel::initWidget() {
+	widget()->setMouseTracking(true);
+
+	widget()->paintRequest(
+	) | rpl::start_with_next([=](QRect clip) {
+		paint(clip);
+	}, widget()->lifetime());
+
+	widget()->sizeValue(
+	) | rpl::skip(1) | rpl::start_with_next([=] {
+		updateControlsGeometry();
+	}, widget()->lifetime());
+}
+
+void GroupPanel::initControls() {
+	_mute->setClickedCallback([=] {
+		if (_call) {
+			_call->setMuted(!_call->muted());
+		}
+	});
+	_hangup->setClickedCallback([=] {
+		if (_call) {
+			_call->hangup();
+		}
+	});
+	_settings->setClickedCallback([=] {
+	});
+	initWithCall(_call);
+}
+
+void GroupPanel::initWithCall(GroupCall *call) {
+	_callLifetime.destroy();
+	_call = call;
+	if (!_call) {
+		return;
+	}
+
+	_channel = _call->channel();
+
+	_settings->setText(tr::lng_menu_settings());
+	_hangup->setText(tr::lng_box_leave());
+
+	_call->mutedValue(
+	) | rpl::start_with_next([=](bool mute) {
+		_mute->setProgress(mute ? 1. : 0.);
+		_mute->setText(mute
+			? tr::lng_call_unmute_audio()
+			: tr::lng_call_mute_audio());
+	}, _callLifetime);
+
+	_call->stateValue(
+	) | rpl::start_with_next([=](State state) {
+		stateChanged(state);
+	}, _callLifetime);
+}
+
+void GroupPanel::initLayout() {
+	initGeometry();
+
+#ifdef Q_OS_WIN
+	_controls->raise();
+#endif // Q_OS_WIN
+}
+
+void GroupPanel::showControls() {
+	Expects(_call != nullptr);
+
+	widget()->showChildren();
+}
+
+void GroupPanel::closeBeforeDestroy() {
+	_window->close();
+	initWithCall(nullptr);
+}
+
+void GroupPanel::initGeometry() {
+	const auto center = Core::App().getPointForCallPanelCenter();
+	const auto rect = QRect(0, 0, st::groupCallWidth, st::groupCallHeight);
+	_window->setGeometry(rect.translated(center - rect.center()));
+	_window->setMinimumSize(rect.size());
+	_window->show();
+	updateControlsGeometry();
+}
+
+void GroupPanel::toggleFullScreen(bool fullscreen) {
+	if (fullscreen) {
+		_window->showFullScreen();
+	} else {
+		_window->showNormal();
+	}
+}
+
+void GroupPanel::updateControlsGeometry() {
+	if (widget()->size().isEmpty()) {
+		return;
+	}
+	const auto top = widget()->height() - 2 * _mute->height();
+	_mute->move((widget()->width() - _mute->width()) / 2, top);
+	_settings->moveToLeft(_settings->width(), top);
+	_hangup->moveToRight(_settings->width(), top);
+}
+
+void GroupPanel::paint(QRect clip) {
+	Painter p(widget());
+
+	auto region = QRegion(clip);
+	for (const auto rect : region) {
+		p.fillRect(rect, st::callBgOpaque);
+	}
+}
+
+void GroupPanel::handleClose() {
+	if (_call) {
+		_call->hangup();
+	}
+}
+
+not_null<Ui::RpWidget*> GroupPanel::widget() const {
+	return _window->body();
+}
+
+void GroupPanel::stateChanged(State state) {
+	Expects(_call != nullptr);
+
+	if ((state != State::HangingUp)
+		&& (state != State::Ended)
+		&& (state != State::FailedHangingUp)
+		&& (state != State::Failed)) {
+	}
+}
+
+} // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h
new file mode 100644
index 000000000..cec1fc107
--- /dev/null
+++ b/Telegram/SourceFiles/calls/calls_group_panel.h
@@ -0,0 +1,96 @@
+/*
+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/weak_ptr.h"
+#include "base/timer.h"
+#include "base/object_ptr.h"
+#include "calls/calls_group_call.h"
+#include "ui/effects/animations.h"
+#include "ui/rp_widget.h"
+
+class Image;
+
+namespace Data {
+class PhotoMedia;
+class CloudImageView;
+} // namespace Data
+
+namespace Ui {
+class IconButton;
+class FlatLabel;
+template <typename Widget>
+class FadeWrap;
+template <typename Widget>
+class PaddingWrap;
+class Window;
+namespace Platform {
+class TitleControls;
+} // namespace Platform
+} // namespace Ui
+
+namespace style {
+struct CallSignalBars;
+struct CallBodyLayout;
+} // namespace style
+
+namespace Calls {
+
+class Userpic;
+class SignalBars;
+
+class GroupPanel final {
+public:
+	GroupPanel(not_null<GroupCall*> call);
+	~GroupPanel();
+
+	void showAndActivate();
+	void closeBeforeDestroy();
+
+private:
+	class Button;
+	using State = GroupCall::State;
+
+	[[nodiscard]] not_null<Ui::RpWidget*> widget() const;
+
+	void paint(QRect clip);
+
+	void initWindow();
+	void initWidget();
+	void initControls();
+	void initWithCall(GroupCall *call);
+	void initLayout();
+	void initGeometry();
+
+	void handleClose();
+
+	void updateControlsGeometry();
+	void stateChanged(State state);
+	void showControls();
+	void startDurationUpdateTimer(crl::time currentDuration);
+
+	void toggleFullScreen(bool fullscreen);
+
+	GroupCall *_call = nullptr;
+	not_null<ChannelData*> _channel;
+
+	const std::unique_ptr<Ui::Window> _window;
+
+#ifdef Q_OS_WIN
+	std::unique_ptr<Ui::Platform::TitleControls> _controls;
+#endif // Q_OS_WIN
+
+	rpl::lifetime _callLifetime;
+
+	object_ptr<Button> _settings;
+	object_ptr<Button> _hangup;
+	object_ptr<Button> _mute;
+
+};
+
+} // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index 9dd83f4ec..bbcabf106 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -15,7 +15,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "boxes/confirm_box.h"
 #include "calls/calls_call.h"
+#include "calls/calls_group_call.h"
 #include "calls/calls_panel.h"
+#include "calls/calls_group_panel.h"
 #include "data/data_user.h"
 #include "data/data_group_call.h"
 #include "data/data_channel.h"
@@ -177,8 +179,8 @@ void Instance::createCall(not_null<UserData*> user, Call::Type type, bool video)
 
 void Instance::destroyGroupCall(not_null<GroupCall*> call) {
 	if (_currentGroupCall.get() == call) {
-		//_currentCallPanel->closeBeforeDestroy();
-		//_currentCallPanel = nullptr;
+		_currentGroupCallPanel->closeBeforeDestroy();
+		_currentGroupCallPanel = nullptr;
 
 		auto taken = base::take(_currentGroupCall);
 		_currentGroupCallChanges.fire(nullptr);
@@ -205,6 +207,7 @@ void Instance::createGroupCall(
 		destroyGroupCall(raw);
 	}, raw->lifetime());
 
+	_currentGroupCallPanel = std::make_unique<GroupPanel>(raw);
 	_currentGroupCall = std::move(call);
 	_currentGroupCallChanges.fire_copy(raw);
 }
@@ -314,6 +317,12 @@ void Instance::showInfoPanel(not_null<Call*> call) {
 	}
 }
 
+void Instance::showInfoPanel(not_null<GroupCall*> call) {
+	if (_currentGroupCall.get() == call) {
+		_currentGroupCallPanel->showAndActivate();
+	}
+}
+
 bool Instance::isQuitPrevent() {
 	if (!_currentCall || _currentCall->isIncomingWaiting()) {
 		return false;
@@ -407,6 +416,7 @@ bool Instance::activateCurrentCall() {
 		_currentCallPanel->showAndActivate();
 		return true;
 	} else if (inGroupCall()) {
+		_currentGroupCallPanel->showAndActivate();
 		return true;
 	}
 	return false;
@@ -420,6 +430,14 @@ rpl::producer<Call*> Instance::currentCallValue() const {
 	return _currentCallChanges.events_starting_with(currentCall());
 }
 
+GroupCall *Instance::currentGroupCall() const {
+	return _currentGroupCall.get();
+}
+
+rpl::producer<GroupCall*> Instance::currentGroupCallValue() const {
+	return _currentGroupCallChanges.events_starting_with(currentGroupCall());
+}
+
 void Instance::requestPermissionsOrFail(Fn<void()> onSuccess) {
 	using Type = Platform::PermissionType;
 	requestPermissionOrFail(Type::Microphone, [=] {
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index 2c2c2a761..54f549c45 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -28,6 +28,7 @@ class Session;
 namespace Calls {
 
 class Panel;
+class GroupPanel;
 
 class Instance
 	: private Call::Delegate
@@ -47,8 +48,11 @@ public:
 		not_null<Main::Session*> session,
 		const MTPUpdate &update);
 	void showInfoPanel(not_null<Call*> call);
+	void showInfoPanel(not_null<GroupCall*> call);
 	[[nodiscard]] Call *currentCall() const;
 	[[nodiscard]] rpl::producer<Call*> currentCallValue() const;
+	[[nodiscard]] GroupCall *currentGroupCall() const;
+	[[nodiscard]] rpl::producer<GroupCall*> currentGroupCallValue() const;
 	std::shared_ptr<tgcalls::VideoCaptureInterface> getVideoCapture() override;
 
 	[[nodiscard]] bool isQuitPrevent();
@@ -117,6 +121,7 @@ private:
 
 	std::unique_ptr<GroupCall> _currentGroupCall;
 	rpl::event_stream<GroupCall*> _currentGroupCallChanges;
+	std::unique_ptr<GroupPanel> _currentGroupCallPanel;
 
 	std::unique_ptr<Media::Audio::Track> _callConnectingTrack;
 	std::unique_ptr<Media::Audio::Track> _callEndedTrack;

From 41591ff2e9d63d8aefe39ca3ec0b0a081da1f99d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 24 Nov 2020 17:40:10 +0300
Subject: [PATCH 161/370] Add group calls top bar.

---
 .../SourceFiles/calls/calls_group_call.cpp    |  5 +-
 Telegram/SourceFiles/calls/calls_group_call.h |  4 +-
 Telegram/SourceFiles/calls/calls_top_bar.cpp  | 75 ++++++++++++++-----
 Telegram/SourceFiles/calls/calls_top_bar.h    |  8 ++
 Telegram/SourceFiles/data/data_channel.cpp    |  5 ++
 .../view/history_view_group_call_tracker.cpp  | 16 ++--
 Telegram/SourceFiles/mainwidget.cpp           | 40 +++++++++-
 Telegram/SourceFiles/mainwidget.h             |  3 +
 .../media/player/media_player_instance.cpp    |  8 +-
 .../media/view/media_view_overlay_widget.cpp  |  8 +-
 10 files changed, 136 insertions(+), 36 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 15ff367de..c08b5b054 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -183,7 +183,6 @@ void GroupCall::checkParticipants() {
 		}
 	}
 	_instance->setSsrcs(std::move(ssrcs));
-	_instance->setIsMuted(false);
 }
 
 void GroupCall::hangup() {
@@ -342,9 +341,7 @@ void GroupCall::createAndStartController() {
 		std::move(descriptor));
 
 	const auto raw = _instance.get();
-	if (_muted.current()) {
-		raw->setIsMuted(_muted.current());
-	}
+	raw->setIsMuted(_muted.current());
 	//raw->setAudioOutputDuckingEnabled(settings.callAudioDuckingEnabled());
 }
 
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 6286f3de5..23424ef2d 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -53,7 +53,7 @@ public:
 		return _muted.value();
 	}
 	[[nodiscard]] bool joined() const {
-		return _mySsrc != 0;
+		return (_state.current() == State::Joined);
 	}
 
 	enum State {
@@ -103,7 +103,7 @@ private:
 	MTP::Sender _api;
 	rpl::variable<State> _state = State::Creating;
 
-	rpl::variable<bool> _muted = false;
+	rpl::variable<bool> _muted = true;
 	bool _acceptFields = false;
 
 	uint64 _id = 0;
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 84f311185..97f074714 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_instance.h"
 #include "calls/calls_signal_bars.h"
 #include "data/data_user.h"
+#include "data/data_channel.h"
 #include "data/data_changes.h"
 #include "main/main_session.h"
 #include "boxes/abstract_box.h"
@@ -77,10 +78,28 @@ void DebugInfoBox::updateText() {
 TopBar::TopBar(
 	QWidget *parent,
 	const base::weak_ptr<Call> &call)
+: TopBar(parent, call, nullptr) {
+}
+
+TopBar::TopBar(
+	QWidget *parent,
+	const base::weak_ptr<GroupCall> &call)
+: TopBar(parent, nullptr, call) {
+}
+
+TopBar::TopBar(
+	QWidget *parent,
+	const base::weak_ptr<Call> &call,
+	const base::weak_ptr<GroupCall> &groupCall)
 : RpWidget(parent)
 , _call(call)
-, _durationLabel(this, st::callBarLabel)
-, _signalBars(this, _call.get(), st::callBarSignalBars)
+, _groupCall(groupCall)
+, _durationLabel(_call
+	? object_ptr<Ui::LabelSimple>(this, st::callBarLabel)
+	: object_ptr<Ui::LabelSimple>(nullptr))
+, _signalBars(_call
+	? object_ptr<SignalBars>(this, _call.get(), st::callBarSignalBars)
+	: object_ptr<SignalBars>(nullptr))
 , _fullInfoLabel(this, st::callBarInfoLabel)
 , _shortInfoLabel(this, st::callBarInfoLabel)
 , _hangupLabel(this, st::callBarLabel, tr::lng_call_bar_hangup(tr::now).toUpper())
@@ -95,22 +114,31 @@ void TopBar::initControls() {
 	_mute->setClickedCallback([=] {
 		if (const auto call = _call.get()) {
 			call->setMuted(!call->muted());
+		} else if (const auto group = _groupCall.get()) {
+			group->setMuted(!group->muted());
 		}
 	});
-	_call->mutedValue(
+
+	auto muted = _call
+		? _call->mutedValue()
+		: _groupCall->mutedValue();
+	std::move(
+		muted
 	) | rpl::start_with_next([=](bool muted) {
 		setMuted(muted);
 		update();
 	}, lifetime());
 
-	_call->user()->session().changes().peerUpdates(
-		Data::PeerUpdate::Flag::Name
-	) | rpl::filter([=](const Data::PeerUpdate &update) {
-		// _user may change for the same Panel.
-		return (_call != nullptr) && (update.peer == _call->user());
-	}) | rpl::start_with_next([=] {
-		updateInfoLabels();
-	}, lifetime());
+	if (const auto call = _call.get()) {
+		call->user()->session().changes().peerUpdates(
+			Data::PeerUpdate::Flag::Name
+		) | rpl::filter([=](const Data::PeerUpdate &update) {
+			// _user may change for the same Panel.
+			return (_call != nullptr) && (update.peer == _call->user());
+		}) | rpl::start_with_next([=] {
+			updateInfoLabels();
+		}, lifetime());
+	}
 
 	setInfoLabels();
 	_info->setClickedCallback([=] {
@@ -121,11 +149,15 @@ void TopBar::initControls() {
 			} else {
 				Core::App().calls().showInfoPanel(call);
 			}
+		} else if (const auto group = _groupCall.get()) {
+			Core::App().calls().showInfoPanel(group);
 		}
 	});
 	_hangup->setClickedCallback([this] {
-		if (auto call = _call.get()) {
+		if (const auto call = _call.get()) {
 			call->hangup();
+		} else if (const auto group = _groupCall.get()) {
+			group->hangup();
 		}
 	});
 	_updateDurationTimer.setCallback([this] { updateDurationText(); });
@@ -144,6 +176,11 @@ void TopBar::setInfoLabels() {
 		const auto shortName = user->firstName;
 		_fullInfoLabel->setText(fullName.toUpper());
 		_shortInfoLabel->setText(shortName.toUpper());
+	} else if (const auto group = _groupCall.get()) {
+		const auto channel = group->channel();
+		const auto name = channel->name;
+		_fullInfoLabel->setText(name.toUpper());
+		_shortInfoLabel->setText(name.toUpper());
 	}
 }
 
@@ -155,7 +192,7 @@ void TopBar::setMuted(bool mute) {
 }
 
 void TopBar::updateDurationText() {
-	if (!_call) {
+	if (!_call || !_durationLabel) {
 		return;
 	}
 	auto wasWidth = _durationLabel->width();
@@ -181,10 +218,14 @@ void TopBar::updateControlsGeometry() {
 	auto left = 0;
 	_mute->moveToLeft(left, 0);
 	left += _mute->width();
-	_durationLabel->moveToLeft(left, st::callBarLabelTop);
-	left += _durationLabel->width() + st::callBarSkip;
-	_signalBars->moveToLeft(left, (height() - _signalBars->height()) / 2);
-	left += _signalBars->width() + st::callBarSkip;
+	if (_durationLabel) {
+		_durationLabel->moveToLeft(left, st::callBarLabelTop);
+		left += _durationLabel->width() + st::callBarSkip;
+	}
+	if (_signalBars) {
+		_signalBars->moveToLeft(left, (height() - _signalBars->height()) / 2);
+		left += _signalBars->width() + st::callBarSkip;
+	}
 
 	auto right = st::callBarRightSkip;
 	_hangupLabel->moveToRight(right, st::callBarLabelTop);
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.h b/Telegram/SourceFiles/calls/calls_top_bar.h
index 72ae98e1f..20c964187 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.h
+++ b/Telegram/SourceFiles/calls/calls_top_bar.h
@@ -26,11 +26,13 @@ class Session;
 namespace Calls {
 
 class Call;
+class GroupCall;
 class SignalBars;
 
 class TopBar : public Ui::RpWidget {
 public:
 	TopBar(QWidget *parent, const base::weak_ptr<Call> &call);
+	TopBar(QWidget *parent, const base::weak_ptr<GroupCall> &call);
 
 	~TopBar();
 
@@ -39,6 +41,11 @@ protected:
 	void paintEvent(QPaintEvent *e) override;
 
 private:
+	TopBar(
+		QWidget *parent,
+		const base::weak_ptr<Call> &call,
+		const base::weak_ptr<GroupCall> &groupCall);
+
 	void initControls();
 	void updateInfoLabels();
 	void setInfoLabels();
@@ -48,6 +55,7 @@ private:
 	void setMuted(bool mute);
 
 	const base::weak_ptr<Call> _call;
+	const base::weak_ptr<GroupCall> _groupCall;
 
 	bool _muted = false;
 	object_ptr<Ui::LabelSimple> _durationLabel;
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index 47a09086a..b150fdda2 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -682,10 +682,14 @@ void ChannelData::setCall(const MTPInputGroupCall &call) {
 			clearCall();
 			return;
 		}
+		if (_call) {
+			owner().unregisterGroupCall(_call.get());
+		}
 		_call = std::make_unique<Data::GroupCall>(
 			this,
 			data.vid().v,
 			data.vaccess_hash().v);
+		owner().registerGroupCall(_call.get());
 		session().changes().peerUpdated(this, UpdateFlag::GroupCall);
 	});
 }
@@ -694,6 +698,7 @@ void ChannelData::clearCall() {
 	if (!_call) {
 		return;
 	}
+	owner().unregisterGroupCall(_call.get());
 	_call = nullptr;
 	session().changes().peerUpdated(this, UpdateFlag::GroupCall);
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
index 9712d559f..39de068eb 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
@@ -12,6 +12,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_group_call.h"
 #include "main/main_session.h"
 #include "ui/chat/group_call_bar.h"
+#include "calls/calls_group_call.h"
+#include "calls/calls_instance.h"
+#include "core/application.h"
 
 namespace HistoryView {
 
@@ -21,12 +24,15 @@ GroupCallTracker::GroupCallTracker(not_null<ChannelData*> channel)
 
 rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::content() const {
 	const auto channel = _channel;
-	return channel->session().changes().peerFlagsValue(
-		channel,
-		Data::PeerUpdate::Flag::GroupCall
-	) | rpl::map([=]() -> Ui::GroupCallBarContent {
+	return rpl::combine(
+		channel->session().changes().peerFlagsValue(
+			channel,
+			Data::PeerUpdate::Flag::GroupCall),
+		Core::App().calls().currentGroupCallValue()
+	) | rpl::map([=](const auto&, Calls::GroupCall *current)
+	-> Ui::GroupCallBarContent {
 		const auto call = channel->call();
-		if (!call) {
+		if (!call || (current && current->channel() == channel)) {
 			return { .shown = false };
 		} else if (!call->fullCount() && !call->participantsLoaded()) {
 			call->requestParticipants();
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index c3b2a27f9..c0d7423fc 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -254,6 +254,10 @@ MainWidget::MainWidget(
 	) | rpl::start_with_next([=](Calls::Call *call) {
 		setCurrentCall(call);
 	}, lifetime());
+	Core::App().calls().currentGroupCallValue(
+	) | rpl::start_with_next([=](Calls::GroupCall *call) {
+		setCurrentGroupCall(call);
+	}, lifetime());
 	if (_callTopBar) {
 		_callTopBar->finishAnimating();
 	}
@@ -942,6 +946,9 @@ void MainWidget::playerHeightUpdated() {
 }
 
 void MainWidget::setCurrentCall(Calls::Call *call) {
+	if (!call && _currentGroupCall) {
+		return;
+	}
 	_currentCallLifetime.destroy();
 	_currentCall = call;
 	if (_currentCall) {
@@ -959,10 +966,35 @@ void MainWidget::setCurrentCall(Calls::Call *call) {
 	}
 }
 
-void MainWidget::createCallTopBar() {
-	Expects(_currentCall != nullptr);
+void MainWidget::setCurrentGroupCall(Calls::GroupCall *call) {
+	if (!call && _currentCall) {
+		return;
+	}
+	_currentCallLifetime.destroy();
+	_currentGroupCall = call;
+	if (_currentGroupCall) {
+		_currentGroupCall->stateValue(
+		) | rpl::start_with_next([=](Calls::GroupCall::State state) {
+			using State = Calls::GroupCall::State;
+			if (state == State::Joined) {
+				createCallTopBar();
+			} else {
+				destroyCallTopBar();
+			}
+		}, _currentCallLifetime);
+	} else {
+		destroyCallTopBar();
+	}
+}
 
-	_callTopBar.create(this, object_ptr<Calls::TopBar>(this, _currentCall));
+void MainWidget::createCallTopBar() {
+	Expects(_currentCall != nullptr || _currentGroupCall != nullptr);
+
+	_callTopBar.create(
+		this,
+		(_currentCall
+			? object_ptr<Calls::TopBar>(this, _currentCall)
+			: object_ptr<Calls::TopBar>(this, _currentGroupCall)));
 	_callTopBar->heightValue(
 	) | rpl::start_with_next([this](int value) {
 		callTopBarHeightUpdated(value);
@@ -986,7 +1018,7 @@ void MainWidget::destroyCallTopBar() {
 }
 
 void MainWidget::callTopBarHeightUpdated(int callTopBarHeight) {
-	if (!callTopBarHeight && !_currentCall) {
+	if (!callTopBarHeight && !_currentCall && !_currentGroupCall) {
 		_callTopBar.destroyDelayed();
 	}
 	if (callTopBarHeight != _callTopBarHeight) {
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 67f62919b..6a1f0e666 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -85,6 +85,7 @@ class HistoryHider;
 
 namespace Calls {
 class Call;
+class GroupCall;
 class TopBar;
 } // namespace Calls
 
@@ -257,6 +258,7 @@ private:
 	void playerHeightUpdated();
 
 	void setCurrentCall(Calls::Call *call);
+	void setCurrentGroupCall(Calls::GroupCall *call);
 	void createCallTopBar();
 	void destroyCallTopBar();
 	void callTopBarHeightUpdated(int callTopBarHeight);
@@ -350,6 +352,7 @@ private:
 	std::unique_ptr<Window::ConnectionState> _connecting;
 
 	base::weak_ptr<Calls::Call> _currentCall;
+	base::weak_ptr<Calls::GroupCall> _currentGroupCall;
 	rpl::lifetime _currentCallLifetime;
 	object_ptr<Ui::SlideWrap<Calls::TopBar>> _callTopBar = { nullptr };
 
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp
index 673f81490..7d3016df3 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp
@@ -114,8 +114,12 @@ Instance::Instance()
 		handleSongUpdate(audioId);
 	});
 
-	Core::App().calls().currentCallValue(
-	) | rpl::start_with_next([=](Calls::Call *call) {
+	using namespace rpl::mappers;
+	rpl::combine(
+		Core::App().calls().currentCallValue(),
+		Core::App().calls().currentGroupCallValue(),
+		_1 || _2
+	) | rpl::start_with_next([=](bool call) {
 		if (call) {
 			pauseOnCall(AudioMsgId::Type::Voice);
 			pauseOnCall(AudioMsgId::Type::Song);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 1036ae393..d6c8fc141 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -395,8 +395,12 @@ OverlayWidget::OverlayWidget()
 		_touchbarFullscreenToggled.events());
 #endif // Q_OS_MAC && !OS_OSX
 
-	Core::App().calls().currentCallValue(
-	) | rpl::start_with_next([=](Calls::Call *call) {
+	using namespace rpl::mappers;
+	rpl::combine(
+		Core::App().calls().currentCallValue(),
+		Core::App().calls().currentGroupCallValue(),
+		_1 || _2
+	) | rpl::start_with_next([=](bool call) {
 		if (!_streamed || videoIsGifOrUserpic()) {
 			return;
 		} else if (call) {

From 267c2d32f0d25ee3c62e0579acc3415564da7040 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 24 Nov 2020 18:12:45 +0300
Subject: [PATCH 162/370] Fix shadow of group call bar.

---
 Telegram/SourceFiles/history/history_widget.cpp |  3 +++
 Telegram/SourceFiles/ui/chat/group_call_bar.cpp | 13 ++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index db6a3c46a..d470a5041 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1250,6 +1250,9 @@ void HistoryWidget::orderWidgets() {
 	if (_contactStatus) {
 		_contactStatus->raise();
 	}
+	if (_groupCallBar) {
+		_groupCallBar->raise();
+	}
 	if (_pinnedBar) {
 		_pinnedBar->raise();
 	}
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
index 497120ad6..08daddd65 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -20,9 +20,9 @@ namespace Ui {
 GroupCallBar::GroupCallBar(
 	not_null<QWidget*> parent,
 	rpl::producer<GroupCallBarContent> content)
-	: _wrap(parent, object_ptr<RpWidget>(parent))
-	, _inner(_wrap.entity())
-	, _shadow(std::make_unique<PlainShadow>(_wrap.parentWidget())) {
+: _wrap(parent, object_ptr<RpWidget>(parent))
+, _inner(_wrap.entity())
+, _shadow(std::make_unique<PlainShadow>(_wrap.parentWidget())) {
 	_wrap.hide(anim::type::instant);
 	_shadow->hide();
 
@@ -89,6 +89,13 @@ void GroupCallBar::setupInner() {
 	) | rpl::map([] {
 		return rpl::empty_value();
 	}) | rpl::start_to_stream(_barClicks, _inner->lifetime());
+
+
+	_wrap.geometryValue(
+	) | rpl::start_with_next([=](QRect rect) {
+		updateShadowGeometry(rect);
+		updateControlsGeometry(rect);
+	}, _inner->lifetime());
 }
 
 void GroupCallBar::paint(Painter &p) {

From 6a86ed15065311004af859ba8adc7514b63633a4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 25 Nov 2020 14:51:34 +0300
Subject: [PATCH 163/370] Handle SEARCH_QUERY_EMPTY in dialogs.

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

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 624e67f6c..fd08fb769 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -851,12 +851,12 @@ bool Widget::onSearchMessages(bool searchCache) {
 					MTP_int(0),
 					MTP_int(0)
 				)).done([=](const MTPmessages_Messages &result) {
-					searchReceived(type, result, _searchRequest);
 					_searchInHistoryRequest = 0;
+					searchReceived(type, result, _searchRequest);
 					finish();
 				}).fail([=](const RPCError &error) {
-					searchFailed(type, error, _searchRequest);
 					_searchInHistoryRequest = 0;
+					searchFailed(type, error, _searchRequest);
 					finish();
 				}).send();
 				_searchQueries.emplace(_searchRequest, _searchQuery);
@@ -1272,7 +1272,15 @@ void Widget::searchFailed(
 		SearchRequestType type,
 		const RPCError &error,
 		mtpRequestId requestId) {
-	if (_searchRequest == requestId) {
+	if (error.type() == qstr("SEARCH_QUERY_EMPTY")) {
+		searchReceived(
+			type,
+			MTP_messages_messages(
+				MTP_vector<MTPMessage>(),
+				MTP_vector<MTPChat>(),
+				MTP_vector<MTPUser>()),
+			requestId);
+	} else if (_searchRequest == requestId) {
 		_searchRequest = 0;
 		if (type == SearchRequestType::MigratedFromStart || type == SearchRequestType::MigratedFromOffset) {
 			_searchFullMigrated = true;

From 2e62eb1186cd8f8efb067b04524fac1c94787d5c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 25 Nov 2020 17:09:59 +0300
Subject: [PATCH 164/370] Start group call members list.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../icons/{ => calls}/call_answer.png         | Bin
 .../icons/{ => calls}/call_answer@2x.png      | Bin
 .../icons/{ => calls}/call_answer@3x.png      | Bin
 .../icons/{ => calls}/call_arrow_in.png       | Bin
 .../icons/{ => calls}/call_arrow_in@2x.png    | Bin
 .../icons/{ => calls}/call_arrow_in@3x.png    | Bin
 .../icons/{ => calls}/call_arrow_out.png      | Bin
 .../icons/{ => calls}/call_arrow_out@2x.png   | Bin
 .../icons/{ => calls}/call_arrow_out@3x.png   | Bin
 .../icons/{ => calls}/call_camera_active.png  | Bin
 .../{ => calls}/call_camera_active@2x.png     | Bin
 .../{ => calls}/call_camera_active@3x.png     | Bin
 .../icons/{ => calls}/call_camera_muted.png   | Bin
 .../{ => calls}/call_camera_muted@2x.png      | Bin
 .../{ => calls}/call_camera_muted@3x.png      | Bin
 .../icons/{ => calls}/call_cancel.png         | Bin
 .../icons/{ => calls}/call_cancel@2x.png      | Bin
 .../icons/{ => calls}/call_cancel@3x.png      | Bin
 .../icons/{ => calls}/call_discard.png        | Bin
 .../icons/{ => calls}/call_discard@2x.png     | Bin
 .../icons/{ => calls}/call_discard@3x.png     | Bin
 .../icons/{ => calls}/call_rating.png         | Bin
 .../icons/{ => calls}/call_rating@2x.png      | Bin
 .../icons/{ => calls}/call_rating@3x.png      | Bin
 .../icons/{ => calls}/call_rating_filled.png  | Bin
 .../{ => calls}/call_rating_filled@2x.png     | Bin
 .../{ => calls}/call_rating_filled@3x.png     | Bin
 .../icons/{ => calls}/call_record_active.png  | Bin
 .../{ => calls}/call_record_active@2x.png     | Bin
 .../{ => calls}/call_record_active@3x.png     | Bin
 .../icons/{ => calls}/call_record_muted.png   | Bin
 .../{ => calls}/call_record_muted@2x.png      | Bin
 .../{ => calls}/call_record_muted@3x.png      | Bin
 .../icons/{ => calls}/call_shadow_left.png    | Bin
 .../icons/{ => calls}/call_shadow_left@2x.png | Bin
 .../icons/{ => calls}/call_shadow_left@3x.png | Bin
 .../icons/{ => calls}/call_shadow_top.png     | Bin
 .../icons/{ => calls}/call_shadow_top@2x.png  | Bin
 .../icons/{ => calls}/call_shadow_top@3x.png  | Bin
 .../{ => calls}/call_shadow_top_left.png      | Bin
 .../{ => calls}/call_shadow_top_left@2x.png   | Bin
 .../{ => calls}/call_shadow_top_left@3x.png   | Bin
 .../icons/{ => calls}/calls_close_main.png    | Bin
 .../icons/{ => calls}/calls_close_main@2x.png | Bin
 .../icons/{ => calls}/calls_close_main@3x.png | Bin
 .../icons/{ => calls}/calls_close_shadow.png  | Bin
 .../{ => calls}/calls_close_shadow@2x.png     | Bin
 .../{ => calls}/calls_close_shadow@3x.png     | Bin
 .../icons/{ => calls}/calls_maximize_main.png | Bin
 .../{ => calls}/calls_maximize_main@2x.png    | Bin
 .../{ => calls}/calls_maximize_main@3x.png    | Bin
 .../{ => calls}/calls_maximize_shadow.png     | Bin
 .../{ => calls}/calls_maximize_shadow@2x.png  | Bin
 .../{ => calls}/calls_maximize_shadow@3x.png  | Bin
 .../icons/{ => calls}/calls_minimize_main.png | Bin
 .../{ => calls}/calls_minimize_main@2x.png    | Bin
 .../{ => calls}/calls_minimize_main@3x.png    | Bin
 .../{ => calls}/calls_minimize_shadow.png     | Bin
 .../{ => calls}/calls_minimize_shadow@2x.png  | Bin
 .../{ => calls}/calls_minimize_shadow@3x.png  | Bin
 .../icons/{ => calls}/calls_mute_tooltip.png  | Bin
 .../{ => calls}/calls_mute_tooltip@2x.png     | Bin
 .../{ => calls}/calls_mute_tooltip@3x.png     | Bin
 .../icons/{ => calls}/calls_mute_userpic.png  | Bin
 .../{ => calls}/calls_mute_userpic@2x.png     | Bin
 .../{ => calls}/calls_mute_userpic@3x.png     | Bin
 .../icons/{ => calls}/calls_restore_main.png  | Bin
 .../{ => calls}/calls_restore_main@2x.png     | Bin
 .../{ => calls}/calls_restore_main@3x.png     | Bin
 .../{ => calls}/calls_restore_shadow.png      | Bin
 .../{ => calls}/calls_restore_shadow@2x.png   | Bin
 .../{ => calls}/calls_restore_shadow@3x.png   | Bin
 .../{ => calls}/calls_shadow_controls.png     | Bin
 .../{ => calls}/calls_shadow_controls@2x.png  | Bin
 .../{ => calls}/calls_shadow_controls@3x.png  | Bin
 .../icons/calls/group_calls_muted.png         | Bin 0 -> 718 bytes
 .../icons/calls/group_calls_muted@2x.png      | Bin 0 -> 1288 bytes
 .../icons/calls/group_calls_muted@3x.png      | Bin 0 -> 1894 bytes
 .../icons/calls/group_calls_unmuted.png       | Bin 0 -> 599 bytes
 .../icons/calls/group_calls_unmuted@2x.png    | Bin 0 -> 1073 bytes
 .../icons/calls/group_calls_unmuted@3x.png    | Bin 0 -> 1563 bytes
 Telegram/SourceFiles/boxes/boxes.style        |   1 -
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |   2 +-
 .../boxes/peers/edit_participants_box.h       |   1 -
 Telegram/SourceFiles/calls/calls.style        | 167 ++++--
 .../SourceFiles/calls/calls_group_members.cpp | 528 ++++++++++++++++++
 .../SourceFiles/calls/calls_group_members.h   |  76 +++
 .../SourceFiles/calls/calls_group_panel.cpp   | 127 ++---
 .../SourceFiles/calls/calls_group_panel.h     |  10 +-
 .../view/history_view_group_call_tracker.cpp  |   2 +-
 Telegram/SourceFiles/ui/chat/chat.style       |  28 +-
 Telegram/lib_ui                               |   2 +-
 93 files changed, 797 insertions(+), 149 deletions(-)
 rename Telegram/Resources/icons/{ => calls}/call_answer.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_answer@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_answer@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_arrow_in.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_arrow_in@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_arrow_in@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_arrow_out.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_arrow_out@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_arrow_out@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_camera_active.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_camera_active@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_camera_active@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_camera_muted.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_camera_muted@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_camera_muted@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_cancel.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_cancel@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_cancel@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_discard.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_discard@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_discard@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_rating.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_rating@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_rating@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_rating_filled.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_rating_filled@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_rating_filled@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_record_active.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_record_active@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_record_active@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_record_muted.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_record_muted@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_record_muted@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_shadow_left.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_shadow_left@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_shadow_left@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_shadow_top.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_shadow_top@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_shadow_top@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_shadow_top_left.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_shadow_top_left@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/call_shadow_top_left@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_close_main.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_close_main@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_close_main@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_close_shadow.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_close_shadow@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_close_shadow@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_maximize_main.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_maximize_main@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_maximize_main@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_maximize_shadow.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_maximize_shadow@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_maximize_shadow@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_minimize_main.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_minimize_main@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_minimize_main@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_minimize_shadow.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_minimize_shadow@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_minimize_shadow@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_mute_tooltip.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_mute_tooltip@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_mute_tooltip@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_mute_userpic.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_mute_userpic@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_mute_userpic@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_restore_main.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_restore_main@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_restore_main@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_restore_shadow.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_restore_shadow@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_restore_shadow@3x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_shadow_controls.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_shadow_controls@2x.png (100%)
 rename Telegram/Resources/icons/{ => calls}/calls_shadow_controls@3x.png (100%)
 create mode 100644 Telegram/Resources/icons/calls/group_calls_muted.png
 create mode 100644 Telegram/Resources/icons/calls/group_calls_muted@2x.png
 create mode 100644 Telegram/Resources/icons/calls/group_calls_muted@3x.png
 create mode 100644 Telegram/Resources/icons/calls/group_calls_unmuted.png
 create mode 100644 Telegram/Resources/icons/calls/group_calls_unmuted@2x.png
 create mode 100644 Telegram/Resources/icons/calls/group_calls_unmuted@3x.png
 create mode 100644 Telegram/SourceFiles/calls/calls_group_members.cpp
 create mode 100644 Telegram/SourceFiles/calls/calls_group_members.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index a483dabc4..c64e375c1 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -266,6 +266,8 @@ PRIVATE
     calls/calls_call.h
     calls/calls_group_call.cpp
     calls/calls_group_call.h
+    calls/calls_group_members.cpp
+    calls/calls_group_members.h
     calls/calls_group_panel.cpp
     calls/calls_group_panel.h
     calls/calls_emoji_fingerprint.cpp
diff --git a/Telegram/Resources/icons/call_answer.png b/Telegram/Resources/icons/calls/call_answer.png
similarity index 100%
rename from Telegram/Resources/icons/call_answer.png
rename to Telegram/Resources/icons/calls/call_answer.png
diff --git a/Telegram/Resources/icons/call_answer@2x.png b/Telegram/Resources/icons/calls/call_answer@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_answer@2x.png
rename to Telegram/Resources/icons/calls/call_answer@2x.png
diff --git a/Telegram/Resources/icons/call_answer@3x.png b/Telegram/Resources/icons/calls/call_answer@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_answer@3x.png
rename to Telegram/Resources/icons/calls/call_answer@3x.png
diff --git a/Telegram/Resources/icons/call_arrow_in.png b/Telegram/Resources/icons/calls/call_arrow_in.png
similarity index 100%
rename from Telegram/Resources/icons/call_arrow_in.png
rename to Telegram/Resources/icons/calls/call_arrow_in.png
diff --git a/Telegram/Resources/icons/call_arrow_in@2x.png b/Telegram/Resources/icons/calls/call_arrow_in@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_arrow_in@2x.png
rename to Telegram/Resources/icons/calls/call_arrow_in@2x.png
diff --git a/Telegram/Resources/icons/call_arrow_in@3x.png b/Telegram/Resources/icons/calls/call_arrow_in@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_arrow_in@3x.png
rename to Telegram/Resources/icons/calls/call_arrow_in@3x.png
diff --git a/Telegram/Resources/icons/call_arrow_out.png b/Telegram/Resources/icons/calls/call_arrow_out.png
similarity index 100%
rename from Telegram/Resources/icons/call_arrow_out.png
rename to Telegram/Resources/icons/calls/call_arrow_out.png
diff --git a/Telegram/Resources/icons/call_arrow_out@2x.png b/Telegram/Resources/icons/calls/call_arrow_out@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_arrow_out@2x.png
rename to Telegram/Resources/icons/calls/call_arrow_out@2x.png
diff --git a/Telegram/Resources/icons/call_arrow_out@3x.png b/Telegram/Resources/icons/calls/call_arrow_out@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_arrow_out@3x.png
rename to Telegram/Resources/icons/calls/call_arrow_out@3x.png
diff --git a/Telegram/Resources/icons/call_camera_active.png b/Telegram/Resources/icons/calls/call_camera_active.png
similarity index 100%
rename from Telegram/Resources/icons/call_camera_active.png
rename to Telegram/Resources/icons/calls/call_camera_active.png
diff --git a/Telegram/Resources/icons/call_camera_active@2x.png b/Telegram/Resources/icons/calls/call_camera_active@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_camera_active@2x.png
rename to Telegram/Resources/icons/calls/call_camera_active@2x.png
diff --git a/Telegram/Resources/icons/call_camera_active@3x.png b/Telegram/Resources/icons/calls/call_camera_active@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_camera_active@3x.png
rename to Telegram/Resources/icons/calls/call_camera_active@3x.png
diff --git a/Telegram/Resources/icons/call_camera_muted.png b/Telegram/Resources/icons/calls/call_camera_muted.png
similarity index 100%
rename from Telegram/Resources/icons/call_camera_muted.png
rename to Telegram/Resources/icons/calls/call_camera_muted.png
diff --git a/Telegram/Resources/icons/call_camera_muted@2x.png b/Telegram/Resources/icons/calls/call_camera_muted@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_camera_muted@2x.png
rename to Telegram/Resources/icons/calls/call_camera_muted@2x.png
diff --git a/Telegram/Resources/icons/call_camera_muted@3x.png b/Telegram/Resources/icons/calls/call_camera_muted@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_camera_muted@3x.png
rename to Telegram/Resources/icons/calls/call_camera_muted@3x.png
diff --git a/Telegram/Resources/icons/call_cancel.png b/Telegram/Resources/icons/calls/call_cancel.png
similarity index 100%
rename from Telegram/Resources/icons/call_cancel.png
rename to Telegram/Resources/icons/calls/call_cancel.png
diff --git a/Telegram/Resources/icons/call_cancel@2x.png b/Telegram/Resources/icons/calls/call_cancel@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_cancel@2x.png
rename to Telegram/Resources/icons/calls/call_cancel@2x.png
diff --git a/Telegram/Resources/icons/call_cancel@3x.png b/Telegram/Resources/icons/calls/call_cancel@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_cancel@3x.png
rename to Telegram/Resources/icons/calls/call_cancel@3x.png
diff --git a/Telegram/Resources/icons/call_discard.png b/Telegram/Resources/icons/calls/call_discard.png
similarity index 100%
rename from Telegram/Resources/icons/call_discard.png
rename to Telegram/Resources/icons/calls/call_discard.png
diff --git a/Telegram/Resources/icons/call_discard@2x.png b/Telegram/Resources/icons/calls/call_discard@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_discard@2x.png
rename to Telegram/Resources/icons/calls/call_discard@2x.png
diff --git a/Telegram/Resources/icons/call_discard@3x.png b/Telegram/Resources/icons/calls/call_discard@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_discard@3x.png
rename to Telegram/Resources/icons/calls/call_discard@3x.png
diff --git a/Telegram/Resources/icons/call_rating.png b/Telegram/Resources/icons/calls/call_rating.png
similarity index 100%
rename from Telegram/Resources/icons/call_rating.png
rename to Telegram/Resources/icons/calls/call_rating.png
diff --git a/Telegram/Resources/icons/call_rating@2x.png b/Telegram/Resources/icons/calls/call_rating@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_rating@2x.png
rename to Telegram/Resources/icons/calls/call_rating@2x.png
diff --git a/Telegram/Resources/icons/call_rating@3x.png b/Telegram/Resources/icons/calls/call_rating@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_rating@3x.png
rename to Telegram/Resources/icons/calls/call_rating@3x.png
diff --git a/Telegram/Resources/icons/call_rating_filled.png b/Telegram/Resources/icons/calls/call_rating_filled.png
similarity index 100%
rename from Telegram/Resources/icons/call_rating_filled.png
rename to Telegram/Resources/icons/calls/call_rating_filled.png
diff --git a/Telegram/Resources/icons/call_rating_filled@2x.png b/Telegram/Resources/icons/calls/call_rating_filled@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_rating_filled@2x.png
rename to Telegram/Resources/icons/calls/call_rating_filled@2x.png
diff --git a/Telegram/Resources/icons/call_rating_filled@3x.png b/Telegram/Resources/icons/calls/call_rating_filled@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_rating_filled@3x.png
rename to Telegram/Resources/icons/calls/call_rating_filled@3x.png
diff --git a/Telegram/Resources/icons/call_record_active.png b/Telegram/Resources/icons/calls/call_record_active.png
similarity index 100%
rename from Telegram/Resources/icons/call_record_active.png
rename to Telegram/Resources/icons/calls/call_record_active.png
diff --git a/Telegram/Resources/icons/call_record_active@2x.png b/Telegram/Resources/icons/calls/call_record_active@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_record_active@2x.png
rename to Telegram/Resources/icons/calls/call_record_active@2x.png
diff --git a/Telegram/Resources/icons/call_record_active@3x.png b/Telegram/Resources/icons/calls/call_record_active@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_record_active@3x.png
rename to Telegram/Resources/icons/calls/call_record_active@3x.png
diff --git a/Telegram/Resources/icons/call_record_muted.png b/Telegram/Resources/icons/calls/call_record_muted.png
similarity index 100%
rename from Telegram/Resources/icons/call_record_muted.png
rename to Telegram/Resources/icons/calls/call_record_muted.png
diff --git a/Telegram/Resources/icons/call_record_muted@2x.png b/Telegram/Resources/icons/calls/call_record_muted@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_record_muted@2x.png
rename to Telegram/Resources/icons/calls/call_record_muted@2x.png
diff --git a/Telegram/Resources/icons/call_record_muted@3x.png b/Telegram/Resources/icons/calls/call_record_muted@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_record_muted@3x.png
rename to Telegram/Resources/icons/calls/call_record_muted@3x.png
diff --git a/Telegram/Resources/icons/call_shadow_left.png b/Telegram/Resources/icons/calls/call_shadow_left.png
similarity index 100%
rename from Telegram/Resources/icons/call_shadow_left.png
rename to Telegram/Resources/icons/calls/call_shadow_left.png
diff --git a/Telegram/Resources/icons/call_shadow_left@2x.png b/Telegram/Resources/icons/calls/call_shadow_left@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_shadow_left@2x.png
rename to Telegram/Resources/icons/calls/call_shadow_left@2x.png
diff --git a/Telegram/Resources/icons/call_shadow_left@3x.png b/Telegram/Resources/icons/calls/call_shadow_left@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_shadow_left@3x.png
rename to Telegram/Resources/icons/calls/call_shadow_left@3x.png
diff --git a/Telegram/Resources/icons/call_shadow_top.png b/Telegram/Resources/icons/calls/call_shadow_top.png
similarity index 100%
rename from Telegram/Resources/icons/call_shadow_top.png
rename to Telegram/Resources/icons/calls/call_shadow_top.png
diff --git a/Telegram/Resources/icons/call_shadow_top@2x.png b/Telegram/Resources/icons/calls/call_shadow_top@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_shadow_top@2x.png
rename to Telegram/Resources/icons/calls/call_shadow_top@2x.png
diff --git a/Telegram/Resources/icons/call_shadow_top@3x.png b/Telegram/Resources/icons/calls/call_shadow_top@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_shadow_top@3x.png
rename to Telegram/Resources/icons/calls/call_shadow_top@3x.png
diff --git a/Telegram/Resources/icons/call_shadow_top_left.png b/Telegram/Resources/icons/calls/call_shadow_top_left.png
similarity index 100%
rename from Telegram/Resources/icons/call_shadow_top_left.png
rename to Telegram/Resources/icons/calls/call_shadow_top_left.png
diff --git a/Telegram/Resources/icons/call_shadow_top_left@2x.png b/Telegram/Resources/icons/calls/call_shadow_top_left@2x.png
similarity index 100%
rename from Telegram/Resources/icons/call_shadow_top_left@2x.png
rename to Telegram/Resources/icons/calls/call_shadow_top_left@2x.png
diff --git a/Telegram/Resources/icons/call_shadow_top_left@3x.png b/Telegram/Resources/icons/calls/call_shadow_top_left@3x.png
similarity index 100%
rename from Telegram/Resources/icons/call_shadow_top_left@3x.png
rename to Telegram/Resources/icons/calls/call_shadow_top_left@3x.png
diff --git a/Telegram/Resources/icons/calls_close_main.png b/Telegram/Resources/icons/calls/calls_close_main.png
similarity index 100%
rename from Telegram/Resources/icons/calls_close_main.png
rename to Telegram/Resources/icons/calls/calls_close_main.png
diff --git a/Telegram/Resources/icons/calls_close_main@2x.png b/Telegram/Resources/icons/calls/calls_close_main@2x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_close_main@2x.png
rename to Telegram/Resources/icons/calls/calls_close_main@2x.png
diff --git a/Telegram/Resources/icons/calls_close_main@3x.png b/Telegram/Resources/icons/calls/calls_close_main@3x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_close_main@3x.png
rename to Telegram/Resources/icons/calls/calls_close_main@3x.png
diff --git a/Telegram/Resources/icons/calls_close_shadow.png b/Telegram/Resources/icons/calls/calls_close_shadow.png
similarity index 100%
rename from Telegram/Resources/icons/calls_close_shadow.png
rename to Telegram/Resources/icons/calls/calls_close_shadow.png
diff --git a/Telegram/Resources/icons/calls_close_shadow@2x.png b/Telegram/Resources/icons/calls/calls_close_shadow@2x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_close_shadow@2x.png
rename to Telegram/Resources/icons/calls/calls_close_shadow@2x.png
diff --git a/Telegram/Resources/icons/calls_close_shadow@3x.png b/Telegram/Resources/icons/calls/calls_close_shadow@3x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_close_shadow@3x.png
rename to Telegram/Resources/icons/calls/calls_close_shadow@3x.png
diff --git a/Telegram/Resources/icons/calls_maximize_main.png b/Telegram/Resources/icons/calls/calls_maximize_main.png
similarity index 100%
rename from Telegram/Resources/icons/calls_maximize_main.png
rename to Telegram/Resources/icons/calls/calls_maximize_main.png
diff --git a/Telegram/Resources/icons/calls_maximize_main@2x.png b/Telegram/Resources/icons/calls/calls_maximize_main@2x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_maximize_main@2x.png
rename to Telegram/Resources/icons/calls/calls_maximize_main@2x.png
diff --git a/Telegram/Resources/icons/calls_maximize_main@3x.png b/Telegram/Resources/icons/calls/calls_maximize_main@3x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_maximize_main@3x.png
rename to Telegram/Resources/icons/calls/calls_maximize_main@3x.png
diff --git a/Telegram/Resources/icons/calls_maximize_shadow.png b/Telegram/Resources/icons/calls/calls_maximize_shadow.png
similarity index 100%
rename from Telegram/Resources/icons/calls_maximize_shadow.png
rename to Telegram/Resources/icons/calls/calls_maximize_shadow.png
diff --git a/Telegram/Resources/icons/calls_maximize_shadow@2x.png b/Telegram/Resources/icons/calls/calls_maximize_shadow@2x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_maximize_shadow@2x.png
rename to Telegram/Resources/icons/calls/calls_maximize_shadow@2x.png
diff --git a/Telegram/Resources/icons/calls_maximize_shadow@3x.png b/Telegram/Resources/icons/calls/calls_maximize_shadow@3x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_maximize_shadow@3x.png
rename to Telegram/Resources/icons/calls/calls_maximize_shadow@3x.png
diff --git a/Telegram/Resources/icons/calls_minimize_main.png b/Telegram/Resources/icons/calls/calls_minimize_main.png
similarity index 100%
rename from Telegram/Resources/icons/calls_minimize_main.png
rename to Telegram/Resources/icons/calls/calls_minimize_main.png
diff --git a/Telegram/Resources/icons/calls_minimize_main@2x.png b/Telegram/Resources/icons/calls/calls_minimize_main@2x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_minimize_main@2x.png
rename to Telegram/Resources/icons/calls/calls_minimize_main@2x.png
diff --git a/Telegram/Resources/icons/calls_minimize_main@3x.png b/Telegram/Resources/icons/calls/calls_minimize_main@3x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_minimize_main@3x.png
rename to Telegram/Resources/icons/calls/calls_minimize_main@3x.png
diff --git a/Telegram/Resources/icons/calls_minimize_shadow.png b/Telegram/Resources/icons/calls/calls_minimize_shadow.png
similarity index 100%
rename from Telegram/Resources/icons/calls_minimize_shadow.png
rename to Telegram/Resources/icons/calls/calls_minimize_shadow.png
diff --git a/Telegram/Resources/icons/calls_minimize_shadow@2x.png b/Telegram/Resources/icons/calls/calls_minimize_shadow@2x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_minimize_shadow@2x.png
rename to Telegram/Resources/icons/calls/calls_minimize_shadow@2x.png
diff --git a/Telegram/Resources/icons/calls_minimize_shadow@3x.png b/Telegram/Resources/icons/calls/calls_minimize_shadow@3x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_minimize_shadow@3x.png
rename to Telegram/Resources/icons/calls/calls_minimize_shadow@3x.png
diff --git a/Telegram/Resources/icons/calls_mute_tooltip.png b/Telegram/Resources/icons/calls/calls_mute_tooltip.png
similarity index 100%
rename from Telegram/Resources/icons/calls_mute_tooltip.png
rename to Telegram/Resources/icons/calls/calls_mute_tooltip.png
diff --git a/Telegram/Resources/icons/calls_mute_tooltip@2x.png b/Telegram/Resources/icons/calls/calls_mute_tooltip@2x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_mute_tooltip@2x.png
rename to Telegram/Resources/icons/calls/calls_mute_tooltip@2x.png
diff --git a/Telegram/Resources/icons/calls_mute_tooltip@3x.png b/Telegram/Resources/icons/calls/calls_mute_tooltip@3x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_mute_tooltip@3x.png
rename to Telegram/Resources/icons/calls/calls_mute_tooltip@3x.png
diff --git a/Telegram/Resources/icons/calls_mute_userpic.png b/Telegram/Resources/icons/calls/calls_mute_userpic.png
similarity index 100%
rename from Telegram/Resources/icons/calls_mute_userpic.png
rename to Telegram/Resources/icons/calls/calls_mute_userpic.png
diff --git a/Telegram/Resources/icons/calls_mute_userpic@2x.png b/Telegram/Resources/icons/calls/calls_mute_userpic@2x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_mute_userpic@2x.png
rename to Telegram/Resources/icons/calls/calls_mute_userpic@2x.png
diff --git a/Telegram/Resources/icons/calls_mute_userpic@3x.png b/Telegram/Resources/icons/calls/calls_mute_userpic@3x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_mute_userpic@3x.png
rename to Telegram/Resources/icons/calls/calls_mute_userpic@3x.png
diff --git a/Telegram/Resources/icons/calls_restore_main.png b/Telegram/Resources/icons/calls/calls_restore_main.png
similarity index 100%
rename from Telegram/Resources/icons/calls_restore_main.png
rename to Telegram/Resources/icons/calls/calls_restore_main.png
diff --git a/Telegram/Resources/icons/calls_restore_main@2x.png b/Telegram/Resources/icons/calls/calls_restore_main@2x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_restore_main@2x.png
rename to Telegram/Resources/icons/calls/calls_restore_main@2x.png
diff --git a/Telegram/Resources/icons/calls_restore_main@3x.png b/Telegram/Resources/icons/calls/calls_restore_main@3x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_restore_main@3x.png
rename to Telegram/Resources/icons/calls/calls_restore_main@3x.png
diff --git a/Telegram/Resources/icons/calls_restore_shadow.png b/Telegram/Resources/icons/calls/calls_restore_shadow.png
similarity index 100%
rename from Telegram/Resources/icons/calls_restore_shadow.png
rename to Telegram/Resources/icons/calls/calls_restore_shadow.png
diff --git a/Telegram/Resources/icons/calls_restore_shadow@2x.png b/Telegram/Resources/icons/calls/calls_restore_shadow@2x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_restore_shadow@2x.png
rename to Telegram/Resources/icons/calls/calls_restore_shadow@2x.png
diff --git a/Telegram/Resources/icons/calls_restore_shadow@3x.png b/Telegram/Resources/icons/calls/calls_restore_shadow@3x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_restore_shadow@3x.png
rename to Telegram/Resources/icons/calls/calls_restore_shadow@3x.png
diff --git a/Telegram/Resources/icons/calls_shadow_controls.png b/Telegram/Resources/icons/calls/calls_shadow_controls.png
similarity index 100%
rename from Telegram/Resources/icons/calls_shadow_controls.png
rename to Telegram/Resources/icons/calls/calls_shadow_controls.png
diff --git a/Telegram/Resources/icons/calls_shadow_controls@2x.png b/Telegram/Resources/icons/calls/calls_shadow_controls@2x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_shadow_controls@2x.png
rename to Telegram/Resources/icons/calls/calls_shadow_controls@2x.png
diff --git a/Telegram/Resources/icons/calls_shadow_controls@3x.png b/Telegram/Resources/icons/calls/calls_shadow_controls@3x.png
similarity index 100%
rename from Telegram/Resources/icons/calls_shadow_controls@3x.png
rename to Telegram/Resources/icons/calls/calls_shadow_controls@3x.png
diff --git a/Telegram/Resources/icons/calls/group_calls_muted.png b/Telegram/Resources/icons/calls/group_calls_muted.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c63be9cde9c27d2acd85f2634fdf5f449de9928
GIT binary patch
literal 718
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6-QsS%!O
zzP=1vKsE;hV|yk83y{SK#8N=az`(SC2`(bBfEmFCNgn(gJ{_pU(bL5-#DjNhnC<yY
zM*%y%P7e>4fFRAlj4v+BuV|Q>aIyYxJmx>)f<mB@(`sQZ!B&kcc2ZI;JLh%Uey_Q!
z{Qa5f$+Yt4k1Ny4pXrEsPI_UwPi_Ccwm)p!GC5`V+EX^)T=Mzn8l#^zcA5el8}hc_
z_G~}wm}-9eLDv(*nLZi&?+2SmO)b5eHC3*ko%5iSRqC9RzxXZYaJ4c$-eZ(9DMs)3
z@3&>%KWpZ(UlX|D)6nYc+t3iS@(6=M<l3;3-FG!4c)A$koXuySO_|F%ah`+cry9G=
z%{N~(OgpU_yFPsGy@nGr96XEm-w!oy<h|+4!?1PNeqn_jx8I(+zEtN=zhJ|Xiy1FG
z>Uti0jr}ljYU^>&f3pv~Eel>6q<H2;oq@!JyLs0qF8HwM#4QQm*ej+d(l*z~9!;9)
zIPqnHg-Z9)MM{q43tJi4;yIE`AKX~YIq9T|_4eDjWn%JCn{TSDzItj`*y^Kp>z}vm
z=H55KMd{;AhVr_dF+X;GsM;%|Ft6)lh0h|juT^s$`;RNn^;7Q?H1oamO87v;>Z=wz
z?!P}B{<-RnhFEu?hRCGNBCYMlR=&(S->R6FU-s-i+T^+HvS#by#D_ZP7pa|kuOifW
zqKtLsJO;P@_x<<A^?QD(T6aDBRf(0&2Dx6hPo+~&r+zzpJJlh{N5RNr`Q<yGUq~rN
zEZ+U-<BmBScdYwaqxbrr#50zr6OTV~)EtU>F|}B2vLesYbD!?*S$1Bj?rDtP_4Mc4
x+ux~Q)-jsuHFG9!?*9@d=NA4`>;JF*!Mj)Cxv&0u0ZUM#@^tlcS?83{1OUj@Hsb&Q

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/calls/group_calls_muted@2x.png b/Telegram/Resources/icons/calls/group_calls_muted@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..231ce293f003a034690347989e5fc84064bfdcf0
GIT binary patch
literal 1288
zcmV+j1^4=iP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000m
zpaTE|000010000m00000`2S8e000DgNkl<ZXa((=&ntC77{|}OVu1)tg(MqUh$Y!r
z5&i;6lI&3|#9tuA0@<=rl!X$JEUc7;WWz?-D3Txf^}O>v?>qC(%$Ygo%yqr4UQ^SV
zndh13c|K=;oSAzQp63zE-!>(`ZRCFf{{i^w5&S<!psA_JYi(`y5{X3Q3$LlE@g^rH
zy`!Te@9yr-&nTk}vd>7^g{*mCV1Rg9Sy`d%>};cMPEHO@Pfyd^+Z$I8JRyS)bi;f)
z%Iv|z(DL%K63FW6Y5)QOZEbBSdSMmlrV%0>prfOM-rwJqcytK7RXtr@UD4Xwnx9eD
z6Z$y5X`6mH0G#yp_68vMbYk;bnKsYQ&onwZN?BQ1!Xe6NgN!FkC-hANL^MDc#MIOj
zkI8?IjEq==0)(8{!nW!<fW-r_LEPTnikL7}<TtMe0hv6V*zWXi0c;SQ0CQdsTCYQg
zC$`N->g)aWy7Px@VPV1R>+ADa5X_dE*xOYb47H1k3(=aNpD)TEDWvokObh$$>@2Xw
zvcMGkv$L~&0Q{#ePob_la4}$l;JcH}PDTMB$eEcL>lSN*$T$F3h>QfVLFiv>=w&Pb
zf*T(n4@@T=BBKESVOrQSM8*MBRaGh5WE8}g0p#Z95;6jm^ZEHXxj@X%&xd{oY<^^)
zT3HQ96Z*k+c6QR^<D;KZmUVC(aDlkIyc7WXQ6kKb>{Ba818i?^3#Yrgy9xjfWJrLh
zsHjk6aAaB&+?altgKeJRQw!8sk98J$cz9s8ey7UHN?!Dz8yg$`v$V9-+uPgoii(O9
zdDz)$b8}PCm2JyD6(vK(NXGO;``p|de=+p>`l?(9^$QKoLkvRn<#uov&~J9QTJk$K
zu9&dR6MXW%5zoJY+7yR}hq+z<+1A#k7}u|qw&`R#cJM70Hsv%lG^F^j#m3sB0jjI3
zW!tp4xTqL6UFvNM+Xk_;w50fe&p5Hg0)U~z!$aW!_t}Pq2E_p&FcR|5DmDny!j`8O
ze8mhNdeI{Qo$l^#0f556!2#vv<pmsJP2jGJ9R}Ov$;k<om6ZkbOc2}we8r6`HURro
zj`sKWxex!jzP>INp@TyaoC)Ik`r6fIyb(Zvb#--ge}At)0IIyaTm<C`Vp|h@cZy*z
zJ^+lhx3??X9cXTDZfI<5j0y`2BSDhMWI*SG5N-f~=<4dCr>7@nBv8Se$F_*yQ(IbE
zsJ6D&&nTk}GOP*H*$LaGypUm!Z?O@h;0^$T_4W01dU^^!&dFtWiUE-t03a}BCMG6G
z{&6cV&GGRu6&Du=rju!5NBn}9IshM9932J+2We+#hhAP@tPGGr2fC)?2Dhg}V9Vw*
z!}H?+veANq0%~k*3_zd_GFdmQ+|$$JuQPlY`}_N?{qUCyglSKVK(QI;-yNj`tCW<K
zc<c-Bu{(q=67`G*5K)E{V%-Nq`ddY8rx7x_EE>~Tu+A^$BV}20b2H(Fg^cn?Y=!mx
yv?-Lv7aVHp)22|U*E9-$0Mhs}Q!@4KN8lH~zwXJ4BjYdt0000<MNUMnLSTY=tx#zI

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/calls/group_calls_muted@3x.png b/Telegram/Resources/icons/calls/group_calls_muted@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..7eaf73940e8b9f8a81a2efa4bb3236d4604aacda
GIT binary patch
literal 1894
zcmV-s2buVZP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000;
zpaTE|000010000;00000v-xDz000KrNkl<ZcmeI2%}Z5J7{`x4-$Pw!6uyBj5-D3r
z5z!_DcM&Km1g49URw99I#Xmp@+=woMN(fW}Erg&&sfgi96eL|pNF+#+MkKz>Z@!1-
z{LVe+nKN_V?!7;~58OL*p7YGiGoLeO&b(zAhQatRBN77tNc0)?Uji9Gil&eOlmVn5
zptzlBK^Z^_0*c!?iu<wO&dSO%Dk>_B($Z3+xVYFXZ-0N^`2PL7@%8IhgR#_)Lg0a~
zUs+ihd-CK78yp;DmoH!Tl~$BhTU*OUMn>4q&JJfl3+}-Nwjx~$LjQ2Kx3{et{rU5U
zb#!!SS0FDhj|~kCv4evHD-Tr!wn&4tX%7f3$0<igN36ZQUFrPAix=6#!h$oo_BGNX
zk0e9#*Mjg`QKEvx`xmyhwnioOrCVKHWymXuko*BcpCfxcydcfY%qT(d&Y9t-66BS(
zfZ!Njr^CZTvL4VoUpHLK<j0R6thcw9m6w-Wl|~#o+>=RLTbpGcGc12CNH_xrbs**B
z<gks64YHo^-o0a$m6g(p;vQ@$L7vE4_!DCo3=kaBfz;I0MAeV2udlPh!a`*QVFO!A
zkavt=MBc#x=|GyDopsgi`1qLJxN$=`pbTM)G)@^F9#*D}0AM&kDo7_MC(e4Y_wV2P
zt{BodWqEnocRqfBMKW2Pn3yo`-MeS-uNW^sQ81No%G}(XQ>DC~pPzTxV2TpAL;?s-
zdO>nlf=?lwD&_UJZ{J)t7cN|I>7rId1_+MnLgM|2?|M*ava_>&=i@g)q<~Pk4y4A$
zM!$Zh)IOGu&T9zZHR9$ZNPl{IdYpZ<c`dV#P)|D)MFD_BeZ^2SYQ*hT=BWgP3J(kn
zL;~s50*VUKsRk4Uq*D(lETl65NI=3@j1sSo`^*3Wq=ye5YAuz(R{YKsAXM6GoJ6&x
zGY7~oq*Dv1wYAlHO~mVB4|QA8sRe}BB`hRB{NDk>Cf?)6kJ<S6xEabe_3*`t0@B#n
znCrubyzQ+~#C3fW_KNVoFNMM|!I`P4sRV~{O{M4i>!w{;NYs)m@}|nv^^HnP===l1
zwhSfqts7AgmPLhxg(UJ3A+_Y{$2Z}lR~TqLsHmuj=joRE`g)ggadFYo@ogI8)vH%V
zOG}HTb4GO5lSCSO-a<$DfO|5ZMLMsLY^FScRDbT=Iq?t^!p_c4R~l;D2Q8_&x!GlF
zFVpMmCJLptec%Hn@Y$ZfZah#6`u+R2!FN4*8HrL=Rh6jVS06rnFg7<g6ZB|FZ{NN(
zZr!?-ptoP3CEdS&-{9*>cC{7f5RCKZ&s*0bLiqq+;d4+4M0RCm#r2?GzkW^Th1Ng`
zTGE|6cgQrnGNxX&o`k%GEkgL<6!>bl@fnxDN?sYgc=5vN2g6yRl9CdaGkoiZ$qp~*
zblkd-P&RyU3Vijdi{f4|KzHxnb^2jmQ~eMe@H+ky6(m{z178&oyzU1Bl%Jo^_V)H%
zkZ^uScBsJX0F@4;{{DW?Re&#FzPS8>kMK3=fKcGemoHroLDAROCv^y;T-gyk9Y{J~
zH@j2tF$5f>4c3B??)vrX<bwRqpFdemO^v5xvO}CvLc)&9wQJWr{m`g?a6riX*|TT%
z2WG`_WQBi*mCm69$2p*@SFf_0H*cE1hK2@KP*C8RR;MMwHw^$Pn{a^8ub{<Hvb3}m
z>v=+)u9fY(LI2>v16Ad9?uP?}Cxqj2GC@m1>xke<l6mM30Ya1?9uNx0fp3}cQ7n7(
z=n><G4aiD{aNf)>W=PQhLglBYr)7*x{pZi0SyxwAETCe96b&G>0!#=$e*EYO2{&<4
ze{^(|@mW1N@)j)$BV*XWc57=(xiYC5Cpo7jq8vpS9Uv5xo14p?K7Fc$Bn;4*?(XiI
zhs<%z4nG_?htAmnhaCbSeE>+&0uoOHj!+|Q0VZge0!Z-y0w@dypFe-jWIL&0AmP;$
z4}%I-huwXgvW*XraJ;Ur&YYG|>&kv1ArDL+E?v6h2?%9-LE`I8%JhHzj~|c#Rb5?e
ze(v$L`}OOWHXGO?4TcKHL*%Cu${@XY^F}wH<N>l*2s7;4w{NrV?rte4+=ETX**Mvf
zRC{$cUsD6f=71EC-6m`tea__MB;!lH%He{&ES&O2Q%k9ELS*^WA#~C(MrEKy`xyO6
zyR6d!5FgvPz)(7uQ4$ns0qE1GPp+y`I+szB6uO_g*zB+zg1MFu#N%8d;as)rk`|pb
z8Umlg8CR}cG1~;6iy7(iilq%8lS~@^r9~f<hFmO{GJq@;bR+|a=3;3xfGiYrBm;=%
gVresgEEII)U&n=aP}w57hyVZp07*qoM6N<$f|!?aH~;_u

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/calls/group_calls_unmuted.png b/Telegram/Resources/icons/calls/group_calls_unmuted.png
new file mode 100644
index 0000000000000000000000000000000000000000..213b54d8a9d48f999a2b1516a6470591dd2d13cf
GIT binary patch
literal 599
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6-QsS%!O
zzP=1vKsE;hV|yk83y{SK#8N=az`(SC2`(bBfEmFCNgn(gJ{_p|l&6bhhzIZ8(ADb>
zISAan7n9+kptwZgA$Nd>O`p6&Qoz<f%ry@G83Q|yKJ*aa5MerbxUrGt*}Itmm&&%k
z5o+2w*{6Jl<#V3hKH}~ij+geQ*~bUhas0n!wjylxqPX?OHM{S2J^q;C{Z#poVd}38
zlSQ}Rx=mDcdnc+Mc3O;W#r^l2-=%F{crf8WpF~@fkA`;L-Gq%17rs_4bzA&V#Gywf
zOWu4(jNX>0wIYg70*p-!`~vOfiwAkUQsK3{;**w>AY^d$e`0gdPMx;H3lDHjzN{2;
zJ=BlM@=8LcpVXWgEph9Q8^8N)_dNHQNQA_WAe)D$@;BUn|C4*m?cBI#1%aJ0erM8*
z72{3Hj+|J?*1ci(-9G!}@|}IHPL1cD8_V*sf3oS%UcZhjp@Ee>Msr@7s^jC2Gq&5z
z^*dQ8qjutSU({ML>m-haY&<+Ny%t4T%}E<QPCuR0`T6IZS!b6yx$&7wY<Tcu%NAaS
zHCMAl+7!7Te2ZCs-DIZE4MF$q+6D*GI$oCxu$S+S-FM~PcWd**%!bRjw_2DfhxL1~
zuL;pQ&(={Y5qqvu<!REk%P)^C2wIuKW-oB9e&&I4E7|Oa96zq{DP6K&{Yh=V^R|Qk
Y7?p$G22Sl1jReK6r>mdKI;Vst0O{fFQvd(}

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/calls/group_calls_unmuted@2x.png b/Telegram/Resources/icons/calls/group_calls_unmuted@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3f4b226aadd108746a1069d9f3b8f377f448863
GIT binary patch
literal 1073
zcmV-11kU@3P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000m
zpaTE|000010000m00000`2S8e000A|Nkl<ZXa((9F-t2!5Z*jdA&O!pSSSeESc#T`
zg@uKPzaUuo57ZC~!C#QZN=v~%U?B>kSP6n)VI^3J#6nPvfoQ_K{qAL#*^8Im%k3fZ
zGO+CI&dfLS?e1M}lMzCYY`<3i{MyPJg?9-2^bU4*AiM)pQ&XZ?EQ-6kJMsSh9yI8f
zgDnlgTPShs>FJ@}-Ce5J>l7uh!3VxRayBsh6n}Ph7FBoCJbXQpNKOE&8kSP2L`O$Q
zL4zI^#CY0;WCY~7Hjd5b=O=A#ZBbWOmo5-G=3rBT<AhibB$5%352var=nI8HWKkf&
z1+hO)K)zvgO*kri<-^6n#*Y(X!#;7xiGK%1M@MDOe{y|&E#%Qq!=@fK_$cAAYA$Y{
zm_UDjzs~ve^rZDDh5PW>D1Y00Vgj}VY1=yl(q3U3erE@4E0ngqvjb_bunqtJ*@0{}
zE6~!GxOtp*U}a@Ryu7>w4LX-{xvYmHBO_XmQn(L~g@3C&QFxfQeo&pCpX(2{%gal{
z-{;31u$3UEOKna&P^nb(0*sH3YaPnz>8TzM4-bpY%}qTHEBSn0z()y>#T>`xIhB7@
zZ)Li-x2G0{YPFhi9sKS>gF6BLtcH%cRu>vvF@dcFIc32v&F&;uRpAEx($bOv?Bhxa
zOfDN68%B;6Wb6bcCnq^J9UdMU;8?w+mwI4wLCzLMbDNz2fNpPZH9qdMv$L}tBsf;s
z3D}|pHu!}9kpLEtLoUbS;pawRb#>LK>*nT$`uh5s65*M^T^DaB`Nvk!pkwa4OFS@u
z#Ra)s>vATL$z<s2>Wb%~<KtuM?(UA0%<x4lFt{KGa(O2J!0G8}`uO<Z`2td7V`Fg=
z2EK?1F9@)aBS!J?bvr`JZ+Usyc-?``>+36RZ*SA!;Gi`*eBg^1E_j6kTjg=>GYv=C
zxl1mW6Z`x7qPMr#2*Rg<d>e_AlM``&e=nY&p94F7ye1|l#Ny(jSXfvP;mdrrS`}++
zYvSPGz`%1I#AYplX=Y}I9v&X}BDSRi16aUpv$Y)<9GRV+9eR6vi(Nco5bJX6EX3L;
zpn!*lhG>0#oh~je=<Dk%k_>F{fiGfIe8N6C0banszyQt7%{7t09Bkazhu+phEE8Kr
zGBAAPyWJT38aRDU`%0DuPHF@mA0KtST-TEx74PR#)<*O5^Mo4~8g$I1(NcQ`JT7oc
rsML;7%d8%a9ReN~vn{A!zXN{(+!pb09+=0O00000NkvXXu0mjf^A*}e

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/calls/group_calls_unmuted@3x.png b/Telegram/Resources/icons/calls/group_calls_unmuted@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e351c3996082646a7ae8fccd2f66d279c32498e9
GIT binary patch
literal 1563
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
N002ovPDHLkV1lhG$2<T4

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 95e70e64b..e52f6e7a8 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -219,7 +219,6 @@ contactsPhotoCheckIcon: defaultPeerListCheckIcon;
 contactsPhotoCheck: defaultPeerListCheck;
 contactsPhotoCheckbox: defaultPeerListCheckbox;
 contactsPhotoDisabledCheckFg: menuIconFg;
-contactsNameCheckedFg: windowActiveTextFg;
 contactsRipple: defaultRippleAnimation;
 
 contactsMarginTop: 4px;
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 5a08ed6e7..2ed83d917 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1283,7 +1283,7 @@ crl::time PeerListContent::paintRow(
 			selected);
 	}
 	auto nameCheckedRatio = row->disabled() ? 0. : row->checkedRatio();
-	p.setPen(anim::pen(st::contactsNameFg, st::contactsNameCheckedFg, nameCheckedRatio));
+	p.setPen(anim::pen(_st.item.nameFg, _st.item.nameFgChecked, nameCheckedRatio));
 	name.drawLeftElided(p, namex, _st.item.namePosition.y(), namew, width());
 
 	if (!actionSize.isEmpty()) {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
index 65d8994fa..0c3264b35 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
@@ -135,7 +135,6 @@ private:
 // Viewing admins, banned or restricted users list with search.
 class ParticipantsBoxController
 	: public PeerListController
-	, private base::Subscriber
 	, public base::has_weak_ptr {
 public:
 	using Role = ParticipantsRole;
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 91441586b..ad0a7aeea 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -22,14 +22,14 @@ CallSignalBars {
 
 callRadius: 6px;
 callShadow: Shadow {
-	left: icon {{ "call_shadow_left", windowShadowFg }};
-	topLeft: icon {{ "call_shadow_top_left", windowShadowFg }};
-	top: icon {{ "call_shadow_top", windowShadowFg }};
-	topRight: icon {{ "call_shadow_top_left-flip_horizontal", windowShadowFg }};
-	right: icon {{ "call_shadow_left-flip_horizontal", windowShadowFg }};
-	bottomRight: icon {{ "call_shadow_top_left-flip_vertical-flip_horizontal", windowShadowFg }};
-	bottom: icon {{ "call_shadow_top-flip_vertical", windowShadowFg }};
-	bottomLeft: icon {{ "call_shadow_top_left-flip_vertical", windowShadowFg }};
+	left: icon {{ "calls/call_shadow_left", windowShadowFg }};
+	topLeft: icon {{ "calls/call_shadow_top_left", windowShadowFg }};
+	top: icon {{ "calls/call_shadow_top", windowShadowFg }};
+	topRight: icon {{ "calls/call_shadow_top_left-flip_horizontal", windowShadowFg }};
+	right: icon {{ "calls/call_shadow_left-flip_horizontal", windowShadowFg }};
+	bottomRight: icon {{ "calls/call_shadow_top_left-flip_vertical-flip_horizontal", windowShadowFg }};
+	bottom: icon {{ "calls/call_shadow_top-flip_vertical", windowShadowFg }};
+	bottomLeft: icon {{ "calls/call_shadow_top_left-flip_vertical", windowShadowFg }};
 	extend: margins(9px, 8px, 9px, 10px);
 	fallback: windowShadowFgFallback;
 }
@@ -72,7 +72,7 @@ callBodyWithPreview: CallBodyLayout {
 	muteSize: 0px;
 	mutePosition: point(90px, 84px);
 }
-callMutedPeerIcon: icon {{ "calls_mute_userpic", callIconFg }};
+callMutedPeerIcon: icon {{ "calls/calls_mute_userpic", callIconFg }};
 
 callOutgoingPreviewMin: size(360px, 120px);
 callOutgoingPreview: size(540px, 180px); // default, for height == callHeight.
@@ -89,7 +89,7 @@ callSignalBarsPadding: margins(8px, 9px, 11px, 5px);
 callFingerprintTop: 8px;
 callFingerprintBottom: -16px;
 
-callTooltipMutedIcon: icon{{ "calls_mute_tooltip", videoPlayIconFg }};
+callTooltipMutedIcon: icon{{ "calls/calls_mute_tooltip", videoPlayIconFg }};
 callTooltipMutedIconPosition: point(10px, 5px);
 callTooltipPadding: margins(41px, 7px, 15px, 8px);
 
@@ -114,7 +114,7 @@ callButtonLabel: FlatLabel(defaultFlatLabel) {
 
 callAnswer: CallButton {
 	button: IconButton(callButton) {
-		icon: icon {{ "call_answer", callIconFg }};
+		icon: icon {{ "calls/call_answer", callIconFg }};
 		ripple: RippleAnimation(defaultRippleAnimation) {
 			color: callAnswerRipple;
 		}
@@ -127,7 +127,7 @@ callAnswer: CallButton {
 }
 callHangup: CallButton {
 	button: IconButton(callButton) {
-		icon: icon {{ "call_discard", callIconFg }};
+		icon: icon {{ "calls/call_discard", callIconFg }};
 		ripple: RippleAnimation(defaultRippleAnimation) {
 			color: callHangupRipple;
 		}
@@ -138,7 +138,7 @@ callHangup: CallButton {
 }
 callCancel: CallButton {
 	button: IconButton(callButton) {
-		icon: icon {{ "call_cancel", callIconFgActive }};
+		icon: icon {{ "calls/call_cancel", callIconFgActive }};
 		ripple: RippleAnimation(defaultRippleAnimation) {
 			color: callIconActiveRipple;
 		}
@@ -149,7 +149,7 @@ callCancel: CallButton {
 }
 callMicrophoneMute: CallButton {
 	button: IconButton(callButton) {
-		icon: icon {{ "call_record_active", callIconFg }};
+		icon: icon {{ "calls/call_record_active", callIconFg }};
 		ripple: RippleAnimation(defaultRippleAnimation) {
 			color: callMuteRipple;
 		}
@@ -160,7 +160,7 @@ callMicrophoneMute: CallButton {
 }
 callMicrophoneUnmute: CallButton(callMicrophoneMute) {
 	button: IconButton(callButton) {
-		icon: icon {{ "call_record_muted", callIconFgActive }};
+		icon: icon {{ "calls/call_record_muted", callIconFgActive }};
 		ripple: RippleAnimation(defaultRippleAnimation) {
 			color: callIconActiveRipple;
 		}
@@ -169,7 +169,7 @@ callMicrophoneUnmute: CallButton(callMicrophoneMute) {
 }
 callCameraMute: CallButton(callMicrophoneMute) {
 	button: IconButton(callButton) {
-		icon: icon {{ "call_camera_active", callIconFg }};
+		icon: icon {{ "calls/call_camera_active", callIconFg }};
 		ripple: RippleAnimation(defaultRippleAnimation) {
 			color: callMuteRipple;
 		}
@@ -177,7 +177,7 @@ callCameraMute: CallButton(callMicrophoneMute) {
 }
 callCameraUnmute: CallButton(callMicrophoneUnmute) {
 	button: IconButton(callButton) {
-		icon: icon {{ "call_camera_muted", callIconFgActive }};
+		icon: icon {{ "calls/call_camera_muted", callIconFgActive }};
 		ripple: RippleAnimation(defaultRippleAnimation) {
 			color: callIconActiveRipple;
 		}
@@ -223,7 +223,7 @@ callBarMuteToggle: IconButton {
 	width: 41px;
 	height: 38px;
 
-	icon: icon {{ "call_record_active", callBarFg }};
+	icon: icon {{ "calls/call_record_active", callBarFg }};
 	iconPosition: point(3px, 2px);
 
 	ripple: RippleAnimation(defaultRippleAnimation) {
@@ -232,11 +232,11 @@ callBarMuteToggle: IconButton {
 	rippleAreaPosition: point(5px, 3px);
 	rippleAreaSize: 32px;
 }
-callBarUnmuteIcon: icon {{ "call_record_muted", callBarFg }};
+callBarUnmuteIcon: icon {{ "calls/call_record_muted", callBarFg }};
 callBarRightSkip: 12px;
 callBarSkip: 10px;
 callBarHangup: IconButton(callBarMuteToggle) {
-	icon: icon {{ "call_discard", callBarFg }};
+	icon: icon {{ "calls/call_discard", callBarFg }};
 	iconPosition: point(3px, 1px);
 }
 callBarLabel: LabelSimple(defaultLabelSimple) {
@@ -254,16 +254,16 @@ callBarInfoLabel: FlatLabel(defaultFlatLabel) {
 callBarLabelTop: 10px;
 
 callArrowPosition: point(-2px, 1px);
-callArrowIn: icon {{ "call_arrow_in", callArrowFg }};
-callArrowOut: icon {{ "call_arrow_out", callArrowFg }};
-callArrowMissed: icon {{ "call_arrow_in", callArrowMissedFg }};
+callArrowIn: icon {{ "calls/call_arrow_in", callArrowFg }};
+callArrowOut: icon {{ "calls/call_arrow_out", callArrowFg }};
+callArrowMissed: icon {{ "calls/call_arrow_in", callArrowMissedFg }};
 callArrowSkip: 4px;
 callReDial: IconButton {
 	width: 40px;
 	height: 56px;
 
-	icon: icon {{ "call_answer", menuIconFg }};
-	iconOver: icon {{ "call_answer", menuIconFgOver }};
+	icon: icon {{ "calls/call_answer", menuIconFg }};
+	iconOver: icon {{ "calls/call_answer", menuIconFgOver }};
 	iconPosition: point(-1px, -1px);
 
 	ripple: defaultRippleAnimation;
@@ -272,8 +272,8 @@ callReDial: IconButton {
 }
 
 callCameraReDial: IconButton(callReDial) {
-	icon: icon {{ "call_camera_active", menuIconFg }};
-	iconOver: icon {{ "call_camera_active", menuIconFgOver }};
+	icon: icon {{ "calls/call_camera_active", menuIconFg }};
+	iconOver: icon {{ "calls/call_camera_active", menuIconFgOver }};
 }
 
 callRatingPadding: margins(24px, 12px, 24px, 0px);
@@ -281,7 +281,7 @@ callRatingStar: IconButton {
 	width: 36px;
 	height: 36px;
 
-	icon: icon {{ "call_rating", windowSubTextFg }};
+	icon: icon {{ "calls/call_rating", windowSubTextFg }};
 	iconPosition: point(-1px, -1px);
 
 	ripple: RippleAnimation(defaultRippleAnimation) {
@@ -290,7 +290,7 @@ callRatingStar: IconButton {
 	rippleAreaPosition: point(0px, 0px);
 	rippleAreaSize: 36px;
 }
-callRatingStarFilled: icon {{ "call_rating_filled", lightButtonFg }};
+callRatingStarFilled: icon {{ "calls/call_rating_filled", lightButtonFg }};
 callRatingStarTop: 4px;
 callRatingComment: InputField(defaultInputField) {
 	textMargins: margins(1px, 26px, 1px, 4px);
@@ -327,43 +327,43 @@ callTitleButton: IconButton {
 	iconPosition: point(0px, 0px);
 }
 callTitleMinimizeIcon: icon {
-	{ "calls_minimize_shadow", windowShadowFg },
-	{ "calls_minimize_main", callNameFg },
+	{ "calls/calls_minimize_shadow", windowShadowFg },
+	{ "calls/calls_minimize_main", callNameFg },
 };
 callTitleMinimizeIconOver: icon {
 	{ size(34px, 30px), callBgButton },
 	{ size(34px, 30px), callMuteRipple },
-	{ "calls_minimize_shadow", windowShadowFg },
-	{ "calls_minimize_main", callNameFg },
+	{ "calls/calls_minimize_shadow", windowShadowFg },
+	{ "calls/calls_minimize_main", callNameFg },
 };
 callTitleMaximizeIcon: icon {
-	{ "calls_maximize_shadow", windowShadowFg },
-	{ "calls_maximize_main", callNameFg },
+	{ "calls/calls_maximize_shadow", windowShadowFg },
+	{ "calls/calls_maximize_main", callNameFg },
 };
 callTitleMaximizeIconOver: icon {
 	{ size(34px, 30px), callBgButton },
 	{ size(34px, 30px), callMuteRipple },
-	{ "calls_maximize_shadow", windowShadowFg },
-	{ "calls_maximize_main", callNameFg },
+	{ "calls/calls_maximize_shadow", windowShadowFg },
+	{ "calls/calls_maximize_main", callNameFg },
 };
 callTitleRestoreIcon: icon {
-	{ "calls_restore_shadow", windowShadowFg },
-	{ "calls_restore_main", callNameFg },
+	{ "calls/calls_restore_shadow", windowShadowFg },
+	{ "calls/calls_restore_main", callNameFg },
 };
 callTitleRestoreIconOver: icon {
 	{ size(34px, 30px), callBgButton },
 	{ size(34px, 30px), callMuteRipple },
-	{ "calls_restore_shadow", windowShadowFg },
-	{ "calls_restore_main", callNameFg },
+	{ "calls/calls_restore_shadow", windowShadowFg },
+	{ "calls/calls_restore_main", callNameFg },
 };
 callTitleCloseIcon: icon {
-	{ "calls_close_shadow", windowShadowFg },
-	{ "calls_close_main", callNameFg },
+	{ "calls/calls_close_shadow", windowShadowFg },
+	{ "calls/calls_close_main", callNameFg },
 };
 callTitleCloseIconOver: icon {
 	{ size(34px, 30px), titleButtonCloseBgOver },
-	{ "calls_close_shadow", windowShadowFg },
-	{ "calls_close_main", titleButtonCloseFgOver },
+	{ "calls/calls_close_shadow", windowShadowFg },
+	{ "calls/calls_close_main", titleButtonCloseFgOver },
 };
 callTitle: WindowTitle(defaultWindowTitle) {
 	height: 0px;
@@ -394,7 +394,7 @@ callTitle: WindowTitle(defaultWindowTitle) {
 	closeIconActive: callTitleCloseIcon;
 	closeIconActiveOver: callTitleCloseIconOver;
 }
-callTitleShadow: icon {{ "calls_shadow_controls", windowShadowFg }};
+callTitleShadow: icon {{ "calls/calls_shadow_controls", windowShadowFg }};
 
 callErrorToast: Toast(defaultToast) {
 	minWidth: 240px;
@@ -402,3 +402,78 @@ callErrorToast: Toast(defaultToast) {
 
 groupCallWidth: 380px;
 groupCallHeight: 580px;
+
+groupCallRipple: RippleAnimation(defaultRippleAnimation) {
+	color: groupCallMembersRipple;
+}
+groupCallMembersList: PeerList(defaultPeerList) {
+	item: PeerListItem(defaultPeerListItem) {
+		button: OutlineButton(defaultPeerListButton) {
+			textBg: groupCallMembersBg;
+			textBgOver: groupCallMembersBg;
+
+			textFg: groupCallMemberInactiveStatus;
+			textFgOver: groupCallMemberInactiveStatus;
+
+			font: normalFont;
+			padding: margins(11px, 5px, 11px, 5px);
+
+			ripple: groupCallRipple;
+		}
+		height: 52px;
+		photoPosition: point(12px, 6px);
+		namePosition: point(68px, 7px);
+		statusPosition: point(68px, 27px);
+		photoSize: 40px;
+		nameFg: groupCallMembersFg;
+		nameFgChecked: groupCallMembersFg;
+		statusFg: groupCallMemberInactiveStatus;
+		statusFgOver: groupCallMemberInactiveStatus;
+		statusFgActive: groupCallMemberActiveStatus;
+	}
+}
+groupCallMembersHeader: 47px;
+groupCallMembersMargin: margins(16px, 16px, 16px, 28px);
+groupCallAddMember: IconButton(defaultIconButton) {
+	width: 36px;
+	height: 36px;
+	iconPosition: point(3px, 5px);
+	icon: icon {{ "info_add_member", groupCallMemberInactiveIcon }};
+	iconOver: icon {{ "info_add_member", groupCallMemberInactiveIcon }};
+	rippleAreaPosition: point(0px, 0px);
+	rippleAreaSize: 36px;
+	ripple: groupCallRipple;
+}
+groupCallHeaderPosition: point(16px, 16px);
+groupCallHeaderLabel: FlatLabel(defaultFlatLabel) {
+	maxHeight: 18px;
+	textFg: groupCallMembersFg;
+	style: TextStyle(defaultTextStyle) {
+		font: semiboldFont;
+		linkFont: semiboldFont;
+		linkFontOver: semiboldFont;
+	}
+}
+groupCallAddButtonPosition: point(10px, 7px);
+
+groupCallInactiveButton: IconButton {
+	width: 36px;
+	height: 52px;
+
+	icon: icon {{ "calls/group_calls_muted", groupCallMemberInactiveIcon }};
+	iconOver: icon {{ "calls/group_calls_muted", groupCallMemberInactiveIcon }};
+	iconPosition: point(-1px, -1px);
+
+	ripple: groupCallRipple;
+	rippleAreaPosition: point(0px, 8px);
+	rippleAreaSize: 36px;
+}
+groupCallActiveButton: IconButton(groupCallInactiveButton) {
+	icon: icon {{ "calls/group_calls_unmuted", groupCallMemberActiveIcon }};
+	iconOver: icon {{ "calls/group_calls_unmuted", groupCallMemberActiveIcon }};
+}
+groupCallMutedButton: IconButton(groupCallInactiveButton) {
+	icon: icon {{ "calls/group_calls_muted", groupCallMemberMutedIcon }};
+	iconOver: icon {{ "calls/group_calls_muted", groupCallMemberMutedIcon }};
+}
+groupCallMemberButtonSkip: 10px;
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
new file mode 100644
index 000000000..d3826d5c5
--- /dev/null
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -0,0 +1,528 @@
+/*
+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 "calls/calls_group_members.h"
+
+#include "calls/calls_group_call.h"
+#include "data/data_channel.h"
+#include "data/data_user.h"
+#include "data/data_changes.h"
+#include "data/data_group_call.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/text/text_utilities.h"
+#include "ui/effects/ripple_animation.h"
+#include "main/main_session.h"
+#include "lang/lang_keys.h"
+#include "styles/style_calls.h"
+
+namespace Calls {
+namespace {
+
+class MembersController final
+	: public PeerListController
+	, public base::has_weak_ptr {
+public:
+	explicit MembersController(not_null<GroupCall*> call);
+
+	Main::Session &session() const override;
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowActionClicked(not_null<PeerListRow*> row) override;
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override;
+	void loadMoreRows() override;
+
+private:
+	[[nodiscard]] std::unique_ptr<PeerListRow> createRow(
+		not_null<UserData*> user) const;
+
+	void prepareRows();
+
+	void setupListChangeViewers();
+	bool appendRow(not_null<UserData*> user);
+	bool prependRow(not_null<UserData*> user);
+	bool removeRow(not_null<UserData*> user);
+
+	const base::weak_ptr<GroupCall> _call;
+	const not_null<ChannelData*> _channel;
+
+	Ui::BoxPointer _addBox;
+	rpl::lifetime _lifetime;
+
+};
+
+class Row final : public PeerListRow {
+public:
+	Row(not_null<ChannelData*> channel, not_null<UserData*> user);
+
+	enum class State {
+		Active,
+		Inactive,
+		Muted,
+	};
+
+	void addActionRipple(QPoint point, Fn<void()> updateCallback) override;
+	void stopLastActionRipple() override;
+
+	int nameIconWidth() const override {
+		return 0;
+	}
+	QSize actionSize() const override {
+		return QSize(_st->width, _st->height);
+	}
+	QMargins actionMargins() const override {
+		return QMargins(
+			0,
+			0,
+			st::groupCallMemberButtonSkip,
+			0);
+	}
+	void paintAction(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) override;
+
+private:
+	void refreshStatus() override;
+
+	[[nodiscard]] static State ComputeState(
+		not_null<ChannelData*> channel,
+		not_null<UserData*> user);
+	[[nodiscard]] static not_null<const style::IconButton*> ComputeIconStyle(
+		State state);
+
+	State _state = State::Inactive;
+	not_null<const style::IconButton*> _st;
+
+	std::unique_ptr<Ui::RippleAnimation> _actionRipple;
+
+};
+
+Row::Row(not_null<ChannelData*> channel, not_null<UserData*> user)
+: PeerListRow(user)
+, _state(ComputeState(channel, user))
+, _st(ComputeIconStyle(_state)) {
+	refreshStatus();
+}
+
+void Row::paintAction(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		bool selected,
+		bool actionSelected) {
+	auto size = actionSize();
+	if (_actionRipple) {
+		_actionRipple->paint(
+			p,
+			x + _st->rippleAreaPosition.x(),
+			y + _st->rippleAreaPosition.y(),
+			outerWidth);
+		if (_actionRipple->empty()) {
+			_actionRipple.reset();
+		}
+	}
+	_st->icon.paintInCenter(
+		p,
+		style::rtlrect(x, y, size.width(), size.height(), outerWidth));
+}
+
+void Row::refreshStatus() {
+	setCustomStatus([&] {
+		switch (_state) {
+		case State::Inactive:
+		case State::Muted: return "listening";
+		case State::Active: return "speaking";
+		}
+		return "";
+	}());
+}
+
+Row::State Row::ComputeState(
+		not_null<ChannelData*> channel,
+		not_null<UserData*> user) {
+	const auto call = channel->call();
+	if (!call) {
+		return State::Inactive;
+	}
+	const auto &participants = call->participants();
+	const auto i = ranges::find(
+		participants,
+		user,
+		&Data::GroupCall::Participant::user);
+	if (i == end(participants)) {
+		return State::Inactive;
+	}
+	return !i->muted
+		? State::Active
+		: i->canSelfUnmute
+		? State::Inactive
+		: State::Muted;
+}
+
+not_null<const style::IconButton*> Row::ComputeIconStyle(
+		State state) {
+	switch (state) {
+	case State::Inactive: return &st::groupCallInactiveButton;
+	case State::Active: return &st::groupCallActiveButton;
+	case State::Muted: return &st::groupCallMutedButton;
+	}
+	Unexpected("State in Row::ComputeIconStyle.");
+}
+
+void Row::addActionRipple(QPoint point, Fn<void()> updateCallback) {
+	if (!_actionRipple) {
+		auto mask = Ui::RippleAnimation::ellipseMask(
+			QSize(_st->rippleAreaSize, _st->rippleAreaSize));
+		_actionRipple = std::make_unique<Ui::RippleAnimation>(
+			_st->ripple,
+			std::move(mask),
+			std::move(updateCallback));
+	}
+	_actionRipple->add(point - _st->rippleAreaPosition);
+}
+
+void Row::stopLastActionRipple() {
+	if (_actionRipple) {
+		_actionRipple->lastStop();
+	}
+}
+
+MembersController::MembersController(not_null<GroupCall*> call)
+: _call(call)
+, _channel(call->channel()) {
+	setupListChangeViewers();
+}
+
+void MembersController::setupListChangeViewers() {
+	const auto call = _call.get();
+	const auto channel = call->channel();
+	channel->session().changes().peerUpdates(
+		channel,
+		Data::PeerUpdate::Flag::GroupCall
+	) | rpl::start_with_next([=] {
+		prepareRows();
+	}, _lifetime);
+}
+
+Main::Session &MembersController::session() const {
+	return _call->channel()->session();
+}
+
+void MembersController::prepare() {
+	delegate()->peerListSetSearchMode(PeerListSearchMode::Disabled);
+	//delegate()->peerListSetTitle(std::move(title));
+	setDescriptionText(tr::lng_contacts_loading(tr::now));
+	setSearchNoResultsText(tr::lng_blocked_list_not_found(tr::now));
+
+	prepareRows();
+	delegate()->peerListRefreshRows();
+
+	loadMoreRows();
+}
+
+void MembersController::prepareRows() {
+	const auto real = _channel->call();
+	if (!real) {
+		return;
+	}
+	auto foundSelf = false;
+	auto changed = false;
+	const auto &participants = real->participants();
+	auto count = delegate()->peerListFullRowsCount();
+	for (auto i = 0; i != count;) {
+		auto row = delegate()->peerListRowAt(i);
+		auto user = row->peer()->asUser();
+		if (user->isSelf()) {
+			foundSelf = true;
+		}
+		const auto contains = ranges::contains(
+			participants,
+			not_null{ user },
+			&Data::GroupCall::Participant::user);
+		if (contains) {
+			++i;
+		} else {
+			changed = true;
+			delegate()->peerListRemoveRow(row);
+			--count;
+		}
+	}
+	if (!foundSelf) {
+		if (auto row = createRow(_channel->session().user())) {
+			changed = true;
+			delegate()->peerListAppendRow(std::move(row));
+		}
+	}
+	for (const auto &participant : participants) {
+		if (auto row = createRow(participant.user)) {
+			changed = true;
+			delegate()->peerListAppendRow(std::move(row));
+		}
+	}
+	if (changed) {
+		delegate()->peerListRefreshRows();
+	}
+}
+
+void MembersController::loadMoreRows() {
+	if (const auto call = _call.get()) {
+		if (const auto real = call->channel()->call()) {
+			real->requestParticipants();
+		}
+	}
+}
+
+void MembersController::rowClicked(not_null<PeerListRow*> row) {
+	Expects(row->peer()->isUser());
+
+	const auto user = row->peer()->asUser();
+}
+
+void MembersController::rowActionClicked(
+		not_null<PeerListRow*> row) {
+	Expects(row->peer()->isUser());
+
+	const auto user = row->peer()->asUser();
+}
+
+base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	Expects(row->peer()->isUser());
+
+	const auto user = row->peer()->asUser();
+	auto result = base::make_unique_q<Ui::PopupMenu>(parent);
+	//result->addAction( // #TODO calls
+	//	tr::lng_context_view_profile(tr::now),
+	//	crl::guard(this, [=] { _navigation->showPeerInfo(user); }));
+	return result;
+}
+
+bool MembersController::appendRow(not_null<UserData*> user) {
+	if (delegate()->peerListFindRow(user->id)) {
+		return false;
+	}
+	delegate()->peerListAppendRow(createRow(user));
+	return true;
+}
+
+bool MembersController::prependRow(not_null<UserData*> user) {
+	if (auto row = delegate()->peerListFindRow(user->id)) {
+		return false;
+	}
+	delegate()->peerListPrependRow(createRow(user));
+	return true;
+}
+
+bool MembersController::removeRow(not_null<UserData*> user) {
+	if (auto row = delegate()->peerListFindRow(user->id)) {
+		delegate()->peerListRemoveRow(row);
+		return true;
+	}
+	return false;
+}
+
+std::unique_ptr<PeerListRow> MembersController::createRow(
+		not_null<UserData*> user) const {
+	return std::make_unique<Row>(_channel, user);
+}
+
+} // namespace
+
+GroupMembers::GroupMembers(
+	QWidget *parent,
+	not_null<GroupCall*> call)
+: RpWidget(parent)
+, _call(call)
+, _scroll(this, st::defaultSolidScroll)
+, _listController(std::make_unique<MembersController>(call)) {
+	setupHeader(call);
+	setupList();
+	setContent(_list);
+	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
+
+	paintRequest(
+	) | rpl::start_with_next([=](QRect clip) {
+		QPainter(this).fillRect(clip, st::groupCallMembersBg);
+	}, lifetime());
+}
+
+int GroupMembers::desiredHeight() const {
+	auto desired = _header ? _header->height() : 0;
+	auto count = [this] {
+		if (const auto call = _call.get()) {
+			if (const auto real = call->channel()->call()) {
+				return real->fullCount();
+			}
+		}
+		return 0;
+	}();
+	desired += qMax(count, _list->fullRowsCount())
+		* st::groupCallMembersList.item.height;
+	return qMax(height(), desired);
+}
+
+void GroupMembers::setupHeader(not_null<GroupCall*> call) {
+	_header = object_ptr<Ui::FixedHeightWidget>(
+		this,
+		st::groupCallMembersHeader);
+	auto parent = _header.data();
+
+	_titleWrap = Ui::CreateChild<Ui::RpWidget>(parent);
+	_title = setupTitle(call);
+	_addMember = Ui::CreateChild<Ui::IconButton>(
+		parent,
+		st::groupCallAddMember);
+	setupButtons();
+
+	widthValue(
+	) | rpl::start_with_next([this](int width) {
+		_header->resizeToWidth(width);
+	}, _header->lifetime());
+}
+
+object_ptr<Ui::FlatLabel> GroupMembers::setupTitle(
+		not_null<GroupCall*> call) {
+	const auto channel = call->channel();
+	auto count = channel->session().changes().peerFlagsValue(
+		channel,
+		Data::PeerUpdate::Flag::GroupCall
+	) | rpl::map([=] {
+		const auto call = channel->call();
+		return std::max(call ? call->fullCount() : 0, 1);
+	});
+	auto result = object_ptr<Ui::FlatLabel>(
+		_titleWrap,
+		tr::lng_chat_status_members(
+			lt_count_decimal,
+			std::move(count) | tr::to_count(),
+			Ui::Text::Upper
+		),
+		st::groupCallHeaderLabel);
+	result->setAttribute(Qt::WA_TransparentForMouseEvents);
+	return result;
+}
+
+void GroupMembers::setupButtons() {
+	using namespace rpl::mappers;
+
+	_addMember->showOn(rpl::single(true));
+	_addMember->addClickHandler([=] { // TODO throttle(ripple duration)
+		addMember();
+	});
+}
+
+void GroupMembers::setupList() {
+	auto topSkip = _header ? _header->height() : 0;
+	_list = _scroll->setOwnedWidget(object_ptr<ListWidget>(
+		this,
+		_listController.get(),
+		st::groupCallMembersList));
+
+	sizeValue(
+	) | rpl::start_with_next([=](QSize size) {
+		_scroll->setGeometry(0, topSkip, size.width(), size.height() - topSkip);
+		_list->resizeToWidth(size.width());
+	}, _list->lifetime());
+
+	_list->heightValue(
+	) | rpl::start_with_next([=](int listHeight) {
+		auto newHeight = (listHeight > 0)
+			? (topSkip + listHeight)
+			: 0;
+		resize(width(), newHeight);
+	}, _list->lifetime());
+	_list->moveToLeft(0, topSkip);
+	_list->show();
+}
+
+void GroupMembers::resizeEvent(QResizeEvent *e) {
+	if (_header) {
+		updateHeaderControlsGeometry(width());
+	}
+}
+
+void GroupMembers::updateHeaderControlsGeometry(int newWidth) {
+	auto availableWidth = newWidth
+		- st::groupCallAddButtonPosition.x();
+	_addMember->moveToLeft(
+		availableWidth - _addMember->width(),
+		st::groupCallAddButtonPosition.y(),
+		newWidth);
+	if (!_addMember->isHidden()) {
+		availableWidth -= _addMember->width();
+	}
+
+	_titleWrap->resize(
+		availableWidth - _addMember->width() - st::groupCallHeaderPosition.x(),
+		_title->height());
+	_titleWrap->moveToLeft(
+		st::groupCallHeaderPosition.x(),
+		st::groupCallHeaderPosition.y(),
+		newWidth);
+	_titleWrap->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	_title->resizeToWidth(_titleWrap->width());
+	_title->moveToLeft(0, 0);
+}
+
+void GroupMembers::addMember() {
+	// #TODO calls
+}
+
+void GroupMembers::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	setChildVisibleTopBottom(_list, visibleTop, visibleBottom);
+}
+
+void GroupMembers::peerListSetTitle(rpl::producer<QString> title) {
+}
+
+void GroupMembers::peerListSetAdditionalTitle(rpl::producer<QString> title) {
+}
+
+bool GroupMembers::peerListIsRowChecked(not_null<PeerListRow*> row) {
+	return false;
+}
+
+void GroupMembers::peerListScrollToTop() {
+}
+
+int GroupMembers::peerListSelectedRowsCount() {
+	return 0;
+}
+
+std::vector<not_null<PeerData*>> GroupMembers::peerListCollectSelectedRows() {
+	return {};
+}
+
+void GroupMembers::peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void GroupMembers::peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) {
+	Unexpected("Item selection in Info::Profile::Members.");
+}
+
+void GroupMembers::peerListFinishSelectedRowsBunch() {
+}
+
+void GroupMembers::peerListSetDescription(
+		object_ptr<Ui::FlatLabel> description) {
+	description.destroy();
+}
+
+} // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_group_members.h b/Telegram/SourceFiles/calls/calls_group_members.h
new file mode 100644
index 000000000..ff1c46385
--- /dev/null
+++ b/Telegram/SourceFiles/calls/calls_group_members.h
@@ -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
+*/
+#pragma once
+
+#include "boxes/peer_list_box.h"
+
+namespace Ui {
+class ScrollArea;
+} // namespace Ui
+
+namespace Calls {
+
+class GroupCall;
+
+class GroupMembers final
+	: public Ui::RpWidget
+	, private PeerListContentDelegate {
+public:
+	GroupMembers(
+		QWidget *parent,
+		not_null<GroupCall*> call);
+
+	int desiredHeight() const;
+
+private:
+	using ListWidget = PeerListContent;
+
+	void visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) override;
+
+	void resizeEvent(QResizeEvent *e) override;
+
+	// PeerListContentDelegate interface.
+	void peerListSetTitle(rpl::producer<QString> title) override;
+	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
+	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
+	int peerListSelectedRowsCount() override;
+	void peerListScrollToTop() override;
+	std::vector<not_null<PeerData*>> peerListCollectSelectedRows() override;
+	void peerListAddSelectedPeerInBunch(
+		not_null<PeerData*> peer) override;
+	void peerListAddSelectedRowInBunch(
+		not_null<PeerListRow*> row) override;
+	void peerListFinishSelectedRowsBunch() override;
+	void peerListSetDescription(
+		object_ptr<Ui::FlatLabel> description) override;
+
+	void setupHeader(not_null<GroupCall*> call);
+	object_ptr<Ui::FlatLabel> setupTitle(not_null<GroupCall*> call);
+	void setupList();
+
+	void setupButtons();
+
+	void addMember();
+	void showMembersWithSearch(bool withSearch);
+	void updateHeaderControlsGeometry(int newWidth);
+
+	base::weak_ptr<GroupCall> _call;
+	object_ptr<Ui::ScrollArea> _scroll;
+	std::unique_ptr<PeerListController> _listController;
+	object_ptr<Ui::RpWidget> _header = { nullptr };
+	ListWidget *_list = { nullptr };
+
+	Ui::RpWidget *_titleWrap = nullptr;
+	Ui::FlatLabel *_title = nullptr;
+	Ui::IconButton *_addMember = nullptr;
+
+};
+
+} // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 4309519e4..167173a63 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -7,42 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "calls/calls_group_panel.h"
 
-#include "data/data_photo.h"
-#include "data/data_session.h"
-#include "data/data_user.h"
-#include "data/data_file_origin.h"
-#include "data/data_photo_media.h"
-#include "data/data_cloud_file.h"
-#include "data/data_changes.h"
-#include "calls/calls_emoji_fingerprint.h"
-#include "calls/calls_signal_bars.h"
-#include "calls/calls_userpic.h"
-#include "calls/calls_video_bubble.h"
+#include "calls/calls_group_members.h"
 #include "ui/widgets/buttons.h"
-#include "ui/widgets/labels.h"
-#include "ui/widgets/shadow.h"
 #include "ui/widgets/window.h"
 #include "ui/effects/ripple_animation.h"
-#include "ui/image/image.h"
-#include "ui/text/format_values.h"
-#include "ui/wrap/fade_wrap.h"
-#include "ui/wrap/padding_wrap.h"
-#include "ui/platform/ui_platform_utility.h"
-#include "ui/toast/toast.h"
-#include "ui/empty_userpic.h"
-#include "ui/emoji_config.h"
 #include "core/application.h"
-#include "mainwindow.h"
 #include "lang/lang_keys.h"
-#include "main/main_session.h"
-#include "apiwrap.h"
-#include "platform/platform_specific.h"
-#include "base/platform/base_platform_info.h"
-#include "window/main_window.h"
+#include "base/event_filter.h"
 #include "app.h"
-#include "webrtc/webrtc_video_track.h"
 #include "styles/style_calls.h"
-#include "styles/style_chat.h"
 
 #ifdef Q_OS_WIN
 #include "ui/platform/win/ui_window_title_win.h"
@@ -246,9 +219,9 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 #ifdef Q_OS_WIN
 , _controls(std::make_unique<Ui::Platform::TitleControls>(
 	_window.get(),
-	st::callTitle,
-	[=](bool maximized) { toggleFullScreen(maximized); }))
+	st::callTitle))
 #endif // Q_OS_WIN
+, _members(widget(), call)
 , _settings(widget(), st::callCancel)
 , _hangup(widget(), st::callHangup)
 , _mute(widget(), st::callMicrophoneMute, &st::callMicrophoneUnmute) {
@@ -262,6 +235,9 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 GroupPanel::~GroupPanel() = default;
 
 void GroupPanel::showAndActivate() {
+	if (_window->isHidden()) {
+		_window->show();
+	}
 	_window->raise();
 	_window->setWindowState(_window->windowState() | Qt::WindowActive);
 	_window->activateWindow();
@@ -276,17 +252,13 @@ void GroupPanel::initWindow() {
 	_window->setTitle(u" "_q);
 	_window->setTitleStyle(st::callTitle);
 
-	_window->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
-		if (e->type() == QEvent::Close) {
-			handleClose();
-		} else if (e->type() == QEvent::KeyPress) {
-			if ((static_cast<QKeyEvent*>(e.get())->key() == Qt::Key_Escape)
-				&& _window->isFullScreen()) {
-				_window->showNormal();
-			}
+	base::install_event_filter(_window.get(), [=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::Close && handleClose()) {
+			e->ignore();
+			return base::EventFilterResult::Cancel;
 		}
-	}, _window->lifetime());
+		return base::EventFilterResult::Continue;
+	});
 
 	_window->setBodyTitleArea([=](QPoint widgetPoint) {
 		using Flag = Ui::WindowTitleHitTestFlag;
@@ -301,31 +273,8 @@ void GroupPanel::initWindow() {
 		const auto inControls = false;
 		return inControls
 			? Flag::None
-			: (Flag::Move | Flag::FullScreen);
+			: (Flag::Move | Flag::Maximize);
 	});
-
-#ifdef Q_OS_WIN
-	// On Windows we replace snap-to-top maximizing with fullscreen.
-	//
-	// We have to switch first to showNormal, so that showFullScreen
-	// will remember correct normal window geometry and next showNormal
-	// will show it instead of a moving maximized window.
-	//
-	// We have to do it in InvokeQueued, otherwise it still captures
-	// the maximized window geometry and saves it.
-	//
-	// I couldn't find a less glitchy way to do that *sigh*.
-	const auto object = _window->windowHandle();
-	const auto signal = &QWindow::windowStateChanged;
-	QObject::connect(object, signal, [=](Qt::WindowState state) {
-		if (state == Qt::WindowMaximized) {
-			InvokeQueued(object, [=] {
-				_window->showNormal();
-				_window->showFullScreen();
-			});
-		}
-	});
-#endif // Q_OS_WIN
 }
 
 void GroupPanel::initWidget() {
@@ -382,6 +331,11 @@ void GroupPanel::initWithCall(GroupCall *call) {
 	) | rpl::start_with_next([=](State state) {
 		stateChanged(state);
 	}, _callLifetime);
+
+	_members->desiredHeightValue(
+	) | rpl::start_with_next([=] {
+		updateControlsGeometry();
+	}, _members->lifetime());
 }
 
 void GroupPanel::initLayout() {
@@ -412,22 +366,33 @@ void GroupPanel::initGeometry() {
 	updateControlsGeometry();
 }
 
-void GroupPanel::toggleFullScreen(bool fullscreen) {
-	if (fullscreen) {
-		_window->showFullScreen();
-	} else {
-		_window->showNormal();
-	}
-}
-
 void GroupPanel::updateControlsGeometry() {
 	if (widget()->size().isEmpty()) {
 		return;
 	}
-	const auto top = widget()->height() - 2 * _mute->height();
-	_mute->move((widget()->width() - _mute->width()) / 2, top);
-	_settings->moveToLeft(_settings->width(), top);
-	_hangup->moveToRight(_settings->width(), top);
+	const auto desiredHeight = _members->desiredHeight();
+	const auto membersWidth = widget()->width()
+		- st::groupCallMembersMargin.left()
+		- st::groupCallMembersMargin.right();
+	const auto muteTop = widget()->height() - 2 * _mute->height();
+	const auto buttonsTop = muteTop;
+#ifdef Q_OS_WIN
+	const auto membersTop = st::callTitleButton.height
+		+ st::groupCallMembersMargin.top() / 2;
+#else // Q_OS_WIN
+	const auto membersTop = st::groupCallMembersMargin.top();
+#endif // Q_OS_WIN
+	const auto availableHeight = buttonsTop
+		- membersTop
+		- st::groupCallMembersMargin.bottom();
+	_members->setGeometry(
+		st::groupCallMembersMargin.left(),
+		membersTop,
+		membersWidth,
+		std::min(desiredHeight, availableHeight));
+	_mute->move((widget()->width() - _mute->width()) / 2, muteTop);
+	_settings->moveToLeft(_settings->width(), buttonsTop);
+	_hangup->moveToRight(_settings->width(), buttonsTop);
 }
 
 void GroupPanel::paint(QRect clip) {
@@ -435,14 +400,16 @@ void GroupPanel::paint(QRect clip) {
 
 	auto region = QRegion(clip);
 	for (const auto rect : region) {
-		p.fillRect(rect, st::callBgOpaque);
+		p.fillRect(rect, st::groupCallBg);
 	}
 }
 
-void GroupPanel::handleClose() {
+bool GroupPanel::handleClose() {
 	if (_call) {
-		_call->hangup();
+		_window->hide();
+		return true;
 	}
+	return false;
 }
 
 not_null<Ui::RpWidget*> GroupPanel::widget() const {
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h
index cec1fc107..54d98a343 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/calls_group_panel.h
@@ -29,6 +29,7 @@ class FadeWrap;
 template <typename Widget>
 class PaddingWrap;
 class Window;
+class ScrollArea;
 namespace Platform {
 class TitleControls;
 } // namespace Platform
@@ -44,6 +45,8 @@ namespace Calls {
 class Userpic;
 class SignalBars;
 
+class GroupMembers;
+
 class GroupPanel final {
 public:
 	GroupPanel(not_null<GroupCall*> call);
@@ -67,14 +70,11 @@ private:
 	void initLayout();
 	void initGeometry();
 
-	void handleClose();
+	bool handleClose();
 
 	void updateControlsGeometry();
 	void stateChanged(State state);
 	void showControls();
-	void startDurationUpdateTimer(crl::time currentDuration);
-
-	void toggleFullScreen(bool fullscreen);
 
 	GroupCall *_call = nullptr;
 	not_null<ChannelData*> _channel;
@@ -87,6 +87,8 @@ private:
 
 	rpl::lifetime _callLifetime;
 
+	object_ptr<GroupMembers> _members;
+
 	object_ptr<Button> _settings;
 	object_ptr<Button> _hangup;
 	object_ptr<Button> _mute;
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
index 39de068eb..1a20e599e 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
@@ -35,7 +35,7 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::content() const {
 		if (!call || (current && current->channel() == channel)) {
 			return { .shown = false };
 		} else if (!call->fullCount() && !call->participantsLoaded()) {
-			call->requestParticipants();
+			call->reload();
 		}
 		return { .count = call->fullCount(), .shown = true };
 	});
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index f7ca7a972..3317d8fac 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -517,22 +517,22 @@ historyUnreadBarFont: semiboldFont;
 historyForwardChooseMargins: margins(30px, 10px, 30px, 10px);
 historyForwardChooseFont: font(16px);
 
-historyCallArrowIn: icon {{ "call_arrow_in", historyCallArrowInFg }};
-historyCallArrowInSelected: icon {{ "call_arrow_in", historyCallArrowInFgSelected }};
-historyCallArrowMissedIn: icon {{ "call_arrow_in", historyCallArrowMissedInFg }};
-historyCallArrowMissedInSelected: icon {{ "call_arrow_in", historyCallArrowMissedInFgSelected }};
-historyCallArrowOut: icon {{ "call_arrow_out", historyCallArrowOutFg }};
-historyCallArrowOutSelected: icon {{ "call_arrow_out", historyCallArrowOutFgSelected }};
+historyCallArrowIn: icon {{ "calls/call_arrow_in", historyCallArrowInFg }};
+historyCallArrowInSelected: icon {{ "calls/call_arrow_in", historyCallArrowInFgSelected }};
+historyCallArrowMissedIn: icon {{ "calls/call_arrow_in", historyCallArrowMissedInFg }};
+historyCallArrowMissedInSelected: icon {{ "calls/call_arrow_in", historyCallArrowMissedInFgSelected }};
+historyCallArrowOut: icon {{ "calls/call_arrow_out", historyCallArrowOutFg }};
+historyCallArrowOutSelected: icon {{ "calls/call_arrow_out", historyCallArrowOutFgSelected }};
 historyCallWidth: 240px;
 historyCallHeight: 56px;
-historyCallInIcon: icon {{ "call_answer", msgFileInBg }};
-historyCallInIconSelected: icon {{ "call_answer", msgFileInBgSelected }};
-historyCallOutIcon: icon {{ "call_answer", msgFileOutBg }};
-historyCallOutIconSelected: icon {{ "call_answer", msgFileOutBgSelected }};
-historyCallCameraInIcon: icon {{ "call_camera_active", msgFileInBg }};
-historyCallCameraInIconSelected: icon {{ "call_camera_active", msgFileInBgSelected }};
-historyCallCameraOutIcon: icon {{ "call_camera_active", msgFileOutBg }};
-historyCallCameraOutIconSelected: icon {{ "call_camera_active", msgFileOutBgSelected }};
+historyCallInIcon: icon {{ "calls/call_answer", msgFileInBg }};
+historyCallInIconSelected: icon {{ "calls/call_answer", msgFileInBgSelected }};
+historyCallOutIcon: icon {{ "calls/call_answer", msgFileOutBg }};
+historyCallOutIconSelected: icon {{ "calls/call_answer", msgFileOutBgSelected }};
+historyCallCameraInIcon: icon {{ "calls/call_camera_active", msgFileInBg }};
+historyCallCameraInIconSelected: icon {{ "calls/call_camera_active", msgFileInBgSelected }};
+historyCallCameraOutIcon: icon {{ "calls/call_camera_active", msgFileOutBg }};
+historyCallCameraOutIconSelected: icon {{ "calls/call_camera_active", msgFileOutBgSelected }};
 historyCallIconPosition: point(12px, 10px);
 historyCallLeft: 16px;
 historyCallTop: 9px;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index f06346fbf..e73bae12e 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit f06346fbf03900c278e1d59717e1387bffc03f39
+Subproject commit e73bae12e26811f70adff5adfafbdb2548e02cd0

From 0537d4c199d9e52fe5986a2d7097a758e5e5b267 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 25 Nov 2020 18:48:22 +0300
Subject: [PATCH 165/370] Update OpenAL to 1.21.

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 docs/building-msvc.md                       | 4 ++--
 docs/building-xcode.md                      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index f3e8278fb..eeb531458 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -338,7 +338,7 @@ RUN make -j$(nproc)
 RUN make DESTDIR="$LibrariesPath/ffmpeg-cache" install
 
 FROM builder AS openal
-RUN git clone -b fix_mono --depth=1 $GIT/telegramdesktop/openal-soft.git
+RUN git clone -b openal-soft-1.21.0 --depth=1 $GIT/kcat/openal-soft.git
 
 WORKDIR openal-soft
 RUN cmake3 -B build . \
diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index 5d12e6f71..dab0de014 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -108,9 +108,9 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     cmake --build . --config Release
     cd ..
 
-    git clone https://github.com/telegramdesktop/openal-soft.git
+    git clone https://github.com/kcat/openal-soft.git
     cd openal-soft
-    git checkout fix_mono
+    git checkout openal-soft-1.21.0
     cd build
     cmake .. ^
         -G "Visual Studio 16 2019" ^
diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index 48dfc7d93..e1ec69eba 100644
--- a/docs/building-xcode.md
+++ b/docs/building-xcode.md
@@ -240,9 +240,9 @@ Go to ***BuildPath*** and run
     sudo make install
     cd ..
 
-    git clone https://github.com/telegramdesktop/openal-soft.git
+    git clone https://github.com/kcat/openal-soft.git
     cd openal-soft
-    git checkout fix_mono
+    git checkout 3970252da9
     cd build
     CFLAGS=$UNGUARDED CPPFLAGS=$UNGUARDED cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr/local/macos -D ALSOFT_EXAMPLES=OFF -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.12 ..
     make $MAKE_THREADS_CNT

From 858ee0e8c4825a8fc8fe0c349c22cb0f0f245b53 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 26 Nov 2020 14:04:00 +0300
Subject: [PATCH 166/370] Update API scheme.

---
 Telegram/Resources/tl/api.tl                       | 13 +++++++------
 Telegram/SourceFiles/calls/calls_group_call.cpp    |  5 +++--
 Telegram/SourceFiles/calls/calls_group_members.cpp |  4 ++--
 Telegram/SourceFiles/data/data_group_call.cpp      |  9 +++++----
 Telegram/SourceFiles/data/data_group_call.h        |  1 +
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index 7ae43c9b0..6d2f7fa06 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -1185,15 +1185,15 @@ peerBlocked#e8fd8014 peer_id:Peer date:int = PeerBlocked;
 stats.messageStats#8999f295 views_graph:StatsGraph = stats.MessageStats;
 
 groupCallDiscarded#7780bcb4 id:long access_hash:long duration:int = GroupCall;
-groupCall#55903081 flags:# id:long access_hash:long participants_count:int params:flags.0?DataJSON version:int = GroupCall;
+groupCall#55903081 flags:# join_muted:flags.1?true can_change_join_muted:flags.2?true id:long access_hash:long participants_count:int params:flags.0?DataJSON version:int = GroupCall;
 
 inputGroupCall#d8aa840f id:long access_hash:long = InputGroupCall;
 
-groupCallParticipant#89a0d26c flags:# muted:flags.0?true left:flags.1?true can_self_unmute:flags.2?true user_id:int date:int source:int = GroupCallParticipant;
+groupCallParticipant#56b087c9 flags:# muted:flags.0?true left:flags.1?true can_self_unmute:flags.2?true user_id:int date:int active_date:flags.3?int source:int = GroupCallParticipant;
 
-phone.groupCall#564c9fd8 call:GroupCall sources:Vector<int> participants:Vector<GroupCallParticipant> users:Vector<User> = phone.GroupCall;
+phone.groupCall#985c2087 call:GroupCall sources:Vector<int> participants:Vector<GroupCallParticipant> participants_next_offset:string users:Vector<User> = phone.GroupCall;
 
-phone.groupParticipants#3cdb7991 count:int participants:Vector<GroupCallParticipant> users:Vector<User> version:int = phone.GroupParticipants;
+phone.groupParticipants#9cfeb92d count:int participants:Vector<GroupCallParticipant> next_offset:string users:Vector<User> version:int = phone.GroupParticipants;
 
 ---functions---
 
@@ -1551,12 +1551,13 @@ phone.saveCallDebug#277add7e peer:InputPhoneCall debug:DataJSON = Bool;
 phone.sendSignalingData#ff7a9383 peer:InputPhoneCall data:bytes = Bool;
 phone.createGroupCall#e428fa02 channel:InputChannel random_id:int = Updates;
 phone.joinGroupCall#5f9c8e62 flags:# muted:flags.0?true call:InputGroupCall params:DataJSON = Updates;
-phone.leaveGroupCall#60e98e5f call:InputGroupCall = Updates;
+phone.leaveGroupCall#500377f9 call:InputGroupCall source:int = Updates;
 phone.editGroupCallMember#63146ae4 flags:# muted:flags.0?true call:InputGroupCall user_id:InputUser = Updates;
 phone.inviteToGroupCall#7b393160 call:InputGroupCall users:Vector<InputUser> = Updates;
 phone.discardGroupCall#7a777135 call:InputGroupCall = Updates;
+phone.toggleGroupCallSettings#74bbb43d flags:# call:InputGroupCall join_muted:flags.0?Bool = Updates;
 phone.getGroupCall#c7cb017 call:InputGroupCall = phone.GroupCall;
-phone.getGroupParticipants#de41d3b2 call:InputGroupCall max_date:int limit:int = phone.GroupParticipants;
+phone.getGroupParticipants#ae1910a4 call:InputGroupCall offset:string limit:int = phone.GroupParticipants;
 phone.checkGroupCall#b74a7bea call:InputGroupCall source:int = Bool;
 
 langpack.getLangPack#f2f2330a lang_pack:string lang_code:string = LangPackDifference;
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index c08b5b054..bdbdfd3bc 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -205,14 +205,15 @@ void GroupCall::finish(FinishType type) {
 		|| state == State::Failed) {
 		return;
 	}
-	if (!joined()) {
+	if (!_mySsrc) {
 		setState(finalState);
 		return;
 	}
 
 	setState(hangupState);
 	_api.request(MTPphone_LeaveGroupCall(
-		inputCall()
+		inputCall(),
+		MTP_int(_mySsrc)
 	)).done([=](const MTPUpdates &result) {
 		// Here 'this' could be destroyed by updates, so we set Ended after
 		// updates being handled, but in a guarded way.
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index d3826d5c5..f522dcd64 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -369,9 +369,9 @@ int GroupMembers::desiredHeight() const {
 		}
 		return 0;
 	}();
-	desired += qMax(count, _list->fullRowsCount())
+	desired += std::max(count, _list->fullRowsCount())
 		* st::groupCallMembersList.item.height;
-	return qMax(height(), desired);
+	return std::max(height(), desired);
 }
 
 void GroupMembers::setupHeader(not_null<GroupCall*> call) {
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index 97192f76d..87748b3d1 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -60,17 +60,18 @@ void GroupCall::requestParticipants() {
 		return;
 	} else if (_participants.size() >= _fullCount && _allReceived) {
 		return;
+	} else if (_allReceived) {
+		reload();
+		return;
 	}
-	const auto requestFromDate = (_allReceived || _participants.empty())
-		? TimeId(0)
-		: _participants.back().date;
 	auto &api = _channel->session().api();
 	_participantsRequestId = api.request(MTPphone_GetGroupParticipants(
 		input(),
-		MTP_int(requestFromDate),
+		MTP_string(_nextOffset),
 		MTP_int(kRequestPerPage)
 	)).done([=](const MTPphone_GroupParticipants &result) {
 		result.match([&](const MTPDphone_groupParticipants &data) {
+			_nextOffset = qs(data.vnext_offset());
 			_channel->owner().processUsers(data.vusers());
 			applyParticipantsSlice(data.vparticipants().v);
 			_fullCount = data.vcount().v;
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index add71d960..11c69c4fc 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -58,6 +58,7 @@ private:
 
 	std::vector<Participant> _participants;
 	base::flat_set<uint32> _sources;
+	QString _nextOffset;
 	int _fullCount = 0;
 	int _duration = 0;
 	bool _finished = false;

From ec5aeb32f1dc97b92a4a747f183ddf7bec2a52df Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 26 Nov 2020 16:04:11 +0300
Subject: [PATCH 167/370] Add title to group call panel.

---
 Telegram/Resources/langs/lang.strings         | 18 +++++
 Telegram/SourceFiles/calls/calls.style        |  1 +
 .../SourceFiles/calls/calls_group_members.cpp | 10 +--
 .../SourceFiles/calls/calls_group_panel.cpp   | 72 ++++++++++++++++---
 .../SourceFiles/calls/calls_group_panel.h     |  5 ++
 .../SourceFiles/ui/chat/group_call_bar.cpp    |  3 +-
 6 files changed, 95 insertions(+), 14 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 68a98cebf..94cd8ad64 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1811,6 +1811,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_call_microphone_off" = "{user}'s microphone is off";
 
+"lng_group_call_title" = "Voice Chat";
+"lng_group_call_active" = "speaking";
+"lng_group_call_inactive" = "listening";
+"lng_group_call_settings" = "Settings";
+"lng_group_call_unmute" = "Unmute";
+"lng_group_call_you_are_live" = "You are Live";
+"lng_group_call_connecting" = "Connecting...";
+"lng_group_call_leave" = "Leave";
+"lng_group_call_leave_title" = "Leave voice chat";
+"lng_group_call_leave_sure" = "Are you sure you want to leave this voice chat?";
+"lng_group_call_also_end" = "End voice chat";
+"lng_group_call_settings_title" = "Settings";
+"lng_group_call_speakers" = "Speakers";
+"lng_group_call_microphone" = "Microphone";
+"lng_group_call_share" = "Share Invite Link";
+"lng_group_call_end" = "End Voice Chat";
+"lng_group_call_join" = "Join";
+
 "lng_no_mic_permission" = "Telegram needs access to your microphone so that you can make calls and record voice messages.";
 
 "lng_player_message_today" = "Today at {time}";
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index ad0a7aeea..8ee01a845 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -455,6 +455,7 @@ groupCallHeaderLabel: FlatLabel(defaultFlatLabel) {
 	}
 }
 groupCallAddButtonPosition: point(10px, 7px);
+groupCallMembersWidthMax: 360px;
 
 groupCallInactiveButton: IconButton {
 	width: 36px;
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index f522dcd64..39278f799 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -142,10 +142,10 @@ void Row::refreshStatus() {
 	setCustomStatus([&] {
 		switch (_state) {
 		case State::Inactive:
-		case State::Muted: return "listening";
-		case State::Active: return "speaking";
+		case State::Muted: return tr::lng_group_call_inactive(tr::now);
+		case State::Active: return tr::lng_group_call_active(tr::now);
 		}
-		return "";
+		Unexpected("State in Row::refreshStatus.");
 	}());
 }
 
@@ -510,11 +510,11 @@ std::vector<not_null<PeerData*>> GroupMembers::peerListCollectSelectedRows() {
 }
 
 void GroupMembers::peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) {
-	Unexpected("Item selection in Info::Profile::Members.");
+	Unexpected("Item selection in Calls::GroupMembers.");
 }
 
 void GroupMembers::peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) {
-	Unexpected("Item selection in Info::Profile::Members.");
+	Unexpected("Item selection in Calls::GroupMembers.");
 }
 
 void GroupMembers::peerListFinishSelectedRowsBunch() {
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 167173a63..fbedf2e0f 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -249,8 +249,10 @@ void GroupPanel::initWindow() {
 	_window->setAttribute(Qt::WA_NoSystemBackground);
 	_window->setWindowIcon(
 		QIcon(QPixmap::fromImage(Image::Empty()->original(), Qt::ColorOnly)));
-	_window->setTitle(u" "_q);
 	_window->setTitleStyle(st::callTitle);
+	_window->setTitle(computeTitleRect()
+		? u" "_q
+		: tr::lng_group_call_title(tr::now));
 
 	base::install_event_filter(_window.get(), [=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::Close && handleClose()) {
@@ -366,22 +368,43 @@ void GroupPanel::initGeometry() {
 	updateControlsGeometry();
 }
 
+int GroupPanel::computeMembersListTop() const {
+#ifdef Q_OS_WIN
+	return st::callTitleButton.height + st::groupCallMembersMargin.top() / 2;
+#elif defined Q_OS_MAC // Q_OS_WIN
+	return st::groupCallMembersMargin.top() * 2;
+#else // Q_OS_WIN || Q_OS_MAC
+	return st::groupCallMembersMargin.top();
+#endif // Q_OS_WIN || Q_OS_MAC
+}
+
+std::optional<QRect> GroupPanel::computeTitleRect() const {
+#ifdef Q_OS_WIN
+	const auto controls = _controls->geometry();
+	return QRect(0, 0, controls.x(), controls.height());
+#else // Q_OS_WIN
+	return std::nullopt;
+#endif // Q_OS_WIN
+}
+
 void GroupPanel::updateControlsGeometry() {
 	if (widget()->size().isEmpty()) {
 		return;
 	}
 	const auto desiredHeight = _members->desiredHeight();
-	const auto membersWidth = widget()->width()
+	const auto membersWidthAvailable = widget()->width()
 		- st::groupCallMembersMargin.left()
 		- st::groupCallMembersMargin.right();
+	const auto membersWidthMin = st::groupCallWidth
+		- st::groupCallMembersMargin.left()
+		- st::groupCallMembersMargin.right();
+	const auto membersWidth = std::clamp(
+		membersWidthAvailable,
+		membersWidthMin,
+		st::groupCallMembersWidthMax);
 	const auto muteTop = widget()->height() - 2 * _mute->height();
 	const auto buttonsTop = muteTop;
-#ifdef Q_OS_WIN
-	const auto membersTop = st::callTitleButton.height
-		+ st::groupCallMembersMargin.top() / 2;
-#else // Q_OS_WIN
-	const auto membersTop = st::groupCallMembersMargin.top();
-#endif // Q_OS_WIN
+	const auto membersTop = computeMembersListTop();
 	const auto availableHeight = buttonsTop
 		- membersTop
 		- st::groupCallMembersMargin.bottom();
@@ -393,6 +416,39 @@ void GroupPanel::updateControlsGeometry() {
 	_mute->move((widget()->width() - _mute->width()) / 2, muteTop);
 	_settings->moveToLeft(_settings->width(), buttonsTop);
 	_hangup->moveToRight(_settings->width(), buttonsTop);
+	refreshTitle();
+}
+
+void GroupPanel::refreshTitle() {
+	if (const auto titleRect = computeTitleRect()) {
+		if (!_title) {
+			_title.create(
+				widget(),
+				tr::lng_group_call_title(),
+				st::groupCallHeaderLabel);
+			_window->setTitle(u" "_q);
+		}
+		const auto best = _title->naturalWidth();
+		const auto from = (widget()->width() - best) / 2;
+		const auto top = (computeMembersListTop() - _title->height()) / 2;
+		const auto left = titleRect->x();
+		if (from >= left && from + best <= left + titleRect->width()) {
+			_title->resizeToWidth(best);
+			_title->moveToLeft(from, top);
+		} else if (titleRect->width() < best) {
+			_title->resizeToWidth(titleRect->width());
+			_title->moveToLeft(left, top);
+		} else if (from < left) {
+			_title->resizeToWidth(best);
+			_title->moveToLeft(left, top);
+		} else {
+			_title->resizeToWidth(best);
+			_title->moveToLeft(left + titleRect->width() - best, top);
+		}
+	} else if (_title) {
+		_title.destroy();
+		_window->setTitle(tr::lng_group_call_title(tr::now));
+	}
 }
 
 void GroupPanel::paint(QRect clip) {
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h
index 54d98a343..d4c87dd63 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/calls_group_panel.h
@@ -76,6 +76,10 @@ private:
 	void stateChanged(State state);
 	void showControls();
 
+	[[nodiscard]] int computeMembersListTop() const;
+	[[nodiscard]] std::optional<QRect> computeTitleRect() const;
+	void refreshTitle();
+
 	GroupCall *_call = nullptr;
 	not_null<ChannelData*> _channel;
 
@@ -87,6 +91,7 @@ private:
 
 	rpl::lifetime _callLifetime;
 
+	object_ptr<Ui::FlatLabel> _title = { nullptr };
 	object_ptr<GroupMembers> _members;
 
 	object_ptr<Button> _settings;
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
index 08daddd65..b7a73e4db 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/message_bar.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/buttons.h"
+#include "lang/lang_keys.h"
 #include "styles/style_chat.h"
 #include "styles/palette.h"
 
@@ -102,7 +103,7 @@ void GroupCallBar::paint(Painter &p) {
 	p.fillRect(_inner->rect(), st::historyComposeAreaBg);
 	p.setPen(st::defaultMessageBar.textFg);
 	p.setFont(st::defaultMessageBar.text.font);
-	p.drawText(_inner->rect(), "Voice Chat", style::al_center);
+	p.drawText(_inner->rect(), tr::lng_group_call_title(tr::now), style::al_center);
 }
 
 void GroupCallBar::updateControlsGeometry(QRect wrapGeometry) {

From 2ac0a2a10bf0e2d30621c541456652aec3cd55eb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 26 Nov 2020 19:01:26 +0300
Subject: [PATCH 168/370] Send mute state updates in group calls.

---
 .../SourceFiles/calls/calls_group_call.cpp    | 166 ++++++++++++------
 Telegram/SourceFiles/calls/calls_group_call.h |   6 +-
 .../SourceFiles/calls/calls_group_members.cpp |   8 +-
 Telegram/SourceFiles/calls/calls_instance.cpp |   3 +
 4 files changed, 123 insertions(+), 60 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index bdbdfd3bc..526a958f5 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -111,45 +111,7 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 		_id = data.vid().v;
 		_accessHash = data.vaccess_hash().v;
 		createAndStartController();
-		const auto weak = base::make_weak(this);
-		_instance->emitJoinPayload([=](tgcalls::GroupJoinPayload payload) {
-			crl::on_main(weak, [=, payload = std::move(payload)]{
-				auto fingerprints = QJsonArray();
-				for (const auto print : payload.fingerprints) {
-					auto object = QJsonObject();
-					object.insert("hash", QString::fromStdString(print.hash));
-					object.insert("setup", QString::fromStdString(print.setup));
-					object.insert(
-						"fingerprint",
-						QString::fromStdString(print.fingerprint));
-					fingerprints.push_back(object);
-				}
-
-				auto root = QJsonObject();
-				const auto ssrc = payload.ssrc;
-				root.insert("ufrag", QString::fromStdString(payload.ufrag));
-				root.insert("pwd", QString::fromStdString(payload.pwd));
-				root.insert("fingerprints", fingerprints);
-				root.insert("ssrc", double(payload.ssrc));
-
-				const auto json = QJsonDocument(root).toJson(
-					QJsonDocument::Compact);
-				_api.request(MTPphone_JoinGroupCall(
-					MTP_flags(_muted.current()
-						? MTPphone_JoinGroupCall::Flag::f_muted
-						: MTPphone_JoinGroupCall::Flag(0)),
-					inputCall,
-					MTP_dataJSON(MTP_bytes(json))
-				)).done([=](const MTPUpdates &updates) {
-					_mySsrc = ssrc;
-					setState(State::Joined);
-
-					_channel->session().api().applyUpdates(updates);
-				}).fail([=](const RPCError &error) {
-					int a = error.code();
-				}).send();
-			});
-		});
+		rejoin();
 	});
 	_channel->setCall(inputCall);
 
@@ -161,6 +123,56 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 	}, _lifetime);
 }
 
+void GroupCall::rejoin() {
+	Expects(_state.current() == State::Joining);
+
+	_mySsrc = 0;
+	const auto weak = base::make_weak(this);
+	_instance->emitJoinPayload([=](tgcalls::GroupJoinPayload payload) {
+		crl::on_main(weak, [=, payload = std::move(payload)]{
+			auto fingerprints = QJsonArray();
+			for (const auto print : payload.fingerprints) {
+				auto object = QJsonObject();
+				object.insert("hash", QString::fromStdString(print.hash));
+				object.insert("setup", QString::fromStdString(print.setup));
+				object.insert(
+					"fingerprint",
+					QString::fromStdString(print.fingerprint));
+				fingerprints.push_back(object);
+			}
+
+			auto root = QJsonObject();
+			const auto ssrc = payload.ssrc;
+			root.insert("ufrag", QString::fromStdString(payload.ufrag));
+			root.insert("pwd", QString::fromStdString(payload.pwd));
+			root.insert("fingerprints", fingerprints);
+			root.insert("ssrc", double(payload.ssrc));
+
+			const auto json = QJsonDocument(root).toJson(
+				QJsonDocument::Compact);
+			const auto muted = _muted.current();
+			_api.request(MTPphone_JoinGroupCall(
+				MTP_flags(muted
+					? MTPphone_JoinGroupCall::Flag::f_muted
+					: MTPphone_JoinGroupCall::Flag(0)),
+				inputCall(),
+				MTP_dataJSON(MTP_bytes(json))
+			)).done([=](const MTPUpdates &updates) {
+				_mySsrc = ssrc;
+				setState(State::Joined);
+
+				if (_muted.current() != muted) {
+					sendMutedUpdate();
+				}
+
+				_channel->session().api().applyUpdates(updates);
+			}).fail([=](const RPCError &error) {
+				int a = error.code();
+			}).send();
+		});
+	});
+}
+
 void GroupCall::checkParticipants() {
 	if (!joined()) {
 		return;
@@ -226,23 +238,19 @@ void GroupCall::finish(FinishType type) {
 
 void GroupCall::setMuted(bool mute) {
 	_muted = mute;
-	if (_instance) {
-		_instance->setIsMuted(mute);
-	}
 }
 
-bool GroupCall::handleUpdate(const MTPGroupCall &call) {
+void GroupCall::handleUpdate(const MTPGroupCall &call) {
 	return call.match([&](const MTPDgroupCall &data) {
 		if (_acceptFields) {
-			if (_instance || _id) {
-				return false;
+			if (!_instance && !_id) {
+				join(MTP_inputGroupCall(data.vid(), data.vaccess_hash()));
 			}
-			join(MTP_inputGroupCall(data.vid(), data.vaccess_hash()));
-			return true;
+			return;
 		} else if (_id != data.vid().v
 			|| _accessHash != data.vaccess_hash().v
 			|| !_instance) {
-			return false;
+			return;
 		}
 		if (const auto params = data.vparams()) {
 			params->match([&](const MTPDdataJSON &data) {
@@ -301,15 +309,39 @@ bool GroupCall::handleUpdate(const MTPGroupCall &call) {
 				checkParticipants();
 			});
 		}
-		return true;
 	}, [&](const MTPDgroupCallDiscarded &data) {
-		if (data.vid().v != _id) {
-			return false;
+		if (data.vid().v == _id) {
+			_mySsrc = 0;
+			hangup();
 		}
-		return true;
 	});
 }
 
+void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
+	const auto state = _state.current();
+	if (state != State::Joined) {
+		return;
+	}
+
+	const auto self = _channel->session().userId();
+	for (const auto &participant : data.vparticipants().v) {
+		participant.match([&](const MTPDgroupCallParticipant &data) {
+			if (data.vuser_id().v != self) {
+				return;
+			}
+			if (data.is_left() && data.vsource().v == _mySsrc) {
+				// I was removed from the call, rejoin.
+				setState(State::Joining);
+				rejoin();
+			} else if (!data.is_left() && data.vsource().v != _mySsrc) {
+				// I joined from another device, hangup.
+				_mySsrc = 0;
+				hangup();
+			}
+		});
+	}
+}
+
 void GroupCall::createAndStartController() {
 	using AudioLevels = std::vector<std::pair<uint32_t, float>>;
 
@@ -341,11 +373,37 @@ void GroupCall::createAndStartController() {
 	_instance = std::make_unique<tgcalls::GroupInstanceImpl>(
 		std::move(descriptor));
 
-	const auto raw = _instance.get();
-	raw->setIsMuted(_muted.current());
+	_muted.value(
+	) | rpl::start_with_next([=](bool muted) {
+		if (_instance) {
+			_instance->setIsMuted(muted);
+		}
+		if (_mySsrc) {
+			sendMutedUpdate();
+		}
+	}, _lifetime);
 	//raw->setAudioOutputDuckingEnabled(settings.callAudioDuckingEnabled());
 }
 
+void GroupCall::sendMutedUpdate() {
+	_api.request(_updateMuteRequestId).cancel();
+	_updateMuteRequestId = _api.request(MTPphone_EditGroupCallMember(
+		MTP_flags(_muted.current()
+			? MTPphone_EditGroupCallMember::Flag::f_muted
+			: MTPphone_EditGroupCallMember::Flag(0)),
+		inputCall(),
+		MTP_inputUserSelf()
+	)).done([=](const MTPUpdates &result) {
+		_channel->session().api().applyUpdates(result);
+	}).fail([=](const RPCError &error) {
+		if (error.type() == u"GROUP_CALL_FORBIDDEN"_q
+			&& _state.current() == State::Joined) {
+			setState(State::Joining);
+			rejoin();
+		}
+	}).send();
+}
+
 void GroupCall::setCurrentAudioDevice(bool input, const QString &deviceId) {
 	if (_instance) {
 		const auto id = deviceId.toStdString();
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 23424ef2d..88553c26e 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -43,7 +43,8 @@ public:
 	void start();
 	void hangup();
 	void join(const MTPInputGroupCall &inputCall);
-	bool handleUpdate(const MTPGroupCall &call);
+	void handleUpdate(const MTPGroupCall &call);
+	void handleUpdate(const MTPDupdateGroupCallParticipants &data);
 
 	void setMuted(bool mute);
 	[[nodiscard]] bool muted() const {
@@ -95,6 +96,8 @@ private:
 
 	void setState(State state);
 	void finish(FinishType type);
+	void sendMutedUpdate();
+	void rejoin();
 
 	[[nodiscard]] MTPInputGroupCall inputCall() const;
 
@@ -109,6 +112,7 @@ private:
 	uint64 _id = 0;
 	uint64 _accessHash = 0;
 	uint32 _mySsrc = 0;
+	mtpRequestId _updateMuteRequestId = 0;
 
 	std::unique_ptr<tgcalls::GroupInstanceImpl> _instance;
 
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 39278f799..1c851be9f 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -246,6 +246,8 @@ void MembersController::prepareRows() {
 		auto user = row->peer()->asUser();
 		if (user->isSelf()) {
 			foundSelf = true;
+			++i;
+			continue;
 		}
 		const auto contains = ranges::contains(
 			participants,
@@ -303,11 +305,7 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 	Expects(row->peer()->isUser());
 
 	const auto user = row->peer()->asUser();
-	auto result = base::make_unique_q<Ui::PopupMenu>(parent);
-	//result->addAction( // #TODO calls
-	//	tr::lng_context_view_profile(tr::now),
-	//	crl::guard(this, [=] { _navigation->showPeerInfo(user); }));
-	return result;
+	return nullptr;
 }
 
 bool MembersController::appendRow(not_null<UserData*> user) {
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index bbcabf106..af760b9f2 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -393,6 +393,9 @@ void Instance::handleGroupCallUpdate(
 	if (const auto existing = session->data().groupCall(callId)) {
 		existing->applyUpdate(update);
 	}
+	if (_currentGroupCall) {
+		_currentGroupCall->handleUpdate(update);
+	}
 }
 
 void Instance::handleSignalingData(

From 8618fe41ee59085d5b1d8bda2cf9510403bf3721 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 27 Nov 2020 13:35:16 +0300
Subject: [PATCH 169/370] Apply new group call from new service message.

---
 Telegram/SourceFiles/calls/calls_call.cpp     | 18 +++----
 Telegram/SourceFiles/calls/calls_call.h       |  2 +-
 .../SourceFiles/calls/calls_group_call.cpp    | 54 ++++++++-----------
 Telegram/SourceFiles/calls/calls_group_call.h |  2 +-
 Telegram/SourceFiles/history/history.cpp      |  7 +++
 Telegram/ThirdParty/tgcalls                   |  2 +-
 6 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index cb552e607..9b428d407 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -978,15 +978,15 @@ void Call::setCurrentVideoDevice(const QString &deviceId) {
 	}
 }
 
-void Call::setAudioVolume(bool input, float level) {
-	if (_instance) {
-		if (input) {
-			_instance->setInputVolume(level);
-		} else {
-			_instance->setOutputVolume(level);
-		}
-	}
-}
+//void Call::setAudioVolume(bool input, float level) {
+//	if (_instance) {
+//		if (input) {
+//			_instance->setInputVolume(level);
+//		} else {
+//			_instance->setOutputVolume(level);
+//		}
+//	}
+//}
 
 void Call::setAudioDuckingEnabled(bool enabled) {
 	if (_instance) {
diff --git a/Telegram/SourceFiles/calls/calls_call.h b/Telegram/SourceFiles/calls/calls_call.h
index 7bfef7ba6..004225ecc 100644
--- a/Telegram/SourceFiles/calls/calls_call.h
+++ b/Telegram/SourceFiles/calls/calls_call.h
@@ -176,7 +176,7 @@ public:
 
 	void setCurrentAudioDevice(bool input, const QString &deviceId);
 	void setCurrentVideoDevice(const QString &deviceId);
-	void setAudioVolume(bool input, float level);
+	//void setAudioVolume(bool input, float level);
 	void setAudioDuckingEnabled(bool enabled);
 
 	[[nodiscard]] rpl::lifetime &lifetime() {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 526a958f5..e8239940b 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -8,28 +8,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_group_call.h"
 
 #include "main/main_session.h"
-//#include "main/main_account.h"
-//#include "main/main_app_config.h"
 #include "apiwrap.h"
 #include "lang/lang_keys.h"
 #include "boxes/confirm_box.h"
-//#include "boxes/rate_call_box.h"
-//#include "calls/calls_instance.h"
-//#include "base/openssl_help.h"
-//#include "mtproto/mtproto_dh_utils.h"
-//#include "mtproto/mtproto_config.h"
-//#include "core/application.h"
-//#include "core/core_settings.h"
-//#include "media/audio/media_audio_track.h"
-//#include "base/platform/base_platform_info.h"
-//#include "calls/calls_panel.h"
-//#include "webrtc/webrtc_video_track.h"
-//#include "webrtc/webrtc_media_devices.h"
+#include "core/application.h"
+#include "core/core_settings.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
 #include "data/data_group_call.h"
-//#include "data/data_session.h"
-//#include "facades.h"
 
 #include <tgcalls/group/GroupInstanceImpl.h>
 
@@ -194,7 +180,7 @@ void GroupCall::checkParticipants() {
 			ssrcs.push_back(source);
 		}
 	}
-	_instance->setSsrcs(std::move(ssrcs));
+//	_instance->setSsrcs(std::move(ssrcs));
 }
 
 void GroupCall::hangup() {
@@ -345,6 +331,8 @@ void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
 void GroupCall::createAndStartController() {
 	using AudioLevels = std::vector<std::pair<uint32_t, float>>;
 
+	const auto &settings = Core::App().settings();
+
 	const auto weak = base::make_weak(this);
 	tgcalls::GroupInstanceDescriptor descriptor = {
 		.config = tgcalls::GroupConfig{
@@ -353,6 +341,10 @@ void GroupCall::createAndStartController() {
 		},
 		.audioLevelsUpdated = [=](const AudioLevels &data) {
 		},
+		.myAudioLevelUpdated = [=](float) {
+		},
+		.initialInputDeviceId = settings.callInputDeviceId().toStdString(),
+		.initialOutputDeviceId = settings.callOutputDeviceId().toStdString(),
 	};
 	if (Logs::DebugEnabled()) {
 		auto callLogFolder = cWorkingDir() + qsl("DebugLogs");
@@ -407,23 +399,23 @@ void GroupCall::sendMutedUpdate() {
 void GroupCall::setCurrentAudioDevice(bool input, const QString &deviceId) {
 	if (_instance) {
 		const auto id = deviceId.toStdString();
-		//if (input) {
-		//	_instance->setAudioInputDevice(id);
-		//} else {
-		//	_instance->setAudioOutputDevice(id);
-		//}
+		if (input) {
+			_instance->setAudioInputDevice(id);
+		} else {
+			_instance->setAudioOutputDevice(id);
+		}
 	}
 }
 
-void GroupCall::setAudioVolume(bool input, float level) {
-	if (_instance) {
-		//if (input) {
-		//	_instance->setInputVolume(level);
-		//} else {
-		//	_instance->setOutputVolume(level);
-		//}
-	}
-}
+//void GroupCall::setAudioVolume(bool input, float level) {
+//	if (_instance) {
+//		if (input) {
+//			_instance->setInputVolume(level);
+//		} else {
+//			_instance->setOutputVolume(level);
+//		}
+//	}
+//}
 
 void GroupCall::setAudioDuckingEnabled(bool enabled) {
 	if (_instance) {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 88553c26e..6dee42bc8 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -74,7 +74,7 @@ public:
 	}
 
 	void setCurrentAudioDevice(bool input, const QString &deviceId);
-	void setAudioVolume(bool input, float level);
+	//void setAudioVolume(bool input, float level);
 	void setAudioDuckingEnabled(bool enabled);
 
 	[[nodiscard]] rpl::lifetime &lifetime() {
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 9cc17dac8..6a81805dd 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -1051,6 +1051,13 @@ void History::applyServiceChanges(
 			});
 		}
 	} break;
+
+	case mtpc_messageActionGroupCall: {
+		if (const auto channel = peer->asChannel()) {
+			const auto &d = action.c_messageActionGroupCall();
+			channel->setCall(d.vcall());
+		}
+	} break;
 	}
 }
 
diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index 176e5fff5..d2c6ad40d 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit 176e5fff55478f23deec25c3bbcdaf9d0f3e19b2
+Subproject commit d2c6ad40d717e604859589d854b81229abd11763

From a6b4cdd62dccd35d07b792a139e979872be6ca5d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 27 Nov 2020 17:50:41 +0300
Subject: [PATCH 170/370] Improve group call members list updating.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |  12 +-
 Telegram/SourceFiles/boxes/peer_list_box.h    |   3 +-
 .../SourceFiles/calls/calls_group_call.cpp    |  59 ++--
 Telegram/SourceFiles/calls/calls_group_call.h |   5 +-
 .../SourceFiles/calls/calls_group_members.cpp | 253 ++++++++++++------
 .../SourceFiles/calls/calls_group_members.h   |   5 +-
 .../SourceFiles/calls/calls_group_panel.cpp   |  13 +-
 .../SourceFiles/calls/calls_group_panel.h     |   2 +
 Telegram/SourceFiles/data/data_group_call.cpp | 116 +++++---
 Telegram/SourceFiles/data/data_group_call.h   |  26 +-
 Telegram/ThirdParty/tgcalls                   |   2 +-
 11 files changed, 332 insertions(+), 164 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 2ed83d917..922a1bdcf 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -426,9 +426,9 @@ bool PeerListRow::checked() const {
 	return _checkbox && _checkbox->checked();
 }
 
-void PeerListRow::setCustomStatus(const QString &status) {
+void PeerListRow::setCustomStatus(const QString &status, bool active) {
 	setStatusText(status);
-	_statusType = StatusType::Custom;
+	_statusType = active ? StatusType::CustomActive : StatusType::Custom;
 	_statusValidTill = 0;
 }
 
@@ -438,7 +438,10 @@ void PeerListRow::clearCustomStatus() {
 }
 
 void PeerListRow::refreshStatus() {
-	if (!_initialized || special() || _statusType == StatusType::Custom) {
+	if (!_initialized
+		|| special()
+		|| _statusType == StatusType::Custom
+		|| _statusType == StatusType::CustomActive) {
 		return;
 	}
 	_statusType = StatusType::LastSeen;
@@ -550,7 +553,8 @@ void PeerListRow::paintStatusText(
 		int availableWidth,
 		int outerWidth,
 		bool selected) {
-	auto statusHasOnlineColor = (_statusType == PeerListRow::StatusType::Online);
+	auto statusHasOnlineColor = (_statusType == PeerListRow::StatusType::Online)
+		|| (_statusType == PeerListRow::StatusType::CustomActive);
 	p.setFont(st::contactsStatusFont);
 	p.setPen(statusHasOnlineColor ? st.statusFgActive : (selected ? st.statusFgOver : st.statusFg));
 	_status.drawLeftElided(p, x, y, availableWidth, outerWidth);
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 364ed1e8b..36df9e66c 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -88,7 +88,7 @@ public:
 	[[nodiscard]] virtual auto generatePaintUserpicCallback()
 		-> PaintRoundImageCallback;
 
-	void setCustomStatus(const QString &status);
+	void setCustomStatus(const QString &status, bool active = false);
 	void clearCustomStatus();
 
 	// Box interface.
@@ -127,6 +127,7 @@ public:
 		Online,
 		LastSeen,
 		Custom,
+		CustomActive,
 	};
 	virtual void refreshStatus();
 	crl::time refreshStatusTime() const;
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index e8239940b..4a65adaf1 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "lang/lang_keys.h"
 #include "boxes/confirm_box.h"
+#include "base/unixtime.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "data/data_changes.h"
@@ -93,19 +94,21 @@ void GroupCall::start() {
 
 void GroupCall::join(const MTPInputGroupCall &inputCall) {
 	setState(State::Joining);
+	_channel->setCall(inputCall);
+
 	inputCall.match([&](const MTPDinputGroupCall &data) {
 		_id = data.vid().v;
 		_accessHash = data.vaccess_hash().v;
 		createAndStartController();
 		rejoin();
 	});
-	_channel->setCall(inputCall);
 
-	_channel->session().changes().peerFlagsValue(
-		_channel,
-		Data::PeerUpdate::Flag::GroupCall
-	) | rpl::start_with_next([=] {
-		checkParticipants();
+	using Update = Data::GroupCall::ParticipantUpdate;
+	_channel->call()->participantUpdated(
+	) | rpl::filter([=](const Update &update) {
+		return (_instance != nullptr) && update.removed;
+	}) | rpl::start_with_next([=](const Update &update) {
+		_instance->removeSsrcs({ update.participant.source });
 	}, _lifetime);
 }
 
@@ -113,6 +116,9 @@ void GroupCall::rejoin() {
 	Expects(_state.current() == State::Joining);
 
 	_mySsrc = 0;
+	applySelfInCallLocally();
+	LOG(("Call Info: Requesting join payload."));
+
 	const auto weak = base::make_weak(this);
 	_instance->emitJoinPayload([=](tgcalls::GroupJoinPayload payload) {
 		crl::on_main(weak, [=, payload = std::move(payload)]{
@@ -134,6 +140,9 @@ void GroupCall::rejoin() {
 			root.insert("fingerprints", fingerprints);
 			root.insert("ssrc", double(payload.ssrc));
 
+			LOG(("Call Info: Join payload received, joining with source: %1."
+				).arg(ssrc));
+
 			const auto json = QJsonDocument(root).toJson(
 				QJsonDocument::Compact);
 			const auto muted = _muted.current();
@@ -146,6 +155,7 @@ void GroupCall::rejoin() {
 			)).done([=](const MTPUpdates &updates) {
 				_mySsrc = ssrc;
 				setState(State::Joined);
+				applySelfInCallLocally();
 
 				if (_muted.current() != muted) {
 					sendMutedUpdate();
@@ -159,28 +169,28 @@ void GroupCall::rejoin() {
 	});
 }
 
-void GroupCall::checkParticipants() {
-	if (!joined()) {
-		return;
-	}
+void GroupCall::applySelfInCallLocally() {
 	const auto call = _channel->call();
 	if (!call || call->id() != _id) {
-		finish(FinishType::Ended);
 		return;
 	}
-	const auto &sources = call->sources();
-	if (sources.size() != call->fullCount() || sources.empty()) {
-		call->reload();
-		return;
-	}
-	auto ssrcs = std::vector<uint32_t>();
-	ssrcs.reserve(sources.size());
-	for (const auto source : sources) {
-		if (source != _mySsrc) {
-			ssrcs.push_back(source);
-		}
-	}
-//	_instance->setSsrcs(std::move(ssrcs));
+	const auto my = [&] {
+		const auto self = _channel->session().userId();
+		const auto now = base::unixtime::now();
+		using Flag = MTPDgroupCallParticipant::Flag;
+		return MTP_groupCallParticipant(
+			MTP_flags((_mySsrc ? Flag(0) : Flag::f_left)
+				| (_muted.current() ? Flag::f_muted : Flag(0))),
+			MTP_int(self),
+			MTP_int(now),
+			MTP_int(0),
+			MTP_int(_mySsrc));
+	};
+	call->applyUpdateChecked(
+		MTP_updateGroupCallParticipants(
+			inputCall(),
+			MTP_vector<MTPGroupCallParticipant>(1, my()),
+			MTP_int(0)).c_updateGroupCallParticipants());
 }
 
 void GroupCall::hangup() {
@@ -292,7 +302,6 @@ void GroupCall::handleUpdate(const MTPGroupCall &call) {
 					});
 				}
 				_instance->setJoinResponsePayload(payload);
-				checkParticipants();
 			});
 		}
 	}, [&](const MTPDgroupCallDiscarded &data) {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 6dee42bc8..fe348e678 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -36,6 +36,9 @@ public:
 		const MTPInputGroupCall &inputCall);
 	~GroupCall();
 
+	[[nodiscard]] uint64 id() const {
+		return _id;
+	}
 	[[nodiscard]] not_null<ChannelData*> channel() const {
 		return _channel;
 	}
@@ -92,11 +95,11 @@ private:
 	void handleControllerError(const QString &error);
 	void createAndStartController();
 	void destroyController();
-	void checkParticipants();
 
 	void setState(State state);
 	void finish(FinishType type);
 	void sendMutedUpdate();
+	void applySelfInCallLocally();
 	void rejoin();
 
 	[[nodiscard]] MTPInputGroupCall inputCall() const;
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 1c851be9f..3edf6f2d4 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -24,40 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Calls {
 namespace {
 
-class MembersController final
-	: public PeerListController
-	, public base::has_weak_ptr {
-public:
-	explicit MembersController(not_null<GroupCall*> call);
-
-	Main::Session &session() const override;
-	void prepare() override;
-	void rowClicked(not_null<PeerListRow*> row) override;
-	void rowActionClicked(not_null<PeerListRow*> row) override;
-	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
-		QWidget *parent,
-		not_null<PeerListRow*> row) override;
-	void loadMoreRows() override;
-
-private:
-	[[nodiscard]] std::unique_ptr<PeerListRow> createRow(
-		not_null<UserData*> user) const;
-
-	void prepareRows();
-
-	void setupListChangeViewers();
-	bool appendRow(not_null<UserData*> user);
-	bool prependRow(not_null<UserData*> user);
-	bool removeRow(not_null<UserData*> user);
-
-	const base::weak_ptr<GroupCall> _call;
-	const not_null<ChannelData*> _channel;
-
-	Ui::BoxPointer _addBox;
-	rpl::lifetime _lifetime;
-
-};
-
 class Row final : public PeerListRow {
 public:
 	Row(not_null<ChannelData*> channel, not_null<UserData*> user);
@@ -68,6 +34,8 @@ public:
 		Muted,
 	};
 
+	void updateState(const Data::GroupCall::Participant *participant);
+
 	void addActionRipple(QPoint point, Fn<void()> updateCallback) override;
 	void stopLastActionRipple() override;
 
@@ -108,6 +76,50 @@ private:
 
 };
 
+class MembersController final
+	: public PeerListController
+	, public base::has_weak_ptr {
+public:
+	explicit MembersController(not_null<GroupCall*> call);
+
+	Main::Session &session() const override;
+	void prepare() override;
+	void rowClicked(not_null<PeerListRow*> row) override;
+	void rowActionClicked(not_null<PeerListRow*> row) override;
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override;
+	void loadMoreRows() override;
+
+	[[nodiscard]] rpl::producer<int> fullCountValue() const {
+		return _fullCount.value();
+	}
+
+private:
+
+	[[nodiscard]] std::unique_ptr<PeerListRow> createSelfRow() const;
+	[[nodiscard]] std::unique_ptr<PeerListRow> createRow(
+		const Data::GroupCall::Participant &participant) const;
+
+	void prepareRows(not_null<Data::GroupCall*> real);
+
+	void setupListChangeViewers(not_null<GroupCall*> call);
+	void subscribeToChanges(not_null<Data::GroupCall*> real);
+	void updateRow(
+		const Data::GroupCall::Participant &participant);
+	void updateRow(
+		not_null<Row*> row,
+		const Data::GroupCall::Participant *participant) const;
+
+	const base::weak_ptr<GroupCall> _call;
+	const not_null<ChannelData*> _channel;
+
+	rpl::variable<int> _fullCount = 1;
+	Ui::BoxPointer _addBox;
+	rpl::lifetime _lifetime;
+
+};
+
 Row::Row(not_null<ChannelData*> channel, not_null<UserData*> user)
 : PeerListRow(user)
 , _state(ComputeState(channel, user))
@@ -115,6 +127,24 @@ Row::Row(not_null<ChannelData*> channel, not_null<UserData*> user)
 	refreshStatus();
 }
 
+void Row::updateState(const Data::GroupCall::Participant *participant) {
+	if (!participant) {
+		if (peer()->isSelf()) {
+			setCustomStatus(tr::lng_group_call_connecting(tr::now));
+		} else {
+			setCustomStatus(QString());
+		}
+		_state = State::Inactive;
+	} else if (!participant->muted) {
+		_state = State::Active;
+	} else if (participant->canSelfUnmute) {
+		_state = State::Inactive;
+	} else {
+		_state = State::Muted;
+	}
+	_st = ComputeIconStyle(_state);
+}
+
 void Row::paintAction(
 		Painter &p,
 		int x,
@@ -146,7 +176,7 @@ void Row::refreshStatus() {
 		case State::Active: return tr::lng_group_call_active(tr::now);
 		}
 		Unexpected("State in Row::refreshStatus.");
-	}());
+	}(), (_state == State::Active));
 }
 
 Row::State Row::ComputeState(
@@ -202,18 +232,81 @@ void Row::stopLastActionRipple() {
 MembersController::MembersController(not_null<GroupCall*> call)
 : _call(call)
 , _channel(call->channel()) {
-	setupListChangeViewers();
+	setupListChangeViewers(call);
 }
 
-void MembersController::setupListChangeViewers() {
-	const auto call = _call.get();
+void MembersController::setupListChangeViewers(not_null<GroupCall*> call) {
 	const auto channel = call->channel();
-	channel->session().changes().peerUpdates(
+	channel->session().changes().peerFlagsValue(
 		channel,
 		Data::PeerUpdate::Flag::GroupCall
-	) | rpl::start_with_next([=] {
-		prepareRows();
+	) | rpl::map([=] {
+		return channel->call();
+	}) | rpl::filter([=](Data::GroupCall *real) {
+		const auto call = _call.get();
+		return call && real && (real->id() == call->id());
+	}) | rpl::take(
+		1
+	) | rpl::start_with_next([=](not_null<Data::GroupCall*> real) {
+		subscribeToChanges(real);
 	}, _lifetime);
+
+	call->stateValue(
+	) | rpl::start_with_next([=] {
+		const auto call = _call.get();
+		const auto real = channel->call();
+		if (call && real && (real->id() == call->id())) {
+			//updateRow(channel->session().user());
+		}
+	}, _lifetime);
+}
+
+void MembersController::subscribeToChanges(not_null<Data::GroupCall*> real) {
+	_fullCount = real->fullCountValue(
+	) | rpl::map([](int value) {
+		return std::max(value, 1);
+	});
+
+	real->participantsSliceAdded(
+	) | rpl::start_with_next([=] {
+		prepareRows(real);
+	}, _lifetime);
+
+	using Update = Data::GroupCall::ParticipantUpdate;
+	real->participantUpdated(
+	) | rpl::start_with_next([=](const Update &update) {
+		const auto user = update.participant.user;
+		if (update.removed) {
+			if (auto row = delegate()->peerListFindRow(user->id)) {
+				if (user->isSelf()) {
+					static_cast<Row*>(row)->updateState(nullptr);
+					delegate()->peerListUpdateRow(row);
+				} else {
+					delegate()->peerListRemoveRow(row);
+					delegate()->peerListRefreshRows();
+				}
+			}
+		} else {
+			updateRow(update.participant);
+		}
+	}, _lifetime);
+}
+
+void MembersController::updateRow(
+		const Data::GroupCall::Participant &participant) {
+	if (auto row = delegate()->peerListFindRow(participant.user->id)) {
+		updateRow(static_cast<Row*>(row), &participant);
+	} else if (auto row = createRow(participant)) {
+		delegate()->peerListAppendRow(std::move(row));
+		delegate()->peerListRefreshRows();
+	}
+}
+
+void MembersController::updateRow(
+		not_null<Row*> row,
+		const Data::GroupCall::Participant *participant) const {
+	row->updateState(participant);
+	delegate()->peerListUpdateRow(row);
 }
 
 Main::Session &MembersController::session() const {
@@ -226,17 +319,18 @@ void MembersController::prepare() {
 	setDescriptionText(tr::lng_contacts_loading(tr::now));
 	setSearchNoResultsText(tr::lng_blocked_list_not_found(tr::now));
 
-	prepareRows();
-	delegate()->peerListRefreshRows();
-
+	const auto call = _call.get();
+	if (const auto real = _channel->call();
+		real && call && real->id() == call->id()) {
+		prepareRows(real);
+	} else if (auto row = createSelfRow()) {
+		delegate()->peerListAppendRow(std::move(row));
+		delegate()->peerListRefreshRows();
+	}
 	loadMoreRows();
 }
 
-void MembersController::prepareRows() {
-	const auto real = _channel->call();
-	if (!real) {
-		return;
-	}
+void MembersController::prepareRows(not_null<Data::GroupCall*> real) {
 	auto foundSelf = false;
 	auto changed = false;
 	const auto &participants = real->participants();
@@ -262,13 +356,19 @@ void MembersController::prepareRows() {
 		}
 	}
 	if (!foundSelf) {
-		if (auto row = createRow(_channel->session().user())) {
+		const auto self = _channel->session().user();
+		const auto i = ranges::find(
+			participants,
+			_channel->session().user(),
+			&Data::GroupCall::Participant::user);
+		auto row = (i != end(participants)) ? createRow(*i) : createSelfRow();
+		if (row) {
 			changed = true;
 			delegate()->peerListAppendRow(std::move(row));
 		}
 	}
 	for (const auto &participant : participants) {
-		if (auto row = createRow(participant.user)) {
+		if (auto row = createRow(participant)) {
 			changed = true;
 			delegate()->peerListAppendRow(std::move(row));
 		}
@@ -279,10 +379,8 @@ void MembersController::prepareRows() {
 }
 
 void MembersController::loadMoreRows() {
-	if (const auto call = _call.get()) {
-		if (const auto real = call->channel()->call()) {
-			real->requestParticipants();
-		}
+	if (const auto real = _channel->call()) {
+		real->requestParticipants();
 	}
 }
 
@@ -308,33 +406,18 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 	return nullptr;
 }
 
-bool MembersController::appendRow(not_null<UserData*> user) {
-	if (delegate()->peerListFindRow(user->id)) {
-		return false;
-	}
-	delegate()->peerListAppendRow(createRow(user));
-	return true;
-}
-
-bool MembersController::prependRow(not_null<UserData*> user) {
-	if (auto row = delegate()->peerListFindRow(user->id)) {
-		return false;
-	}
-	delegate()->peerListPrependRow(createRow(user));
-	return true;
-}
-
-bool MembersController::removeRow(not_null<UserData*> user) {
-	if (auto row = delegate()->peerListFindRow(user->id)) {
-		delegate()->peerListRemoveRow(row);
-		return true;
-	}
-	return false;
+std::unique_ptr<PeerListRow> MembersController::createSelfRow() const {
+	const auto self = _channel->session().user();
+	auto result = std::make_unique<Row>(_channel, self);
+	updateRow(result.get(), nullptr);
+	return result;
 }
 
 std::unique_ptr<PeerListRow> MembersController::createRow(
-		not_null<UserData*> user) const {
-	return std::make_unique<Row>(_channel, user);
+		const Data::GroupCall::Participant &participant) const {
+	auto result = std::make_unique<Row>(_channel, participant.user);
+	updateRow(result.get(), &participant);
+	return result;
 }
 
 } // namespace
@@ -393,19 +476,13 @@ void GroupMembers::setupHeader(not_null<GroupCall*> call) {
 
 object_ptr<Ui::FlatLabel> GroupMembers::setupTitle(
 		not_null<GroupCall*> call) {
-	const auto channel = call->channel();
-	auto count = channel->session().changes().peerFlagsValue(
-		channel,
-		Data::PeerUpdate::Flag::GroupCall
-	) | rpl::map([=] {
-		const auto call = channel->call();
-		return std::max(call ? call->fullCount() : 0, 1);
-	});
+	const auto controller = static_cast<MembersController*>(
+		_listController.get());
 	auto result = object_ptr<Ui::FlatLabel>(
 		_titleWrap,
 		tr::lng_chat_status_members(
 			lt_count_decimal,
-			std::move(count) | tr::to_count(),
+			controller->fullCountValue() | tr::to_count(),
 			Ui::Text::Upper
 		),
 		st::groupCallHeaderLabel);
diff --git a/Telegram/SourceFiles/calls/calls_group_members.h b/Telegram/SourceFiles/calls/calls_group_members.h
index ff1c46385..7883c6120 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.h
+++ b/Telegram/SourceFiles/calls/calls_group_members.h
@@ -13,6 +13,10 @@ namespace Ui {
 class ScrollArea;
 } // namespace Ui
 
+namespace Data {
+class GroupCall;
+} // namespace Data
+
 namespace Calls {
 
 class GroupCall;
@@ -58,7 +62,6 @@ private:
 	void setupButtons();
 
 	void addMember();
-	void showMembersWithSearch(bool withSearch);
 	void updateHeaderControlsGeometry(int newWidth);
 
 	base::weak_ptr<GroupCall> _call;
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index fbedf2e0f..5e6cc20f4 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -11,6 +11,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/window.h"
 #include "ui/effects/ripple_animation.h"
+#include "ui/layers/layer_manager.h"
+#include "boxes/confirm_box.h"
 #include "core/application.h"
 #include "lang/lang_keys.h"
 #include "base/event_filter.h"
@@ -216,6 +218,7 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 : _call(call)
 , _channel(call->channel())
 , _window(std::make_unique<Ui::Window>(Core::App().getModalParent()))
+, _layerBg(std::make_unique<Ui::LayerManager>(_window->body()))
 #ifdef Q_OS_WIN
 , _controls(std::make_unique<Ui::Platform::TitleControls>(
 	_window.get(),
@@ -300,9 +303,10 @@ void GroupPanel::initControls() {
 		}
 	});
 	_hangup->setClickedCallback([=] {
-		if (_call) {
-			_call->hangup();
-		}
+		_layerBg->showBox(Box<ConfirmBox>(
+			tr::lng_group_call_leave_sure(tr::now),
+			tr::lng_group_call_leave(tr::now),
+			[=] { if (_call) _call->hangup(); }));
 	});
 	_settings->setClickedCallback([=] {
 	});
@@ -409,7 +413,7 @@ void GroupPanel::updateControlsGeometry() {
 		- membersTop
 		- st::groupCallMembersMargin.bottom();
 	_members->setGeometry(
-		st::groupCallMembersMargin.left(),
+		(widget()->width() - membersWidth) / 2,
 		membersTop,
 		membersWidth,
 		std::min(desiredHeight, availableHeight));
@@ -426,6 +430,7 @@ void GroupPanel::refreshTitle() {
 				widget(),
 				tr::lng_group_call_title(),
 				st::groupCallHeaderLabel);
+			_title->setAttribute(Qt::WA_TransparentForMouseEvents);
 			_window->setTitle(u" "_q);
 		}
 		const auto best = _title->naturalWidth();
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h
index d4c87dd63..facca9cd4 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/calls_group_panel.h
@@ -30,6 +30,7 @@ template <typename Widget>
 class PaddingWrap;
 class Window;
 class ScrollArea;
+class LayerManager;
 namespace Platform {
 class TitleControls;
 } // namespace Platform
@@ -84,6 +85,7 @@ private:
 	not_null<ChannelData*> _channel;
 
 	const std::unique_ptr<Ui::Window> _window;
+	const std::unique_ptr<Ui::LayerManager> _layerBg;
 
 #ifdef Q_OS_WIN
 	std::unique_ptr<Ui::Platform::TitleControls> _controls;
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index 87748b3d1..1d6265614 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -51,14 +51,10 @@ auto GroupCall::participants() const
 	return _participants;
 }
 
-const base::flat_set<uint32> &GroupCall::sources() const {
-	return _sources;
-}
-
 void GroupCall::requestParticipants() {
 	if (_participantsRequestId || _reloadRequestId) {
 		return;
-	} else if (_participants.size() >= _fullCount && _allReceived) {
+	} else if (_participants.size() >= _fullCount.current() && _allReceived) {
 		return;
 	} else if (_allReceived) {
 		reload();
@@ -83,9 +79,7 @@ void GroupCall::requestParticipants() {
 				_fullCount = _participants.size();
 			}
 		});
-		_channel->session().changes().peerUpdated(
-			_channel,
-			PeerUpdate::Flag::GroupCall);
+		_participantsSliceAdded.fire({});
 		_participantsRequestId = 0;
 	}).fail([=](const RPCError &error) {
 		_fullCount = _participants.size();
@@ -98,13 +92,26 @@ void GroupCall::requestParticipants() {
 }
 
 int GroupCall::fullCount() const {
-	return _fullCount;
+	return _fullCount.current();
+}
+
+rpl::producer<int> GroupCall::fullCountValue() const {
+	return _fullCount.value();
 }
 
 bool GroupCall::participantsLoaded() const {
 	return _allReceived;
 }
 
+rpl::producer<> GroupCall::participantsSliceAdded() {
+	return _participantsSliceAdded.events();
+}
+
+auto GroupCall::participantUpdated() const
+-> rpl::producer<ParticipantUpdate> {
+	return _participantUpdates.events();
+}
+
 void GroupCall::applyUpdate(const MTPGroupCall &update) {
 	applyCall(update, false);
 }
@@ -112,7 +119,7 @@ void GroupCall::applyUpdate(const MTPGroupCall &update) {
 void GroupCall::applyCall(const MTPGroupCall &call, bool force) {
 	call.match([&](const MTPDgroupCall &data) {
 		const auto changed = (_version != data.vversion().v)
-			|| (_fullCount != data.vparticipants_count().v);
+			|| (_fullCount.current() != data.vparticipants_count().v);
 		if (!force && !changed) {
 			return;
 		} else if (!force && _version > data.vversion().v) {
@@ -130,9 +137,6 @@ void GroupCall::applyCall(const MTPGroupCall &call, bool force) {
 		_finished = true;
 		_duration = data.vduration().v;
 	});
-	_channel->session().changes().peerUpdated(
-		_channel,
-		PeerUpdate::Flag::GroupCall);
 }
 
 void GroupCall::reload() {
@@ -148,17 +152,10 @@ void GroupCall::reload() {
 		result.match([&](const MTPDphone_groupCall &data) {
 			_channel->owner().processUsers(data.vusers());
 			_participants.clear();
-			_sources.clear();
 			applyParticipantsSlice(data.vparticipants().v);
-			for (const auto &source : data.vsources().v) {
-				_sources.emplace(source.v);
-			}
-			_fullCount = _sources.size();
-			if (_participants.size() > _fullCount) {
-				_fullCount = _participants.size();
-			}
-			_allReceived = (_fullCount == _participants.size());
 			applyCall(data.vcall(), true);
+			_allReceived = (_fullCount.current() == _participants.size());
+			_participantsSliceAdded.fire({});
 		});
 		_reloadRequestId = 0;
 	}).fail([=](const RPCError &error) {
@@ -167,7 +164,9 @@ void GroupCall::reload() {
 }
 
 void GroupCall::applyParticipantsSlice(
-		const QVector<MTPGroupCallParticipant> &list) {
+		const QVector<MTPGroupCallParticipant> &list,
+		bool sendIndividualUpdates) {
+	auto fullCount = _fullCount.current();
 	for (const auto &participant : list) {
 		participant.match([&](const MTPDgroupCallParticipant &data) {
 			const auto userId = data.vuser_id().v;
@@ -178,11 +177,17 @@ void GroupCall::applyParticipantsSlice(
 				&Participant::user);
 			if (data.is_left()) {
 				if (i != end(_participants)) {
-					_sources.remove(i->source);
+					auto update = ParticipantUpdate{
+						.participant = *i,
+						.removed = true,
+					};
 					_participants.erase(i);
+					if (sendIndividualUpdates) {
+						_participantUpdates.fire(std::move(update));
+					}
 				}
-				if (_fullCount > _participants.size()) {
-					--_fullCount;
+				if (fullCount > _participants.size()) {
+					--fullCount;
 				}
 				return;
 			}
@@ -195,28 +200,69 @@ void GroupCall::applyParticipantsSlice(
 			};
 			if (i == end(_participants)) {
 				_participants.push_back(value);
-				++_fullCount;
+				++fullCount;
 			} else {
 				*i = value;
 			}
-			_sources.emplace(uint32(data.vsource().v));
+			_participantUpdates.fire({
+				.participant = value,
+			});
 		});
 	}
-	ranges::sort(_participants, std::greater<>(), &Participant::date);
+	ranges::sort(_participants, std::greater<>(), [](const Participant &p) {
+		return p.lastActivePrecise
+			? p.lastActivePrecise
+			: p.lastActive
+			? p.lastActive
+			: p.date;
+	});
+	_fullCount = fullCount;
+}
+
+void GroupCall::applyParticipantsMutes(
+		const MTPDupdateGroupCallParticipants &update) {
+	for (const auto &participant : update.vparticipants().v) {
+		participant.match([&](const MTPDgroupCallParticipant &data) {
+			if (data.is_left()) {
+				return;
+			}
+			const auto userId = data.vuser_id().v;
+			const auto user = _channel->owner().user(userId);
+			const auto i = ranges::find(
+				_participants,
+				user,
+				&Participant::user);
+			if (i != end(_participants)) {
+				i->muted = data.is_muted();
+				i->canSelfUnmute = data.is_can_self_unmute();
+				_participantUpdates.fire({
+					.participant = *i,
+				});
+			}
+		});
+	}
+
 }
 
 void GroupCall::applyUpdate(const MTPDupdateGroupCallParticipants &update) {
-	if (update.vversion().v <= _version) {
+	const auto version = update.vversion().v;
+	if (version < _version) {
 		return;
-	} else if (update.vversion().v != _version + 1) {
+	} else if (version == _version) {
+		applyParticipantsMutes(update);
+		return;
+	} else if (version != _version + 1) {
+		applyParticipantsMutes(update);
 		reload();
 		return;
 	}
 	_version = update.vversion().v;
-	applyParticipantsSlice(update.vparticipants().v);
-	_channel->session().changes().peerUpdated(
-		_channel,
-		PeerUpdate::Flag::GroupCall);
+	applyUpdateChecked(update);
+}
+
+void GroupCall::applyUpdateChecked(
+		const MTPDupdateGroupCallParticipants &update) {
+	applyParticipantsSlice(update.vparticipants().v, true);
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 11c69c4fc..8182abfb8 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -24,21 +24,32 @@ public:
 	struct Participant {
 		not_null<UserData*> user;
 		TimeId date = 0;
+		TimeId lastActive = 0;
+		TimeId lastActivePrecise = 0;
 		uint32 source = 0;
 		bool muted = false;
 		bool canSelfUnmute = false;
 	};
+	struct ParticipantUpdate {
+		Participant participant;
+		bool removed = false;
+	};
 
 	[[nodiscard]] auto participants() const
 		-> const std::vector<Participant> &;
-	[[nodiscard]] const base::flat_set<uint32> &sources() const;
 	void requestParticipants();
 	[[nodiscard]] bool participantsLoaded() const;
 
+	[[nodiscard]] rpl::producer<> participantsSliceAdded();
+	[[nodiscard]] rpl::producer<ParticipantUpdate> participantUpdated() const;
+
 	void applyUpdate(const MTPGroupCall &update);
 	void applyUpdate(const MTPDupdateGroupCallParticipants &update);
+	void applyUpdateChecked(
+		const MTPDupdateGroupCallParticipants &update);
 
 	[[nodiscard]] int fullCount() const;
+	[[nodiscard]] rpl::producer<int> fullCountValue() const;
 
 	void reload();
 	[[nodiscard]] bool finished() const;
@@ -46,7 +57,11 @@ public:
 
 private:
 	void applyCall(const MTPGroupCall &call, bool force);
-	void applyParticipantsSlice(const QVector<MTPGroupCallParticipant> &list);
+	void applyParticipantsSlice(
+		const QVector<MTPGroupCallParticipant> &list,
+		bool sendIndividualUpdates = false);
+	void applyParticipantsMutes(
+		const MTPDupdateGroupCallParticipants &update);
 
 	const not_null<ChannelData*> _channel;
 	const uint64 _id = 0;
@@ -57,9 +72,12 @@ private:
 	mtpRequestId _reloadRequestId = 0;
 
 	std::vector<Participant> _participants;
-	base::flat_set<uint32> _sources;
 	QString _nextOffset;
-	int _fullCount = 0;
+	rpl::variable<int> _fullCount = 0;
+
+	rpl::event_stream<ParticipantUpdate> _participantUpdates;
+	rpl::event_stream<> _participantsSliceAdded;
+
 	int _duration = 0;
 	bool _finished = false;
 	bool _allReceived = false;
diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index d2c6ad40d..ac86c0ee8 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit d2c6ad40d717e604859589d854b81229abd11763
+Subproject commit ac86c0ee86293d6fced7dcb48a8c93657f18a7f3

From b8f23bda59260dc5ca80e84757372cbe194dd9ce Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 27 Nov 2020 18:51:24 +0300
Subject: [PATCH 171/370] Allow to toggle group call members mute.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |  8 ++---
 Telegram/SourceFiles/boxes/peer_list_box.h    |  5 ++-
 .../SourceFiles/calls/calls_group_call.cpp    | 21 +++++++++++
 Telegram/SourceFiles/calls/calls_group_call.h |  2 ++
 .../SourceFiles/calls/calls_group_members.cpp | 36 ++++++++++++++++---
 .../SourceFiles/calls/calls_group_members.h   |  8 ++++-
 .../SourceFiles/calls/calls_group_panel.cpp   |  7 ++++
 7 files changed, 76 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 922a1bdcf..8754a149e 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1150,7 +1150,7 @@ void PeerListContent::mousePressEvent(QMouseEvent *e) {
 			updateRow(row, hint);
 		};
 		if (_selected.action) {
-			auto actionRect = getActionRect(row, _selected.index);
+			auto actionRect = getActiveActionRect(row, _selected.index);
 			if (!actionRect.isEmpty()) {
 				auto point = mapFromGlobal(QCursor::pos()) - actionRect.topLeft();
 				row->addActionRipple(point, std::move(updateCallback));
@@ -1627,7 +1627,7 @@ void PeerListContent::selectByMouse(QPoint globalPosition) {
 		if (row->disabled()) {
 			selected = Selected();
 		} else {
-			if (getActionRect(row, selected.index).contains(point)) {
+			if (getActiveActionRect(row, selected.index).contains(point)) {
 				selected.action = true;
 			}
 		}
@@ -1635,9 +1635,9 @@ void PeerListContent::selectByMouse(QPoint globalPosition) {
 	setSelected(selected);
 }
 
-QRect PeerListContent::getActionRect(not_null<PeerListRow*> row, RowIndex index) const {
+QRect PeerListContent::getActiveActionRect(not_null<PeerListRow*> row, RowIndex index) const {
 	auto actionSize = row->actionSize();
-	if (actionSize.isEmpty()) {
+	if (actionSize.isEmpty() || row->actionDisabled()) {
 		return QRect();
 	}
 	auto actionMargins = row->actionMargins();
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 36df9e66c..189c379f8 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -102,6 +102,9 @@ public:
 	virtual QSize actionSize() const {
 		return QSize();
 	}
+	virtual bool actionDisabled() const {
+		return false;
+	}
 	virtual QMargins actionMargins() const {
 		return QMargins();
 	}
@@ -607,7 +610,7 @@ private:
 	int getRowTop(RowIndex row) const;
 	PeerListRow *getRow(RowIndex element);
 	RowIndex findRowIndex(not_null<PeerListRow*> row, RowIndex hint = RowIndex());
-	QRect getActionRect(not_null<PeerListRow*> row, RowIndex index) const;
+	QRect getActiveActionRect(not_null<PeerListRow*> row, RowIndex index) const;
 
 	crl::time paintRow(Painter &p, crl::time ms, RowIndex index);
 
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 4a65adaf1..08838d916 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "data/data_changes.h"
+#include "data/data_user.h"
 #include "data/data_channel.h"
 #include "data/data_group_call.h"
 
@@ -395,8 +396,10 @@ void GroupCall::sendMutedUpdate() {
 		inputCall(),
 		MTP_inputUserSelf()
 	)).done([=](const MTPUpdates &result) {
+		_updateMuteRequestId = 0;
 		_channel->session().api().applyUpdates(result);
 	}).fail([=](const RPCError &error) {
+		_updateMuteRequestId = 0;
 		if (error.type() == u"GROUP_CALL_FORBIDDEN"_q
 			&& _state.current() == State::Joined) {
 			setState(State::Joining);
@@ -416,6 +419,24 @@ void GroupCall::setCurrentAudioDevice(bool input, const QString &deviceId) {
 	}
 }
 
+void GroupCall::toggleMute(not_null<UserData*> user, bool mute) {
+	_api.request(MTPphone_EditGroupCallMember(
+		MTP_flags(mute
+			? MTPphone_EditGroupCallMember::Flag::f_muted
+			: MTPphone_EditGroupCallMember::Flag(0)),
+		inputCall(),
+		user->inputUser
+	)).done([=](const MTPUpdates &result) {
+		_channel->session().api().applyUpdates(result);
+	}).fail([=](const RPCError &error) {
+		if (error.type() == u"GROUP_CALL_FORBIDDEN"_q
+			&& _state.current() == State::Joined) {
+			setState(State::Joining);
+			rejoin();
+		}
+	}).send();
+}
+
 //void GroupCall::setAudioVolume(bool input, float level) {
 //	if (_instance) {
 //		if (input) {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index fe348e678..2a5495ae1 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -80,6 +80,8 @@ public:
 	//void setAudioVolume(bool input, float level);
 	void setAudioDuckingEnabled(bool enabled);
 
+	void toggleMute(not_null<UserData*> user, bool mute);
+
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 3edf6f2d4..a26f63e79 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "main/main_session.h"
 #include "lang/lang_keys.h"
+#include "facades.h"
 #include "styles/style_calls.h"
 
 namespace Calls {
@@ -35,6 +36,9 @@ public:
 	};
 
 	void updateState(const Data::GroupCall::Participant *participant);
+	[[nodiscard]] State state() const {
+		return _state;
+	}
 
 	void addActionRipple(QPoint point, Fn<void()> updateCallback) override;
 	void stopLastActionRipple() override;
@@ -45,6 +49,9 @@ public:
 	QSize actionSize() const override {
 		return QSize(_st->width, _st->height);
 	}
+	bool actionDisabled() const override {
+		return peer()->isSelf() || !_channel->amCreator();
+	}
 	QMargins actionMargins() const override {
 		return QMargins(
 			0,
@@ -70,6 +77,7 @@ private:
 		State state);
 
 	State _state = State::Inactive;
+	not_null<ChannelData*> _channel;
 	not_null<const style::IconButton*> _st;
 
 	std::unique_ptr<Ui::RippleAnimation> _actionRipple;
@@ -82,6 +90,8 @@ class MembersController final
 public:
 	explicit MembersController(not_null<GroupCall*> call);
 
+	using MuteRequest = GroupMembers::MuteRequest;
+
 	Main::Session &session() const override;
 	void prepare() override;
 	void rowClicked(not_null<PeerListRow*> row) override;
@@ -94,9 +104,9 @@ public:
 	[[nodiscard]] rpl::producer<int> fullCountValue() const {
 		return _fullCount.value();
 	}
+	[[nodiscard]] rpl::producer<MuteRequest> toggleMuteRequests() const;
 
 private:
-
 	[[nodiscard]] std::unique_ptr<PeerListRow> createSelfRow() const;
 	[[nodiscard]] std::unique_ptr<PeerListRow> createRow(
 		const Data::GroupCall::Participant &participant) const;
@@ -114,6 +124,7 @@ private:
 	const base::weak_ptr<GroupCall> _call;
 	const not_null<ChannelData*> _channel;
 
+	rpl::event_stream<MuteRequest> _toggleMuteRequests;
 	rpl::variable<int> _fullCount = 1;
 	Ui::BoxPointer _addBox;
 	rpl::lifetime _lifetime;
@@ -123,6 +134,7 @@ private:
 Row::Row(not_null<ChannelData*> channel, not_null<UserData*> user)
 : PeerListRow(user)
 , _state(ComputeState(channel, user))
+, _channel(channel)
 , _st(ComputeIconStyle(_state)) {
 	refreshStatus();
 }
@@ -384,17 +396,25 @@ void MembersController::loadMoreRows() {
 	}
 }
 
-void MembersController::rowClicked(not_null<PeerListRow*> row) {
-	Expects(row->peer()->isUser());
+auto MembersController::toggleMuteRequests() const
+-> rpl::producer<GroupMembers::MuteRequest> {
+	return _toggleMuteRequests.events();
+}
 
-	const auto user = row->peer()->asUser();
+void MembersController::rowClicked(not_null<PeerListRow*> row) {
+	Ui::showPeerHistory(row->peer(), ShowAtUnreadMsgId);
 }
 
 void MembersController::rowActionClicked(
 		not_null<PeerListRow*> row) {
 	Expects(row->peer()->isUser());
 
-	const auto user = row->peer()->asUser();
+	const auto real = static_cast<Row*>(row.get());
+	const auto mute = (real->state() != Row::State::Muted);
+	_toggleMuteRequests.fire(MuteRequest{
+		.user = row->peer()->asUser(),
+		.mute = mute,
+	});
 }
 
 base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
@@ -440,6 +460,12 @@ GroupMembers::GroupMembers(
 	}, lifetime());
 }
 
+auto GroupMembers::toggleMuteRequests() const
+-> rpl::producer<GroupMembers::MuteRequest> {
+	return static_cast<MembersController*>(
+		_listController.get())->toggleMuteRequests();
+}
+
 int GroupMembers::desiredHeight() const {
 	auto desired = _header ? _header->height() : 0;
 	auto count = [this] {
diff --git a/Telegram/SourceFiles/calls/calls_group_members.h b/Telegram/SourceFiles/calls/calls_group_members.h
index 7883c6120..5b6d39df6 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.h
+++ b/Telegram/SourceFiles/calls/calls_group_members.h
@@ -29,7 +29,13 @@ public:
 		QWidget *parent,
 		not_null<GroupCall*> call);
 
-	int desiredHeight() const;
+	struct MuteRequest {
+		not_null<UserData*> user;
+		bool mute = false;
+	};
+
+	[[nodiscard]] int desiredHeight() const;
+	[[nodiscard]] rpl::producer<MuteRequest> toggleMuteRequests() const;
 
 private:
 	using ListWidget = PeerListContent;
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 5e6cc20f4..e7e0bd3d1 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -342,6 +342,13 @@ void GroupPanel::initWithCall(GroupCall *call) {
 	) | rpl::start_with_next([=] {
 		updateControlsGeometry();
 	}, _members->lifetime());
+
+	_members->toggleMuteRequests(
+	) | rpl::start_with_next([=](GroupMembers::MuteRequest request) {
+		if (_call) {
+			_call->toggleMute(request.user, request.mute);
+		}
+	}, _callLifetime);
 }
 
 void GroupPanel::initLayout() {

From eb40edae221c400ab36af4f356f4c17b6f59952d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 27 Nov 2020 19:55:18 +0300
Subject: [PATCH 172/370] Fix group call members list height.

---
 Telegram/SourceFiles/calls/calls_group_members.cpp | 13 ++++++++++++-
 Telegram/SourceFiles/calls/calls_group_members.h   |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index a26f63e79..543ce6fdf 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -478,7 +478,18 @@ int GroupMembers::desiredHeight() const {
 	}();
 	desired += std::max(count, _list->fullRowsCount())
 		* st::groupCallMembersList.item.height;
-	return std::max(height(), desired);
+	return desired;
+}
+
+rpl::producer<int> GroupMembers::desiredHeightValue() const {
+	const auto controller = static_cast<MembersController*>(
+		_listController.get());
+	return rpl::combine(
+		heightValue(),
+		controller->fullCountValue()
+	) | rpl::map([=] {
+		return desiredHeight();
+	});
 }
 
 void GroupMembers::setupHeader(not_null<GroupCall*> call) {
diff --git a/Telegram/SourceFiles/calls/calls_group_members.h b/Telegram/SourceFiles/calls/calls_group_members.h
index 5b6d39df6..9cc8fcc8d 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.h
+++ b/Telegram/SourceFiles/calls/calls_group_members.h
@@ -35,6 +35,7 @@ public:
 	};
 
 	[[nodiscard]] int desiredHeight() const;
+	[[nodiscard]] rpl::producer<int> desiredHeightValue() const override;
 	[[nodiscard]] rpl::producer<MuteRequest> toggleMuteRequests() const;
 
 private:

From c8dd486410036c2798face407d3a109427671073 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Nov 2020 09:38:55 +0300
Subject: [PATCH 173/370] Update API scheme.

---
 Telegram/Resources/tl/api.tl                    | 4 ++--
 Telegram/SourceFiles/calls/calls_group_call.cpp | 9 ++++++++-
 Telegram/SourceFiles/calls/calls_group_call.h   | 2 ++
 Telegram/SourceFiles/data/data_group_call.cpp   | 2 ++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index 6d2f7fa06..cb7ea4274 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -1191,7 +1191,7 @@ inputGroupCall#d8aa840f id:long access_hash:long = InputGroupCall;
 
 groupCallParticipant#56b087c9 flags:# muted:flags.0?true left:flags.1?true can_self_unmute:flags.2?true user_id:int date:int active_date:flags.3?int source:int = GroupCallParticipant;
 
-phone.groupCall#985c2087 call:GroupCall sources:Vector<int> participants:Vector<GroupCallParticipant> participants_next_offset:string users:Vector<User> = phone.GroupCall;
+phone.groupCall#66ab0bfc call:GroupCall participants:Vector<GroupCallParticipant> participants_next_offset:string users:Vector<User> = phone.GroupCall;
 
 phone.groupParticipants#9cfeb92d count:int participants:Vector<GroupCallParticipant> next_offset:string users:Vector<User> version:int = phone.GroupParticipants;
 
@@ -1557,7 +1557,7 @@ phone.inviteToGroupCall#7b393160 call:InputGroupCall users:Vector<InputUser> = U
 phone.discardGroupCall#7a777135 call:InputGroupCall = Updates;
 phone.toggleGroupCallSettings#74bbb43d flags:# call:InputGroupCall join_muted:flags.0?Bool = Updates;
 phone.getGroupCall#c7cb017 call:InputGroupCall = phone.GroupCall;
-phone.getGroupParticipants#ae1910a4 call:InputGroupCall offset:string limit:int = phone.GroupParticipants;
+phone.getGroupParticipants#c9f1d285 call:InputGroupCall ids:Vector<int> sources:Vector<int> offset:string limit:int = phone.GroupParticipants;
 phone.checkGroupCall#b74a7bea call:InputGroupCall source:int = Bool;
 
 langpack.getLangPack#f2f2330a lang_pack:string lang_code:string = LangPackDifference;
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 08838d916..a99229d5b 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -351,7 +351,8 @@ void GroupCall::createAndStartController() {
 		},
 		.audioLevelsUpdated = [=](const AudioLevels &data) {
 		},
-		.myAudioLevelUpdated = [=](float) {
+		.myAudioLevelUpdated = [=](float level) {
+			crl::on_main(weak, [=] { myLevelUpdated(level); });
 		},
 		.initialInputDeviceId = settings.callInputDeviceId().toStdString(),
 		.initialOutputDeviceId = settings.callOutputDeviceId().toStdString(),
@@ -387,6 +388,12 @@ void GroupCall::createAndStartController() {
 	//raw->setAudioOutputDuckingEnabled(settings.callAudioDuckingEnabled());
 }
 
+void GroupCall::myLevelUpdated(float level) {
+	if (level > 0.) {
+
+	}
+}
+
 void GroupCall::sendMutedUpdate() {
 	_api.request(_updateMuteRequestId).cancel();
 	_updateMuteRequestId = _api.request(MTPphone_EditGroupCallMember(
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 2a5495ae1..7551e4a8a 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -104,6 +104,8 @@ private:
 	void applySelfInCallLocally();
 	void rejoin();
 
+	void myLevelUpdated(float level);
+
 	[[nodiscard]] MTPInputGroupCall inputCall() const;
 
 	const not_null<Delegate*> _delegate;
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index 1d6265614..a3a6251c6 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -63,6 +63,8 @@ void GroupCall::requestParticipants() {
 	auto &api = _channel->session().api();
 	_participantsRequestId = api.request(MTPphone_GetGroupParticipants(
 		input(),
+		MTP_vector<MTPint>(), // ids
+		MTP_vector<MTPint>(), // sources
 		MTP_string(_nextOffset),
 		MTP_int(kRequestPerPage)
 	)).done([=](const MTPphone_GroupParticipants &result) {

From d18b29efb827a17f95c77b5daaf9a8758e3c8fcc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Nov 2020 10:18:46 +0300
Subject: [PATCH 174/370] Track three-state muted value.

---
 .../SourceFiles/calls/calls_group_call.cpp    | 21 ++++++++++++-------
 Telegram/SourceFiles/calls/calls_group_call.h | 14 +++++++++----
 .../SourceFiles/calls/calls_group_panel.cpp   | 21 ++++++++++++++-----
 Telegram/SourceFiles/calls/calls_top_bar.cpp  | 21 +++++++++++++++++--
 4 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index a99229d5b..4026beaaa 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -148,7 +148,7 @@ void GroupCall::rejoin() {
 				QJsonDocument::Compact);
 			const auto muted = _muted.current();
 			_api.request(MTPphone_JoinGroupCall(
-				MTP_flags(muted
+				MTP_flags((muted != MuteState::Active)
 					? MTPphone_JoinGroupCall::Flag::f_muted
 					: MTPphone_JoinGroupCall::Flag(0)),
 				inputCall(),
@@ -181,7 +181,9 @@ void GroupCall::applySelfInCallLocally() {
 		using Flag = MTPDgroupCallParticipant::Flag;
 		return MTP_groupCallParticipant(
 			MTP_flags((_mySsrc ? Flag(0) : Flag::f_left)
-				| (_muted.current() ? Flag::f_muted : Flag(0))),
+				| ((_muted.current() != MuteState::Active)
+					? Flag::f_muted
+					: Flag(0))),
 			MTP_int(self),
 			MTP_int(now),
 			MTP_int(0),
@@ -233,7 +235,7 @@ void GroupCall::finish(FinishType type) {
 	}).send();
 }
 
-void GroupCall::setMuted(bool mute) {
+void GroupCall::setMuted(MuteState mute) {
 	_muted = mute;
 }
 
@@ -334,6 +336,11 @@ void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
 				_mySsrc = 0;
 				hangup();
 			}
+			if (data.is_muted() && !data.is_can_self_unmute()) {
+				setMuted(MuteState::ForceMuted);
+			} else if (muted() == MuteState::ForceMuted) {
+				setMuted(MuteState::Muted);
+			}
 		});
 	}
 }
@@ -377,11 +384,11 @@ void GroupCall::createAndStartController() {
 		std::move(descriptor));
 
 	_muted.value(
-	) | rpl::start_with_next([=](bool muted) {
+	) | rpl::start_with_next([=](MuteState state) {
 		if (_instance) {
-			_instance->setIsMuted(muted);
+			_instance->setIsMuted(state != MuteState::Active);
 		}
-		if (_mySsrc) {
+		if (_mySsrc && state != MuteState::ForceMuted) {
 			sendMutedUpdate();
 		}
 	}, _lifetime);
@@ -397,7 +404,7 @@ void GroupCall::myLevelUpdated(float level) {
 void GroupCall::sendMutedUpdate() {
 	_api.request(_updateMuteRequestId).cancel();
 	_updateMuteRequestId = _api.request(MTPphone_EditGroupCallMember(
-		MTP_flags(_muted.current()
+		MTP_flags((_muted.current() != MuteState::Active)
 			? MTPphone_EditGroupCallMember::Flag::f_muted
 			: MTPphone_EditGroupCallMember::Flag(0)),
 		inputCall(),
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 7551e4a8a..9069c7a37 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -19,6 +19,12 @@ class GroupInstanceImpl;
 
 namespace Calls {
 
+enum class MuteState {
+	Active,
+	Muted,
+	ForceMuted,
+};
+
 class GroupCall final : public base::has_weak_ptr {
 public:
 	class Delegate {
@@ -49,11 +55,11 @@ public:
 	void handleUpdate(const MTPGroupCall &call);
 	void handleUpdate(const MTPDupdateGroupCallParticipants &data);
 
-	void setMuted(bool mute);
-	[[nodiscard]] bool muted() const {
+	void setMuted(MuteState mute);
+	[[nodiscard]] MuteState muted() const {
 		return _muted.current();
 	}
-	[[nodiscard]] rpl::producer<bool> mutedValue() const {
+	[[nodiscard]] rpl::producer<MuteState> mutedValue() const {
 		return _muted.value();
 	}
 	[[nodiscard]] bool joined() const {
@@ -113,7 +119,7 @@ private:
 	MTP::Sender _api;
 	rpl::variable<State> _state = State::Creating;
 
-	rpl::variable<bool> _muted = true;
+	rpl::variable<MuteState> _muted = MuteState::Muted;
 	bool _acceptFields = false;
 
 	uint64 _id = 0;
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index e7e0bd3d1..910ad48a6 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -297,9 +297,20 @@ void GroupPanel::initWidget() {
 }
 
 void GroupPanel::initControls() {
+	_call->mutedValue(
+	) | rpl::start_with_next([=](MuteState state) {
+		if (state == MuteState::ForceMuted) {
+			_mute->clearState();
+		}
+		_mute->setAttribute(
+			Qt::WA_TransparentForMouseEvents,
+			(state == MuteState::ForceMuted));
+	}, _mute->lifetime());
 	_mute->setClickedCallback([=] {
-		if (_call) {
-			_call->setMuted(!_call->muted());
+		if (_call && _call->muted() != MuteState::ForceMuted) {
+			_call->setMuted((_call->muted() == MuteState::Active)
+				? MuteState::Muted
+				: MuteState::Active);
 		}
 	});
 	_hangup->setClickedCallback([=] {
@@ -326,9 +337,9 @@ void GroupPanel::initWithCall(GroupCall *call) {
 	_hangup->setText(tr::lng_box_leave());
 
 	_call->mutedValue(
-	) | rpl::start_with_next([=](bool mute) {
-		_mute->setProgress(mute ? 1. : 0.);
-		_mute->setText(mute
+	) | rpl::start_with_next([=](MuteState state) {
+		_mute->setProgress((state != MuteState::Active) ? 1. : 0.);
+		_mute->setText((state != MuteState::Active)
 			? tr::lng_call_unmute_audio()
 			: tr::lng_call_mute_audio());
 	}, _callLifetime);
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 97f074714..e06097ced 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -115,13 +115,18 @@ void TopBar::initControls() {
 		if (const auto call = _call.get()) {
 			call->setMuted(!call->muted());
 		} else if (const auto group = _groupCall.get()) {
-			group->setMuted(!group->muted());
+			if (group->muted() != MuteState::ForceMuted) {
+				group->setMuted((group->muted() == MuteState::Active)
+					? MuteState::Muted
+					: MuteState::Active);
+			}
 		}
 	});
 
+	using namespace rpl::mappers;
 	auto muted = _call
 		? _call->mutedValue()
-		: _groupCall->mutedValue();
+		: (_groupCall->mutedValue() | rpl::map(_1 != MuteState::Active));
 	std::move(
 		muted
 	) | rpl::start_with_next([=](bool muted) {
@@ -129,6 +134,18 @@ void TopBar::initControls() {
 		update();
 	}, lifetime());
 
+	if (_groupCall) {
+		_groupCall->mutedValue(
+		) | rpl::start_with_next([=](MuteState state) {
+			if (state == MuteState::ForceMuted) {
+				_mute->clearState();
+			}
+			_mute->setAttribute(
+				Qt::WA_TransparentForMouseEvents,
+				(state == MuteState::ForceMuted));
+		}, _mute->lifetime());
+	}
+
 	if (const auto call = _call.get()) {
 		call->user()->session().changes().peerUpdates(
 			Data::PeerUpdate::Flag::Name

From 7983d33ad5115d2caaabdcb95b1650f5e0805cfe Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Nov 2020 10:21:11 +0300
Subject: [PATCH 175/370] Add manage_call admin right support.

---
 Telegram/Resources/langs/lang.strings                       | 2 ++
 Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp   | 3 ++-
 .../SourceFiles/boxes/peers/edit_peer_permissions_box.cpp   | 1 +
 Telegram/SourceFiles/calls/calls_group_members.cpp          | 6 ++++--
 Telegram/SourceFiles/data/data_channel.cpp                  | 4 ++++
 Telegram/SourceFiles/data/data_channel.h                    | 1 +
 Telegram/SourceFiles/data/data_chat.cpp                     | 3 ++-
 Telegram/SourceFiles/data/data_group_call.cpp               | 4 ++--
 Telegram/SourceFiles/data/data_group_call.h                 | 2 +-
 .../history/admin_log/history_admin_log_item.cpp            | 6 +++++-
 10 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 94cd8ad64..9675aa046 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1881,6 +1881,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_rights_group_invite_link" = "Invite users via link";
 "lng_rights_group_invite" = "Add users";
 "lng_rights_group_pin" = "Pin messages";
+"lng_rights_group_manage_calls" = "Manage voice chats";
 "lng_rights_group_delete" = "Delete messages";
 "lng_rights_group_anonymous" = "Remain Anonymous";
 "lng_rights_add_admins" = "Add new admins";
@@ -2045,6 +2046,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_admin_log_admin_invite_users" = "Add members";
 "lng_admin_log_admin_invite_link" = "Invite users via link";
 "lng_admin_log_admin_pin_messages" = "Pin messages";
+"lng_admin_log_admin_manage_calls" = "Manage voice chats";
 "lng_admin_log_admin_add_admins" = "Add new admins";
 
 // #feed
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
index c6fbac836..2ef65dcef 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
@@ -216,7 +216,8 @@ MTPChatAdminRights EditAdminBox::Defaults(not_null<PeerData*> peer) {
 			| Flag::f_delete_messages
 			| Flag::f_ban_users
 			| Flag::f_invite_users
-			| Flag::f_pin_messages)
+			| Flag::f_pin_messages
+			| Flag::f_manage_call)
 		: (Flag::f_change_info
 			| Flag::f_post_messages
 			| Flag::f_edit_messages
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
index 91e0a0dfe..6684a390f 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
@@ -135,6 +135,7 @@ std::vector<std::pair<ChatAdminRights, QString>> AdminRightLabels(
 				? tr::lng_rights_group_invite_link(tr::now)
 				: tr::lng_rights_group_invite(tr::now) },
 			{ Flag::f_pin_messages, tr::lng_rights_group_pin(tr::now) },
+			{ Flag::f_manage_call, tr::lng_rights_group_manage_calls(tr::now) },
 			{ Flag::f_anonymous, tr::lng_rights_group_anonymous(tr::now) },
 			{ Flag::f_add_admins, tr::lng_rights_add_admins(tr::now) },
 		};
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 543ce6fdf..1ebc20818 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -19,7 +19,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "main/main_session.h"
 #include "lang/lang_keys.h"
-#include "facades.h"
+#include "facades.h" // Ui::showPeerHistory.
+#include "mainwindow.h" // App::wnd()->activate.
 #include "styles/style_calls.h"
 
 namespace Calls {
@@ -50,7 +51,7 @@ public:
 		return QSize(_st->width, _st->height);
 	}
 	bool actionDisabled() const override {
-		return peer()->isSelf() || !_channel->amCreator();
+		return peer()->isSelf() || !_channel->canManageCall();
 	}
 	QMargins actionMargins() const override {
 		return QMargins(
@@ -403,6 +404,7 @@ auto MembersController::toggleMuteRequests() const
 
 void MembersController::rowClicked(not_null<PeerListRow*> row) {
 	Ui::showPeerHistory(row->peer(), ShowAtUnreadMsgId);
+	App::wnd()->activate();
 }
 
 void MembersController::rowActionClicked(
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index b150fdda2..9f5ed04fe 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -523,6 +523,10 @@ bool ChannelData::canRestrictUser(not_null<UserData*> user) const {
 	return adminRights() & AdminRight::f_ban_users;
 }
 
+bool ChannelData::canManageCall() const {
+	return amCreator() || (adminRights() & AdminRight::f_manage_call);
+}
+
 void ChannelData::setAdminRights(const MTPChatAdminRights &rights) {
 	if (rights.c_chatAdminRights().vflags().v == adminRights()) {
 		return;
diff --git a/Telegram/SourceFiles/data/data_channel.h b/Telegram/SourceFiles/data/data_channel.h
index 070c42502..372244ab8 100644
--- a/Telegram/SourceFiles/data/data_channel.h
+++ b/Telegram/SourceFiles/data/data_channel.h
@@ -306,6 +306,7 @@ public:
 	[[nodiscard]] bool canDelete() const;
 	[[nodiscard]] bool canEditAdmin(not_null<UserData*> user) const;
 	[[nodiscard]] bool canRestrictUser(not_null<UserData*> user) const;
+	[[nodiscard]] bool canManageCall() const;
 
 	void setInviteLink(const QString &newInviteLink);
 	[[nodiscard]] QString inviteLink() const;
diff --git a/Telegram/SourceFiles/data/data_chat.cpp b/Telegram/SourceFiles/data/data_chat.cpp
index 47c167951..568cf04ab 100644
--- a/Telegram/SourceFiles/data/data_chat.cpp
+++ b/Telegram/SourceFiles/data/data_chat.cpp
@@ -44,7 +44,8 @@ auto ChatData::DefaultAdminRights() -> AdminRights {
 		| Flag::f_delete_messages
 		| Flag::f_ban_users
 		| Flag::f_invite_users
-		| Flag::f_pin_messages;
+		| Flag::f_pin_messages
+		| Flag::f_manage_call;
 }
 
 bool ChatData::canWrite() const {
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index a3a6251c6..dd0040ba3 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -212,8 +212,8 @@ void GroupCall::applyParticipantsSlice(
 		});
 	}
 	ranges::sort(_participants, std::greater<>(), [](const Participant &p) {
-		return p.lastActivePrecise
-			? p.lastActivePrecise
+		return p.lastSpoke
+			? p.lastSpoke
 			: p.lastActive
 			? p.lastActive
 			: p.date;
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 8182abfb8..164989b58 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -25,7 +25,7 @@ public:
 		not_null<UserData*> user;
 		TimeId date = 0;
 		TimeId lastActive = 0;
-		TimeId lastActivePrecise = 0;
+		TimeId lastSpoke = 0;
 		uint32 source = 0;
 		bool muted = false;
 		bool canSelfUnmute = false;
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 e1b1da1df..27df26a23 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -164,6 +164,7 @@ TextWithEntities GenerateAdminChangeText(
 		{ Flag::f_ban_users, tr::lng_admin_log_admin_ban_users },
 		{ Flag::f_invite_users, invitePhrase },
 		{ Flag::f_pin_messages, tr::lng_admin_log_admin_pin_messages },
+		{ Flag::f_manage_call, tr::lng_admin_log_admin_manage_calls },
 		{ Flag::f_add_admins, tr::lng_admin_log_admin_add_admins },
 	};
 	phraseMap[Flag::f_invite_users] = invitePhrase;
@@ -197,7 +198,10 @@ QString GenerateBannedChangeText(
 		{ Flag::f_view_messages, tr::lng_admin_log_banned_view_messages },
 		{ Flag::f_send_messages, tr::lng_admin_log_banned_send_messages },
 		{ Flag::f_send_media, tr::lng_admin_log_banned_send_media },
-		{ Flag::f_send_stickers | Flag::f_send_gifs | Flag::f_send_inline | Flag::f_send_games, tr::lng_admin_log_banned_send_stickers },
+		{ Flag::f_send_stickers
+			| Flag::f_send_gifs
+			| Flag::f_send_inline
+			| Flag::f_send_games, tr::lng_admin_log_banned_send_stickers },
 		{ Flag::f_embed_links, tr::lng_admin_log_banned_embed_links },
 		{ Flag::f_send_polls, tr::lng_admin_log_banned_send_polls },
 		{ Flag::f_change_info, tr::lng_admin_log_admin_change_info },

From b54a2aa40b32e172b18af4897fff8334c6a64782 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Nov 2020 10:41:33 +0300
Subject: [PATCH 176/370] Apply self mute status locally.

---
 .../SourceFiles/calls/calls_group_call.cpp    | 47 ++++++++++++-------
 Telegram/SourceFiles/data/data_group_call.cpp |  4 +-
 Telegram/ThirdParty/tgcalls                   |  2 +-
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 4026beaaa..387dfb026 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -175,24 +175,36 @@ void GroupCall::applySelfInCallLocally() {
 	if (!call || call->id() != _id) {
 		return;
 	}
-	const auto my = [&] {
-		const auto self = _channel->session().userId();
-		const auto now = base::unixtime::now();
-		using Flag = MTPDgroupCallParticipant::Flag;
-		return MTP_groupCallParticipant(
-			MTP_flags((_mySsrc ? Flag(0) : Flag::f_left)
-				| ((_muted.current() != MuteState::Active)
-					? Flag::f_muted
-					: Flag(0))),
-			MTP_int(self),
-			MTP_int(now),
-			MTP_int(0),
-			MTP_int(_mySsrc));
-	};
+	using Flag = MTPDgroupCallParticipant::Flag;
+	const auto &participants = call->participants();
+	const auto self = _channel->session().user();
+	const auto i = ranges::find(
+		participants,
+		self,
+		&Data::GroupCall::Participant::user);
+	const auto date = (i != end(participants))
+		? i->date
+		: base::unixtime::now();
+	const auto lastActive = (i != end(participants))
+		? i->lastActive
+		: TimeId(0);
+	const auto muted = (_muted.current() != MuteState::Active);
+	const auto cantSelfUnmute = (_muted.current() == MuteState::ForceMuted);
+	const auto flags = (cantSelfUnmute ? Flag(0) : Flag::f_can_self_unmute)
+		| (lastActive ? Flag::f_active_date : Flag(0))
+		| (_mySsrc ? Flag(0) : Flag::f_left)
+		| (muted ? Flag::f_muted : Flag(0));
 	call->applyUpdateChecked(
 		MTP_updateGroupCallParticipants(
 			inputCall(),
-			MTP_vector<MTPGroupCallParticipant>(1, my()),
+			MTP_vector<MTPGroupCallParticipant>(
+				1,
+				MTP_groupCallParticipant(
+					MTP_flags(flags),
+					MTP_int(self->bareId()),
+					MTP_int(date),
+					MTP_int(lastActive),
+					MTP_int(_mySsrc))),
 			MTP_int(0)).c_updateGroupCallParticipants());
 }
 
@@ -237,6 +249,7 @@ void GroupCall::finish(FinishType type) {
 
 void GroupCall::setMuted(MuteState mute) {
 	_muted = mute;
+	applySelfInCallLocally();
 }
 
 void GroupCall::handleUpdate(const MTPGroupCall &call) {
@@ -396,9 +409,7 @@ void GroupCall::createAndStartController() {
 }
 
 void GroupCall::myLevelUpdated(float level) {
-	if (level > 0.) {
-
-	}
+	LOG(("Level: %1").arg(level));
 }
 
 void GroupCall::sendMutedUpdate() {
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index dd0040ba3..f5e6ec96f 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -198,7 +198,7 @@ void GroupCall::applyParticipantsSlice(
 				.date = data.vdate().v,
 				.source = uint32(data.vsource().v),
 				.muted = data.is_muted(),
-				.canSelfUnmute = data.is_can_self_unmute(),
+				.canSelfUnmute = !data.is_muted() || data.is_can_self_unmute(),
 			};
 			if (i == end(_participants)) {
 				_participants.push_back(value);
@@ -236,7 +236,7 @@ void GroupCall::applyParticipantsMutes(
 				&Participant::user);
 			if (i != end(_participants)) {
 				i->muted = data.is_muted();
-				i->canSelfUnmute = data.is_can_self_unmute();
+				i->canSelfUnmute = !i->muted || data.is_can_self_unmute();
 				_participantUpdates.fire({
 					.participant = *i,
 				});
diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index ac86c0ee8..10d63157e 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit ac86c0ee86293d6fced7dcb48a8c93657f18a7f3
+Subproject commit 10d63157e4ebdf71d1ea3694bef2ab1f7d7f033c

From d1c821973a66645b3cf3ad17b62dcf21bab5e332 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Nov 2020 12:01:50 +0300
Subject: [PATCH 177/370] Update speaking status based on audio level.

---
 .../SourceFiles/calls/calls_group_call.cpp    |  24 +++-
 Telegram/SourceFiles/calls/calls_group_call.h |  13 ++
 .../SourceFiles/calls/calls_group_members.cpp | 127 ++++++++++++++++--
 .../SourceFiles/calls/calls_group_members.h   |   2 +-
 Telegram/SourceFiles/data/data_group_call.cpp |  11 ++
 Telegram/SourceFiles/data/data_group_call.h   |   2 +
 6 files changed, 163 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 387dfb026..f3f35b017 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -364,15 +364,20 @@ void GroupCall::createAndStartController() {
 	const auto &settings = Core::App().settings();
 
 	const auto weak = base::make_weak(this);
+	const auto myLevel = std::make_shared<float>();
 	tgcalls::GroupInstanceDescriptor descriptor = {
 		.config = tgcalls::GroupConfig{
 		},
 		.networkStateUpdated = [=](bool) {
 		},
 		.audioLevelsUpdated = [=](const AudioLevels &data) {
+			crl::on_main(weak, [=] { audioLevelsUpdated(data); });
 		},
 		.myAudioLevelUpdated = [=](float level) {
-			crl::on_main(weak, [=] { myLevelUpdated(level); });
+			if (*myLevel != level) { // Don't send many 0 while we're muted.
+				*myLevel = level;
+				crl::on_main(weak, [=] { myLevelUpdated(level); });
+			}
 		},
 		.initialInputDeviceId = settings.callInputDeviceId().toStdString(),
 		.initialOutputDeviceId = settings.callOutputDeviceId().toStdString(),
@@ -409,7 +414,22 @@ void GroupCall::createAndStartController() {
 }
 
 void GroupCall::myLevelUpdated(float level) {
-	LOG(("Level: %1").arg(level));
+	_levelUpdates.fire(LevelUpdate{
+		.source = _mySsrc,
+		.value = level,
+		.self = true
+	});
+}
+
+void GroupCall::audioLevelsUpdated(
+		const std::vector<std::pair<std::uint32_t, float>> &data) {
+	for (const auto &[source, level] : data) {
+		_levelUpdates.fire(LevelUpdate{
+			.source = source,
+			.value = level,
+			.self = (source == _mySsrc)
+		});
+	}
 }
 
 void GroupCall::sendMutedUpdate() {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 9069c7a37..f38f216d9 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -25,6 +25,12 @@ enum class MuteState {
 	ForceMuted,
 };
 
+struct LevelUpdate {
+	uint32 source = 0;
+	float value = 0.;
+	bool self = false;
+};
+
 class GroupCall final : public base::has_weak_ptr {
 public:
 	class Delegate {
@@ -82,6 +88,10 @@ public:
 		return _state.value();
 	}
 
+	[[nodiscard]] rpl::producer<LevelUpdate> levelUpdates() const {
+		return _levelUpdates.events();
+	}
+
 	void setCurrentAudioDevice(bool input, const QString &deviceId);
 	//void setAudioVolume(bool input, float level);
 	void setAudioDuckingEnabled(bool enabled);
@@ -111,6 +121,8 @@ private:
 	void rejoin();
 
 	void myLevelUpdated(float level);
+	void audioLevelsUpdated(
+		const std::vector<std::pair<std::uint32_t, float>> &data);
 
 	[[nodiscard]] MTPInputGroupCall inputCall() const;
 
@@ -128,6 +140,7 @@ private:
 	mtpRequestId _updateMuteRequestId = 0;
 
 	std::unique_ptr<tgcalls::GroupInstanceImpl> _instance;
+	rpl::event_stream<LevelUpdate> _levelUpdates;
 
 	rpl::lifetime _lifetime;
 
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 1ebc20818..e226e84f1 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -26,6 +26,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Calls {
 namespace {
 
+constexpr auto kLevelThreshold = 0.01;
+constexpr auto kLevelActiveTimeout = crl::time(1000);
+
+enum class UpdateLevelResult {
+	NothingChanged,
+	LevelChanged,
+	StateChanged,
+};
+
 class Row final : public PeerListRow {
 public:
 	Row(not_null<ChannelData*> channel, not_null<UserData*> user);
@@ -37,6 +46,7 @@ public:
 	};
 
 	void updateState(const Data::GroupCall::Participant *participant);
+	UpdateLevelResult updateLevel(float level);
 	[[nodiscard]] State state() const {
 		return _state;
 	}
@@ -70,6 +80,8 @@ public:
 
 private:
 	void refreshStatus() override;
+	void refreshStatus(crl::time now);
+	void resetSpeakingState();
 
 	[[nodiscard]] static State ComputeState(
 		not_null<ChannelData*> channel,
@@ -80,6 +92,8 @@ private:
 	State _state = State::Inactive;
 	not_null<ChannelData*> _channel;
 	not_null<const style::IconButton*> _st;
+	float _level = 0.;
+	crl::time _markInactiveAt = 0;
 
 	std::unique_ptr<Ui::RippleAnimation> _actionRipple;
 
@@ -121,10 +135,18 @@ private:
 	void updateRow(
 		not_null<Row*> row,
 		const Data::GroupCall::Participant *participant) const;
+	void updateRowLevel(not_null<UserData*> user, float level) const;
+	Row *findRow(not_null<UserData*> user) const;
+
+	[[nodiscard]] Data::GroupCall *resolvedRealCall() const;
 
 	const base::weak_ptr<GroupCall> _call;
 	const not_null<ChannelData*> _channel;
 
+	// Use only resolvedRealCall() method, not this value directly.
+	Data::GroupCall *_realCallRawValue = nullptr;
+	uint64 _realId = 0;
+
 	rpl::event_stream<MuteRequest> _toggleMuteRequests;
 	rpl::variable<int> _fullCount = 1;
 	Ui::BoxPointer _addBox;
@@ -148,16 +170,48 @@ void Row::updateState(const Data::GroupCall::Participant *participant) {
 			setCustomStatus(QString());
 		}
 		_state = State::Inactive;
+		resetSpeakingState();
 	} else if (!participant->muted) {
 		_state = State::Active;
 	} else if (participant->canSelfUnmute) {
 		_state = State::Inactive;
+		resetSpeakingState();
 	} else {
 		_state = State::Muted;
+		resetSpeakingState();
 	}
 	_st = ComputeIconStyle(_state);
 }
 
+void Row::resetSpeakingState() {
+	_markInactiveAt = 0;
+	updateLevel(0.);
+}
+
+UpdateLevelResult Row::updateLevel(float level) {
+	if (_level == level) {
+		return UpdateLevelResult::NothingChanged;
+	}
+	const auto now = crl::now();
+	const auto stillActive = (now < _markInactiveAt);
+	const auto wasActive = (_level >= kLevelThreshold) && stillActive;
+	const auto nowActive = (level >= kLevelThreshold);
+	if (nowActive) {
+		_markInactiveAt = now + kLevelActiveTimeout;
+		if (_state != State::Active) {
+			_state = State::Active;
+			_st = ComputeIconStyle(_state);
+		}
+	}
+	_level = level;
+	const auto changed = wasActive != (nowActive || stillActive);
+	if (!changed) {
+		return UpdateLevelResult::LevelChanged;
+	}
+	refreshStatus(now);
+	return UpdateLevelResult::StateChanged;
+}
+
 void Row::paintAction(
 		Painter &p,
 		int x,
@@ -182,14 +236,16 @@ void Row::paintAction(
 }
 
 void Row::refreshStatus() {
-	setCustomStatus([&] {
-		switch (_state) {
-		case State::Inactive:
-		case State::Muted: return tr::lng_group_call_inactive(tr::now);
-		case State::Active: return tr::lng_group_call_active(tr::now);
-		}
-		Unexpected("State in Row::refreshStatus.");
-	}(), (_state == State::Active));
+	refreshStatus(crl::now());
+}
+
+void Row::refreshStatus(crl::time now) {
+	const auto active = (now < _markInactiveAt);
+	setCustomStatus(
+		(active
+			? tr::lng_group_call_active(tr::now)
+			: tr::lng_group_call_inactive(tr::now)),
+		active);
 }
 
 Row::State Row::ComputeState(
@@ -272,9 +328,28 @@ void MembersController::setupListChangeViewers(not_null<GroupCall*> call) {
 			//updateRow(channel->session().user());
 		}
 	}, _lifetime);
+
+	call->levelUpdates(
+	) | rpl::start_with_next([=](const LevelUpdate &update) {
+		const auto findUserBySource = [&](uint32 source) -> UserData* {
+			if (const auto real = resolvedRealCall()) {
+				return real->userBySource(source);
+			}
+			return nullptr;
+		};
+		const auto user = update.self
+			? _channel->session().user().get()
+			: findUserBySource(update.source);
+		if (user) {
+			updateRowLevel(user, update.value);
+		}
+	}, _lifetime);
 }
 
 void MembersController::subscribeToChanges(not_null<Data::GroupCall*> real) {
+	_realCallRawValue = real;
+	_realId = real->id();
+
 	_fullCount = real->fullCountValue(
 	) | rpl::map([](int value) {
 		return std::max(value, 1);
@@ -290,9 +365,9 @@ void MembersController::subscribeToChanges(not_null<Data::GroupCall*> real) {
 	) | rpl::start_with_next([=](const Update &update) {
 		const auto user = update.participant.user;
 		if (update.removed) {
-			if (auto row = delegate()->peerListFindRow(user->id)) {
+			if (const auto row = findRow(user)) {
 				if (user->isSelf()) {
-					static_cast<Row*>(row)->updateState(nullptr);
+					row->updateState(nullptr);
 					delegate()->peerListUpdateRow(row);
 				} else {
 					delegate()->peerListRemoveRow(row);
@@ -307,8 +382,8 @@ void MembersController::subscribeToChanges(not_null<Data::GroupCall*> real) {
 
 void MembersController::updateRow(
 		const Data::GroupCall::Participant &participant) {
-	if (auto row = delegate()->peerListFindRow(participant.user->id)) {
-		updateRow(static_cast<Row*>(row), &participant);
+	if (const auto row = findRow(participant.user)) {
+		updateRow(row, &participant);
 	} else if (auto row = createRow(participant)) {
 		delegate()->peerListAppendRow(std::move(row));
 		delegate()->peerListRefreshRows();
@@ -322,6 +397,30 @@ void MembersController::updateRow(
 	delegate()->peerListUpdateRow(row);
 }
 
+void MembersController::updateRowLevel(
+		not_null<UserData*> user,
+		float level) const {
+	if (const auto row = findRow(user)) {
+		const auto result = row->updateLevel(level);
+		if (result == UpdateLevelResult::StateChanged) {
+			// #TODO calls reorder.
+		}
+		delegate()->peerListUpdateRow(row);
+	}
+}
+
+Row *MembersController::findRow(not_null<UserData*> user) const {
+	return static_cast<Row*>(delegate()->peerListFindRow(user->id));
+}
+
+Data::GroupCall *MembersController::resolvedRealCall() const {
+	return (_realCallRawValue
+		&& (_channel->call() == _realCallRawValue)
+		&& (_realCallRawValue->id() == _realId))
+		? _realCallRawValue
+		: nullptr;
+}
+
 Main::Session &MembersController::session() const {
 	return _call->channel()->session();
 }
@@ -473,7 +572,9 @@ int GroupMembers::desiredHeight() const {
 	auto count = [this] {
 		if (const auto call = _call.get()) {
 			if (const auto real = call->channel()->call()) {
-				return real->fullCount();
+				if (call->id() == real->id()) {
+					return real->fullCount();
+				}
 			}
 		}
 		return 0;
diff --git a/Telegram/SourceFiles/calls/calls_group_members.h b/Telegram/SourceFiles/calls/calls_group_members.h
index 9cc8fcc8d..f5481a486 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.h
+++ b/Telegram/SourceFiles/calls/calls_group_members.h
@@ -71,7 +71,7 @@ private:
 	void addMember();
 	void updateHeaderControlsGeometry(int newWidth);
 
-	base::weak_ptr<GroupCall> _call;
+	const base::weak_ptr<GroupCall> _call;
 	object_ptr<Ui::ScrollArea> _scroll;
 	std::unique_ptr<PeerListController> _listController;
 	object_ptr<Ui::RpWidget> _header = { nullptr };
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index f5e6ec96f..e30fb9458 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -105,6 +105,11 @@ bool GroupCall::participantsLoaded() const {
 	return _allReceived;
 }
 
+UserData *GroupCall::userBySource(uint32 source) const {
+	const auto i = _userBySource.find(source);
+	return (i != end(_userBySource)) ? i->second.get() : nullptr;
+}
+
 rpl::producer<> GroupCall::participantsSliceAdded() {
 	return _participantsSliceAdded.events();
 }
@@ -183,6 +188,7 @@ void GroupCall::applyParticipantsSlice(
 						.participant = *i,
 						.removed = true,
 					};
+					_userBySource.erase(i->source);
 					_participants.erase(i);
 					if (sendIndividualUpdates) {
 						_participantUpdates.fire(std::move(update));
@@ -201,9 +207,14 @@ void GroupCall::applyParticipantsSlice(
 				.canSelfUnmute = !data.is_muted() || data.is_can_self_unmute(),
 			};
 			if (i == end(_participants)) {
+				_userBySource.emplace(value.source, value.user);
 				_participants.push_back(value);
 				++fullCount;
 			} else {
+				if (i->source != value.source) {
+					_userBySource.erase(i->source);
+					_userBySource.emplace(value.source, value.user);
+				}
 				*i = value;
 			}
 			_participantUpdates.fire({
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 164989b58..4ccda796c 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -39,6 +39,7 @@ public:
 		-> const std::vector<Participant> &;
 	void requestParticipants();
 	[[nodiscard]] bool participantsLoaded() const;
+	[[nodiscard]] UserData *userBySource(uint32 source) const;
 
 	[[nodiscard]] rpl::producer<> participantsSliceAdded();
 	[[nodiscard]] rpl::producer<ParticipantUpdate> participantUpdated() const;
@@ -72,6 +73,7 @@ private:
 	mtpRequestId _reloadRequestId = 0;
 
 	std::vector<Participant> _participants;
+	base::flat_map<uint32, not_null<UserData*>> _userBySource;
 	QString _nextOffset;
 	rpl::variable<int> _fullCount = 0;
 

From bc01a364d090104b071b3e742d24491467b8ef73 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Nov 2020 12:30:03 +0300
Subject: [PATCH 178/370] Reset speaking status by timeout.

---
 .../SourceFiles/calls/calls_group_members.cpp | 68 +++++++++++++++----
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index e226e84f1..2550b56cb 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/effects/ripple_animation.h"
 #include "main/main_session.h"
+#include "base/timer.h"
 #include "lang/lang_keys.h"
 #include "facades.h" // Ui::showPeerHistory.
 #include "mainwindow.h" // App::wnd()->activate.
@@ -29,10 +30,10 @@ namespace {
 constexpr auto kLevelThreshold = 0.01;
 constexpr auto kLevelActiveTimeout = crl::time(1000);
 
-enum class UpdateLevelResult {
-	NothingChanged,
-	LevelChanged,
-	StateChanged,
+struct UpdateLevelResult {
+	bool levelChanged = false;
+	bool stateChanged = false;
+	crl::time nextUpdateTime = 0;
 };
 
 class Row final : public PeerListRow {
@@ -127,6 +128,7 @@ private:
 		const Data::GroupCall::Participant &participant) const;
 
 	void prepareRows(not_null<Data::GroupCall*> real);
+	void repaintByTimer();
 
 	void setupListChangeViewers(not_null<GroupCall*> call);
 	void subscribeToChanges(not_null<Data::GroupCall*> real);
@@ -135,7 +137,7 @@ private:
 	void updateRow(
 		not_null<Row*> row,
 		const Data::GroupCall::Participant *participant) const;
-	void updateRowLevel(not_null<UserData*> user, float level) const;
+	void updateRowLevel(not_null<UserData*> user, float level);
 	Row *findRow(not_null<UserData*> user) const;
 
 	[[nodiscard]] Data::GroupCall *resolvedRealCall() const;
@@ -150,6 +152,10 @@ private:
 	rpl::event_stream<MuteRequest> _toggleMuteRequests;
 	rpl::variable<int> _fullCount = 1;
 	Ui::BoxPointer _addBox;
+
+	base::flat_map<not_null<UserData*>, crl::time> _repaintByTimer;
+	base::Timer _repaintTimer;
+
 	rpl::lifetime _lifetime;
 
 };
@@ -190,7 +196,7 @@ void Row::resetSpeakingState() {
 
 UpdateLevelResult Row::updateLevel(float level) {
 	if (_level == level) {
-		return UpdateLevelResult::NothingChanged;
+		return UpdateLevelResult{ .nextUpdateTime = _markInactiveAt };
 	}
 	const auto now = crl::now();
 	const auto stillActive = (now < _markInactiveAt);
@@ -206,10 +212,17 @@ UpdateLevelResult Row::updateLevel(float level) {
 	_level = level;
 	const auto changed = wasActive != (nowActive || stillActive);
 	if (!changed) {
-		return UpdateLevelResult::LevelChanged;
+		return UpdateLevelResult{
+			.levelChanged = true,
+			.nextUpdateTime = _markInactiveAt,
+		};
 	}
 	refreshStatus(now);
-	return UpdateLevelResult::StateChanged;
+	return UpdateLevelResult{
+		.levelChanged = true,
+		.stateChanged = true,
+		.nextUpdateTime = _markInactiveAt,
+	};
 }
 
 void Row::paintAction(
@@ -300,7 +313,8 @@ void Row::stopLastActionRipple() {
 
 MembersController::MembersController(not_null<GroupCall*> call)
 : _call(call)
-, _channel(call->channel()) {
+, _channel(call->channel())
+, _repaintTimer([=] { repaintByTimer(); }) {
 	setupListChangeViewers(call);
 }
 
@@ -399,13 +413,43 @@ void MembersController::updateRow(
 
 void MembersController::updateRowLevel(
 		not_null<UserData*> user,
-		float level) const {
+		float level) {
 	if (const auto row = findRow(user)) {
 		const auto result = row->updateLevel(level);
-		if (result == UpdateLevelResult::StateChanged) {
+		if (result.stateChanged) {
 			// #TODO calls reorder.
 		}
-		delegate()->peerListUpdateRow(row);
+		if (result.stateChanged) {
+			delegate()->peerListUpdateRow(row);
+		}
+		if (result.nextUpdateTime) {
+			_repaintByTimer[user] = result.nextUpdateTime;
+			if (!_repaintTimer.isActive()) {
+				_repaintTimer.callOnce(kLevelActiveTimeout);
+			}
+		} else if (_repaintByTimer.remove(user) && _repaintByTimer.empty()) {
+			_repaintTimer.cancel();
+		}
+	}
+}
+
+void MembersController::repaintByTimer() {
+	const auto now = crl::now();
+	auto next = crl::time(0);
+	for (auto i = begin(_repaintByTimer); i != end(_repaintByTimer);) {
+		if (i->second > now) {
+			if (!next || next > i->second) {
+				next = i->second;
+			}
+		} else if (const auto row = findRow(i->first)) {
+			delegate()->peerListUpdateRow(row);
+			i = _repaintByTimer.erase(i);
+			continue;
+		}
+		++i;
+	}
+	if (next) {
+		_repaintTimer.callOnce(next - now);
 	}
 }
 

From 7cfb39ea5dbe1d30b82bbe6120bba514d8ac465c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Nov 2020 15:00:06 +0300
Subject: [PATCH 179/370] Use new button types from lib_ui.

---
 .../Resources/icons/calls/call_settings.png   | Bin 0 -> 345 bytes
 .../icons/calls/call_settings@2x.png          | Bin 0 -> 591 bytes
 .../icons/calls/call_settings@3x.png          | Bin 0 -> 932 bytes
 Telegram/Resources/langs/lang.strings         |   1 +
 Telegram/SourceFiles/calls/calls.style        |  24 +-
 .../SourceFiles/calls/calls_group_panel.cpp   | 300 ++++--------------
 .../SourceFiles/calls/calls_group_panel.h     |  10 +-
 Telegram/SourceFiles/calls/calls_panel.cpp    | 226 +------------
 Telegram/SourceFiles/calls/calls_panel.h      |  12 +-
 Telegram/lib_ui                               |   2 +-
 10 files changed, 102 insertions(+), 473 deletions(-)
 create mode 100644 Telegram/Resources/icons/calls/call_settings.png
 create mode 100644 Telegram/Resources/icons/calls/call_settings@2x.png
 create mode 100644 Telegram/Resources/icons/calls/call_settings@3x.png

diff --git a/Telegram/Resources/icons/calls/call_settings.png b/Telegram/Resources/icons/calls/call_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..f16037f3c3f1d7a366c51d614587e000004ecc8a
GIT binary patch
literal 345
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6-QsS%!O
zzP=1vKsE;hV|yk83y{SK#8N=az`(SC2`(bBfEmFCNgn(gJ{?G%@pN$v@!&lh!pPU6
zz#}a_|9J7k$UTk4ma})PY+mWz*Rr5*>+5SXI##T=&Z#{#!TiC0HI1bL`PoZNE2`P{
z{tpUHn(<jRDkNLgZ&O+J+lDRs*Nbv8g_Jl{d{Erudb;^hN3>PcGNv!a&utFv?3v9n
zqx0z`?<cwnZEIqeOup$@eSD6svuP14qn6u;UgJHk%evEIjDj+?E}VR^{&=V!)0q>G
zwG30<DzVA@t==+ufzT_UN*AcgElt+ziZm~@7{5<qGv>T!{g5TzXu;Z`h|Tk)LH_e}
L^>bP0l+XkK+JScQ

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/calls/call_settings@2x.png b/Telegram/Resources/icons/calls/call_settings@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..21d18e24feb0de00bf81b7ef83f77f873b240942
GIT binary patch
literal 591
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G|u)CkWs
zUtb0-Ae)1Mu|1Q41;}CqVksbIU|?Fn1Q#(_z>HvnB!B$(GXp9<<muuVlEL~mg1e|i
zf#>MGbH87;Ua7v}o_@Je%)`gw+O#tU>(>3;yN9Jr{rR2FuMs~ha-OU|;LfyH+d}I@
zzP7>n&9}eb&At8XPkQ$c!>Zp-AJjP~1^k{LcQBeE;HA<JkNjCR8rPq`H#01}qMRCg
zdeepr&uToXR8H=nu-G6^EJfhw&ZG@jl>3)Y(9dn*x!dfNzE-QjX@8A}_JfPxHwMJm
zuTSP;oVf1NTK2xjKm6{zKOuJV6Sv#!T6f!Hg)sundMCOVBOEWO3iz$KG)GJ!!^^?8
z)qqX;R@Ql=iGoLcx2uI6nH6$UjiIl8?seNsE2nM|vx&KGx^nua&?>g7P5Z?s$?#b6
zv9D41c7ktp!Nb;|{#0#&hM(W$m7j2UN=*)0;L*Qs!Gw^lKjgOi_h??39sf#hMdh@O
zO%vWQJ}P?WWqYX5WO@9@N}GRKlKTt~nsK)L_Q>puW(@XMw9w;9Oa4;3dh?`Ror_;s
z-AfUEaL!3CF>2cX+7oW?xPJ9+4sdTe5u^T{QL0%(R~sm7@%WCN@v;ePPQ1N$%1?3i
zY3uV|C*>TNmOa1XEYrTWZr0a^txZ9H(?lk*CDi7tB)DE!Wv>My|8x50t6$Kv`F8>o
NtDdfYF6*2UngE2g^!xw-

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/calls/call_settings@3x.png b/Telegram/Resources/icons/calls/call_settings@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d86c793a0bfa9cfe8a5a5d6b21c54e3d50003a71
GIT binary patch
literal 932
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Ea{HEjtmSN`?>!lvI6-QsS%!O
zzP=1vKsE;hV|yk83y{SK#8N=az`(SC2`=KXfEmFCNpAj`a+QIBS=`gbF{Fa=?X18e
zCPkjMjr{i<->;tM{C?Ry$M~G2+p@db{x*9@WE?)@7k<FO&WUN|YJo$|a{8Q1@|{)d
z|EWD_XwbA!U}xcINZXD~J=4?8*c;b=_@RK_bZ?9K=g*g~+pJYH>D?<ui~hogR?4=&
znhpz`C^}X%uT-od?7q`WfBV)K9g}0%M$Fx`)LTA8?BEs?c9XN}D;SOjHlMxyYv<j(
z#O=2mSME2<e)iSxO7p$=E-4eq%T5y}ebzGEVD@U|9FzIxX0y+}o+NpF$s9e#S+<|P
zR`K3`D|RX{*HB~WVZNvnS`Nn_Z?tOq{Ws6**~^lk)Bf*DCw<6KR{#6JR$KOh*N^6n
zJm2h}ESdaS>ihYhK7PMea=-qv`2Lmnsr*5U*Ik*|(4oAvX4;L&$d$K}ydvv2&1Pmg
zeM?n=@8aV_?t<NyR24K=J#$$aGeIlg&uR8care-^H8P1?17Gsmp3;`no**4|Kj1*s
z!&A(Y-sRoeeSSZKimb-Yb&gLT&hg>vGUYE~xx1xA@~BT|PmA>e!3iJTMHRZd4*y?R
z@q0nK4acuN_un(83r@Tv^wu|BgmcOZk)Pk<c4sVJb;|Rz;XW5P!_wPnr&q+<EavFQ
z7I%Hxyks}Og#GH9R@EB5YR})P{bCiex^g_c-EyDOG|BywC)Zv1<h(Onek%W@u!L25
zsrxkLO;odAnq3u(uA1cC_r8IlR@lMRxXxk!&9iC^OIA!5HciV8jW{5%)+2A?cZ*k{
zCw_>|{M_;`b%75LgJ?(Nv$ltpkG1yiwpnn@c*1GsEKBChq5zf4XSH<Yb$k~^h|N7_
zZLP4uLCayMr0YGSkB4tMt-ddF>~Y4u*=IFA<<1rJuJPFT>Zoy7!s`k*K?bGCthW1R
zh1z-Sie9<IeeSdqQf`O$?|F8I*LA;xQ2VbRS|9p0C;U(TI{WaQpHJda|19{C6un<N
zB>K(w@PF6U*;%gb=5)|aSD4M9;(Bt926InB*=L}`FDbn*oRXu<eA7i__TD3HOtWqz
twf#CP_O^k+iTz0f1LK7^V#w4VPK(=NDLpg#WPmw^!PC{xWt~$(696yylqvuK

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 9675aa046..5d609b908 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1817,6 +1817,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_settings" = "Settings";
 "lng_group_call_unmute" = "Unmute";
 "lng_group_call_you_are_live" = "You are Live";
+"lng_group_call_force_muted" = "You are muted";
 "lng_group_call_connecting" = "Connecting...";
 "lng_group_call_leave" = "Leave";
 "lng_group_call_leave_title" = "Leave voice chat";
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 8ee01a845..e3ad82bb6 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -120,12 +120,14 @@ callAnswer: CallButton {
 		}
 	}
 	bg: callAnswerBg;
+	bgSize: 44px;
+	bgPosition: point(12px, 12px);
 	angle: 135.;
 	outerRadius: 12px;
 	outerBg: callAnswerBgOuter;
 	label: callButtonLabel;
 }
-callHangup: CallButton {
+callHangup: CallButton(callAnswer) {
 	button: IconButton(callButton) {
 		icon: icon {{ "calls/call_discard", callIconFg }};
 		ripple: RippleAnimation(defaultRippleAnimation) {
@@ -136,7 +138,7 @@ callHangup: CallButton {
 	outerBg: callHangupBg;
 	label: callButtonLabel;
 }
-callCancel: CallButton {
+callCancel: CallButton(callAnswer) {
 	button: IconButton(callButton) {
 		icon: icon {{ "calls/call_cancel", callIconFgActive }};
 		ripple: RippleAnimation(defaultRippleAnimation) {
@@ -147,7 +149,7 @@ callCancel: CallButton {
 	outerBg: callIconBgActive;
 	label: callButtonLabel;
 }
-callMicrophoneMute: CallButton {
+callMicrophoneMute: CallButton(callAnswer) {
 	button: IconButton(callButton) {
 		icon: icon {{ "calls/call_record_active", callIconFg }};
 		ripple: RippleAnimation(defaultRippleAnimation) {
@@ -478,3 +480,19 @@ groupCallMutedButton: IconButton(groupCallInactiveButton) {
 	iconOver: icon {{ "calls/group_calls_muted", groupCallMemberMutedIcon }};
 }
 groupCallMemberButtonSkip: 10px;
+
+groupCallSettings: CallButton(callMicrophoneMute) {
+	button: IconButton(callButton) {
+		iconPosition: point(-1px, 22px);
+		icon: icon {{ "calls/call_settings", callIconFg }};
+		ripple: RippleAnimation(defaultRippleAnimation) {
+			color: callMuteRipple;
+		}
+	}
+	bg: callIconBg;
+	outerBg: callMuteRipple;
+	label: callButtonLabel;
+}
+groupCallButtonSkip: 43px;
+groupCallButtonBottomSkip: 134px;
+groupCallMuteBottomSkip: 149px;
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 910ad48a6..7ac1cb75b 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -10,7 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_group_members.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/window.h"
-#include "ui/effects/ripple_animation.h"
+#include "ui/widgets/call_button.h"
+#include "ui/widgets/call_mute_button.h"
 #include "ui/layers/layer_manager.h"
 #include "boxes/confirm_box.h"
 #include "core/application.h"
@@ -29,191 +30,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Calls {
 
-class GroupPanel::Button final : public Ui::RippleButton {
-public:
-	Button(
-		QWidget *parent,
-		const style::CallButton &stFrom,
-		const style::CallButton *stTo = nullptr);
-
-	void setProgress(float64 progress);
-	void setText(rpl::producer<QString> text);
-
-protected:
-	void paintEvent(QPaintEvent *e) override;
-
-	void onStateChanged(State was, StateChangeSource source) override;
-
-	QImage prepareRippleMask() const override;
-	QPoint prepareRippleStartPosition() const override;
-
-private:
-	QPoint iconPosition(not_null<const style::CallButton*> st) const;
-	void mixIconMasks();
-
-	not_null<const style::CallButton*> _stFrom;
-	const style::CallButton *_stTo = nullptr;
-	float64 _progress = 0.;
-
-	object_ptr<Ui::FlatLabel> _label = { nullptr };
-
-	QImage _bgMask, _bg;
-	QPixmap _bgFrom, _bgTo;
-	QImage _iconMixedMask, _iconFrom, _iconTo, _iconMixed;
-
-};
-
-GroupPanel::Button::Button(
-	QWidget *parent,
-	const style::CallButton &stFrom,
-	const style::CallButton *stTo)
-: Ui::RippleButton(parent, stFrom.button.ripple)
-, _stFrom(&stFrom)
-, _stTo(stTo) {
-	resize(_stFrom->button.width, _stFrom->button.height);
-
-	_bgMask = prepareRippleMask();
-	_bgFrom = App::pixmapFromImageInPlace(style::colorizeImage(_bgMask, _stFrom->bg));
-	if (_stTo) {
-		Assert(_stFrom->button.width == _stTo->button.width);
-		Assert(_stFrom->button.height == _stTo->button.height);
-		Assert(_stFrom->button.rippleAreaPosition == _stTo->button.rippleAreaPosition);
-		Assert(_stFrom->button.rippleAreaSize == _stTo->button.rippleAreaSize);
-
-		_bg = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
-		_bg.setDevicePixelRatio(cRetinaFactor());
-		_bgTo = App::pixmapFromImageInPlace(style::colorizeImage(_bgMask, _stTo->bg));
-		_iconMixedMask = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
-		_iconMixedMask.setDevicePixelRatio(cRetinaFactor());
-		_iconFrom = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
-		_iconFrom.setDevicePixelRatio(cRetinaFactor());
-		_iconFrom.fill(Qt::black);
-		{
-			Painter p(&_iconFrom);
-			p.drawImage((_stFrom->button.rippleAreaSize - _stFrom->button.icon.width()) / 2, (_stFrom->button.rippleAreaSize - _stFrom->button.icon.height()) / 2, _stFrom->button.icon.instance(Qt::white));
-		}
-		_iconTo = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
-		_iconTo.setDevicePixelRatio(cRetinaFactor());
-		_iconTo.fill(Qt::black);
-		{
-			Painter p(&_iconTo);
-			p.drawImage((_stTo->button.rippleAreaSize - _stTo->button.icon.width()) / 2, (_stTo->button.rippleAreaSize - _stTo->button.icon.height()) / 2, _stTo->button.icon.instance(Qt::white));
-		}
-		_iconMixed = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
-		_iconMixed.setDevicePixelRatio(cRetinaFactor());
-	}
-}
-
-void GroupPanel::Button::setText(rpl::producer<QString> text) {
-	_label.create(this, std::move(text), _stFrom->label);
-	_label->show();
-	rpl::combine(
-		sizeValue(),
-		_label->sizeValue()
-	) | rpl::start_with_next([=](QSize my, QSize label) {
-		_label->moveToLeft(
-			(my.width() - label.width()) / 2,
-			my.height() - label.height(),
-			my.width());
-	}, _label->lifetime());
-}
-
-void GroupPanel::Button::setProgress(float64 progress) {
-	_progress = progress;
-	update();
-}
-
-void GroupPanel::Button::paintEvent(QPaintEvent *e) {
-	Painter p(this);
-
-	auto bgPosition = myrtlpoint(_stFrom->button.rippleAreaPosition);
-	auto paintFrom = (_progress == 0.) || !_stTo;
-	auto paintTo = !paintFrom && (_progress == 1.);
-
-	if (paintFrom) {
-		p.drawPixmap(bgPosition, _bgFrom);
-	} else if (paintTo) {
-		p.drawPixmap(bgPosition, _bgTo);
-	} else {
-		style::colorizeImage(_bgMask, anim::color(_stFrom->bg, _stTo->bg, _progress), &_bg);
-		p.drawImage(bgPosition, _bg);
-	}
-
-	auto rippleColorInterpolated = QColor();
-	auto rippleColorOverride = &rippleColorInterpolated;
-	if (paintFrom) {
-		rippleColorOverride = nullptr;
-	} else if (paintTo) {
-		rippleColorOverride = &_stTo->button.ripple.color->c;
-	} else {
-		rippleColorInterpolated = anim::color(_stFrom->button.ripple.color, _stTo->button.ripple.color, _progress);
-	}
-	paintRipple(p, _stFrom->button.rippleAreaPosition.x(), _stFrom->button.rippleAreaPosition.y(), rippleColorOverride);
-
-	auto positionFrom = iconPosition(_stFrom);
-	if (paintFrom) {
-		const auto icon = &_stFrom->button.icon;
-		icon->paint(p, positionFrom, width());
-	} else {
-		auto positionTo = iconPosition(_stTo);
-		if (paintTo) {
-			_stTo->button.icon.paint(p, positionTo, width());
-		} else {
-			mixIconMasks();
-			style::colorizeImage(_iconMixedMask, st::callIconFg->c, &_iconMixed);
-			p.drawImage(myrtlpoint(_stFrom->button.rippleAreaPosition), _iconMixed);
-		}
-	}
-}
-
-QPoint GroupPanel::Button::iconPosition(not_null<const style::CallButton*> st) const {
-	auto result = st->button.iconPosition;
-	if (result.x() < 0) {
-		result.setX((width() - st->button.icon.width()) / 2);
-	}
-	if (result.y() < 0) {
-		result.setY((height() - st->button.icon.height()) / 2);
-	}
-	return result;
-}
-
-void GroupPanel::Button::mixIconMasks() {
-	_iconMixedMask.fill(Qt::black);
-
-	Painter p(&_iconMixedMask);
-	PainterHighQualityEnabler hq(p);
-	auto paintIconMask = [this, &p](const QImage &mask, float64 angle) {
-		auto skipFrom = _stFrom->button.rippleAreaSize / 2;
-		p.translate(skipFrom, skipFrom);
-		p.rotate(angle);
-		p.translate(-skipFrom, -skipFrom);
-		p.drawImage(0, 0, mask);
-	};
-	p.save();
-	paintIconMask(_iconFrom, (_stFrom->angle - _stTo->angle) * _progress);
-	p.restore();
-	p.setOpacity(_progress);
-	paintIconMask(_iconTo, (_stTo->angle - _stFrom->angle) * (1. - _progress));
-}
-
-void GroupPanel::Button::onStateChanged(State was, StateChangeSource source) {
-	RippleButton::onStateChanged(was, source);
-
-	auto over = isOver();
-	auto wasOver = static_cast<bool>(was & StateFlag::Over);
-	if (over != wasOver) {
-		update();
-	}
-}
-
-QPoint GroupPanel::Button::prepareRippleStartPosition() const {
-	return mapFromGlobal(QCursor::pos()) - _stFrom->button.rippleAreaPosition;
-}
-
-QImage GroupPanel::Button::prepareRippleMask() const {
-	return Ui::RippleAnimation::ellipseMask(QSize(_stFrom->button.rippleAreaSize, _stFrom->button.rippleAreaSize));
-}
-
 GroupPanel::GroupPanel(not_null<GroupCall*> call)
 : _call(call)
 , _channel(call->channel())
@@ -225,9 +41,14 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 	st::callTitle))
 #endif // Q_OS_WIN
 , _members(widget(), call)
-, _settings(widget(), st::callCancel)
-, _hangup(widget(), st::callHangup)
-, _mute(widget(), st::callMicrophoneMute, &st::callMicrophoneUnmute) {
+, _settings(widget(), st::groupCallSettings)
+, _mute(std::make_unique<Ui::CallMuteButton>(
+	widget(),
+	Ui::CallMuteButtonState{
+		.text = tr::lng_group_call_connecting(tr::now),
+		.type = Ui::CallMuteButtonType::Connecting,
+	}))
+, _hangup(widget(), st::callHangup) {
 	initWindow();
 	initWidget();
 	initControls();
@@ -297,22 +118,17 @@ void GroupPanel::initWidget() {
 }
 
 void GroupPanel::initControls() {
-	_call->mutedValue(
-	) | rpl::start_with_next([=](MuteState state) {
-		if (state == MuteState::ForceMuted) {
-			_mute->clearState();
-		}
-		_mute->setAttribute(
-			Qt::WA_TransparentForMouseEvents,
-			(state == MuteState::ForceMuted));
-	}, _mute->lifetime());
-	_mute->setClickedCallback([=] {
+	_mute->clicks(
+	) | rpl::filter([=](Qt::MouseButton button) {
+		return (button == Qt::LeftButton);
+	}) | rpl::start_with_next([=] {
 		if (_call && _call->muted() != MuteState::ForceMuted) {
 			_call->setMuted((_call->muted() == MuteState::Active)
 				? MuteState::Muted
 				: MuteState::Active);
 		}
-	});
+	}, _mute->lifetime());
+
 	_hangup->setClickedCallback([=] {
 		_layerBg->showBox(Box<ConfirmBox>(
 			tr::lng_group_call_leave_sure(tr::now),
@@ -321,6 +137,15 @@ void GroupPanel::initControls() {
 	});
 	_settings->setClickedCallback([=] {
 	});
+
+	_settings->setText(tr::lng_menu_settings());
+	_hangup->setText(tr::lng_box_leave());
+
+	_members->desiredHeightValue(
+	) | rpl::start_with_next([=] {
+		updateControlsGeometry();
+	}, _members->lifetime());
+
 	initWithCall(_call);
 }
 
@@ -333,33 +158,44 @@ void GroupPanel::initWithCall(GroupCall *call) {
 
 	_channel = _call->channel();
 
-	_settings->setText(tr::lng_menu_settings());
-	_hangup->setText(tr::lng_box_leave());
-
-	_call->mutedValue(
-	) | rpl::start_with_next([=](MuteState state) {
-		_mute->setProgress((state != MuteState::Active) ? 1. : 0.);
-		_mute->setText((state != MuteState::Active)
-			? tr::lng_call_unmute_audio()
-			: tr::lng_call_mute_audio());
+	call->levelUpdates(
+	) | rpl::filter([=](const LevelUpdate &update) {
+		return update.self;
+	}) | rpl::start_with_next([=](const LevelUpdate &update) {
+		_mute->setLevel(update.value);
 	}, _callLifetime);
 
-	_call->stateValue(
-	) | rpl::start_with_next([=](State state) {
-		stateChanged(state);
-	}, _callLifetime);
-
-	_members->desiredHeightValue(
-	) | rpl::start_with_next([=] {
-		updateControlsGeometry();
-	}, _members->lifetime());
-
 	_members->toggleMuteRequests(
 	) | rpl::start_with_next([=](GroupMembers::MuteRequest request) {
 		if (_call) {
 			_call->toggleMute(request.user, request.mute);
 		}
 	}, _callLifetime);
+
+	using namespace rpl::mappers;
+	rpl::combine(
+		_call->mutedValue(),
+		_call->stateValue() | rpl::map(
+			_1 == State::Creating || _1 == State::Joining
+		)
+	) | rpl::start_with_next([=](MuteState mute, bool connecting) {
+		_mute->setState(Ui::CallMuteButtonState{
+			.text = (connecting
+				? tr::lng_group_call_connecting(tr::now)
+				: mute == MuteState::ForceMuted
+				? tr::lng_group_call_force_muted(tr::now)
+				: mute != MuteState::Active
+				? tr::lng_call_unmute_audio(tr::now)
+				: tr::lng_call_mute_audio(tr::now)),
+			.type = (connecting
+				? Ui::CallMuteButtonType::Connecting
+				: mute == MuteState::ForceMuted
+				? Ui::CallMuteButtonType::ForceMuted
+				: mute == MuteState::Muted
+				? Ui::CallMuteButtonType::Muted
+				: Ui::CallMuteButtonType::Active),
+		});
+	}, _callLifetime);
 }
 
 void GroupPanel::initLayout() {
@@ -424,10 +260,10 @@ void GroupPanel::updateControlsGeometry() {
 		membersWidthAvailable,
 		membersWidthMin,
 		st::groupCallMembersWidthMax);
-	const auto muteTop = widget()->height() - 2 * _mute->height();
-	const auto buttonsTop = muteTop;
+	const auto muteTop = widget()->height() - st::groupCallMuteBottomSkip;
+	const auto buttonsTop = widget()->height() - st::groupCallButtonBottomSkip;
 	const auto membersTop = computeMembersListTop();
-	const auto availableHeight = buttonsTop
+	const auto availableHeight = muteTop
 		- membersTop
 		- st::groupCallMembersMargin.bottom();
 	_members->setGeometry(
@@ -435,9 +271,13 @@ void GroupPanel::updateControlsGeometry() {
 		membersTop,
 		membersWidth,
 		std::min(desiredHeight, availableHeight));
-	_mute->move((widget()->width() - _mute->width()) / 2, muteTop);
-	_settings->moveToLeft(_settings->width(), buttonsTop);
-	_hangup->moveToRight(_settings->width(), buttonsTop);
+	const auto muteSize = _mute->innerSize().width();
+	const auto fullWidth = muteSize
+		+ 2 * _settings->width()
+		+ 2 * st::groupCallButtonSkip;
+	_mute->moveInner({ (widget()->width() - muteSize) / 2, muteTop });
+	_settings->moveToLeft((widget()->width() - fullWidth) / 2, buttonsTop);
+	_hangup->moveToRight((widget()->width() - fullWidth) / 2, buttonsTop);
 	refreshTitle();
 }
 
@@ -495,14 +335,4 @@ not_null<Ui::RpWidget*> GroupPanel::widget() const {
 	return _window->body();
 }
 
-void GroupPanel::stateChanged(State state) {
-	Expects(_call != nullptr);
-
-	if ((state != State::HangingUp)
-		&& (state != State::Ended)
-		&& (state != State::FailedHangingUp)
-		&& (state != State::Failed)) {
-	}
-}
-
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h
index facca9cd4..cda7c2b9a 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/calls_group_panel.h
@@ -22,6 +22,8 @@ class CloudImageView;
 } // namespace Data
 
 namespace Ui {
+class CallButton;
+class CallMuteButton;
 class IconButton;
 class FlatLabel;
 template <typename Widget>
@@ -57,7 +59,6 @@ public:
 	void closeBeforeDestroy();
 
 private:
-	class Button;
 	using State = GroupCall::State;
 
 	[[nodiscard]] not_null<Ui::RpWidget*> widget() const;
@@ -74,7 +75,6 @@ private:
 	bool handleClose();
 
 	void updateControlsGeometry();
-	void stateChanged(State state);
 	void showControls();
 
 	[[nodiscard]] int computeMembersListTop() const;
@@ -96,9 +96,9 @@ private:
 	object_ptr<Ui::FlatLabel> _title = { nullptr };
 	object_ptr<GroupMembers> _members;
 
-	object_ptr<Button> _settings;
-	object_ptr<Button> _hangup;
-	object_ptr<Button> _mute;
+	object_ptr<Ui::CallButton> _settings;
+	std::unique_ptr<Ui::CallMuteButton> _mute;
+	object_ptr<Ui::CallButton> _hangup;
 
 };
 
diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index 217924d13..14ac068f8 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -18,11 +18,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_signal_bars.h"
 #include "calls/calls_userpic.h"
 #include "calls/calls_video_bubble.h"
+#include "ui/widgets/call_button.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/window.h"
-#include "ui/effects/ripple_animation.h"
 #include "ui/image/image.h"
 #include "ui/text/format_values.h"
 #include "ui/wrap/fade_wrap.h"
@@ -170,226 +170,6 @@ void Panel::Incoming::fillBottomShadow(QPainter &p) {
 			factor * fill.height()));
 }
 
-
-class Panel::Button final : public Ui::RippleButton {
-public:
-	Button(
-		QWidget *parent,
-		const style::CallButton &stFrom,
-		const style::CallButton *stTo = nullptr);
-
-	void setProgress(float64 progress);
-	void setOuterValue(float64 value);
-	void setText(rpl::producer<QString> text);
-
-protected:
-	void paintEvent(QPaintEvent *e) override;
-
-	void onStateChanged(State was, StateChangeSource source) override;
-
-	QImage prepareRippleMask() const override;
-	QPoint prepareRippleStartPosition() const override;
-
-private:
-	QPoint iconPosition(not_null<const style::CallButton*> st) const;
-	void mixIconMasks();
-
-	not_null<const style::CallButton*> _stFrom;
-	const style::CallButton *_stTo = nullptr;
-	float64 _progress = 0.;
-
-	object_ptr<Ui::FlatLabel> _label = { nullptr };
-
-	QImage _bgMask, _bg;
-	QPixmap _bgFrom, _bgTo;
-	QImage _iconMixedMask, _iconFrom, _iconTo, _iconMixed;
-
-	float64 _outerValue = 0.;
-	Ui::Animations::Simple _outerAnimation;
-
-};
-
-Panel::Button::Button(
-	QWidget *parent,
-	const style::CallButton &stFrom,
-	const style::CallButton *stTo)
-: Ui::RippleButton(parent, stFrom.button.ripple)
-, _stFrom(&stFrom)
-, _stTo(stTo) {
-	resize(_stFrom->button.width, _stFrom->button.height);
-
-	_bgMask = prepareRippleMask();
-	_bgFrom = App::pixmapFromImageInPlace(style::colorizeImage(_bgMask, _stFrom->bg));
-	if (_stTo) {
-		Assert(_stFrom->button.width == _stTo->button.width);
-		Assert(_stFrom->button.height == _stTo->button.height);
-		Assert(_stFrom->button.rippleAreaPosition == _stTo->button.rippleAreaPosition);
-		Assert(_stFrom->button.rippleAreaSize == _stTo->button.rippleAreaSize);
-
-		_bg = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
-		_bg.setDevicePixelRatio(cRetinaFactor());
-		_bgTo = App::pixmapFromImageInPlace(style::colorizeImage(_bgMask, _stTo->bg));
-		_iconMixedMask = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
-		_iconMixedMask.setDevicePixelRatio(cRetinaFactor());
-		_iconFrom = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
-		_iconFrom.setDevicePixelRatio(cRetinaFactor());
-		_iconFrom.fill(Qt::black);
-		{
-			Painter p(&_iconFrom);
-			p.drawImage((_stFrom->button.rippleAreaSize - _stFrom->button.icon.width()) / 2, (_stFrom->button.rippleAreaSize - _stFrom->button.icon.height()) / 2, _stFrom->button.icon.instance(Qt::white));
-		}
-		_iconTo = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
-		_iconTo.setDevicePixelRatio(cRetinaFactor());
-		_iconTo.fill(Qt::black);
-		{
-			Painter p(&_iconTo);
-			p.drawImage((_stTo->button.rippleAreaSize - _stTo->button.icon.width()) / 2, (_stTo->button.rippleAreaSize - _stTo->button.icon.height()) / 2, _stTo->button.icon.instance(Qt::white));
-		}
-		_iconMixed = QImage(_bgMask.size(), QImage::Format_ARGB32_Premultiplied);
-		_iconMixed.setDevicePixelRatio(cRetinaFactor());
-	}
-}
-
-void Panel::Button::setOuterValue(float64 value) {
-	if (_outerValue != value) {
-		_outerAnimation.start([this] {
-			if (_progress == 0. || _progress == 1.) {
-				update();
-			}
-		}, _outerValue, value, Call::kSoundSampleMs);
-		_outerValue = value;
-	}
-}
-
-void Panel::Button::setText(rpl::producer<QString> text) {
-	_label.create(this, std::move(text), _stFrom->label);
-	_label->show();
-	rpl::combine(
-		sizeValue(),
-		_label->sizeValue()
-	) | rpl::start_with_next([=](QSize my, QSize label) {
-		_label->moveToLeft(
-			(my.width() - label.width()) / 2,
-			my.height() - label.height(),
-			my.width());
-	}, _label->lifetime());
-}
-
-void Panel::Button::setProgress(float64 progress) {
-	_progress = progress;
-	update();
-}
-
-void Panel::Button::paintEvent(QPaintEvent *e) {
-	Painter p(this);
-
-	auto bgPosition = myrtlpoint(_stFrom->button.rippleAreaPosition);
-	auto paintFrom = (_progress == 0.) || !_stTo;
-	auto paintTo = !paintFrom && (_progress == 1.);
-
-	auto outerValue = _outerAnimation.value(_outerValue);
-	if (outerValue > 0.) {
-		auto outerRadius = paintFrom ? _stFrom->outerRadius : paintTo ? _stTo->outerRadius : (_stFrom->outerRadius * (1. - _progress) + _stTo->outerRadius * _progress);
-		auto outerPixels = outerValue * outerRadius;
-		auto outerRect = QRectF(myrtlrect(bgPosition.x(), bgPosition.y(), _stFrom->button.rippleAreaSize, _stFrom->button.rippleAreaSize));
-		outerRect = outerRect.marginsAdded(QMarginsF(outerPixels, outerPixels, outerPixels, outerPixels));
-
-		PainterHighQualityEnabler hq(p);
-		if (paintFrom) {
-			p.setBrush(_stFrom->outerBg);
-		} else if (paintTo) {
-			p.setBrush(_stTo->outerBg);
-		} else {
-			p.setBrush(anim::brush(_stFrom->outerBg, _stTo->outerBg, _progress));
-		}
-		p.setPen(Qt::NoPen);
-		p.drawEllipse(outerRect);
-	}
-
-	if (paintFrom) {
-		p.drawPixmap(bgPosition, _bgFrom);
-	} else if (paintTo) {
-		p.drawPixmap(bgPosition, _bgTo);
-	} else {
-		style::colorizeImage(_bgMask, anim::color(_stFrom->bg, _stTo->bg, _progress), &_bg);
-		p.drawImage(bgPosition, _bg);
-	}
-
-	auto rippleColorInterpolated = QColor();
-	auto rippleColorOverride = &rippleColorInterpolated;
-	if (paintFrom) {
-		rippleColorOverride = nullptr;
-	} else if (paintTo) {
-		rippleColorOverride = &_stTo->button.ripple.color->c;
-	} else {
-		rippleColorInterpolated = anim::color(_stFrom->button.ripple.color, _stTo->button.ripple.color, _progress);
-	}
-	paintRipple(p, _stFrom->button.rippleAreaPosition.x(), _stFrom->button.rippleAreaPosition.y(), rippleColorOverride);
-
-	auto positionFrom = iconPosition(_stFrom);
-	if (paintFrom) {
-		const auto icon = &_stFrom->button.icon;
-		icon->paint(p, positionFrom, width());
-	} else {
-		auto positionTo = iconPosition(_stTo);
-		if (paintTo) {
-			_stTo->button.icon.paint(p, positionTo, width());
-		} else {
-			mixIconMasks();
-			style::colorizeImage(_iconMixedMask, st::callIconFg->c, &_iconMixed);
-			p.drawImage(myrtlpoint(_stFrom->button.rippleAreaPosition), _iconMixed);
-		}
-	}
-}
-
-QPoint Panel::Button::iconPosition(not_null<const style::CallButton*> st) const {
-	auto result = st->button.iconPosition;
-	if (result.x() < 0) {
-		result.setX((width() - st->button.icon.width()) / 2);
-	}
-	if (result.y() < 0) {
-		result.setY((height() - st->button.icon.height()) / 2);
-	}
-	return result;
-}
-
-void Panel::Button::mixIconMasks() {
-	_iconMixedMask.fill(Qt::black);
-
-	Painter p(&_iconMixedMask);
-	PainterHighQualityEnabler hq(p);
-	auto paintIconMask = [this, &p](const QImage &mask, float64 angle) {
-		auto skipFrom = _stFrom->button.rippleAreaSize / 2;
-		p.translate(skipFrom, skipFrom);
-		p.rotate(angle);
-		p.translate(-skipFrom, -skipFrom);
-		p.drawImage(0, 0, mask);
-	};
-	p.save();
-	paintIconMask(_iconFrom, (_stFrom->angle - _stTo->angle) * _progress);
-	p.restore();
-	p.setOpacity(_progress);
-	paintIconMask(_iconTo, (_stTo->angle - _stFrom->angle) * (1. - _progress));
-}
-
-void Panel::Button::onStateChanged(State was, StateChangeSource source) {
-	RippleButton::onStateChanged(was, source);
-
-	auto over = isOver();
-	auto wasOver = static_cast<bool>(was & StateFlag::Over);
-	if (over != wasOver) {
-		update();
-	}
-}
-
-QPoint Panel::Button::prepareRippleStartPosition() const {
-	return mapFromGlobal(QCursor::pos()) - _stFrom->button.rippleAreaPosition;
-}
-
-QImage Panel::Button::prepareRippleMask() const {
-	return Ui::RippleAnimation::ellipseMask(QSize(_stFrom->button.rippleAreaSize, _stFrom->button.rippleAreaSize));
-}
-
 Panel::Panel(not_null<Call*> call)
 : _call(call)
 , _user(call->user())
@@ -402,8 +182,8 @@ Panel::Panel(not_null<Call*> call)
 #endif // Q_OS_WIN
 , _bodySt(&st::callBodyLayout)
 , _answerHangupRedial(widget(), st::callAnswer, &st::callHangup)
-, _decline(widget(), object_ptr<Button>(widget(), st::callHangup))
-, _cancel(widget(), object_ptr<Button>(widget(), st::callCancel))
+, _decline(widget(), object_ptr<Ui::CallButton>(widget(), st::callHangup))
+, _cancel(widget(), object_ptr<Ui::CallButton>(widget(), st::callCancel))
 , _camera(widget(), st::callCameraMute, &st::callCameraUnmute)
 , _mute(widget(), st::callMicrophoneMute, &st::callMicrophoneUnmute)
 , _name(widget(), st::callName)
diff --git a/Telegram/SourceFiles/calls/calls_panel.h b/Telegram/SourceFiles/calls/calls_panel.h
index 99ad93081..3bd6a59c0 100644
--- a/Telegram/SourceFiles/calls/calls_panel.h
+++ b/Telegram/SourceFiles/calls/calls_panel.h
@@ -23,6 +23,7 @@ class CloudImageView;
 
 namespace Ui {
 class IconButton;
+class CallButton;
 class FlatLabel;
 template <typename Widget>
 class FadeWrap;
@@ -56,7 +57,6 @@ public:
 
 private:
 	class Incoming;
-	class Button;
 	using State = Call::State;
 	using Type = Call::Type;
 	enum class AnswerHangupRedialState : uchar {
@@ -115,15 +115,15 @@ private:
 	rpl::lifetime _callLifetime;
 
 	not_null<const style::CallBodyLayout*> _bodySt;
-	object_ptr<Button> _answerHangupRedial;
-	object_ptr<Ui::FadeWrap<Button>> _decline;
-	object_ptr<Ui::FadeWrap<Button>> _cancel;
+	object_ptr<Ui::CallButton> _answerHangupRedial;
+	object_ptr<Ui::FadeWrap<Ui::CallButton>> _decline;
+	object_ptr<Ui::FadeWrap<Ui::CallButton>> _cancel;
 	bool _hangupShown = false;
 	bool _outgoingPreviewInBody = false;
 	std::optional<AnswerHangupRedialState> _answerHangupRedialState;
 	Ui::Animations::Simple _hangupShownProgress;
-	object_ptr<Button> _camera;
-	object_ptr<Button> _mute;
+	object_ptr<Ui::CallButton> _camera;
+	object_ptr<Ui::CallButton> _mute;
 	object_ptr<Ui::FlatLabel> _name;
 	object_ptr<Ui::FlatLabel> _status;
 	object_ptr<Ui::RpWidget> _fingerprint = { nullptr };
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index e73bae12e..962c8d89e 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit e73bae12e26811f70adff5adfafbdb2548e02cd0
+Subproject commit 962c8d89e52a8c92bc7987eba4cfaef77a3a9ebf

From e66a72876c5676709540e318c51e6fd965e95d55 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Nov 2020 15:14:28 +0300
Subject: [PATCH 180/370] Show call button only when you can create voice chat.

---
 .../history/view/history_view_top_bar_widget.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

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 1414db537..983025d41 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -127,12 +127,22 @@ TopBarWidget::TopBarWidget(
 		| UpdateFlag::OnlineStatus
 		| UpdateFlag::Members
 		| UpdateFlag::SupportInfo
+		| UpdateFlag::Rights
 	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
 		if (update.flags & UpdateFlag::HasCalls) {
-			if (update.peer->isUser()) {
+			if (update.peer->isUser()
+				&& (update.peer->isSelf()
+					|| _activeChat.key.peer() == update.peer)) {
 				updateControlsVisibility();
 			}
-		} else {
+		} else if ((update.flags & UpdateFlag::Rights)
+			&& (_activeChat.key.peer() == update.peer)) {
+			updateControlsVisibility();
+		}
+		if (update.flags
+			& (UpdateFlag::OnlineStatus
+				| UpdateFlag::Members
+				| UpdateFlag::SupportInfo)) {
 			updateOnlineDisplay();
 		}
 	}, lifetime());
@@ -694,7 +704,7 @@ void TopBarWidget::updateControlsVisibility() {
 				return session().serverConfig().phoneCallsEnabled.current()
 					&& user->hasCalls();
 			} else if (const auto megagroup = peer->asMegagroup()) {
-				return true;
+				return megagroup->canManageCall();
 			}
 		}
 		return false;

From abb81c764e71820d86e428f334a49cc15b88590d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Nov 2020 17:07:36 +0300
Subject: [PATCH 181/370] Allow discarding group call when leaving.

---
 Telegram/CMakeLists.txt                       |  2 +
 Telegram/Resources/langs/lang.strings         |  1 +
 .../SourceFiles/calls/calls_group_call.cpp    | 47 +++++++++--
 Telegram/SourceFiles/calls/calls_group_call.h |  8 +-
 .../SourceFiles/calls/calls_group_members.cpp |  2 +-
 .../SourceFiles/calls/calls_group_panel.cpp   | 79 ++++++++++++++++---
 .../SourceFiles/calls/calls_group_panel.h     | 15 ++++
 .../calls/calls_group_settings.cpp            | 34 ++++++++
 .../SourceFiles/calls/calls_group_settings.h  | 19 +++++
 Telegram/SourceFiles/calls/calls_top_bar.cpp  |  8 +-
 Telegram/SourceFiles/data/data_group_call.cpp | 17 ++--
 Telegram/SourceFiles/data/data_group_call.h   |  4 -
 Telegram/SourceFiles/mainwidget.cpp           |  2 +-
 Telegram/lib_ui                               |  2 +-
 14 files changed, 204 insertions(+), 36 deletions(-)
 create mode 100644 Telegram/SourceFiles/calls/calls_group_settings.cpp
 create mode 100644 Telegram/SourceFiles/calls/calls_group_settings.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index c64e375c1..e8072cf86 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -270,6 +270,8 @@ PRIVATE
     calls/calls_group_members.h
     calls/calls_group_panel.cpp
     calls/calls_group_panel.h
+    calls/calls_group_settings.cpp
+    calls/calls_group_settings.h
     calls/calls_emoji_fingerprint.cpp
     calls/calls_emoji_fingerprint.h
     calls/calls_instance.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 5d609b908..acb95429d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1824,6 +1824,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_leave_sure" = "Are you sure you want to leave this voice chat?";
 "lng_group_call_also_end" = "End voice chat";
 "lng_group_call_settings_title" = "Settings";
+"lng_group_call_new_muted" = "Mute new members";
 "lng_group_call_speakers" = "Speakers";
 "lng_group_call_microphone" = "Microphone";
 "lng_group_call_share" = "Share Invite Link";
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index f3f35b017..ec6350e40 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -81,7 +81,7 @@ void GroupCall::setState(State state) {
 
 void GroupCall::start() {
 	const auto randomId = rand_value<int32>();
-	_api.request(MTPphone_CreateGroupCall(
+	_createRequestId = _api.request(MTPphone_CreateGroupCall(
 		_channel->inputChannel,
 		MTP_int(randomId)
 	)).done([=](const MTPUpdates &result) {
@@ -155,7 +155,9 @@ void GroupCall::rejoin() {
 				MTP_dataJSON(MTP_bytes(json))
 			)).done([=](const MTPUpdates &updates) {
 				_mySsrc = ssrc;
-				setState(State::Joined);
+				setState(_instanceConnected
+					? State::Joined
+					: State::Connecting);
 				applySelfInCallLocally();
 
 				if (_muted.current() != muted) {
@@ -212,6 +214,24 @@ void GroupCall::hangup() {
 	finish(FinishType::Ended);
 }
 
+void GroupCall::discard() {
+	if (!_id) {
+		_api.request(_createRequestId).cancel();
+		hangup();
+		return;
+	}
+	_api.request(MTPphone_DiscardGroupCall(
+		inputCall()
+	)).done([=](const MTPUpdates &result) {
+		// Here 'this' could be destroyed by updates, so we set Ended after
+		// updates being handled, but in a guarded way.
+		crl::on_main(this, [=] { hangup(); });
+		_channel->session().api().applyUpdates(result);
+	}).fail([=](const RPCError &error) {
+		hangup();
+	}).send();
+}
+
 void GroupCall::finish(FinishType type) {
 	Expects(type != FinishType::None);
 
@@ -330,7 +350,7 @@ void GroupCall::handleUpdate(const MTPGroupCall &call) {
 
 void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
 	const auto state = _state.current();
-	if (state != State::Joined) {
+	if (state != State::Joined && state != State::Connecting) {
 		return;
 	}
 
@@ -368,7 +388,8 @@ void GroupCall::createAndStartController() {
 	tgcalls::GroupInstanceDescriptor descriptor = {
 		.config = tgcalls::GroupConfig{
 		},
-		.networkStateUpdated = [=](bool) {
+		.networkStateUpdated = [=](bool connected) {
+			crl::on_main(weak, [=] { setInstanceConnected(connected); });
 		},
 		.audioLevelsUpdated = [=](const AudioLevels &data) {
 			crl::on_main(weak, [=] { audioLevelsUpdated(data); });
@@ -432,6 +453,18 @@ void GroupCall::audioLevelsUpdated(
 	}
 }
 
+void GroupCall::setInstanceConnected(bool connected) {
+	if (_instanceConnected == connected) {
+		return;
+	}
+	_instanceConnected = connected;
+	if (state() == State::Connecting && connected) {
+		setState(State::Joined);
+	} else if (state() == State::Joined && !connected) {
+		setState(State::Connecting);
+	}
+}
+
 void GroupCall::sendMutedUpdate() {
 	_api.request(_updateMuteRequestId).cancel();
 	_updateMuteRequestId = _api.request(MTPphone_EditGroupCallMember(
@@ -446,7 +479,8 @@ void GroupCall::sendMutedUpdate() {
 	}).fail([=](const RPCError &error) {
 		_updateMuteRequestId = 0;
 		if (error.type() == u"GROUP_CALL_FORBIDDEN"_q
-			&& _state.current() == State::Joined) {
+			&& (_state.current() == State::Joined
+				|| _state.current() == State::Connecting)) {
 			setState(State::Joining);
 			rejoin();
 		}
@@ -475,7 +509,8 @@ void GroupCall::toggleMute(not_null<UserData*> user, bool mute) {
 		_channel->session().api().applyUpdates(result);
 	}).fail([=](const RPCError &error) {
 		if (error.type() == u"GROUP_CALL_FORBIDDEN"_q
-			&& _state.current() == State::Joined) {
+			&& (_state.current() == State::Joined
+				|| _state.current() == State::Connecting)) {
 			setState(State::Joining);
 			rejoin();
 		}
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index f38f216d9..593c15e43 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -57,6 +57,7 @@ public:
 
 	void start();
 	void hangup();
+	void discard();
 	void join(const MTPInputGroupCall &inputCall);
 	void handleUpdate(const MTPGroupCall &call);
 	void handleUpdate(const MTPDupdateGroupCallParticipants &data);
@@ -68,13 +69,11 @@ public:
 	[[nodiscard]] rpl::producer<MuteState> mutedValue() const {
 		return _muted.value();
 	}
-	[[nodiscard]] bool joined() const {
-		return (_state.current() == State::Joined);
-	}
 
 	enum State {
 		Creating,
 		Joining,
+		Connecting,
 		Joined,
 		FailedHangingUp,
 		Failed,
@@ -123,6 +122,7 @@ private:
 	void myLevelUpdated(float level);
 	void audioLevelsUpdated(
 		const std::vector<std::pair<std::uint32_t, float>> &data);
+	void setInstanceConnected(bool connected);
 
 	[[nodiscard]] MTPInputGroupCall inputCall() const;
 
@@ -130,6 +130,7 @@ private:
 	const not_null<ChannelData*> _channel;
 	MTP::Sender _api;
 	rpl::variable<State> _state = State::Creating;
+	bool _instanceConnected = false;
 
 	rpl::variable<MuteState> _muted = MuteState::Muted;
 	bool _acceptFields = false;
@@ -137,6 +138,7 @@ private:
 	uint64 _id = 0;
 	uint64 _accessHash = 0;
 	uint32 _mySsrc = 0;
+	mtpRequestId _createRequestId = 0;
 	mtpRequestId _updateMuteRequestId = 0;
 
 	std::unique_ptr<tgcalls::GroupInstanceImpl> _instance;
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 2550b56cb..fb0cfe011 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Calls {
 namespace {
 
-constexpr auto kLevelThreshold = 0.01;
+constexpr auto kLevelThreshold = 0.2;
 constexpr auto kLevelActiveTimeout = crl::time(1000);
 
 struct UpdateLevelResult {
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 7ac1cb75b..634821b1b 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -8,17 +8,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_group_panel.h"
 
 #include "calls/calls_group_members.h"
+#include "calls/calls_group_settings.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/window.h"
 #include "ui/widgets/call_button.h"
 #include "ui/widgets/call_mute_button.h"
+#include "ui/widgets/checkbox.h"
 #include "ui/layers/layer_manager.h"
-#include "boxes/confirm_box.h"
+#include "ui/layers/generic_box.h"
 #include "core/application.h"
 #include "lang/lang_keys.h"
+#include "data/data_channel.h"
 #include "base/event_filter.h"
 #include "app.h"
 #include "styles/style_calls.h"
+#include "styles/style_layers.h"
 
 #ifdef Q_OS_WIN
 #include "ui/platform/win/ui_window_title_win.h"
@@ -30,6 +34,44 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Calls {
 
+void LeaveGroupCallBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<GroupCall*> call,
+		bool discardChecked,
+		BoxContext context) {
+	box->setTitle(tr::lng_group_call_leave_title());
+	box->addRow(object_ptr<Ui::FlatLabel>(
+		box.get(),
+		tr::lng_group_call_leave_sure(),
+		st::boxLabel));
+	const auto discard = call->channel()->canManageCall()
+		? box->addRow(object_ptr<Ui::Checkbox>(
+			box.get(),
+			tr::lng_group_call_end(),
+			discardChecked,
+			st::defaultBoxCheckbox),
+			style::margins(
+				st::boxRowPadding.left(),
+				st::boxRowPadding.left(),
+				st::boxRowPadding.right(),
+				st::boxRowPadding.bottom()))
+		: nullptr;
+	const auto weak = base::make_weak(call.get());
+	box->addButton(tr::lng_group_call_leave(), [=] {
+		const auto discardCall = (discard && discard->checked());
+		box->closeBox();
+
+		if (!weak) {
+			return;
+		} else if (discardCall) {
+			call->discard();
+		} else {
+			call->hangup();
+		}
+	});
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+}
+
 GroupPanel::GroupPanel(not_null<GroupCall*> call)
 : _call(call)
 , _channel(call->channel())
@@ -96,7 +138,10 @@ void GroupPanel::initWindow() {
 			return Flag::None | Flag(0);
 		}
 #endif // Q_OS_WIN
-		const auto inControls = false;
+		const auto inControls = _settings->geometry().contains(widgetPoint)
+			|| _mute->innerGeometry().contains(widgetPoint)
+			|| _hangup->geometry().contains(widgetPoint)
+			|| _members->geometry().contains(widgetPoint);
 		return inControls
 			? Flag::None
 			: (Flag::Move | Flag::Maximize);
@@ -117,6 +162,21 @@ void GroupPanel::initWidget() {
 	}, widget()->lifetime());
 }
 
+void GroupPanel::copyShareLink() {
+
+}
+
+void GroupPanel::hangup(bool discardCallChecked) {
+	if (!_call) {
+		return;
+	}
+	_layerBg->showBox(Box(
+		LeaveGroupCallBox,
+		_call,
+		discardCallChecked,
+		BoxContext::GroupCallPanel));
+}
+
 void GroupPanel::initControls() {
 	_mute->clicks(
 	) | rpl::filter([=](Qt::MouseButton button) {
@@ -129,13 +189,12 @@ void GroupPanel::initControls() {
 		}
 	}, _mute->lifetime());
 
-	_hangup->setClickedCallback([=] {
-		_layerBg->showBox(Box<ConfirmBox>(
-			tr::lng_group_call_leave_sure(tr::now),
-			tr::lng_group_call_leave(tr::now),
-			[=] { if (_call) _call->hangup(); }));
-	});
+	_hangup->setClickedCallback([=] { hangup(false); });
 	_settings->setClickedCallback([=] {
+		_layerBg->showBox(Box(
+			GroupCallSettingsBox,
+			[=] { copyShareLink(); },
+			[=] { hangup(true); }));
 	});
 
 	_settings->setText(tr::lng_menu_settings());
@@ -176,7 +235,9 @@ void GroupPanel::initWithCall(GroupCall *call) {
 	rpl::combine(
 		_call->mutedValue(),
 		_call->stateValue() | rpl::map(
-			_1 == State::Creating || _1 == State::Joining
+			_1 == State::Creating
+			|| _1 == State::Joining
+			|| _1 == State::Connecting
 		)
 	) | rpl::start_with_next([=](MuteState mute, bool connecting) {
 		_mute->setState(Ui::CallMuteButtonState{
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h
index cda7c2b9a..6270b2454 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/calls_group_panel.h
@@ -32,6 +32,7 @@ template <typename Widget>
 class PaddingWrap;
 class Window;
 class ScrollArea;
+class GenericBox;
 class LayerManager;
 namespace Platform {
 class TitleControls;
@@ -50,6 +51,17 @@ class SignalBars;
 
 class GroupMembers;
 
+enum class BoxContext {
+	GroupCallPanel,
+	MainWindow,
+};
+
+void LeaveGroupCallBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<GroupCall*> call,
+	bool discardChecked,
+	BoxContext context);
+
 class GroupPanel final {
 public:
 	GroupPanel(not_null<GroupCall*> call);
@@ -77,6 +89,9 @@ private:
 	void updateControlsGeometry();
 	void showControls();
 
+	void copyShareLink();
+	void hangup(bool discardCallChecked);
+
 	[[nodiscard]] int computeMembersListTop() const;
 	[[nodiscard]] std::optional<QRect> computeTitleRect() const;
 	void refreshTitle();
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
new file mode 100644
index 000000000..49bf82c94
--- /dev/null
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -0,0 +1,34 @@
+/*
+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 "calls/calls_group_settings.h"
+
+#include "ui/widgets/checkbox.h"
+#include "lang/lang_keys.h"
+#include "styles/style_layers.h"
+
+namespace Calls {
+
+void GroupCallSettingsBox(
+		not_null<Ui::GenericBox*> box,
+		Fn<void()> copyShareLink,
+		Fn<void()> discard) {
+	box->setTitle(tr::lng_group_call_settings_title());
+	//box->addRow(object_ptr<Ui::Checkbox>(
+	//	box.get(),
+	//	tr::lng_group_call_new_muted(),
+	//	newMuted
+	//	))
+	box->addButton(tr::lng_settings_save(), [=] {
+		box->closeBox();
+	});
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+}
+
+} // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.h b/Telegram/SourceFiles/calls/calls_group_settings.h
new file mode 100644
index 000000000..51797cc26
--- /dev/null
+++ b/Telegram/SourceFiles/calls/calls_group_settings.h
@@ -0,0 +1,19 @@
+/*
+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/layers/generic_box.h"
+
+namespace Calls {
+
+void GroupCallSettingsBox(
+	not_null<Ui::GenericBox*> box,
+	Fn<void()> copyShareLink,
+	Fn<void()> discard);
+
+} // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index e06097ced..e129b20b5 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/layers/generic_box.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/text/format_values.h"
 #include "lang/lang_keys.h"
@@ -16,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_call.h"
 #include "calls/calls_instance.h"
 #include "calls/calls_signal_bars.h"
+#include "calls/calls_group_panel.h" // LeaveGroupCallBox.
 #include "data/data_user.h"
 #include "data/data_channel.h"
 #include "data/data_changes.h"
@@ -174,7 +176,11 @@ void TopBar::initControls() {
 		if (const auto call = _call.get()) {
 			call->hangup();
 		} else if (const auto group = _groupCall.get()) {
-			group->hangup();
+			Ui::show(Box(
+				LeaveGroupCallBox,
+				group,
+				false,
+				BoxContext::MainWindow));
 		}
 	});
 	_updateDurationTimer.setCallback([this] { updateDurationText(); });
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index e30fb9458..f39cf67d0 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -86,9 +86,6 @@ void GroupCall::requestParticipants() {
 	}).fail([=](const RPCError &error) {
 		_fullCount = _participants.size();
 		_allReceived = true;
-		_channel->session().changes().peerUpdated(
-			_channel,
-			PeerUpdate::Flag::GroupCall);
 		_participantsRequestId = 0;
 	}).send();
 }
@@ -136,13 +133,13 @@ void GroupCall::applyCall(const MTPGroupCall &call, bool force) {
 		_version = data.vversion().v;
 		_fullCount = data.vparticipants_count().v;
 	}, [&](const MTPDgroupCallDiscarded &data) {
-		const auto changed = (_duration != data.vduration().v)
-			|| !_finished;
-		if (!force && !changed) {
-			return;
-		}
-		_finished = true;
-		_duration = data.vduration().v;
+		const auto id = _id;
+		const auto channel = _channel;
+		crl::on_main(&channel->session(), [=] {
+			if (channel->call() && channel->call()->id() == id) {
+				channel->clearCall();
+			}
+		});
 	});
 }
 
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 4ccda796c..22cfc0865 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -53,8 +53,6 @@ public:
 	[[nodiscard]] rpl::producer<int> fullCountValue() const;
 
 	void reload();
-	[[nodiscard]] bool finished() const;
-	[[nodiscard]] int duration() const;
 
 private:
 	void applyCall(const MTPGroupCall &call, bool force);
@@ -80,8 +78,6 @@ private:
 	rpl::event_stream<ParticipantUpdate> _participantUpdates;
 	rpl::event_stream<> _participantsSliceAdded;
 
-	int _duration = 0;
-	bool _finished = false;
 	bool _allReceived = false;
 
 };
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index c0d7423fc..10820639b 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -976,7 +976,7 @@ void MainWidget::setCurrentGroupCall(Calls::GroupCall *call) {
 		_currentGroupCall->stateValue(
 		) | rpl::start_with_next([=](Calls::GroupCall::State state) {
 			using State = Calls::GroupCall::State;
-			if (state == State::Joined) {
+			if (state == State::Joined || state == State::Connecting) {
 				createCallTopBar();
 			} else {
 				destroyCallTopBar();
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 962c8d89e..41bae1eba 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 962c8d89e52a8c92bc7987eba4cfaef77a3a9ebf
+Subproject commit 41bae1eba67801eb8768887100c17b7e84e7daf7

From 9e5006dd67cc171dd0904f74edf575078bc17edc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Nov 2020 19:18:51 +0300
Subject: [PATCH 182/370] Add group call settings box.

---
 .../SourceFiles/calls/calls_group_call.cpp    |   8 +-
 .../SourceFiles/calls/calls_group_panel.cpp   |   7 +-
 .../calls/calls_group_settings.cpp            | 213 ++++++++++++-
 .../SourceFiles/calls/calls_group_settings.h  |   5 +-
 Telegram/SourceFiles/calls/calls_instance.cpp |  14 +
 Telegram/SourceFiles/calls/calls_instance.h   |   2 +
 Telegram/SourceFiles/data/data_group_call.cpp |  18 +-
 Telegram/SourceFiles/data/data_group_call.h   |   6 +
 Telegram/SourceFiles/mainwidget.cpp           |  14 +-
 .../SourceFiles/settings/settings_calls.cpp   | 286 ++++++------------
 .../SourceFiles/settings/settings_calls.h     |  15 +-
 11 files changed, 369 insertions(+), 219 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index ec6350e40..8ebefbb53 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -38,7 +38,13 @@ GroupCall::GroupCall(
 : _delegate(delegate)
 , _channel(channel)
 , _api(&_channel->session().mtp()) {
-	if (inputCall.c_inputGroupCall().vid().v) {
+	const auto id = inputCall.c_inputGroupCall().vid().v;
+	if (id) {
+		if (const auto call = _channel->call(); call && call->id() == id) {
+			if (!_channel->canManageCall() && call->joinMuted()) {
+				_muted = MuteState::ForceMuted;
+			}
+		}
 		_state = State::Joining;
 		join(inputCall);
 	} else {
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 634821b1b..d5d35d882 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -191,10 +191,9 @@ void GroupPanel::initControls() {
 
 	_hangup->setClickedCallback([=] { hangup(false); });
 	_settings->setClickedCallback([=] {
-		_layerBg->showBox(Box(
-			GroupCallSettingsBox,
-			[=] { copyShareLink(); },
-			[=] { hangup(true); }));
+		if (_call) {
+			_layerBg->showBox(Box(GroupCallSettingsBox, _call));
+		}
 	});
 
 	_settings->setText(tr::lng_menu_settings());
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
index 49bf82c94..58f78d3b2 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -7,26 +7,217 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "calls/calls_group_settings.h"
 
+#include "calls/calls_group_call.h"
+#include "calls/calls_group_panel.h" // LeaveGroupCallBox.
+#include "calls/calls_instance.h"
 #include "ui/widgets/checkbox.h"
+#include "ui/widgets/level_meter.h"
+#include "ui/toast/toast.h"
 #include "lang/lang_keys.h"
+#include "data/data_channel.h"
+#include "data/data_group_call.h"
+#include "core/application.h"
+#include "boxes/single_choice_box.h"
+#include "webrtc/webrtc_audio_input_tester.h"
+#include "webrtc/webrtc_media_devices.h"
+#include "settings/settings_common.h"
+#include "settings/settings_calls.h"
+#include "main/main_session.h"
+#include "apiwrap.h"
 #include "styles/style_layers.h"
+#include "styles/style_calls.h"
+#include "styles/style_settings.h"
+
+#include <QtGui/QGuiApplication>
 
 namespace Calls {
+namespace {
+
+void SaveCallJoinMuted(
+		not_null<ChannelData*> channel,
+		uint64 callId,
+		bool joinMuted) {
+	const auto call = channel->call();
+	if (!call
+		|| call->id() != callId
+		|| !channel->canManageCall()
+		|| !call->canChangeJoinMuted()
+		|| call->joinMuted() == joinMuted) {
+		return;
+	}
+	call->setJoinMutedLocally(joinMuted);
+	channel->session().api().request(MTPphone_ToggleGroupCallSettings(
+		MTP_flags(MTPphone_ToggleGroupCallSettings::Flag::f_join_muted),
+		call->input(),
+		MTP_bool(joinMuted)
+	)).send();
+}
+
+} // namespace
 
 void GroupCallSettingsBox(
 		not_null<Ui::GenericBox*> box,
-		Fn<void()> copyShareLink,
-		Fn<void()> discard) {
-	box->setTitle(tr::lng_group_call_settings_title());
-	//box->addRow(object_ptr<Ui::Checkbox>(
-	//	box.get(),
-	//	tr::lng_group_call_new_muted(),
-	//	newMuted
-	//	))
-	box->addButton(tr::lng_settings_save(), [=] {
-		box->closeBox();
+		not_null<GroupCall*> call) {
+	using namespace Settings;
+
+	const auto weakCall = base::make_weak(call.get());
+	const auto weakBox = Ui::MakeWeak(box);
+
+	struct State {
+		rpl::event_stream<QString> outputNameStream;
+		rpl::event_stream<QString> inputNameStream;
+		std::unique_ptr<Webrtc::AudioInputTester> micTester;
+		Ui::LevelMeter *micTestLevel = nullptr;
+		float micLevel = 0.;
+		Ui::Animations::Simple micLevelAnimation;
+		base::Timer levelUpdateTimer;
+		bool generatingLink = false;
+	};
+	const auto state = box->lifetime().make_state<State>();
+
+	const auto channel = call->channel();
+	const auto real = channel->call();
+	const auto id = call->id();
+	const auto goodReal = (real && real->id() == id);
+
+	const auto layout = box->verticalLayout();
+	const auto &settings = Core::App().settings();
+
+	const auto joinMuted = goodReal ? real->joinMuted() : false;
+	const auto canChangeJoinMuted = (goodReal && real->canChangeJoinMuted());
+	const auto muteJoined = (channel->canManageCall() && canChangeJoinMuted)
+		? box->addRow(object_ptr<Ui::Checkbox>(
+			box.get(),
+			tr::lng_group_call_new_muted(),
+			joinMuted))
+		: nullptr;
+	if (muteJoined) {
+		AddSkip(layout);
+	}
+
+	state->levelUpdateTimer.callEach(kMicTestUpdateInterval);
+	state->micTester = std::make_unique<Webrtc::AudioInputTester>(
+		settings.callInputDeviceId());
+
+	AddButtonWithLabel(
+		layout,
+		tr::lng_group_call_speakers(),
+		rpl::single(
+			CurrentAudioOutputName()
+		) | rpl::then(
+			state->outputNameStream.events()
+		),
+		st::settingsButton
+	)->addClickHandler([=] {
+		box->getDelegate()->show(ChooseAudioInputBox(crl::guard(box, [=](
+				const QString &id,
+				const QString &name) {
+			state->outputNameStream.fire_copy(name);
+		})));
 	});
-	box->addButton(tr::lng_cancel(), [=] {
+
+	AddButtonWithLabel(
+		layout,
+		tr::lng_group_call_microphone(),
+		rpl::single(
+			CurrentAudioInputName()
+		) | rpl::then(
+			state->inputNameStream.events()
+		),
+		st::settingsButton
+	)->addClickHandler([=] {
+		box->getDelegate()->show(ChooseAudioInputBox(crl::guard(box, [=](
+				const QString &id,
+				const QString &name) {
+			state->inputNameStream.fire_copy(name);
+			state->micTester->setDeviceId(id);
+		})));
+	});
+
+	state->micTestLevel = box->addRow(
+		object_ptr<Ui::LevelMeter>(
+			box.get(),
+			st::defaultLevelMeter),
+		st::settingsLevelMeterPadding);
+	state->micTestLevel->resize(QSize(0, st::defaultLevelMeter.height));
+
+	state->levelUpdateTimer.setCallback([=] {
+		const auto was = state->micLevel;
+		state->micLevel = state->micTester->getAndResetLevel();
+		state->micLevelAnimation.start([=] {
+			state->micTestLevel->setValue(
+				state->micLevelAnimation.value(state->micLevel));
+		}, was, state->micLevel, kMicTestAnimationDuration);
+	});
+
+	AddSkip(layout);
+
+	const auto lookupLink = [=] {
+		return channel->hasUsername()
+			? channel->session().createInternalLinkFull(channel->username)
+			: channel->inviteLink();
+	};
+	if (!lookupLink().isEmpty() || channel->canHaveInviteLink()) {
+		const auto copyLink = [=] {
+			const auto link = lookupLink();
+			if (link.isEmpty()) {
+				return false;
+			}
+			QGuiApplication::clipboard()->setText(link);
+			if (weakBox) {
+				Ui::Toast::Show(
+					box->getDelegate()->outerContainer(),
+					tr::lng_create_channel_link_copied(tr::now));
+			}
+			return true;
+		};
+		AddButton(
+			layout,
+			tr::lng_group_call_share(),
+			st::settingsButton
+		)->addClickHandler([=] {
+			if (!copyLink() && !state->generatingLink) {
+				state->generatingLink = true;
+				channel->session().api().request(MTPmessages_ExportChatInvite(
+					channel->input
+				)).done([=](const MTPExportedChatInvite &result) {
+					if (result.type() == mtpc_chatInviteExported) {
+						channel->setInviteLink(
+							qs(result.c_chatInviteExported().vlink()));
+						copyLink();
+					}
+				}).send();
+			}
+		});
+	}
+
+	if (channel->canManageCall()) {
+		AddButton(
+			layout,
+			tr::lng_group_call_end(),
+			st::settingsAttentionButton
+		)->addClickHandler([=] {
+			if (const auto call = weakCall.get()) {
+				box->getDelegate()->show(Box(
+					LeaveGroupCallBox,
+					call,
+					true,
+					BoxContext::GroupCallPanel));
+				box->closeBox();
+			}
+		});
+	}
+
+	box->setTitle(tr::lng_group_call_settings_title());
+	box->boxClosing(
+	) | rpl::start_with_next([=] {
+		if (canChangeJoinMuted
+			&& muteJoined
+			&& muteJoined->checked() != joinMuted) {
+			SaveCallJoinMuted(channel, id, muteJoined->checked());
+		}
+	}, box->lifetime());
+	box->addButton(tr::lng_box_done(), [=] {
 		box->closeBox();
 	});
 }
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.h b/Telegram/SourceFiles/calls/calls_group_settings.h
index 51797cc26..fe7b98fb6 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.h
+++ b/Telegram/SourceFiles/calls/calls_group_settings.h
@@ -11,9 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Calls {
 
+class GroupCall;
+
 void GroupCallSettingsBox(
 	not_null<Ui::GenericBox*> box,
-	Fn<void()> copyShareLink,
-	Fn<void()> discard);
+	not_null<GroupCall*> call);
 
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index af760b9f2..15d9f53f6 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -323,6 +323,20 @@ void Instance::showInfoPanel(not_null<GroupCall*> call) {
 	}
 }
 
+void Instance::setCurrentAudioDevice(bool input, const QString &deviceId) {
+	if (input) {
+		Core::App().settings().setCallInputDeviceId(deviceId);
+	} else {
+		Core::App().settings().setCallOutputDeviceId(deviceId);
+	}
+	Core::App().saveSettingsDelayed();
+	if (const auto call = currentCall()) {
+		call->setCurrentAudioDevice(input, deviceId);
+	} else if (const auto group = currentGroupCall()) {
+		group->setCurrentAudioDevice(input, deviceId);
+	}
+}
+
 bool Instance::isQuitPrevent() {
 	if (!_currentCall || _currentCall->isIncomingWaiting()) {
 		return false;
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index 54f549c45..3705bbcc5 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -55,6 +55,8 @@ public:
 	[[nodiscard]] rpl::producer<GroupCall*> currentGroupCallValue() const;
 	std::shared_ptr<tgcalls::VideoCaptureInterface> getVideoCapture() override;
 
+	void setCurrentAudioDevice(bool input, const QString &deviceId);
+
 	[[nodiscard]] bool isQuitPrevent();
 
 private:
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index f39cf67d0..7d4601e5f 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -123,13 +123,17 @@ void GroupCall::applyUpdate(const MTPGroupCall &update) {
 void GroupCall::applyCall(const MTPGroupCall &call, bool force) {
 	call.match([&](const MTPDgroupCall &data) {
 		const auto changed = (_version != data.vversion().v)
-			|| (_fullCount.current() != data.vparticipants_count().v);
+			|| (_fullCount.current() != data.vparticipants_count().v)
+			|| (_joinMuted != data.is_join_muted())
+			|| (_canChangeJoinMuted != data.is_can_change_join_muted());
 		if (!force && !changed) {
 			return;
 		} else if (!force && _version > data.vversion().v) {
 			reload();
 			return;
 		}
+		_joinMuted = data.is_join_muted();
+		_canChangeJoinMuted = data.is_can_change_join_muted();
 		_version = data.vversion().v;
 		_fullCount = data.vparticipants_count().v;
 	}, [&](const MTPDgroupCallDiscarded &data) {
@@ -275,4 +279,16 @@ void GroupCall::applyUpdateChecked(
 	applyParticipantsSlice(update.vparticipants().v, true);
 }
 
+void GroupCall::setJoinMutedLocally(bool muted) {
+	_joinMuted = muted;
+}
+
+bool GroupCall::joinMuted() const {
+	return _joinMuted;
+}
+
+bool GroupCall::canChangeJoinMuted() const {
+	return _canChangeJoinMuted;
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 22cfc0865..695513b60 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -54,6 +54,10 @@ public:
 
 	void reload();
 
+	void setJoinMutedLocally(bool muted);
+	[[nodiscard]] bool joinMuted() const;
+	[[nodiscard]] bool canChangeJoinMuted() const;
+
 private:
 	void applyCall(const MTPGroupCall &call, bool force);
 	void applyParticipantsSlice(
@@ -78,6 +82,8 @@ private:
 	rpl::event_stream<ParticipantUpdate> _participantUpdates;
 	rpl::event_stream<> _participantsSliceAdded;
 
+	bool _joinMuted = false;
+	bool _canChangeJoinMuted = true;
 	bool _allReceived = false;
 
 };
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 10820639b..addf7088f 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -952,13 +952,14 @@ void MainWidget::setCurrentCall(Calls::Call *call) {
 	_currentCallLifetime.destroy();
 	_currentCall = call;
 	if (_currentCall) {
+		_callTopBar.destroy();
 		_currentCall->stateValue(
 		) | rpl::start_with_next([=](Calls::Call::State state) {
 			using State = Calls::Call::State;
-			if (state == State::Established) {
-				createCallTopBar();
-			} else {
+			if (state != State::Established) {
 				destroyCallTopBar();
+			} else if (!_callTopBar) {
+				createCallTopBar();
 			}
 		}, _currentCallLifetime);
 	} else {
@@ -973,13 +974,14 @@ void MainWidget::setCurrentGroupCall(Calls::GroupCall *call) {
 	_currentCallLifetime.destroy();
 	_currentGroupCall = call;
 	if (_currentGroupCall) {
+		_callTopBar.destroy();
 		_currentGroupCall->stateValue(
 		) | rpl::start_with_next([=](Calls::GroupCall::State state) {
 			using State = Calls::GroupCall::State;
-			if (state == State::Joined || state == State::Connecting) {
-				createCallTopBar();
-			} else {
+			if (state != State::Joined && state != State::Connecting) {
 				destroyCallTopBar();
+			} else if (!_callTopBar) {
+				createCallTopBar();
 			}
 		}, _currentCallLifetime);
 	} else {
diff --git a/Telegram/SourceFiles/settings/settings_calls.cpp b/Telegram/SourceFiles/settings/settings_calls.cpp
index 7a8e7d3d2..06dce8a62 100644
--- a/Telegram/SourceFiles/settings/settings_calls.cpp
+++ b/Telegram/SourceFiles/settings/settings_calls.cpp
@@ -35,12 +35,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 
 namespace Settings {
-namespace {
-
-constexpr auto kMicTestUpdateInterval = crl::time(100);
-constexpr auto kMicTestAnimationDuration = crl::time(200);
-
-} // namespace
 
 Calls::Calls(
 	QWidget *parent,
@@ -51,11 +45,7 @@ Calls::Calls(
 	requestPermissionAndStartTestingMicrophone();
 }
 
-Calls::~Calls() {
-	if (_needWriteSettings) {
-		Core::App().saveSettingsDelayed();
-	}
-}
+Calls::~Calls() = default;
 
 void Calls::sectionSaveChanges(FnMut<void()> done) {
 	if (_micTester) {
@@ -66,37 +56,8 @@ void Calls::sectionSaveChanges(FnMut<void()> done) {
 
 void Calls::setupContent() {
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-	const auto getId = [](const auto &device) {
-		return device.id;
-	};
-	const auto getName = [](const auto &device) {
-		return device.name;
-	};
 
 	const auto &settings = Core::App().settings();
-
-	const auto currentOutputName = [&] {
-		const auto list = Webrtc::GetAudioOutputList();
-		const auto i = ranges::find(
-			list,
-			settings.callOutputDeviceId(),
-			getId);
-		return (i != end(list))
-			? getName(*i)
-			: tr::lng_settings_call_device_default(tr::now);
-	}();
-
-	const auto currentInputName = [&] {
-		const auto list = Webrtc::GetAudioInputList();
-		const auto i = ranges::find(
-			list,
-			settings.callInputDeviceId(),
-			getId);
-		return (i != end(list))
-			? getName(*i)
-			: tr::lng_settings_call_device_default(tr::now);
-	}();
-
 	const auto cameras = Webrtc::GetVideoInputList();
 	if (!cameras.empty()) {
 		const auto hasCall = (Core::App().calls().currentCall() != nullptr);
@@ -114,9 +75,9 @@ void Calls::setupContent() {
 			const auto i = ranges::find(
 				cameras,
 				settings.callVideoInputDeviceId(),
-				getId);
+				&Webrtc::VideoInput::id);
 			return (i != end(cameras))
-				? getName(*i)
+				? i->name
 				: tr::lng_settings_call_device_default(tr::now);
 		}();
 
@@ -135,12 +96,12 @@ void Calls::setupContent() {
 			const auto &devices = Webrtc::GetVideoInputList();
 			const auto options = ranges::view::concat(
 				ranges::view::single(tr::lng_settings_call_device_default(tr::now)),
-				devices | ranges::view::transform(getName)
+				devices | ranges::view::transform(&Webrtc::VideoInput::name)
 			) | ranges::to_vector;
 			const auto i = ranges::find(
 				devices,
 				Core::App().settings().callVideoInputDeviceId(),
-				getId);
+				&Webrtc::VideoInput::id);
 			const auto currentOption = (i != end(devices))
 				? int(i - begin(devices) + 1)
 				: 0;
@@ -216,73 +177,19 @@ void Calls::setupContent() {
 		content,
 		tr::lng_settings_call_output_device(),
 		rpl::single(
-			currentOutputName
+			CurrentAudioOutputName()
 		) | rpl::then(
 			_outputNameStream.events()
 		),
 		st::settingsButton
 	)->addClickHandler([=] {
-		const auto &devices = Webrtc::GetAudioOutputList();
-		const auto options = ranges::view::concat(
-			ranges::view::single(tr::lng_settings_call_device_default(tr::now)),
-			devices | ranges::view::transform(getName)
-		) | ranges::to_vector;
-		const auto i = ranges::find(
-			devices,
-			Core::App().settings().callOutputDeviceId(),
-			getId);
-		const auto currentOption = (i != end(devices))
-			? int(i - begin(devices) + 1)
-			: 0;
-		const auto save = crl::guard(this, [=](int option) {
-			_outputNameStream.fire_copy(options[option]);
-			const auto deviceId = option
-				? devices[option - 1].id
-				: "default";
-			Core::App().settings().setCallOutputDeviceId(deviceId);
-			Core::App().saveSettingsDelayed();
-			if (const auto call = Core::App().calls().currentCall()) {
-				call->setCurrentAudioDevice(false, deviceId);
-			}
-		});
-		Ui::show(Box<SingleChoiceBox>(
-			tr::lng_settings_call_output_device(),
-			options,
-			currentOption,
-			save));
+		Ui::show(ChooseAudioOutputBox(crl::guard(this, [=](
+				const QString &id,
+				const QString &name) {
+			_outputNameStream.fire_copy(name);
+		})));
 	});
 
-	//const auto outputLabel = content->add(
-	//	object_ptr<Ui::LabelSimple>(
-	//		content,
-	//		st::settingsAudioVolumeLabel),
-	//	st::settingsAudioVolumeLabelPadding);
-	//const auto outputSlider = content->add(
-	//	object_ptr<Ui::MediaSlider>(
-	//		content,
-	//		st::settingsAudioVolumeSlider),
-	//	st::settingsAudioVolumeSliderPadding);
-	//const auto updateOutputLabel = [=](int value) {
-	//	const auto percent = QString::number(value);
-	//	outputLabel->setText(
-	//		tr::lng_settings_call_output_volume(tr::now, lt_percent, percent));
-	//};
-	//const auto updateOutputVolume = [=](int value) {
-	//	_needWriteSettings = true;
-	//	updateOutputLabel(value);
-	//	Core::App().settings().setCallOutputVolume(value);
-	//	if (const auto call = Core::App().calls().currentCall()) {
-	//		call->setAudioVolume(false, value / 100.0f);
-	//	}
-	//};
-	//outputSlider->resize(st::settingsAudioVolumeSlider.seekSize);
-	//outputSlider->setPseudoDiscrete(
-	//	101,
-	//	[](int val) { return val; },
-	//	settings.callOutputVolume(),
-	//	updateOutputVolume);
-	//updateOutputLabel(Core::App().settings().callOutputVolume());
-
 	AddSkip(content);
 	AddDivider(content);
 	AddSkip(content);
@@ -291,91 +198,22 @@ void Calls::setupContent() {
 		content,
 		tr::lng_settings_call_input_device(),
 		rpl::single(
-			currentInputName
+			CurrentAudioInputName()
 		) | rpl::then(
 			_inputNameStream.events()
 		),
 		st::settingsButton
 	)->addClickHandler([=] {
-		const auto devices = Webrtc::GetAudioInputList();
-		const auto options = ranges::view::concat(
-			ranges::view::single(tr::lng_settings_call_device_default(tr::now)),
-			devices | ranges::view::transform(getName)
-		) | ranges::to_vector;
-		const auto i = ranges::find(
-			devices,
-			Core::App().settings().callInputDeviceId(),
-			getId);
-		const auto currentOption = (i != end(devices))
-			? int(i - begin(devices) + 1)
-			: 0;
-		const auto save = crl::guard(this, [=](int option) {
-			_inputNameStream.fire_copy(options[option]);
-			const auto deviceId = option
-				? devices[option - 1].id
-				: "default";
-			Core::App().settings().setCallInputDeviceId(deviceId);
-			Core::App().saveSettingsDelayed();
+		Ui::show(ChooseAudioOutputBox(crl::guard(this, [=](
+				const QString &id,
+				const QString &name) {
+			_inputNameStream.fire_copy(name);
 			if (_micTester) {
-				_micTester->setDeviceId(deviceId);
+				_micTester->setDeviceId(id);
 			}
-			if (const auto call = Core::App().calls().currentCall()) {
-				call->setCurrentAudioDevice(true, deviceId);
-			}
-		});
-		Ui::show(Box<SingleChoiceBox>(
-			tr::lng_settings_call_input_device(),
-			options,
-			currentOption,
-			save));
+		})));
 	});
 
-	//const auto inputLabel = content->add(
-	//	object_ptr<Ui::LabelSimple>(
-	//		content,
-	//		st::settingsAudioVolumeLabel),
-	//	st::settingsAudioVolumeLabelPadding);
-	//const auto inputSlider = content->add(
-	//	object_ptr<Ui::MediaSlider>(
-	//		content,
-	//		st::settingsAudioVolumeSlider),
-	//	st::settingsAudioVolumeSliderPadding);
-	//const auto updateInputLabel = [=](int value) {
-	//	const auto percent = QString::number(value);
-	//	inputLabel->setText(
-	//		tr::lng_settings_call_input_volume(tr::now, lt_percent, percent));
-	//};
-	//const auto updateInputVolume = [=](int value) {
-	//	_needWriteSettings = true;
-	//	updateInputLabel(value);
-	//	Core::App().settings().setCallInputVolume(value);
-	//	if (const auto call = Core::App().calls().currentCall()) {
-	//		call->setAudioVolume(true, value / 100.0f);
-	//	}
-	//};
-	//inputSlider->resize(st::settingsAudioVolumeSlider.seekSize);
-	//inputSlider->setPseudoDiscrete(101,
-	//	[](int val) { return val; },
-	//	settings.callInputVolume(),
-	//	updateInputVolume);
-	//updateInputLabel(settings.callInputVolume());
-
-	//AddButton(
-	//	content,
-	//	rpl::single(
-	//		tr::lng_settings_call_test_mic(tr::now)
-	//	) | rpl::then(
-	//		_micTestTextStream.events()
-	//	),
-	//	st::settingsButton
-	//)->addClickHandler([=] {
-	//	if (!_micTester) {
-	//		requestPermissionAndStartTestingMicrophone();
-	//	} else {
-	//		stopTestingMicrophone();
-	//	}
-	//});
-
 	_micTestLevel = content->add(
 		object_ptr<Ui::LevelMeter>(
 			content,
@@ -461,22 +299,88 @@ void Calls::requestPermissionAndStartTestingMicrophone() {
 }
 
 void Calls::startTestingMicrophone() {
-	//_micTestTextStream.fire(tr::lng_settings_call_stop_mic_test(tr::now));
 	_levelUpdateTimer.callEach(kMicTestUpdateInterval);
 	_micTester = std::make_unique<Webrtc::AudioInputTester>(
 		Core::App().settings().callInputDeviceId());
-	//if (_micTester->Failed()) {
-	//	stopTestingMicrophone();
-	//	Ui::show(Box<InformBox>(tr::lng_call_error_audio_io(tr::now)));
-	//}
 }
 
-//void Calls::stopTestingMicrophone() {
-//	_micTestTextStream.fire(tr::lng_settings_call_test_mic(tr::now));
-//	_levelUpdateTimer.cancel();
-//	_micTester.reset();
-//	_micTestLevel->setValue(0.0f);
-//}
+QString CurrentAudioOutputName() {
+	const auto list = Webrtc::GetAudioOutputList();
+	const auto i = ranges::find(
+		list,
+		Core::App().settings().callOutputDeviceId(),
+		&Webrtc::AudioOutput::id);
+	return (i != end(list))
+		? i->name
+		: tr::lng_settings_call_device_default(tr::now);
+}
+
+QString CurrentAudioInputName() {
+	const auto list = Webrtc::GetAudioInputList();
+	const auto i = ranges::find(
+		list,
+		Core::App().settings().callInputDeviceId(),
+		&Webrtc::AudioInput::id);
+	return (i != end(list))
+		? i->name
+		: tr::lng_settings_call_device_default(tr::now);
+}
+
+object_ptr<SingleChoiceBox> ChooseAudioOutputBox(
+		Fn<void(QString id, QString name)> chosen) {
+	const auto &devices = Webrtc::GetAudioOutputList();
+	const auto options = ranges::view::concat(
+		ranges::view::single(tr::lng_settings_call_device_default(tr::now)),
+		devices | ranges::view::transform(&Webrtc::AudioOutput::name)
+	) | ranges::to_vector;
+	const auto i = ranges::find(
+		devices,
+		Core::App().settings().callOutputDeviceId(),
+		&Webrtc::AudioOutput::id);
+	const auto currentOption = (i != end(devices))
+		? int(i - begin(devices) + 1)
+		: 0;
+	const auto save = [=](int option) {
+		const auto deviceId = option
+			? devices[option - 1].id
+			: "default";
+		Core::App().calls().setCurrentAudioDevice(false, deviceId);
+		chosen(deviceId, options[option]);
+	};
+	return Box<SingleChoiceBox>(
+		tr::lng_settings_call_output_device(),
+		options,
+		currentOption,
+		save);
+}
+
+object_ptr<SingleChoiceBox> ChooseAudioInputBox(
+		Fn<void(QString id, QString name)> chosen) {
+	const auto devices = Webrtc::GetAudioInputList();
+	const auto options = ranges::view::concat(
+		ranges::view::single(tr::lng_settings_call_device_default(tr::now)),
+		devices | ranges::view::transform(&Webrtc::AudioInput::name)
+	) | ranges::to_vector;
+	const auto i = ranges::find(
+		devices,
+		Core::App().settings().callInputDeviceId(),
+		&Webrtc::AudioInput::id);
+	const auto currentOption = (i != end(devices))
+		? int(i - begin(devices) + 1)
+		: 0;
+	const auto save = [=](int option) {
+		const auto deviceId = option
+			? devices[option - 1].id
+			: "default";
+		Core::App().calls().setCurrentAudioDevice(true, deviceId);
+		chosen(deviceId, options[option]);
+	};
+	return Box<SingleChoiceBox>(
+		tr::lng_settings_call_input_device(),
+		options,
+		currentOption,
+		save);
+}
 
 } // namespace Settings
 
diff --git a/Telegram/SourceFiles/settings/settings_calls.h b/Telegram/SourceFiles/settings/settings_calls.h
index fdb5949d6..73c8cf9c1 100644
--- a/Telegram/SourceFiles/settings/settings_calls.h
+++ b/Telegram/SourceFiles/settings/settings_calls.h
@@ -23,6 +23,8 @@ namespace Webrtc {
 class AudioInputTester;
 } // namespace Webrtc
 
+class SingleChoiceBox;
+
 namespace Settings {
 
 class Calls : public Section {
@@ -36,14 +38,11 @@ private:
 	void setupContent();
 	void requestPermissionAndStartTestingMicrophone();
 	void startTestingMicrophone();
-	//void stopTestingMicrophone();
 
 	const not_null<Window::SessionController*> _controller;
 	rpl::event_stream<QString> _cameraNameStream;
 	rpl::event_stream<QString> _outputNameStream;
 	rpl::event_stream<QString> _inputNameStream;
-	//rpl::event_stream<QString> _micTestTextStream;
-	bool _needWriteSettings = false;
 	std::unique_ptr<Webrtc::AudioInputTester> _micTester;
 	Ui::LevelMeter *_micTestLevel = nullptr;
 	float _micLevel = 0.;
@@ -52,5 +51,15 @@ private:
 
 };
 
+inline constexpr auto kMicTestUpdateInterval = crl::time(100);
+inline constexpr auto kMicTestAnimationDuration = crl::time(200);
+
+[[nodiscard]] QString CurrentAudioOutputName();
+[[nodiscard]] QString CurrentAudioInputName();
+[[nodiscard]] object_ptr<SingleChoiceBox> ChooseAudioOutputBox(
+	Fn<void(QString id, QString name)> chosen);
+[[nodiscard]] object_ptr<SingleChoiceBox> ChooseAudioInputBox(
+	Fn<void(QString id, QString name)> chosen);
+
 } // namespace Settings
 

From 3a5b625d64dc99375854b2b1aa5c64ec75844296 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Nov 2020 21:17:13 +0300
Subject: [PATCH 183/370] Allow inviting members to the group call.

---
 Telegram/Resources/langs/lang.strings         |  10 +
 .../boxes/peers/edit_participants_box.cpp     |  49 +++--
 .../boxes/peers/edit_participants_box.h       |  14 +-
 Telegram/SourceFiles/calls/calls.style        |   2 +-
 .../SourceFiles/calls/calls_group_call.cpp    |  59 +++++
 Telegram/SourceFiles/calls/calls_group_call.h |   2 +
 .../SourceFiles/calls/calls_group_members.cpp |  27 +--
 .../SourceFiles/calls/calls_group_members.h   |   7 +-
 .../SourceFiles/calls/calls_group_panel.cpp   | 204 +++++++++++++++++-
 .../SourceFiles/calls/calls_group_panel.h     |   2 +-
 Telegram/SourceFiles/data/data_group_call.cpp |   5 +-
 Telegram/SourceFiles/data/data_session.cpp    |  36 ++++
 Telegram/SourceFiles/data/data_session.h      |   9 +
 .../export/data/export_data_types.cpp         |  13 +-
 .../export/data/export_data_types.h           |  12 +-
 .../export/output/export_output_html.cpp      |  16 +-
 .../export/output/export_output_json.cpp      |  10 +
 .../SourceFiles/history/history_service.cpp   |  49 ++++-
 18 files changed, 478 insertions(+), 48 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index acb95429d..339f79bbb 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1062,6 +1062,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_duration_minsec_seconds#other" = "{count} sec";
 "lng_duration_minutes_seconds" = "{minutes_count} {seconds_count}";
 
+"lng_action_invite_user" = "{from} invited {user} to the voice chat";
+"lng_action_invite_users_many" = "{from} invited {users} to the voice chat";
+"lng_action_invite_users_and_one" = "{accumulated}, {user}";
+"lng_action_invite_users_and_last" = "{accumulated} and {user}";
+"lng_action_group_call" = "Group call";
 "lng_action_add_user" = "{from} added {user}";
 "lng_action_add_users_many" = "{from} added {users}";
 "lng_action_add_users_and_one" = "{accumulated}, {user}";
@@ -1824,12 +1829,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_leave_sure" = "Are you sure you want to leave this voice chat?";
 "lng_group_call_also_end" = "End voice chat";
 "lng_group_call_settings_title" = "Settings";
+"lng_group_call_invite_title" = "Invite members";
+"lng_group_call_invite_button" = "Invite";
 "lng_group_call_new_muted" = "Mute new members";
 "lng_group_call_speakers" = "Speakers";
 "lng_group_call_microphone" = "Microphone";
 "lng_group_call_share" = "Share Invite Link";
 "lng_group_call_end" = "End Voice Chat";
 "lng_group_call_join" = "Join";
+"lng_group_call_invite_done_user" = "You invited {user} to the voice chat.";
+"lng_group_call_invite_done_many#one" = "You invited **{count} member** to the voice chat.";
+"lng_group_call_invite_done_many#other" = "You invited **{count} members** to the voice chat.";
 
 "lng_no_mic_permission" = "Telegram needs access to your microphone so that you can make calls and record voice messages.";
 
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index 3cc3aca22..0d866296f 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -758,6 +758,14 @@ ParticipantsBoxController::ParticipantsBoxController(
 	not_null<Window::SessionNavigation*> navigation,
 	not_null<PeerData*> peer,
 	Role role)
+: ParticipantsBoxController(CreateTag(), navigation, peer, role) {
+}
+
+ParticipantsBoxController::ParticipantsBoxController(
+	CreateTag,
+	Window::SessionNavigation *navigation,
+	not_null<PeerData*> peer,
+	Role role)
 : PeerListController(CreateSearchController(peer, role, &_additional))
 , _navigation(navigation)
 , _peer(peer)
@@ -795,8 +803,8 @@ void ParticipantsBoxController::setupListChangeViewers() {
 			delegate()->peerListPartitionRows([&](const PeerListRow &row) {
 				return (row.peer() == user);
 			});
-		} else {
-			delegate()->peerListPrependRow(createRow(user));
+		} else if (auto row = createRow(user)) {
+			delegate()->peerListPrependRow(std::move(row));
 			delegate()->peerListRefreshRows();
 			if (_onlineSorter) {
 				_onlineSorter->sort();
@@ -929,6 +937,8 @@ void ParticipantsBoxController::addNewItem() {
 }
 
 void ParticipantsBoxController::addNewParticipants() {
+	Expects(_navigation != nullptr);
+
 	const auto chat = _peer->asChat();
 	const auto channel = _peer->asChannel();
 	if (chat) {
@@ -1386,6 +1396,7 @@ void ParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {
 		&& (_peer->isChat() || _peer->isMegagroup())) {
 		showRestricted(user);
 	} else {
+		Assert(_navigation != nullptr);
 		_navigation->showPeerInfo(user);
 	}
 }
@@ -1413,9 +1424,11 @@ base::unique_qptr<Ui::PopupMenu> ParticipantsBoxController::rowContextMenu(
 	const auto channel = _peer->asChannel();
 	const auto user = row->peer()->asUser();
 	auto result = base::make_unique_q<Ui::PopupMenu>(parent);
-	result->addAction(
-		tr::lng_context_view_profile(tr::now),
-		crl::guard(this, [=] { _navigation->showPeerInfo(user); }));
+	if (_navigation) {
+		result->addAction(
+			tr::lng_context_view_profile(tr::now),
+			crl::guard(this, [=] { _navigation->showPeerInfo(user); }));
+	}
 	if (_role == Role::Kicked) {
 		if (_peer->isMegagroup()
 			&& _additional.canRestrictUser(user)) {
@@ -1735,16 +1748,18 @@ bool ParticipantsBoxController::appendRow(not_null<UserData*> user) {
 	if (delegate()->peerListFindRow(user->id)) {
 		recomputeTypeFor(user);
 		return false;
+	} else if (auto row = createRow(user)) {
+		delegate()->peerListAppendRow(std::move(row));
+		if (_role != Role::Kicked) {
+			setDescriptionText(QString());
+		}
+		return true;
 	}
-	delegate()->peerListAppendRow(createRow(user));
-	if (_role != Role::Kicked) {
-		setDescriptionText(QString());
-	}
-	return true;
+	return false;
 }
 
 bool ParticipantsBoxController::prependRow(not_null<UserData*> user) {
-	if (auto row = delegate()->peerListFindRow(user->id)) {
+	if (const auto row = delegate()->peerListFindRow(user->id)) {
 		recomputeTypeFor(user);
 		refreshCustomStatus(row);
 		if (_role == Role::Admins) {
@@ -1752,12 +1767,14 @@ bool ParticipantsBoxController::prependRow(not_null<UserData*> user) {
 			delegate()->peerListPrependRowFromSearchResult(row);
 		}
 		return false;
+	} else if (auto row = createRow(user)) {
+		delegate()->peerListPrependRow(std::move(row));
+		if (_role != Role::Kicked) {
+			setDescriptionText(QString());
+		}
+		return true;
 	}
-	delegate()->peerListPrependRow(createRow(user));
-	if (_role != Role::Kicked) {
-		setDescriptionText(QString());
-	}
-	return true;
+	return false;
 }
 
 bool ParticipantsBoxController::removeRow(not_null<UserData*> user) {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
index 0c3264b35..dfcb1ae6d 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
@@ -170,6 +170,16 @@ public:
 	rpl::producer<int> onlineCountValue() const override;
 
 protected:
+	// Allow child controllers not providing navigation.
+	// This is their responsibility to override all methods that use it.
+	struct CreateTag {
+	};
+	ParticipantsBoxController(
+		CreateTag,
+		Window::SessionNavigation *navigation,
+		not_null<PeerData*> peer,
+		Role role);
+
 	virtual std::unique_ptr<PeerListRow> createRow(
 		not_null<UserData*> user) const;
 
@@ -236,7 +246,9 @@ private:
 	void subscribeToCreatorChange(not_null<ChannelData*> channel);
 	void fullListRefresh();
 
-	not_null<Window::SessionNavigation*> _navigation;
+	// It may be nullptr in subclasses of this controller.
+	Window::SessionNavigation *_navigation = nullptr;
+
 	not_null<PeerData*> _peer;
 	MTP::Sender _api;
 	Role _role = Role::Admins;
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index e3ad82bb6..afb4668f8 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -425,7 +425,7 @@ groupCallMembersList: PeerList(defaultPeerList) {
 		height: 52px;
 		photoPosition: point(12px, 6px);
 		namePosition: point(68px, 7px);
-		statusPosition: point(68px, 27px);
+		statusPosition: point(68px, 26px);
 		photoSize: 40px;
 		nameFg: groupCallMembersFg;
 		nameFgChecked: groupCallMembersFg;
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 8ebefbb53..0952f814b 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_channel.h"
 #include "data/data_group_call.h"
+#include "data/data_session.h"
 
 #include <tgcalls/group/GroupInstanceImpl.h>
 
@@ -30,6 +31,11 @@ class GroupInstanceImpl;
 } // namespace tgcalls
 
 namespace Calls {
+namespace {
+
+constexpr auto kMaxInvitePerSlice = 10;
+
+} // namespace
 
 GroupCall::GroupCall(
 	not_null<Delegate*> delegate,
@@ -505,6 +511,9 @@ void GroupCall::setCurrentAudioDevice(bool input, const QString &deviceId) {
 }
 
 void GroupCall::toggleMute(not_null<UserData*> user, bool mute) {
+	if (!_id) {
+		return;
+	}
 	_api.request(MTPphone_EditGroupCallMember(
 		MTP_flags(mute
 			? MTPphone_EditGroupCallMember::Flag::f_muted
@@ -523,6 +532,56 @@ void GroupCall::toggleMute(not_null<UserData*> user, bool mute) {
 	}).send();
 }
 
+std::variant<int, not_null<UserData*>> GroupCall::inviteUsers(
+		const std::vector<not_null<UserData*>> &users) {
+	const auto real = _channel->call();
+	if (!real || real->id() != _id) {
+		return 0;
+	}
+	const auto owner = &_channel->owner();
+	const auto &invited = owner->invitedToCallUsers(_id);
+	const auto &participants = real->participants();
+	auto &&toInvite = users | ranges::view::filter([&](
+			not_null<UserData*> user) {
+		return !invited.contains(user) && !ranges::contains(
+			participants,
+			user,
+			&Data::GroupCall::Participant::user);
+	});
+
+	auto count = 0;
+	auto slice = QVector<MTPInputUser>();
+	auto result = std::variant<int, not_null<UserData*>>(0);
+	slice.reserve(kMaxInvitePerSlice);
+	const auto sendSlice = [&] {
+		count += slice.size();
+		_api.request(MTPphone_InviteToGroupCall(
+			inputCall(),
+			MTP_vector<MTPInputUser>(slice)
+		)).done([=](const MTPUpdates &result) {
+			_channel->session().api().applyUpdates(result);
+		}).send();
+		slice.clear();
+	};
+	for (const auto user : users) {
+		if (!count && slice.empty()) {
+			result = user;
+		}
+		owner->registerInvitedToCallUser(_id, _channel, user);
+		slice.push_back(user->inputUser);
+		if (slice.size() == kMaxInvitePerSlice) {
+			sendSlice();
+		}
+	}
+	if (count != 0 || slice.size() != 1) {
+		result = int(count + slice.size());
+	}
+	if (!slice.empty()) {
+		sendSlice();
+	}
+	return result;
+}
+
 //void GroupCall::setAudioVolume(bool input, float level) {
 //	if (_instance) {
 //		if (input) {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 593c15e43..73a66149f 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -96,6 +96,8 @@ public:
 	void setAudioDuckingEnabled(bool enabled);
 
 	void toggleMute(not_null<UserData*> user, bool mute);
+	std::variant<int, not_null<UserData*>> inviteUsers(
+		const std::vector<not_null<UserData*>> &users);
 
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index fb0cfe011..1a401d155 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_changes.h"
 #include "data/data_group_call.h"
+#include "data/data_peer_values.h" // Data::CanWriteValue.
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/popup_menu.h"
@@ -19,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "main/main_session.h"
 #include "base/timer.h"
+#include "boxes/peers/edit_participants_box.h"
 #include "lang/lang_keys.h"
 #include "facades.h" // Ui::showPeerHistory.
 #include "mainwindow.h" // App::wnd()->activate.
@@ -613,7 +615,7 @@ auto GroupMembers::toggleMuteRequests() const
 
 int GroupMembers::desiredHeight() const {
 	auto desired = _header ? _header->height() : 0;
-	auto count = [this] {
+	auto count = [&] {
 		if (const auto call = _call.get()) {
 			if (const auto real = call->channel()->call()) {
 				if (call->id() == real->id()) {
@@ -623,9 +625,10 @@ int GroupMembers::desiredHeight() const {
 		}
 		return 0;
 	}();
-	desired += std::max(count, _list->fullRowsCount())
-		* st::groupCallMembersList.item.height;
-	return desired;
+	const auto use = std::max(count, _list->fullRowsCount());
+	return (_header ? _header->height() : 0)
+		+ (use * st::groupCallMembersList.item.height)
+		+ (use ? st::lineWidth : 0);
 }
 
 rpl::producer<int> GroupMembers::desiredHeightValue() const {
@@ -650,7 +653,7 @@ void GroupMembers::setupHeader(not_null<GroupCall*> call) {
 	_addMember = Ui::CreateChild<Ui::IconButton>(
 		parent,
 		st::groupCallAddMember);
-	setupButtons();
+	setupButtons(call);
 
 	widthValue(
 	) | rpl::start_with_next([this](int width) {
@@ -674,12 +677,14 @@ object_ptr<Ui::FlatLabel> GroupMembers::setupTitle(
 	return result;
 }
 
-void GroupMembers::setupButtons() {
+void GroupMembers::setupButtons(not_null<GroupCall*> call) {
 	using namespace rpl::mappers;
 
-	_addMember->showOn(rpl::single(true));
+	_addMember->showOn(Data::CanWriteValue(
+		call->channel()
+	));
 	_addMember->addClickHandler([=] { // TODO throttle(ripple duration)
-		addMember();
+		_addMemberRequests.fire({});
 	});
 }
 
@@ -699,7 +704,7 @@ void GroupMembers::setupList() {
 	_list->heightValue(
 	) | rpl::start_with_next([=](int listHeight) {
 		auto newHeight = (listHeight > 0)
-			? (topSkip + listHeight)
+			? (topSkip + listHeight + st::lineWidth)
 			: 0;
 		resize(width(), newHeight);
 	}, _list->lifetime());
@@ -737,10 +742,6 @@ void GroupMembers::updateHeaderControlsGeometry(int newWidth) {
 	_title->moveToLeft(0, 0);
 }
 
-void GroupMembers::addMember() {
-	// #TODO calls
-}
-
 void GroupMembers::visibleTopBottomUpdated(
 		int visibleTop,
 		int visibleBottom) {
diff --git a/Telegram/SourceFiles/calls/calls_group_members.h b/Telegram/SourceFiles/calls/calls_group_members.h
index f5481a486..1e02d6a76 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.h
+++ b/Telegram/SourceFiles/calls/calls_group_members.h
@@ -37,6 +37,9 @@ public:
 	[[nodiscard]] int desiredHeight() const;
 	[[nodiscard]] rpl::producer<int> desiredHeightValue() const override;
 	[[nodiscard]] rpl::producer<MuteRequest> toggleMuteRequests() const;
+	[[nodiscard]] rpl::producer<> addMembersRequests() const {
+		return _addMemberRequests.events();
+	}
 
 private:
 	using ListWidget = PeerListContent;
@@ -66,9 +69,8 @@ private:
 	object_ptr<Ui::FlatLabel> setupTitle(not_null<GroupCall*> call);
 	void setupList();
 
-	void setupButtons();
+	void setupButtons(not_null<GroupCall*> call);
 
-	void addMember();
 	void updateHeaderControlsGeometry(int newWidth);
 
 	const base::weak_ptr<GroupCall> _call;
@@ -76,6 +78,7 @@ private:
 	std::unique_ptr<PeerListController> _listController;
 	object_ptr<Ui::RpWidget> _header = { nullptr };
 	ListWidget *_list = { nullptr };
+	rpl::event_stream<> _addMemberRequests;
 
 	Ui::RpWidget *_titleWrap = nullptr;
 	Ui::FlatLabel *_title = nullptr;
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index d5d35d882..143799ba5 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -16,10 +16,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/checkbox.h"
 #include "ui/layers/layer_manager.h"
 #include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "core/application.h"
 #include "lang/lang_keys.h"
 #include "data/data_channel.h"
+#include "data/data_user.h"
+#include "data/data_group_call.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
 #include "base/event_filter.h"
+#include "boxes/peers/edit_participants_box.h"
 #include "app.h"
 #include "styles/style_calls.h"
 #include "styles/style_layers.h"
@@ -33,6 +40,132 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QWindow>
 
 namespace Calls {
+namespace {
+
+class InviteController final : public ParticipantsBoxController {
+public:
+	InviteController(
+		not_null<ChannelData*> channel,
+		base::flat_set<not_null<UserData*>> alreadyIn,
+		int fullInCount);
+
+	void prepare() override;
+
+	void rowClicked(not_null<PeerListRow*> row) override;
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override;
+
+	void itemDeselectedHook(not_null<PeerData*> peer) override;
+
+	std::variant<int, not_null<UserData*>> inviteSelectedUsers(
+		not_null<PeerListBox*> box,
+		not_null<GroupCall*> call) const;
+
+private:
+	void updateTitle() const;
+	[[nodiscard]] int alreadyInCount() const;
+	[[nodiscard]] bool isAlreadyIn(not_null<UserData*> user) const;
+	[[nodiscard]] int fullCount() const;
+
+	std::unique_ptr<PeerListRow> createRow(
+		not_null<UserData*> user) const override;
+
+	const not_null<ChannelData*> _channel;
+	const base::flat_set<not_null<UserData*>> _alreadyIn;
+	const int _fullInCount = 0;
+	mutable base::flat_set<not_null<UserData*>> _skippedUsers;
+
+};
+
+InviteController::InviteController(
+	not_null<ChannelData*> channel,
+	base::flat_set<not_null<UserData*>> alreadyIn,
+	int fullInCount)
+: ParticipantsBoxController(CreateTag{}, nullptr, channel, Role::Members)
+, _channel(channel)
+, _alreadyIn(std::move(alreadyIn))
+, _fullInCount(std::max(fullInCount, int(_alreadyIn.size()))) {
+	_skippedUsers.emplace(channel->session().user());
+}
+
+void InviteController::prepare() {
+	ParticipantsBoxController::prepare();
+	updateTitle();
+}
+
+void InviteController::rowClicked(not_null<PeerListRow*> row) {
+	delegate()->peerListSetRowChecked(row, !row->checked());
+	updateTitle();
+}
+
+base::unique_qptr<Ui::PopupMenu> InviteController::rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) {
+	return nullptr;
+}
+
+void InviteController::itemDeselectedHook(not_null<PeerData*> peer) {
+	updateTitle();
+}
+
+int InviteController::alreadyInCount() const {
+	return std::max(_fullInCount, int(_alreadyIn.size()));
+}
+
+bool InviteController::isAlreadyIn(not_null<UserData*> user) const {
+	return _alreadyIn.contains(user);
+}
+
+int InviteController::fullCount() const {
+	return alreadyInCount() + delegate()->peerListSelectedRowsCount();
+}
+
+std::unique_ptr<PeerListRow> InviteController::createRow(
+		not_null<UserData*> user) const {
+	if (user->isSelf() || user->isBot()) {
+		if (_skippedUsers.emplace(user).second) {
+			updateTitle();
+		}
+		return nullptr;
+	}
+	auto result = std::make_unique<PeerListRow>(user);
+	if (isAlreadyIn(user)) {
+		result->setDisabledState(PeerListRow::State::DisabledChecked);
+	}
+	return result;
+}
+
+void InviteController::updateTitle() const {
+	const auto inOrInvited = fullCount() - 1; // minus self
+	const auto canBeInvited = std::max({
+		delegate()->peerListFullRowsCount(), // minus self and bots
+		_channel->membersCount() - int(_skippedUsers.size()), // self + bots
+		inOrInvited
+	});
+	const auto additional = canBeInvited
+		? qsl("%1 / %2").arg(inOrInvited).arg(canBeInvited)
+		: QString();
+	delegate()->peerListSetTitle(tr::lng_group_call_invite_title());
+	delegate()->peerListSetAdditionalTitle(rpl::single(additional));
+}
+
+std::variant<int, not_null<UserData*>> InviteController::inviteSelectedUsers(
+		not_null<PeerListBox*> box,
+		not_null<GroupCall*> call) const {
+	const auto rows = box->peerListCollectSelectedRows();
+	const auto users = ranges::view::all(
+		rows
+	) | ranges::view::transform([](not_null<PeerData*> peer) {
+		Expects(peer->isUser());
+		Expects(!peer->isSelf());
+
+		return not_null<UserData*>(peer->asUser());
+	}) | ranges::to_vector;
+	return call->inviteUsers(users);
+}
+
+} // namespace
 
 void LeaveGroupCallBox(
 		not_null<Ui::GenericBox*> box,
@@ -159,13 +292,13 @@ void GroupPanel::initWidget() {
 	widget()->sizeValue(
 	) | rpl::skip(1) | rpl::start_with_next([=] {
 		updateControlsGeometry();
+
+		// title geometry depends on _controls->geometry,
+		// which is not updated here yet.
+		crl::on_main(widget(), [=] { refreshTitle(); });
 	}, widget()->lifetime());
 }
 
-void GroupPanel::copyShareLink() {
-
-}
-
 void GroupPanel::hangup(bool discardCallChecked) {
 	if (!_call) {
 		return;
@@ -230,6 +363,13 @@ void GroupPanel::initWithCall(GroupCall *call) {
 		}
 	}, _callLifetime);
 
+	_members->addMembersRequests(
+	) | rpl::start_with_next([=] {
+		if (_call) {
+			addMembers();
+		}
+	}, _callLifetime);
+
 	using namespace rpl::mappers;
 	rpl::combine(
 		_call->mutedValue(),
@@ -258,6 +398,62 @@ void GroupPanel::initWithCall(GroupCall *call) {
 	}, _callLifetime);
 }
 
+void GroupPanel::addMembers() {
+	const auto real = _channel->call();
+	if (!_call || !real || real->id() != _call->id()) {
+		return;
+	}
+	auto alreadyIn = _channel->owner().invitedToCallUsers(real->id());
+	for (const auto &participant : real->participants()) {
+		alreadyIn.emplace(participant.user);
+	}
+	alreadyIn.emplace(_channel->session().user());
+	auto controller = std::make_unique<InviteController>(
+		_channel,
+		std::move(alreadyIn),
+		real->fullCount());
+	const auto weak = base::make_weak(_call);
+	auto initBox = [=, controller = controller.get()](
+			not_null<PeerListBox*> box) {
+		box->addButton(tr::lng_group_call_invite_button(), [=] {
+			if (const auto call = weak.get()) {
+				const auto result = controller->inviteSelectedUsers(box, call);
+
+				if (const auto user = std::get_if<not_null<UserData*>>(&result)) {
+					Ui::Toast::Show(
+						widget(),
+						Ui::Toast::Config{
+							.text = tr::lng_group_call_invite_done_user(
+								tr::now,
+								lt_user,
+								Ui::Text::Bold((*user)->firstName),
+								Ui::Text::WithEntities),
+							.st = &st::defaultToast,
+						});
+				} else if (const auto count = std::get_if<int>(&result)) {
+					if (*count > 0) {
+						Ui::Toast::Show(
+							widget(),
+							Ui::Toast::Config{
+								.text = tr::lng_group_call_invite_done_many(
+									tr::now,
+									lt_count,
+									*count,
+									Ui::Text::RichLangValue),
+								.st = &st::defaultToast,
+							});
+					}
+				} else {
+					Unexpected("Result in GroupCall::inviteUsers.");
+				}
+			}
+			box->closeBox();
+		});
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	};
+	_layerBg->showBox(Box<PeerListBox>(std::move(controller), initBox));
+}
+
 void GroupPanel::initLayout() {
 	initGeometry();
 
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h
index 6270b2454..691893d55 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/calls_group_panel.h
@@ -89,9 +89,9 @@ private:
 	void updateControlsGeometry();
 	void showControls();
 
-	void copyShareLink();
 	void hangup(bool discardCallChecked);
 
+	void addMembers();
 	[[nodiscard]] int computeMembersListTop() const;
 	[[nodiscard]] std::optional<QRect> computeTitleRect() const;
 	void refreshTitle();
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index 7d4601e5f..75ca74ee0 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -208,13 +208,14 @@ void GroupCall::applyParticipantsSlice(
 				.canSelfUnmute = !data.is_muted() || data.is_can_self_unmute(),
 			};
 			if (i == end(_participants)) {
-				_userBySource.emplace(value.source, value.user);
+				_userBySource.emplace(value.source, user);
 				_participants.push_back(value);
+				_channel->owner().unregisterInvitedToCallUser(_id, user);
 				++fullCount;
 			} else {
 				if (i->source != value.source) {
 					_userBySource.erase(i->source);
-					_userBySource.emplace(value.source, value.user);
+					_userBySource.emplace(value.source, user);
 				}
 				*i = value;
 			}
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index c0b5cedf6..833aae59d 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -805,6 +805,42 @@ GroupCall *Session::groupCall(uint64 callId) const {
 	return (i != end(_groupCalls)) ? i->second.get() : nullptr;
 }
 
+auto Session::invitedToCallUsers(uint64 callId) const
+-> const base::flat_set<not_null<UserData*>> & {
+	static const base::flat_set<not_null<UserData*>> kEmpty;
+	const auto i = _invitedToCallUsers.find(callId);
+	return (i != _invitedToCallUsers.end()) ? i->second : kEmpty;
+}
+
+void Session::registerInvitedToCallUser(
+		uint64 callId,
+		not_null<ChannelData*> channel,
+		not_null<UserData*> user) {
+	const auto call = channel->call();
+	if (call && call->id() == callId) {
+		const auto inCall = ranges::contains(
+			call->participants(),
+			user,
+			&Data::GroupCall::Participant::user);
+		if (inCall) {
+			return;
+		}
+	}
+	_invitedToCallUsers[callId].emplace(user);
+}
+
+void Session::unregisterInvitedToCallUser(
+		uint64 callId,
+		not_null<UserData*> user) {
+	const auto i = _invitedToCallUsers.find(callId);
+	if (i != _invitedToCallUsers.end()) {
+		i->second.remove(user);
+		if (i->second.empty()) {
+			_invitedToCallUsers.erase(i);
+		}
+	}
+}
+
 PeerData *Session::peerByUsername(const QString &username) const {
 	const auto uname = username.trimmed();
 	for (const auto &[peerId, peer] : _peers) {
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index fc2fd3b46..b61cce387 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -158,6 +158,14 @@ public:
 	void unregisterGroupCall(not_null<GroupCall*> call);
 	GroupCall *groupCall(uint64 callId) const;
 
+	[[nodiscard]] auto invitedToCallUsers(uint64 callId) const
+		-> const base::flat_set<not_null<UserData*>> &;
+	void registerInvitedToCallUser(
+		uint64 callId,
+		not_null<ChannelData*> channel,
+		not_null<UserData*> user);
+	void unregisterInvitedToCallUser(uint64 callId, not_null<UserData*> user);
+
 	void enumerateUsers(Fn<void(not_null<UserData*>)> action) const;
 	void enumerateGroups(Fn<void(not_null<PeerData*>)> action) const;
 	void enumerateChannels(Fn<void(not_null<ChannelData*>)> action) const;
@@ -912,6 +920,7 @@ private:
 	base::flat_set<not_null<ViewElement*>> _heavyViewParts;
 
 	base::flat_map<uint64, not_null<GroupCall*>> _groupCalls;
+	base::flat_map<uint64, base::flat_set<not_null<UserData*>>> _invitedToCallUsers;
 
 	History *_topPromoted = nullptr;
 
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index 97d917f21..c4c30d8cc 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -1113,9 +1113,18 @@ ServiceAction ParseServiceAction(
 		content.distance = data.vdistance().v;
 		result.content = content;
 	}, [&](const MTPDmessageActionGroupCall &data) {
-		// #TODO calls
+		auto content = ActionGroupCall();
+		if (const auto duration = data.vduration()) {
+			content.duration = duration->v;
+		}
+		result.content = content;
 	}, [&](const MTPDmessageActionInviteToGroupCall &data) {
-		// #TODO calls
+		auto content = ActionInviteToGroupCall();
+		content.userIds.reserve(data.vusers().v.size());
+		for (const auto &user : data.vusers().v) {
+			content.userIds.push_back(user.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 8454d58c5..ff169de80 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.h
+++ b/Telegram/SourceFiles/export/data/export_data_types.h
@@ -458,6 +458,14 @@ struct ActionGeoProximityReached {
 	bool toSelf = false;
 };
 
+struct ActionGroupCall {
+	int duration = 0;
+};
+
+struct ActionInviteToGroupCall {
+	std::vector<int32> userIds;
+};
+
 struct ServiceAction {
 	std::variant<
 		v::null_t,
@@ -482,7 +490,9 @@ struct ServiceAction {
 		ActionSecureValuesSent,
 		ActionContactSignUp,
 		ActionPhoneNumberRequest,
-		ActionGeoProximityReached> content;
+		ActionGeoProximityReached,
+		ActionGroupCall,
+		ActionInviteToGroupCall> content;
 };
 
 ServiceAction ParseServiceAction(
diff --git a/Telegram/SourceFiles/export/output/export_output_html.cpp b/Telegram/SourceFiles/export/output/export_output_html.cpp
index 6684724f9..0f62a466e 100644
--- a/Telegram/SourceFiles/export/output/export_output_html.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_html.cpp
@@ -1110,10 +1110,24 @@ auto HtmlWriter::Wrap::pushMessage(
 		} else if (data.toSelf) {
 			return fromName + " is now within " + distance + " from you";
 		} else {
-			return fromName + " is now within " + distance + " from " + toName;
+			return fromName
+				+ " is now within "
+				+ distance
+				+ " from "
+				+ toName;
 		}
 	}, [&](const ActionPhoneNumberRequest &data) {
 		return serviceFrom + " requested your phone number";
+	}, [&](const ActionGroupCall &data) {
+		return "Group call"
+			+ (data.duration
+				? (" (" + QString::number(data.duration) + " seconds)")
+				: QString()).toUtf8();
+	}, [&](const ActionInviteToGroupCall &data) {
+		return serviceFrom
+			+ " invited "
+			+ peers.wrapUserNames(data.userIds)
+			+ " to the voice chat";
 	}, [](v::null_t) { return QByteArray(); });
 
 	if (!serviceText.isEmpty()) {
diff --git a/Telegram/SourceFiles/export/output/export_output_json.cpp b/Telegram/SourceFiles/export/output/export_output_json.cpp
index f079b017d..4a36652eb 100644
--- a/Telegram/SourceFiles/export/output/export_output_json.cpp
+++ b/Telegram/SourceFiles/export/output/export_output_json.cpp
@@ -487,6 +487,16 @@ QByteArray SerializeMessage(
 	}, [&](const ActionPhoneNumberRequest &data) {
 		pushActor();
 		pushAction("requested_phone_number");
+	}, [&](const ActionGroupCall &data) {
+		pushActor();
+		pushAction("group_call");
+		if (data.duration) {
+			push("duration", data.duration);
+		}
+	}, [&](const ActionInviteToGroupCall &data) {
+		pushActor();
+		pushAction("invite_to_group_call");
+		pushUserNames(data.userIds);
 	}, [](v::null_t) {});
 
 	if (v::is_null(message.action.content)) {
diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index 6dfafdc58..74ee7373a 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -274,6 +274,49 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 		return result;
 	};
 
+	auto prepareInviteToGroupCall = [this](const MTPDmessageActionInviteToGroupCall &action) {
+		const auto channel = history()->peer->asChannel();
+		const auto callId = action.vcall().match([&](const MTPDinputGroupCall &data) {
+			return data.vid().v;
+		});
+		const auto owner = &history()->owner();
+		const auto registerUser = [&](UserId userId) {
+			const auto user = owner->user(userId);
+			if (channel && callId) {
+				owner->registerInvitedToCallUser(callId, channel, user);
+			}
+			return user;
+		};
+		auto result = PreparedText{};
+		auto &users = action.vusers().v;
+		if (users.size() == 1) {
+			auto user = registerUser(users[0].v);
+			result.links.push_back(fromLink());
+			result.links.push_back(user->createOpenLink());
+			result.text = tr::lng_action_invite_user(tr::now, lt_from, fromLinkText(), lt_user, textcmdLink(2, user->name));
+		} else if (users.isEmpty()) {
+			result.links.push_back(fromLink());
+			result.text = tr::lng_action_invite_user(tr::now, lt_from, fromLinkText(), lt_user, qsl("somebody"));
+		} else {
+			result.links.push_back(fromLink());
+			for (auto i = 0, l = users.size(); i != l; ++i) {
+				auto user = registerUser(users[i].v);
+				result.links.push_back(user->createOpenLink());
+
+				auto linkText = textcmdLink(i + 2, user->name);
+				if (i == 0) {
+					result.text = linkText;
+				} else if (i + 1 == l) {
+					result.text = tr::lng_action_invite_users_and_last(tr::now, lt_accumulated, result.text, lt_user, linkText);
+				} else {
+					result.text = tr::lng_action_invite_users_and_one(tr::now, lt_accumulated, result.text, lt_user, linkText);
+				}
+			}
+			result.text = tr::lng_action_invite_users_many(tr::now, lt_from, fromLinkText(), lt_users, result.text);
+		}
+		return result;
+	};
+
 	const auto messageText = action.match([&](
 		const MTPDmessageActionChatAddUser &data) {
 		return prepareChatAddUserText(data);
@@ -324,11 +367,9 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 		LOG(("API Error: messageActionSecureValuesSentMe received."));
 		return PreparedText{ tr::lng_message_empty(tr::now) };
 	}, [&](const MTPDmessageActionGroupCall &data) {
-		// #TODO calls
-		return PreparedText{ "Group call" };
+		return PreparedText{ tr::lng_action_group_call(tr::now) };
 	}, [&](const MTPDmessageActionInviteToGroupCall &data) {
-		// #TODO calls
-		return PreparedText{ "Invite to group call" };
+		return prepareInviteToGroupCall(data);
 	}, [](const MTPDmessageActionEmpty &) {
 		return PreparedText{ tr::lng_message_empty(tr::now) };
 	});

From 058199aa0d558ab49222cc7234dcaaae33a563be Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 29 Nov 2020 12:20:33 +0300
Subject: [PATCH 184/370] Track speaking state in participants list.

---
 Telegram/SourceFiles/boxes/peer_list_box.h    |   2 +-
 .../SourceFiles/calls/calls_group_call.cpp    |  88 +++++-
 Telegram/SourceFiles/calls/calls_group_call.h |   5 +
 .../SourceFiles/calls/calls_group_members.cpp | 286 ++++++++++--------
 Telegram/SourceFiles/data/data_group_call.cpp |  45 ++-
 Telegram/SourceFiles/data/data_group_call.h   |   7 +-
 6 files changed, 285 insertions(+), 148 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index 189c379f8..fa263606f 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -760,7 +760,7 @@ public:
 		_content->reorderRows([&](
 				auto &&begin,
 				auto &&end) {
-			std::sort(begin, end, [&](auto &&a, auto &&b) {
+			std::stable_sort(begin, end, [&](auto &&a, auto &&b) {
 				return compare(*a, *b);
 			});
 		});
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 0952f814b..03ce9378c 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -34,6 +34,8 @@ namespace Calls {
 namespace {
 
 constexpr auto kMaxInvitePerSlice = 10;
+constexpr auto kCheckLastSpokeInterval = 3 * crl::time(1000);
+constexpr auto kSpeakLevelThreshold = 0.2;
 
 } // namespace
 
@@ -43,7 +45,8 @@ GroupCall::GroupCall(
 	const MTPInputGroupCall &inputCall)
 : _delegate(delegate)
 , _channel(channel)
-, _api(&_channel->session().mtp()) {
+, _api(&_channel->session().mtp())
+, _lastSpokeCheckTimer([=] { checkLastSpoke(); }) {
 	const auto id = inputCall.c_inputGroupCall().vid().v;
 	if (id) {
 		if (const auto call = _channel->call(); call && call->id() == id) {
@@ -119,9 +122,11 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 	using Update = Data::GroupCall::ParticipantUpdate;
 	_channel->call()->participantUpdated(
 	) | rpl::filter([=](const Update &update) {
-		return (_instance != nullptr) && update.removed;
+		return (_instance != nullptr) && !update.now;
 	}) | rpl::start_with_next([=](const Update &update) {
-		_instance->removeSsrcs({ update.participant.source });
+		Expects(update.was.has_value());
+
+		_instance->removeSsrcs({ update.was->source });
 	}, _lifetime);
 }
 
@@ -404,7 +409,9 @@ void GroupCall::createAndStartController() {
 			crl::on_main(weak, [=] { setInstanceConnected(connected); });
 		},
 		.audioLevelsUpdated = [=](const AudioLevels &data) {
-			crl::on_main(weak, [=] { audioLevelsUpdated(data); });
+			if (!data.empty()) {
+				crl::on_main(weak, [=] { audioLevelsUpdated(data); });
+			}
 		},
 		.myAudioLevelUpdated = [=](float level) {
 			if (*myLevel != level) { // Don't send many 0 while we're muted.
@@ -446,22 +453,77 @@ void GroupCall::createAndStartController() {
 	//raw->setAudioOutputDuckingEnabled(settings.callAudioDuckingEnabled());
 }
 
-void GroupCall::myLevelUpdated(float level) {
-	_levelUpdates.fire(LevelUpdate{
-		.source = _mySsrc,
-		.value = level,
-		.self = true
-	});
-}
+void GroupCall::handleLevelsUpdated(
+		gsl::span<const std::pair<std::uint32_t, float>> data) {
+	Expects(!data.empty());
 
-void GroupCall::audioLevelsUpdated(
-		const std::vector<std::pair<std::uint32_t, float>> &data) {
+	auto check = false;
+	auto checkNow = false;
+	const auto now = crl::now();
 	for (const auto &[source, level] : data) {
 		_levelUpdates.fire(LevelUpdate{
 			.source = source,
 			.value = level,
 			.self = (source == _mySsrc)
 		});
+		if (level <= kSpeakLevelThreshold) {
+			continue;
+		}
+
+		check = true;
+		const auto i = _lastSpoke.find(source);
+		if (i == _lastSpoke.end()) {
+			_lastSpoke.emplace(source, now);
+			checkNow = true;
+		} else {
+			if (i->second + kCheckLastSpokeInterval / 3 <= now) {
+				checkNow = true;
+			}
+			i->second = now;
+		}
+	}
+	if (checkNow) {
+		checkLastSpoke();
+	} else if (check && !_lastSpokeCheckTimer.isActive()) {
+		_lastSpokeCheckTimer.callEach(kCheckLastSpokeInterval / 2);
+	}
+}
+
+void GroupCall::myLevelUpdated(float level) {
+	const auto pair = std::pair<std::uint32_t, float>{ _mySsrc, level };
+	handleLevelsUpdated({ &pair, &pair + 1 });
+}
+
+void GroupCall::audioLevelsUpdated(
+		const std::vector<std::pair<std::uint32_t, float>> &data) {
+	handleLevelsUpdated(gsl::make_span(data));
+}
+
+void GroupCall::checkLastSpoke() {
+	const auto real = _channel->call();
+	if (!real || real->id() != _id) {
+		return;
+	}
+
+	auto hasRecent = false;
+	const auto now = crl::now();
+	auto list = base::take(_lastSpoke);
+	for (auto i = list.begin(); i != list.end();) {
+		const auto [source, when] = *i;
+		if (when + kCheckLastSpokeInterval >= now) {
+			hasRecent = true;
+			++i;
+		} else {
+			i = list.erase(i);
+		}
+		real->applyLastSpoke(source, when, now);
+	}
+	_lastSpoke = std::move(list);
+
+	if (!hasRecent) {
+		_lastSpokeCheckTimer.cancel();
+	} else if (!_lastSpokeCheckTimer.isActive()) {
+		_lastSpokeCheckTimer.callEach(kCheckLastSpokeInterval / 3);
 	}
 }
 
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 73a66149f..ec089d1c9 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -124,7 +124,10 @@ private:
 	void myLevelUpdated(float level);
 	void audioLevelsUpdated(
 		const std::vector<std::pair<std::uint32_t, float>> &data);
+	void handleLevelsUpdated(
+		gsl::span<const std::pair<std::uint32_t, float>> data);
 	void setInstanceConnected(bool connected);
+	void checkLastSpoke();
 
 	[[nodiscard]] MTPInputGroupCall inputCall() const;
 
@@ -145,6 +148,8 @@ private:
 
 	std::unique_ptr<tgcalls::GroupInstanceImpl> _instance;
 	rpl::event_stream<LevelUpdate> _levelUpdates;
+	base::flat_map<uint32, crl::time> _lastSpoke;
+	base::Timer _lastSpokeCheckTimer;
 
 	rpl::lifetime _lifetime;
 
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 1a401d155..d48596eeb 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -30,7 +30,6 @@ namespace Calls {
 namespace {
 
 constexpr auto kLevelThreshold = 0.2;
-constexpr auto kLevelActiveTimeout = crl::time(1000);
 
 struct UpdateLevelResult {
 	bool levelChanged = false;
@@ -49,10 +48,13 @@ public:
 	};
 
 	void updateState(const Data::GroupCall::Participant *participant);
-	UpdateLevelResult updateLevel(float level);
+	//UpdateLevelResult updateLevel(float level);
 	[[nodiscard]] State state() const {
 		return _state;
 	}
+	[[nodiscard]] bool speaking() const {
+		return _speaking;
+	}
 
 	void addActionRipple(QPoint point, Fn<void()> updateCallback) override;
 	void stopLastActionRipple() override;
@@ -83,8 +85,7 @@ public:
 
 private:
 	void refreshStatus() override;
-	void refreshStatus(crl::time now);
-	void resetSpeakingState();
+	void setSpeaking(bool speaking);
 
 	[[nodiscard]] static State ComputeState(
 		not_null<ChannelData*> channel,
@@ -95,8 +96,8 @@ private:
 	State _state = State::Inactive;
 	not_null<ChannelData*> _channel;
 	not_null<const style::IconButton*> _st;
-	float _level = 0.;
-	crl::time _markInactiveAt = 0;
+	bool _speaking = false;
+	//float _level = 0.;
 
 	std::unique_ptr<Ui::RippleAnimation> _actionRipple;
 
@@ -130,16 +131,18 @@ private:
 		const Data::GroupCall::Participant &participant) const;
 
 	void prepareRows(not_null<Data::GroupCall*> real);
-	void repaintByTimer();
+	//void repaintByTimer();
 
 	void setupListChangeViewers(not_null<GroupCall*> call);
 	void subscribeToChanges(not_null<Data::GroupCall*> real);
 	void updateRow(
-		const Data::GroupCall::Participant &participant);
+		const std::optional<Data::GroupCall::Participant> &was,
+		const Data::GroupCall::Participant &now);
 	void updateRow(
 		not_null<Row*> row,
 		const Data::GroupCall::Participant *participant) const;
-	void updateRowLevel(not_null<UserData*> user, float level);
+	void checkSpeakingRowPosition(not_null<Row*> row);
+	//void updateRowLevel(not_null<UserData*> user, float level);
 	Row *findRow(not_null<UserData*> user) const;
 
 	[[nodiscard]] Data::GroupCall *resolvedRealCall() const;
@@ -155,8 +158,8 @@ private:
 	rpl::variable<int> _fullCount = 1;
 	Ui::BoxPointer _addBox;
 
-	base::flat_map<not_null<UserData*>, crl::time> _repaintByTimer;
-	base::Timer _repaintTimer;
+	//base::flat_map<not_null<UserData*>, crl::time> _repaintByTimer;
+	//base::Timer _repaintTimer;
 
 	rpl::lifetime _lifetime;
 
@@ -178,54 +181,61 @@ void Row::updateState(const Data::GroupCall::Participant *participant) {
 			setCustomStatus(QString());
 		}
 		_state = State::Inactive;
-		resetSpeakingState();
+		setSpeaking(false);
 	} else if (!participant->muted) {
 		_state = State::Active;
+		setSpeaking(participant->speaking);
 	} else if (participant->canSelfUnmute) {
 		_state = State::Inactive;
-		resetSpeakingState();
+		setSpeaking(false);
 	} else {
 		_state = State::Muted;
-		resetSpeakingState();
+		setSpeaking(false);
 	}
 	_st = ComputeIconStyle(_state);
 }
 
-void Row::resetSpeakingState() {
-	_markInactiveAt = 0;
-	updateLevel(0.);
+void Row::setSpeaking(bool speaking) {
+	if (_speaking == speaking) {
+		return;
+	}
+	_speaking = speaking;
+	refreshStatus();
+	//if (!_speaking) {
+	//	updateLevel(0.);
+	//}
 }
 
-UpdateLevelResult Row::updateLevel(float level) {
-	if (_level == level) {
-		return UpdateLevelResult{ .nextUpdateTime = _markInactiveAt };
-	}
-	const auto now = crl::now();
-	const auto stillActive = (now < _markInactiveAt);
-	const auto wasActive = (_level >= kLevelThreshold) && stillActive;
-	const auto nowActive = (level >= kLevelThreshold);
-	if (nowActive) {
-		_markInactiveAt = now + kLevelActiveTimeout;
-		if (_state != State::Active) {
-			_state = State::Active;
-			_st = ComputeIconStyle(_state);
-		}
-	}
-	_level = level;
-	const auto changed = wasActive != (nowActive || stillActive);
-	if (!changed) {
-		return UpdateLevelResult{
-			.levelChanged = true,
-			.nextUpdateTime = _markInactiveAt,
-		};
-	}
-	refreshStatus(now);
-	return UpdateLevelResult{
-		.levelChanged = true,
-		.stateChanged = true,
-		.nextUpdateTime = _markInactiveAt,
-	};
-}
+//UpdateLevelResult Row::updateLevel(float level) {
+//	if (_level == level) {
+//		return UpdateLevelResult{ .nextUpdateTime = _markInactiveAt };
+//	}
+//	const auto now = crl::now();
+//	const auto stillActive = (now < _markInactiveAt);
+//	const auto wasActive = (_level >= kLevelThreshold) && stillActive;
+//	const auto nowActive = (level >= kLevelThreshold);
+//	if (nowActive) {
+//		_markInactiveAt = now + kLevelActiveTimeout;
+//		if (_state != State::Active) {
+//			_state = State::Active;
+//			_st = ComputeIconStyle(_state);
+//		}
+//	}
+//	_level = level;
+//	const auto changed = wasActive != (nowActive || stillActive);
+//	if (!changed) {
+//		return UpdateLevelResult{
+//			.levelChanged = true,
+//			.nextUpdateTime = _markInactiveAt,
+//		};
+//	}
+//	refreshStatus(now);
+//	return UpdateLevelResult{
+//		.levelChanged = true,
+//		.stateChanged = true,
+//		.nextUpdateTime = _markInactiveAt,
+//	};
+//}
 
 void Row::paintAction(
 		Painter &p,
@@ -251,16 +261,11 @@ void Row::paintAction(
 }
 
 void Row::refreshStatus() {
-	refreshStatus(crl::now());
-}
-
-void Row::refreshStatus(crl::time now) {
-	const auto active = (now < _markInactiveAt);
 	setCustomStatus(
-		(active
+		(_speaking
 			? tr::lng_group_call_active(tr::now)
 			: tr::lng_group_call_inactive(tr::now)),
-		active);
+		_speaking);
 }
 
 Row::State Row::ComputeState(
@@ -315,8 +320,8 @@ void Row::stopLastActionRipple() {
 
 MembersController::MembersController(not_null<GroupCall*> call)
 : _call(call)
-, _channel(call->channel())
-, _repaintTimer([=] { repaintByTimer(); }) {
+, _channel(call->channel()) {
+//, _repaintTimer([=] { repaintByTimer(); }) {
 	setupListChangeViewers(call);
 }
 
@@ -345,21 +350,21 @@ void MembersController::setupListChangeViewers(not_null<GroupCall*> call) {
 		}
 	}, _lifetime);
 
-	call->levelUpdates(
-	) | rpl::start_with_next([=](const LevelUpdate &update) {
-		const auto findUserBySource = [&](uint32 source) -> UserData* {
-			if (const auto real = resolvedRealCall()) {
-				return real->userBySource(source);
-			}
-			return nullptr;
-		};
-		const auto user = update.self
-			? _channel->session().user().get()
-			: findUserBySource(update.source);
-		if (user) {
-			updateRowLevel(user, update.value);
-		}
-	}, _lifetime);
+	//call->levelUpdates(
+	//) | rpl::start_with_next([=](const LevelUpdate &update) {
+	//	const auto findUserBySource = [&](uint32 source) -> UserData* {
+	//		if (const auto real = resolvedRealCall()) {
+	//			return real->userBySource(source);
+	//		}
+	//		return nullptr;
+	//	};
+	//	const auto user = update.self
+	//		? _channel->session().user().get()
+	//		: findUserBySource(update.source);
+	//	if (user) {
+	//		updateRowLevel(user, update.value);
+	//	}
+	//}, _lifetime);
 }
 
 void MembersController::subscribeToChanges(not_null<Data::GroupCall*> real) {
@@ -379,8 +384,10 @@ void MembersController::subscribeToChanges(not_null<Data::GroupCall*> real) {
 	using Update = Data::GroupCall::ParticipantUpdate;
 	real->participantUpdated(
 	) | rpl::start_with_next([=](const Update &update) {
-		const auto user = update.participant.user;
-		if (update.removed) {
+		Expects(update.was.has_value() || update.now.has_value());
+
+		const auto user = update.was ? update.was->user : update.now->user;
+		if (!update.now) {
 			if (const auto row = findRow(user)) {
 				if (user->isSelf()) {
 					row->updateState(nullptr);
@@ -391,21 +398,60 @@ void MembersController::subscribeToChanges(not_null<Data::GroupCall*> real) {
 				}
 			}
 		} else {
-			updateRow(update.participant);
+			updateRow(update.was, *update.now);
 		}
 	}, _lifetime);
 }
 
 void MembersController::updateRow(
-		const Data::GroupCall::Participant &participant) {
-	if (const auto row = findRow(participant.user)) {
-		updateRow(row, &participant);
-	} else if (auto row = createRow(participant)) {
-		delegate()->peerListAppendRow(std::move(row));
+		const std::optional<Data::GroupCall::Participant> &was,
+		const Data::GroupCall::Participant &now) {
+	if (const auto row = findRow(now.user)) {
+		if (now.speaking && (!was || !was->speaking)) {
+			checkSpeakingRowPosition(row);
+		}
+		updateRow(row, &now);
+	} else if (auto row = createRow(now)) {
+		if (now.speaking) {
+			delegate()->peerListPrependRow(std::move(row));
+		} else {
+			delegate()->peerListAppendRow(std::move(row));
+		}
 		delegate()->peerListRefreshRows();
 	}
 }
 
+void MembersController::checkSpeakingRowPosition(not_null<Row*> row) {
+	// Check if there are non-speaking rows above this one.
+	const auto count = delegate()->peerListFullRowsCount();
+	for (auto i = 0; i != count; ++i) {
+		const auto above = delegate()->peerListRowAt(i);
+		if (above == row) {
+			// All rows above are speaking.
+			return;
+		} else if (!static_cast<Row*>(above.get())->speaking()) {
+			break;
+		}
+	}
+	// Someone started speaking and has a non-speaking row above him. Sort.
+	const auto proj = [&](const PeerListRow &other) {
+		if (&other == row.get()) {
+			// Bring this new one to the top.
+			return 0;
+		} else if (static_cast<const Row&>(other).speaking()) {
+			// Bring all the speaking ones below him.
+			return 1;
+		} else {
+			return 2;
+		}
+	};
+	delegate()->peerListSortRows([&](
+			const PeerListRow &a,
+			const PeerListRow &b) {
+		return proj(a) < proj(b);
+	});
+}
+
 void MembersController::updateRow(
 		not_null<Row*> row,
 		const Data::GroupCall::Participant *participant) const {
@@ -413,47 +459,47 @@ void MembersController::updateRow(
 	delegate()->peerListUpdateRow(row);
 }
 
-void MembersController::updateRowLevel(
-		not_null<UserData*> user,
-		float level) {
-	if (const auto row = findRow(user)) {
-		const auto result = row->updateLevel(level);
-		if (result.stateChanged) {
-			// #TODO calls reorder.
-		}
-		if (result.stateChanged) {
-			delegate()->peerListUpdateRow(row);
-		}
-		if (result.nextUpdateTime) {
-			_repaintByTimer[user] = result.nextUpdateTime;
-			if (!_repaintTimer.isActive()) {
-				_repaintTimer.callOnce(kLevelActiveTimeout);
-			}
-		} else if (_repaintByTimer.remove(user) && _repaintByTimer.empty()) {
-			_repaintTimer.cancel();
-		}
-	}
-}
+//void MembersController::updateRowLevel(
+//		not_null<UserData*> user,
+//		float level) {
+//	if (const auto row = findRow(user)) {
+//		const auto result = row->updateLevel(level);
+//		if (result.stateChanged) {
+//			// #TODO calls reorder.
+//		}
+//		if (result.stateChanged) {
+//			delegate()->peerListUpdateRow(row);
+//		}
+//		if (result.nextUpdateTime) {
+//			_repaintByTimer[user] = result.nextUpdateTime;
+//			if (!_repaintTimer.isActive()) {
+//				_repaintTimer.callOnce(kLevelActiveTimeout);
+//			}
+//		} else if (_repaintByTimer.remove(user) && _repaintByTimer.empty()) {
+//			_repaintTimer.cancel();
+//		}
+//	}
+//}
 
-void MembersController::repaintByTimer() {
-	const auto now = crl::now();
-	auto next = crl::time(0);
-	for (auto i = begin(_repaintByTimer); i != end(_repaintByTimer);) {
-		if (i->second > now) {
-			if (!next || next > i->second) {
-				next = i->second;
-			}
-		} else if (const auto row = findRow(i->first)) {
-			delegate()->peerListUpdateRow(row);
-			i = _repaintByTimer.erase(i);
-			continue;
-		}
-		++i;
-	}
-	if (next) {
-		_repaintTimer.callOnce(next - now);
-	}
-}
+//void MembersController::repaintByTimer() {
+//	const auto now = crl::now();
+//	auto next = crl::time(0);
+//	for (auto i = begin(_repaintByTimer); i != end(_repaintByTimer);) {
+//		if (i->second > now) {
+//			if (!next || next > i->second) {
+//				next = i->second;
+//			}
+//		} else if (const auto row = findRow(i->first)) {
+//			delegate()->peerListUpdateRow(row);
+//			i = _repaintByTimer.erase(i);
+//			continue;
+//		}
+//		++i;
+//	}
+//	if (next) {
+//		_repaintTimer.callOnce(next - now);
+//	}
+//}
 
 Row *MembersController::findRow(not_null<UserData*> user) const {
 	return static_cast<Row*>(delegate()->peerListFindRow(user->id));
@@ -681,7 +727,7 @@ void GroupMembers::setupButtons(not_null<GroupCall*> call) {
 	using namespace rpl::mappers;
 
 	_addMember->showOn(Data::CanWriteValue(
-		call->channel()
+		call->channel().get()
 	));
 	_addMember->addClickHandler([=] { // TODO throttle(ripple duration)
 		_addMemberRequests.fire({});
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index 75ca74ee0..82347da02 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -17,6 +17,7 @@ namespace Data {
 namespace {
 
 constexpr auto kRequestPerPage = 30;
+constexpr auto kSpeakStatusKeptFor = crl::time(1000);
 
 } // namespace
 
@@ -186,8 +187,7 @@ void GroupCall::applyParticipantsSlice(
 			if (data.is_left()) {
 				if (i != end(_participants)) {
 					auto update = ParticipantUpdate{
-						.participant = *i,
-						.removed = true,
+						.was = *i,
 					};
 					_userBySource.erase(i->source);
 					_participants.erase(i);
@@ -200,10 +200,15 @@ void GroupCall::applyParticipantsSlice(
 				}
 				return;
 			}
+			const auto was = (i != end(_participants))
+				? std::make_optional(*i)
+				: std::nullopt;
 			const auto value = Participant{
 				.user = user,
 				.date = data.vdate().v,
+				.lastActive = was ? was->lastActive : 0,
 				.source = uint32(data.vsource().v),
+				.speaking = !data.is_muted() && (was ? was->speaking : false),
 				.muted = data.is_muted(),
 				.canSelfUnmute = !data.is_muted() || data.is_can_self_unmute(),
 			};
@@ -220,17 +225,11 @@ void GroupCall::applyParticipantsSlice(
 				*i = value;
 			}
 			_participantUpdates.fire({
-				.participant = value,
+				.was = was,
+				.now = value,
 			});
 		});
 	}
-	ranges::sort(_participants, std::greater<>(), [](const Participant &p) {
-		return p.lastSpoke
-			? p.lastSpoke
-			: p.lastActive
-			? p.lastActive
-			: p.date;
-	});
 	_fullCount = fullCount;
 }
 
@@ -248,15 +247,39 @@ void GroupCall::applyParticipantsMutes(
 				user,
 				&Participant::user);
 			if (i != end(_participants)) {
+				const auto was = *i;
 				i->muted = data.is_muted();
 				i->canSelfUnmute = !i->muted || data.is_can_self_unmute();
+				if (i->muted) {
+					i->speaking = false;
+				}
 				_participantUpdates.fire({
-					.participant = *i,
+					.was = was,
+					.now = *i,
 				});
 			}
 		});
 	}
+}
 
+void GroupCall::applyLastSpoke(uint32 source, crl::time when, crl::time now) {
+	const auto i = _userBySource.find(source);
+	if (i == end(_userBySource)) {
+		// #TODO calls load participant by source from server.
+		return;
+	}
+	const auto j = ranges::find(_participants, i->second, &Participant::user);
+	Assert(j != end(_participants));
+
+	const auto speaking = (when + kSpeakStatusKeptFor >= now) && !j->muted;
+	if (j->speaking != speaking) {
+		const auto was = *j;
+		j->speaking = speaking;
+		_participantUpdates.fire({
+			.was = was,
+			.now = *j,
+		});
+	}
 }
 
 void GroupCall::applyUpdate(const MTPDupdateGroupCallParticipants &update) {
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 695513b60..1b5e04e76 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -25,14 +25,14 @@ public:
 		not_null<UserData*> user;
 		TimeId date = 0;
 		TimeId lastActive = 0;
-		TimeId lastSpoke = 0;
 		uint32 source = 0;
+		bool speaking = false;
 		bool muted = false;
 		bool canSelfUnmute = false;
 	};
 	struct ParticipantUpdate {
-		Participant participant;
-		bool removed = false;
+		std::optional<Participant> was;
+		std::optional<Participant> now;
 	};
 
 	[[nodiscard]] auto participants() const
@@ -48,6 +48,7 @@ public:
 	void applyUpdate(const MTPDupdateGroupCallParticipants &update);
 	void applyUpdateChecked(
 		const MTPDupdateGroupCallParticipants &update);
+	void applyLastSpoke(uint32 source, crl::time when, crl::time now);
 
 	[[nodiscard]] int fullCount() const;
 	[[nodiscard]] rpl::producer<int> fullCountValue() const;

From e3a73378e7ccf0708c52706ee6c4397eeaf9218e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 29 Nov 2020 15:29:25 +0300
Subject: [PATCH 185/370] Add recent members userpics to group call bar.

---
 Telegram/Resources/langs/lang.strings         |   3 +
 Telegram/SourceFiles/calls/calls.style        |   4 +
 .../view/history_view_group_call_tracker.cpp  | 277 +++++++++++++++++-
 .../view/history_view_group_call_tracker.h    |  27 ++
 .../history/view/history_view_message.cpp     |  41 +--
 Telegram/SourceFiles/mainwidget.cpp           |   5 +-
 Telegram/SourceFiles/ui/chat/chat.style       |   4 +
 .../SourceFiles/ui/chat/group_call_bar.cpp    |  25 +-
 Telegram/SourceFiles/ui/chat/group_call_bar.h |   3 +-
 Telegram/lib_base                             |   2 +-
 10 files changed, 348 insertions(+), 43 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 339f79bbb..f66ac5678 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1840,6 +1840,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_invite_done_user" = "You invited {user} to the voice chat.";
 "lng_group_call_invite_done_many#one" = "You invited **{count} member** to the voice chat.";
 "lng_group_call_invite_done_many#other" = "You invited **{count} members** to the voice chat.";
+"lng_group_call_no_members" = "No members";
+"lng_group_call_members#one" = "{count} member";
+"lng_group_call_members#other" = "{count} members";
 
 "lng_no_mic_permission" = "Telegram needs access to your microphone so that you can make calls and record voice messages.";
 
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index afb4668f8..0ad1c75ea 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -496,3 +496,7 @@ groupCallSettings: CallButton(callMicrophoneMute) {
 groupCallButtonSkip: 43px;
 groupCallButtonBottomSkip: 134px;
 groupCallMuteBottomSkip: 149px;
+
+groupCallTopBarUserpicSize: 28px;
+groupCallTopBarUserpicShift: 8px;
+groupCallTopBarUserpicStroke: 2px;
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
index 1a20e599e..b61969c26 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
@@ -8,20 +8,275 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_group_call_tracker.h"
 
 #include "data/data_channel.h"
+#include "data/data_user.h"
 #include "data/data_changes.h"
 #include "data/data_group_call.h"
 #include "main/main_session.h"
 #include "ui/chat/group_call_bar.h"
+#include "ui/painter.h"
 #include "calls/calls_group_call.h"
 #include "calls/calls_instance.h"
 #include "core/application.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 
+void GenerateUserpicsInRow(
+		QImage &result,
+		const std::vector<UserpicInRow> &list,
+		const UserpicsInRowStyle &st,
+		int maxElements) {
+	const auto count = int(list.size());
+	if (!count) {
+		result = QImage();
+		return;
+	}
+	const auto limit = std::max(count, maxElements);
+	const auto single = st.size;
+	const auto shift = st.shift;
+	const auto width = single + (limit - 1) * (single - shift);
+	if (result.width() != width * cIntRetinaFactor()) {
+		result = QImage(
+			QSize(width, single) * cIntRetinaFactor(),
+			QImage::Format_ARGB32_Premultiplied);
+	}
+	result.fill(Qt::transparent);
+	result.setDevicePixelRatio(cRetinaFactor());
+
+	auto q = Painter(&result);
+	auto hq = PainterHighQualityEnabler(q);
+	auto pen = QPen(Qt::transparent);
+	pen.setWidth(st.stroke);
+	auto x = (count - 1) * (single - shift);
+	for (auto i = count; i != 0;) {
+		auto &entry = list[--i];
+		q.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		entry.peer->paintUserpic(q, entry.view, x, 0, single);
+		entry.uniqueKey = entry.peer->userpicUniqueKey(entry.view);
+		q.setCompositionMode(QPainter::CompositionMode_Source);
+		q.setBrush(Qt::NoBrush);
+		q.setPen(pen);
+		q.drawEllipse(x, 0, single, single);
+		x -= single - shift;
+	}
+}
+
 GroupCallTracker::GroupCallTracker(not_null<ChannelData*> channel)
 : _channel(channel) {
 }
 
+rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
+		not_null<Data::GroupCall*> call,
+		const UserpicsInRowStyle &st) {
+	struct State {
+		std::vector<UserpicInRow> userpics;
+		Ui::GroupCallBarContent current;
+		base::has_weak_ptr guard;
+		bool someUserpicsNotLoaded = false;
+		bool scheduled = false;
+	};
+
+	// speaking DESC, std::max(date, lastActive) DESC
+	static const auto SortKey = [](const Data::GroupCall::Participant &p) {
+		const auto result = (p.speaking ? uint64(0x100000000ULL) : uint64(0))
+			| uint64(std::max(p.lastActive, p.date));
+		return (~uint64(0)) - result; // sorting with less(), so invert.
+	};
+
+	constexpr auto kLimit = 3;
+	static const auto FillMissingUserpics = [](
+			not_null<State*> state,
+			not_null<Data::GroupCall*> call) {
+		const auto already = int(state->userpics.size());
+		const auto &participants = call->participants();
+		if (already >= kLimit || participants.size() <= already) {
+			return false;
+		}
+		std::array<const Data::GroupCall::Participant*, kLimit> adding{
+			{ nullptr }
+		};
+		for (const auto &participant : call->participants()) {
+			const auto alreadyInList = ranges::contains(
+				state->userpics,
+				participant.user,
+				&UserpicInRow::peer);
+			if (alreadyInList) {
+				continue;
+			}
+			for (auto i = 0; i != kLimit; ++i) {
+				if (!adding[i]) {
+					adding[i] = &participant;
+					break;
+				} else if (SortKey(participant) < SortKey(*adding[i])) {
+					for (auto j = kLimit - 1; j != i; --j) {
+						adding[j] = adding[j - 1];
+					}
+					adding[i] = &participant;
+					break;
+				}
+			}
+		}
+		for (auto i = 0; i != kLimit - already; ++i) {
+			if (adding[i]) {
+				state->userpics.push_back(UserpicInRow{ adding[i]->user });
+			}
+		}
+		return true;
+	};
+
+	static const auto RegenerateUserpics = [](
+			not_null<State*> state,
+			not_null<Data::GroupCall*> call,
+			const UserpicsInRowStyle &st,
+			bool force = false) {
+		const auto result = FillMissingUserpics(state, call) || force;
+		if (!result) {
+			return false;
+		}
+		GenerateUserpicsInRow(
+			state->current.userpics,
+			state->userpics,
+			st);
+		state->someUserpicsNotLoaded = false;
+		for (const auto &userpic : state->userpics) {
+			if (userpic.peer->hasUserpic()
+				&& userpic.peer->useEmptyUserpic(userpic.view)) {
+				state->someUserpicsNotLoaded = true;
+			}
+		}
+		return true;
+	};
+
+	static const auto RemoveUserpic = [](
+			not_null<State*> state,
+			not_null<Data::GroupCall*> call,
+			not_null<UserData*> user,
+			const UserpicsInRowStyle &st) {
+		const auto i = ranges::find(
+			state->userpics,
+			user,
+			&UserpicInRow::peer);
+		if (i == state->userpics.end()) {
+			return false;
+		}
+		state->userpics.erase(i);
+		RegenerateUserpics(state, call, st, true);
+		return true;
+	};
+
+	static const auto CheckPushToFront = [](
+			not_null<State*> state,
+			not_null<Data::GroupCall*> call,
+			not_null<UserData*> user,
+			const UserpicsInRowStyle &st) {
+		Expects(state->userpics.size() <= kLimit);
+
+		const auto &participants = call->participants();
+		auto i = state->userpics.begin();
+
+		// Find where to put a new speaking userpic.
+		for (; i != state->userpics.end(); ++i) {
+			if (i->peer == user) {
+				return false;
+			}
+			const auto j = ranges::find(
+				participants,
+				not_null{ static_cast<UserData*>(i->peer.get()) },
+				&Data::GroupCall::Participant::user);
+			if (j == end(participants) || !j->speaking) {
+				// Found a non-speaking one, put the new speaking one here.
+				break;
+			}
+		}
+		if (i - state->userpics.begin() >= kLimit) {
+			// Full kLimit of speaking userpics already.
+			return false;
+		}
+		const auto added = state->userpics.insert(i, UserpicInRow{ user });
+		if (state->userpics.size() > kLimit) {
+			// Find last non-speaking userpic to remove. It must be there.
+			for (auto i = state->userpics.end() - 1; i != added; --i) {
+				const auto j = ranges::find(
+					participants,
+					not_null{ static_cast<UserData*>(i->peer.get()) },
+					&Data::GroupCall::Participant::user);
+				if (j == end(participants) || !j->speaking) {
+					// Found a non-speaking one, remove.
+					state->userpics.erase(i);
+					break;
+				}
+			}
+			Assert(state->userpics.size() <= kLimit);
+		}
+		RegenerateUserpics(state, call, st, true);
+		return true;
+	};
+
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+		auto state = lifetime.make_state<State>();
+		state->current.shown = true;
+
+		const auto pushNext = [=] {
+			if (state->scheduled) {
+				return;
+			}
+			state->scheduled = true;
+			crl::on_main(&state->guard, [=] {
+				state->scheduled = false;
+				consumer.put_next_copy(state->current);
+			});
+		};
+
+		using ParticipantUpdate = Data::GroupCall::ParticipantUpdate;
+		call->participantUpdated(
+		) | rpl::start_with_next([=](const ParticipantUpdate &update) {
+			const auto user = update.now ? update.now->user : update.was->user;
+			if (!update.now) {
+				if (RemoveUserpic(state, call, user, st)) {
+					pushNext();
+				}
+			} else if (update.now->speaking
+				&& (!update.was || !update.was->speaking)) {
+				if (CheckPushToFront(state, call, user, st)) {
+					pushNext();
+				}
+			} else if (RegenerateUserpics(state, call, st)) {
+				pushNext();
+			}
+		}, lifetime);
+
+		call->participantsSliceAdded(
+		) | rpl::filter([=] {
+			return RegenerateUserpics(state, call, st);
+		}) | rpl::start_with_next(pushNext, lifetime);
+
+		call->channel()->session().downloaderTaskFinished(
+		) | rpl::filter([=] {
+			return state->someUserpicsNotLoaded;
+		}) | rpl::start_with_next([=] {
+			for (const auto &userpic : state->userpics) {
+				if (userpic.peer->userpicUniqueKey(userpic.view)
+					!= userpic.uniqueKey) {
+					RegenerateUserpics(state, call, st, true);
+					pushNext();
+					return;
+				}
+			}
+		}, lifetime);
+
+		RegenerateUserpics(state, call, st);
+
+		call->fullCountValue(
+		) | rpl::start_with_next([=](int count) {
+			state->current.count = count;
+			consumer.put_next_copy(state->current);
+		}, lifetime);
+
+		return lifetime;
+	};
+}
+
 rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::content() const {
 	const auto channel = _channel;
 	return rpl::combine(
@@ -29,16 +284,26 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::content() const {
 			channel,
 			Data::PeerUpdate::Flag::GroupCall),
 		Core::App().calls().currentGroupCallValue()
-	) | rpl::map([=](const auto&, Calls::GroupCall *current)
-	-> Ui::GroupCallBarContent {
+	) | rpl::map([=](const auto&, Calls::GroupCall *current) {
 		const auto call = channel->call();
-		if (!call || (current && current->channel() == channel)) {
-			return { .shown = false };
+		return (call && (!current || current->channel() != channel))
+			? call
+			: nullptr;
+	}) | rpl::distinct_until_changed(
+	) | rpl::map([](Data::GroupCall *call)
+	-> rpl::producer<Ui::GroupCallBarContent> {
+		if (!call) {
+			return rpl::single(Ui::GroupCallBarContent{ .shown = false });
 		} else if (!call->fullCount() && !call->participantsLoaded()) {
 			call->reload();
 		}
-		return { .count = call->fullCount(), .shown = true };
-	});
+		const auto st = UserpicsInRowStyle{
+			.size = st::historyGroupCallUserpicSize,
+			.shift = st::historyGroupCallUserpicShift,
+			.stroke = st::historyGroupCallUserpicStroke,
+		};
+		return ContentByCall(call, st);
+	}) | rpl::flatten_latest();
 }
 
 rpl::producer<> GroupCallTracker::joinClicks() const {
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h
index 1dc6c4f94..e93cbf432 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h
@@ -13,8 +13,31 @@ namespace Ui {
 struct GroupCallBarContent;
 } // namespace Ui
 
+namespace Data {
+class GroupCall;
+class CloudImageView;
+} // namespace Data
+
 namespace HistoryView {
 
+struct UserpicInRow {
+	not_null<PeerData*> peer;
+	mutable std::shared_ptr<Data::CloudImageView> view;
+	mutable InMemoryKey uniqueKey;
+};
+
+struct UserpicsInRowStyle {
+	int size = 0;
+	int shift = 0;
+	int stroke = 0;
+};
+
+void GenerateUserpicsInRow(
+	QImage &result,
+	const std::vector<UserpicInRow> &list,
+	const UserpicsInRowStyle &st,
+	int maxElements = 0);
+
 class GroupCallTracker final {
 public:
 	GroupCallTracker(not_null<ChannelData*> channel);
@@ -22,6 +45,10 @@ public:
 	[[nodiscard]] rpl::producer<Ui::GroupCallBarContent> content() const;
 	[[nodiscard]] rpl::producer<> joinClicks() const;
 
+	[[nodiscard]] static rpl::producer<Ui::GroupCallBarContent> ContentByCall(
+		not_null<Data::GroupCall*> call,
+		const UserpicsInRowStyle &st);
+
 private:
 	not_null<ChannelData*> _channel;
 
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 67f888493..71ac89589 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_message.h"
 #include "history/view/media/history_view_media.h"
 #include "history/view/media/history_view_web_page.h"
+#include "history/view/history_view_group_call_tracker.h" // UserpicInRow.
 #include "history/history.h"
 #include "ui/effects/ripple_animation.h"
 #include "core/application.h"
@@ -266,13 +267,8 @@ style::color FromNameFg(PeerId peerId, bool selected) {
 } // namespace
 
 struct Message::CommentsButton {
-	struct Userpic {
-		not_null<PeerData*> peer;
-		std::shared_ptr<Data::CloudImageView> view;
-		InMemoryKey uniqueKey;
-	};
 	std::unique_ptr<Ui::RippleAnimation> ripple;
-	std::vector<Userpic> userpics;
+	std::vector<UserpicInRow> userpics;
 	QImage cachedUserpics;
 	ClickHandlerPtr link;
 	QPoint lastPoint;
@@ -822,7 +818,7 @@ void Message::paintCommentsButton(
 			for (auto i = 0; i != count; ++i) {
 				const auto peerId = views->recentRepliers[i];
 				if (i == list.size()) {
-					list.push_back(CommentsButton::Userpic{
+					list.push_back(UserpicInRow{
 						history()->owner().peer(peerId)
 					});
 				} else if (list[i].peer->id != peerId) {
@@ -832,31 +828,12 @@ void Message::paintCommentsButton(
 			while (list.size() > count) {
 				list.pop_back();
 			}
-			const auto width = single + (limit - 1) * (single - shift);
-			if (_comments->cachedUserpics.isNull()) {
-				_comments->cachedUserpics = QImage(
-					QSize(width, single) * cIntRetinaFactor(),
-					QImage::Format_ARGB32_Premultiplied);
-			}
-			_comments->cachedUserpics.fill(Qt::transparent);
-			_comments->cachedUserpics.setDevicePixelRatio(cRetinaFactor());
-
-			auto q = Painter(&_comments->cachedUserpics);
-			auto hq = PainterHighQualityEnabler(q);
-			auto pen = QPen(Qt::transparent);
-			pen.setWidth(st::historyCommentsUserpicStroke);
-			auto x = (count - 1) * (single - shift);
-			for (auto i = count; i != 0;) {
-				auto &entry = list[--i];
-				q.setCompositionMode(QPainter::CompositionMode_SourceOver);
-				entry.peer->paintUserpic(q, entry.view, x, 0, single);
-				entry.uniqueKey = entry.peer->userpicUniqueKey(entry.view);
-				q.setCompositionMode(QPainter::CompositionMode_Source);
-				q.setBrush(Qt::NoBrush);
-				q.setPen(pen);
-				q.drawEllipse(x, 0, single, single);
-				x -= single - shift;
-			}
+			const auto st = UserpicsInRowStyle{
+				.size = single,
+				.shift = shift,
+				.stroke = st::historyCommentsUserpicStroke,
+			};
+			GenerateUserpicsInRow(_comments->cachedUserpics, list, st, limit);
 		}
 		p.drawImage(
 			left,
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index addf7088f..bf47f7455 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -978,7 +978,10 @@ void MainWidget::setCurrentGroupCall(Calls::GroupCall *call) {
 		_currentGroupCall->stateValue(
 		) | rpl::start_with_next([=](Calls::GroupCall::State state) {
 			using State = Calls::GroupCall::State;
-			if (state != State::Joined && state != State::Connecting) {
+			if (state != State::Creating
+				&& state != State::Joining
+				&& state != State::Joined
+				&& state != State::Connecting) {
 				destroyCallTopBar();
 			} else if (!_callTopBar) {
 				createCallTopBar();
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 3317d8fac..d65f8d885 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -797,6 +797,10 @@ historyCommentsOpenOutSelected: icon {{ "history_comments_open", msgFileThumbLin
 
 historySlowmodeCounterMargins: margins(0px, 0px, 10px, 0px);
 
+historyGroupCallUserpicSize: 36px;
+historyGroupCallUserpicShift: 12px;
+historyGroupCallUserpicStroke: 2px;
+
 largeEmojiSize: 36px;
 largeEmojiOutline: 1px;
 largeEmojiPadding: margins(0px, 0px, 0px, 0px);
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
index b7a73e4db..584f902e6 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -101,9 +101,32 @@ void GroupCallBar::setupInner() {
 
 void GroupCallBar::paint(Painter &p) {
 	p.fillRect(_inner->rect(), st::historyComposeAreaBg);
+
+	auto left = st::msgReplyBarSkip;
+	if (!_content.userpics.isNull()) {
+		const auto imageSize = _content.userpics.size()
+			/ _content.userpics.devicePixelRatio();
+		p.drawImage(
+			left,
+			(_inner->height() - imageSize.height()) / 2,
+			_content.userpics);
+		left += imageSize.width() + st::msgReplyBarSkip;
+	}
+	const auto titleTop = st::msgReplyPadding.top();
+	const auto textTop = titleTop + st::msgServiceNameFont->height;
+	const auto width = _inner->width();
 	p.setPen(st::defaultMessageBar.textFg);
+	p.setFont(st::defaultMessageBar.title.font);
+	p.drawTextLeft(left, titleTop, width, tr::lng_group_call_title(tr::now));
+	p.setPen(st::historyComposeAreaFgService);
 	p.setFont(st::defaultMessageBar.text.font);
-	p.drawText(_inner->rect(), tr::lng_group_call_title(tr::now), style::al_center);
+	p.drawTextLeft(
+		left,
+		textTop,
+		width,
+		(_content.count > 0
+			? tr::lng_group_call_members(tr::now, lt_count, _content.count)
+			: tr::lng_group_call_no_members(tr::now)));
 }
 
 void GroupCallBar::updateControlsGeometry(QRect wrapGeometry) {
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.h b/Telegram/SourceFiles/ui/chat/group_call_bar.h
index fe0ec25ae..1796330c1 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.h
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.h
@@ -19,8 +19,7 @@ class PlainShadow;
 struct GroupCallBarContent {
 	int count = 0;
 	bool shown = false;
-	bool joined = false;
-	// #TODO calls userpics
+	QImage userpics;
 };
 
 class GroupCallBar final {
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 707bdc849..3562a4368 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 707bdc84918eddfd8c08e776d328dab03dc04b25
+Subproject commit 3562a43685fdac00c277292ce2c83d92132cc319

From 533952382426ba0246baa384b8d1ea433401ccbb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 29 Nov 2020 16:12:46 +0300
Subject: [PATCH 186/370] Add userpics to the active call bar.

---
 Telegram/SourceFiles/calls/calls.style        |  5 ++
 Telegram/SourceFiles/calls/calls_top_bar.cpp  | 57 +++++++++++++++++--
 Telegram/SourceFiles/calls/calls_top_bar.h    |  3 +
 .../view/history_view_group_call_tracker.cpp  | 11 ++++
 .../SourceFiles/ui/chat/group_call_bar.cpp    | 27 +++++++--
 Telegram/SourceFiles/ui/chat/group_call_bar.h |  8 ++-
 6 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 0ad1c75ea..eedd87c6b 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -500,3 +500,8 @@ groupCallMuteBottomSkip: 149px;
 groupCallTopBarUserpicSize: 28px;
 groupCallTopBarUserpicShift: 8px;
 groupCallTopBarUserpicStroke: 2px;
+groupCallTopBarJoin: RoundButton(defaultActiveButton) {
+	width: -30px;
+	height: 28px;
+	textTop: 5px;
+}
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index e129b20b5..f0200f503 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/chat/group_call_bar.h" // Ui::GroupCallBarContent.
 #include "ui/layers/generic_box.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/text/format_values.h"
@@ -18,7 +19,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_instance.h"
 #include "calls/calls_signal_bars.h"
 #include "calls/calls_group_panel.h" // LeaveGroupCallBox.
+#include "history/view/history_view_group_call_tracker.h" // ContentByCall.
 #include "data/data_user.h"
+#include "data/data_group_call.h"
 #include "data/data_channel.h"
 #include "data/data_changes.h"
 #include "main/main_session.h"
@@ -104,7 +107,12 @@ TopBar::TopBar(
 	: object_ptr<SignalBars>(nullptr))
 , _fullInfoLabel(this, st::callBarInfoLabel)
 , _shortInfoLabel(this, st::callBarInfoLabel)
-, _hangupLabel(this, st::callBarLabel, tr::lng_call_bar_hangup(tr::now).toUpper())
+, _hangupLabel(_call
+	? object_ptr<Ui::LabelSimple>(
+		this,
+		st::callBarLabel,
+		tr::lng_call_bar_hangup(tr::now).toUpper())
+	: object_ptr<Ui::LabelSimple>(nullptr))
 , _mute(this, st::callBarMuteToggle)
 , _info(this)
 , _hangup(this, st::callBarHangup) {
@@ -136,8 +144,8 @@ void TopBar::initControls() {
 		update();
 	}, lifetime());
 
-	if (_groupCall) {
-		_groupCall->mutedValue(
+	if (const auto group = _groupCall.get()) {
+		group->mutedValue(
 		) | rpl::start_with_next([=](MuteState state) {
 			if (state == MuteState::ForceMuted) {
 				_mute->clearState();
@@ -146,6 +154,8 @@ void TopBar::initControls() {
 				Qt::WA_TransparentForMouseEvents,
 				(state == MuteState::ForceMuted));
 		}, _mute->lifetime());
+
+		subscribeToMembersChanges(group);
 	}
 
 	if (const auto call = _call.get()) {
@@ -187,6 +197,33 @@ void TopBar::initControls() {
 	updateDurationText();
 }
 
+void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
+	const auto channel = call->channel();
+	channel->session().changes().peerFlagsValue(
+		channel,
+		Data::PeerUpdate::Flag::GroupCall
+	) | rpl::map([=] {
+		return channel->call();
+	}) | rpl::filter([=](Data::GroupCall *real) {
+		const auto call = _groupCall.get();
+		return call && real && (real->id() == call->id());
+	}) | rpl::take(
+		1
+	) | rpl::map([=](not_null<Data::GroupCall*> real) {
+		return HistoryView::GroupCallTracker::ContentByCall(
+			real,
+			HistoryView::UserpicsInRowStyle{
+				.size = st::groupCallTopBarUserpicSize,
+				.shift = st::groupCallTopBarUserpicShift,
+				.stroke = st::groupCallTopBarUserpicStroke,
+			});
+	}) | rpl::flatten_latest(
+	) | rpl::start_with_next([=](const Ui::GroupCallBarContent &content) {
+		_userpics = content.userpics;
+		update();
+	}, lifetime());
+}
+
 void TopBar::updateInfoLabels() {
 	setInfoLabels();
 	updateControlsGeometry();
@@ -251,8 +288,12 @@ void TopBar::updateControlsGeometry() {
 	}
 
 	auto right = st::callBarRightSkip;
-	_hangupLabel->moveToRight(right, st::callBarLabelTop);
-	right += _hangupLabel->width();
+	if (_hangupLabel) {
+		_hangupLabel->moveToRight(right, st::callBarLabelTop);
+		right += _hangupLabel->width();
+	} else {
+		//right -= st::callBarRightSkip;
+	}
 	right += st::callBarHangup.width;
 	_hangup->setGeometryToRight(0, 0, right, height());
 	_info->setGeometryToLeft(
@@ -283,6 +324,12 @@ void TopBar::updateControlsGeometry() {
 void TopBar::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 	p.fillRect(e->rect(), _muted ? st::callBarBgMuted : st::callBarBg);
+	if (!_userpics.isNull()) {
+		const auto imageSize = _userpics.size()
+			/ _userpics.devicePixelRatio();
+		const auto top = (height() - imageSize.height()) / 2;
+		p.drawImage(_mute->width(), top, _userpics);
+	}
 }
 
 TopBar::~TopBar() = default;
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.h b/Telegram/SourceFiles/calls/calls_top_bar.h
index 20c964187..9871284e1 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.h
+++ b/Telegram/SourceFiles/calls/calls_top_bar.h
@@ -54,10 +54,13 @@ private:
 	void startDurationUpdateTimer(crl::time currentDuration);
 	void setMuted(bool mute);
 
+	void subscribeToMembersChanges(not_null<GroupCall*> call);
+
 	const base::weak_ptr<Call> _call;
 	const base::weak_ptr<GroupCall> _groupCall;
 
 	bool _muted = false;
+	QImage _userpics;
 	object_ptr<Ui::LabelSimple> _durationLabel;
 	object_ptr<SignalBars> _signalBars;
 	object_ptr<Ui::FlatLabel> _fullInfoLabel;
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
index b61969c26..77a97d8ce 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
@@ -192,7 +192,18 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 			// Full kLimit of speaking userpics already.
 			return false;
 		}
+
+		// Add the new speaking to the place we found.
 		const auto added = state->userpics.insert(i, UserpicInRow{ user });
+
+		// Remove him from the tail, if he was there.
+		for (auto i = added + 1; i != state->userpics.end(); ++i) {
+			if (i->peer == user) {
+				state->userpics.erase(i);
+				break;
+			}
+		}
+
 		if (state->userpics.size() > kLimit) {
 			// Find last non-speaking userpic to remove. It must be there.
 			for (auto i = state->userpics.end() - 1; i != added; --i) {
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
index 584f902e6..cff4ed1f5 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "lang/lang_keys.h"
 #include "styles/style_chat.h"
+#include "styles/style_calls.h"
 #include "styles/palette.h"
 
 #include <QtGui/QtEvents>
@@ -23,6 +24,10 @@ GroupCallBar::GroupCallBar(
 	rpl::producer<GroupCallBarContent> content)
 : _wrap(parent, object_ptr<RpWidget>(parent))
 , _inner(_wrap.entity())
+, _join(std::make_unique<RoundButton>(
+	_inner.get(),
+	tr::lng_group_call_join(),
+	st::groupCallTopBarJoin))
 , _shadow(std::make_unique<PlainShadow>(_wrap.parentWidget())) {
 	_wrap.hide(anim::type::instant);
 	_shadow->hide();
@@ -72,7 +77,6 @@ void GroupCallBar::setupInner() {
 		paint(p);
 	}, _inner->lifetime());
 
-
 	// Clicks.
 	_inner->setCursor(style::cur_pointer);
 	_inner->events(
@@ -91,6 +95,16 @@ void GroupCallBar::setupInner() {
 		return rpl::empty_value();
 	}) | rpl::start_to_stream(_barClicks, _inner->lifetime());
 
+	rpl::combine(
+		_inner->widthValue(),
+		_join->widthValue()
+	) | rpl::start_with_next([=](int outerWidth, int) {
+		// Skip shadow of the bar above.
+		const auto top = (st::historyReplyHeight
+			- st::lineWidth
+			- _join->height()) / 2 + st::lineWidth;
+		_join->moveToRight(top, top, outerWidth);
+	}, _join->lifetime());
 
 	_wrap.geometryValue(
 	) | rpl::start_with_next([=](QRect rect) {
@@ -106,10 +120,11 @@ void GroupCallBar::paint(Painter &p) {
 	if (!_content.userpics.isNull()) {
 		const auto imageSize = _content.userpics.size()
 			/ _content.userpics.devicePixelRatio();
-		p.drawImage(
-			left,
-			(_inner->height() - imageSize.height()) / 2,
-			_content.userpics);
+		// Skip shadow of the bar above.
+		const auto imageTop = (st::historyReplyHeight
+			- st::lineWidth
+			- imageSize.height()) / 2 + st::lineWidth;
+		p.drawImage(left, imageTop, _content.userpics);
 		left += imageSize.width() + st::msgReplyBarSkip;
 	}
 	const auto titleTop = st::msgReplyPadding.top();
@@ -207,7 +222,7 @@ rpl::producer<> GroupCallBar::barClicks() const {
 }
 
 rpl::producer<> GroupCallBar::joinClicks() const {
-	return rpl::never<>();
+	return _join->clicks() | rpl::to_empty;
 }
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.h b/Telegram/SourceFiles/ui/chat/group_call_bar.h
index 1796330c1..9fba26326 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.h
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.h
@@ -15,6 +15,7 @@ class Painter;
 namespace Ui {
 
 class PlainShadow;
+class RoundButton;
 
 struct GroupCallBarContent {
 	int count = 0;
@@ -53,9 +54,10 @@ private:
 	void setupInner();
 	void paint(Painter &p);
 
-	Ui::SlideWrap<> _wrap;
-	not_null<Ui::RpWidget*> _inner;
-	std::unique_ptr<Ui::PlainShadow> _shadow;
+	SlideWrap<> _wrap;
+	not_null<RpWidget*> _inner;
+	std::unique_ptr<RoundButton> _join;
+	std::unique_ptr<PlainShadow> _shadow;
 	rpl::event_stream<> _barClicks;
 	Fn<QRect(QRect)> _shadowGeometryPostprocess;
 	bool _shouldBeShown = false;

From c42ef54417dd856a74d4197265eb85d195745c09 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 29 Nov 2020 16:59:07 +0300
Subject: [PATCH 187/370] Join call instead of creating a new one.

---
 Telegram/SourceFiles/calls/calls_top_bar.cpp               | 7 +++++++
 .../history/view/history_view_top_bar_widget.cpp           | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index f0200f503..c8ddf621d 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -219,7 +219,11 @@ void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
 			});
 	}) | rpl::flatten_latest(
 	) | rpl::start_with_next([=](const Ui::GroupCallBarContent &content) {
+		const auto changed = (_userpics.size() != content.userpics.size());
 		_userpics = content.userpics;
+		if (changed) {
+			updateControlsGeometry();
+		}
 		update();
 	}, lifetime());
 }
@@ -282,6 +286,9 @@ void TopBar::updateControlsGeometry() {
 		_durationLabel->moveToLeft(left, st::callBarLabelTop);
 		left += _durationLabel->width() + st::callBarSkip;
 	}
+	if (!_userpics.isNull()) {
+		left += _userpics.width() / _userpics.devicePixelRatio();
+	}
 	if (_signalBars) {
 		_signalBars->moveToLeft(left, (height() - _signalBars->height()) / 2);
 		left += _signalBars->width() + st::callBarSkip;
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 983025d41..214950959 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -34,6 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_peer_menu.h"
 #include "calls/calls_instance.h"
 #include "data/data_peer_values.h"
+#include "data/data_group_call.h" // GroupCall::input.
 #include "data/data_folder.h"
 #include "data/data_session.h"
 #include "data/data_channel.h"
@@ -211,7 +212,11 @@ void TopBarWidget::onCall() {
 		if (const auto user = peer->asUser()) {
 			Core::App().calls().startOutgoingCall(user, false);
 		} else if (const auto megagroup = peer->asMegagroup()) {
-			Core::App().calls().startGroupCall(megagroup);
+			if (const auto call = megagroup->call()) {
+				Core::App().calls().joinGroupCall(megagroup, call->input());
+			} else {
+				Core::App().calls().startGroupCall(megagroup);
+			}
 		}
 	}
 }

From cf8e45ab617da5c89fe6560d10e9d41fe9814d0a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 29 Nov 2020 17:42:34 +0300
Subject: [PATCH 188/370] Check joined state if disconnected.

---
 .../SourceFiles/calls/calls_group_call.cpp    | 68 +++++++++++++------
 Telegram/SourceFiles/calls/calls_group_call.h |  3 +
 2 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 03ce9378c..114b4f5b2 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -36,6 +36,7 @@ namespace {
 constexpr auto kMaxInvitePerSlice = 10;
 constexpr auto kCheckLastSpokeInterval = 3 * crl::time(1000);
 constexpr auto kSpeakLevelThreshold = 0.2;
+constexpr auto kCheckJoinedTimeout = 4 * crl::time(1000);
 
 } // namespace
 
@@ -46,7 +47,18 @@ GroupCall::GroupCall(
 : _delegate(delegate)
 , _channel(channel)
 , _api(&_channel->session().mtp())
-, _lastSpokeCheckTimer([=] { checkLastSpoke(); }) {
+, _lastSpokeCheckTimer([=] { checkLastSpoke(); })
+, _checkJoinedTimer([=] { checkJoined(); }) {
+	_muted.changes(
+	) | rpl::start_with_next([=](MuteState state) {
+		if (_instance) {
+			_instance->setIsMuted(state != MuteState::Active);
+		}
+		if (_mySsrc && state != MuteState::ForceMuted) {
+			sendMutedUpdate();
+		}
+	}, _lifetime);
+
 	const auto id = inputCall.c_inputGroupCall().vid().v;
 	if (id) {
 		if (const auto call = _channel->call(); call && call->id() == id) {
@@ -91,6 +103,11 @@ void GroupCall::setState(State state) {
 	case State::Failed:
 		_delegate->groupCallFailed(this);
 		break;
+	case State::Connecting:
+		if (!_checkJoinedTimer.isActive()) {
+			_checkJoinedTimer.callOnce(kCheckJoinedTimeout);
+		}
+		break;
 	}
 }
 
@@ -115,7 +132,6 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 	inputCall.match([&](const MTPDinputGroupCall &data) {
 		_id = data.vid().v;
 		_accessHash = data.vaccess_hash().v;
-		createAndStartController();
 		rejoin();
 	});
 
@@ -131,9 +147,13 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 }
 
 void GroupCall::rejoin() {
-	Expects(_state.current() == State::Joining);
+	Expects(_state.current() == State::Joining
+		|| _state.current() == State::Joined
+		|| _state.current() == State::Connecting);
 
 	_mySsrc = 0;
+	setState(State::Joining);
+	createAndStartController();
 	applySelfInCallLocally();
 	LOG(("Call Info: Requesting join payload."));
 
@@ -183,7 +203,9 @@ void GroupCall::rejoin() {
 
 				_channel->session().api().applyUpdates(updates);
 			}).fail([=](const RPCError &error) {
-				int a = error.code();
+				LOG(("Call Error: Could not join, error: %1"
+					).arg(error.type()));
+				hangup();
 			}).send();
 		});
 	});
@@ -440,16 +462,8 @@ void GroupCall::createAndStartController() {
 	LOG(("Call Info: Creating group instance"));
 	_instance = std::make_unique<tgcalls::GroupInstanceImpl>(
 		std::move(descriptor));
+	_instance->setIsMuted(_muted.current() != MuteState::Active);
 
-	_muted.value(
-	) | rpl::start_with_next([=](MuteState state) {
-		if (_instance) {
-			_instance->setIsMuted(state != MuteState::Active);
-		}
-		if (_mySsrc && state != MuteState::ForceMuted) {
-			sendMutedUpdate();
-		}
-	}, _lifetime);
 	//raw->setAudioOutputDuckingEnabled(settings.callAudioDuckingEnabled());
 }
 
@@ -527,6 +541,24 @@ void GroupCall::checkLastSpoke() {
 	}
 }
 
+void GroupCall::checkJoined() {
+	if (state() != State::Connecting || !_id || !_mySsrc) {
+		return;
+	}
+	_api.request(MTPphone_CheckGroupCall(
+		inputCall(),
+		MTP_int(_mySsrc)
+	)).done([=](const MTPBool &result) {
+		if (!mtpIsTrue(result)) {
+			rejoin();
+		} else if (state() == State::Connecting) {
+			_checkJoinedTimer.callOnce(kCheckJoinedTimeout);
+		}
+	}).fail([=](const RPCError &error) {
+		rejoin();
+	}).send();
+}
+
 void GroupCall::setInstanceConnected(bool connected) {
 	if (_instanceConnected == connected) {
 		return;
@@ -552,10 +584,7 @@ void GroupCall::sendMutedUpdate() {
 		_channel->session().api().applyUpdates(result);
 	}).fail([=](const RPCError &error) {
 		_updateMuteRequestId = 0;
-		if (error.type() == u"GROUP_CALL_FORBIDDEN"_q
-			&& (_state.current() == State::Joined
-				|| _state.current() == State::Connecting)) {
-			setState(State::Joining);
+		if (error.type() == u"GROUP_CALL_FORBIDDEN"_q) {
 			rejoin();
 		}
 	}).send();
@@ -585,10 +614,7 @@ void GroupCall::toggleMute(not_null<UserData*> user, bool mute) {
 	)).done([=](const MTPUpdates &result) {
 		_channel->session().api().applyUpdates(result);
 	}).fail([=](const RPCError &error) {
-		if (error.type() == u"GROUP_CALL_FORBIDDEN"_q
-			&& (_state.current() == State::Joined
-				|| _state.current() == State::Connecting)) {
-			setState(State::Joining);
+		if (error.type() == u"GROUP_CALL_FORBIDDEN"_q) {
 			rejoin();
 		}
 	}).send();
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index ec089d1c9..db2a0aa62 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -129,6 +129,8 @@ private:
 	void setInstanceConnected(bool connected);
 	void checkLastSpoke();
 
+	void checkJoined();
+
 	[[nodiscard]] MTPInputGroupCall inputCall() const;
 
 	const not_null<Delegate*> _delegate;
@@ -150,6 +152,7 @@ private:
 	rpl::event_stream<LevelUpdate> _levelUpdates;
 	base::flat_map<uint32, crl::time> _lastSpoke;
 	base::Timer _lastSpokeCheckTimer;
+	base::Timer _checkJoinedTimer;
 
 	rpl::lifetime _lifetime;
 

From e66ad89a2aebf43ee34e98fa2b23713821312f12 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 29 Nov 2020 18:18:51 +0300
Subject: [PATCH 189/370] Load unknown participants by source.

---
 .../SourceFiles/calls/calls_group_members.cpp |   3 -
 Telegram/SourceFiles/data/data_group_call.cpp | 112 ++++++++++++++----
 Telegram/SourceFiles/data/data_group_call.h   |  15 ++-
 3 files changed, 105 insertions(+), 25 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index d48596eeb..6b82e31f5 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -465,9 +465,6 @@ void MembersController::updateRow(
 //	if (const auto row = findRow(user)) {
 //		const auto result = row->updateLevel(level);
 //		if (result.stateChanged) {
-//			// #TODO calls reorder.
-//		}
-//		if (result.stateChanged) {
 //			delegate()->peerListUpdateRow(row);
 //		}
 //		if (result.nextUpdateTime) {
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index 82347da02..976c6447b 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -31,8 +31,9 @@ GroupCall::GroupCall(
 }
 
 GroupCall::~GroupCall() {
-	_channel->session().api().request(_participantsRequestId).cancel();
-	_channel->session().api().request(_reloadRequestId).cancel();
+	api().request(_unknownSourcesRequestId).cancel();
+	api().request(_participantsRequestId).cancel();
+	api().request(_reloadRequestId).cancel();
 }
 
 uint64 GroupCall::id() const {
@@ -61,8 +62,7 @@ void GroupCall::requestParticipants() {
 		reload();
 		return;
 	}
-	auto &api = _channel->session().api();
-	_participantsRequestId = api.request(MTPphone_GetGroupParticipants(
+	_participantsRequestId = api().request(MTPphone_GetGroupParticipants(
 		input(),
 		MTP_vector<MTPint>(), // ids
 		MTP_vector<MTPint>(), // sources
@@ -72,7 +72,9 @@ void GroupCall::requestParticipants() {
 		result.match([&](const MTPDphone_groupParticipants &data) {
 			_nextOffset = qs(data.vnext_offset());
 			_channel->owner().processUsers(data.vusers());
-			applyParticipantsSlice(data.vparticipants().v);
+			applyParticipantsSlice(
+				data.vparticipants().v,
+				ApplySliceSource::SliceLoaded);
 			_fullCount = data.vcount().v;
 			if (!_allReceived
 				&& (data.vparticipants().v.size() < kRequestPerPage)) {
@@ -152,16 +154,19 @@ void GroupCall::reload() {
 	if (_reloadRequestId) {
 		return;
 	} else if (_participantsRequestId) {
-		_channel->session().api().request(_participantsRequestId).cancel();
+		api().request(_participantsRequestId).cancel();
 		_participantsRequestId = 0;
 	}
-	_reloadRequestId = _channel->session().api().request(
+	_reloadRequestId = api().request(
 		MTPphone_GetGroupCall(input())
 	).done([=](const MTPphone_GroupCall &result) {
 		result.match([&](const MTPDphone_groupCall &data) {
 			_channel->owner().processUsers(data.vusers());
 			_participants.clear();
-			applyParticipantsSlice(data.vparticipants().v);
+			_userBySource.clear();
+			applyParticipantsSlice(
+				data.vparticipants().v,
+				ApplySliceSource::SliceLoaded);
 			applyCall(data.vcall(), true);
 			_allReceived = (_fullCount.current() == _participants.size());
 			_participantsSliceAdded.fire({});
@@ -174,8 +179,11 @@ void GroupCall::reload() {
 
 void GroupCall::applyParticipantsSlice(
 		const QVector<MTPGroupCallParticipant> &list,
-		bool sendIndividualUpdates) {
-	auto fullCount = _fullCount.current();
+		ApplySliceSource sliceSource) {
+	if (sliceSource != ApplySliceSource::UnknownLoaded) {
+		return;
+	}
+	auto changedCount = _fullCount.current();
 	for (const auto &participant : list) {
 		participant.match([&](const MTPDgroupCallParticipant &data) {
 			const auto userId = data.vuser_id().v;
@@ -191,12 +199,12 @@ void GroupCall::applyParticipantsSlice(
 					};
 					_userBySource.erase(i->source);
 					_participants.erase(i);
-					if (sendIndividualUpdates) {
+					if (sliceSource != ApplySliceSource::SliceLoaded) {
 						_participantUpdates.fire(std::move(update));
 					}
 				}
-				if (fullCount > _participants.size()) {
-					--fullCount;
+				if (changedCount > _participants.size()) {
+					--changedCount;
 				}
 				return;
 			}
@@ -216,7 +224,7 @@ void GroupCall::applyParticipantsSlice(
 				_userBySource.emplace(value.source, user);
 				_participants.push_back(value);
 				_channel->owner().unregisterInvitedToCallUser(_id, user);
-				++fullCount;
+				++changedCount;
 			} else {
 				if (i->source != value.source) {
 					_userBySource.erase(i->source);
@@ -224,13 +232,17 @@ void GroupCall::applyParticipantsSlice(
 				}
 				*i = value;
 			}
-			_participantUpdates.fire({
-				.was = was,
-				.now = value,
-			});
+			if (sliceSource != ApplySliceSource::SliceLoaded) {
+				_participantUpdates.fire({
+					.was = was,
+					.now = value,
+				});
+			}
 		});
 	}
-	_fullCount = fullCount;
+	if (sliceSource == ApplySliceSource::UpdateReceived) {
+		_fullCount = changedCount;
+	}
 }
 
 void GroupCall::applyParticipantsMutes(
@@ -265,7 +277,8 @@ void GroupCall::applyParticipantsMutes(
 void GroupCall::applyLastSpoke(uint32 source, crl::time when, crl::time now) {
 	const auto i = _userBySource.find(source);
 	if (i == end(_userBySource)) {
-		// #TODO calls load participant by source from server.
+		_unknownSpokenSources.emplace(source, when);
+		requestUnknownSources();
 		return;
 	}
 	const auto j = ranges::find(_participants, i->second, &Participant::user);
@@ -282,6 +295,57 @@ void GroupCall::applyLastSpoke(uint32 source, crl::time when, crl::time now) {
 	}
 }
 
+void GroupCall::requestUnknownSources() {
+	if (_unknownSourcesRequestId || _unknownSpokenSources.empty()) {
+		return;
+	}
+	const auto sources = [&] {
+		if (_unknownSpokenSources.size() < kRequestPerPage) {
+			return base::take(_unknownSpokenSources);
+		}
+		auto result = base::flat_map<uint32, crl::time>();
+		result.reserve(kRequestPerPage);
+		while (result.size() < kRequestPerPage) {
+			const auto [source, when] = _unknownSpokenSources.back();
+			result.emplace(source, when);
+			_unknownSpokenSources.erase(_unknownSpokenSources.end() - 1);
+		}
+		return result;
+	}();
+	auto sourceInputs = QVector<MTPint>();
+	sourceInputs.reserve(sources.size());
+	for (const auto [source, when] : sources) {
+		sourceInputs.push_back(MTP_int(source));
+	}
+	_unknownSourcesRequestId = api().request(MTPphone_GetGroupParticipants(
+		input(),
+		MTP_vector<MTPint>(), // ids
+		MTP_vector<MTPint>(sourceInputs),
+		MTP_string(QString()),
+		MTP_int(kRequestPerPage)
+	)).done([=](const MTPphone_GroupParticipants &result) {
+		result.match([&](const MTPDphone_groupParticipants &data) {
+			_channel->owner().processUsers(data.vusers());
+			applyParticipantsSlice(
+				data.vparticipants().v,
+				ApplySliceSource::UnknownLoaded);
+		});
+		_unknownSourcesRequestId = 0;
+		const auto now = crl::now();
+		for (const auto [source, when] : sources) {
+			applyLastSpoke(source, when, now);
+			_unknownSpokenSources.remove(source);
+		}
+		requestUnknownSources();
+	}).fail([=](const RPCError &error) {
+		_unknownSourcesRequestId = 0;
+		for (const auto [source, when] : sources) {
+			_unknownSpokenSources.remove(source);
+		}
+		requestUnknownSources();
+	}).send();
+}
+
 void GroupCall::applyUpdate(const MTPDupdateGroupCallParticipants &update) {
 	const auto version = update.vversion().v;
 	if (version < _version) {
@@ -300,7 +364,9 @@ void GroupCall::applyUpdate(const MTPDupdateGroupCallParticipants &update) {
 
 void GroupCall::applyUpdateChecked(
 		const MTPDupdateGroupCallParticipants &update) {
-	applyParticipantsSlice(update.vparticipants().v, true);
+	applyParticipantsSlice(
+		update.vparticipants().v,
+		ApplySliceSource::UpdateReceived);
 }
 
 void GroupCall::setJoinMutedLocally(bool muted) {
@@ -315,4 +381,8 @@ bool GroupCall::canChangeJoinMuted() const {
 	return _canChangeJoinMuted;
 }
 
+ApiWrap &GroupCall::api() const {
+	return _channel->session().api();
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 1b5e04e76..2ee4b2901 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -10,6 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 class UserData;
 class ChannelData;
 
+class ApiWrap;
+
 namespace Data {
 
 class GroupCall final {
@@ -60,12 +62,20 @@ public:
 	[[nodiscard]] bool canChangeJoinMuted() const;
 
 private:
+	enum class ApplySliceSource {
+		SliceLoaded,
+		UnknownLoaded,
+		UpdateReceived,
+	};
+	[[nodiscard]] ApiWrap &api() const;
+
 	void applyCall(const MTPGroupCall &call, bool force);
 	void applyParticipantsSlice(
 		const QVector<MTPGroupCallParticipant> &list,
-		bool sendIndividualUpdates = false);
+		ApplySliceSource sliceSource);
 	void applyParticipantsMutes(
 		const MTPDupdateGroupCallParticipants &update);
+	void requestUnknownSources();
 
 	const not_null<ChannelData*> _channel;
 	const uint64 _id = 0;
@@ -80,6 +90,9 @@ private:
 	QString _nextOffset;
 	rpl::variable<int> _fullCount = 0;
 
+	base::flat_map<uint32, crl::time> _unknownSpokenSources;
+	mtpRequestId _unknownSourcesRequestId = 0;
+
 	rpl::event_stream<ParticipantUpdate> _participantUpdates;
 	rpl::event_stream<> _participantsSliceAdded;
 

From d40768f6b06f9fac0d544eb3f2a98fce34b4ea9b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 29 Nov 2020 21:26:49 +0300
Subject: [PATCH 190/370] Use separate styles for group call boxes.

---
 Telegram/SourceFiles/boxes/boxes.style        |  78 +--------
 .../boxes/dictionaries_manager.cpp            |   2 +-
 .../boxes/filters/edit_filter_chats_list.cpp  |   4 +-
 Telegram/SourceFiles/boxes/language_box.cpp   |   6 +-
 .../SourceFiles/boxes/local_storage_box.cpp   |   2 +-
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |  60 ++++---
 Telegram/SourceFiles/boxes/peer_list_box.h    |  22 ++-
 Telegram/SourceFiles/boxes/share_box.cpp      |   2 +-
 .../SourceFiles/boxes/single_choice_box.cpp   |  11 +-
 .../SourceFiles/boxes/single_choice_box.h     |  10 +-
 Telegram/SourceFiles/boxes/stickers_box.cpp   |   2 +-
 Telegram/SourceFiles/calls/calls.style        | 158 +++++++++++++++---
 .../SourceFiles/calls/calls_group_members.cpp |   5 +-
 .../SourceFiles/calls/calls_group_panel.cpp   |  12 +-
 .../calls/calls_group_settings.cpp            |  18 +-
 .../chat_helpers/chat_helpers.style           |   4 +-
 .../chat_helpers/emoji_sets_manager.cpp       |   2 +-
 Telegram/SourceFiles/data/data_group_call.cpp |   3 -
 .../info_common_groups_inner_widget.cpp       |   4 +-
 Telegram/SourceFiles/info/info.style          |  12 +-
 .../polls/info_polls_results_inner_widget.cpp |   4 +-
 .../info/profile/info_profile_members.cpp     |   4 +-
 Telegram/SourceFiles/overview/overview.style  |   2 +-
 Telegram/SourceFiles/passport/passport.style  |   2 +-
 Telegram/SourceFiles/settings/settings.style  |   5 -
 .../SourceFiles/settings/settings_calls.cpp   |  16 +-
 .../SourceFiles/settings/settings_calls.h     |  13 +-
 .../SourceFiles/settings/settings_common.cpp  |   2 +-
 Telegram/SourceFiles/ui/countryinput.cpp      |   4 +-
 Telegram/SourceFiles/ui/widgets/level_meter.h |   2 +-
 .../window/themes/window_theme_editor.cpp     |   4 +-
 Telegram/SourceFiles/window/window.style      |   2 +-
 .../window/window_media_preview.cpp           |   3 +-
 Telegram/lib_ui                               |   2 +-
 34 files changed, 300 insertions(+), 182 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index e52f6e7a8..82d7dfda6 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -153,74 +153,6 @@ contactsAboutFg: windowSubTextFgOver;
 contactsAboutTop: 60px;
 contactsAboutBottom: 19px;
 
-contactsSearchField: InputField(defaultInputField) {
-	textBg: transparent;
-	textMargins: margins(2px, 7px, 2px, 0px);
-
-	placeholderFg: placeholderFg;
-	placeholderFgActive: placeholderFgActive;
-	placeholderFgError: placeholderFgActive;
-	placeholderMargins: margins(2px, 0px, 2px, 0px);
-	placeholderScale: 0.;
-	placeholderFont: normalFont;
-
-	border: 0px;
-	borderActive: 0px;
-
-	heightMin: 32px;
-
-	font: normalFont;
-}
-contactsSearchCancel: CrossButton {
-	width: 44px;
-	height: 44px;
-
-	cross: CrossAnimation {
-		size: 36px;
-		skip: 12px;
-		stroke: 2px;
-		minScale: 0.3;
-	}
-	crossFg: boxTitleCloseFg;
-	crossFgOver: boxTitleCloseFgOver;
-	crossPosition: point(4px, 4px);
-
-	duration: 150;
-	loadingPeriod: 1000;
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: windowBgOver;
-	}
-}
-contactsMultiSelect: MultiSelect {
-	bg: boxSearchBg;
-	padding: margins(8px, 6px, 8px, 6px);
-	maxHeight: 104px;
-	scroll: ScrollArea(defaultSolidScroll) {
-		deltat: 3px;
-		deltab: 3px;
-		round: 1px;
-		width: 8px;
-		deltax: 3px;
-		hiding: 1000;
-	}
-
-	item: defaultMultiSelectItem;
-	itemSkip: 8px;
-
-	field: contactsSearchField;
-	fieldMinWidth: 42px;
-	fieldIcon: boxFieldSearchIcon;
-	fieldIconSkip: 36px;
-
-	fieldCancel: contactsSearchCancel;
-	fieldCancelSkip: 40px;
-}
-contactsPhotoCheckIcon: defaultPeerListCheckIcon;
-contactsPhotoCheck: defaultPeerListCheck;
-contactsPhotoCheckbox: defaultPeerListCheckbox;
-contactsPhotoDisabledCheckFg: menuIconFg;
-contactsRipple: defaultRippleAnimation;
-
 contactsMarginTop: 4px;
 contactsMarginBottom: 4px;
 membersMarginTop: 10px;
@@ -241,7 +173,7 @@ peerListBox: PeerList(defaultPeerList) {
 		button: OutlineButton(defaultPeerListButton) {
 			textBg: contactsBg;
 			textBgOver: contactsBgOver;
-			ripple: contactsRipple;
+			ripple: defaultRippleAnimation;
 		}
 		statusFg: contactsStatusFg;
 		statusFgOver: contactsStatusFgOver;
@@ -282,7 +214,7 @@ localStorageLimitMargin: margins(22px, 5px, 20px, 10px);
 shareRowsTop: 12px;
 shareRowHeight: 108px;
 sharePhotoTop: 6px;
-sharePhotoCheckbox: RoundImageCheckbox(contactsPhotoCheckbox) {
+sharePhotoCheckbox: RoundImageCheckbox(defaultPeerListCheckbox) {
 	imageRadius: 28px;
 	imageSmallRadius: 24px;
 }
@@ -697,10 +629,10 @@ muteChatTitle: FlatLabel(boxLabel) {
 }
 muteChatTitleLeft: 50px;
 
-groupStickersRemove: contactsSearchCancel;
+groupStickersRemove: defaultMultiSelectSearchCancel;
 groupStickersRemovePosition: point(6px, 6px);
 groupStickersFieldPadding: margins(8px, 6px, 8px, 6px);
-groupStickersField: InputField(contactsSearchField) {
+groupStickersField: InputField(defaultMultiSelectSearchField) {
 	placeholderFont: boxTextFont;
 	font: boxTextFont;
 	placeholderMargins: margins(0px, 0px, 0px, 0px);
@@ -960,7 +892,7 @@ pollResultsVotesCount: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
 }
 pollResultsHeaderPadding: margins(22px, 22px, 22px, 8px);
-pollResultsShowMore: SettingsButton {
+pollResultsShowMore: SettingsButton(defaultSettingsButton) {
 	textFg: lightButtonFg;
 	textFgOver: lightButtonFgOver;
 	textBg: windowBg;
diff --git a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
index 5bf50e809..e8caa8404 100644
--- a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
+++ b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
@@ -91,7 +91,7 @@ QString StateDescription(const DictState &state) {
 auto CreateMultiSelect(QWidget *parent) {
 	const auto result = Ui::CreateChild<Ui::MultiSelect>(
 		parent,
-		st::contactsMultiSelect,
+		st::defaultMultiSelect,
 		tr::lng_participant_filter());
 
 	result->resizeToWidth(st::boxWidth);
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
index 427a803fb..33ff95351 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
@@ -423,10 +423,10 @@ object_ptr<Ui::RpWidget> EditFilterChatsListController::prepareTypesList() {
 		&session(),
 		_options,
 		_selected);
+	controller->setStyleOverrides(&st::windowFilterSmallList);
 	const auto content = result->add(object_ptr<PeerListContent>(
 		container,
-		controller,
-		st::windowFilterSmallList));
+		controller));
 	delegate->setContent(content);
 	controller->setDelegate(delegate);
 	for (const auto flag : kAllTypes) {
diff --git a/Telegram/SourceFiles/boxes/language_box.cpp b/Telegram/SourceFiles/boxes/language_box.cpp
index 53ba3f53e..80d7dc7f4 100644
--- a/Telegram/SourceFiles/boxes/language_box.cpp
+++ b/Telegram/SourceFiles/boxes/language_box.cpp
@@ -880,7 +880,7 @@ void Content::setupContent(
 		const auto inner = wrap->entity();
 		inner->add(object_ptr<Ui::FixedHeightWidget>(
 			inner,
-			st::boxVerticalMargin));
+			st::defaultBox.margin.top()));
 		const auto rows = inner->add(object_ptr<Rows>(
 			inner,
 			list,
@@ -888,7 +888,7 @@ void Content::setupContent(
 			areOfficial));
 		inner->add(object_ptr<Ui::FixedHeightWidget>(
 			inner,
-			st::boxVerticalMargin));
+			st::defaultBox.margin.top()));
 
 		rows->isEmpty() | rpl::start_with_next([=](bool empty) {
 			wrap->toggle(!empty, anim::type::instant);
@@ -1153,7 +1153,7 @@ void LanguageBox::setInnerFocus() {
 not_null<Ui::MultiSelect*> LanguageBox::createMultiSelect() {
 	const auto result = Ui::CreateChild<Ui::MultiSelect>(
 		this,
-		st::contactsMultiSelect,
+		st::defaultMultiSelect,
 		tr::lng_participant_filter());
 	result->resizeToWidth(st::boxWidth);
 	result->moveToLeft(0, 0);
diff --git a/Telegram/SourceFiles/boxes/local_storage_box.cpp b/Telegram/SourceFiles/boxes/local_storage_box.cpp
index 389208dfc..82fafb972 100644
--- a/Telegram/SourceFiles/boxes/local_storage_box.cpp
+++ b/Telegram/SourceFiles/boxes/local_storage_box.cpp
@@ -360,7 +360,7 @@ void LocalStorageBox::clearByTag(uint16 tag) {
 void LocalStorageBox::setupControls() {
 	const auto container = setInnerWidget(
 		object_ptr<Ui::VerticalLayout>(this),
-		st::contactsMultiSelect.scroll);
+		st::defaultMultiSelect.scroll);
 	const auto createRow = [&](
 			uint16 tag,
 			Fn<QString(size_type)> title,
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 8754a149e..5a957773b 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -67,7 +67,9 @@ void PeerListBox::createMultiSelect() {
 
 	auto entity = object_ptr<Ui::MultiSelect>(
 		this,
-		st::contactsMultiSelect,
+		(_controller->selectSt()
+			? *_controller->selectSt()
+			: st::defaultMultiSelect),
 		tr::lng_participant_filter());
 	_select.create(this, std::move(entity));
 	_select->heightValue(
@@ -117,8 +119,7 @@ void PeerListBox::prepare() {
 	setContent(setInnerWidget(
 		object_ptr<PeerListContent>(
 			this,
-			_controller.get(),
-			st::peerListBox),
+			_controller.get()),
 		st::boxScroll));
 	content()->resizeToWidth(_controller->contentWidth());
 
@@ -178,8 +179,12 @@ void PeerListBox::resizeEvent(QResizeEvent *e) {
 
 void PeerListBox::paintEvent(QPaintEvent *e) {
 	Painter p(this);
+
+	const auto &bg = (_controller->listSt()
+		? *_controller->listSt()
+		: st::peerListBox).bg;
 	for (const auto rect : e->region()) {
-		p.fillRect(rect, st::contactsBg);
+		p.fillRect(rect, bg);
 	}
 }
 
@@ -248,6 +253,14 @@ PeerListController::PeerListController(std::unique_ptr<PeerListSearchController>
 	}
 }
 
+const style::PeerList &PeerListController::computeListSt() const {
+	return _listSt ? *_listSt : st::peerListBox;
+}
+
+const style::MultiSelect &PeerListController::computeSelectSt() const {
+	return _selectSt ? *_selectSt : st::defaultMultiSelect;
+}
+
 bool PeerListController::hasComplexSearch() const {
 	return (_searchController != nullptr);
 }
@@ -279,7 +292,8 @@ void PeerListController::setDescriptionText(const QString &text) {
 	if (text.isEmpty()) {
 		setDescription(nullptr);
 	} else {
-		setDescription(object_ptr<Ui::FlatLabel>(nullptr, text, st::membersAbout));
+		const auto &st = _listSt ? *_listSt : st::peerListBox;
+		setDescription(object_ptr<Ui::FlatLabel>(nullptr, text, computeListSt().about));
 	}
 }
 
@@ -353,17 +367,20 @@ void PeerListBox::addSelectItem(
 		createMultiSelect();
 		_select->hide(anim::type::instant);
 	}
+	const auto &activeBg = (_controller->selectSt()
+		? *_controller->selectSt()
+		: st::defaultMultiSelect).item.textActiveBg;
 	if (animated == anim::type::instant) {
 		_select->entity()->addItemInBunch(
 			itemId,
 			text,
-			st::activeButtonBg,
+			activeBg,
 			std::move(paintUserpic));
 	} else {
 		_select->entity()->addItem(
 			itemId,
 			text,
-			st::activeButtonBg,
+			activeBg,
 			std::move(paintUserpic));
 	}
 }
@@ -606,21 +623,21 @@ void PeerListRow::paintDisabledCheckUserpic(
 		int x,
 		int y,
 		int outerWidth) const {
-	auto userpicRadius = st::contactsPhotoCheckbox.imageSmallRadius;
-	auto userpicShift = st::contactsPhotoCheckbox.imageRadius - userpicRadius;
-	auto userpicDiameter = st::contactsPhotoCheckbox.imageRadius * 2;
+	auto userpicRadius = st.checkbox.imageSmallRadius;
+	auto userpicShift = st.checkbox.imageRadius - userpicRadius;
+	auto userpicDiameter = st.checkbox.imageRadius * 2;
 	auto userpicLeft = x + userpicShift;
 	auto userpicTop = y + userpicShift;
 	auto userpicEllipse = style::rtlrect(x, y, userpicDiameter, userpicDiameter, outerWidth);
-	auto userpicBorderPen = st::contactsPhotoDisabledCheckFg->p;
-	userpicBorderPen.setWidth(st::contactsPhotoCheckbox.selectWidth);
+	auto userpicBorderPen = st.disabledCheckFg->p;
+	userpicBorderPen.setWidth(st.checkbox.selectWidth);
 
-	auto iconDiameter = st::contactsPhotoCheckbox.check.size;
-	auto iconLeft = x + userpicDiameter + st::contactsPhotoCheckbox.selectWidth - iconDiameter;
-	auto iconTop = y + userpicDiameter + st::contactsPhotoCheckbox.selectWidth - iconDiameter;
+	auto iconDiameter = st.checkbox.check.size;
+	auto iconLeft = x + userpicDiameter + st.checkbox.selectWidth - iconDiameter;
+	auto iconTop = y + userpicDiameter + st.checkbox.selectWidth - iconDiameter;
 	auto iconEllipse = style::rtlrect(iconLeft, iconTop, iconDiameter, iconDiameter, outerWidth);
-	auto iconBorderPen = st::contactsPhotoCheckbox.check.border->p;
-	iconBorderPen.setWidth(st::contactsPhotoCheckbox.selectWidth);
+	auto iconBorderPen = st.checkbox.check.border->p;
+	iconBorderPen.setWidth(st.checkbox.selectWidth);
 
 	if (_isSavedMessagesChat) {
 		Ui::EmptyUserpic::PaintSavedMessages(p, userpicLeft, userpicTop, outerWidth, userpicRadius * 2);
@@ -638,11 +655,11 @@ void PeerListRow::paintDisabledCheckUserpic(
 		p.drawEllipse(userpicEllipse);
 
 		p.setPen(iconBorderPen);
-		p.setBrush(st::contactsPhotoDisabledCheckFg);
+		p.setBrush(st.disabledCheckFg);
 		p.drawEllipse(iconEllipse);
 	}
 
-	st::contactsPhotoCheckbox.check.check.paint(p, iconEllipse.topLeft(), outerWidth);
+	st.checkbox.check.check.paint(p, iconEllipse.topLeft(), outerWidth);
 }
 
 void PeerListRow::setStatusText(const QString &text) {
@@ -679,10 +696,9 @@ void PeerListRow::setCheckedInternal(bool checked, anim::type animated) {
 
 PeerListContent::PeerListContent(
 	QWidget *parent,
-	not_null<PeerListController*> controller,
-	const style::PeerList &st)
+	not_null<PeerListController*> controller)
 : RpWidget(parent)
-, _st(st)
+, _st(controller->computeListSt())
 , _controller(controller)
 , _rowHeight(_st.item.height) {
 	_controller->session().downloaderTaskFinished(
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index fa263606f..f5cedcbbc 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace style {
 struct PeerList;
 struct PeerListItem;
+struct MultiSelect;
 } // namespace style
 
 namespace Main {
@@ -371,6 +372,21 @@ public:
 		prepare();
 	}
 
+	void setStyleOverrides(
+			const style::PeerList *listSt,
+			const style::MultiSelect *selectSt = nullptr) {
+		_listSt = listSt;
+		_selectSt = selectSt;
+	}
+	const style::PeerList *listSt() const {
+		return _listSt;
+	}
+	const style::MultiSelect *selectSt() const {
+		return _selectSt;
+	}
+	const style::PeerList &computeListSt() const;
+	const style::MultiSelect &computeSelectSt() const;
+
 	virtual void prepare() = 0;
 	virtual void rowClicked(not_null<PeerListRow*> row) = 0;
 	virtual Main::Session &session() const = 0;
@@ -457,6 +473,9 @@ private:
 	PeerListDelegate *_delegate = nullptr;
 	std::unique_ptr<PeerListSearchController> _searchController = nullptr;
 
+	const style::PeerList *_listSt = nullptr;
+	const style::MultiSelect *_selectSt = nullptr;
+
 	rpl::lifetime _lifetime;
 
 };
@@ -478,8 +497,7 @@ class PeerListContent
 public:
 	PeerListContent(
 		QWidget *parent,
-		not_null<PeerListController*> controller,
-		const style::PeerList &st);
+		not_null<PeerListController*> controller);
 
 	void selectSkip(int direction);
 	void selectSkipPage(int height, int direction);
diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index da1dd35fb..1b24f3b06 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -166,7 +166,7 @@ ShareBox::ShareBox(
 , _filterCallback(std::move(filterCallback))
 , _select(
 	this,
-	st::contactsMultiSelect,
+	st::defaultMultiSelect,
 	tr::lng_participant_filter())
 , _comment(
 	this,
diff --git a/Telegram/SourceFiles/boxes/single_choice_box.cpp b/Telegram/SourceFiles/boxes/single_choice_box.cpp
index 882b093a1..ea2cf9a10 100644
--- a/Telegram/SourceFiles/boxes/single_choice_box.cpp
+++ b/Telegram/SourceFiles/boxes/single_choice_box.cpp
@@ -21,11 +21,15 @@ SingleChoiceBox::SingleChoiceBox(
 	rpl::producer<QString> title,
 	const std::vector<QString> &optionTexts,
 	int initialSelection,
-	Fn<void(int)> callback)
+	Fn<void(int)> callback,
+	const style::Checkbox *st,
+	const style::Radio *radioSt)
 : _title(std::move(title))
 , _optionTexts(optionTexts)
 , _initialSelection(initialSelection)
-, _callback(callback) {
+, _callback(callback)
+, _st(st ? *st : st::defaultBoxCheckbox)
+, _radioSt(radioSt ? *radioSt : st::defaultRadio) {
 }
 
 void SingleChoiceBox::prepare() {
@@ -47,7 +51,8 @@ void SingleChoiceBox::prepare() {
 				group,
 				i,
 				text,
-				st::defaultBoxCheckbox),
+				_st,
+				_radioSt),
 			QMargins(
 				st::boxPadding.left() + st::boxOptionListPadding.left(),
 				0,
diff --git a/Telegram/SourceFiles/boxes/single_choice_box.h b/Telegram/SourceFiles/boxes/single_choice_box.h
index a5c93f5a6..2a83c8e29 100644
--- a/Telegram/SourceFiles/boxes/single_choice_box.h
+++ b/Telegram/SourceFiles/boxes/single_choice_box.h
@@ -14,6 +14,10 @@ namespace Ui {
 class Radiobutton;
 } // namespace Ui
 
+namespace style {
+struct Checkbox;
+} // namespace style
+
 class SingleChoiceBox : public Ui::BoxContent {
 public:
 	SingleChoiceBox(
@@ -21,7 +25,9 @@ public:
 		rpl::producer<QString> title,
 		const std::vector<QString> &optionTexts,
 		int initialSelection,
-		Fn<void(int)> callback);
+		Fn<void(int)> callback,
+		const style::Checkbox *st = nullptr,
+		const style::Radio *radioSt = nullptr);
 
 protected:
 	void prepare() override;
@@ -31,6 +37,8 @@ private:
 	std::vector<QString> _optionTexts;
 	int _initialSelection = 0;
 	Fn<void(int)> _callback;
+	const style::Checkbox &_st;
+	const style::Radio &_radioSt;
 
 };
 
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 5ed95a24b..37508535f 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -1436,7 +1436,7 @@ void StickersBox::Inner::setPressed(SelectedRow pressed) {
 		auto &set = _rows[pressedIndex];
 		auto rippleMask = Ui::RippleAnimation::rectMask(QSize(width(), _rowHeight));
 		if (!set->ripple) {
-			set->ripple = std::make_unique<Ui::RippleAnimation>(st::contactsRipple, std::move(rippleMask), [this, pressedIndex] {
+			set->ripple = std::make_unique<Ui::RippleAnimation>(st::defaultRippleAnimation, std::move(rippleMask), [this, pressedIndex] {
 				update(0, _itemsTop + pressedIndex * _rowHeight, width(), _rowHeight);
 			});
 		}
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index eedd87c6b..77f2fa24e 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 using "ui/basic.style";
 
 using "ui/widgets/widgets.style";
+using "ui/layers/layers.style";
 using "window/window.style";
 
 CallSignalBars {
@@ -408,32 +409,76 @@ groupCallHeight: 580px;
 groupCallRipple: RippleAnimation(defaultRippleAnimation) {
 	color: groupCallMembersRipple;
 }
-groupCallMembersList: PeerList(defaultPeerList) {
-	item: PeerListItem(defaultPeerListItem) {
-		button: OutlineButton(defaultPeerListButton) {
-			textBg: groupCallMembersBg;
-			textBgOver: groupCallMembersBg;
+groupCallMembersListItem: PeerListItem(defaultPeerListItem) {
+	button: OutlineButton(defaultPeerListButton) {
+		textBg: groupCallMembersBg;
+		textBgOver: groupCallMembersBg;
 
-			textFg: groupCallMemberInactiveStatus;
-			textFgOver: groupCallMemberInactiveStatus;
+		textFg: groupCallMemberInactiveStatus;
+		textFgOver: groupCallMemberInactiveStatus;
 
-			font: normalFont;
-			padding: margins(11px, 5px, 11px, 5px);
+		font: normalFont;
+		padding: margins(11px, 5px, 11px, 5px);
 
-			ripple: groupCallRipple;
+		ripple: groupCallRipple;
+	}
+	disabledCheckFg: groupCallMemberNotJoinedStatus;
+	checkbox: RoundImageCheckbox(defaultPeerListCheckbox) {
+		selectFg: groupCallActiveFg;
+		check: RoundCheckbox(defaultPeerListCheck) {
+			border: groupCallMembersBg;
+			bgActive: groupCallActiveFg;
+			check: icon {{ "default_checkbox_check", groupCallMembersFg, point(3px, 6px) }};
 		}
-		height: 52px;
-		photoPosition: point(12px, 6px);
-		namePosition: point(68px, 7px);
-		statusPosition: point(68px, 26px);
-		photoSize: 40px;
-		nameFg: groupCallMembersFg;
-		nameFgChecked: groupCallMembersFg;
-		statusFg: groupCallMemberInactiveStatus;
-		statusFgOver: groupCallMemberInactiveStatus;
-		statusFgActive: groupCallMemberActiveStatus;
+	}
+	height: 52px;
+	photoPosition: point(12px, 6px);
+	namePosition: point(68px, 7px);
+	statusPosition: point(68px, 26px);
+	photoSize: 40px;
+	nameFg: groupCallMembersFg;
+	nameFgChecked: groupCallMembersFg;
+	statusFg: groupCallMemberInactiveStatus;
+	statusFgOver: groupCallMemberInactiveStatus;
+	statusFgActive: groupCallMemberActiveStatus;
+}
+groupCallMembersList: PeerList(defaultPeerList) {
+	bg: groupCallMembersBg;
+	about: FlatLabel(defaultPeerListAbout) {
+		textFg: groupCallMemberInactiveStatus;
+	}
+	item: groupCallMembersListItem;
+}
+groupCallInviteMembersList: PeerList(groupCallMembersList) {
+	item: PeerListItem(groupCallMembersListItem) {
+		statusFg: groupCallMemberNotJoinedStatus;
+		statusFgOver: groupCallMemberNotJoinedStatus;
+		statusFgActive: groupCallMemberInactiveStatus;
 	}
 }
+groupCallMultiSelect: MultiSelect(defaultMultiSelect) {
+	bg: groupCallMembersBg;
+	item: MultiSelectItem(defaultMultiSelectItem) {
+		textBg: groupCallMembersRipple;
+		textFg: groupCallMembersFg;
+		textActiveBg: groupCallActiveFg;
+		textActiveFg: groupCallMembersFg;
+		deleteFg: groupCallMembersFg;
+	}
+	field: InputField(defaultMultiSelectSearchField) {
+		textFg: groupCallMembersFg;
+		placeholderFg: groupCallMemberNotJoinedStatus;
+		placeholderFgActive: groupCallMemberNotJoinedStatus;
+		placeholderFgError: groupCallMemberNotJoinedStatus;
+	}
+	fieldIcon: icon {{ "box_search", groupCallMemberNotJoinedStatus, point(10px, 9px) }};
+	fieldCancel: CrossButton(defaultMultiSelectSearchCancel) {
+		crossFg: groupCallMemberNotJoinedStatus;
+		crossFgOver: groupCallMemberNotJoinedStatus;
+		ripple: groupCallRipple;
+	}
+}
+
 groupCallMembersHeader: 47px;
 groupCallMembersMargin: margins(16px, 16px, 16px, 28px);
 groupCallAddMember: IconButton(defaultIconButton) {
@@ -505,3 +550,76 @@ groupCallTopBarJoin: RoundButton(defaultActiveButton) {
 	height: 28px;
 	textTop: 5px;
 }
+groupCallBox: Box(defaultBox) {
+	button: RoundButton(defaultBoxButton) {
+		textFg: groupCallActiveFg;
+		textFgOver: groupCallActiveFg;
+		numbersTextFg: groupCallActiveFg;
+		numbersTextFgOver: groupCallActiveFg;
+		textBg: groupCallMembersBg;
+		textBgOver: groupCallBoxButtonBgOver;
+
+		ripple: RippleAnimation(defaultRippleAnimation) {
+			color: groupCallBoxButtonBgRipple;
+		}
+	}
+	margin: margins(0px, 56px, 0px, 10px);
+	bg: groupCallMembersBg;
+	title: FlatLabel(boxTitle) {
+		textFg: groupCallMembersFg;
+	}
+	titleAdditionalFg: groupCallMemberNotJoinedStatus;
+}
+groupCallLayerBox: Box(groupCallBox) {
+	buttonPadding: margins(8px, 8px, 8px, 8px);
+}
+groupCallLevelMeter: LevelMeter(defaultLevelMeter) {
+	height: 18px;
+	lineWidth: 3px;
+	lineSpacing: 5px;
+	lineCount: 44;
+	activeFg: groupCallActiveFg;
+	inactiveFg: groupCallMemberNotJoinedStatus;
+}
+groupCallCheckboxIcon: icon {{ "default_checkbox_check", groupCallMembersFg, point(4px, 7px) }};
+groupCallCheck: Check(defaultCheck) {
+	untoggledFg: groupCallMemberNotJoinedStatus;
+	toggledFg: groupCallActiveFg;
+	icon: groupCallCheckboxIcon;
+}
+groupCallRadio: Radio(defaultRadio) {
+	untoggledFg: groupCallMemberNotJoinedStatus;
+	toggledFg: groupCallActiveFg;
+}
+groupCallCheckbox: Checkbox(defaultBoxCheckbox) {
+	textFg: groupCallMembersFg;
+	textFgActive: groupCallMembersFg;
+	rippleBg: groupCallMembersRipple;
+	rippleBgActive: groupCallBoxButtonBgRipple;
+}
+
+groupCallSettingsButton: SettingsButton {
+	textFg: groupCallMembersFg;
+	textFgOver: groupCallMembersFg;
+	textBg: groupCallMembersBg;
+	textBgOver: groupCallBoxButtonBgOver;
+
+	font: boxTextFont;
+	rightLabel: FlatLabel(defaultSettingsRightLabel) {
+		textFg: groupCallActiveFg;
+	}
+
+	height: 20px;
+	padding: margins(22px, 10px, 22px, 8px);
+
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: groupCallBoxButtonBgRipple;
+	}
+}
+groupCallSettingsAttentionButton: SettingsButton(groupCallSettingsButton) {
+	textFg: attentionButtonFg;
+	textFgOver: attentionButtonFgOver;
+}
+groupCallBoxLabel: FlatLabel(boxLabel) {
+	textFg: groupCallMembersFg;
+}
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 6b82e31f5..9531d0870 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -733,10 +733,11 @@ void GroupMembers::setupButtons(not_null<GroupCall*> call) {
 
 void GroupMembers::setupList() {
 	auto topSkip = _header ? _header->height() : 0;
+
+	_listController->setStyleOverrides(&st::groupCallMembersList);
 	_list = _scroll->setOwnedWidget(object_ptr<ListWidget>(
 		this,
-		_listController.get(),
-		st::groupCallMembersList));
+		_listController.get()));
 
 	sizeValue(
 	) | rpl::start_with_next([=](QSize size) {
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 143799ba5..76a5eca1c 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -173,16 +173,18 @@ void LeaveGroupCallBox(
 		bool discardChecked,
 		BoxContext context) {
 	box->setTitle(tr::lng_group_call_leave_title());
+	const auto inCall = (context == BoxContext::GroupCallPanel);
 	box->addRow(object_ptr<Ui::FlatLabel>(
 		box.get(),
 		tr::lng_group_call_leave_sure(),
-		st::boxLabel));
+		(inCall ? st::groupCallBoxLabel : st::boxLabel)));
 	const auto discard = call->channel()->canManageCall()
 		? box->addRow(object_ptr<Ui::Checkbox>(
 			box.get(),
 			tr::lng_group_call_end(),
 			discardChecked,
-			st::defaultBoxCheckbox),
+			(inCall ? st::groupCallCheckbox : st::defaultBoxCheckbox),
+			(inCall ? st::groupCallCheck : st::defaultCheck)),
 			style::margins(
 				st::boxRowPadding.left(),
 				st::boxRowPadding.left(),
@@ -224,6 +226,8 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 		.type = Ui::CallMuteButtonType::Connecting,
 	}))
 , _hangup(widget(), st::callHangup) {
+	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
+
 	initWindow();
 	initWidget();
 	initControls();
@@ -412,6 +416,10 @@ void GroupPanel::addMembers() {
 		_channel,
 		std::move(alreadyIn),
 		real->fullCount());
+	controller->setStyleOverrides(
+		&st::groupCallInviteMembersList,
+		&st::groupCallMultiSelect);
+
 	const auto weak = base::make_weak(_call);
 	auto initBox = [=, controller = controller.get()](
 			not_null<PeerListBox*> box) {
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
index 58f78d3b2..8e86943f6 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -89,7 +89,9 @@ void GroupCallSettingsBox(
 		? box->addRow(object_ptr<Ui::Checkbox>(
 			box.get(),
 			tr::lng_group_call_new_muted(),
-			joinMuted))
+			joinMuted,
+			st::groupCallCheckbox,
+			st::groupCallCheck))
 		: nullptr;
 	if (muteJoined) {
 		AddSkip(layout);
@@ -107,13 +109,13 @@ void GroupCallSettingsBox(
 		) | rpl::then(
 			state->outputNameStream.events()
 		),
-		st::settingsButton
+		st::groupCallSettingsButton
 	)->addClickHandler([=] {
 		box->getDelegate()->show(ChooseAudioInputBox(crl::guard(box, [=](
 				const QString &id,
 				const QString &name) {
 			state->outputNameStream.fire_copy(name);
-		})));
+		}), &st::groupCallCheckbox, &st::groupCallRadio));
 	});
 
 	AddButtonWithLabel(
@@ -124,20 +126,20 @@ void GroupCallSettingsBox(
 		) | rpl::then(
 			state->inputNameStream.events()
 		),
-		st::settingsButton
+		st::groupCallSettingsButton
 	)->addClickHandler([=] {
 		box->getDelegate()->show(ChooseAudioInputBox(crl::guard(box, [=](
 				const QString &id,
 				const QString &name) {
 			state->inputNameStream.fire_copy(name);
 			state->micTester->setDeviceId(id);
-		})));
+		}), &st::groupCallCheckbox, &st::groupCallRadio));
 	});
 
 	state->micTestLevel = box->addRow(
 		object_ptr<Ui::LevelMeter>(
 			box.get(),
-			st::defaultLevelMeter),
+			st::groupCallLevelMeter),
 		st::settingsLevelMeterPadding);
 	state->micTestLevel->resize(QSize(0, st::defaultLevelMeter.height));
 
@@ -174,7 +176,7 @@ void GroupCallSettingsBox(
 		AddButton(
 			layout,
 			tr::lng_group_call_share(),
-			st::settingsButton
+			st::groupCallSettingsButton
 		)->addClickHandler([=] {
 			if (!copyLink() && !state->generatingLink) {
 				state->generatingLink = true;
@@ -195,7 +197,7 @@ void GroupCallSettingsBox(
 		AddButton(
 			layout,
 			tr::lng_group_call_end(),
-			st::settingsAttentionButton
+			st::groupCallSettingsAttentionButton
 		)->addClickHandler([=] {
 			if (const auto call = weakCall.get()) {
 				box->getDelegate()->show(Box(
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 7c3cf0494..8b1f357ad 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -231,9 +231,9 @@ inlineBotsScroll: ScrollArea(defaultSolidScroll) {
 	deltab: stickerPanPadding;
 }
 
-gifsSearchField: contactsSearchField;
+gifsSearchField: defaultMultiSelectSearchField;
 gifsSearchFieldPosition: point(42px, 7px);
-gifsSearchCancel: contactsSearchCancel;
+gifsSearchCancel: defaultMultiSelectSearchCancel;
 gifsSearchCancelPosition: point(1px, 1px);
 gifsSearchIcon: boxFieldSearchIcon;
 gifsSearchIconPosition: point(6px, 7px);
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
index c6e37779e..2fc1331c2 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
@@ -221,7 +221,7 @@ void Inner::setupContent() {
 }
 
 Row::Row(QWidget *widget, not_null<Main::Session*> session, const Set &set)
-: RippleButton(widget, st::contactsRipple)
+: RippleButton(widget, st::defaultRippleAnimation)
 , _session(session)
 , _id(set.id)
 , _state(Available{ set.size }) {
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index 976c6447b..85d58eb32 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -180,9 +180,6 @@ void GroupCall::reload() {
 void GroupCall::applyParticipantsSlice(
 		const QVector<MTPGroupCallParticipant> &list,
 		ApplySliceSource sliceSource) {
-	if (sliceSource != ApplySliceSource::UnknownLoaded) {
-		return;
-	}
 	auto changedCount = _fullCount.current();
 	for (const auto &participant : list) {
 		participant.match([&](const MTPDgroupCallParticipant &data) {
diff --git a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
index f1905b000..fca98f1b6 100644
--- a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
@@ -213,10 +213,10 @@ int InnerWidget::desiredHeight() const {
 object_ptr<InnerWidget::ListWidget> InnerWidget::setupList(
 		RpWidget *parent,
 		not_null<PeerListController*> controller) const {
+	controller->setStyleOverrides(&st::infoCommonGroupsList);
 	auto result = object_ptr<ListWidget>(
 		parent,
-		controller,
-		st::infoCommonGroupsList);
+		controller);
 	result->scrollToRequests(
 	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
 		auto addmin = (request.ymin < 0)
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index cfaa8bbe7..d311f6fe1 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -44,14 +44,14 @@ infoScroll: ScrollArea(defaultScrollArea) {
 infoMediaSearch: SearchFieldRow {
 	height: 44px;
 	padding: margins(8px, 6px, 8px, 6px);
-	field: contactsSearchField;
+	field: defaultMultiSelectSearchField;
 	fieldIcon: icon {{
 		"box_search-flip_horizontal",
 		menuIconFg,
 		point(6px, 8px)
 	}};
 	fieldIconSkip: 36px;
-	fieldCancel: contactsSearchCancel;
+	fieldCancel: defaultMultiSelectSearchCancel;
 	fieldCancelSkip: 40px;
 }
 infoLayerMediaSearch: SearchFieldRow(infoMediaSearch) {
@@ -62,7 +62,7 @@ infoLayerMediaSearch: SearchFieldRow(infoMediaSearch) {
 		point(9px, 9px)
 	}};
 	fieldIconSkip: 34px;
-	fieldCancel: CrossButton(contactsSearchCancel) {
+	fieldCancel: CrossButton(defaultMultiSelectSearchCancel) {
 		width: 50px;
 		cross: CrossAnimation {
 			size: 38px;
@@ -77,7 +77,7 @@ infoLayerMediaSearch: SearchFieldRow(infoMediaSearch) {
 infoTopBarSearchRow: SearchFieldRow(infoLayerMediaSearch) {
 	height: 52px;
 	padding: margins(0px, 12px, 8px, 10px);
-	fieldCancel: CrossButton(contactsSearchCancel) {
+	fieldCancel: CrossButton(defaultMultiSelectSearchCancel) {
 		width: 51px;
 		height: 52px;
 		cross: CrossAnimation {
@@ -402,7 +402,7 @@ infoProfileToggle: Toggle(defaultToggle) {
 infoProfileToggleOver: Toggle(infoProfileToggle) {
 	untoggledFg: menuIconFgOver;
 }
-infoProfileButton: SettingsButton {
+infoProfileButton: SettingsButton(defaultSettingsButton) {
 	textFg: windowBoldFg;
 	textFgOver: windowBoldFgOver;
 	textBg: windowBg;
@@ -496,7 +496,7 @@ infoMembersSearchActiveLayer: icon {
 		infoMembersButtonIconPosition
 	}
 };
-infoMembersSearchField: InputField(contactsSearchField) {
+infoMembersSearchField: InputField(defaultMultiSelectSearchField) {
 }
 infoMembersCancelSearch: CrossButton {
 	width: 44px;
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
index 2a6345fd1..8f1a52fd6 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
@@ -501,10 +501,10 @@ ListController *CreateAnswerRows(
 		container,
 		st::boxLittleSkip));
 
+	controller->setStyleOverrides(&st::infoCommonGroupsList);
 	const auto content = container->add(object_ptr<PeerListContent>(
 		container,
-		controller,
-		st::infoCommonGroupsList));
+		controller));
 	delegate->setContent(content);
 	controller->setDelegate(delegate);
 
diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.cpp b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
index 0f3d57301..d95ed2d0b 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_members.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
@@ -212,10 +212,10 @@ void Members::setupButtons() {
 
 void Members::setupList() {
 	auto topSkip = _header ? _header->height() : 0;
+	_listController->setStyleOverrides(&st::infoMembersList);
 	_list = object_ptr<ListWidget>(
 		this,
-		_listController.get(),
-		st::infoMembersList);
+		_listController.get());
 	_list->scrollToRequests(
 	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
 		auto addmin = (request.ymin < 0 || !_header)
diff --git a/Telegram/SourceFiles/overview/overview.style b/Telegram/SourceFiles/overview/overview.style
index 818d39ce9..5cdcd40f1 100644
--- a/Telegram/SourceFiles/overview/overview.style
+++ b/Telegram/SourceFiles/overview/overview.style
@@ -47,7 +47,7 @@ overviewCheck: RoundCheckbox(defaultRoundCheckbox) {
 	sizeSmall: 0.3;
 	check: icon {{ "overview_photo_check", overviewCheckFgActive, point(4px, 8px) }};
 }
-overviewSmallCheck: RoundCheckbox(contactsPhotoCheck) {
+overviewSmallCheck: RoundCheckbox(defaultPeerListCheck) {
 	border: overviewCheckBorder;
 }
 overviewCheckSkip: 5px;
diff --git a/Telegram/SourceFiles/passport/passport.style b/Telegram/SourceFiles/passport/passport.style
index 8e6811090..81b7b1cf6 100644
--- a/Telegram/SourceFiles/passport/passport.style
+++ b/Telegram/SourceFiles/passport/passport.style
@@ -123,7 +123,7 @@ passportRowTitleFg: windowFg;
 passportRowDescriptionFg: windowSubTextFg;
 
 passportScansHeaderPadding: margins(22px, 10px, 22px, 10px);
-passportUploadButton: SettingsButton {
+passportUploadButton: SettingsButton(defaultSettingsButton) {
 	textFg: windowActiveTextFg;
 	textFgOver: windowActiveTextFg;
 	textBg: windowBg;
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 509e1e706..d2582c0c3 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -25,11 +25,6 @@ settingsSectionSkip: 9px;
 settingsSectionIconLeft: 22px;
 settingsSeparatorPadding: margins(22px, infoProfileSkip, 0px, infoProfileSkip);
 settingsButtonRightSkip: 28px;
-settingsButtonRight: FlatLabel(defaultFlatLabel) {
-	textFg: windowActiveTextFg;
-	style: boxTextStyle;
-	maxHeight: 20px;
-}
 settingsScalePadding: margins(79px, 10px, 28px, 8px);
 settingsBigScalePadding: margins(22px, 10px, 22px, 8px);
 settingsSlider: SettingsSlider(defaultSettingsSlider) {
diff --git a/Telegram/SourceFiles/settings/settings_calls.cpp b/Telegram/SourceFiles/settings/settings_calls.cpp
index 06dce8a62..7118f4139 100644
--- a/Telegram/SourceFiles/settings/settings_calls.cpp
+++ b/Telegram/SourceFiles/settings/settings_calls.cpp
@@ -327,7 +327,9 @@ QString CurrentAudioInputName() {
 }
 
 object_ptr<SingleChoiceBox> ChooseAudioOutputBox(
-		Fn<void(QString id, QString name)> chosen) {
+		Fn<void(QString id, QString name)> chosen,
+		const style::Checkbox *st,
+		const style::Radio *radioSt) {
 	const auto &devices = Webrtc::GetAudioOutputList();
 	const auto options = ranges::view::concat(
 		ranges::view::single(tr::lng_settings_call_device_default(tr::now)),
@@ -351,11 +353,15 @@ object_ptr<SingleChoiceBox> ChooseAudioOutputBox(
 		tr::lng_settings_call_output_device(),
 		options,
 		currentOption,
-		save);
+		save,
+		st,
+		radioSt);
 }
 
 object_ptr<SingleChoiceBox> ChooseAudioInputBox(
-		Fn<void(QString id, QString name)> chosen) {
+		Fn<void(QString id, QString name)> chosen,
+		const style::Checkbox *st,
+		const style::Radio *radioSt) {
 	const auto devices = Webrtc::GetAudioInputList();
 	const auto options = ranges::view::concat(
 		ranges::view::single(tr::lng_settings_call_device_default(tr::now)),
@@ -379,7 +385,9 @@ object_ptr<SingleChoiceBox> ChooseAudioInputBox(
 		tr::lng_settings_call_input_device(),
 		options,
 		currentOption,
-		save);
+		save,
+		st,
+		radioSt);
 }
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_calls.h b/Telegram/SourceFiles/settings/settings_calls.h
index 73c8cf9c1..db298f746 100644
--- a/Telegram/SourceFiles/settings/settings_calls.h
+++ b/Telegram/SourceFiles/settings/settings_calls.h
@@ -11,6 +11,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/animations.h"
 #include "base/timer.h"
 
+namespace style {
+struct Checkbox;
+struct Radio;
+} // namespace style
+
 namespace Calls {
 class Call;
 } // namespace Calls
@@ -57,9 +62,13 @@ inline constexpr auto kMicTestAnimationDuration = crl::time(200);
 [[nodiscard]] QString CurrentAudioOutputName();
 [[nodiscard]] QString CurrentAudioInputName();
 [[nodiscard]] object_ptr<SingleChoiceBox> ChooseAudioOutputBox(
-	Fn<void(QString id, QString name)> chosen);
+	Fn<void(QString id, QString name)> chosen,
+	const style::Checkbox *st = nullptr,
+	const style::Radio *radioSt = nullptr);
 [[nodiscard]] object_ptr<SingleChoiceBox> ChooseAudioInputBox(
-	Fn<void(QString id, QString name)> chosen);
+	Fn<void(QString id, QString name)> chosen,
+	const style::Checkbox *st = nullptr,
+	const style::Radio *radioSt = nullptr);
 
 } // namespace Settings
 
diff --git a/Telegram/SourceFiles/settings/settings_common.cpp b/Telegram/SourceFiles/settings/settings_common.cpp
index 0b6dc0390..43951b443 100644
--- a/Telegram/SourceFiles/settings/settings_common.cpp
+++ b/Telegram/SourceFiles/settings/settings_common.cpp
@@ -137,7 +137,7 @@ void CreateRightLabel(
 		rpl::producer<QString> buttonText) {
 	const auto name = Ui::CreateChild<Ui::FlatLabel>(
 		button.get(),
-		st::settingsButtonRight);
+		st.rightLabel);
 	rpl::combine(
 		button->widthValue(),
 		std::move(buttonText),
diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp
index 99ae478d8..446a819f1 100644
--- a/Telegram/SourceFiles/ui/countryinput.cpp
+++ b/Telegram/SourceFiles/ui/countryinput.cpp
@@ -148,12 +148,12 @@ void CountryInput::setText(const QString &newText) {
 }
 
 CountrySelectBox::CountrySelectBox(QWidget*)
-: _select(this, st::contactsMultiSelect, tr::lng_country_ph()) {
+: _select(this, st::defaultMultiSelect, tr::lng_country_ph()) {
 }
 
 CountrySelectBox::CountrySelectBox(QWidget*, const QString &iso, Type type)
 : _type(type)
-, _select(this, st::contactsMultiSelect, tr::lng_country_ph()) {
+, _select(this, st::defaultMultiSelect, tr::lng_country_ph()) {
 	if (Data::CountriesByISO2().contains(iso)) {
 		LastValidISO = iso;
 	}
diff --git a/Telegram/SourceFiles/ui/widgets/level_meter.h b/Telegram/SourceFiles/ui/widgets/level_meter.h
index d279af4a2..4fe15b7f4 100644
--- a/Telegram/SourceFiles/ui/widgets/level_meter.h
+++ b/Telegram/SourceFiles/ui/widgets/level_meter.h
@@ -14,7 +14,7 @@ namespace Ui {
 
 class LevelMeter : public RpWidget {
 public:
-	LevelMeter(QWidget *parent, const style::LevelMeter& st);
+	LevelMeter(QWidget *parent, const style::LevelMeter &st);
 
 	void setValue(float value);
 
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
index ef6e3d3a0..58fe1adad 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
@@ -650,9 +650,9 @@ Editor::Editor(
 : _window(window)
 , _cloud(cloud)
 , _scroll(this, st::themesScroll)
-, _close(this, st::contactsMultiSelect.fieldCancel)
+, _close(this, st::defaultMultiSelect.fieldCancel)
 , _menuToggle(this, st::themesMenuToggle)
-, _select(this, st::contactsMultiSelect, tr::lng_country_ph())
+, _select(this, st::defaultMultiSelect, tr::lng_country_ph())
 , _leftShadow(this)
 , _topShadow(this)
 , _save(this, tr::lng_theme_editor_save_button(tr::now).toUpper(), st::dialogsUpdateButton) {
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 3b3577e08..854c5df4b 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -233,7 +233,7 @@ windowOutdatedClose: IconButton(defaultIconButton) {
 	iconPosition: point(-1px, -1px);
 }
 
-createThemeImportButton: SettingsButton {
+createThemeImportButton: SettingsButton(defaultSettingsButton) {
 	textFg: lightButtonFg;
 	textFgOver: lightButtonFgOver;
 	textBg: windowBg;
diff --git a/Telegram/SourceFiles/window/window_media_preview.cpp b/Telegram/SourceFiles/window/window_media_preview.cpp
index bb2c97e1f..881ed4813 100644
--- a/Telegram/SourceFiles/window/window_media_preview.cpp
+++ b/Telegram/SourceFiles/window/window_media_preview.cpp
@@ -208,7 +208,8 @@ QSize MediaPreviewWidget::currentDimensions() const {
 	QSize result, box;
 	if (_photo) {
 		result = QSize(_photo->width(), _photo->height());
-		box = QSize(width() - 2 * st::boxVerticalMargin, height() - 2 * st::boxVerticalMargin);
+		const auto skip = st::defaultBox.margin.top();
+		box = QSize(width() - 2 * skip, height() - 2 * skip);
 	} else {
 		result = _document->dimensions;
 		if (result.isEmpty()) {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 41bae1eba..7287e235e 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 41bae1eba67801eb8768887100c17b7e84e7daf7
+Subproject commit 7287e235e0205fd878cd35329d08aa1aa1c218fa

From d773f2c765b5bfc8c85dc6a1a99bcc4893250e62 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Nov 2020 10:51:23 +0300
Subject: [PATCH 191/370] Handle call updates only from the correct session.

---
 Telegram/SourceFiles/calls/calls_instance.cpp | 17 ++++++++++++-----
 Telegram/SourceFiles/calls/calls_instance.h   |  5 +++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index 15d9f53f6..672d36e53 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -301,7 +301,7 @@ void Instance::handleUpdate(
 	update.match([&](const MTPDupdatePhoneCall &data) {
 		handleCallUpdate(session, data.vphone_call());
 	}, [&](const MTPDupdatePhoneCallSignalingData &data) {
-		handleSignalingData(data);
+		handleSignalingData(session, data);
 	}, [&](const MTPDupdateGroupCall &data) {
 		handleGroupCallUpdate(session, data.vcall());
 	}, [&](const MTPDupdateGroupCallParticipants &data) {
@@ -379,7 +379,9 @@ void Instance::handleCallUpdate(
 			createCall(user, Call::Type::Incoming, phoneCall.is_video());
 			_currentCall->handleUpdate(call);
 		}
-	} else if (!_currentCall || !_currentCall->handleUpdate(call)) {
+	} else if (!_currentCall
+		|| (&_currentCall->user()->session() != session)
+		|| !_currentCall->handleUpdate(call)) {
 		DEBUG_LOG(("API Warning: unexpected phone call update %1").arg(call.type()));
 	}
 }
@@ -393,7 +395,8 @@ void Instance::handleGroupCallUpdate(
 	if (const auto existing = session->data().groupCall(callId)) {
 		existing->applyUpdate(call);
 	}
-	if (_currentGroupCall) {
+	if (_currentGroupCall
+		&& (&_currentGroupCall->channel()->session() == session)) {
 		_currentGroupCall->handleUpdate(call);
 	}
 }
@@ -407,14 +410,18 @@ void Instance::handleGroupCallUpdate(
 	if (const auto existing = session->data().groupCall(callId)) {
 		existing->applyUpdate(update);
 	}
-	if (_currentGroupCall) {
+	if (_currentGroupCall
+		&& (&_currentGroupCall->channel()->session() == session)) {
 		_currentGroupCall->handleUpdate(update);
 	}
 }
 
 void Instance::handleSignalingData(
+		not_null<Main::Session*> session,
 		const MTPDupdatePhoneCallSignalingData &data) {
-	if (!_currentCall || !_currentCall->handleSignalingData(data)) {
+	if (!_currentCall
+		|| (&_currentCall->user()->session() != session)
+		|| !_currentCall->handleSignalingData(data)) {
 		DEBUG_LOG(("API Warning: unexpected call signaling data %1"
 			).arg(data.vphone_call_id().v));
 	}
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index 3705bbcc5..6877e1422 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -92,8 +92,6 @@ private:
 	void requestPermissionsOrFail(Fn<void()> onSuccess);
 	void requestPermissionOrFail(Platform::PermissionType type, Fn<void()> onSuccess);
 
-	void handleSignalingData(const MTPDupdatePhoneCallSignalingData &data);
-
 	void refreshDhConfig();
 	void refreshServerConfig(not_null<Main::Session*> session);
 	bytes::const_span updateDhConfig(const MTPmessages_DhConfig &data);
@@ -104,6 +102,9 @@ private:
 	void handleCallUpdate(
 		not_null<Main::Session*> session,
 		const MTPPhoneCall &call);
+	void handleSignalingData(
+		not_null<Main::Session*> session,
+		const MTPDupdatePhoneCallSignalingData &data);
 	void handleGroupCallUpdate(
 		not_null<Main::Session*> session,
 		const MTPGroupCall &call);

From d5216a30c7cb77e25c284a203ae0d0226c425ed0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Nov 2020 10:52:53 +0300
Subject: [PATCH 192/370] Forbid anonymous admins joining group calls.

---
 Telegram/Resources/langs/lang.strings         |  3 ++
 .../SourceFiles/calls/calls_group_call.cpp    | 29 +++++++++++++++++--
 .../SourceFiles/history/history_widget.cpp    | 10 ++++---
 .../view/history_view_top_bar_widget.cpp      |  7 ++++-
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f66ac5678..0b92d24c4 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1477,6 +1477,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_game_tag" = "Game";
 
 "lng_context_view_profile" = "View profile";
+"lng_context_send_message" = "Send message";
 "lng_context_view_group" = "View group info";
 "lng_context_view_channel" = "View channel info";
 //"lng_context_view_feed_info" = "View feed info";
@@ -1843,6 +1844,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_no_members" = "No members";
 "lng_group_call_members#one" = "{count} member";
 "lng_group_call_members#other" = "{count} members";
+"lng_group_call_no_anonymous" = "Anonymous admins can't join voice chats :(";
+"lng_group_call_context_mute" = "Mute";
 
 "lng_no_mic_permission" = "Telegram needs access to your microphone so that you can make calls and record voice messages.";
 
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 114b4f5b2..09ed5804e 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "lang/lang_keys.h"
 #include "boxes/confirm_box.h"
+#include "ui/toasts/common_toasts.h"
 #include "base/unixtime.h"
 #include "core/application.h"
 #include "core/core_settings.h"
@@ -112,16 +113,22 @@ void GroupCall::setState(State state) {
 }
 
 void GroupCall::start() {
-	const auto randomId = rand_value<int32>();
 	_createRequestId = _api.request(MTPphone_CreateGroupCall(
 		_channel->inputChannel,
-		MTP_int(randomId)
+		MTP_int(rand_value<int32>())
 	)).done([=](const MTPUpdates &result) {
 		_acceptFields = true;
 		_channel->session().api().applyUpdates(result);
 		_acceptFields = false;
 	}).fail([=](const RPCError &error) {
-		int a = error.code();
+		LOG(("Call Error: Could not create, error: %1"
+			).arg(error.type()));
+		hangup();
+		if (error.type() == u"GROUP_CALL_ANONYMOUS_FORBIDDEN"_q) {
+			Ui::ShowMultilineToast({
+				.text = tr::lng_group_call_no_anonymous(tr::now),
+			});
+		}
 	}).send();
 }
 
@@ -206,6 +213,11 @@ void GroupCall::rejoin() {
 				LOG(("Call Error: Could not join, error: %1"
 					).arg(error.type()));
 				hangup();
+				if (error.type() == u"GROUP_CALL_ANONYMOUS_FORBIDDEN"_q) {
+					Ui::ShowMultilineToast({
+						.text = tr::lng_group_call_no_anonymous(tr::now),
+					});
+				}
 			}).send();
 		});
 	});
@@ -401,10 +413,14 @@ void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
 			}
 			if (data.is_left() && data.vsource().v == _mySsrc) {
 				// I was removed from the call, rejoin.
+				LOG(("Call Info: Rejoin after got 'left' with my source."));
 				setState(State::Joining);
 				rejoin();
 			} else if (!data.is_left() && data.vsource().v != _mySsrc) {
 				// I joined from another device, hangup.
+				LOG(("Call Info: Hangup after '!left' with source %1, my %2."
+					).arg(data.vsource().v
+					).arg(_mySsrc));
 				_mySsrc = 0;
 				hangup();
 			}
@@ -550,11 +566,14 @@ void GroupCall::checkJoined() {
 		MTP_int(_mySsrc)
 	)).done([=](const MTPBool &result) {
 		if (!mtpIsTrue(result)) {
+			LOG(("Call Info: Rejoin after FALSE in checkGroupCall."));
 			rejoin();
 		} else if (state() == State::Connecting) {
 			_checkJoinedTimer.callOnce(kCheckJoinedTimeout);
 		}
 	}).fail([=](const RPCError &error) {
+		LOG(("Call Info: Rejoin after error '%1' in checkGroupCall."
+			).arg(error.type()));
 		rejoin();
 	}).send();
 }
@@ -585,6 +604,8 @@ void GroupCall::sendMutedUpdate() {
 	}).fail([=](const RPCError &error) {
 		_updateMuteRequestId = 0;
 		if (error.type() == u"GROUP_CALL_FORBIDDEN"_q) {
+			LOG(("Call Info: Rejoin after error '%1' in editGroupCallMember."
+				).arg(error.type()));
 			rejoin();
 		}
 	}).send();
@@ -615,6 +636,8 @@ void GroupCall::toggleMute(not_null<UserData*> user, bool mute) {
 		_channel->session().api().applyUpdates(result);
 	}).fail([=](const RPCError &error) {
 		if (error.type() == u"GROUP_CALL_FORBIDDEN"_q) {
+			LOG(("Call Info: Rejoin after error '%1' in editGroupCallMember."
+				).arg(error.type()));
 			rejoin();
 		}
 	}).send();
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index d470a5041..f5ec69fa7 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5413,12 +5413,14 @@ void HistoryWidget::setupGroupCallTracker() {
 		const auto channel = _history->peer->asChannel();
 		if (!channel) {
 			return;
-		}
-		const auto call = channel->call();
-		if (!call) {
+		} else if (channel->amAnonymous()) {
+			Ui::ShowMultilineToast({
+				.text = tr::lng_group_call_no_anonymous(tr::now),
+				});
 			return;
+		} else if (const auto call = channel->call()) {
+			Core::App().calls().joinGroupCall(channel, call->input());
 		}
-		Core::App().calls().joinGroupCall(channel, call->input());
 	}, _groupCallBar->lifetime());
 
 	_groupCallBarHeight = 0;
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 214950959..d57c4903b 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/dropdown_menu.h"
 #include "ui/effects/radial_animation.h"
+#include "ui/toasts/common_toasts.h"
 #include "ui/special_buttons.h"
 #include "ui/unread_badge.h"
 #include "ui/ui_utility.h"
@@ -212,7 +213,11 @@ void TopBarWidget::onCall() {
 		if (const auto user = peer->asUser()) {
 			Core::App().calls().startOutgoingCall(user, false);
 		} else if (const auto megagroup = peer->asMegagroup()) {
-			if (const auto call = megagroup->call()) {
+			if (megagroup->amAnonymous()) {
+				Ui::ShowMultilineToast({
+					.text = tr::lng_group_call_no_anonymous(tr::now),
+				});
+			} else if (const auto call = megagroup->call()) {
 				Core::App().calls().joinGroupCall(megagroup, call->input());
 			} else {
 				Core::App().calls().startGroupCall(megagroup);

From 1a2fe59d88686ec3c8c60aa1e1141623f627a355 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Nov 2020 10:57:55 +0300
Subject: [PATCH 193/370] Drag group call panel only by title area.

---
 .../SourceFiles/calls/calls_group_panel.cpp   | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 76a5eca1c..0364dd3f3 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -267,21 +267,14 @@ void GroupPanel::initWindow() {
 
 	_window->setBodyTitleArea([=](QPoint widgetPoint) {
 		using Flag = Ui::WindowTitleHitTestFlag;
-		if (!widget()->rect().contains(widgetPoint)) {
-			return Flag::None | Flag(0);
-		}
-#ifdef Q_OS_WIN
-		if (_controls->geometry().contains(widgetPoint)) {
-			return Flag::None | Flag(0);
-		}
-#endif // Q_OS_WIN
-		const auto inControls = _settings->geometry().contains(widgetPoint)
-			|| _mute->innerGeometry().contains(widgetPoint)
-			|| _hangup->geometry().contains(widgetPoint)
-			|| _members->geometry().contains(widgetPoint);
-		return inControls
-			? Flag::None
-			: (Flag::Move | Flag::Maximize);
+		const auto titleRect = QRect(
+			0,
+			0,
+			widget()->width(),
+			computeMembersListTop());
+		return titleRect.contains(widgetPoint)
+			? (Flag::Move | Flag::Maximize)
+			: Flag::None;
 	});
 }
 

From 834516d4a73b03f81d67c13b113a8a915149a498 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Nov 2020 11:00:25 +0300
Subject: [PATCH 194/370] Improve colors in group call panel.

---
 Telegram/SourceFiles/calls/calls.style         | 18 +++++++++---------
 .../SourceFiles/calls/calls_group_members.cpp  |  6 +++++-
 .../SourceFiles/calls/calls_group_settings.cpp |  8 ++++++--
 Telegram/lib_ui                                |  2 +-
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 77f2fa24e..ee401e81c 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -407,12 +407,12 @@ groupCallWidth: 380px;
 groupCallHeight: 580px;
 
 groupCallRipple: RippleAnimation(defaultRippleAnimation) {
-	color: groupCallMembersRipple;
+	color: groupCallMembersBgRipple;
 }
 groupCallMembersListItem: PeerListItem(defaultPeerListItem) {
 	button: OutlineButton(defaultPeerListButton) {
 		textBg: groupCallMembersBg;
-		textBgOver: groupCallMembersBg;
+		textBgOver: groupCallMembersBgOver;
 
 		textFg: groupCallMemberInactiveStatus;
 		textFgOver: groupCallMemberInactiveStatus;
@@ -459,7 +459,7 @@ groupCallInviteMembersList: PeerList(groupCallMembersList) {
 groupCallMultiSelect: MultiSelect(defaultMultiSelect) {
 	bg: groupCallMembersBg;
 	item: MultiSelectItem(defaultMultiSelectItem) {
-		textBg: groupCallMembersRipple;
+		textBg: groupCallMembersBgRipple;
 		textFg: groupCallMembersFg;
 		textActiveBg: groupCallActiveFg;
 		textActiveFg: groupCallMembersFg;
@@ -557,10 +557,10 @@ groupCallBox: Box(defaultBox) {
 		numbersTextFg: groupCallActiveFg;
 		numbersTextFgOver: groupCallActiveFg;
 		textBg: groupCallMembersBg;
-		textBgOver: groupCallBoxButtonBgOver;
+		textBgOver: groupCallMembersBgOver;
 
 		ripple: RippleAnimation(defaultRippleAnimation) {
-			color: groupCallBoxButtonBgRipple;
+			color: groupCallMembersBgRipple;
 		}
 	}
 	margin: margins(0px, 56px, 0px, 10px);
@@ -594,15 +594,15 @@ groupCallRadio: Radio(defaultRadio) {
 groupCallCheckbox: Checkbox(defaultBoxCheckbox) {
 	textFg: groupCallMembersFg;
 	textFgActive: groupCallMembersFg;
-	rippleBg: groupCallMembersRipple;
-	rippleBgActive: groupCallBoxButtonBgRipple;
+	rippleBg: groupCallMembersBgRipple;
+	rippleBgActive: groupCallMembersBgRipple;
 }
 
 groupCallSettingsButton: SettingsButton {
 	textFg: groupCallMembersFg;
 	textFgOver: groupCallMembersFg;
 	textBg: groupCallMembersBg;
-	textBgOver: groupCallBoxButtonBgOver;
+	textBgOver: groupCallMembersBgOver;
 
 	font: boxTextFont;
 	rightLabel: FlatLabel(defaultSettingsRightLabel) {
@@ -613,7 +613,7 @@ groupCallSettingsButton: SettingsButton {
 	padding: margins(22px, 10px, 22px, 8px);
 
 	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: groupCallBoxButtonBgRipple;
+		color: groupCallMembersBgRipple;
 	}
 }
 groupCallSettingsAttentionButton: SettingsButton(groupCallSettingsButton) {
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 9531d0870..19e516b8a 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -646,7 +646,11 @@ GroupMembers::GroupMembers(
 
 	paintRequest(
 	) | rpl::start_with_next([=](QRect clip) {
-		QPainter(this).fillRect(clip, st::groupCallMembersBg);
+		const auto headerPart = clip.intersected(
+			QRect(0, 0, width(), _header->height()));
+		if (!headerPart.isEmpty()) {
+			QPainter(this).fillRect(headerPart, st::groupCallMembersBg);
+		}
 	}, lifetime());
 }
 
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
index 8e86943f6..8f4ab9eaa 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -85,7 +85,11 @@ void GroupCallSettingsBox(
 
 	const auto joinMuted = goodReal ? real->joinMuted() : false;
 	const auto canChangeJoinMuted = (goodReal && real->canChangeJoinMuted());
-	const auto muteJoined = (channel->canManageCall() && canChangeJoinMuted)
+	const auto addCheck = (channel->canManageCall() && canChangeJoinMuted);
+	if (addCheck) {
+		AddSkip(layout);
+	}
+	const auto muteJoined = addCheck
 		? box->addRow(object_ptr<Ui::Checkbox>(
 			box.get(),
 			tr::lng_group_call_new_muted(),
@@ -93,7 +97,7 @@ void GroupCallSettingsBox(
 			st::groupCallCheckbox,
 			st::groupCallCheck))
 		: nullptr;
-	if (muteJoined) {
+	if (addCheck) {
 		AddSkip(layout);
 	}
 
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 7287e235e..79ea65112 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 7287e235e0205fd878cd35329d08aa1aa1c218fa
+Subproject commit 79ea651127962fff366e9d76ce4d932490b30158

From 53052c61403c9dddd5461052ec7dd9b5ca572263 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Nov 2020 14:31:32 +0300
Subject: [PATCH 195/370] Add member menu on click in group call members list.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 Telegram/SourceFiles/calls/calls.style        |  39 ++++-
 .../SourceFiles/calls/calls_group_members.cpp | 143 +++++++++++++++---
 .../SourceFiles/calls/calls_group_members.h   |   5 +-
 .../SourceFiles/calls/calls_group_panel.cpp   |  43 ++++++
 .../SourceFiles/calls/calls_group_panel.h     |   2 +
 Telegram/lib_ui                               |   2 +-
 7 files changed, 207 insertions(+), 28 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 0b92d24c4..6c75ca852 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1846,6 +1846,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_members#other" = "{count} members";
 "lng_group_call_no_anonymous" = "Anonymous admins can't join voice chats :(";
 "lng_group_call_context_mute" = "Mute";
+"lng_group_call_context_unmute" = "Unmute";
 
 "lng_no_mic_permission" = "Telegram needs access to your microphone so that you can make calls and record voice messages.";
 
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index ee401e81c..af1af5dd8 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -409,6 +409,36 @@ groupCallHeight: 580px;
 groupCallRipple: RippleAnimation(defaultRippleAnimation) {
 	color: groupCallMembersBgRipple;
 }
+
+groupCallMenu: Menu(defaultMenu) {
+	itemBg: groupCallMembersBgOver;
+	itemBgOver: groupCallMembersBgRipple;
+	itemFg: groupCallMembersFg;
+	itemFgOver: groupCallMembersFg;
+	itemFgDisabled: groupCallMemberNotJoinedStatus;
+	itemFgShortcut: groupCallMemberNotJoinedStatus;
+	itemFgShortcutOver: groupCallMemberNotJoinedStatus;
+	itemFgShortcutDisabled: groupCallMemberNotJoinedStatus;
+
+	separatorFg: groupCallMemberNotJoinedStatus;
+
+	arrow: icon {{ "dropdown_submenu_arrow", groupCallMemberNotJoinedStatus }};
+
+	ripple: groupCallRipple;
+}
+groupCallMenuShadow: Shadow(defaultEmptyShadow) {
+	fallback: groupCallMembersBgOver;
+}
+groupCallPanelAnimation: PanelAnimation(defaultPanelAnimation) {
+	fadeBg: groupCallMembersBgOver;
+	shadow: groupCallMenuShadow;
+}
+groupCallPopupMenu: PopupMenu(defaultPopupMenu) {
+	shadow: groupCallMenuShadow;
+	menu: groupCallMenu;
+	animation: groupCallPanelAnimation;
+}
+
 groupCallMembersListItem: PeerListItem(defaultPeerListItem) {
 	button: OutlineButton(defaultPeerListButton) {
 		textBg: groupCallMembersBg;
@@ -470,6 +500,7 @@ groupCallMultiSelect: MultiSelect(defaultMultiSelect) {
 		placeholderFg: groupCallMemberNotJoinedStatus;
 		placeholderFgActive: groupCallMemberNotJoinedStatus;
 		placeholderFgError: groupCallMemberNotJoinedStatus;
+		menu: groupCallPopupMenu;
 	}
 	fieldIcon: icon {{ "box_search", groupCallMemberNotJoinedStatus, point(10px, 9px) }};
 	fieldCancel: CrossButton(defaultMultiSelectSearchCancel) {
@@ -559,9 +590,7 @@ groupCallBox: Box(defaultBox) {
 		textBg: groupCallMembersBg;
 		textBgOver: groupCallMembersBgOver;
 
-		ripple: RippleAnimation(defaultRippleAnimation) {
-			color: groupCallMembersBgRipple;
-		}
+		ripple: groupCallRipple;
 	}
 	margin: margins(0px, 56px, 0px, 10px);
 	bg: groupCallMembersBg;
@@ -612,9 +641,7 @@ groupCallSettingsButton: SettingsButton {
 	height: 20px;
 	padding: margins(22px, 10px, 22px, 8px);
 
-	ripple: RippleAnimation(defaultRippleAnimation) {
-		color: groupCallMembersBgRipple;
-	}
+	ripple: groupCallRipple;
 }
 groupCallSettingsAttentionButton: SettingsButton(groupCallSettingsButton) {
 	textFg: attentionButtonFg;
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 19e516b8a..e4591ea13 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -18,12 +18,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/popup_menu.h"
 #include "ui/text/text_utilities.h"
 #include "ui/effects/ripple_animation.h"
+#include "core/application.h" // Core::App().domain, Core::App().activeWindow.
+#include "main/main_domain.h" // Core::App().domain().activate.
 #include "main/main_session.h"
 #include "base/timer.h"
 #include "boxes/peers/edit_participants_box.h"
 #include "lang/lang_keys.h"
-#include "facades.h" // Ui::showPeerHistory.
-#include "mainwindow.h" // App::wnd()->activate.
+#include "window/window_controller.h" // Controller::sessionController.
+#include "window/window_session_controller.h"
 #include "styles/style_calls.h"
 
 namespace Calls {
@@ -107,7 +109,9 @@ class MembersController final
 	: public PeerListController
 	, public base::has_weak_ptr {
 public:
-	explicit MembersController(not_null<GroupCall*> call);
+	MembersController(
+		not_null<GroupCall*> call,
+		not_null<QWidget*> menuParent);
 
 	using MuteRequest = GroupMembers::MuteRequest;
 
@@ -124,6 +128,8 @@ public:
 		return _fullCount.value();
 	}
 	[[nodiscard]] rpl::producer<MuteRequest> toggleMuteRequests() const;
+	[[nodiscard]] auto kickMemberRequests() const
+		-> rpl::producer<not_null<UserData*>>;
 
 private:
 	[[nodiscard]] std::unique_ptr<PeerListRow> createSelfRow() const;
@@ -155,8 +161,11 @@ private:
 	uint64 _realId = 0;
 
 	rpl::event_stream<MuteRequest> _toggleMuteRequests;
+	rpl::event_stream<not_null<UserData*>> _kickMemberRequests;
 	rpl::variable<int> _fullCount = 1;
-	Ui::BoxPointer _addBox;
+
+	not_null<QWidget*> _menuParent;
+	base::unique_qptr<Ui::PopupMenu> _menu;
 
 	//base::flat_map<not_null<UserData*>, crl::time> _repaintByTimer;
 	//base::Timer _repaintTimer;
@@ -318,9 +327,12 @@ void Row::stopLastActionRipple() {
 	}
 }
 
-MembersController::MembersController(not_null<GroupCall*> call)
+MembersController::MembersController(
+	not_null<GroupCall*> call,
+	not_null<QWidget*> menuParent)
 : _call(call)
-, _channel(call->channel()) {
+, _channel(call->channel())
+, _menuParent(menuParent) {
 //, _repaintTimer([=] { repaintByTimer(); }) {
 	setupListChangeViewers(call);
 }
@@ -586,25 +598,27 @@ void MembersController::loadMoreRows() {
 }
 
 auto MembersController::toggleMuteRequests() const
--> rpl::producer<GroupMembers::MuteRequest> {
+-> rpl::producer<MuteRequest> {
 	return _toggleMuteRequests.events();
 }
 
+auto MembersController::kickMemberRequests() const
+-> rpl::producer<not_null<UserData*>>{
+	return _kickMemberRequests.events();
+}
+
 void MembersController::rowClicked(not_null<PeerListRow*> row) {
-	Ui::showPeerHistory(row->peer(), ShowAtUnreadMsgId);
-	App::wnd()->activate();
+	if (_menu) {
+		_menu->deleteLater();
+		_menu = nullptr;
+	}
+	_menu = rowContextMenu(_menuParent, row);
+	_menu->popup(QCursor::pos());
 }
 
 void MembersController::rowActionClicked(
 		not_null<PeerListRow*> row) {
-	Expects(row->peer()->isUser());
-
-	const auto real = static_cast<Row*>(row.get());
-	const auto mute = (real->state() != Row::State::Muted);
-	_toggleMuteRequests.fire(MuteRequest{
-		.user = row->peer()->asUser(),
-		.mute = mute,
-	});
+	rowClicked(row);
 }
 
 base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
@@ -612,8 +626,86 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 		not_null<PeerListRow*> row) {
 	Expects(row->peer()->isUser());
 
+	const auto real = static_cast<Row*>(row.get());
 	const auto user = row->peer()->asUser();
-	return nullptr;
+	auto result = base::make_unique_q<Ui::PopupMenu>(
+		parent,
+		st::groupCallPopupMenu);
+
+	const auto mute = (real->state() != Row::State::Muted);
+	const auto toggleMute = crl::guard(this, [=] {
+		_toggleMuteRequests.fire(MuteRequest{
+			.user = user,
+			.mute = mute,
+		});
+	});
+
+	const auto session = &user->session();
+	const auto getCurrentWindow = [=]() -> Window::SessionController* {
+		if (const auto window = Core::App().activeWindow()) {
+			if (const auto controller = window->sessionController()) {
+				if (&controller->session() == session) {
+					return controller;
+				}
+			}
+		}
+		return nullptr;
+	};
+	const auto getWindow = [=] {
+		if (const auto current = getCurrentWindow()) {
+			return current;
+		} else if (&Core::App().domain().active() != &session->account()) {
+			Core::App().domain().activate(&session->account());
+		}
+		return getCurrentWindow();
+	};
+	const auto performOnMainWindow = [=](auto callback) {
+		if (const auto window = getWindow()) {
+			if (_menu) {
+				_menu->discardParentReActivate();
+
+				// We must hide PopupMenu before we activate the MainWindow,
+				// otherwise we set focus in field inside MainWindow and then
+				// PopupMenu::hide activates back the group call panel :(
+				_menu = nullptr;
+			}
+			callback(window);
+			window->widget()->activate();
+		}
+	};
+	const auto showProfile = [=] {
+		performOnMainWindow([=](not_null<Window::SessionController*> window) {
+			window->showPeerInfo(user);
+		});
+	};
+	const auto showHistory = [=] {
+		performOnMainWindow([=](not_null<Window::SessionController*> window) {
+			window->showPeerHistory(user);
+		});
+	};
+	const auto removeFromGroup = crl::guard(this, [=] {
+		_kickMemberRequests.fire_copy(user);
+	});
+
+	if (!user->isSelf() && _channel->canManageCall()) {
+		result->addAction(
+			(mute
+				? tr::lng_group_call_context_mute(tr::now)
+				: tr::lng_group_call_context_unmute(tr::now)),
+			toggleMute);
+	}
+	result->addAction(
+		tr::lng_context_view_profile(tr::now),
+		showProfile);
+	result->addAction(
+		tr::lng_context_send_message(tr::now),
+		showHistory);
+	if (_channel->canRestrictUser(user)) {
+		result->addAction(
+			tr::lng_context_remove_from_group(tr::now),
+			removeFromGroup);
+	}
+	return result;
 }
 
 std::unique_ptr<PeerListRow> MembersController::createSelfRow() const {
@@ -633,15 +725,16 @@ std::unique_ptr<PeerListRow> MembersController::createRow(
 } // namespace
 
 GroupMembers::GroupMembers(
-	QWidget *parent,
+	not_null<QWidget*> parent,
 	not_null<GroupCall*> call)
 : RpWidget(parent)
 , _call(call)
 , _scroll(this, st::defaultSolidScroll)
-, _listController(std::make_unique<MembersController>(call)) {
+, _listController(std::make_unique<MembersController>(call, parent)) {
 	setupHeader(call);
 	setupList();
 	setContent(_list);
+	setupFakeRoundCorners();
 	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
 
 	paintRequest(
@@ -660,6 +753,12 @@ auto GroupMembers::toggleMuteRequests() const
 		_listController.get())->toggleMuteRequests();
 }
 
+auto GroupMembers::kickMemberRequests() const
+-> rpl::producer<not_null<UserData*>> {
+	return static_cast<MembersController*>(
+		_listController.get())->kickMemberRequests();
+}
+
 int GroupMembers::desiredHeight() const {
 	auto desired = _header ? _header->height() : 0;
 	auto count = [&] {
@@ -790,6 +889,10 @@ void GroupMembers::updateHeaderControlsGeometry(int newWidth) {
 	_title->moveToLeft(0, 0);
 }
 
+void GroupMembers::setupFakeRoundCorners() {
+
+}
+
 void GroupMembers::visibleTopBottomUpdated(
 		int visibleTop,
 		int visibleBottom) {
diff --git a/Telegram/SourceFiles/calls/calls_group_members.h b/Telegram/SourceFiles/calls/calls_group_members.h
index 1e02d6a76..de42404ee 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.h
+++ b/Telegram/SourceFiles/calls/calls_group_members.h
@@ -26,7 +26,7 @@ class GroupMembers final
 	, private PeerListContentDelegate {
 public:
 	GroupMembers(
-		QWidget *parent,
+		not_null<QWidget*> parent,
 		not_null<GroupCall*> call);
 
 	struct MuteRequest {
@@ -37,6 +37,8 @@ public:
 	[[nodiscard]] int desiredHeight() const;
 	[[nodiscard]] rpl::producer<int> desiredHeightValue() const override;
 	[[nodiscard]] rpl::producer<MuteRequest> toggleMuteRequests() const;
+	[[nodiscard]] auto kickMemberRequests() const
+		-> rpl::producer<not_null<UserData*>>;
 	[[nodiscard]] rpl::producer<> addMembersRequests() const {
 		return _addMemberRequests.events();
 	}
@@ -68,6 +70,7 @@ private:
 	void setupHeader(not_null<GroupCall*> call);
 	object_ptr<Ui::FlatLabel> setupTitle(not_null<GroupCall*> call);
 	void setupList();
+	void setupFakeRoundCorners();
 
 	void setupButtons(not_null<GroupCall*> call);
 
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 0364dd3f3..5763498fa 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/event_filter.h"
 #include "boxes/peers/edit_participants_box.h"
 #include "app.h"
+#include "apiwrap.h" // api().kickParticipant.
 #include "styles/style_calls.h"
 #include "styles/style_layers.h"
 
@@ -360,6 +361,11 @@ void GroupPanel::initWithCall(GroupCall *call) {
 		}
 	}, _callLifetime);
 
+	_members->kickMemberRequests(
+	) | rpl::start_with_next([=](not_null<UserData*> user) {
+		kickMember(user);
+	}, _callLifetime);
+
 	_members->addMembersRequests(
 	) | rpl::start_with_next([=] {
 		if (_call) {
@@ -455,6 +461,43 @@ void GroupPanel::addMembers() {
 	_layerBg->showBox(Box<PeerListBox>(std::move(controller), initBox));
 }
 
+void GroupPanel::kickMember(not_null<UserData*> user) {
+	_layerBg->showBox(Box([=](not_null<Ui::GenericBox*> box) {
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box.get(),
+				tr::lng_profile_sure_kick(
+					tr::now,
+					lt_user,
+					user->firstName),
+				st::groupCallBoxLabel),
+			style::margins(
+				st::boxRowPadding.left(),
+				st::boxPadding.top(),
+				st::boxRowPadding.right(),
+				st::boxPadding.bottom()));
+		box->addButton(tr::lng_box_remove(), [=] {
+			box->closeBox();
+			kickMemberSure(user);
+		});
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	}));
+}
+
+void GroupPanel::kickMemberSure(not_null<UserData*> user) {
+	const auto currentRestrictedRights = [&]() -> MTPChatBannedRights {
+		const auto it = _channel->mgInfo->lastRestricted.find(user);
+		return (it != _channel->mgInfo->lastRestricted.cend())
+			? it->second.rights
+			: MTP_chatBannedRights(MTP_flags(0), MTP_int(0));
+	}();
+
+	_channel->session().api().kickParticipant(
+		_channel,
+		user,
+		currentRestrictedRights);
+}
+
 void GroupPanel::initLayout() {
 	initGeometry();
 
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h
index 691893d55..6fd1f2190 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/calls_group_panel.h
@@ -92,6 +92,8 @@ private:
 	void hangup(bool discardCallChecked);
 
 	void addMembers();
+	void kickMember(not_null<UserData*> user);
+	void kickMemberSure(not_null<UserData*> user);
 	[[nodiscard]] int computeMembersListTop() const;
 	[[nodiscard]] std::optional<QRect> computeTitleRect() const;
 	void refreshTitle();
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 79ea65112..e0fb1129d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 79ea651127962fff366e9d76ce4d932490b30158
+Subproject commit e0fb1129d145054410476bd83d1cecf5c2a2644d

From aeea262b9266e04eba52197006374fdcadc68fc6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Nov 2020 14:56:43 +0300
Subject: [PATCH 196/370] Add fake round corners to call members list.

---
 .../SourceFiles/calls/calls_group_members.cpp | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index e4591ea13..a584833e0 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -890,7 +890,66 @@ void GroupMembers::updateHeaderControlsGeometry(int newWidth) {
 }
 
 void GroupMembers::setupFakeRoundCorners() {
+	const auto size = st::roundRadiusLarge;
+	const auto full = 3 * size;
+	const auto imagePartSize = size * cIntRetinaFactor();
+	const auto imageSize = full * cIntRetinaFactor();
+	const auto image = std::make_shared<QImage>(
+		QImage(imageSize, imageSize, QImage::Format_ARGB32_Premultiplied));
+	image->setDevicePixelRatio(cRetinaFactor());
 
+	const auto refreshImage = [=] {
+		image->fill(st::groupCallBg->c);
+		{
+			QPainter p(image.get());
+			PainterHighQualityEnabler hq(p);
+			p.setCompositionMode(QPainter::CompositionMode_Source);
+			p.setPen(Qt::NoPen);
+			p.setBrush(Qt::transparent);
+			p.drawRoundedRect(0, 0, full, full, size, size);
+		}
+	};
+
+	const auto create = [&](QPoint imagePartOrigin) {
+		const auto result = Ui::CreateChild<Ui::RpWidget>(this);
+		result->show();
+		result->resize(size, size);
+		result->setAttribute(Qt::WA_TransparentForMouseEvents);
+		result->paintRequest(
+		) | rpl::start_with_next([=] {
+			QPainter(result).drawImage(
+				result->rect(),
+				*image,
+				QRect(imagePartOrigin, QSize(imagePartSize, imagePartSize)));
+		}, result->lifetime());
+		result->raise();
+		return result;
+	};
+	const auto shift = imageSize - imagePartSize;
+	const auto topleft = create({ 0, 0 });
+	const auto topright = create({ shift, 0 });
+	const auto bottomleft = create({ 0, shift });
+	const auto bottomright = create({ shift, shift });
+
+	sizeValue(
+	) | rpl::start_with_next([=](QSize size) {
+		topleft->move(0, 0);
+		topright->move(size.width() - topright->width(), 0);
+		bottomleft->move(0, size.height() - bottomleft->height());
+		bottomright->move(
+			size.width() - bottomright->width(),
+			size.height() - bottomright->height());
+	}, lifetime());
+
+	refreshImage();
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		refreshImage();
+		topleft->update();
+		topright->update();
+		bottomleft->update();
+		bottomright->update();
+	}, lifetime());
 }
 
 void GroupMembers::visibleTopBottomUpdated(

From 5739b708442d51eeb5594ce287804bb30792da38 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Nov 2020 15:11:24 +0300
Subject: [PATCH 197/370] Improve group call popup menu styles.

---
 Telegram/SourceFiles/calls/calls.style        | 24 +++++++++++++------
 .../SourceFiles/calls/calls_group_panel.cpp   |  2 +-
 Telegram/lib_ui                               |  2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index af1af5dd8..8d7272faa 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -411,8 +411,8 @@ groupCallRipple: RippleAnimation(defaultRippleAnimation) {
 }
 
 groupCallMenu: Menu(defaultMenu) {
-	itemBg: groupCallMembersBgOver;
-	itemBgOver: groupCallMembersBgRipple;
+	itemBg: groupCallMenuBg;
+	itemBgOver: groupCallMenuBgOver;
 	itemFg: groupCallMembersFg;
 	itemFgOver: groupCallMembersFg;
 	itemFgDisabled: groupCallMemberNotJoinedStatus;
@@ -424,13 +424,15 @@ groupCallMenu: Menu(defaultMenu) {
 
 	arrow: icon {{ "dropdown_submenu_arrow", groupCallMemberNotJoinedStatus }};
 
-	ripple: groupCallRipple;
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: groupCallMenuBgRipple;
+	}
 }
 groupCallMenuShadow: Shadow(defaultEmptyShadow) {
-	fallback: groupCallMembersBgOver;
+	fallback: groupCallMenuBg;
 }
 groupCallPanelAnimation: PanelAnimation(defaultPanelAnimation) {
-	fadeBg: groupCallMembersBgOver;
+	fadeBg: groupCallMenuBg;
 	shadow: groupCallMenuShadow;
 }
 groupCallPopupMenu: PopupMenu(defaultPopupMenu) {
@@ -565,8 +567,16 @@ groupCallSettings: CallButton(callMicrophoneMute) {
 			color: callMuteRipple;
 		}
 	}
-	bg: callIconBg;
-	outerBg: callMuteRipple;
+}
+groupCallHangup: CallButton(callHangup) {
+	button: IconButton(callButton) {
+		icon: icon {{ "calls/call_discard", callIconFg }};
+		ripple: RippleAnimation(defaultRippleAnimation) {
+			color: groupCallLeaveBgRipple;
+		}
+	}
+	bg: groupCallLeaveBg;
+	outerBg: groupCallLeaveBg;
 	label: callButtonLabel;
 }
 groupCallButtonSkip: 43px;
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 5763498fa..480146788 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -226,7 +226,7 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 		.text = tr::lng_group_call_connecting(tr::now),
 		.type = Ui::CallMuteButtonType::Connecting,
 	}))
-, _hangup(widget(), st::callHangup) {
+, _hangup(widget(), st::groupCallHangup) {
 	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
 
 	initWindow();
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index e0fb1129d..5897e357b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit e0fb1129d145054410476bd83d1cecf5c2a2644d
+Subproject commit 5897e357bfd6114ecede2711831b8c5e9d045fcb

From a2191a293edcae481bdca0cc07b5602f1a707b59 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 30 Nov 2020 12:39:35 +0300
Subject: [PATCH 198/370] Added colors overriding for call settings button from
 mute button.

---
 Telegram/SourceFiles/calls/calls_group_panel.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 480146788..1e02ff274 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -228,6 +228,7 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 	}))
 , _hangup(widget(), st::groupCallHangup) {
 	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
+	_settings->setColorOverrides(_mute->colorOverrides());
 
 	initWindow();
 	initWidget();

From 2f7a4730a4901724ccab02ca2aef683773b172ff Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Nov 2020 15:38:00 +0300
Subject: [PATCH 199/370] Use new buttons and phrases.

---
 Telegram/SourceFiles/calls/calls_group_panel.cpp | 4 ++--
 Telegram/lib_ui                                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 1e02ff274..1a91692e7 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -389,8 +389,8 @@ void GroupPanel::initWithCall(GroupCall *call) {
 				: mute == MuteState::ForceMuted
 				? tr::lng_group_call_force_muted(tr::now)
 				: mute != MuteState::Active
-				? tr::lng_call_unmute_audio(tr::now)
-				: tr::lng_call_mute_audio(tr::now)),
+				? tr::lng_group_call_unmute(tr::now)
+				: tr::lng_group_call_you_are_live(tr::now)),
 			.type = (connecting
 				? Ui::CallMuteButtonType::Connecting
 				: mute == MuteState::ForceMuted
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 5897e357b..84b3ac9b5 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 5897e357bfd6114ecede2711831b8c5e9d045fcb
+Subproject commit 84b3ac9b58626f29952b8a0589e950893bfc0577

From 3134d6897118414f4e654af6e96d1c6926968973 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Nov 2020 15:41:39 +0300
Subject: [PATCH 200/370] Closed alpha version 2.4.11.1.

---
 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                       | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 5e36731ba..9b5824ca7 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.11.0" />
+    Version="2.4.11.1" />
   <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 4d2150713..46f41032f 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,11,0
- PRODUCTVERSION 2,4,11,0
+ FILEVERSION 2,4,11,1
+ PRODUCTVERSION 2,4,11,1
  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.11.0"
+            VALUE "FileVersion", "2.4.11.1"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.11.0"
+            VALUE "ProductVersion", "2.4.11.1"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 3d3f6fda6..6fd121b85 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,11,0
- PRODUCTVERSION 2,4,11,0
+ FILEVERSION 2,4,11,1
+ PRODUCTVERSION 2,4,11,1
  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.11.0"
+            VALUE "FileVersion", "2.4.11.1"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.11.0"
+            VALUE "ProductVersion", "2.4.11.1"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index ab26b4e00..3ec410ef6 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/const_string.h"
 
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (2004011001ULL)
 
 #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
 #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
@@ -24,5 +24,5 @@ constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
 constexpr auto AppVersion = 2004011;
 constexpr auto AppVersionStr = "2.4.11";
-constexpr auto AppBetaVersion = true;
+constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 23d9aea34..b8284de81 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -2,6 +2,6 @@ AppVersion         2004011
 AppVersionStrMajor 2.4
 AppVersionStrSmall 2.4.11
 AppVersionStr      2.4.11
-BetaChannel        1
-AlphaVersion       0
-AppVersionOriginal 2.4.11.beta
+BetaChannel        0
+AlphaVersion       2004011001
+AppVersionOriginal 2.4.11.1

From 624ee3bf60097d62ad7c623b27576c5c93a43b37 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Nov 2020 18:51:04 +0300
Subject: [PATCH 201/370] Send speaking typing actions.

---
 .../SourceFiles/api/api_send_progress.cpp     |  1 +
 Telegram/SourceFiles/api/api_send_progress.h  |  1 +
 .../SourceFiles/calls/calls_group_call.cpp    | 22 +++++++++++++++----
 Telegram/SourceFiles/calls/calls_group_call.h |  5 +++++
 .../calls/calls_group_settings.cpp            |  2 +-
 .../history/view/history_view_send_action.cpp |  6 ++---
 Telegram/lib_ui                               |  2 +-
 7 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_send_progress.cpp b/Telegram/SourceFiles/api/api_send_progress.cpp
index 6def1f9cd..c21a1a516 100644
--- a/Telegram/SourceFiles/api/api_send_progress.cpp
+++ b/Telegram/SourceFiles/api/api_send_progress.cpp
@@ -121,6 +121,7 @@ void SendProgressManager::send(const Key &key, int progress) {
 		case Type::ChooseLocation: return MTP_sendMessageGeoLocationAction();
 		case Type::ChooseContact: return MTP_sendMessageChooseContactAction();
 		case Type::PlayGame: return MTP_sendMessageGamePlayAction();
+		case Type::Speaking: return MTP_speakingInGroupCallAction();
 		default: return MTP_sendMessageTypingAction();
 		}
 	}();
diff --git a/Telegram/SourceFiles/api/api_send_progress.h b/Telegram/SourceFiles/api/api_send_progress.h
index 22bed6ac1..511e25cc1 100644
--- a/Telegram/SourceFiles/api/api_send_progress.h
+++ b/Telegram/SourceFiles/api/api_send_progress.h
@@ -31,6 +31,7 @@ enum class SendProgressType {
 	ChooseLocation,
 	ChooseContact,
 	PlayGame,
+	Speaking,
 };
 
 struct SendProgress {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 09ed5804e..d03bdda74 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_group_call.h"
 
 #include "main/main_session.h"
+#include "api/api_send_progress.h"
 #include "apiwrap.h"
 #include "lang/lang_keys.h"
 #include "boxes/confirm_box.h"
@@ -38,6 +39,7 @@ constexpr auto kMaxInvitePerSlice = 10;
 constexpr auto kCheckLastSpokeInterval = 3 * crl::time(1000);
 constexpr auto kSpeakLevelThreshold = 0.2;
 constexpr auto kCheckJoinedTimeout = 4 * crl::time(1000);
+constexpr auto kUpdateSendActionEach = crl::time(500);
 
 } // namespace
 
@@ -47,6 +49,7 @@ GroupCall::GroupCall(
 	const MTPInputGroupCall &inputCall)
 : _delegate(delegate)
 , _channel(channel)
+, _history(channel->owner().history(channel))
 , _api(&_channel->session().mtp())
 , _lastSpokeCheckTimer([=] { checkLastSpoke(); })
 , _checkJoinedTimer([=] { checkJoined(); }) {
@@ -154,9 +157,11 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 }
 
 void GroupCall::rejoin() {
-	Expects(_state.current() == State::Joining
-		|| _state.current() == State::Joined
-		|| _state.current() == State::Connecting);
+	if (state() != State::Joining
+		&& state() != State::Joined
+		&& state() != State::Connecting) {
+		return;
+	}
 
 	_mySsrc = 0;
 	setState(State::Joining);
@@ -491,14 +496,23 @@ void GroupCall::handleLevelsUpdated(
 	auto checkNow = false;
 	const auto now = crl::now();
 	for (const auto &[source, level] : data) {
+		const auto self = (source == _mySsrc);
 		_levelUpdates.fire(LevelUpdate{
 			.source = source,
 			.value = level,
-			.self = (source == _mySsrc)
+			.self = self
 		});
 		if (level <= kSpeakLevelThreshold) {
 			continue;
 		}
+		if (self
+			&& (!_lastSendProgressUpdate
+				|| _lastSendProgressUpdate + kUpdateSendActionEach < now)) {
+			_lastSendProgressUpdate = now;
+			_channel->session().sendProgressManager().update(
+				_history,
+				Api::SendProgressType::Speaking);
+		}
 
 		check = true;
 		const auto i = _lastSpoke.find(source);
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index db2a0aa62..b8c1f7988 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -13,6 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mtproto/sender.h"
 #include "mtproto/mtproto_auth_key.h"
 
+class History;
+
 namespace tgcalls {
 class GroupInstanceImpl;
 } // namespace tgcalls
@@ -135,6 +137,7 @@ private:
 
 	const not_null<Delegate*> _delegate;
 	const not_null<ChannelData*> _channel;
+	const not_null<History*> _history;
 	MTP::Sender _api;
 	rpl::variable<State> _state = State::Creating;
 	bool _instanceConnected = false;
@@ -154,6 +157,8 @@ private:
 	base::Timer _lastSpokeCheckTimer;
 	base::Timer _checkJoinedTimer;
 
+	crl::time _lastSendProgressUpdate = 0;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
index 8f4ab9eaa..5a4246c16 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -115,7 +115,7 @@ void GroupCallSettingsBox(
 		),
 		st::groupCallSettingsButton
 	)->addClickHandler([=] {
-		box->getDelegate()->show(ChooseAudioInputBox(crl::guard(box, [=](
+		box->getDelegate()->show(ChooseAudioOutputBox(crl::guard(box, [=](
 				const QString &id,
 				const QString &name) {
 			state->outputNameStream.fire_copy(name);
diff --git a/Telegram/SourceFiles/history/view/history_view_send_action.cpp b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
index f62efa170..8719aacfb 100644
--- a/Telegram/SourceFiles/history/view/history_view_send_action.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
@@ -51,9 +51,9 @@ bool SendActionPainter::updateNeedsAnimating(
 
 	const auto now = crl::now();
 	const auto emplaceAction = [&](
-		Type type,
-		crl::time duration,
-		int progress = 0) {
+			Type type,
+			crl::time duration,
+			int progress = 0) {
 		_sendActions.emplace_or_assign(user, type, now + duration, progress);
 	};
 	action.match([&](const MTPDsendMessageTypingAction &) {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 84b3ac9b5..c4df09733 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 84b3ac9b58626f29952b8a0589e950893bfc0577
+Subproject commit c4df097339aa7edf1d7aadde4df4a954971a3afb

From 02d5af7d713727710f6a48d257f7353267ff79b1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Nov 2020 20:43:37 +0300
Subject: [PATCH 202/370] Detect animated stickers by mime type.

---
 Telegram/SourceFiles/data/data_document.cpp | 3 +--
 Telegram/ThirdParty/tgcalls                 | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index cd236d62f..b7c8d16ca 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -580,8 +580,7 @@ void DocumentData::setattributes(
 
 void DocumentData::validateLottieSticker() {
 	if (type == FileDocument
-		&& _mimeString == qstr("application/x-tgsticker")
-		&& hasThumbnail()) {
+		&& _mimeString == qstr("application/x-tgsticker")) {
 		type = StickerDocument;
 		_additional = std::make_unique<StickerData>();
 		sticker()->animated = true;
diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index 10d63157e..5879ef0c4 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit 10d63157e4ebdf71d1ea3694bef2ab1f7d7f033c
+Subproject commit 5879ef0c4f42dad4ed0f7e2da856506d5ae9780c

From c53d9c532f9484580e3ddd5783d598fb8acd6636 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Nov 2020 21:08:27 +0300
Subject: [PATCH 203/370] Delayed mic init in group call settings.

---
 .../SourceFiles/calls/calls_group_panel.cpp     |  6 +-----
 .../SourceFiles/calls/calls_group_settings.cpp  | 17 ++++++++++++-----
 Telegram/lib_ui                                 |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 1a91692e7..f75d7de2c 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -255,9 +255,7 @@ void GroupPanel::initWindow() {
 	_window->setWindowIcon(
 		QIcon(QPixmap::fromImage(Image::Empty()->original(), Qt::ColorOnly)));
 	_window->setTitleStyle(st::callTitle);
-	_window->setTitle(computeTitleRect()
-		? u" "_q
-		: tr::lng_group_call_title(tr::now));
+	_window->setTitle(tr::lng_group_call_title(tr::now));
 
 	base::install_event_filter(_window.get(), [=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::Close && handleClose()) {
@@ -590,7 +588,6 @@ void GroupPanel::refreshTitle() {
 				tr::lng_group_call_title(),
 				st::groupCallHeaderLabel);
 			_title->setAttribute(Qt::WA_TransparentForMouseEvents);
-			_window->setTitle(u" "_q);
 		}
 		const auto best = _title->naturalWidth();
 		const auto from = (widget()->width() - best) / 2;
@@ -611,7 +608,6 @@ void GroupPanel::refreshTitle() {
 		}
 	} else if (_title) {
 		_title.destroy();
-		_window->setTitle(tr::lng_group_call_title(tr::now));
 	}
 }
 
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
index 5a4246c16..5d1383303 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -101,10 +101,6 @@ void GroupCallSettingsBox(
 		AddSkip(layout);
 	}
 
-	state->levelUpdateTimer.callEach(kMicTestUpdateInterval);
-	state->micTester = std::make_unique<Webrtc::AudioInputTester>(
-		settings.callInputDeviceId());
-
 	AddButtonWithLabel(
 		layout,
 		tr::lng_group_call_speakers(),
@@ -136,7 +132,9 @@ void GroupCallSettingsBox(
 				const QString &id,
 				const QString &name) {
 			state->inputNameStream.fire_copy(name);
-			state->micTester->setDeviceId(id);
+			if (state->micTester) {
+				state->micTester->setDeviceId(id);
+			}
 		}), &st::groupCallCheckbox, &st::groupCallRadio));
 	});
 
@@ -214,6 +212,15 @@ void GroupCallSettingsBox(
 		});
 	}
 
+	box->setShowFinishedCallback([=] {
+		// Means we finished showing the box.
+		crl::on_main(box, [=] {
+			state->micTester = std::make_unique<Webrtc::AudioInputTester>(
+				Core::App().settings().callInputDeviceId());
+			state->levelUpdateTimer.callEach(kMicTestUpdateInterval);
+		});
+	});
+
 	box->setTitle(tr::lng_group_call_settings_title());
 	box->boxClosing(
 	) | rpl::start_with_next([=] {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index c4df09733..7fd90cb38 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit c4df097339aa7edf1d7aadde4df4a954971a3afb
+Subproject commit 7fd90cb38b6b1069af43039f93c991fffaf8ddea

From c109e35d95a8500c7f282f4daa3d913c0f4f8190 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 20 Nov 2020 20:04:50 +0300
Subject: [PATCH 204/370] Fixed send options in CreatePollBox and SendFilesBox
 in replies.

---
 .../SourceFiles/boxes/create_poll_box.cpp     | 31 +++++++++----------
 Telegram/SourceFiles/boxes/create_poll_box.h  |  8 ++++-
 .../view/history_view_replies_section.cpp     |  2 +-
 .../SourceFiles/window/window_peer_menu.cpp   | 14 +++++++--
 .../SourceFiles/window/window_peer_menu.h     |  4 ++-
 5 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index 2ac6a8fb7..07d0dd0c5 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -754,11 +754,13 @@ CreatePollBox::CreatePollBox(
 	not_null<Window::SessionController*> controller,
 	PollData::Flags chosen,
 	PollData::Flags disabled,
-	Api::SendType sendType)
+	Api::SendType sendType,
+	SendMenu::Type sendMenuType)
 : _controller(controller)
 , _chosen(chosen)
 , _disabled(disabled)
-, _sendType(sendType) {
+, _sendType(sendType)
+, _sendMenuType(sendMenuType) {
 }
 
 rpl::producer<CreatePollBox::Result> CreatePollBox::submitRequests() const {
@@ -1101,26 +1103,23 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 	}, lifetime());
 
 	const auto isNormal = (_sendType == Api::SendType::Normal);
-	const auto isScheduled = (_sendType == Api::SendType::Scheduled);
 
 	const auto submit = addButton(
 		isNormal
 			? tr::lng_polls_create_button()
 			: tr::lng_schedule_button(),
 		[=] { isNormal ? send({}) : sendScheduled(); });
-	if (isNormal || isScheduled) {
-		const auto sendMenuType = [=] {
-			collectError();
-			return (*error || isScheduled)
-				? SendMenu::Type::Disabled
-				: SendMenu::Type::Scheduled;
-		};
-		SendMenu::SetupMenuAndShortcuts(
-			submit.data(),
-			sendMenuType,
-			sendSilent,
-			sendScheduled);
-	}
+	const auto sendMenuType = [=] {
+		collectError();
+		return (*error)
+			? SendMenu::Type::Disabled
+			: _sendMenuType;
+	};
+	SendMenu::SetupMenuAndShortcuts(
+		submit.data(),
+		sendMenuType,
+		sendSilent,
+		sendScheduled);
 	addButton(tr::lng_cancel(), [=] { closeBox(); });
 
 	return result;
diff --git a/Telegram/SourceFiles/boxes/create_poll_box.h b/Telegram/SourceFiles/boxes/create_poll_box.h
index f88de5418..362213987 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.h
+++ b/Telegram/SourceFiles/boxes/create_poll_box.h
@@ -22,6 +22,10 @@ namespace Window {
 class SessionController;
 } // namespace Window
 
+namespace SendMenu {
+enum class Type;
+} // namespace SendMenu
+
 class CreatePollBox : public Ui::BoxContent {
 public:
 	struct Result {
@@ -34,7 +38,8 @@ public:
 		not_null<Window::SessionController*> controller,
 		PollData::Flags chosen,
 		PollData::Flags disabled,
-		Api::SendType sendType);
+		Api::SendType sendType,
+		SendMenu::Type sendMenuType);
 
 	[[nodiscard]] rpl::producer<Result> submitRequests() const;
 	void submitFailed(const QString &error);
@@ -66,6 +71,7 @@ private:
 	const PollData::Flags _chosen = PollData::Flags();
 	const PollData::Flags _disabled = PollData::Flags();
 	const Api::SendType _sendType = Api::SendType();
+	const SendMenu::Type _sendMenuType;
 	Fn<void()> _setInnerFocus;
 	Fn<rpl::producer<bool>()> _dataIsValidValue;
 	rpl::event_stream<Result> _submitRequests;
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index ea9818aef..47d6aae4f 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -632,7 +632,7 @@ bool RepliesWidget::confirmSendingFiles(
 		text,
 		_history->peer->slowmodeApplied() ? SendLimit::One : SendLimit::Many,
 		Api::SendType::Normal,
-		SendMenu::Type::Disabled); // #TODO replies schedule
+		SendMenu::Type::SilentOnly); // #TODO replies schedule
 	_composeControls->setText({});
 
 	const auto replyTo = replyToId();
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 02218bd02..9e5f7653f 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -616,6 +616,11 @@ void Filler::addPollAction(not_null<PeerData*> peer) {
 	const auto source = (_request.section == Section::Scheduled)
 		? Api::SendType::Scheduled
 		: Api::SendType::Normal;
+	const auto sendMenuType = (_request.section == Section::Scheduled)
+		? SendMenu::Type::Disabled
+		: (_request.section == Section::Replies)
+		? SendMenu::Type::SilentOnly
+		: SendMenu::Type::Scheduled;
 	const auto flag = PollData::Flags();
 	const auto replyToId = _request.currentReplyToId
 		? _request.currentReplyToId
@@ -627,7 +632,8 @@ void Filler::addPollAction(not_null<PeerData*> peer) {
 			replyToId,
 			flag,
 			flag,
-			source);
+			source,
+			sendMenuType);
 	};
 	_addAction(tr::lng_polls_create(tr::now), std::move(callback));
 }
@@ -812,7 +818,8 @@ void PeerMenuCreatePoll(
 		MsgId replyToId,
 		PollData::Flags chosen,
 		PollData::Flags disabled,
-		Api::SendType sendType) {
+		Api::SendType sendType,
+		SendMenu::Type sendMenuType) {
 	if (peer->isChannel() && !peer->isMegagroup()) {
 		chosen &= ~PollData::Flag::PublicVotes;
 		disabled |= PollData::Flag::PublicVotes;
@@ -821,7 +828,8 @@ void PeerMenuCreatePoll(
 		controller,
 		chosen,
 		disabled,
-		sendType));
+		sendType,
+		sendMenuType));
 	const auto lock = box->lifetime().make_state<bool>(false);
 	box->submitRequests(
 	) | rpl::start_with_next([=](const CreatePollBox::Result &result) {
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index fdaf60363..939f52a39 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "api/api_common.h"
+#include "chat_helpers/send_context_menu.h"
 #include "data/data_poll.h"
 
 class History;
@@ -69,7 +70,8 @@ void PeerMenuCreatePoll(
 	MsgId replyToId = 0,
 	PollData::Flags chosen = PollData::Flags(),
 	PollData::Flags disabled = PollData::Flags(),
-	Api::SendType sendType = Api::SendType::Normal);
+	Api::SendType sendType = Api::SendType::Normal,
+	SendMenu::Type sendMenuType = SendMenu::Type::Scheduled);
 
 struct ClearChat {
 };

From 5f9e497d382fba1fdd81f31f0947d5403c07b1fe Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 22 Nov 2020 03:43:56 +0300
Subject: [PATCH 205/370] Fixed accidental stop of voice recording in sections.

---
 .../history/view/controls/history_view_voice_record_bar.cpp     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 2c0142c71..c8339467a 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1288,6 +1288,7 @@ void VoiceRecordBar::stop(bool send) {
 }
 
 void VoiceRecordBar::finish() {
+	stopRecording(StopType::Cancel);
 	_recordingLifetime.destroy();
 	_lockShowing = false;
 	_recording = false;
@@ -1307,7 +1308,6 @@ void VoiceRecordBar::hideFast() {
 	hide();
 	_lock->hide();
 	_level->hide();
-	stopRecording(StopType::Cancel);
 }
 
 void VoiceRecordBar::stopRecording(StopType type) {

From 7b837e5138fd998a9871f8f2177a8f4cf89ba18c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 22 Nov 2020 04:11:52 +0300
Subject: [PATCH 206/370] Fixed section scrolling above voice recording lock.

---
 Telegram/SourceFiles/history/history_widget.cpp            | 5 +++++
 .../view/controls/history_view_compose_controls.cpp        | 4 ++++
 .../history/view/controls/history_view_compose_controls.h  | 1 +
 .../view/controls/history_view_voice_record_bar.cpp        | 7 +++++++
 .../history/view/controls/history_view_voice_record_bar.h  | 1 +
 .../history/view/history_view_replies_section.cpp          | 5 +++++
 .../history/view/history_view_scheduled_section.cpp        | 5 +++++
 7 files changed, 28 insertions(+)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index f5ec69fa7..b8a243a20 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -815,6 +815,11 @@ void HistoryWidget::initVoiceRecordBar() {
 		updateSendButtonType();
 	}, lifetime());
 
+	_voiceRecordBar->lockViewportEvents(
+	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		_scroll->viewportEvent(e);
+	}, lifetime());
+
 	_voiceRecordBar->hideFast();
 }
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 5f440dc47..76ba6c160 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2122,6 +2122,10 @@ rpl::producer<bool> ComposeControls::lockShowStarts() const {
 	return _voiceRecordBar->lockShowStarts();
 }
 
+rpl::producer<not_null<QEvent*>> ComposeControls::viewportEvents() const {
+	return _voiceRecordBar->lockViewportEvents();
+}
+
 bool ComposeControls::isRecording() const {
 	return _voiceRecordBar->isRecording();
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 4da785239..8ca65f62b 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -120,6 +120,7 @@ public:
 	[[nodiscard]] rpl::producer<not_null<QKeyEvent*>> keyEvents() const;
 	[[nodiscard]] rpl::producer<InlineChosen> inlineResultChosen() const;
 	[[nodiscard]] rpl::producer<SendActionUpdate> sendActionUpdates() const;
+	[[nodiscard]] rpl::producer<not_null<QEvent*>> viewportEvents() const;
 
 	using MimeDataHook = Fn<bool(
 		not_null<const QMimeData*> data,
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index c8339467a..143ba1b11 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1433,6 +1433,13 @@ rpl::producer<bool> VoiceRecordBar::lockShowStarts() const {
 	return _lockShowing.changes();
 }
 
+rpl::producer<not_null<QEvent*>> VoiceRecordBar::lockViewportEvents() const {
+	return _lock->events(
+		) | rpl::filter([=](not_null<QEvent*> e) {
+			return e->type() == QEvent::Wheel;
+		});
+}
+
 rpl::producer<> VoiceRecordBar::updateSendButtonTypeRequests() const {
 	return _listenChanges.events();
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index f976bafb8..bc96898f5 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -59,6 +59,7 @@ public:
 	[[nodiscard]] rpl::producer<VoiceToSend> sendVoiceRequests() const;
 	[[nodiscard]] rpl::producer<bool> recordingStateChanges() const;
 	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
+	[[nodiscard]] rpl::producer<not_null<QEvent*>> lockViewportEvents() const;
 	[[nodiscard]] rpl::producer<> updateSendButtonTypeRequests() const;
 
 	void requestToSendWithOptions(Api::SendOptions options);
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 47d6aae4f..1787f399b 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -531,6 +531,11 @@ void RepliesWidget::setupComposeControls() {
 		updateScrollDownVisibility();
 	}, lifetime());
 
+	_composeControls->viewportEvents(
+	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		_scroll->viewportEvent(e);
+	}, lifetime());
+
 	_composeControls->finishAnimating();
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 723c424c5..484fbd69b 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -266,6 +266,11 @@ void ScheduledWidget::setupComposeControls() {
 	) | rpl::start_with_next([=] {
 		updateScrollDownVisibility();
 	}, lifetime());
+
+	_composeControls->viewportEvents(
+	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+		_scroll->viewportEvent(e);
+	}, lifetime());
 }
 
 void ScheduledWidget::chooseAttach() {

From 346547c23d21ae5f25befac3ab736610ed3e0e7a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 22 Nov 2020 06:35:00 +0300
Subject: [PATCH 207/370] Fixed draft applying while recording voice message in
 HistoryWidget.

---
 .../SourceFiles/history/history_widget.cpp     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index b8a243a20..aa9250236 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -821,6 +821,13 @@ void HistoryWidget::initVoiceRecordBar() {
 	}, lifetime());
 
 	_voiceRecordBar->hideFast();
+
+	_voiceRecordBar->shownValue(
+	) | rpl::start_with_next([=](bool shown) {
+		if (!shown) {
+			applyDraft();
+		}
+	}, lifetime());
 }
 
 void HistoryWidget::initTabbedSelector() {
@@ -2082,8 +2089,15 @@ bool HistoryWidget::contentOverlapped(const QRect &globalRect) {
 }
 
 bool HistoryWidget::canWriteMessage() const {
-	if (!_history || !_canSendMessages) return false;
-	if (isBlocked() || isJoinChannel() || isMuteUnmute() || isBotStart()) return false;
+	if (!_history || !_canSendMessages) {
+		return false;
+	}
+	if (isBlocked() || isJoinChannel() || isMuteUnmute() || isBotStart()) {
+		return false;
+	}
+	if (!_voiceRecordBar->isHidden()) {
+		return false;
+	}
 	return true;
 }
 

From c4c18d16abc3ce0f904371266e1557bff6c79e25 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 30 Nov 2020 22:40:13 +0300
Subject: [PATCH 208/370] Updated docs.

---
 .github/workflows/mac.yml                   | 6 +++---
 .github/workflows/win.yml                   | 8 +++-----
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 94c164fcf..21e486f17 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -366,9 +366,9 @@ jobs:
         run: |
           cd $LibrariesPath
 
-          git clone https://github.com/telegramdesktop/openal-soft.git
+          git clone $GIT/kcat/openal-soft.git
           cd openal-soft
-          git checkout fix_mono
+          git checkout 3970252da9
           cd build
 
           CFLAGS="$UNGUARDED" CPPFLAGS="$UNGUARDED" cmake \
@@ -481,7 +481,7 @@ jobs:
         run: |
           cd $LibrariesPath
 
-          git clone $GIT/desktop-app/tg_owt.git
+          git clone --recursive $GIT/desktop-app/tg_owt.git
           mkdir -p tg_owt/out/Debug
           cd tg_owt/out/Debug
           cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug \
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 510ce788e..0f7e70d91 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -211,10 +211,8 @@ jobs:
         run: |
           %VC%
 
-          git clone %GIT%/telegramdesktop/openal-soft.git
-          cd openal-soft
-          git checkout fix_capture
-          cd build
+          git clone -b openal-soft-1.21.0 --depth=1 $GIT/kcat/openal-soft.git
+          cd openal-soft\build
           cmake .. ^
           -G "Visual Studio 16 2019" ^
           -A Win32 ^
@@ -367,7 +365,7 @@ jobs:
         run: |
           %VC%
 
-          git clone %GIT%/desktop-app/tg_owt.git
+          git clone --recursive %GIT%/desktop-app/tg_owt.git
           mkdir tg_owt\out\Debug
           cd tg_owt\out\Debug
           cmake -G Ninja ^
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index eeb531458..e3f3b23f3 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -486,7 +486,7 @@ COPY --from=opus ${LibrariesPath}/opus-cache /
 COPY --from=ffmpeg ${LibrariesPath}/ffmpeg-cache /
 COPY --from=openssl ${LibrariesPath}/openssl-cache /
 
-RUN git clone $GIT/desktop-app/tg_owt.git
+RUN git clone --recursive $GIT/desktop-app/tg_owt.git
 
 WORKDIR tg_owt
 RUN git checkout c73a471

From 80597e190acbd9b74993d67743c406b772156454 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 30 Nov 2020 23:56:43 +0300
Subject: [PATCH 209/370] Fixed permissions requesting for different call
 types.

---
 Telegram/SourceFiles/calls/calls_call.cpp     | 11 ++++++++++-
 Telegram/SourceFiles/calls/calls_call.h       |  5 ++++-
 Telegram/SourceFiles/calls/calls_instance.cpp | 17 ++++++++++-------
 Telegram/SourceFiles/calls/calls_instance.h   |  8 +++++---
 Telegram/SourceFiles/calls/calls_panel.cpp    |  5 +----
 5 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 9b428d407..913536660 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -288,10 +288,19 @@ void Call::startIncoming() {
 	}).send();
 }
 
+void Call::switchVideoOutgoing() {
+	const auto video = _videoOutgoing->state() == Webrtc::VideoState::Active;
+	_delegate->callRequestPermissionsOrFail(crl::guard(this, [=] {
+		videoOutgoing()->setState(StartVideoState(!video));
+	}), true);
+
+}
+
 void Call::answer() {
+	const auto video = _videoOutgoing->state() == Webrtc::VideoState::Active;
 	_delegate->callRequestPermissionsOrFail(crl::guard(this, [=] {
 		actuallyAnswer();
-	}));
+	}), video);
 }
 
 void Call::actuallyAnswer() {
diff --git a/Telegram/SourceFiles/calls/calls_call.h b/Telegram/SourceFiles/calls/calls_call.h
index 004225ecc..531397c1d 100644
--- a/Telegram/SourceFiles/calls/calls_call.h
+++ b/Telegram/SourceFiles/calls/calls_call.h
@@ -68,7 +68,9 @@ public:
 			Ended,
 		};
 		virtual void playSound(Sound sound) = 0;
-		virtual void callRequestPermissionsOrFail(Fn<void()> onSuccess) = 0;
+		virtual void callRequestPermissionsOrFail(
+			Fn<void()> onSuccess,
+			bool video) = 0;
 		virtual auto getVideoCapture()
 			-> std::shared_ptr<tgcalls::VideoCaptureInterface> = 0;
 
@@ -165,6 +167,7 @@ public:
 	crl::time getDurationMs() const;
 	float64 getWaitingSoundPeakValue() const;
 
+	void switchVideoOutgoing();
 	void answer();
 	void hangup();
 	void redial();
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index 672d36e53..e5e9f9510 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -55,7 +55,7 @@ void Instance::startOutgoingCall(not_null<UserData*> user, bool video) {
 	}
 	requestPermissionsOrFail(crl::guard(this, [=] {
 		createCall(user, Call::Type::Outgoing, video);
-	}));
+	}), video);
 }
 
 void Instance::startGroupCall(not_null<ChannelData*> channel) {
@@ -64,7 +64,7 @@ void Instance::startGroupCall(not_null<ChannelData*> channel) {
 	}
 	requestPermissionsOrFail(crl::guard(this, [=] {
 		createGroupCall(channel, MTP_inputGroupCall(MTPlong(), MTPlong()));
-	}));
+	}), false);
 }
 
 void Instance::joinGroupCall(
@@ -75,7 +75,7 @@ void Instance::joinGroupCall(
 	}
 	requestPermissionsOrFail(crl::guard(this, [=] {
 		createGroupCall(channel, call);
-	}));
+	}), false);
 }
 
 void Instance::callFinished(not_null<Call*> call) {
@@ -462,12 +462,15 @@ rpl::producer<GroupCall*> Instance::currentGroupCallValue() const {
 	return _currentGroupCallChanges.events_starting_with(currentGroupCall());
 }
 
-void Instance::requestPermissionsOrFail(Fn<void()> onSuccess) {
+void Instance::requestPermissionsOrFail(Fn<void()> onSuccess, bool video) {
 	using Type = Platform::PermissionType;
 	requestPermissionOrFail(Type::Microphone, [=] {
-		requestPermissionOrFail(Type::Camera, [=] {
-			crl::on_main(onSuccess);
-		});
+		auto callback = [=] { crl::on_main(onSuccess); };
+		if (video) {
+			requestPermissionOrFail(Type::Camera, std::move(callback));
+		} else {
+			callback();
+		}
 	});
 }
 
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index 6877e1422..10d9b56b1 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -72,8 +72,10 @@ private:
 	void callFinished(not_null<Call*> call) override;
 	void callFailed(not_null<Call*> call) override;
 	void callRedial(not_null<Call*> call) override;
-	void callRequestPermissionsOrFail(Fn<void()> onSuccess) override {
-		requestPermissionsOrFail(std::move(onSuccess));
+	void callRequestPermissionsOrFail(
+			Fn<void()> onSuccess,
+			bool video) override {
+		requestPermissionsOrFail(std::move(onSuccess), video);
 	}
 
 	void groupCallFinished(not_null<GroupCall*> call) override;
@@ -89,7 +91,7 @@ private:
 		const MTPInputGroupCall &inputCall);
 	void destroyGroupCall(not_null<GroupCall*> call);
 
-	void requestPermissionsOrFail(Fn<void()> onSuccess);
+	void requestPermissionsOrFail(Fn<void()> onSuccess, bool video = true);
 	void requestPermissionOrFail(Platform::PermissionType type, Fn<void()> onSuccess);
 
 	void refreshDhConfig();
diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index 14ac068f8..0d87b44c4 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -307,10 +307,7 @@ void Panel::initControls() {
 	});
 	_camera->setClickedCallback([=] {
 		if (_call) {
-			_call->videoOutgoing()->setState(
-				(_call->videoOutgoing()->state() == Webrtc::VideoState::Active)
-				? Webrtc::VideoState::Inactive
-				: Webrtc::VideoState::Active);
+			_call->switchVideoOutgoing();
 		}
 	});
 

From 498d6226e3c858869568584451cec1a88673de27 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Dec 2020 12:06:06 +0300
Subject: [PATCH 210/370] Add blob animations to group call participants.

---
 Telegram/SourceFiles/calls/calls.style        |   3 +
 .../SourceFiles/calls/calls_group_call.cpp    |  22 +-
 Telegram/SourceFiles/calls/calls_group_call.h |   2 +-
 .../SourceFiles/calls/calls_group_members.cpp | 266 ++++++++++--------
 Telegram/SourceFiles/data/data_group_call.cpp |  80 +++---
 Telegram/SourceFiles/data/data_group_call.h   |  14 +-
 6 files changed, 216 insertions(+), 171 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 8d7272faa..a46b7eea5 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -660,3 +660,6 @@ groupCallSettingsAttentionButton: SettingsButton(groupCallSettingsButton) {
 groupCallBoxLabel: FlatLabel(boxLabel) {
 	textFg: groupCallMembersFg;
 }
+
+groupCallRowBlobMinRadius: 26px;
+groupCallRowBlobMaxRadius: 30px;
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index d03bdda74..d59452582 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -152,7 +152,7 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 	}) | rpl::start_with_next([=](const Update &update) {
 		Expects(update.was.has_value());
 
-		_instance->removeSsrcs({ update.was->source });
+		_instance->removeSsrcs({ update.was->ssrc });
 	}, _lifetime);
 }
 
@@ -190,7 +190,7 @@ void GroupCall::rejoin() {
 			root.insert("fingerprints", fingerprints);
 			root.insert("ssrc", double(payload.ssrc));
 
-			LOG(("Call Info: Join payload received, joining with source: %1."
+			LOG(("Call Info: Join payload received, joining with ssrc: %1."
 				).arg(ssrc));
 
 			const auto json = QJsonDocument(root).toJson(
@@ -418,12 +418,12 @@ void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
 			}
 			if (data.is_left() && data.vsource().v == _mySsrc) {
 				// I was removed from the call, rejoin.
-				LOG(("Call Info: Rejoin after got 'left' with my source."));
+				LOG(("Call Info: Rejoin after got 'left' with my ssrc."));
 				setState(State::Joining);
 				rejoin();
 			} else if (!data.is_left() && data.vsource().v != _mySsrc) {
 				// I joined from another device, hangup.
-				LOG(("Call Info: Hangup after '!left' with source %1, my %2."
+				LOG(("Call Info: Hangup after '!left' with ssrc %1, my %2."
 					).arg(data.vsource().v
 					).arg(_mySsrc));
 				_mySsrc = 0;
@@ -495,10 +495,10 @@ void GroupCall::handleLevelsUpdated(
 	auto check = false;
 	auto checkNow = false;
 	const auto now = crl::now();
-	for (const auto &[source, level] : data) {
-		const auto self = (source == _mySsrc);
+	for (const auto &[ssrc, level] : data) {
+		const auto self = (ssrc == _mySsrc);
 		_levelUpdates.fire(LevelUpdate{
-			.source = source,
+			.ssrc = ssrc,
 			.value = level,
 			.self = self
 		});
@@ -515,9 +515,9 @@ void GroupCall::handleLevelsUpdated(
 		}
 
 		check = true;
-		const auto i = _lastSpoke.find(source);
+		const auto i = _lastSpoke.find(ssrc);
 		if (i == _lastSpoke.end()) {
-			_lastSpoke.emplace(source, now);
+			_lastSpoke.emplace(ssrc, now);
 			checkNow = true;
 		} else {
 			if (i->second + kCheckLastSpokeInterval / 3 <= now) {
@@ -553,14 +553,14 @@ void GroupCall::checkLastSpoke() {
 	const auto now = crl::now();
 	auto list = base::take(_lastSpoke);
 	for (auto i = list.begin(); i != list.end();) {
-		const auto [source, when] = *i;
+		const auto [ssrc, when] = *i;
 		if (when + kCheckLastSpokeInterval >= now) {
 			hasRecent = true;
 			++i;
 		} else {
 			i = list.erase(i);
 		}
-		real->applyLastSpoke(source, when, now);
+		real->applyLastSpoke(ssrc, when, now);
 	}
 	_lastSpoke = std::move(list);
 
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index b8c1f7988..52d1e7985 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -28,7 +28,7 @@ enum class MuteState {
 };
 
 struct LevelUpdate {
-	uint32 source = 0;
+	uint32 ssrc = 0;
 	float value = 0.;
 	bool self = false;
 };
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index a584833e0..4125f4369 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_changes.h"
 #include "data/data_group_call.h"
 #include "data/data_peer_values.h" // Data::CanWriteValue.
+#include "ui/paint/blobs.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/widgets/popup_menu.h"
@@ -32,12 +33,37 @@ namespace Calls {
 namespace {
 
 constexpr auto kLevelThreshold = 0.2;
+constexpr auto kRowBlobRadiusFactor = (float)(50. / 57.);
+constexpr auto kLevelDuration = 100. + 500. * 0.33;
+constexpr auto kScaleSmall = 0.704 - 0.1;
+constexpr auto kScaleSmallMin = 0.926;
+constexpr auto kScaleSmallMax = (float)(kScaleSmallMin + kScaleSmall);
+constexpr auto kMaxLevel = 1.;
 
-struct UpdateLevelResult {
-	bool levelChanged = false;
-	bool stateChanged = false;
-	crl::time nextUpdateTime = 0;
-};
+auto RowBlobs() -> std::array<Ui::Paint::Blobs::BlobData, 2> {
+	return { {
+		{
+			.segmentsCount = 6,
+			.minScale = kScaleSmallMin / kScaleSmallMax,
+			.minRadius = st::groupCallRowBlobMinRadius
+				* kRowBlobRadiusFactor,
+			.maxRadius = st::groupCallRowBlobMaxRadius
+				* kRowBlobRadiusFactor,
+			.speedScale = 1.,
+			.alpha = (76. / 255.),
+		},
+		{
+			.segmentsCount = 8,
+			.minScale = kScaleSmallMin / kScaleSmallMax,
+			.minRadius = st::groupCallRowBlobMinRadius
+				* kRowBlobRadiusFactor,
+			.maxRadius = st::groupCallRowBlobMaxRadius
+				* kRowBlobRadiusFactor,
+			.speedScale = 1.,
+			.alpha = (76. / 255.),
+		},
+	} };
+}
 
 class Row final : public PeerListRow {
 public:
@@ -50,10 +76,14 @@ public:
 	};
 
 	void updateState(const Data::GroupCall::Participant *participant);
-	//UpdateLevelResult updateLevel(float level);
+	void updateLevel(float level);
+	void updateBlobAnimation(crl::time now);
 	[[nodiscard]] State state() const {
 		return _state;
 	}
+	[[nodiscard]] uint32 ssrc() const {
+		return _ssrc;
+	}
 	[[nodiscard]] bool speaking() const {
 		return _speaking;
 	}
@@ -85,9 +115,12 @@ public:
 		bool selected,
 		bool actionSelected) override;
 
+	auto generatePaintUserpicCallback() -> PaintRoundImageCallback override;
+
 private:
 	void refreshStatus() override;
 	void setSpeaking(bool speaking);
+	void setSsrc(uint32 ssrc);
 
 	[[nodiscard]] static State ComputeState(
 		not_null<ChannelData*> channel,
@@ -98,10 +131,12 @@ private:
 	State _state = State::Inactive;
 	not_null<ChannelData*> _channel;
 	not_null<const style::IconButton*> _st;
-	bool _speaking = false;
-	//float _level = 0.;
-
 	std::unique_ptr<Ui::RippleAnimation> _actionRipple;
+	std::unique_ptr<Ui::Paint::Blobs> _blobs;
+	crl::time _blobsLastTime = 0;
+	uint32 _ssrc = 0;
+	float _level = 0.;
+	bool _speaking = false;
 
 };
 
@@ -132,9 +167,9 @@ public:
 		-> rpl::producer<not_null<UserData*>>;
 
 private:
-	[[nodiscard]] std::unique_ptr<PeerListRow> createSelfRow() const;
-	[[nodiscard]] std::unique_ptr<PeerListRow> createRow(
-		const Data::GroupCall::Participant &participant) const;
+	[[nodiscard]] std::unique_ptr<Row> createSelfRow();
+	[[nodiscard]] std::unique_ptr<Row> createRow(
+		const Data::GroupCall::Participant &participant);
 
 	void prepareRows(not_null<Data::GroupCall*> real);
 	//void repaintByTimer();
@@ -146,9 +181,10 @@ private:
 		const Data::GroupCall::Participant &now);
 	void updateRow(
 		not_null<Row*> row,
-		const Data::GroupCall::Participant *participant) const;
+		const Data::GroupCall::Participant *participant);
+	void removeRow(not_null<Row*> row);
+	void updateRowLevel(not_null<Row*> row, float level);
 	void checkSpeakingRowPosition(not_null<Row*> row);
-	//void updateRowLevel(not_null<UserData*> user, float level);
 	Row *findRow(not_null<UserData*> user) const;
 
 	[[nodiscard]] Data::GroupCall *resolvedRealCall() const;
@@ -167,8 +203,8 @@ private:
 	not_null<QWidget*> _menuParent;
 	base::unique_qptr<Ui::PopupMenu> _menu;
 
-	//base::flat_map<not_null<UserData*>, crl::time> _repaintByTimer;
-	//base::Timer _repaintTimer;
+	base::flat_map<uint32, not_null<Row*>> _speakingRowBySsrc;
+	Ui::Animations::Basic _speakingAnimation;
 
 	rpl::lifetime _lifetime;
 
@@ -183,6 +219,7 @@ Row::Row(not_null<ChannelData*> channel, not_null<UserData*> user)
 }
 
 void Row::updateState(const Data::GroupCall::Participant *participant) {
+	setSsrc(participant ? participant->ssrc : 0);
 	if (!participant) {
 		if (peer()->isSelf()) {
 			setCustomStatus(tr::lng_group_call_connecting(tr::now));
@@ -193,7 +230,7 @@ void Row::updateState(const Data::GroupCall::Participant *participant) {
 		setSpeaking(false);
 	} else if (!participant->muted) {
 		_state = State::Active;
-		setSpeaking(participant->speaking);
+		setSpeaking(participant->speaking && participant->ssrc != 0);
 	} else if (participant->canSelfUnmute) {
 		_state = State::Inactive;
 		setSpeaking(false);
@@ -209,42 +246,49 @@ void Row::setSpeaking(bool speaking) {
 		return;
 	}
 	_speaking = speaking;
+	if (!_speaking) {
+		_blobs = nullptr;
+	}
 	refreshStatus();
-	//if (!_speaking) {
-	//	updateLevel(0.);
-	//}
 }
 
-//UpdateLevelResult Row::updateLevel(float level) {
-//	if (_level == level) {
-//		return UpdateLevelResult{ .nextUpdateTime = _markInactiveAt };
-//	}
-//	const auto now = crl::now();
-//	const auto stillActive = (now < _markInactiveAt);
-//	const auto wasActive = (_level >= kLevelThreshold) && stillActive;
-//	const auto nowActive = (level >= kLevelThreshold);
-//	if (nowActive) {
-//		_markInactiveAt = now + kLevelActiveTimeout;
-//		if (_state != State::Active) {
-//			_state = State::Active;
-//			_st = ComputeIconStyle(_state);
-//		}
-//	}
-//	_level = level;
-//	const auto changed = wasActive != (nowActive || stillActive);
-//	if (!changed) {
-//		return UpdateLevelResult{
-//			.levelChanged = true,
-//			.nextUpdateTime = _markInactiveAt,
-//		};
-//	}
-//	refreshStatus(now);
-//	return UpdateLevelResult{
-//		.levelChanged = true,
-//		.stateChanged = true,
-//		.nextUpdateTime = _markInactiveAt,
-//	};
-//}
+void Row::setSsrc(uint32 ssrc) {
+	_ssrc = ssrc;
+}
+
+void Row::updateLevel(float level) {
+	Expects(_speaking);
+
+	if (!_blobs) {
+		_blobs = std::make_unique<Ui::Paint::Blobs>(
+			RowBlobs() | ranges::to_vector,
+			kLevelDuration,
+			kMaxLevel);
+		_blobsLastTime = crl::now();
+	}
+	_blobs->setLevel(level + 0.5);
+}
+
+void Row::updateBlobAnimation(crl::time now) {
+	if (_blobs) {
+		_blobs->updateLevel(now - _blobsLastTime);
+		_blobsLastTime = now;
+	}
+}
+
+auto Row::generatePaintUserpicCallback() -> PaintRoundImageCallback {
+	auto userpic = ensureUserpicView();
+	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
+		if (_blobs) {
+			const auto shift = QPointF(x + size / 2., y + size / 2.);
+			p.translate(shift);
+			_blobs->paint(p, st::groupCallLive1);
+			p.translate(-shift);
+			p.setOpacity(1.);
+		}
+		peer()->paintUserpicLeft(p, userpic, x, y, outerWidth, size);
+	};
+}
 
 void Row::paintAction(
 		Painter &p,
@@ -333,8 +377,15 @@ MembersController::MembersController(
 : _call(call)
 , _channel(call->channel())
 , _menuParent(menuParent) {
-//, _repaintTimer([=] { repaintByTimer(); }) {
 	setupListChangeViewers(call);
+
+	_speakingAnimation.init([=](crl::time now) {
+		for (const auto [ssrc, row] : _speakingRowBySsrc) {
+			row->updateBlobAnimation(now);
+			delegate()->peerListUpdateRow(row);
+		}
+		return true;
+	});
 }
 
 void MembersController::setupListChangeViewers(not_null<GroupCall*> call) {
@@ -362,21 +413,13 @@ void MembersController::setupListChangeViewers(not_null<GroupCall*> call) {
 		}
 	}, _lifetime);
 
-	//call->levelUpdates(
-	//) | rpl::start_with_next([=](const LevelUpdate &update) {
-	//	const auto findUserBySource = [&](uint32 source) -> UserData* {
-	//		if (const auto real = resolvedRealCall()) {
-	//			return real->userBySource(source);
-	//		}
-	//		return nullptr;
-	//	};
-	//	const auto user = update.self
-	//		? _channel->session().user().get()
-	//		: findUserBySource(update.source);
-	//	if (user) {
-	//		updateRowLevel(user, update.value);
-	//	}
-	//}, _lifetime);
+	call->levelUpdates(
+	) | rpl::start_with_next([=](const LevelUpdate &update) {
+		const auto i = _speakingRowBySsrc.find(update.ssrc);
+		if (i != end(_speakingRowBySsrc)) {
+			updateRowLevel(i->second, update.value);
+		}
+	}, _lifetime);
 }
 
 void MembersController::subscribeToChanges(not_null<Data::GroupCall*> real) {
@@ -402,10 +445,9 @@ void MembersController::subscribeToChanges(not_null<Data::GroupCall*> real) {
 		if (!update.now) {
 			if (const auto row = findRow(user)) {
 				if (user->isSelf()) {
-					row->updateState(nullptr);
-					delegate()->peerListUpdateRow(row);
+					updateRow(row, nullptr);
 				} else {
-					delegate()->peerListRemoveRow(row);
+					removeRow(row);
 					delegate()->peerListRefreshRows();
 				}
 			}
@@ -424,7 +466,7 @@ void MembersController::updateRow(
 		}
 		updateRow(row, &now);
 	} else if (auto row = createRow(now)) {
-		if (now.speaking) {
+		if (row->speaking()) {
 			delegate()->peerListPrependRow(std::move(row));
 		} else {
 			delegate()->peerListAppendRow(std::move(row));
@@ -466,49 +508,49 @@ void MembersController::checkSpeakingRowPosition(not_null<Row*> row) {
 
 void MembersController::updateRow(
 		not_null<Row*> row,
-		const Data::GroupCall::Participant *participant) const {
+		const Data::GroupCall::Participant *participant) {
+	const auto wasSpeaking = row->speaking();
+	const auto wasSsrc = row->ssrc();
 	row->updateState(participant);
+	const auto nowSpeaking = row->speaking();
+	const auto nowSsrc = row->ssrc();
+
+	const auto wasNoSpeaking = _speakingRowBySsrc.empty();
+	if (wasSsrc == nowSsrc) {
+		if (nowSpeaking != wasSpeaking) {
+			if (nowSpeaking) {
+				_speakingRowBySsrc.emplace(nowSsrc, row);
+			} else {
+				_speakingRowBySsrc.remove(nowSsrc);
+			}
+		}
+	} else {
+		_speakingRowBySsrc.remove(wasSsrc);
+		if (nowSpeaking) {
+			Assert(nowSsrc != 0);
+			_speakingRowBySsrc.emplace(nowSsrc, row);
+		}
+	}
+	const auto nowNoSpeaking = _speakingRowBySsrc.empty();
+	if (wasNoSpeaking && !nowNoSpeaking) {
+		_speakingAnimation.start();
+	} else if (nowNoSpeaking && !wasNoSpeaking) {
+		_speakingAnimation.stop();
+	}
+
 	delegate()->peerListUpdateRow(row);
 }
 
-//void MembersController::updateRowLevel(
-//		not_null<UserData*> user,
-//		float level) {
-//	if (const auto row = findRow(user)) {
-//		const auto result = row->updateLevel(level);
-//		if (result.stateChanged) {
-//			delegate()->peerListUpdateRow(row);
-//		}
-//		if (result.nextUpdateTime) {
-//			_repaintByTimer[user] = result.nextUpdateTime;
-//			if (!_repaintTimer.isActive()) {
-//				_repaintTimer.callOnce(kLevelActiveTimeout);
-//			}
-//		} else if (_repaintByTimer.remove(user) && _repaintByTimer.empty()) {
-//			_repaintTimer.cancel();
-//		}
-//	}
-//}
+void MembersController::removeRow(not_null<Row*> row) {
+	_speakingRowBySsrc.remove(row->ssrc());
+	delegate()->peerListRemoveRow(row);
+}
 
-//void MembersController::repaintByTimer() {
-//	const auto now = crl::now();
-//	auto next = crl::time(0);
-//	for (auto i = begin(_repaintByTimer); i != end(_repaintByTimer);) {
-//		if (i->second > now) {
-//			if (!next || next > i->second) {
-//				next = i->second;
-//			}
-//		} else if (const auto row = findRow(i->first)) {
-//			delegate()->peerListUpdateRow(row);
-//			i = _repaintByTimer.erase(i);
-//			continue;
-//		}
-//		++i;
-//	}
-//	if (next) {
-//		_repaintTimer.callOnce(next - now);
-//	}
-//}
+void MembersController::updateRowLevel(
+		not_null<Row*> row,
+		float level) {
+	row->updateLevel(level);
+}
 
 Row *MembersController::findRow(not_null<UserData*> user) const {
 	return static_cast<Row*>(delegate()->peerListFindRow(user->id));
@@ -564,7 +606,7 @@ void MembersController::prepareRows(not_null<Data::GroupCall*> real) {
 			++i;
 		} else {
 			changed = true;
-			delegate()->peerListRemoveRow(row);
+			removeRow(static_cast<Row*>(row.get()));
 			--count;
 		}
 	}
@@ -708,15 +750,15 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 	return result;
 }
 
-std::unique_ptr<PeerListRow> MembersController::createSelfRow() const {
+std::unique_ptr<Row> MembersController::createSelfRow() {
 	const auto self = _channel->session().user();
 	auto result = std::make_unique<Row>(_channel, self);
 	updateRow(result.get(), nullptr);
 	return result;
 }
 
-std::unique_ptr<PeerListRow> MembersController::createRow(
-		const Data::GroupCall::Participant &participant) const {
+std::unique_ptr<Row> MembersController::createRow(
+		const Data::GroupCall::Participant &participant) {
 	auto result = std::make_unique<Row>(_channel, participant.user);
 	updateRow(result.get(), &participant);
 	return result;
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index 85d58eb32..dde5a8d5b 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -31,7 +31,7 @@ GroupCall::GroupCall(
 }
 
 GroupCall::~GroupCall() {
-	api().request(_unknownSourcesRequestId).cancel();
+	api().request(_unknownSsrcsRequestId).cancel();
 	api().request(_participantsRequestId).cancel();
 	api().request(_reloadRequestId).cancel();
 }
@@ -65,7 +65,7 @@ void GroupCall::requestParticipants() {
 	_participantsRequestId = api().request(MTPphone_GetGroupParticipants(
 		input(),
 		MTP_vector<MTPint>(), // ids
-		MTP_vector<MTPint>(), // sources
+		MTP_vector<MTPint>(), // ssrcs
 		MTP_string(_nextOffset),
 		MTP_int(kRequestPerPage)
 	)).done([=](const MTPphone_GroupParticipants &result) {
@@ -105,9 +105,9 @@ bool GroupCall::participantsLoaded() const {
 	return _allReceived;
 }
 
-UserData *GroupCall::userBySource(uint32 source) const {
-	const auto i = _userBySource.find(source);
-	return (i != end(_userBySource)) ? i->second.get() : nullptr;
+UserData *GroupCall::userBySsrc(uint32 ssrc) const {
+	const auto i = _userBySsrc.find(ssrc);
+	return (i != end(_userBySsrc)) ? i->second.get() : nullptr;
 }
 
 rpl::producer<> GroupCall::participantsSliceAdded() {
@@ -163,7 +163,7 @@ void GroupCall::reload() {
 		result.match([&](const MTPDphone_groupCall &data) {
 			_channel->owner().processUsers(data.vusers());
 			_participants.clear();
-			_userBySource.clear();
+			_userBySsrc.clear();
 			applyParticipantsSlice(
 				data.vparticipants().v,
 				ApplySliceSource::SliceLoaded);
@@ -194,7 +194,7 @@ void GroupCall::applyParticipantsSlice(
 					auto update = ParticipantUpdate{
 						.was = *i,
 					};
-					_userBySource.erase(i->source);
+					_userBySsrc.erase(i->ssrc);
 					_participants.erase(i);
 					if (sliceSource != ApplySliceSource::SliceLoaded) {
 						_participantUpdates.fire(std::move(update));
@@ -212,20 +212,20 @@ void GroupCall::applyParticipantsSlice(
 				.user = user,
 				.date = data.vdate().v,
 				.lastActive = was ? was->lastActive : 0,
-				.source = uint32(data.vsource().v),
+				.ssrc = uint32(data.vsource().v),
 				.speaking = !data.is_muted() && (was ? was->speaking : false),
 				.muted = data.is_muted(),
 				.canSelfUnmute = !data.is_muted() || data.is_can_self_unmute(),
 			};
 			if (i == end(_participants)) {
-				_userBySource.emplace(value.source, user);
+				_userBySsrc.emplace(value.ssrc, user);
 				_participants.push_back(value);
 				_channel->owner().unregisterInvitedToCallUser(_id, user);
 				++changedCount;
 			} else {
-				if (i->source != value.source) {
-					_userBySource.erase(i->source);
-					_userBySource.emplace(value.source, user);
+				if (i->ssrc != value.ssrc) {
+					_userBySsrc.erase(i->ssrc);
+					_userBySsrc.emplace(value.ssrc, user);
 				}
 				*i = value;
 			}
@@ -271,11 +271,11 @@ void GroupCall::applyParticipantsMutes(
 	}
 }
 
-void GroupCall::applyLastSpoke(uint32 source, crl::time when, crl::time now) {
-	const auto i = _userBySource.find(source);
-	if (i == end(_userBySource)) {
-		_unknownSpokenSources.emplace(source, when);
-		requestUnknownSources();
+void GroupCall::applyLastSpoke(uint32 ssrc, crl::time when, crl::time now) {
+	const auto i = _userBySsrc.find(ssrc);
+	if (i == end(_userBySsrc)) {
+		_unknownSpokenSsrcs.emplace(ssrc, when);
+		requestUnknownSsrcs();
 		return;
 	}
 	const auto j = ranges::find(_participants, i->second, &Participant::user);
@@ -292,32 +292,32 @@ void GroupCall::applyLastSpoke(uint32 source, crl::time when, crl::time now) {
 	}
 }
 
-void GroupCall::requestUnknownSources() {
-	if (_unknownSourcesRequestId || _unknownSpokenSources.empty()) {
+void GroupCall::requestUnknownSsrcs() {
+	if (_unknownSsrcsRequestId || _unknownSpokenSsrcs.empty()) {
 		return;
 	}
-	const auto sources = [&] {
-		if (_unknownSpokenSources.size() < kRequestPerPage) {
-			return base::take(_unknownSpokenSources);
+	const auto ssrcs = [&] {
+		if (_unknownSpokenSsrcs.size() < kRequestPerPage) {
+			return base::take(_unknownSpokenSsrcs);
 		}
 		auto result = base::flat_map<uint32, crl::time>();
 		result.reserve(kRequestPerPage);
 		while (result.size() < kRequestPerPage) {
-			const auto [source, when] = _unknownSpokenSources.back();
-			result.emplace(source, when);
-			_unknownSpokenSources.erase(_unknownSpokenSources.end() - 1);
+			const auto [ssrc, when] = _unknownSpokenSsrcs.back();
+			result.emplace(ssrc, when);
+			_unknownSpokenSsrcs.erase(_unknownSpokenSsrcs.end() - 1);
 		}
 		return result;
 	}();
-	auto sourceInputs = QVector<MTPint>();
-	sourceInputs.reserve(sources.size());
-	for (const auto [source, when] : sources) {
-		sourceInputs.push_back(MTP_int(source));
+	auto inputs = QVector<MTPint>();
+	inputs.reserve(ssrcs.size());
+	for (const auto [ssrc, when] : ssrcs) {
+		inputs.push_back(MTP_int(ssrc));
 	}
-	_unknownSourcesRequestId = api().request(MTPphone_GetGroupParticipants(
+	_unknownSsrcsRequestId = api().request(MTPphone_GetGroupParticipants(
 		input(),
 		MTP_vector<MTPint>(), // ids
-		MTP_vector<MTPint>(sourceInputs),
+		MTP_vector<MTPint>(inputs),
 		MTP_string(QString()),
 		MTP_int(kRequestPerPage)
 	)).done([=](const MTPphone_GroupParticipants &result) {
@@ -327,19 +327,19 @@ void GroupCall::requestUnknownSources() {
 				data.vparticipants().v,
 				ApplySliceSource::UnknownLoaded);
 		});
-		_unknownSourcesRequestId = 0;
+		_unknownSsrcsRequestId = 0;
 		const auto now = crl::now();
-		for (const auto [source, when] : sources) {
-			applyLastSpoke(source, when, now);
-			_unknownSpokenSources.remove(source);
+		for (const auto [ssrc, when] : ssrcs) {
+			applyLastSpoke(ssrc, when, now);
+			_unknownSpokenSsrcs.remove(ssrc);
 		}
-		requestUnknownSources();
+		requestUnknownSsrcs();
 	}).fail([=](const RPCError &error) {
-		_unknownSourcesRequestId = 0;
-		for (const auto [source, when] : sources) {
-			_unknownSpokenSources.remove(source);
+		_unknownSsrcsRequestId = 0;
+		for (const auto [ssrc, when] : ssrcs) {
+			_unknownSpokenSsrcs.remove(ssrc);
 		}
-		requestUnknownSources();
+		requestUnknownSsrcs();
 	}).send();
 }
 
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 2ee4b2901..7efb9f84f 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -27,7 +27,7 @@ public:
 		not_null<UserData*> user;
 		TimeId date = 0;
 		TimeId lastActive = 0;
-		uint32 source = 0;
+		uint32 ssrc = 0;
 		bool speaking = false;
 		bool muted = false;
 		bool canSelfUnmute = false;
@@ -41,7 +41,7 @@ public:
 		-> const std::vector<Participant> &;
 	void requestParticipants();
 	[[nodiscard]] bool participantsLoaded() const;
-	[[nodiscard]] UserData *userBySource(uint32 source) const;
+	[[nodiscard]] UserData *userBySsrc(uint32 ssrc) const;
 
 	[[nodiscard]] rpl::producer<> participantsSliceAdded();
 	[[nodiscard]] rpl::producer<ParticipantUpdate> participantUpdated() const;
@@ -50,7 +50,7 @@ public:
 	void applyUpdate(const MTPDupdateGroupCallParticipants &update);
 	void applyUpdateChecked(
 		const MTPDupdateGroupCallParticipants &update);
-	void applyLastSpoke(uint32 source, crl::time when, crl::time now);
+	void applyLastSpoke(uint32 ssrc, crl::time when, crl::time now);
 
 	[[nodiscard]] int fullCount() const;
 	[[nodiscard]] rpl::producer<int> fullCountValue() const;
@@ -75,7 +75,7 @@ private:
 		ApplySliceSource sliceSource);
 	void applyParticipantsMutes(
 		const MTPDupdateGroupCallParticipants &update);
-	void requestUnknownSources();
+	void requestUnknownSsrcs();
 
 	const not_null<ChannelData*> _channel;
 	const uint64 _id = 0;
@@ -86,12 +86,12 @@ private:
 	mtpRequestId _reloadRequestId = 0;
 
 	std::vector<Participant> _participants;
-	base::flat_map<uint32, not_null<UserData*>> _userBySource;
+	base::flat_map<uint32, not_null<UserData*>> _userBySsrc;
 	QString _nextOffset;
 	rpl::variable<int> _fullCount = 0;
 
-	base::flat_map<uint32, crl::time> _unknownSpokenSources;
-	mtpRequestId _unknownSourcesRequestId = 0;
+	base::flat_map<uint32, crl::time> _unknownSpokenSsrcs;
+	mtpRequestId _unknownSsrcsRequestId = 0;
 
 	rpl::event_stream<ParticipantUpdate> _participantUpdates;
 	rpl::event_stream<> _participantsSliceAdded;

From ef119dadd51dceb7754c60383defcc065b26846a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Dec 2020 14:52:40 +0300
Subject: [PATCH 211/370] Add bouncing of userpics in group call members.

---
 Telegram/SourceFiles/calls/calls.style        |   8 +-
 .../SourceFiles/calls/calls_group_call.cpp    |   1 -
 Telegram/SourceFiles/calls/calls_group_call.h |   1 +
 .../SourceFiles/calls/calls_group_members.cpp | 159 +++++++++++++++---
 Telegram/SourceFiles/data/data_group_call.cpp |   1 -
 Telegram/SourceFiles/data/data_group_call.h   |   2 +
 6 files changed, 140 insertions(+), 32 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index a46b7eea5..eccc821c2 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -550,8 +550,8 @@ groupCallInactiveButton: IconButton {
 	rippleAreaSize: 36px;
 }
 groupCallActiveButton: IconButton(groupCallInactiveButton) {
-	icon: icon {{ "calls/group_calls_unmuted", groupCallMemberActiveIcon }};
-	iconOver: icon {{ "calls/group_calls_unmuted", groupCallMemberActiveIcon }};
+	icon: icon {{ "calls/group_calls_unmuted", groupCallMemberInactiveIcon }};
+	iconOver: icon {{ "calls/group_calls_unmuted", groupCallMemberInactiveIcon }};
 }
 groupCallMutedButton: IconButton(groupCallInactiveButton) {
 	icon: icon {{ "calls/group_calls_muted", groupCallMemberMutedIcon }};
@@ -661,5 +661,5 @@ groupCallBoxLabel: FlatLabel(boxLabel) {
 	textFg: groupCallMembersFg;
 }
 
-groupCallRowBlobMinRadius: 26px;
-groupCallRowBlobMaxRadius: 30px;
+groupCallRowBlobMinRadius: 28px;
+groupCallRowBlobMaxRadius: 31px;
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index d59452582..69f379e0b 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -37,7 +37,6 @@ namespace {
 
 constexpr auto kMaxInvitePerSlice = 10;
 constexpr auto kCheckLastSpokeInterval = 3 * crl::time(1000);
-constexpr auto kSpeakLevelThreshold = 0.2;
 constexpr auto kCheckJoinedTimeout = 4 * crl::time(1000);
 constexpr auto kUpdateSendActionEach = crl::time(500);
 
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 52d1e7985..7ea4294eb 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -92,6 +92,7 @@ public:
 	[[nodiscard]] rpl::producer<LevelUpdate> levelUpdates() const {
 		return _levelUpdates.events();
 	}
+	static constexpr auto kSpeakLevelThreshold = 0.2;
 
 	void setCurrentAudioDevice(bool input, const QString &deviceId);
 	//void setAudioVolume(bool input, float level);
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 4125f4369..6630ee58e 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -32,25 +32,26 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Calls {
 namespace {
 
-constexpr auto kLevelThreshold = 0.2;
+constexpr auto kBlobsEnterDuration = crl::time(250);
 constexpr auto kRowBlobRadiusFactor = (float)(50. / 57.);
 constexpr auto kLevelDuration = 100. + 500. * 0.33;
 constexpr auto kScaleSmall = 0.704 - 0.1;
 constexpr auto kScaleSmallMin = 0.926;
 constexpr auto kScaleSmallMax = (float)(kScaleSmallMin + kScaleSmall);
 constexpr auto kMaxLevel = 1.;
+constexpr auto kWideScale = 5;
 
 auto RowBlobs() -> std::array<Ui::Paint::Blobs::BlobData, 2> {
 	return { {
 		{
 			.segmentsCount = 6,
-			.minScale = kScaleSmallMin / kScaleSmallMax,
+			.minScale = (kScaleSmallMin / kScaleSmallMax) * 0.9f,
 			.minRadius = st::groupCallRowBlobMinRadius
-				* kRowBlobRadiusFactor,
+				* kRowBlobRadiusFactor * 0.9f,
 			.maxRadius = st::groupCallRowBlobMaxRadius
-				* kRowBlobRadiusFactor,
+				* kRowBlobRadiusFactor * 0.9f,
 			.speedScale = 1.,
-			.alpha = (76. / 255.),
+			.alpha = .5,
 		},
 		{
 			.segmentsCount = 8,
@@ -60,7 +61,7 @@ auto RowBlobs() -> std::array<Ui::Paint::Blobs::BlobData, 2> {
 			.maxRadius = st::groupCallRowBlobMaxRadius
 				* kRowBlobRadiusFactor,
 			.speedScale = 1.,
-			.alpha = (76. / 255.),
+			.alpha = .2,
 		},
 	} };
 }
@@ -118,6 +119,28 @@ public:
 	auto generatePaintUserpicCallback() -> PaintRoundImageCallback override;
 
 private:
+	struct SpeakingAnimation {
+		SpeakingAnimation(
+			std::vector<Ui::Paint::Blobs::BlobData> blobDatas,
+			float levelDuration,
+			float maxLevel)
+		: blobs(std::move(blobDatas), levelDuration, maxLevel) {
+			style::PaletteChanged(
+			) | rpl::start_with_next([=] {
+				userpicCache = QImage();
+			}, lifetime);
+		}
+
+		Ui::Paint::Blobs blobs;
+		crl::time lastTime = 0;
+		crl::time lastSpeakingUpdateTime = 0;
+		float64 enter = 0.;
+
+		QImage userpicCache;
+		InMemoryKey userpicKey;
+
+		rpl::lifetime lifetime;
+	};
 	void refreshStatus() override;
 	void setSpeaking(bool speaking);
 	void setSsrc(uint32 ssrc);
@@ -128,12 +151,15 @@ private:
 	[[nodiscard]] static not_null<const style::IconButton*> ComputeIconStyle(
 		State state);
 
+	void ensureUserpicCache(
+		std::shared_ptr<Data::CloudImageView> &view,
+		int size);
+
 	State _state = State::Inactive;
 	not_null<ChannelData*> _channel;
 	not_null<const style::IconButton*> _st;
 	std::unique_ptr<Ui::RippleAnimation> _actionRipple;
-	std::unique_ptr<Ui::Paint::Blobs> _blobs;
-	crl::time _blobsLastTime = 0;
+	std::unique_ptr<SpeakingAnimation> _speakingAnimation;
 	uint32 _ssrc = 0;
 	float _level = 0.;
 	bool _speaking = false;
@@ -247,7 +273,14 @@ void Row::setSpeaking(bool speaking) {
 	}
 	_speaking = speaking;
 	if (!_speaking) {
-		_blobs = nullptr;
+		_speakingAnimation = nullptr;
+	} else if (!_speakingAnimation) {
+		_speakingAnimation = std::make_unique<SpeakingAnimation>(
+			RowBlobs() | ranges::to_vector,
+			kLevelDuration,
+			kMaxLevel);
+		_speakingAnimation->lastTime = crl::now();
+		updateLevel(GroupCall::kSpeakLevelThreshold);
 	}
 	refreshStatus();
 }
@@ -257,36 +290,102 @@ void Row::setSsrc(uint32 ssrc) {
 }
 
 void Row::updateLevel(float level) {
-	Expects(_speaking);
+	Expects(_speakingAnimation != nullptr);
 
-	if (!_blobs) {
-		_blobs = std::make_unique<Ui::Paint::Blobs>(
-			RowBlobs() | ranges::to_vector,
-			kLevelDuration,
-			kMaxLevel);
-		_blobsLastTime = crl::now();
+	if (level >= GroupCall::kSpeakLevelThreshold) {
+		_speakingAnimation->lastSpeakingUpdateTime = crl::now();
 	}
-	_blobs->setLevel(level + 0.5);
+	_speakingAnimation->blobs.setLevel(level);
 }
 
 void Row::updateBlobAnimation(crl::time now) {
-	if (_blobs) {
-		_blobs->updateLevel(now - _blobsLastTime);
-		_blobsLastTime = now;
+	Expects(_speakingAnimation != nullptr);
+
+	const auto speakingFinishesAt = _speakingAnimation->lastSpeakingUpdateTime
+		+ Data::GroupCall::kSpeakStatusKeptFor;
+	const auto speakingStartsFinishing = speakingFinishesAt
+		- kBlobsEnterDuration;
+	const auto speakingFinishes = (speakingStartsFinishing < now);
+	if (speakingFinishes) {
+		_speakingAnimation->enter = std::clamp(
+			(speakingFinishesAt - now) / float64(kBlobsEnterDuration),
+			0.,
+			1.);
+	} else if (_speakingAnimation->enter < 1.) {
+		_speakingAnimation->enter = std::clamp(
+			(_speakingAnimation->enter
+				+ ((now - _speakingAnimation->lastTime)
+					/ float64(kBlobsEnterDuration))),
+			0.,
+			1.);
+	}
+	_speakingAnimation->blobs.updateLevel(now - _speakingAnimation->lastTime);
+	_speakingAnimation->lastTime = now;
+}
+
+void Row::ensureUserpicCache(
+		std::shared_ptr<Data::CloudImageView> &view,
+		int size) {
+	Expects(_speakingAnimation != nullptr);
+
+	const auto user = peer();
+	const auto key = user->userpicUniqueKey(view);
+	const auto full = QSize(size, size) * kWideScale * cIntRetinaFactor();
+	auto &cache = _speakingAnimation->userpicCache;
+	if (cache.isNull()) {
+		cache = QImage(full, QImage::Format_ARGB32_Premultiplied);
+		cache.setDevicePixelRatio(cRetinaFactor());
+	} else if (_speakingAnimation->userpicKey == key
+		&& cache.size() == full) {
+		return;
+	}
+	_speakingAnimation->userpicKey = key;
+	cache.fill(Qt::transparent);
+	{
+		Painter p(&cache);
+		const auto skip = (kWideScale - 1) / 2 * size;
+		user->paintUserpicLeft(p, view, skip, skip, kWideScale * size, size);
 	}
 }
 
 auto Row::generatePaintUserpicCallback() -> PaintRoundImageCallback {
 	auto userpic = ensureUserpicView();
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
-		if (_blobs) {
+		if (_speakingAnimation) {
 			const auto shift = QPointF(x + size / 2., y + size / 2.);
 			p.translate(shift);
-			_blobs->paint(p, st::groupCallLive1);
+			_speakingAnimation->blobs.paint(p, st::groupCallMemberActiveStatus);
 			p.translate(-shift);
 			p.setOpacity(1.);
+
+			const auto enter = _speakingAnimation->enter;
+			const auto scaleAvatar = 0.8
+				+ 0.2 * _speakingAnimation->blobs.currentLevel();
+			const auto scale = scaleAvatar * enter + 1. * (1. - enter);
+			if (scale == 1.) {
+				peer()->paintUserpicLeft(p, userpic, x, y, outerWidth, size);
+			} else {
+				ensureUserpicCache(userpic, size);
+
+				PainterHighQualityEnabler hq(p);
+
+				auto target = QRect(
+					x + (1 - kWideScale) / 2 * size,
+					y + (1 - kWideScale) / 2 * size,
+					kWideScale * size,
+					kWideScale * size);
+				auto shrink = anim::interpolate(
+					(1 - kWideScale) / 2 * size,
+					0,
+					scale);
+				auto margins = QMargins(shrink, shrink, shrink, shrink);
+				p.drawImage(
+					target.marginsAdded(margins),
+					_speakingAnimation->userpicCache);
+			}
+		} else {
+			peer()->paintUserpicLeft(p, userpic, x, y, outerWidth, size);
 		}
-		peer()->paintUserpicLeft(p, userpic, x, y, outerWidth, size);
 	};
 }
 
@@ -308,9 +407,17 @@ void Row::paintAction(
 			_actionRipple.reset();
 		}
 	}
-	_st->icon.paintInCenter(
-		p,
-		style::rtlrect(x, y, size.width(), size.height(), outerWidth));
+	const auto iconRect = style::rtlrect(
+		x,
+		y,
+		size.width(),
+		size.height(),
+		outerWidth);
+	if (_speaking) {
+		_st->icon.paintInCenter(p, iconRect, st::groupCallMemberActiveIcon->c);
+	} else {
+		_st->icon.paintInCenter(p, iconRect);
+	}
 }
 
 void Row::refreshStatus() {
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index dde5a8d5b..aad2b3415 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -17,7 +17,6 @@ namespace Data {
 namespace {
 
 constexpr auto kRequestPerPage = 30;
-constexpr auto kSpeakStatusKeptFor = crl::time(1000);
 
 } // namespace
 
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 7efb9f84f..7d31a6eca 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -37,6 +37,8 @@ public:
 		std::optional<Participant> now;
 	};
 
+	static constexpr auto kSpeakStatusKeptFor = crl::time(1000);
+
 	[[nodiscard]] auto participants() const
 		-> const std::vector<Participant> &;
 	void requestParticipants();

From 309b3a6f96b6c9a975a719c89aac110c1c9fd635 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Dec 2020 14:59:09 +0300
Subject: [PATCH 212/370] Keep speaking state only for 350ms.

---
 Telegram/SourceFiles/calls/calls_group_call.cpp | 2 +-
 Telegram/SourceFiles/data/data_group_call.h     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 69f379e0b..ebdb395c2 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -36,7 +36,7 @@ namespace Calls {
 namespace {
 
 constexpr auto kMaxInvitePerSlice = 10;
-constexpr auto kCheckLastSpokeInterval = 3 * crl::time(1000);
+constexpr auto kCheckLastSpokeInterval = crl::time(1000);
 constexpr auto kCheckJoinedTimeout = 4 * crl::time(1000);
 constexpr auto kUpdateSendActionEach = crl::time(500);
 
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 7d31a6eca..56d480297 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -37,7 +37,7 @@ public:
 		std::optional<Participant> now;
 	};
 
-	static constexpr auto kSpeakStatusKeptFor = crl::time(1000);
+	static constexpr auto kSpeakStatusKeptFor = crl::time(350);
 
 	[[nodiscard]] auto participants() const
 		-> const std::vector<Participant> &;

From 43ee8a402c2aac2209a067834ae9a82e0a07189f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 1 Dec 2020 15:33:57 +0300
Subject: [PATCH 213/370] Slightly refactored group call members.

---
 .../SourceFiles/calls/calls_group_members.cpp | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 6630ee58e..aafde86aa 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -33,11 +33,10 @@ namespace Calls {
 namespace {
 
 constexpr auto kBlobsEnterDuration = crl::time(250);
-constexpr auto kRowBlobRadiusFactor = (float)(50. / 57.);
-constexpr auto kLevelDuration = 100. + 500. * 0.33;
-constexpr auto kScaleSmall = 0.704 - 0.1;
-constexpr auto kScaleSmallMin = 0.926;
-constexpr auto kScaleSmallMax = (float)(kScaleSmallMin + kScaleSmall);
+constexpr auto kLevelDuration = 100. + 500. * 0.23;
+constexpr auto kBlobScale = 0.605;
+constexpr auto kMinorBlobFactor = 0.9f;
+constexpr auto kUserpicMinScale = 0.8;
 constexpr auto kMaxLevel = 1.;
 constexpr auto kWideScale = 5;
 
@@ -45,21 +44,17 @@ auto RowBlobs() -> std::array<Ui::Paint::Blobs::BlobData, 2> {
 	return { {
 		{
 			.segmentsCount = 6,
-			.minScale = (kScaleSmallMin / kScaleSmallMax) * 0.9f,
-			.minRadius = st::groupCallRowBlobMinRadius
-				* kRowBlobRadiusFactor * 0.9f,
-			.maxRadius = st::groupCallRowBlobMaxRadius
-				* kRowBlobRadiusFactor * 0.9f,
+			.minScale = kBlobScale * kMinorBlobFactor,
+			.minRadius = st::groupCallRowBlobMinRadius * kMinorBlobFactor,
+			.maxRadius = st::groupCallRowBlobMaxRadius * kMinorBlobFactor,
 			.speedScale = 1.,
 			.alpha = .5,
 		},
 		{
 			.segmentsCount = 8,
-			.minScale = kScaleSmallMin / kScaleSmallMax,
-			.minRadius = st::groupCallRowBlobMinRadius
-				* kRowBlobRadiusFactor,
-			.maxRadius = st::groupCallRowBlobMaxRadius
-				* kRowBlobRadiusFactor,
+			.minScale = kBlobScale,
+			.minRadius = (float)st::groupCallRowBlobMinRadius,
+			.maxRadius = (float)st::groupCallRowBlobMaxRadius,
 			.speedScale = 1.,
 			.alpha = .2,
 		},
@@ -359,9 +354,10 @@ auto Row::generatePaintUserpicCallback() -> PaintRoundImageCallback {
 			p.setOpacity(1.);
 
 			const auto enter = _speakingAnimation->enter;
-			const auto scaleAvatar = 0.8
-				+ 0.2 * _speakingAnimation->blobs.currentLevel();
-			const auto scale = scaleAvatar * enter + 1. * (1. - enter);
+			const auto &minScale = kUserpicMinScale;
+			const auto scaleUserpic = minScale
+				+ (1. - minScale) * _speakingAnimation->blobs.currentLevel();
+			const auto scale = scaleUserpic * enter + 1. * (1. - enter);
 			if (scale == 1.) {
 				peer()->paintUserpicLeft(p, userpic, x, y, outerWidth, size);
 			} else {

From 5a324756fdf2ce8f93aa0603ad8dbc63370c6f7e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Dec 2020 16:22:07 +0300
Subject: [PATCH 214/370] Track call_active flag in channels.

---
 Telegram/SourceFiles/calls/calls.style        |  2 +-
 .../SourceFiles/calls/calls_group_members.cpp |  1 -
 Telegram/SourceFiles/data/data_channel.cpp    | 44 ++++++++++---------
 Telegram/SourceFiles/data/data_channel.h      |  1 +
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index eccc821c2..8daf15005 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -662,4 +662,4 @@ groupCallBoxLabel: FlatLabel(boxLabel) {
 }
 
 groupCallRowBlobMinRadius: 28px;
-groupCallRowBlobMaxRadius: 31px;
+groupCallRowBlobMaxRadius: 30px;
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index aafde86aa..d8a1a8088 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -156,7 +156,6 @@ private:
 	std::unique_ptr<Ui::RippleAnimation> _actionRipple;
 	std::unique_ptr<SpeakingAnimation> _speakingAnimation;
 	uint32 _ssrc = 0;
-	float _level = 0.;
 	bool _speaking = false;
 
 };
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index 9f5ed04fe..e972e4388 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -49,27 +49,28 @@ ChannelData::ChannelData(not_null<Data::Session*> owner, PeerId id)
 : PeerData(owner, id)
 , inputChannel(MTP_inputChannel(MTP_int(bareId()), MTP_long(0)))
 , _ptsWaiter(&owner->session().updates()) {
-	Data::PeerFlagValue(
-		this,
-		MTPDchannel::Flag::f_megagroup
-	) | rpl::start_with_next([=](bool megagroup) {
-		if (megagroup) {
-			if (!mgInfo) {
-				mgInfo = std::make_unique<MegagroupInfo>();
+	_flags.changes(
+	) | rpl::start_with_next([=](const Flags::Change &change) {
+		if (change.diff
+			& (MTPDchannel::Flag::f_left | MTPDchannel_ClientFlag::f_forbidden)) {
+			if (const auto chat = getMigrateFromChat()) {
+				session().changes().peerUpdated(chat, UpdateFlag::Migration);
+				session().changes().peerUpdated(this, UpdateFlag::Migration);
 			}
-		} else if (mgInfo) {
-			mgInfo = nullptr;
 		}
-	}, _lifetime);
-
-	Data::PeerFlagsValue(
-		this,
-		MTPDchannel::Flag::f_left | MTPDchannel_ClientFlag::f_forbidden
-	) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=] {
-		if (const auto chat = getMigrateFromChat()) {
-			session().changes().peerUpdated(chat, UpdateFlag::Migration);
-			session().changes().peerUpdated(this, UpdateFlag::Migration);
+		if (change.diff & MTPDchannel::Flag::f_megagroup) {
+			if (change.value & MTPDchannel::Flag::f_megagroup) {
+				if (!mgInfo) {
+					mgInfo = std::make_unique<MegagroupInfo>();
+				}
+			} else if (mgInfo) {
+				mgInfo = nullptr;
+			}
+		}
+		if (change.diff & MTPDchannel::Flag::f_call_active) {
+			if (const auto history = this->owner().historyLoaded(this)) {
+				history->updateChatListEntry();
+			}
 		}
 	}, _lifetime);
 }
@@ -686,7 +687,8 @@ void ChannelData::setCall(const MTPInputGroupCall &call) {
 			clearCall();
 			return;
 		}
-		if (_call) {
+		const auto hasCall = (_call != nullptr);
+		if (hasCall) {
 			owner().unregisterGroupCall(_call.get());
 		}
 		_call = std::make_unique<Data::GroupCall>(
@@ -695,6 +697,7 @@ void ChannelData::setCall(const MTPInputGroupCall &call) {
 			data.vaccess_hash().v);
 		owner().registerGroupCall(_call.get());
 		session().changes().peerUpdated(this, UpdateFlag::GroupCall);
+		addFlags(MTPDchannel::Flag::f_call_active);
 	});
 }
 
@@ -705,6 +708,7 @@ void ChannelData::clearCall() {
 	owner().unregisterGroupCall(_call.get());
 	_call = nullptr;
 	session().changes().peerUpdated(this, UpdateFlag::GroupCall);
+	removeFlags(MTPDchannel::Flag::f_call_active);
 }
 
 namespace Data {
diff --git a/Telegram/SourceFiles/data/data_channel.h b/Telegram/SourceFiles/data/data_channel.h
index 372244ab8..b98dec3f4 100644
--- a/Telegram/SourceFiles/data/data_channel.h
+++ b/Telegram/SourceFiles/data/data_channel.h
@@ -102,6 +102,7 @@ public:
 		| MTPDchannel::Flag::f_restricted
 		| MTPDchannel::Flag::f_signatures
 		| MTPDchannel::Flag::f_username
+		| MTPDchannel::Flag::f_call_active
 		| MTPDchannel::Flag::f_slowmode_enabled;
 	using Flags = Data::Flags<
 		MTPDchannel::Flags,

From c82bc691e0ee6648007e4430b7beb145e4013f60 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Dec 2020 17:17:05 +0300
Subject: [PATCH 215/370] Improve group call service messages.

---
 Telegram/Resources/langs/lang.strings         | 11 +++-
 Telegram/SourceFiles/api/api_updates.cpp      |  9 +++
 Telegram/SourceFiles/data/data_session.cpp    |  8 +++
 Telegram/SourceFiles/data/data_session.h      |  8 +++
 .../SourceFiles/history/history_service.cpp   | 59 +++++++++++++++++--
 .../SourceFiles/history/history_service.h     | 22 ++++---
 6 files changed, 104 insertions(+), 13 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 6c75ca852..5aa204d79 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1066,7 +1066,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_invite_users_many" = "{from} invited {users} to the voice chat";
 "lng_action_invite_users_and_one" = "{accumulated}, {user}";
 "lng_action_invite_users_and_last" = "{accumulated} and {user}";
-"lng_action_group_call" = "Group call";
+"lng_action_group_call_started" = "{from} started a voice chat";
+"lng_action_group_call_finished" = "Voice chat finished ({duration})";
 "lng_action_add_user" = "{from} added {user}";
 "lng_action_add_users_many" = "{from} added {users}";
 "lng_action_add_users_and_one" = "{accumulated}, {user}";
@@ -1847,6 +1848,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_no_anonymous" = "Anonymous admins can't join voice chats :(";
 "lng_group_call_context_mute" = "Mute";
 "lng_group_call_context_unmute" = "Unmute";
+"lng_group_call_duration_days#one" = "{count} day";
+"lng_group_call_duration_days#other" = "{count} days";
+"lng_group_call_duration_hours#one" = "{count} hour";
+"lng_group_call_duration_hours#other" = "{count} hours";
+"lng_group_call_duration_minutes#one" = "{count} minute";
+"lng_group_call_duration_minutes#other" = "{count} minutes";
+"lng_group_call_duration_seconds#one" = "{count} second";
+"lng_group_call_duration_seconds#other" = "{count} seconds";
 
 "lng_no_mic_permission" = "Telegram needs access to your microphone so that you can make calls and record voice messages.";
 
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 9babc7347..ca1c6f3cc 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -1799,6 +1799,15 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 	case mtpc_updatePhoneCallSignalingData:
 	case mtpc_updateGroupCallParticipants:
 	case mtpc_updateGroupCall: {
+		if (update.type() == mtpc_updateGroupCall) {
+			const auto &data = update.c_updateGroupCall();
+			if (data.vcall().type() == mtpc_groupCallDiscarded) {
+				const auto &call = data.vcall().c_groupCallDiscarded();
+				session().data().groupCallDiscarded(
+					call.vid().v,
+					call.vduration().v);
+			}
+		}
 		Core::App().calls().handleUpdate(&session(), update);
 	} break;
 
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 833aae59d..38f887599 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -800,6 +800,14 @@ void Session::unregisterGroupCall(not_null<GroupCall*> call) {
 	_groupCalls.remove(call->id());
 }
 
+rpl::producer<Session::GroupCallDiscard> Session::groupCallDiscards() const {
+	return _groupCallDiscarded.events();
+}
+
+void Session::groupCallDiscarded(uint64 id, int duration) {
+	_groupCallDiscarded.fire({ id, duration });
+}
+
 GroupCall *Session::groupCall(uint64 callId) const {
 	const auto i = _groupCalls.find(callId);
 	return (i != end(_groupCalls)) ? i->second.get() : nullptr;
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index b61cce387..f3d05032d 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -158,6 +158,13 @@ public:
 	void unregisterGroupCall(not_null<GroupCall*> call);
 	GroupCall *groupCall(uint64 callId) const;
 
+	struct GroupCallDiscard {
+		uint64 id = 0;
+		int duration = 0;
+	};
+	rpl::producer<GroupCallDiscard> groupCallDiscards() const;
+	void groupCallDiscarded(uint64 id, int duration);
+
 	[[nodiscard]] auto invitedToCallUsers(uint64 callId) const
 		-> const base::flat_set<not_null<UserData*>> &;
 	void registerInvitedToCallUser(
@@ -921,6 +928,7 @@ private:
 
 	base::flat_map<uint64, not_null<GroupCall*>> _groupCalls;
 	base::flat_map<uint64, base::flat_set<not_null<UserData*>>> _invitedToCallUsers;
+	rpl::event_stream<GroupCallDiscard> _groupCallDiscarded;
 
 	History *_topPromoted = nullptr;
 
diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index 74ee7373a..7467f196f 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -274,6 +274,16 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 		return result;
 	};
 
+	auto prepareGroupCall = [this](const MTPDmessageActionGroupCall &action) {
+		if (const auto duration = action.vduration()) {
+			return prepareDiscardedCallText(duration->v);
+		}
+		auto result = PreparedText{};
+		result.links.push_back(fromLink());
+		result.text = tr::lng_action_group_call_started(tr::now, lt_from, fromLinkText());
+		return result;
+	};
+
 	auto prepareInviteToGroupCall = [this](const MTPDmessageActionInviteToGroupCall &action) {
 		const auto channel = history()->peer->asChannel();
 		const auto callId = action.vcall().match([&](const MTPDinputGroupCall &data) {
@@ -367,7 +377,7 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 		LOG(("API Error: messageActionSecureValuesSentMe received."));
 		return PreparedText{ tr::lng_message_empty(tr::now) };
 	}, [&](const MTPDmessageActionGroupCall &data) {
-		return PreparedText{ tr::lng_action_group_call(tr::now) };
+		return prepareGroupCall(data);
 	}, [&](const MTPDmessageActionInviteToGroupCall &data) {
 		return prepareInviteToGroupCall(data);
 	}, [](const MTPDmessageActionEmpty &) {
@@ -466,6 +476,22 @@ bool HistoryService::updateDependent(bool force) {
 	return (dependent->msg || !dependent->msgId);
 }
 
+HistoryService::PreparedText HistoryService::prepareDiscardedCallText(
+		int duration) {
+	const auto seconds = duration;
+	const auto days = seconds / 86400;
+	const auto hours = seconds / 3600;
+	const auto minutes = seconds / 60;
+	auto text = (days > 1)
+		? tr::lng_group_call_duration_days(tr::now, lt_count, days)
+		: (hours > 1)
+		? tr::lng_group_call_duration_hours(tr::now, lt_count, hours)
+		: (minutes > 1)
+		? tr::lng_group_call_duration_minutes(tr::now, lt_count, minutes)
+		: tr::lng_group_call_duration_seconds(tr::now, lt_count, seconds);
+	return PreparedText{ tr::lng_action_group_call_finished(tr::now, lt_duration, text) };
+}
+
 HistoryService::PreparedText HistoryService::preparePinnedText() {
 	auto result = PreparedText {};
 	auto pinned = Get<HistoryServicePinned>();
@@ -789,13 +815,33 @@ void HistoryService::createFromMtp(const MTPDmessage &message) {
 
 void HistoryService::createFromMtp(const MTPDmessageService &message) {
 	if (message.vaction().type() == mtpc_messageActionGameScore) {
+		const auto &data = message.vaction().c_messageActionGameScore();
 		UpdateComponents(HistoryServiceGameScore::Bit());
-		Get<HistoryServiceGameScore>()->score = message.vaction().c_messageActionGameScore().vscore().v;
+		Get<HistoryServiceGameScore>()->score = data.vscore().v;
 	} else if (message.vaction().type() == mtpc_messageActionPaymentSent) {
+		const auto &data = message.vaction().c_messageActionPaymentSent();
 		UpdateComponents(HistoryServicePayment::Bit());
-		auto amount = message.vaction().c_messageActionPaymentSent().vtotal_amount().v;
-		auto currency = qs(message.vaction().c_messageActionPaymentSent().vcurrency());
+		const auto amount = data.vtotal_amount().v;
+		const auto currency = qs(data.vcurrency());
 		Get<HistoryServicePayment>()->amount = Ui::FillAmountAndCurrency(amount, currency);
+	} else if (message.vaction().type() == mtpc_messageActionGroupCall) {
+		const auto &data = message.vaction().c_messageActionGroupCall();
+		if (data.vduration()) {
+			RemoveComponents(HistoryServiceOngoingCall::Bit());
+		} else {
+			UpdateComponents(HistoryServiceOngoingCall::Bit());
+			const auto call = Get<HistoryServiceOngoingCall>();
+			const auto id = data.vcall().c_inputGroupCall().vid().v;
+			call->lifetime.destroy();
+			history()->owner().groupCallDiscards(
+			) | rpl::filter([=](Data::Session::GroupCallDiscard discard) {
+				return (discard.id == id);
+			}) | rpl::start_with_next([=](
+					Data::Session::GroupCallDiscard discard) {
+				RemoveComponents(HistoryServiceOngoingCall::Bit());
+				updateText(prepareDiscardedCallText(discard.duration));
+			}, call->lifetime);
+		}
 	}
 	if (const auto replyTo = message.vreply_to()) {
 		replyTo->match([&](const MTPDmessageReplyHeader &data) {
@@ -852,7 +898,7 @@ Storage::SharedMediaTypesMask HistoryService::sharedMediaTypes() const {
 }
 
 void HistoryService::updateDependentText() {
-	auto text = PreparedText {};
+	auto text = PreparedText{};
 	if (Has<HistoryServicePinned>()) {
 		text = preparePinnedText();
 	} else if (Has<HistoryServiceGameScore>()) {
@@ -862,7 +908,10 @@ void HistoryService::updateDependentText() {
 	} else {
 		return;
 	}
+	updateText(std::move(text));
+}
 
+void HistoryService::updateText(PreparedText &&text) {
 	setServiceText(text);
 	history()->owner().requestItemResize(this);
 	const auto inDialogsHistory = history()->migrateToOrMe();
diff --git a/Telegram/SourceFiles/history/history_service.h b/Telegram/SourceFiles/history/history_service.h
index 99e93be8d..f9f93240a 100644
--- a/Telegram/SourceFiles/history/history_service.h
+++ b/Telegram/SourceFiles/history/history_service.h
@@ -20,24 +20,24 @@ struct HistoryServiceDependentData {
 };
 
 struct HistoryServicePinned
-	: public RuntimeComponent<HistoryServicePinned, HistoryItem>
-	, public HistoryServiceDependentData {
+: public RuntimeComponent<HistoryServicePinned, HistoryItem>
+, public HistoryServiceDependentData {
 };
 
 struct HistoryServiceGameScore
-	: public RuntimeComponent<HistoryServiceGameScore, HistoryItem>
-	, public HistoryServiceDependentData {
+: public RuntimeComponent<HistoryServiceGameScore, HistoryItem>
+, public HistoryServiceDependentData {
 	int score = 0;
 };
 
 struct HistoryServicePayment
-	: public RuntimeComponent<HistoryServicePayment, HistoryItem>
-	, public HistoryServiceDependentData {
+: public RuntimeComponent<HistoryServicePayment, HistoryItem>
+, public HistoryServiceDependentData {
 	QString amount;
 };
 
 struct HistoryServiceSelfDestruct
-	: public RuntimeComponent<HistoryServiceSelfDestruct, HistoryItem> {
+: public RuntimeComponent<HistoryServiceSelfDestruct, HistoryItem> {
 	enum class Type {
 		Photo,
 		Video,
@@ -47,6 +47,12 @@ struct HistoryServiceSelfDestruct
 	crl::time destructAt = 0;
 };
 
+struct HistoryServiceOngoingCall
+: public RuntimeComponent<HistoryServiceOngoingCall, HistoryItem> {
+	uint64 id = 0;
+	rpl::lifetime lifetime;
+};
+
 namespace HistoryView {
 class ServiceMessagePainter;
 } // namespace HistoryView
@@ -136,6 +142,7 @@ private:
 	}
 	bool updateDependent(bool force = false);
 	void updateDependentText();
+	void updateText(PreparedText &&text);
 	void clearDependency();
 
 	void createFromMtp(const MTPDmessage &message);
@@ -149,6 +156,7 @@ private:
 	PreparedText preparePinnedText();
 	PreparedText prepareGameScoreText();
 	PreparedText preparePaymentSentText();
+	PreparedText prepareDiscardedCallText(int duration);
 
 	friend class HistoryView::Service;
 

From c0af89f465c78c0b42ef4121e9c8f607ab4926ae Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Dec 2020 17:28:01 +0300
Subject: [PATCH 216/370] Show group name in the title.

---
 Telegram/Resources/langs/lang.strings            |  2 +-
 Telegram/SourceFiles/calls/calls_group_panel.cpp | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 5aa204d79..ee967a1ef 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1847,7 +1847,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_members#other" = "{count} members";
 "lng_group_call_no_anonymous" = "Anonymous admins can't join voice chats :(";
 "lng_group_call_context_mute" = "Mute";
-"lng_group_call_context_unmute" = "Unmute";
+"lng_group_call_context_unmute" = "Allow to speak";
 "lng_group_call_duration_days#one" = "{count} day";
 "lng_group_call_duration_days#other" = "{count} days";
 "lng_group_call_duration_hours#one" = "{count} hour";
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index f75d7de2c..6543b976d 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
+#include "info/profile/info_profile_values.h" // Info::Profile::Value.
 #include "core/application.h"
 #include "lang/lang_keys.h"
 #include "data/data_channel.h"
@@ -255,7 +256,12 @@ void GroupPanel::initWindow() {
 	_window->setWindowIcon(
 		QIcon(QPixmap::fromImage(Image::Empty()->original(), Qt::ColorOnly)));
 	_window->setTitleStyle(st::callTitle);
-	_window->setTitle(tr::lng_group_call_title(tr::now));
+
+	Info::Profile::NameValue(
+		_channel
+	) | rpl::start_with_next([=](const TextWithEntities &name) {
+		_window->setTitle(name.text);
+	}, _window->lifetime());
 
 	base::install_event_filter(_window.get(), [=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::Close && handleClose()) {
@@ -585,7 +591,7 @@ void GroupPanel::refreshTitle() {
 		if (!_title) {
 			_title.create(
 				widget(),
-				tr::lng_group_call_title(),
+				Info::Profile::NameValue(_channel),
 				st::groupCallHeaderLabel);
 			_title->setAttribute(Qt::WA_TransparentForMouseEvents);
 		}

From d0358458ea2e7c6dae848a7076812ac6b614208e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 1 Dec 2020 14:56:32 +0300
Subject: [PATCH 217/370] Added gradient to Calls::TopBar.

---
 Telegram/SourceFiles/calls/calls_top_bar.cpp | 64 ++++++++++++++++++--
 Telegram/SourceFiles/calls/calls_top_bar.h   |  7 +++
 2 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index c8ddf621d..bb1b3ee76 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -35,6 +35,25 @@ namespace Calls {
 namespace {
 
 constexpr auto kUpdateDebugTimeoutMs = crl::time(500);
+constexpr auto kSwitchStateDuration = 120;
+
+auto Colors() {
+	using Vector = std::vector<QColor>;
+	return base::flat_map<MuteState, Vector>{
+		{
+			MuteState::ForceMuted,
+			Vector{ st::callIconBg->c, st::callIconBg->c }
+		},
+		{
+			MuteState::Active,
+			Vector{ st::groupCallLive1->c, st::groupCallLive2->c }
+		},
+		{
+			MuteState::Muted,
+			Vector{ st::groupCallMuted1->c, st::groupCallMuted2->c }
+		},
+	};
+}
 
 class DebugInfoBox : public Ui::BoxContent {
 public:
@@ -115,7 +134,8 @@ TopBar::TopBar(
 	: object_ptr<Ui::LabelSimple>(nullptr))
 , _mute(this, st::callBarMuteToggle)
 , _info(this)
-, _hangup(this, st::callBarHangup) {
+, _hangup(this, st::callBarHangup)
+, _gradients(Colors(), QPointF(), QPointF()) {
 	initControls();
 	resize(width(), st::callBarHeight);
 }
@@ -145,6 +165,9 @@ void TopBar::initControls() {
 	}, lifetime());
 
 	if (const auto group = _groupCall.get()) {
+		const auto fromState = _mute->lifetime().make_state<MuteState>(
+			group->muted());
+
 		group->mutedValue(
 		) | rpl::start_with_next([=](MuteState state) {
 			if (state == MuteState::ForceMuted) {
@@ -153,6 +176,28 @@ void TopBar::initControls() {
 			_mute->setAttribute(
 				Qt::WA_TransparentForMouseEvents,
 				(state == MuteState::ForceMuted));
+
+			const auto to = 1.;
+			const auto from = _switchStateAnimation.animating()
+				? (to - _switchStateAnimation.value(0.))
+				: 0.;
+			const auto fromMuted = *fromState;
+			const auto toMuted = state;
+			*fromState = state;
+
+			auto animationCallback = [=](float64 value) {
+				_groupBrush = QBrush(
+					_gradients.gradient(fromMuted, toMuted, value));
+				update();
+			};
+
+			_switchStateAnimation.stop();
+			const auto duration = (to - from) * kSwitchStateDuration;
+			_switchStateAnimation.start(
+				std::move(animationCallback),
+				from,
+				to,
+				duration);
 		}, _mute->lifetime());
 
 		subscribeToMembersChanges(group);
@@ -250,8 +295,11 @@ void TopBar::setInfoLabels() {
 
 void TopBar::setMuted(bool mute) {
 	_mute->setIconOverride(mute ? &st::callBarUnmuteIcon : nullptr);
-	_mute->setRippleColorOverride(mute ? &st::callBarUnmuteRipple : nullptr);
-	_hangup->setRippleColorOverride(mute ? &st::callBarUnmuteRipple : nullptr);
+	const auto color = _groupCall
+		? &st::shadowFg
+		: (mute ? &st::callBarUnmuteRipple : nullptr);
+	_mute->setRippleColorOverride(color);
+	_hangup->setRippleColorOverride(color);
 	_muted = mute;
 }
 
@@ -326,11 +374,19 @@ void TopBar::updateControlsGeometry() {
 	};
 	setInfoLabelGeometry(_fullInfoLabel);
 	setInfoLabelGeometry(_shortInfoLabel);
+
+	_gradients.set_points(
+		QPointF(0, st::callBarHeight / 2),
+		QPointF(width(), st::callBarHeight / 2));
 }
 
 void TopBar::paintEvent(QPaintEvent *e) {
 	Painter p(this);
-	p.fillRect(e->rect(), _muted ? st::callBarBgMuted : st::callBarBg);
+	auto brush = _groupCall
+		? _groupBrush
+		: (_muted ? st::callBarBgMuted : st::callBarBg);
+	p.fillRect(e->rect(), std::move(brush));
+
 	if (!_userpics.isNull()) {
 		const auto imageSize = _userpics.size()
 			/ _userpics.devicePixelRatio();
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.h b/Telegram/SourceFiles/calls/calls_top_bar.h
index 9871284e1..79be3b3dc 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.h
+++ b/Telegram/SourceFiles/calls/calls_top_bar.h
@@ -10,6 +10,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/weak_ptr.h"
 #include "base/timer.h"
 #include "base/object_ptr.h"
+#include "ui/effects/animations.h"
+#include "ui/effects/gradient.h"
 #include "ui/rp_widget.h"
 
 namespace Ui {
@@ -28,6 +30,7 @@ namespace Calls {
 class Call;
 class GroupCall;
 class SignalBars;
+enum class MuteState;
 
 class TopBar : public Ui::RpWidget {
 public:
@@ -70,6 +73,10 @@ private:
 	object_ptr<Ui::AbstractButton> _info;
 	object_ptr<Ui::IconButton> _hangup;
 
+	QBrush _groupBrush;
+	anim::linear_gradients<MuteState> _gradients;
+	Ui::Animations::Simple _switchStateAnimation;
+
 	base::Timer _updateDurationTimer;
 
 };

From 00e4ef7701002ab76a6a3602f76f2389f6ccf266 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 1 Dec 2020 19:44:05 +0300
Subject: [PATCH 218/370] Added cross line animation to mute button in
 Calls::TopBar.

---
 Telegram/SourceFiles/calls/calls.style       |   8 ++
 Telegram/SourceFiles/calls/calls_top_bar.cpp | 132 +++++++++++++------
 Telegram/SourceFiles/calls/calls_top_bar.h   |   3 +-
 3 files changed, 102 insertions(+), 41 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 8daf15005..5c65a556c 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -663,3 +663,11 @@ groupCallBoxLabel: FlatLabel(boxLabel) {
 
 groupCallRowBlobMinRadius: 28px;
 groupCallRowBlobMaxRadius: 30px;
+
+callTopBarMuteCrossLine: CrossLineAnimation {
+	fg: callBarFg;
+	icon: icon {{ "calls/call_record_active", callBarFg }};
+	startPosition: point(11px, 8px);
+	endPosition: point(26px, 23px);
+	stroke: 2px;
+}
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index bb1b3ee76..07a9f72b0 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "calls/calls_top_bar.h"
 
+#include "ui/effects/cross_line.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/chat/group_call_bar.h" // Ui::GroupCallBarContent.
@@ -99,6 +100,52 @@ void DebugInfoBox::updateText() {
 
 } // namespace
 
+class Mute final : public Ui::IconButton {
+public:
+	Mute(QWidget *parent, const style::IconButton &st)
+	: Ui::IconButton(parent, st)
+	, _st(st)
+	, _crossLineMuteAnimation(st::callTopBarMuteCrossLine) {
+		resize(_st.width, _st.height);
+		installEventFilter(this);
+	}
+
+	void setProgress(float64 progress) {
+		if (_progress == progress) {
+			return;
+		}
+		_progress = progress;
+		update();
+	}
+
+	void setRippleColorOverride(const style::color *colorOverride) {
+		_rippleColorOverride = colorOverride;
+	}
+
+protected:
+	bool eventFilter(QObject *object, QEvent *event) {
+		if (event->type() == QEvent::Paint) {
+			Painter p(this);
+			paintRipple(
+				p,
+				_st.rippleAreaPosition.x(),
+				_st.rippleAreaPosition.y(),
+				_rippleColorOverride ? &(*_rippleColorOverride)->c : nullptr);
+			_crossLineMuteAnimation.paint(p, _st.iconPosition, _progress);
+			return true;
+		}
+		return QObject::eventFilter(object, event);
+	}
+
+private:
+	float64 _progress = 0.;
+
+	const style::IconButton &_st;
+	Ui::CrossLineAnimation _crossLineMuteAnimation;
+	const style::color *_rippleColorOverride = nullptr;
+
+};
+
 TopBar::TopBar(
 	QWidget *parent,
 	const base::weak_ptr<Call> &call)
@@ -153,53 +200,62 @@ void TopBar::initControls() {
 		}
 	});
 
-	using namespace rpl::mappers;
+	const auto mapToState = [](bool muted) {
+		return muted ? MuteState::Muted : MuteState::Active;
+	};
+	const auto fromState = _mute->lifetime().make_state<MuteState>(
+		_call ? mapToState(_call->muted()) : _groupCall->muted());
 	auto muted = _call
-		? _call->mutedValue()
-		: (_groupCall->mutedValue() | rpl::map(_1 != MuteState::Active));
+		? _call->mutedValue() | rpl::map(mapToState)
+		: _groupCall->mutedValue();
 	std::move(
 		muted
-	) | rpl::start_with_next([=](bool muted) {
-		setMuted(muted);
+	) | rpl::start_with_next([=](MuteState state) {
+		setMuted(state != MuteState::Active);
 		update();
-	}, lifetime());
 
-	if (const auto group = _groupCall.get()) {
-		const auto fromState = _mute->lifetime().make_state<MuteState>(
-			group->muted());
+		const auto isForceMuted = (state == MuteState::ForceMuted);
+		if (isForceMuted) {
+			_mute->clearState();
+		}
+		_mute->setAttribute(
+			Qt::WA_TransparentForMouseEvents,
+			isForceMuted);
 
-		group->mutedValue(
-		) | rpl::start_with_next([=](MuteState state) {
-			if (state == MuteState::ForceMuted) {
-				_mute->clearState();
-			}
-			_mute->setAttribute(
-				Qt::WA_TransparentForMouseEvents,
-				(state == MuteState::ForceMuted));
+		const auto to = 1.;
+		const auto from = _switchStateAnimation.animating()
+			? (to - _switchStateAnimation.value(0.))
+			: 0.;
+		const auto fromMuted = *fromState;
+		const auto toMuted = state;
+		*fromState = state;
 
-			const auto to = 1.;
-			const auto from = _switchStateAnimation.animating()
-				? (to - _switchStateAnimation.value(0.))
-				: 0.;
-			const auto fromMuted = *fromState;
-			const auto toMuted = state;
-			*fromState = state;
+		const auto crossFrom = (fromMuted != MuteState::Active) ? 1. : 0.;
+		const auto crossTo = (toMuted != MuteState::Active) ? 1. : 0.;
 
-			auto animationCallback = [=](float64 value) {
+		auto animationCallback = [=](float64 value) {
+			if (_groupCall) {
 				_groupBrush = QBrush(
 					_gradients.gradient(fromMuted, toMuted, value));
 				update();
-			};
+			}
 
-			_switchStateAnimation.stop();
-			const auto duration = (to - from) * kSwitchStateDuration;
-			_switchStateAnimation.start(
-				std::move(animationCallback),
-				from,
-				to,
-				duration);
-		}, _mute->lifetime());
+			const auto crossProgress = (crossFrom == crossTo)
+				? crossTo
+				: (crossFrom + float64(crossTo - crossFrom) * value);
+			_mute->setProgress(crossProgress);
+		};
 
+		_switchStateAnimation.stop();
+		const auto duration = (to - from) * kSwitchStateDuration;
+		_switchStateAnimation.start(
+			std::move(animationCallback),
+			from,
+			to,
+			duration);
+	}, _mute->lifetime());
+
+	if (const auto group = _groupCall.get()) {
 		subscribeToMembersChanges(group);
 	}
 
@@ -294,12 +350,8 @@ void TopBar::setInfoLabels() {
 }
 
 void TopBar::setMuted(bool mute) {
-	_mute->setIconOverride(mute ? &st::callBarUnmuteIcon : nullptr);
-	const auto color = _groupCall
-		? &st::shadowFg
-		: (mute ? &st::callBarUnmuteRipple : nullptr);
-	_mute->setRippleColorOverride(color);
-	_hangup->setRippleColorOverride(color);
+	_mute->setRippleColorOverride(&st::shadowFg);
+	_hangup->setRippleColorOverride(&st::shadowFg);
 	_muted = mute;
 }
 
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.h b/Telegram/SourceFiles/calls/calls_top_bar.h
index 79be3b3dc..db16eea21 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.h
+++ b/Telegram/SourceFiles/calls/calls_top_bar.h
@@ -30,6 +30,7 @@ namespace Calls {
 class Call;
 class GroupCall;
 class SignalBars;
+class Mute;
 enum class MuteState;
 
 class TopBar : public Ui::RpWidget {
@@ -69,7 +70,7 @@ private:
 	object_ptr<Ui::FlatLabel> _fullInfoLabel;
 	object_ptr<Ui::FlatLabel> _shortInfoLabel;
 	object_ptr<Ui::LabelSimple> _hangupLabel;
-	object_ptr<Ui::IconButton> _mute;
+	object_ptr<Mute> _mute;
 	object_ptr<Ui::AbstractButton> _info;
 	object_ptr<Ui::IconButton> _hangup;
 

From fdbe6bdeb2723b3976a5398ec26713778bf3a232 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 2 Dec 2020 13:52:19 +0300
Subject: [PATCH 219/370] Add voice chat indicator in the chats list.

---
 .../SourceFiles/data/data_peer_values.cpp     |  11 +-
 Telegram/SourceFiles/data/data_peer_values.h  |   3 +-
 Telegram/SourceFiles/data/data_session.cpp    |   9 +
 Telegram/SourceFiles/data/data_session.h      |   4 +
 Telegram/SourceFiles/dialogs/dialogs.style    |   8 +-
 .../dialogs/dialogs_inner_widget.cpp          |  88 ++++--
 .../dialogs/dialogs_inner_widget.h            |   6 +
 .../SourceFiles/dialogs/dialogs_layout.cpp    |   6 +-
 Telegram/SourceFiles/dialogs/dialogs_row.cpp  | 137 ++++++---
 Telegram/SourceFiles/dialogs/dialogs_row.h    |  24 +-
 .../history/view/history_view_send_action.cpp |  99 ++++--
 .../history/view/history_view_send_action.h   |   9 +
 .../ui/effects/send_action_animations.cpp     | 291 +++++++++++++++---
 .../ui/effects/send_action_animations.h       |  53 +---
 Telegram/lib_ui                               |   2 +-
 15 files changed, 556 insertions(+), 194 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_peer_values.cpp b/Telegram/SourceFiles/data/data_peer_values.cpp
index d0cf78fd0..74eb650bf 100644
--- a/Telegram/SourceFiles/data/data_peer_values.cpp
+++ b/Telegram/SourceFiles/data/data_peer_values.cpp
@@ -438,11 +438,12 @@ bool OnlineTextActive(not_null<UserData*> user, TimeId now) {
 	return OnlineTextActive(user->onlineTill, now);
 }
 
-bool IsPeerAnOnlineUser(not_null<PeerData*> peer) {
-	if (const auto user = peer->asUser()) {
-		return OnlineTextActive(user, base::unixtime::now());
-	}
-	return false;
+bool IsUserOnline(not_null<UserData*> user) {
+	return OnlineTextActive(user, base::unixtime::now());
+}
+
+bool ChannelHasActiveCall(not_null<ChannelData*> channel) {
+	return (channel->flags() & MTPDchannel::Flag::f_call_active);
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_peer_values.h b/Telegram/SourceFiles/data/data_peer_values.h
index c913761f8..04d12b391 100644
--- a/Telegram/SourceFiles/data/data_peer_values.h
+++ b/Telegram/SourceFiles/data/data_peer_values.h
@@ -120,6 +120,7 @@ inline auto PeerFullFlagValue(
 [[nodiscard]] QString OnlineTextFull(not_null<UserData*> user, TimeId now);
 [[nodiscard]] bool OnlineTextActive(TimeId online, TimeId now);
 [[nodiscard]] bool OnlineTextActive(not_null<UserData*> user, TimeId now);
-[[nodiscard]] bool IsPeerAnOnlineUser(not_null<PeerData*> peer);
+[[nodiscard]] bool IsUserOnline(not_null<UserData*> user);
+[[nodiscard]] bool ChannelHasActiveCall(not_null<ChannelData*> channel);
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 38f887599..bf914276c 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -2181,6 +2181,15 @@ void Session::updateSendActionAnimation(
 	_sendActionAnimationUpdate.fire(std::move(update));
 }
 
+auto Session::speakingAnimationUpdated() const
+-> rpl::producer<not_null<History*>> {
+	return _speakingAnimationUpdate.events();
+}
+
+void Session::updateSpeakingAnimation(not_null<History*> history) {
+	_speakingAnimationUpdate.fire_copy(history);
+}
+
 int Session::unreadBadge() const {
 	return computeUnreadBadge(_chatsList.unreadState());
 }
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index f3d05032d..583c36ec1 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -400,6 +400,9 @@ public:
 	[[nodiscard]] auto sendActionAnimationUpdated() const
 		-> rpl::producer<SendActionAnimationUpdate>;
 	void updateSendActionAnimation(SendActionAnimationUpdate &&update);
+	[[nodiscard]] auto speakingAnimationUpdated() const
+		-> rpl::producer<not_null<History*>>;
+	void updateSpeakingAnimation(not_null<History*> history);
 
 	using SendActionPainter = HistoryView::SendActionPainter;
 	[[nodiscard]] std::shared_ptr<SendActionPainter> repliesSendActionPainter(
@@ -951,6 +954,7 @@ private:
 	std::unique_ptr<CredentialsWithGeneration> _passportCredentials;
 
 	rpl::event_stream<SendActionAnimationUpdate> _sendActionAnimationUpdate;
+	rpl::event_stream<not_null<History*>> _speakingAnimationUpdate;
 
 	std::vector<WallPaper> _wallpapers;
 	int32 _wallpapersHash = 0;
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index a9dcfc89d..63b08e1a6 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -36,9 +36,15 @@ dialogsPadding: point(10px, 8px);
 
 dialogsOnlineBadgeStroke: 2px;
 dialogsOnlineBadgeSize: 10px;
-dialogsOnlineBadgeSkip: point(10px, 12px);
+dialogsOnlineBadgeSkip: point(0px, 2px);
 dialogsOnlineBadgeDuration: 150;
 
+dialogsCallBadgeSize: 16px;
+dialogsCallBadgeSkip: point(-1px, 1px);
+
+dialogsSpeakingStrokeNumerator: 16px;
+dialogsSpeakingDenominator: 8.;
+
 dialogsImportantBarHeight: 37px;
 
 dialogsSkip: 8px;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 169d13e83..63ca47022 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -189,6 +189,11 @@ InnerWidget::InnerWidget(
 			UpdateRowSection::Default | UpdateRowSection::Filtered);
 	}, lifetime());
 
+	session().data().speakingAnimationUpdated(
+	) | rpl::start_with_next([=](not_null<History*> history) {
+		updateDialogRowCornerStatus(history);
+	}, lifetime());
+
 	setupOnlineStatusCheck();
 
 	rpl::merge(
@@ -2959,11 +2964,43 @@ MsgId InnerWidget::lastSearchMigratedId() const {
 void InnerWidget::setupOnlineStatusCheck() {
 	session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::OnlineStatus
+		| Data::PeerUpdate::Flag::GroupCall
 	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
-		userOnlineUpdated(update.peer);
+		if (update.peer->isUser()) {
+			userOnlineUpdated(update.peer);
+		} else {
+			groupHasCallUpdated(update.peer);
+		}
 	}, lifetime());
 }
 
+void InnerWidget::updateDialogRowCornerStatus(not_null<History*> history) {
+	const auto user = history->peer->isUser();
+	const auto size = user
+		? st::dialogsOnlineBadgeSize
+		: st::dialogsCallBadgeSize;
+	const auto stroke = st::dialogsOnlineBadgeStroke;
+	const auto skip = user
+		? st::dialogsOnlineBadgeSkip
+		: st::dialogsCallBadgeSkip;
+	const auto updateRect = QRect(
+		st::dialogsPhotoSize - skip.x() - size,
+		st::dialogsPhotoSize - skip.y() - size,
+		size,
+		size
+	).marginsAdded(
+		{ stroke, stroke, stroke, stroke }
+	).translated(
+		st::dialogsPadding
+	);
+	updateDialogRow(
+		RowDescriptor(
+			history,
+			FullMsgId()),
+		updateRect,
+		UpdateRowSection::Default | UpdateRowSection::Filtered);
+}
+
 void InnerWidget::userOnlineUpdated(not_null<PeerData*> peer) {
 	const auto user = peer->isSelf() ? nullptr : peer->asUser();
 	if (!user) {
@@ -2973,32 +3010,35 @@ void InnerWidget::userOnlineUpdated(not_null<PeerData*> peer) {
 	if (!history) {
 		return;
 	}
-	const auto size = st::dialogsOnlineBadgeSize;
-	const auto stroke = st::dialogsOnlineBadgeStroke;
-	const auto skip = st::dialogsOnlineBadgeSkip;
-	const auto edge = st::dialogsPadding.x() + st::dialogsPhotoSize;
-	const auto updateRect = QRect(
-		edge - skip.x() - size,
-		edge - skip.y() - size,
-		size,
-		size
-	).marginsAdded(
-		{ stroke, stroke, stroke, stroke }
-	).translated(
-		st::dialogsPadding
-	);
+	updateRowCornerStatusShown(
+		history,
+		Data::OnlineTextActive(user, base::unixtime::now()));
+}
+
+void InnerWidget::groupHasCallUpdated(not_null<PeerData*> peer) {
+	const auto group = peer->asMegagroup();
+	if (!group) {
+		return;
+	}
+	const auto history = session().data().historyLoaded(group);
+	if (!history) {
+		return;
+	}
+	updateRowCornerStatusShown(
+		history,
+		group->flags() & MTPDchannel::Flag::f_call_active);
+}
+
+void InnerWidget::updateRowCornerStatusShown(
+		not_null<History*> history,
+		bool shown) {
 	const auto repaint = [=] {
-		updateDialogRow(
-			RowDescriptor(
-				history,
-				FullMsgId()),
-			updateRect,
-			UpdateRowSection::Default | UpdateRowSection::Filtered);
+		updateDialogRowCornerStatus(history);
 	};
 	repaint();
 
 	const auto findRow = [&](not_null<History*> history)
-	-> std::pair<Row*, int> {
+		-> std::pair<Row*, int> {
 		if (state() == WidgetState::Default) {
 			const auto row = shownDialogs()->getRow({ history });
 			return { row, row ? defaultRowTop(row) : 0 };
@@ -3014,8 +3054,8 @@ void InnerWidget::userOnlineUpdated(not_null<PeerData*> peer) {
 	if (const auto &[row, top] = findRow(history); row != nullptr) {
 		const auto visible = (top < _visibleBottom)
 			&& (top + st::dialogsRowHeight > _visibleTop);
-		row->setOnline(
-			Data::OnlineTextActive(user, base::unixtime::now()),
+		row->updateCornerBadgeShown(
+			history->peer,
 			visible ? Fn<void()>(crl::guard(this, repaint)) : nullptr);
 	}
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
index ea3a59fa2..254b622c1 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
@@ -224,6 +224,12 @@ private:
 	int defaultRowTop(not_null<Row*> row) const;
 	void setupOnlineStatusCheck();
 	void userOnlineUpdated(not_null<PeerData*> peer);
+	void groupHasCallUpdated(not_null<PeerData*> peer);
+
+	void updateRowCornerStatusShown(
+		not_null<History*> history,
+		bool shown);
+	void updateDialogRowCornerStatus(not_null<History*> history);
 
 	void setupShortcuts();
 	RowDescriptor computeJump(
diff --git a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
index 1c7f238d5..8d52c7e4c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
@@ -258,6 +258,8 @@ void paintRow(
 	p.fillRect(fullRect, bg);
 	row->paintRipple(p, 0, 0, fullWidth, &ripple->c);
 
+	const auto history = chat.history();
+
 	if (flags & Flag::SavedMessages) {
 		Ui::EmptyUserpic::PaintSavedMessages(
 			p,
@@ -276,7 +278,8 @@ void paintRow(
 		row->paintUserpic(
 			p,
 			from,
-			(flags & Flag::AllowUserOnline),
+			(flags & Flag::AllowUserOnline) ? history : nullptr,
+			ms,
 			active,
 			fullWidth);
 	} else if (hiddenSenderInfo) {
@@ -306,7 +309,6 @@ void paintRow(
 		return;
 	}
 
-	const auto history = chat.history();
 	auto namewidth = fullWidth - nameleft - st::dialogsPadding.x();
 	auto rectForName = QRect(
 		nameleft,
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
index 97e045275..ba46161dd 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
@@ -71,27 +71,29 @@ QString ComposeFolderListEntryText(not_null<Data::Folder*> folder) {
 BasicRow::BasicRow() = default;
 BasicRow::~BasicRow() = default;
 
-void BasicRow::setOnline(bool online, Fn<void()> updateCallback) const {
-	if (_online == online) {
+void BasicRow::setCornerBadgeShown(
+		bool shown,
+		Fn<void()> updateCallback) const {
+	if (_cornerBadgeShown == shown) {
 		return;
 	}
-	_online = online;
-	if (_onlineUserpic && _onlineUserpic->animation.animating()) {
-		_onlineUserpic->animation.change(
-			_online ? 1. : 0.,
+	_cornerBadgeShown = shown;
+	if (_cornerBadgeUserpic && _cornerBadgeUserpic->animation.animating()) {
+		_cornerBadgeUserpic->animation.change(
+			_cornerBadgeShown ? 1. : 0.,
 			st::dialogsOnlineBadgeDuration);
 	} else if (updateCallback) {
-		ensureOnlineUserpic();
-		_onlineUserpic->animation.start(
+		ensureCornerBadgeUserpic();
+		_cornerBadgeUserpic->animation.start(
 			std::move(updateCallback),
-			_online ? 0. : 1.,
-			_online ? 1. : 0.,
+			_cornerBadgeShown ? 0. : 1.,
+			_cornerBadgeShown ? 1. : 0.,
 			st::dialogsOnlineBadgeDuration);
 	}
-	if (!_online
-		&& _onlineUserpic
-		&& !_onlineUserpic->animation.animating()) {
-		_onlineUserpic = nullptr;
+	if (!_cornerBadgeShown
+		&& _cornerBadgeUserpic
+		&& !_cornerBadgeUserpic->animation.animating()) {
+		_cornerBadgeUserpic = nullptr;
 	}
 }
 
@@ -129,15 +131,29 @@ void BasicRow::paintRipple(
 	}
 }
 
-void BasicRow::ensureOnlineUserpic() const {
-	if (_onlineUserpic) {
-		return;
-	}
-	_onlineUserpic = std::make_unique<OnlineUserpic>();
+void BasicRow::updateCornerBadgeShown(
+		not_null<PeerData*> peer,
+		Fn<void()> updateCallback) const {
+	const auto shown = [&] {
+		if (const auto user = peer->asUser()) {
+			return Data::IsUserOnline(user);
+		} else if (const auto channel = peer->asChannel()) {
+			return Data::ChannelHasActiveCall(channel);
+		}
+		return false;
+	}();
+	setCornerBadgeShown(shown, std::move(updateCallback));
 }
 
-void BasicRow::PaintOnlineFrame(
-		not_null<OnlineUserpic*> data,
+void BasicRow::ensureCornerBadgeUserpic() const {
+	if (_cornerBadgeUserpic) {
+		return;
+	}
+	_cornerBadgeUserpic = std::make_unique<CornerBadgeUserpic>();
+}
+
+void BasicRow::PaintCornerBadgeFrame(
+		not_null<CornerBadgeUserpic*> data,
 		not_null<PeerData*> peer,
 		std::shared_ptr<Data::CloudImageView> &view) {
 	data->frame.fill(Qt::transparent);
@@ -153,21 +169,24 @@ void BasicRow::PaintOnlineFrame(
 	PainterHighQualityEnabler hq(q);
 	q.setCompositionMode(QPainter::CompositionMode_Source);
 
-	const auto size = st::dialogsOnlineBadgeSize;
+	const auto size = peer->isUser()
+		? st::dialogsOnlineBadgeSize
+		: st::dialogsCallBadgeSize;
 	const auto stroke = st::dialogsOnlineBadgeStroke;
-	const auto skip = st::dialogsOnlineBadgeSkip;
-	const auto edge = st::dialogsPadding.x() + st::dialogsPhotoSize;
-	const auto shrink = (size / 2) * (1. - data->online);
+	const auto skip = peer->isUser()
+		? st::dialogsOnlineBadgeSkip
+		: st::dialogsCallBadgeSkip;
+	const auto shrink = (size / 2) * (1. - data->shown);
 
 	auto pen = QPen(Qt::transparent);
-	pen.setWidthF(stroke * data->online);
+	pen.setWidthF(stroke * data->shown);
 	q.setPen(pen);
 	q.setBrush(data->active
 		? st::dialogsOnlineBadgeFgActive
 		: st::dialogsOnlineBadgeFg);
 	q.drawEllipse(QRectF(
-		edge - skip.x() - size,
-		edge - skip.y() - size,
+		st::dialogsPhotoSize - skip.x() - size,
+		st::dialogsPhotoSize - skip.y() - size,
 		size,
 		size
 	).marginsRemoved({ shrink, shrink, shrink, shrink }));
@@ -176,15 +195,16 @@ void BasicRow::PaintOnlineFrame(
 void BasicRow::paintUserpic(
 		Painter &p,
 		not_null<PeerData*> peer,
-		bool allowOnline,
+		History *historyForCornerBadge,
+		crl::time now,
 		bool active,
 		int fullWidth) const {
-	setOnline(Data::IsPeerAnOnlineUser(peer));
+	updateCornerBadgeShown(peer);
 
-	const auto online = _onlineUserpic
-		? _onlineUserpic->animation.value(_online ? 1. : 0.)
-		: (_online ? 1. : 0.);
-	if (!allowOnline || online == 0.) {
+	const auto shown = _cornerBadgeUserpic
+		? _cornerBadgeUserpic->animation.value(_cornerBadgeShown ? 1. : 0.)
+		: (_cornerBadgeShown ? 1. : 0.);
+	if (!historyForCornerBadge || shown == 0.) {
 		peer->paintUserpicLeft(
 			p,
 			_userpic,
@@ -192,34 +212,53 @@ void BasicRow::paintUserpic(
 			st::dialogsPadding.y(),
 			fullWidth,
 			st::dialogsPhotoSize);
-		if (!allowOnline || !_online) {
-			_onlineUserpic = nullptr;
+		if (!historyForCornerBadge || !_cornerBadgeShown) {
+			_cornerBadgeUserpic = nullptr;
 		}
 		return;
 	}
-	ensureOnlineUserpic();
-	if (_onlineUserpic->frame.isNull()) {
-		_onlineUserpic->frame = QImage(
+	ensureCornerBadgeUserpic();
+	if (_cornerBadgeUserpic->frame.isNull()) {
+		_cornerBadgeUserpic->frame = QImage(
 			st::dialogsPhotoSize * cRetinaFactor(),
 			st::dialogsPhotoSize * cRetinaFactor(),
 			QImage::Format_ARGB32_Premultiplied);
-		_onlineUserpic->frame.setDevicePixelRatio(cRetinaFactor());
+		_cornerBadgeUserpic->frame.setDevicePixelRatio(cRetinaFactor());
 	}
 	const auto key = peer->userpicUniqueKey(_userpic);
-	if (_onlineUserpic->online != online
-		|| _onlineUserpic->key != key
-		|| _onlineUserpic->active != active) {
-		_onlineUserpic->online = online;
-		_onlineUserpic->key = key;
-		_onlineUserpic->active = active;
-		PaintOnlineFrame(_onlineUserpic.get(), peer, _userpic);
+	if (_cornerBadgeUserpic->shown != shown
+		|| _cornerBadgeUserpic->key != key
+		|| _cornerBadgeUserpic->active != active) {
+		_cornerBadgeUserpic->shown = shown;
+		_cornerBadgeUserpic->key = key;
+		_cornerBadgeUserpic->active = active;
+		PaintCornerBadgeFrame(_cornerBadgeUserpic.get(), peer, _userpic);
 	}
-	p.drawImage(st::dialogsPadding, _onlineUserpic->frame);
+	p.drawImage(st::dialogsPadding, _cornerBadgeUserpic->frame);
+	if (historyForCornerBadge->peer->isUser()) {
+		return;
+	}
+	p.setOpacity(shown);
+	const auto actionPainter = historyForCornerBadge->sendActionPainter();
+	const auto bg = active
+		? st::dialogsBgActive
+		: st::dialogsBg;
+	const auto size = st::dialogsCallBadgeSize;
+	const auto skip = st::dialogsCallBadgeSkip;
+	p.translate(st::dialogsPadding);
+	actionPainter->paintSpeaking(
+		p,
+		st::dialogsPhotoSize - skip.x() - size,
+		st::dialogsPhotoSize - skip.y() - size,
+		fullWidth,
+		bg,
+		now);
+	p.translate(-st::dialogsPadding);
 }
 
 Row::Row(Key key, int pos) : _id(key), _pos(pos) {
 	if (const auto history = key.history()) {
-		setOnline(Data::IsPeerAnOnlineUser(history->peer));
+		updateCornerBadgeShown(history->peer);
 	}
 }
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.h b/Telegram/SourceFiles/dialogs/dialogs_row.h
index 6871a38f0..0bbfaf8fa 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.h
@@ -34,11 +34,14 @@ public:
 	BasicRow();
 	~BasicRow();
 
-	void setOnline(bool online, Fn<void()> updateCallback = nullptr) const;
+	void updateCornerBadgeShown(
+		not_null<PeerData*> peer,
+		Fn<void()> updateCallback = nullptr) const;
 	void paintUserpic(
 		Painter &p,
 		not_null<PeerData*> peer,
-		bool allowOnline,
+		History *historyForCornerBadge,
+		crl::time now,
 		bool active,
 		int fullWidth) const;
 
@@ -57,24 +60,27 @@ public:
 	}
 
 private:
-	struct OnlineUserpic {
+	struct CornerBadgeUserpic {
 		InMemoryKey key;
-		float64 online = 0.;
+		float64 shown = 0.;
 		bool active = false;
 		QImage frame;
 		Ui::Animations::Simple animation;
 	};
 
-	void ensureOnlineUserpic() const;
-	static void PaintOnlineFrame(
-		not_null<OnlineUserpic*> data,
+	void setCornerBadgeShown(
+		bool shown,
+		Fn<void()> updateCallback) const;
+	void ensureCornerBadgeUserpic() const;
+	static void PaintCornerBadgeFrame(
+		not_null<CornerBadgeUserpic*> data,
 		not_null<PeerData*> peer,
 		std::shared_ptr<Data::CloudImageView> &view);
 
 	mutable std::shared_ptr<Data::CloudImageView> _userpic;
 	mutable std::unique_ptr<Ui::RippleAnimation> _ripple;
-	mutable std::unique_ptr<OnlineUserpic> _onlineUserpic;
-	mutable bool _online = false;
+	mutable std::unique_ptr<CornerBadgeUserpic> _cornerBadgeUserpic;
+	mutable bool _cornerBadgeShown = false;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/history_view_send_action.cpp b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
index 8719aacfb..c7bd84f83 100644
--- a/Telegram/SourceFiles/history/view/history_view_send_action.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_send_action.cpp
@@ -19,18 +19,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace HistoryView {
 namespace {
 
-constexpr auto kStatusShowClientsideTyping = 6000;
-constexpr auto kStatusShowClientsideRecordVideo = 6000;
-constexpr auto kStatusShowClientsideUploadVideo = 6000;
-constexpr auto kStatusShowClientsideRecordVoice = 6000;
-constexpr auto kStatusShowClientsideUploadVoice = 6000;
-constexpr auto kStatusShowClientsideRecordRound = 6000;
-constexpr auto kStatusShowClientsideUploadRound = 6000;
-constexpr auto kStatusShowClientsideUploadPhoto = 6000;
-constexpr auto kStatusShowClientsideUploadFile = 6000;
-constexpr auto kStatusShowClientsideChooseLocation = 6000;
-constexpr auto kStatusShowClientsideChooseContact = 6000;
-constexpr auto kStatusShowClientsidePlayGame = 10000;
+constexpr auto kStatusShowClientsideTyping = 6 * crl::time(1000);
+constexpr auto kStatusShowClientsideRecordVideo = 6 * crl::time(1000);
+constexpr auto kStatusShowClientsideUploadVideo = 6 * crl::time(1000);
+constexpr auto kStatusShowClientsideRecordVoice = 6 * crl::time(1000);
+constexpr auto kStatusShowClientsideUploadVoice = 6 * crl::time(1000);
+constexpr auto kStatusShowClientsideRecordRound = 6 * crl::time(1000);
+constexpr auto kStatusShowClientsideUploadRound = 6 * crl::time(1000);
+constexpr auto kStatusShowClientsideUploadPhoto = 6 * crl::time(1000);
+constexpr auto kStatusShowClientsideUploadFile = 6 * crl::time(1000);
+constexpr auto kStatusShowClientsideChooseLocation = 6 * crl::time(1000);
+constexpr auto kStatusShowClientsideChooseContact = 6 * crl::time(1000);
+constexpr auto kStatusShowClientsidePlayGame = 10 * crl::time(1000);
+constexpr auto kStatusShowClientsideSpeaking = 6 * crl::time(1000);
 
 } // namespace
 
@@ -101,7 +102,9 @@ bool SendActionPainter::updateNeedsAnimating(
 			emplaceAction(Type::PlayGame, kStatusShowClientsidePlayGame);
 		}
 	}, [&](const MTPDspeakingInGroupCallAction &) {
-		// #TODO calls
+		_speaking.emplace_or_assign(
+			user,
+			now + kStatusShowClientsideSpeaking);
 	}, [&](const MTPDsendMessageCancelAction &) {
 		Unexpected("CancelAction here.");
 	});
@@ -134,15 +137,49 @@ bool SendActionPainter::paint(
 	return false;
 }
 
+void SendActionPainter::paintSpeaking(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		style::color color,
+		crl::time ms) {
+	if (_speakingAnimation) {
+		_speakingAnimation.paint(
+			p,
+			color,
+			x,
+			y,
+			outerWidth,
+			ms);
+	} else {
+		Ui::SendActionAnimation::PaintSpeakingIdle(
+			p,
+			color,
+			x,
+			y,
+			outerWidth);
+	}
+}
+
 bool SendActionPainter::updateNeedsAnimating(crl::time now, bool force) {
 	if (!_weak) {
 		return false;
 	}
-	auto changed = force;
+	auto sendActionChanged = false;
+	auto speakingChanged = false;
 	for (auto i = begin(_typing); i != end(_typing);) {
 		if (now >= i->second) {
 			i = _typing.erase(i);
-			changed = true;
+			sendActionChanged = true;
+		} else {
+			++i;
+		}
+	}
+	for (auto i = begin(_speaking); i != end(_speaking);) {
+		if (now >= i->second) {
+			i = _speaking.erase(i);
+			speakingChanged = true;
 		} else {
 			++i;
 		}
@@ -150,12 +187,13 @@ bool SendActionPainter::updateNeedsAnimating(crl::time now, bool force) {
 	for (auto i = begin(_sendActions); i != end(_sendActions);) {
 		if (now >= i->second.until) {
 			i = _sendActions.erase(i);
-			changed = true;
+			sendActionChanged = true;
 		} else {
 			++i;
 		}
 	}
-	if (changed) {
+	const auto wasSpeakingAnimation = !!_speakingAnimation;
+	if (force || sendActionChanged || speakingChanged) {
 		QString newTypingString;
 		auto typingCount = _typing.size();
 		if (typingCount > 2) {
@@ -232,7 +270,7 @@ bool SendActionPainter::updateNeedsAnimating(crl::time now, bool force) {
 		if (typingCount > 0) {
 			_sendActionAnimation.start(Api::SendProgressType::Typing);
 		} else if (newTypingString.isEmpty()) {
-			_sendActionAnimation.stop();
+			_sendActionAnimation.tryToFinish();
 		}
 		if (_sendActionString != newTypingString) {
 			_sendActionString = newTypingString;
@@ -241,17 +279,34 @@ bool SendActionPainter::updateNeedsAnimating(crl::time now, bool force) {
 				_sendActionString,
 				Ui::NameTextOptions());
 		}
+		if (_speaking.empty()) {
+			_speakingAnimation.tryToFinish();
+		} else {
+			_speakingAnimation.start(Api::SendProgressType::Speaking);
+		}
+	} else if (_speaking.empty() && _speakingAnimation) {
+		_speakingAnimation.tryToFinish();
 	}
-	const auto result = (!_typing.empty() || !_sendActions.empty());
-	if (changed || (result && !anim::Disabled())) {
+	const auto sendActionResult = !_typing.empty() || !_sendActions.empty();
+	const auto speakingResult = !_speaking.empty() || wasSpeakingAnimation;
+	if (force
+		|| sendActionChanged
+		|| (sendActionResult && !anim::Disabled())) {
 		_history->peer->owner().updateSendActionAnimation({
 			_history,
 			_sendActionAnimation.width(),
 			st::normalFont->height,
-			changed
+			(force || sendActionChanged)
 		});
 	}
-	return result;
+	if (force
+		|| speakingChanged
+		|| (speakingResult && !anim::Disabled())) {
+		_history->peer->owner().updateSpeakingAnimation({
+			_history
+		});
+	}
+	return sendActionResult || speakingResult;
 }
 
 void SendActionPainter::clear(not_null<UserData*> from) {
diff --git a/Telegram/SourceFiles/history/view/history_view_send_action.h b/Telegram/SourceFiles/history/view/history_view_send_action.h
index 2ad370eb9..4eb559809 100644
--- a/Telegram/SourceFiles/history/view/history_view_send_action.h
+++ b/Telegram/SourceFiles/history/view/history_view_send_action.h
@@ -35,6 +35,13 @@ public:
 		int outerWidth,
 		style::color color,
 		crl::time now);
+	void paintSpeaking(
+		Painter &p,
+		int x,
+		int y,
+		int outerWidth,
+		style::color color,
+		crl::time now);
 
 	bool updateNeedsAnimating(
 		crl::time now,
@@ -48,10 +55,12 @@ private:
 	const not_null<History*> _history;
 	const base::weak_ptr<Main::Session> _weak;
 	base::flat_map<not_null<UserData*>, crl::time> _typing;
+	base::flat_map<not_null<UserData*>, crl::time> _speaking;
 	base::flat_map<not_null<UserData*>, Api::SendProgress> _sendActions;
 	QString _sendActionString;
 	Ui::Text::String _sendActionText;
 	Ui::SendActionAnimation _sendActionAnimation;
+	Ui::SendActionAnimation _speakingAnimation;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
index 46d9d0ffe..487a3ea59 100644
--- a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
+++ b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_send_progress.h"
 #include "ui/effects/animation_value.h"
 #include "styles/style_widgets.h"
+#include "styles/style_dialogs.h"
 
 namespace Ui {
 namespace {
@@ -17,6 +18,58 @@ namespace {
 constexpr int kTypingDotsCount = 3;
 constexpr int kRecordArcsCount = 4;
 constexpr int kUploadArrowsCount = 3;
+constexpr int kSpeakingPartsCount = 3;
+constexpr auto kSpeakingDuration = 3200;
+constexpr auto kSpeakingFadeDuration = 400;
+
+} // namespace
+
+class SendActionAnimation::Impl {
+public:
+	using Type = Api::SendProgressType;
+
+	Impl(int period) : _period(period), _started(crl::now()) {
+	}
+
+	struct MetaData {
+		int index;
+		std::unique_ptr<Impl>(*creator)();
+	};
+	virtual const MetaData *metaData() const = 0;
+	bool supports(Type type) const;
+
+	virtual int width() const = 0;
+	virtual void paint(
+		Painter &p,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth,
+		crl::time now) = 0;
+
+	virtual void restartedAt(crl::time now) {
+	}
+	virtual bool finishNow() {
+		return true;
+	}
+
+	virtual ~Impl() = default;
+
+protected:
+	[[nodiscard]] crl::time started() const {
+		return _started;
+	}
+	[[nodiscard]] int frameTime(crl::time now) const {
+		return anim::Disabled() ? 0 : (std::max(now - _started, crl::time(0)) % _period);
+	}
+
+private:
+	int _period = 1;
+	crl::time _started = 0;
+
+};
+
+namespace {
 
 using ImplementationsMap = QMap<Api::SendProgressType, const SendActionAnimation::Impl::MetaData*>;
 NeverFreedPointer<ImplementationsMap> Implementations;
@@ -38,17 +91,17 @@ public:
 		return st::historySendActionTypingPosition.x() + kTypingDotsCount * st::historySendActionTypingDelta;
 	}
 
-private:
-	void paintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs) override;
+	void paint(Painter &p, style::color color, int x, int y, int outerWidth, crl::time now) override;
 
 };
 
 const TypingAnimation::MetaData TypingAnimation::kMeta = { 0, &TypingAnimation::create };
 
-void TypingAnimation::paintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs) {
+void TypingAnimation::paint(Painter &p, style::color color, int x, int y, int outerWidth, crl::time now) {
 	PainterHighQualityEnabler hq(p);
 	p.setPen(Qt::NoPen);
 	p.setBrush(color);
+	auto frameMs = frameTime(now);
 	auto position = QPointF(x + 0.5, y - 0.5) + st::historySendActionTypingPosition;
 	for (auto i = 0; i != kTypingDotsCount; ++i) {
 		auto r = st::historySendActionTypingSmallNumerator / st::historySendActionTypingDenominator;
@@ -83,15 +136,15 @@ public:
 		return st::historySendActionRecordPosition.x() + (kRecordArcsCount + 1) * st::historySendActionRecordDelta;
 	}
 
-private:
-	void paintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs) override;
+	void paint(Painter &p, style::color color, int x, int y, int outerWidth, crl::time now) override;
 
 };
 
 const RecordAnimation::MetaData RecordAnimation::kMeta = { 0, &RecordAnimation::create };
 
-void RecordAnimation::paintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs) {
+void RecordAnimation::paint(Painter &p, style::color color, int x, int y, int outerWidth, crl::time now) {
 	PainterHighQualityEnabler hq(p);
+	const auto frameMs = frameTime(now);
 	auto pen = color->p;
 	pen.setWidth(st::historySendActionRecordStrokeNumerator / st::historySendActionRecordDenominator);
 	pen.setJoinStyle(Qt::RoundJoin);
@@ -127,15 +180,15 @@ public:
 		return st::historySendActionUploadPosition.x() + (kUploadArrowsCount + 1) * st::historySendActionUploadDelta;
 	}
 
-private:
-	void paintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs) override;
+	void paint(Painter &p, style::color color, int x, int y, int outerWidth, crl::time now) override;
 
 };
 
 const UploadAnimation::MetaData UploadAnimation::kMeta = { 0, &UploadAnimation::create };
 
-void UploadAnimation::paintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs) {
+void UploadAnimation::paint(Painter &p, style::color color, int x, int y, int outerWidth, crl::time now) {
 	PainterHighQualityEnabler hq(p);
+	const auto frameMs = frameTime(now);
 	auto pen = color->p;
 	pen.setWidth(st::historySendActionUploadStrokeNumerator / st::historySendActionUploadDenominator);
 	pen.setJoinStyle(Qt::RoundJoin);
@@ -159,71 +212,237 @@ void UploadAnimation::paintFrame(Painter &p, style::color color, int x, int y, i
 	p.translate(-position);
 }
 
+class SpeakingAnimation : public SendActionAnimation::Impl {
+public:
+	SpeakingAnimation();
+
+	static const MetaData kMeta;
+	static std::unique_ptr<Impl> create() {
+		return std::make_unique<SpeakingAnimation>();
+	}
+	const MetaData *metaData() const override {
+		return &kMeta;
+	}
+
+	int width() const override {
+		return 4 * (st::dialogsSpeakingStrokeNumerator / st::dialogsSpeakingDenominator);
+	}
+
+	void restartedAt(crl::time now) override;
+	bool finishNow() override;
+
+	static void PaintIdle(Painter &p, style::color color, int x, int y, int outerWidth);
+
+	void paint(Painter &p, style::color color, int x, int y, int outerWidth, crl::time now) override;
+
+private:
+	static void PaintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs, float64 started);
+
+	crl::time _startStarted = 0;
+	crl::time _finishStarted = 0;
+
+};
+
+const SpeakingAnimation::MetaData SpeakingAnimation::kMeta = { 0, &SpeakingAnimation::create };
+
+SpeakingAnimation::SpeakingAnimation()
+: Impl(kSpeakingDuration)
+, _startStarted(crl::now()) {
+}
+
+void SpeakingAnimation::restartedAt(crl::time now) {
+	if (!_finishStarted) {
+		return;
+	}
+	const auto finishFinishes = _finishStarted + kSpeakingFadeDuration;
+	const auto leftToFinish = (finishFinishes - now);
+	if (leftToFinish > 0) {
+		_startStarted = now - leftToFinish;
+	} else {
+		_startStarted = now;
+	}
+	_finishStarted = 0;
+}
+
+bool SpeakingAnimation::finishNow() {
+	const auto now = crl::now();
+	if (_finishStarted) {
+		return (_finishStarted + kSpeakingFadeDuration <= now);
+	} else if (_startStarted >= now) {
+		return true;
+	}
+	const auto startFinishes = _startStarted + kSpeakingFadeDuration;
+	const auto leftToStart = (startFinishes - now);
+	if (leftToStart > 0) {
+		_finishStarted = now - leftToStart;
+	} else {
+		_finishStarted = now;
+	}
+	return false;
+}
+
+void SpeakingAnimation::PaintIdle(Painter &p, style::color color, int x, int y, int outerWidth) {
+	PaintFrame(p, color, x, y, outerWidth, 0, 0.);
+	PainterHighQualityEnabler hq(p);
+
+	const auto line = st::dialogsSpeakingStrokeNumerator / (2 * st::dialogsSpeakingDenominator);
+
+	p.setPen(Qt::NoPen);
+	p.setBrush(color);
+
+	const auto half = st::dialogsCallBadgeSize / 2.;
+	const auto center = QPointF(x + half, y + half);
+	auto middleSize = line;
+	auto sideSize = line;
+
+	auto left = center.x() - 4 * line;
+	p.drawRoundedRect(left, center.y() - line * 2, 2 * line, 4 * line, line, line);
+	left += 3 * line;
+	p.drawRoundedRect(left, center.y() - line * 2, 2 * line, 4 * line, line, line);
+	left += 3 * line;
+	p.drawRoundedRect(left, center.y() - line * 2, 2 * line, 4 * line, line, line);
+}
+
+void SpeakingAnimation::paint(Painter &p, style::color color, int x, int y, int outerWidth, crl::time now) {
+	const auto started = _finishStarted
+		? (1. - ((now - _finishStarted) / float64(kSpeakingFadeDuration)))
+		: (now - _startStarted) / float64(kSpeakingFadeDuration);
+	PaintFrame(p, color, x, y, outerWidth, frameTime(now), std::clamp(started, 0., 1.));
+}
+
+void SpeakingAnimation::PaintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs, float64 started) {
+	PainterHighQualityEnabler hq(p);
+
+	const auto line = st::dialogsSpeakingStrokeNumerator / (2 * st::dialogsSpeakingDenominator);
+
+	p.setPen(Qt::NoPen);
+	p.setBrush(color);
+
+	const auto duration = kSpeakingDuration;
+	const auto stageDuration = duration / 8;
+	const auto fullprogress = frameMs;
+	const auto stage = fullprogress / stageDuration;
+	const auto progress = (fullprogress - stage * stageDuration) / float64(stageDuration);
+	const auto half = st::dialogsCallBadgeSize / 2.;
+	const auto center = QPointF(x + half, y + half);
+	const auto middleSize = [&] {
+		if (!started) {
+			return 2 * line;
+		}
+		auto result = line;
+		switch (stage) {
+		case 0: result += 4 * line * progress; break;
+		case 1: result += 4 * line * (1. - progress); break;
+		case 2: result += 2 * line * progress; break;
+		case 3: result += 2 * line * (1. - progress); break;
+		case 4: result += 4 * line * progress; break;
+		case 5: result += 4 * line * (1. - progress); break;
+		case 6: result += 4 * line * progress; break;
+		case 7: result += 4 * line * (1. - progress); break;
+		}
+		return (started == 1.)
+			? result
+			: (started * result) + ((1. - started) * 2 * line);
+	}();
+	const auto sideSize = [&] {
+		if (!started) {
+			return 2 * line;
+		}
+		auto result = line;
+		switch (stage) {
+		case 0: result += 2 * line * (1. - progress); break;
+		case 1: result += 4 * line * progress; break;
+		case 2: result += 4 * line * (1. - progress); break;
+		case 3: result += 2 * line * progress; break;
+		case 4: result += 2 * line * (1. - progress); break;
+		case 5: result += 4 * line * progress; break;
+		case 6: result += 4 * line * (1. - progress); break;
+		case 7: result += 2 * line * progress; break;
+		}
+		return (started == 1.)
+			? result
+			: (started * result) + ((1. - started) * 2 * line);
+	}();
+
+	auto left = center.x() - 4 * line;
+	p.drawRoundedRect(left, center.y() - sideSize, 2 * line, 2 * sideSize, line, line);
+	left += 3 * line;
+	p.drawRoundedRect(left, center.y() - middleSize, 2 * line, 2 * middleSize, line, line);
+	left += 3 * line;
+	p.drawRoundedRect(left, center.y() - sideSize, 2 * line, 2 * sideSize, line, line);
+}
+
 void CreateImplementationsMap() {
 	if (Implementations) {
 		return;
 	}
 	using Type = Api::SendProgressType;
 	Implementations.createIfNull();
-	Type recordTypes[] = {
+	static constexpr auto kRecordTypes = {
 		Type::RecordVideo,
 		Type::RecordVoice,
 		Type::RecordRound,
 	};
-	for_const (auto type, recordTypes) {
+	for (const auto type : kRecordTypes) {
 		Implementations->insert(type, &RecordAnimation::kMeta);
 	}
-	Type uploadTypes[] = {
+	static constexpr auto kUploadTypes = {
 		Type::UploadFile,
 		Type::UploadPhoto,
 		Type::UploadVideo,
 		Type::UploadVoice,
 		Type::UploadRound,
 	};
-	for_const (auto type, uploadTypes) {
+	for (const auto type : kUploadTypes) {
 		Implementations->insert(type, &UploadAnimation::kMeta);
 	}
+	Implementations->insert(Type::Speaking, &SpeakingAnimation::kMeta);
 }
 
 } // namespace
 
+SendActionAnimation::SendActionAnimation() = default;
+
+SendActionAnimation::~SendActionAnimation() = default;
+
 bool SendActionAnimation::Impl::supports(Type type) const {
 	CreateImplementationsMap();
 	return Implementations->value(type, &TypingAnimation::kMeta) == metaData();
 }
 
-void SendActionAnimation::Impl::paint(
-		Painter &p,
-		style::color color,
-		int x,
-		int y,
-		int outerWidth,
-		crl::time ms) {
-	paintFrame(
-		p,
-		color,
-		x,
-		y,
-		outerWidth,
-		anim::Disabled() ? 0 : (qMax(ms - _started, crl::time(0)) % _period));
-}
-
-
 void SendActionAnimation::start(Type type) {
 	if (!_impl || !_impl->supports(type)) {
-		_impl = createByType(type);
+		_impl = CreateByType(type);
+	} else {
+		_impl->restartedAt(crl::now());
 	}
 }
 
-void SendActionAnimation::stop() {
-	_impl.reset();
+void SendActionAnimation::tryToFinish() {
+	if (!_impl) {
+		return;
+	} else if (_impl->finishNow()) {
+		_impl.reset();
+	}
 }
 
-std::unique_ptr<SendActionAnimation::Impl> SendActionAnimation::createByType(Type type) {
+int SendActionAnimation::width() const {
+	return _impl ? _impl->width() : 0;
+}
+
+void SendActionAnimation::paint(Painter &p, style::color color, int x, int y, int outerWidth, crl::time ms) const {
+	if (_impl) {
+		_impl->paint(p, color, x, y, outerWidth, ms);
+	}
+}
+
+void SendActionAnimation::PaintSpeakingIdle(Painter &p, style::color color, int x, int y, int outerWidth) {
+	SpeakingAnimation::PaintIdle(p, color, x, y, outerWidth);
+}
+
+auto SendActionAnimation::CreateByType(Type type) -> std::unique_ptr<Impl> {
 	CreateImplementationsMap();
 	return Implementations->value(type, &TypingAnimation::kMeta)->creator();
 }
 
-SendActionAnimation::~SendActionAnimation() = default;
-
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/effects/send_action_animations.h b/Telegram/SourceFiles/ui/effects/send_action_animations.h
index 502f59415..b24581d6f 100644
--- a/Telegram/SourceFiles/ui/effects/send_action_animations.h
+++ b/Telegram/SourceFiles/ui/effects/send_action_animations.h
@@ -16,60 +16,25 @@ namespace Ui {
 class SendActionAnimation {
 public:
 	using Type = Api::SendProgressType;
+	class Impl;
+
+	SendActionAnimation();
+	~SendActionAnimation();
 
 	void start(Type type);
-	void stop();
+	void tryToFinish();
 
-	int width() const {
-		return _impl ? _impl->width() : 0;
-	}
-	void paint(Painter &p, style::color color, int x, int y, int outerWidth, crl::time ms) {
-		if (_impl) {
-			_impl->paint(p, color, x, y, outerWidth, ms);
-		}
-	}
+	int width() const;
+	void paint(Painter &p, style::color color, int x, int y, int outerWidth, crl::time ms) const;
 
 	explicit operator bool() const {
 		return _impl != nullptr;
 	}
 
-	class Impl {
-	public:
-		using Type = Api::SendProgressType;
-
-		Impl(int period) : _period(period), _started(crl::now()) {
-		}
-
-		struct MetaData {
-			int index;
-			std::unique_ptr<Impl> (*creator)();
-		};
-		virtual const MetaData *metaData() const = 0;
-		bool supports(Type type) const;
-
-		virtual int width() const = 0;
-		void paint(
-			Painter &p,
-			style::color color,
-			int x,
-			int y,
-			int outerWidth,
-			crl::time ms);
-
-		virtual ~Impl() = default;
-
-	private:
-		virtual void paintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs) = 0;
-
-		int _period = 1;
-		crl::time _started = 0;
-
-	};
-
-	~SendActionAnimation();
+	static void PaintSpeakingIdle(Painter &p, style::color color, int x, int y, int outerWidth);
 
 private:
-	std::unique_ptr<Impl> createByType(Type type);
+	[[nodiscard]] static std::unique_ptr<Impl> CreateByType(Type type);
 
 	std::unique_ptr<Impl> _impl;
 
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 7fd90cb38..87ee83bc7 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 7fd90cb38b6b1069af43039f93c991fffaf8ddea
+Subproject commit 87ee83bc7336b4c814e2f0dc45261ff8e280cca0

From 101409d8669a280325cda1db6d00d7fbc9d873f3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 2 Dec 2020 15:25:30 +0300
Subject: [PATCH 220/370] Add animations to group call member mute status.

---
 Telegram/SourceFiles/calls/calls.style        |  30 +-
 .../SourceFiles/calls/calls_group_members.cpp | 277 ++++++++++++------
 Telegram/SourceFiles/calls/calls_top_bar.cpp  |   5 +
 Telegram/lib_ui                               |   2 +-
 4 files changed, 206 insertions(+), 108 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 5c65a556c..78000ea93 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -537,28 +537,32 @@ groupCallHeaderLabel: FlatLabel(defaultFlatLabel) {
 groupCallAddButtonPosition: point(10px, 7px);
 groupCallMembersWidthMax: 360px;
 
-groupCallInactiveButton: IconButton {
+groupCallActiveButton: IconButton {
 	width: 36px;
 	height: 52px;
 
-	icon: icon {{ "calls/group_calls_muted", groupCallMemberInactiveIcon }};
-	iconOver: icon {{ "calls/group_calls_muted", groupCallMemberInactiveIcon }};
+	icon: icon {{ "calls/group_calls_unmuted", groupCallMemberInactiveIcon }};
+	iconOver: icon {{ "calls/group_calls_unmuted", groupCallMemberInactiveIcon }};
 	iconPosition: point(-1px, -1px);
 
 	ripple: groupCallRipple;
 	rippleAreaPosition: point(0px, 8px);
 	rippleAreaSize: 36px;
 }
-groupCallActiveButton: IconButton(groupCallInactiveButton) {
-	icon: icon {{ "calls/group_calls_unmuted", groupCallMemberInactiveIcon }};
-	iconOver: icon {{ "calls/group_calls_unmuted", groupCallMemberInactiveIcon }};
-}
-groupCallMutedButton: IconButton(groupCallInactiveButton) {
-	icon: icon {{ "calls/group_calls_muted", groupCallMemberMutedIcon }};
-	iconOver: icon {{ "calls/group_calls_muted", groupCallMemberMutedIcon }};
-}
 groupCallMemberButtonSkip: 10px;
 
+groupCallMemberInactiveCrossLine: CrossLineAnimation {
+	fg: groupCallMemberInactiveIcon;
+	icon: icon {{ "calls/group_calls_unmuted", groupCallMemberInactiveIcon }};
+	startPosition: point(5px, 2px);
+	endPosition: point(20px, 17px);
+	stroke: 2px;
+}
+groupCallMemberColoredCrossLine: CrossLineAnimation(groupCallMemberInactiveCrossLine) {
+	fg: groupCallMemberMutedIcon;
+	icon: icon {{ "calls/group_calls_unmuted", groupCallMemberActiveIcon }};
+}
+
 groupCallSettings: CallButton(callMicrophoneMute) {
 	button: IconButton(callButton) {
 		iconPosition: point(-1px, 22px);
@@ -661,8 +665,8 @@ groupCallBoxLabel: FlatLabel(boxLabel) {
 	textFg: groupCallMembersFg;
 }
 
-groupCallRowBlobMinRadius: 28px;
-groupCallRowBlobMaxRadius: 30px;
+groupCallRowBlobMinRadius: 27px;
+groupCallRowBlobMaxRadius: 29px;
 
 callTopBarMuteCrossLine: CrossLineAnimation {
 	fg: callBarFg;
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index d8a1a8088..618b3959c 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/popup_menu.h"
 #include "ui/text/text_utilities.h"
 #include "ui/effects/ripple_animation.h"
+#include "ui/effects/cross_line.h"
 #include "core/application.h" // Core::App().domain, Core::App().activeWindow.
 #include "main/main_domain.h" // Core::App().domain().activate.
 #include "main/main_session.h"
@@ -61,9 +62,23 @@ auto RowBlobs() -> std::array<Ui::Paint::Blobs::BlobData, 2> {
 	} };
 }
 
+class Row;
+
+class RowDelegate {
+public:
+	virtual bool rowCanMuteMembers() = 0;
+	virtual void rowUpdateRow(not_null<Row*> row) = 0;
+	virtual void rowPaintIcon(
+		Painter &p,
+		QRect rect,
+		float64 speaking,
+		float64 active,
+		float64 muted) = 0;
+};
+
 class Row final : public PeerListRow {
 public:
-	Row(not_null<ChannelData*> channel, not_null<UserData*> user);
+	Row(not_null<RowDelegate*> delegate, not_null<UserData*> user);
 
 	enum class State {
 		Active,
@@ -91,10 +106,12 @@ public:
 		return 0;
 	}
 	QSize actionSize() const override {
-		return QSize(_st->width, _st->height);
+		return QSize(
+			st::groupCallActiveButton.width,
+			st::groupCallActiveButton.height);
 	}
 	bool actionDisabled() const override {
-		return peer()->isSelf() || !_channel->canManageCall();
+		return peer()->isSelf() || !_delegate->rowCanMuteMembers();
 	}
 	QMargins actionMargins() const override {
 		return QMargins(
@@ -114,8 +131,8 @@ public:
 	auto generatePaintUserpicCallback() -> PaintRoundImageCallback override;
 
 private:
-	struct SpeakingAnimation {
-		SpeakingAnimation(
+	struct BlobsAnimation {
+		BlobsAnimation(
 			std::vector<Ui::Paint::Blobs::BlobData> blobDatas,
 			float levelDuration,
 			float maxLevel)
@@ -138,23 +155,20 @@ private:
 	};
 	void refreshStatus() override;
 	void setSpeaking(bool speaking);
+	void setState(State state);
 	void setSsrc(uint32 ssrc);
 
-	[[nodiscard]] static State ComputeState(
-		not_null<ChannelData*> channel,
-		not_null<UserData*> user);
-	[[nodiscard]] static not_null<const style::IconButton*> ComputeIconStyle(
-		State state);
-
 	void ensureUserpicCache(
 		std::shared_ptr<Data::CloudImageView> &view,
 		int size);
 
+	const not_null<RowDelegate*> _delegate;
 	State _state = State::Inactive;
-	not_null<ChannelData*> _channel;
-	not_null<const style::IconButton*> _st;
 	std::unique_ptr<Ui::RippleAnimation> _actionRipple;
-	std::unique_ptr<SpeakingAnimation> _speakingAnimation;
+	std::unique_ptr<BlobsAnimation> _blobsAnimation;
+	Ui::Animations::Simple _speakingAnimation; // For gray-red/green icon.
+	Ui::Animations::Simple _mutedAnimation; // For gray/red icon.
+	Ui::Animations::Simple _activeAnimation; // For icon cross animation.
 	uint32 _ssrc = 0;
 	bool _speaking = false;
 
@@ -162,6 +176,7 @@ private:
 
 class MembersController final
 	: public PeerListController
+	, public RowDelegate
 	, public base::has_weak_ptr {
 public:
 	MembersController(
@@ -186,6 +201,15 @@ public:
 	[[nodiscard]] auto kickMemberRequests() const
 		-> rpl::producer<not_null<UserData*>>;
 
+	bool rowCanMuteMembers() override;
+	void rowUpdateRow(not_null<Row*> row) override;
+	void rowPaintIcon(
+		Painter &p,
+		QRect rect,
+		float64 speaking,
+		float64 active,
+		float64 muted) override;
+
 private:
 	[[nodiscard]] std::unique_ptr<Row> createSelfRow();
 	[[nodiscard]] std::unique_ptr<Row> createRow(
@@ -226,15 +250,16 @@ private:
 	base::flat_map<uint32, not_null<Row*>> _speakingRowBySsrc;
 	Ui::Animations::Basic _speakingAnimation;
 
+	Ui::CrossLineAnimation _inactiveCrossLine;
+	Ui::CrossLineAnimation _coloredCrossLine;
+
 	rpl::lifetime _lifetime;
 
 };
 
-Row::Row(not_null<ChannelData*> channel, not_null<UserData*> user)
+Row::Row(not_null<RowDelegate*> delegate, not_null<UserData*> user)
 : PeerListRow(user)
-, _state(ComputeState(channel, user))
-, _channel(channel)
-, _st(ComputeIconStyle(_state)) {
+, _delegate(delegate) {
 	refreshStatus();
 }
 
@@ -246,19 +271,18 @@ void Row::updateState(const Data::GroupCall::Participant *participant) {
 		} else {
 			setCustomStatus(QString());
 		}
-		_state = State::Inactive;
+		setState(State::Inactive);
 		setSpeaking(false);
 	} else if (!participant->muted) {
-		_state = State::Active;
+		setState(State::Active);
 		setSpeaking(participant->speaking && participant->ssrc != 0);
 	} else if (participant->canSelfUnmute) {
-		_state = State::Inactive;
+		setState(State::Inactive);
 		setSpeaking(false);
 	} else {
-		_state = State::Muted;
+		setState(State::Muted);
 		setSpeaking(false);
 	}
-	_st = ComputeIconStyle(_state);
 }
 
 void Row::setSpeaking(bool speaking) {
@@ -266,74 +290,104 @@ void Row::setSpeaking(bool speaking) {
 		return;
 	}
 	_speaking = speaking;
+	_speakingAnimation.start(
+		[=] { _delegate->rowUpdateRow(this); },
+		_speaking ? 0. : 1.,
+		_speaking ? 1. : 0.,
+		st::widgetFadeDuration);
 	if (!_speaking) {
-		_speakingAnimation = nullptr;
-	} else if (!_speakingAnimation) {
-		_speakingAnimation = std::make_unique<SpeakingAnimation>(
+		_blobsAnimation = nullptr;
+	} else if (!_blobsAnimation) {
+		_blobsAnimation = std::make_unique<BlobsAnimation>(
 			RowBlobs() | ranges::to_vector,
 			kLevelDuration,
 			kMaxLevel);
-		_speakingAnimation->lastTime = crl::now();
+		_blobsAnimation->lastTime = crl::now();
 		updateLevel(GroupCall::kSpeakLevelThreshold);
 	}
 	refreshStatus();
 }
 
+void Row::setState(State state) {
+	if (_state == state) {
+		return;
+	}
+	const auto wasActive = (_state == State::Active);
+	const auto wasMuted = (_state == State::Muted);
+	_state = state;
+	const auto nowActive = (_state == State::Active);
+	const auto nowMuted = (_state == State::Muted);
+	if (nowActive != wasActive) {
+		_activeAnimation.start(
+			[=] { _delegate->rowUpdateRow(this); },
+			nowActive ? 0. : 1.,
+			nowActive ? 1. : 0.,
+			st::widgetFadeDuration);
+	}
+	if (nowMuted != wasMuted) {
+		_mutedAnimation.start(
+			[=] { _delegate->rowUpdateRow(this); },
+			nowMuted ? 0. : 1.,
+			nowMuted ? 1. : 0.,
+			st::widgetFadeDuration);
+	}
+}
+
 void Row::setSsrc(uint32 ssrc) {
 	_ssrc = ssrc;
 }
 
 void Row::updateLevel(float level) {
-	Expects(_speakingAnimation != nullptr);
+	Expects(_blobsAnimation != nullptr);
 
 	if (level >= GroupCall::kSpeakLevelThreshold) {
-		_speakingAnimation->lastSpeakingUpdateTime = crl::now();
+		_blobsAnimation->lastSpeakingUpdateTime = crl::now();
 	}
-	_speakingAnimation->blobs.setLevel(level);
+	_blobsAnimation->blobs.setLevel(level);
 }
 
 void Row::updateBlobAnimation(crl::time now) {
-	Expects(_speakingAnimation != nullptr);
+	Expects(_blobsAnimation != nullptr);
 
-	const auto speakingFinishesAt = _speakingAnimation->lastSpeakingUpdateTime
+	const auto speakingFinishesAt = _blobsAnimation->lastSpeakingUpdateTime
 		+ Data::GroupCall::kSpeakStatusKeptFor;
 	const auto speakingStartsFinishing = speakingFinishesAt
 		- kBlobsEnterDuration;
 	const auto speakingFinishes = (speakingStartsFinishing < now);
 	if (speakingFinishes) {
-		_speakingAnimation->enter = std::clamp(
+		_blobsAnimation->enter = std::clamp(
 			(speakingFinishesAt - now) / float64(kBlobsEnterDuration),
 			0.,
 			1.);
-	} else if (_speakingAnimation->enter < 1.) {
-		_speakingAnimation->enter = std::clamp(
-			(_speakingAnimation->enter
-				+ ((now - _speakingAnimation->lastTime)
+	} else if (_blobsAnimation->enter < 1.) {
+		_blobsAnimation->enter = std::clamp(
+			(_blobsAnimation->enter
+				+ ((now - _blobsAnimation->lastTime)
 					/ float64(kBlobsEnterDuration))),
 			0.,
 			1.);
 	}
-	_speakingAnimation->blobs.updateLevel(now - _speakingAnimation->lastTime);
-	_speakingAnimation->lastTime = now;
+	_blobsAnimation->blobs.updateLevel(now - _blobsAnimation->lastTime);
+	_blobsAnimation->lastTime = now;
 }
 
 void Row::ensureUserpicCache(
 		std::shared_ptr<Data::CloudImageView> &view,
 		int size) {
-	Expects(_speakingAnimation != nullptr);
+	Expects(_blobsAnimation != nullptr);
 
 	const auto user = peer();
 	const auto key = user->userpicUniqueKey(view);
 	const auto full = QSize(size, size) * kWideScale * cIntRetinaFactor();
-	auto &cache = _speakingAnimation->userpicCache;
+	auto &cache = _blobsAnimation->userpicCache;
 	if (cache.isNull()) {
 		cache = QImage(full, QImage::Format_ARGB32_Premultiplied);
 		cache.setDevicePixelRatio(cRetinaFactor());
-	} else if (_speakingAnimation->userpicKey == key
+	} else if (_blobsAnimation->userpicKey == key
 		&& cache.size() == full) {
 		return;
 	}
-	_speakingAnimation->userpicKey = key;
+	_blobsAnimation->userpicKey = key;
 	cache.fill(Qt::transparent);
 	{
 		Painter p(&cache);
@@ -345,17 +399,17 @@ void Row::ensureUserpicCache(
 auto Row::generatePaintUserpicCallback() -> PaintRoundImageCallback {
 	auto userpic = ensureUserpicView();
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
-		if (_speakingAnimation) {
+		if (_blobsAnimation) {
 			const auto shift = QPointF(x + size / 2., y + size / 2.);
 			p.translate(shift);
-			_speakingAnimation->blobs.paint(p, st::groupCallMemberActiveStatus);
+			_blobsAnimation->blobs.paint(p, st::groupCallMemberActiveStatus);
 			p.translate(-shift);
 			p.setOpacity(1.);
 
-			const auto enter = _speakingAnimation->enter;
+			const auto enter = _blobsAnimation->enter;
 			const auto &minScale = kUserpicMinScale;
 			const auto scaleUserpic = minScale
-				+ (1. - minScale) * _speakingAnimation->blobs.currentLevel();
+				+ (1. - minScale) * _blobsAnimation->blobs.currentLevel();
 			const auto scale = scaleUserpic * enter + 1. * (1. - enter);
 			if (scale == 1.) {
 				peer()->paintUserpicLeft(p, userpic, x, y, outerWidth, size);
@@ -376,7 +430,7 @@ auto Row::generatePaintUserpicCallback() -> PaintRoundImageCallback {
 				auto margins = QMargins(shrink, shrink, shrink, shrink);
 				p.drawImage(
 					target.marginsAdded(margins),
-					_speakingAnimation->userpicCache);
+					_blobsAnimation->userpicCache);
 			}
 		} else {
 			peer()->paintUserpicLeft(p, userpic, x, y, outerWidth, size);
@@ -395,8 +449,8 @@ void Row::paintAction(
 	if (_actionRipple) {
 		_actionRipple->paint(
 			p,
-			x + _st->rippleAreaPosition.x(),
-			y + _st->rippleAreaPosition.y(),
+			x + st::groupCallActiveButton.rippleAreaPosition.x(),
+			y + st::groupCallActiveButton.rippleAreaPosition.y(),
 			outerWidth);
 		if (_actionRipple->empty()) {
 			_actionRipple.reset();
@@ -408,11 +462,12 @@ void Row::paintAction(
 		size.width(),
 		size.height(),
 		outerWidth);
-	if (_speaking) {
-		_st->icon.paintInCenter(p, iconRect, st::groupCallMemberActiveIcon->c);
-	} else {
-		_st->icon.paintInCenter(p, iconRect);
-	}
+	const auto speaking = _speakingAnimation.value(_speaking ? 1. : 0.);
+	const auto active = _activeAnimation.value(
+		(_state == State::Active) ? 1. : 0.);
+	const auto muted = _mutedAnimation.value(
+		(_state == State::Muted) ? 1. : 0.);
+	_delegate->rowPaintIcon(p, iconRect, speaking, active, muted);
 }
 
 void Row::refreshStatus() {
@@ -423,48 +478,17 @@ void Row::refreshStatus() {
 		_speaking);
 }
 
-Row::State Row::ComputeState(
-		not_null<ChannelData*> channel,
-		not_null<UserData*> user) {
-	const auto call = channel->call();
-	if (!call) {
-		return State::Inactive;
-	}
-	const auto &participants = call->participants();
-	const auto i = ranges::find(
-		participants,
-		user,
-		&Data::GroupCall::Participant::user);
-	if (i == end(participants)) {
-		return State::Inactive;
-	}
-	return !i->muted
-		? State::Active
-		: i->canSelfUnmute
-		? State::Inactive
-		: State::Muted;
-}
-
-not_null<const style::IconButton*> Row::ComputeIconStyle(
-		State state) {
-	switch (state) {
-	case State::Inactive: return &st::groupCallInactiveButton;
-	case State::Active: return &st::groupCallActiveButton;
-	case State::Muted: return &st::groupCallMutedButton;
-	}
-	Unexpected("State in Row::ComputeIconStyle.");
-}
-
 void Row::addActionRipple(QPoint point, Fn<void()> updateCallback) {
 	if (!_actionRipple) {
-		auto mask = Ui::RippleAnimation::ellipseMask(
-			QSize(_st->rippleAreaSize, _st->rippleAreaSize));
+		auto mask = Ui::RippleAnimation::ellipseMask(QSize(
+			st::groupCallActiveButton.rippleAreaSize,
+			st::groupCallActiveButton.rippleAreaSize));
 		_actionRipple = std::make_unique<Ui::RippleAnimation>(
-			_st->ripple,
+			st::groupCallActiveButton.ripple,
 			std::move(mask),
 			std::move(updateCallback));
 	}
-	_actionRipple->add(point - _st->rippleAreaPosition);
+	_actionRipple->add(point - st::groupCallActiveButton.rippleAreaPosition);
 }
 
 void Row::stopLastActionRipple() {
@@ -478,9 +502,17 @@ MembersController::MembersController(
 	not_null<QWidget*> menuParent)
 : _call(call)
 , _channel(call->channel())
-, _menuParent(menuParent) {
+, _menuParent(menuParent)
+, _inactiveCrossLine(st::groupCallMemberInactiveCrossLine)
+, _coloredCrossLine(st::groupCallMemberColoredCrossLine) {
 	setupListChangeViewers(call);
 
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		_inactiveCrossLine.invalidate();
+		_coloredCrossLine.invalidate();
+	}, _lifetime);
+
 	_speakingAnimation.init([=](crl::time now) {
 		for (const auto [ssrc, row] : _speakingRowBySsrc) {
 			row->updateBlobAnimation(now);
@@ -746,6 +778,63 @@ auto MembersController::toggleMuteRequests() const
 	return _toggleMuteRequests.events();
 }
 
+bool MembersController::rowCanMuteMembers() {
+	return _channel->canManageCall();
+}
+
+void MembersController::rowUpdateRow(not_null<Row*> row) {
+	delegate()->peerListUpdateRow(row);
+}
+
+void MembersController::rowPaintIcon(
+		Painter &p,
+		QRect rect,
+		float64 speaking,
+		float64 active,
+		float64 muted) {
+	const auto &greenIcon = st::groupCallMemberColoredCrossLine.icon;
+	const auto left = rect.x() + (rect.width() - greenIcon.width()) / 2;
+	const auto top = rect.y() + (rect.height() - greenIcon.height()) / 2;
+	if (speaking == 1.) {
+		// Just green icon, no cross, no coloring.
+		greenIcon.paintInCenter(p, rect);
+		return;
+	} else if (speaking == 0.) {
+		if (active == 1.) {
+			// Just gray icon, no cross, no coloring.
+			st::groupCallMemberInactiveCrossLine.icon.paintInCenter(p, rect);
+			return;
+		} else if (active == 0.) {
+			if (muted == 1.) {
+				// Red crossed icon, colorized once, cached as last frame.
+				_coloredCrossLine.paint(
+					p,
+					left,
+					top,
+					1.,
+					st::groupCallMemberMutedIcon->c);
+				return;
+			} else if (muted == 0.) {
+				// Gray crossed icon, no coloring, cached as last frame.
+				_inactiveCrossLine.paint(p, left, top, 1.);
+				return;
+			}
+		}
+	}
+	const auto activeInactiveColor = anim::color(
+		st::groupCallMemberInactiveIcon,
+		st::groupCallMemberActiveIcon,
+		speaking);
+	const auto iconColor = anim::color(
+		activeInactiveColor,
+		st::groupCallMemberMutedIcon,
+		muted);
+
+	// Don't use caching of the last frame, because 'muted' may animate color.
+	const auto crossProgress = std::min(1. - active, 0.9999);
+	_inactiveCrossLine.paint(p, left, top, crossProgress, iconColor);
+}
+
 auto MembersController::kickMemberRequests() const
 -> rpl::producer<not_null<UserData*>>{
 	return _kickMemberRequests.events();
@@ -854,14 +943,14 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 
 std::unique_ptr<Row> MembersController::createSelfRow() {
 	const auto self = _channel->session().user();
-	auto result = std::make_unique<Row>(_channel, self);
+	auto result = std::make_unique<Row>(this, self);
 	updateRow(result.get(), nullptr);
 	return result;
 }
 
 std::unique_ptr<Row> MembersController::createRow(
 		const Data::GroupCall::Participant &participant) {
-	auto result = std::make_unique<Row>(_channel, participant.user);
+	auto result = std::make_unique<Row>(this, participant.user);
 	updateRow(result.get(), &participant);
 	return result;
 }
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 07a9f72b0..2b9cc6c7a 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -108,6 +108,11 @@ public:
 	, _crossLineMuteAnimation(st::callTopBarMuteCrossLine) {
 		resize(_st.width, _st.height);
 		installEventFilter(this);
+
+		style::PaletteChanged(
+		) | rpl::start_with_next([=] {
+			_crossLineMuteAnimation.invalidate();
+		}, lifetime());
 	}
 
 	void setProgress(float64 progress) {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 87ee83bc7..ab4ad89c4 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 87ee83bc7336b4c814e2f0dc45261ff8e280cca0
+Subproject commit ab4ad89c4c709b2ec0f8296451d49c99d2ae4372

From 4a20a4d739363793750cd72dd51e9490467bec37 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 3 Dec 2020 00:16:26 +0300
Subject: [PATCH 221/370] Fixed drawing of voice chat indicator for non-default
 scales.

---
 .../ui/effects/send_action_animations.cpp     | 101 ++++++++++++------
 1 file changed, 69 insertions(+), 32 deletions(-)

diff --git a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
index 487a3ea59..6762bd84d 100644
--- a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
+++ b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
@@ -225,25 +225,47 @@ public:
 	}
 
 	int width() const override {
-		return 4 * (st::dialogsSpeakingStrokeNumerator / st::dialogsSpeakingDenominator);
+		const auto &numerator = st::dialogsSpeakingStrokeNumerator;
+		const auto &denominator = st::dialogsSpeakingDenominator;
+		return 4 * (numerator / denominator);
 	}
 
 	void restartedAt(crl::time now) override;
 	bool finishNow() override;
 
-	static void PaintIdle(Painter &p, style::color color, int x, int y, int outerWidth);
+	static void PaintIdle(
+		Painter &p,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth);
 
-	void paint(Painter &p, style::color color, int x, int y, int outerWidth, crl::time now) override;
+	void paint(
+		Painter &p,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth,
+		crl::time now) override;
 
 private:
-	static void PaintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs, float64 started);
+	static void PaintFrame(
+		Painter &p,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth,
+		int frameMs,
+		float64 started);
 
 	crl::time _startStarted = 0;
 	crl::time _finishStarted = 0;
 
 };
 
-const SpeakingAnimation::MetaData SpeakingAnimation::kMeta = { 0, &SpeakingAnimation::create };
+const SpeakingAnimation::MetaData SpeakingAnimation::kMeta = {
+	0,
+	&SpeakingAnimation::create };
 
 SpeakingAnimation::SpeakingAnimation()
 : Impl(kSpeakingDuration)
@@ -281,39 +303,41 @@ bool SpeakingAnimation::finishNow() {
 	return false;
 }
 
-void SpeakingAnimation::PaintIdle(Painter &p, style::color color, int x, int y, int outerWidth) {
+void SpeakingAnimation::PaintIdle(
+		Painter &p,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth) {
 	PaintFrame(p, color, x, y, outerWidth, 0, 0.);
-	PainterHighQualityEnabler hq(p);
-
-	const auto line = st::dialogsSpeakingStrokeNumerator / (2 * st::dialogsSpeakingDenominator);
-
-	p.setPen(Qt::NoPen);
-	p.setBrush(color);
-
-	const auto half = st::dialogsCallBadgeSize / 2.;
-	const auto center = QPointF(x + half, y + half);
-	auto middleSize = line;
-	auto sideSize = line;
-
-	auto left = center.x() - 4 * line;
-	p.drawRoundedRect(left, center.y() - line * 2, 2 * line, 4 * line, line, line);
-	left += 3 * line;
-	p.drawRoundedRect(left, center.y() - line * 2, 2 * line, 4 * line, line, line);
-	left += 3 * line;
-	p.drawRoundedRect(left, center.y() - line * 2, 2 * line, 4 * line, line, line);
 }
 
-void SpeakingAnimation::paint(Painter &p, style::color color, int x, int y, int outerWidth, crl::time now) {
+void SpeakingAnimation::paint(
+		Painter &p,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth,
+		crl::time now) {
 	const auto started = _finishStarted
 		? (1. - ((now - _finishStarted) / float64(kSpeakingFadeDuration)))
 		: (now - _startStarted) / float64(kSpeakingFadeDuration);
-	PaintFrame(p, color, x, y, outerWidth, frameTime(now), std::clamp(started, 0., 1.));
+	const auto progress = std::clamp(started, 0., 1.);
+	PaintFrame(p, color, x, y, outerWidth, frameTime(now), progress);
 }
 
-void SpeakingAnimation::PaintFrame(Painter &p, style::color color, int x, int y, int outerWidth, int frameMs, float64 started) {
+void SpeakingAnimation::PaintFrame(
+		Painter &p,
+		style::color color,
+		int x,
+		int y,
+		int outerWidth,
+		int frameMs,
+		float64 started) {
 	PainterHighQualityEnabler hq(p);
 
-	const auto line = st::dialogsSpeakingStrokeNumerator / (2 * st::dialogsSpeakingDenominator);
+	const auto line = st::dialogsSpeakingStrokeNumerator
+		/ (2 * st::dialogsSpeakingDenominator);
 
 	p.setPen(Qt::NoPen);
 	p.setBrush(color);
@@ -322,7 +346,8 @@ void SpeakingAnimation::PaintFrame(Painter &p, style::color color, int x, int y,
 	const auto stageDuration = duration / 8;
 	const auto fullprogress = frameMs;
 	const auto stage = fullprogress / stageDuration;
-	const auto progress = (fullprogress - stage * stageDuration) / float64(stageDuration);
+	const auto progress = (fullprogress - stage * stageDuration)
+		/ float64(stageDuration);
 	const auto half = st::dialogsCallBadgeSize / 2.;
 	const auto center = QPointF(x + half, y + half);
 	const auto middleSize = [&] {
@@ -364,12 +389,24 @@ void SpeakingAnimation::PaintFrame(Painter &p, style::color color, int x, int y,
 			: (started * result) + ((1. - started) * 2 * line);
 	}();
 
+	const auto drawRoundedRect = [&](float left, float size) {
+		const auto top = center.y() - size;
+		const auto w = 2 * line;
+		const auto h = 2 * size;
+
+		if (left == (int)left) {
+			p.drawRoundedRect(left, top, w, h, line, line);
+		} else {
+			p.drawRoundedRect(QRectF(left, top, w, h), line, line);
+		}
+	};
+
 	auto left = center.x() - 4 * line;
-	p.drawRoundedRect(left, center.y() - sideSize, 2 * line, 2 * sideSize, line, line);
+	drawRoundedRect(left, sideSize);
 	left += 3 * line;
-	p.drawRoundedRect(left, center.y() - middleSize, 2 * line, 2 * middleSize, line, line);
+	drawRoundedRect(left, middleSize);
 	left += 3 * line;
-	p.drawRoundedRect(left, center.y() - sideSize, 2 * line, 2 * sideSize, line, line);
+	drawRoundedRect(left, sideSize);
 }
 
 void CreateImplementationsMap() {

From a57d23f7d9d82a57020689fa34eb5f690bb77030 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 3 Dec 2020 19:34:18 +0300
Subject: [PATCH 222/370] Added ability to handle application deactivating.

---
 Telegram/SourceFiles/core/application.cpp | 32 ++++++++++++++---------
 Telegram/SourceFiles/core/application.h   |  1 +
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 8058a0f32..d27610990 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "base/timer.h"
 #include "base/concurrent_timer.h"
+#include "base/qt_signal_producer.h"
 #include "base/unixtime.h"
 #include "core/update_checker.h"
 #include "core/shortcuts.h"
@@ -245,11 +246,15 @@ void Application::run() {
 	}, _window->widget()->lifetime());
 
 	QCoreApplication::instance()->installEventFilter(this);
-	connect(
-		static_cast<QGuiApplication*>(QCoreApplication::instance()),
-		&QGuiApplication::applicationStateChanged,
-		this,
-		&Application::stateChanged);
+
+	appDeactivated(
+	) | rpl::start_with_next([=](bool deactivated) {
+		if (deactivated) {
+			handleAppDeactivated();
+		} else {
+			handleAppActivated();
+		}
+	}, _lifetime);
 
 	DEBUG_LOG(("Application Info: window created..."));
 
@@ -633,14 +638,6 @@ void Application::checkLocalTime() {
 	}
 }
 
-void Application::stateChanged(Qt::ApplicationState state) {
-	if (state == Qt::ApplicationActive) {
-		handleAppActivated();
-	} else {
-		handleAppDeactivated();
-	}
-}
-
 void Application::handleAppActivated() {
 	checkLocalTime();
 	if (_window) {
@@ -655,6 +652,15 @@ void Application::handleAppDeactivated() {
 	Ui::Tooltip::Hide();
 }
 
+rpl::producer<bool> Application::appDeactivated() const {
+	return base::qt_signal_producer(
+		static_cast<QGuiApplication*>(QCoreApplication::instance()),
+		&QGuiApplication::applicationStateChanged
+	) | rpl::map([=](Qt::ApplicationState state) {
+		return (state != Qt::ApplicationActive);
+	});
+}
+
 void Application::call_handleObservables() {
 	base::HandleObservables();
 }
diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h
index aba9460c6..059e33bf4 100644
--- a/Telegram/SourceFiles/core/application.h
+++ b/Telegram/SourceFiles/core/application.h
@@ -271,6 +271,7 @@ public:
 
 	void handleAppActivated();
 	void handleAppDeactivated();
+	[[nodiscard]] rpl::producer<bool> appDeactivated() const;
 
 	void switchDebugMode();
 	void switchFreeType();

From 79d5a49e7c73fece88ada14e3023bc9a474b6404 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 3 Dec 2020 19:34:51 +0300
Subject: [PATCH 223/370] Added hiding of Blob animations at application
 deactivating.

---
 .../SourceFiles/calls/calls_group_members.cpp | 26 +++++++++++++++++++
 .../SourceFiles/calls/calls_group_panel.cpp   |  1 +
 Telegram/SourceFiles/core/application.cpp     |  4 +--
 Telegram/SourceFiles/core/application.h       |  2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 618b3959c..15de07f96 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -250,6 +250,9 @@ private:
 	base::flat_map<uint32, not_null<Row*>> _speakingRowBySsrc;
 	Ui::Animations::Basic _speakingAnimation;
 
+	crl::time _speakingAnimationHideLastTime = 0;
+	bool _skipRowLevelUpdate = false;
+
 	Ui::CrossLineAnimation _inactiveCrossLine;
 	Ui::CrossLineAnimation _coloredCrossLine;
 
@@ -513,7 +516,27 @@ MembersController::MembersController(
 		_coloredCrossLine.invalidate();
 	}, _lifetime);
 
+	Core::App().appDeactivates(
+	) | rpl::start_with_next([=](bool hide) {
+		_speakingAnimationHideLastTime = hide ? crl::now() : 0;
+		for (const auto [_, row] : _speakingRowBySsrc) {
+			if (hide) {
+				row->updateLevel(0.);
+			}
+			updateRowLevel(row, 0.);
+			if (!hide && !_speakingAnimation.animating()) {
+				_speakingAnimation.start();
+			}
+		}
+		_skipRowLevelUpdate = hide;
+	}, _lifetime);
+
 	_speakingAnimation.init([=](crl::time now) {
+		if (const auto &last = _speakingAnimationHideLastTime; (last > 0)
+			&& (now - last >= Ui::Paint::Blobs::kHideBlobsDuration)) {
+			_speakingAnimation.stop();
+			return false;
+		}
 		for (const auto [ssrc, row] : _speakingRowBySsrc) {
 			row->updateBlobAnimation(now);
 			delegate()->peerListUpdateRow(row);
@@ -683,6 +706,9 @@ void MembersController::removeRow(not_null<Row*> row) {
 void MembersController::updateRowLevel(
 		not_null<Row*> row,
 		float level) {
+	if (_skipRowLevelUpdate) {
+		return;
+	}
 	row->updateLevel(level);
 }
 
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 6543b976d..6e66af6c0 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -223,6 +223,7 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 , _settings(widget(), st::groupCallSettings)
 , _mute(std::make_unique<Ui::CallMuteButton>(
 	widget(),
+	Core::App().appDeactivates(),
 	Ui::CallMuteButtonState{
 		.text = tr::lng_group_call_connecting(tr::now),
 		.type = Ui::CallMuteButtonType::Connecting,
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index d27610990..211316c7b 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -247,7 +247,7 @@ void Application::run() {
 
 	QCoreApplication::instance()->installEventFilter(this);
 
-	appDeactivated(
+	appDeactivates(
 	) | rpl::start_with_next([=](bool deactivated) {
 		if (deactivated) {
 			handleAppDeactivated();
@@ -652,7 +652,7 @@ void Application::handleAppDeactivated() {
 	Ui::Tooltip::Hide();
 }
 
-rpl::producer<bool> Application::appDeactivated() const {
+rpl::producer<bool> Application::appDeactivates() const {
 	return base::qt_signal_producer(
 		static_cast<QGuiApplication*>(QCoreApplication::instance()),
 		&QGuiApplication::applicationStateChanged
diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h
index 059e33bf4..1238bd39d 100644
--- a/Telegram/SourceFiles/core/application.h
+++ b/Telegram/SourceFiles/core/application.h
@@ -271,7 +271,7 @@ public:
 
 	void handleAppActivated();
 	void handleAppDeactivated();
-	[[nodiscard]] rpl::producer<bool> appDeactivated() const;
+	[[nodiscard]] rpl::producer<bool> appDeactivates() const;
 
 	void switchDebugMode();
 	void switchFreeType();

From f4dfd738eca4bd7a187ecc88a6705c6e24644df8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 3 Dec 2020 21:10:08 +0300
Subject: [PATCH 224/370] Added hiding of Blob animations at animations
 disabling.

---
 .../SourceFiles/calls/calls_group_members.cpp     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 15de07f96..fb48433f6 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -516,14 +516,19 @@ MembersController::MembersController(
 		_coloredCrossLine.invalidate();
 	}, _lifetime);
 
-	Core::App().appDeactivates(
-	) | rpl::start_with_next([=](bool hide) {
-		_speakingAnimationHideLastTime = hide ? crl::now() : 0;
+	rpl::combine(
+		rpl::single(anim::Disabled()) | rpl::then(anim::Disables()),
+		rpl::single(false) | rpl::then(Core::App().appDeactivates())
+	) | rpl::start_with_next([=](bool animDisabled, bool deactivated) {
+		const auto hide = !(!animDisabled && !deactivated);
+
+		if (!(hide && _speakingAnimationHideLastTime)) {
+			_speakingAnimationHideLastTime = hide ? crl::now() : 0;
+		}
 		for (const auto [_, row] : _speakingRowBySsrc) {
 			if (hide) {
-				row->updateLevel(0.);
+				updateRowLevel(row, 0.);
 			}
-			updateRowLevel(row, 0.);
 			if (!hide && !_speakingAnimation.animating()) {
 				_speakingAnimation.start();
 			}

From d41e93fb1c7f224766b67cde0f3d71d0fe09f4a0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 3 Dec 2020 21:17:15 +0300
Subject: [PATCH 225/370] Add push-to-talk with global shortcut on Windows.

---
 Telegram/Resources/langs/lang.strings         |   3 +
 Telegram/SourceFiles/calls/calls.style        |  16 +--
 .../SourceFiles/calls/calls_group_call.cpp    |  57 ++++++++++
 Telegram/SourceFiles/calls/calls_group_call.h |  18 +++
 .../calls/calls_group_settings.cpp            | 107 ++++++++++++++++--
 Telegram/SourceFiles/core/core_settings.cpp   |  13 ++-
 Telegram/SourceFiles/core/core_settings.h     |  14 +++
 Telegram/lib_base                             |   2 +-
 Telegram/lib_spellcheck                       |   2 +-
 Telegram/lib_storage                          |   2 +-
 Telegram/lib_ui                               |   2 +-
 Telegram/lib_webrtc                           |   2 +-
 12 files changed, 217 insertions(+), 21 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index ee967a1ef..69f04bae1 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1836,6 +1836,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_new_muted" = "Mute new members";
 "lng_group_call_speakers" = "Speakers";
 "lng_group_call_microphone" = "Microphone";
+"lng_group_call_push_to_talk" = "Push to Talk";
+"lng_group_call_ptt_shortcut" = "Edit Shortcut";
+"lng_group_call_ptt_recording" = "Stop Recording";
 "lng_group_call_share" = "Share Invite Link";
 "lng_group_call_end" = "End Voice Chat";
 "lng_group_call_join" = "Join";
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 78000ea93..5849c0254 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -641,20 +641,22 @@ groupCallCheckbox: Checkbox(defaultBoxCheckbox) {
 	rippleBgActive: groupCallMembersBgRipple;
 }
 
-groupCallSettingsButton: SettingsButton {
+groupCallSettingsToggle: Toggle(defaultToggle) {
+	toggledBg: groupCallMembersBg;
+	toggledFg: groupCallActiveFg;
+	untoggledBg: groupCallMembersBg;
+	untoggledFg: groupCallMemberNotJoinedStatus;
+}
+groupCallSettingsButton: SettingsButton(defaultSettingsButton) {
 	textFg: groupCallMembersFg;
 	textFgOver: groupCallMembersFg;
 	textBg: groupCallMembersBg;
 	textBgOver: groupCallMembersBgOver;
-
-	font: boxTextFont;
 	rightLabel: FlatLabel(defaultSettingsRightLabel) {
 		textFg: groupCallActiveFg;
 	}
-
-	height: 20px;
-	padding: margins(22px, 10px, 22px, 8px);
-
+	toggle: groupCallSettingsToggle;
+	toggleOver: groupCallSettingsToggle;
 	ripple: groupCallRipple;
 }
 groupCallSettingsAttentionButton: SettingsButton(groupCallSettingsButton) {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index ebdb395c2..b97287e45 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel.h"
 #include "data/data_group_call.h"
 #include "data/data_session.h"
+#include "base/platform/base_platform_global_shortcuts.h"
 
 #include <tgcalls/group/GroupInstanceImpl.h>
 
@@ -92,6 +93,11 @@ void GroupCall::setState(State state) {
 	}
 	_state = state;
 
+	if (_state.current() == State::Joined && !_pushToTalkStarted) {
+		_pushToTalkStarted = true;
+		applyGlobalShortcutChanges();
+	}
+
 	if (false
 		|| state == State::Ended
 		|| state == State::Failed) {
@@ -706,6 +712,57 @@ std::variant<int, not_null<UserData*>> GroupCall::inviteUsers(
 	return result;
 }
 
+auto GroupCall::ensureGlobalShortcutManager()
+-> std::shared_ptr<GlobalShortcutManager> {
+	if (!_shortcutManager) {
+		_shortcutManager = base::Platform::CreateGlobalShortcutManager();
+	}
+	return _shortcutManager;
+}
+
+void GroupCall::applyGlobalShortcutChanges() {
+	auto &settings = Core::App().settings();
+	if (!settings.groupCallPushToTalk()) {
+		_shortcutManager = nullptr;
+		_pushToTalk = nullptr;
+		return;
+	} else if (settings.groupCallPushToTalkShortcut().isEmpty()) {
+		settings.setGroupCallPushToTalk(false);
+		Core::App().saveSettingsDelayed();
+		_shortcutManager = nullptr;
+		_pushToTalk = nullptr;
+		return;
+	}
+	ensureGlobalShortcutManager();
+	if (!_shortcutManager) {
+		settings.setGroupCallPushToTalk(false);
+		Core::App().saveSettingsDelayed();
+		_pushToTalk = nullptr;
+		return;
+	}
+	const auto shortcut = _shortcutManager->shortcutFromSerialized(
+		settings.groupCallPushToTalkShortcut());
+	if (!shortcut) {
+		settings.setGroupCallPushToTalkShortcut(QByteArray());
+		settings.setGroupCallPushToTalk(false);
+		Core::App().saveSettingsDelayed();
+		_shortcutManager = nullptr;
+		_pushToTalk = nullptr;
+		return;
+	}
+	if (_pushToTalk) {
+		if (shortcut->serialize() == _pushToTalk->serialize()) {
+			return;
+		}
+		_shortcutManager->stopWatching(_pushToTalk);
+	}
+	_pushToTalk = shortcut;
+	_shortcutManager->startWatching(_pushToTalk, [=](bool pressed) {
+		if (_muted.current() != MuteState::ForceMuted) {
+			setMuted(pressed ? MuteState::Active : MuteState::Muted);
+		}
+	});
+}
 //void GroupCall::setAudioVolume(bool input, float level) {
 //	if (_instance) {
 //		if (input) {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 7ea4294eb..1a016a6eb 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -19,6 +19,13 @@ namespace tgcalls {
 class GroupInstanceImpl;
 } // namespace tgcalls
 
+namespace base {
+namespace Platform {
+class GlobalShortcutManager;
+class GlobalShortcutValue;
+} // namespace Platform
+} // namespace base
+
 namespace Calls {
 
 enum class MuteState {
@@ -44,6 +51,8 @@ public:
 
 	};
 
+	using GlobalShortcutManager = base::Platform::GlobalShortcutManager;
+
 	GroupCall(
 		not_null<Delegate*> delegate,
 		not_null<ChannelData*> channel,
@@ -102,11 +111,16 @@ public:
 	std::variant<int, not_null<UserData*>> inviteUsers(
 		const std::vector<not_null<UserData*>> &users);
 
+	std::shared_ptr<GlobalShortcutManager> ensureGlobalShortcutManager();
+	void applyGlobalShortcutChanges();
+
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
 
 private:
+	using GlobalShortcutValue = base::Platform::GlobalShortcutValue;
+
 	enum class FinishType {
 		None,
 		Ended,
@@ -160,6 +174,10 @@ private:
 
 	crl::time _lastSendProgressUpdate = 0;
 
+	std::shared_ptr<GlobalShortcutManager> _shortcutManager;
+	std::shared_ptr<GlobalShortcutValue> _pushToTalk;
+	bool _pushToTalkStarted = false;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
index 5d1383303..c26d4dc76 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -10,10 +10,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_group_call.h"
 #include "calls/calls_group_panel.h" // LeaveGroupCallBox.
 #include "calls/calls_instance.h"
-#include "ui/widgets/checkbox.h"
 #include "ui/widgets/level_meter.h"
+#include "ui/widgets/buttons.h"
+#include "ui/wrap/slide_wrap.h"
 #include "ui/toast/toast.h"
 #include "lang/lang_keys.h"
+#include "base/platform/base_platform_global_shortcuts.h"
 #include "data/data_channel.h"
 #include "data/data_group_call.h"
 #include "core/application.h"
@@ -90,12 +92,10 @@ void GroupCallSettingsBox(
 		AddSkip(layout);
 	}
 	const auto muteJoined = addCheck
-		? box->addRow(object_ptr<Ui::Checkbox>(
-			box.get(),
+		? AddButton(
+			layout,
 			tr::lng_group_call_new_muted(),
-			joinMuted,
-			st::groupCallCheckbox,
-			st::groupCallCheck))
+			st::groupCallSettingsButton)->toggleOn(rpl::single(joinMuted))
 		: nullptr;
 	if (addCheck) {
 		AddSkip(layout);
@@ -155,6 +155,97 @@ void GroupCallSettingsBox(
 	});
 
 	AddSkip(layout);
+	//AddDivider(layout);
+	//AddSkip(layout);
+
+	using namespace base::Platform;
+	struct PushToTalkState {
+		rpl::variable<QString> recordText = tr::lng_group_call_ptt_shortcut();
+		rpl::variable<QString> shortcutText;
+		GlobalShortcut shortcut;
+		bool recording = false;
+	};
+	const auto manager = call->ensureGlobalShortcutManager();
+	if (manager) {
+		const auto state = box->lifetime().make_state<PushToTalkState>();
+		state->shortcut = manager->shortcutFromSerialized(
+			settings.groupCallPushToTalkShortcut());
+		state->shortcutText = state->shortcut
+			? state->shortcut->toDisplayString()
+			: QString();
+		const auto pushToTalk = AddButton(
+			layout,
+			tr::lng_group_call_push_to_talk(),
+			st::groupCallSettingsButton
+		)->toggleOn(rpl::single(settings.groupCallPushToTalk()));
+		const auto recordingWrap = layout->add(
+			object_ptr<Ui::SlideWrap<Button>>(
+				layout,
+				object_ptr<Button>(
+					layout,
+					state->recordText.value(),
+					st::groupCallSettingsButton)));
+		const auto recording = recordingWrap->entity();
+		CreateRightLabel(
+			recording,
+			state->shortcutText.value(),
+			st::groupCallSettingsButton,
+			state->recordText.value());
+		const auto startRecording = [=] {
+			state->recording = true;
+			state->recordText = tr::lng_group_call_ptt_recording();
+			manager->startRecording([=](GlobalShortcut shortcut) {
+				state->shortcutText = shortcut->toDisplayString();
+			}, [=](GlobalShortcut shortcut) {
+				state->recording = false;
+				state->shortcut = shortcut;
+				state->shortcutText = shortcut
+					? shortcut->toDisplayString()
+					: QString();
+				state->recordText = tr::lng_group_call_ptt_shortcut();
+				Core::App().settings().setGroupCallPushToTalkShortcut(shortcut
+					? shortcut->serialize()
+					: QByteArray());
+				Core::App().saveSettingsDelayed();
+			});
+		};
+		const auto stopRecording = [=] {
+			state->recording = false;
+			state->recordText = tr::lng_group_call_ptt_shortcut();
+			state->shortcutText = state->shortcut
+				? state->shortcut->toDisplayString()
+				: QString();
+			manager->stopRecording();
+		};
+		recording->addClickHandler([=] {
+			if (state->recording) {
+				stopRecording();
+			} else {
+				startRecording();
+			}
+		});
+		recordingWrap->toggle(
+			settings.groupCallPushToTalk(),
+			anim::type::instant);
+		pushToTalk->toggledChanges(
+		) | rpl::start_with_next([=](bool toggled) {
+			if (!toggled) {
+				stopRecording();
+			}
+			Core::App().settings().setGroupCallPushToTalk(toggled);
+			Core::App().saveSettingsDelayed();
+			recordingWrap->toggle(toggled, anim::type::normal);
+		}, pushToTalk->lifetime());
+
+		box->boxClosing(
+		) | rpl::start_with_next([=] {
+			call->applyGlobalShortcutChanges();
+		}, box->lifetime());
+	}
+
+	AddSkip(layout);
+	//AddDivider(layout);
+	//AddSkip(layout);
 
 	const auto lookupLink = [=] {
 		return channel->hasUsername()
@@ -226,8 +317,8 @@ void GroupCallSettingsBox(
 	) | rpl::start_with_next([=] {
 		if (canChangeJoinMuted
 			&& muteJoined
-			&& muteJoined->checked() != joinMuted) {
-			SaveCallJoinMuted(channel, id, muteJoined->checked());
+			&& muteJoined->toggled() != joinMuted) {
+			SaveCallJoinMuted(channel, id, muteJoined->toggled());
 		}
 	}, box->lifetime());
 	box->addButton(tr::lng_box_done(), [=] {
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index c6ea4b8dc..4dd8852ea 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -109,7 +109,9 @@ QByteArray Settings::serialize() const {
 			<< qint32(_nativeWindowFrame.current() ? 1 : 0)
 			<< qint32(_systemDarkModeEnabled.current() ? 1 : 0)
 			<< _callVideoInputDeviceId
-			<< qint32(_ipRevealWarning ? 1 : 0);
+			<< qint32(_ipRevealWarning ? 1 : 0)
+			<< qint32(_groupCallPushToTalk ? 1 : 0)
+			<< _groupCallPushToTalkShortcut;
 	}
 	return result;
 }
@@ -177,6 +179,8 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 nativeWindowFrame = _nativeWindowFrame.current() ? 1 : 0;
 	qint32 systemDarkModeEnabled = _systemDarkModeEnabled.current() ? 1 : 0;
 	qint32 ipRevealWarning = _ipRevealWarning ? 1 : 0;
+	qint32 groupCallPushToTalk = _groupCallPushToTalk ? 1 : 0;
+	QByteArray groupCallPushToTalkShortcut = _groupCallPushToTalkShortcut;
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -263,6 +267,11 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> ipRevealWarning;
 	}
+	if (!stream.atEnd()) {
+		stream
+			>> groupCallPushToTalk
+			>> groupCallPushToTalkShortcut;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -354,6 +363,8 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_notifyFromAll = (notifyFromAll == 1);
 	_nativeWindowFrame = (nativeWindowFrame == 1);
 	_systemDarkModeEnabled = (systemDarkModeEnabled == 1);
+	_groupCallPushToTalk = (groupCallPushToTalk == 1);
+	_groupCallPushToTalkShortcut = groupCallPushToTalkShortcut;
 }
 
 bool Settings::chatWide() const {
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index dbb3a8933..c193ed64c 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -217,6 +217,18 @@ public:
 	void setCallAudioDuckingEnabled(bool value) {
 		_callAudioDuckingEnabled = value;
 	}
+	[[nodiscard]] bool groupCallPushToTalk() const {
+		return _groupCallPushToTalk;
+	}
+	void setGroupCallPushToTalk(bool value) {
+		_groupCallPushToTalk = value;
+	}
+	[[nodiscard]] QByteArray groupCallPushToTalkShortcut() const {
+		return _groupCallPushToTalkShortcut;
+	}
+	void setGroupCallPushToTalkShortcut(const QByteArray &serialized) {
+		_groupCallPushToTalkShortcut = serialized;
+	}
 	[[nodiscard]] Window::Theme::AccentColors &themesAccentColors() {
 		return _themesAccentColors;
 	}
@@ -513,6 +525,8 @@ private:
 	int _callOutputVolume = 100;
 	int _callInputVolume = 100;
 	bool _callAudioDuckingEnabled = true;
+	bool _groupCallPushToTalk = false;
+	QByteArray _groupCallPushToTalkShortcut;
 	Window::Theme::AccentColors _themesAccentColors;
 	bool _lastSeenWarningSeen = false;
 	Ui::SendFilesWay _sendFilesWay;
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 3562a4368..7d1df24be 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 3562a43685fdac00c277292ce2c83d92132cc319
+Subproject commit 7d1df24be11eb6b3e6382735b73418b4a282bad4
diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck
index 8aede3acc..1b540b38e 160000
--- a/Telegram/lib_spellcheck
+++ b/Telegram/lib_spellcheck
@@ -1 +1 @@
-Subproject commit 8aede3acc9d386484d2774316e9d1a3d0c265dd5
+Subproject commit 1b540b38ed78e9a3cba93e9ba4ce4525ab692277
diff --git a/Telegram/lib_storage b/Telegram/lib_storage
index 6fc06b5f9..cbe51722b 160000
--- a/Telegram/lib_storage
+++ b/Telegram/lib_storage
@@ -1 +1 @@
-Subproject commit 6fc06b5f9645005143f09f72e1c052a28d5f26ed
+Subproject commit cbe51722b73cfa9ff27bd59294b08aa5ee33c936
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index ab4ad89c4..5f44304a3 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit ab4ad89c4c709b2ec0f8296451d49c99d2ae4372
+Subproject commit 5f44304a305f9d02823e2d7ded9aadd59463e5a5
diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
index 52d52cad4..0ed2a6cc0 160000
--- a/Telegram/lib_webrtc
+++ b/Telegram/lib_webrtc
@@ -1 +1 @@
-Subproject commit 52d52cad4e554dac1907224372d51fd40b9da92f
+Subproject commit 0ed2a6cc048e30ee8bacf7212f3f12f4f7ae2b5a

From d36fad72683bb314b31f970d0badd28e3463b361 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 4 Dec 2020 01:01:14 +0300
Subject: [PATCH 226/370] Fixed crash in shortcut editor of push-to-talk.

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

diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
index c26d4dc76..f1fbd27bb 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -194,9 +194,10 @@ void GroupCallSettingsBox(
 		const auto startRecording = [=] {
 			state->recording = true;
 			state->recordText = tr::lng_group_call_ptt_recording();
-			manager->startRecording([=](GlobalShortcut shortcut) {
+			auto progress = crl::guard(box, [=](GlobalShortcut shortcut) {
 				state->shortcutText = shortcut->toDisplayString();
-			}, [=](GlobalShortcut shortcut) {
+			});
+			auto done = crl::guard(box, [=](GlobalShortcut shortcut) {
 				state->recording = false;
 				state->shortcut = shortcut;
 				state->shortcutText = shortcut
@@ -208,6 +209,7 @@ void GroupCallSettingsBox(
 					: QByteArray());
 				Core::App().saveSettingsDelayed();
 			});
+			manager->startRecording(std::move(progress), std::move(done));
 		};
 		const auto stopRecording = [=] {
 			state->recording = false;

From 190b1c98720b80fa2179ce7832ac618a9bd8d6b3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 4 Dec 2020 01:28:52 +0300
Subject: [PATCH 227/370] Added key filter to calls settings box while shortcut
 is recording.

---
 Telegram/SourceFiles/calls/calls_group_settings.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
index f1fbd27bb..8b587409c 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/slide_wrap.h"
 #include "ui/toast/toast.h"
 #include "lang/lang_keys.h"
+#include "base/event_filter.h"
 #include "base/platform/base_platform_global_shortcuts.h"
 #include "data/data_channel.h"
 #include "data/data_group_call.h"
@@ -243,6 +244,17 @@ void GroupCallSettingsBox(
 		) | rpl::start_with_next([=] {
 			call->applyGlobalShortcutChanges();
 		}, box->lifetime());
+
+		auto boxKeyFilter = [=](not_null<QEvent*> e) {
+			if (e->type() != QEvent::KeyPress) {
+				return base::EventFilterResult::Continue;
+			}
+			return (state->recording)
+				? base::EventFilterResult::Cancel
+				: base::EventFilterResult::Continue;
+		};
+		box->lifetime().make_state<base::unique_qptr<QObject>>(
+			base::install_event_filter(box, std::move(boxKeyFilter)));
 	}
 
 	AddSkip(layout);

From be9644c2fff01d3a287fdb87b89c91dcb5e2023e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 4 Dec 2020 01:48:57 +0300
Subject: [PATCH 228/370] Removed redundant condition in drawing of voice chat
 indicator.

Related commit: 4a20a4d739.
---
 .../SourceFiles/ui/effects/send_action_animations.cpp    | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
index 6762bd84d..6abfe71bf 100644
--- a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
+++ b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp
@@ -391,14 +391,7 @@ void SpeakingAnimation::PaintFrame(
 
 	const auto drawRoundedRect = [&](float left, float size) {
 		const auto top = center.y() - size;
-		const auto w = 2 * line;
-		const auto h = 2 * size;
-
-		if (left == (int)left) {
-			p.drawRoundedRect(left, top, w, h, line, line);
-		} else {
-			p.drawRoundedRect(QRectF(left, top, w, h), line, line);
-		}
+		p.drawRoundedRect(QRectF(left, top, 2 * line, 2 * size), line, line);
 	};
 
 	auto left = center.x() - 4 * line;

From 8b2d75502b8af5b27d1595272ffcc20b849b0709 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 4 Dec 2020 18:16:03 +0300
Subject: [PATCH 229/370] Fixed background color in Calls::TopBar for force
 muted state.

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

diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 2b9cc6c7a..9b48078ef 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -43,7 +43,7 @@ auto Colors() {
 	return base::flat_map<MuteState, Vector>{
 		{
 			MuteState::ForceMuted,
-			Vector{ st::callIconBg->c, st::callIconBg->c }
+			Vector{ st::groupCallMembersBg->c, st::groupCallMembersBg->c }
 		},
 		{
 			MuteState::Active,

From 8f11868bb6e92ce30dcbd7494508f76657ac8e46 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 6 Dec 2020 12:41:45 +0400
Subject: [PATCH 230/370] Use new global shortcuts interface.

---
 Telegram/SourceFiles/calls/calls_group_call.cpp     | 4 ++--
 Telegram/SourceFiles/calls/calls_group_call.h       | 6 ++----
 Telegram/SourceFiles/calls/calls_group_settings.cpp | 4 ++--
 Telegram/lib_base                                   | 2 +-
 Telegram/lib_ui                                     | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index b97287e45..9f34964cc 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel.h"
 #include "data/data_group_call.h"
 #include "data/data_session.h"
-#include "base/platform/base_platform_global_shortcuts.h"
+#include "base/global_shortcuts.h"
 
 #include <tgcalls/group/GroupInstanceImpl.h>
 
@@ -715,7 +715,7 @@ std::variant<int, not_null<UserData*>> GroupCall::inviteUsers(
 auto GroupCall::ensureGlobalShortcutManager()
 -> std::shared_ptr<GlobalShortcutManager> {
 	if (!_shortcutManager) {
-		_shortcutManager = base::Platform::CreateGlobalShortcutManager();
+		_shortcutManager = base::CreateGlobalShortcutManager();
 	}
 	return _shortcutManager;
 }
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 1a016a6eb..739b6295b 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -20,10 +20,8 @@ class GroupInstanceImpl;
 } // namespace tgcalls
 
 namespace base {
-namespace Platform {
 class GlobalShortcutManager;
 class GlobalShortcutValue;
-} // namespace Platform
 } // namespace base
 
 namespace Calls {
@@ -51,7 +49,7 @@ public:
 
 	};
 
-	using GlobalShortcutManager = base::Platform::GlobalShortcutManager;
+	using GlobalShortcutManager = base::GlobalShortcutManager;
 
 	GroupCall(
 		not_null<Delegate*> delegate,
@@ -119,7 +117,7 @@ public:
 	}
 
 private:
-	using GlobalShortcutValue = base::Platform::GlobalShortcutValue;
+	using GlobalShortcutValue = base::GlobalShortcutValue;
 
 	enum class FinishType {
 		None,
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
index 8b587409c..fffb45f7c 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "lang/lang_keys.h"
 #include "base/event_filter.h"
-#include "base/platform/base_platform_global_shortcuts.h"
+#include "base/global_shortcuts.h"
 #include "data/data_channel.h"
 #include "data/data_group_call.h"
 #include "core/application.h"
@@ -159,7 +159,7 @@ void GroupCallSettingsBox(
 	//AddDivider(layout);
 	//AddSkip(layout);
 
-	using namespace base::Platform;
+	using GlobalShortcut = base::GlobalShortcut;
 	struct PushToTalkState {
 		rpl::variable<QString> recordText = tr::lng_group_call_ptt_shortcut();
 		rpl::variable<QString> shortcutText;
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 7d1df24be..79b9ed178 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 7d1df24be11eb6b3e6382735b73418b4a282bad4
+Subproject commit 79b9ed178aa1fa9779afb51470f571c4153866fc
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 5f44304a3..f24411cd9 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 5f44304a305f9d02823e2d7ded9aadd59463e5a5
+Subproject commit f24411cd96b2e3503d572418a63d2df8bae90fc9

From af4f10b1bb2df5de588df26296011d7171fb6fa0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 6 Dec 2020 14:13:50 +0400
Subject: [PATCH 231/370] Special mute state for Push-to-Talk unmute.

---
 .../SourceFiles/calls/calls_group_call.cpp    | 58 ++++++++++++-------
 Telegram/SourceFiles/calls/calls_group_call.h |  9 +++
 .../SourceFiles/calls/calls_group_panel.cpp   | 17 +++---
 Telegram/SourceFiles/calls/calls_top_bar.cpp  | 10 ++--
 4 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 9f34964cc..319c7223c 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -53,13 +53,14 @@ GroupCall::GroupCall(
 , _api(&_channel->session().mtp())
 , _lastSpokeCheckTimer([=] { checkLastSpoke(); })
 , _checkJoinedTimer([=] { checkJoined(); }) {
-	_muted.changes(
-	) | rpl::start_with_next([=](MuteState state) {
+	_muted.value(
+	) | rpl::combine_previous(
+	) | rpl::start_with_next([=](MuteState previous, MuteState state) {
 		if (_instance) {
-			_instance->setIsMuted(state != MuteState::Active);
+			updateInstanceMuteState();
 		}
-		if (_mySsrc && state != MuteState::ForceMuted) {
-			sendMutedUpdate();
+		if (_mySsrc) {
+			maybeSendMutedUpdate(previous);
 		}
 	}, _lifetime);
 
@@ -200,9 +201,9 @@ void GroupCall::rejoin() {
 
 			const auto json = QJsonDocument(root).toJson(
 				QJsonDocument::Compact);
-			const auto muted = _muted.current();
+			const auto wasMuteState = muted();
 			_api.request(MTPphone_JoinGroupCall(
-				MTP_flags((muted != MuteState::Active)
+				MTP_flags((wasMuteState != MuteState::Active)
 					? MTPphone_JoinGroupCall::Flag::f_muted
 					: MTPphone_JoinGroupCall::Flag(0)),
 				inputCall(),
@@ -213,11 +214,7 @@ void GroupCall::rejoin() {
 					? State::Joined
 					: State::Connecting);
 				applySelfInCallLocally();
-
-				if (_muted.current() != muted) {
-					sendMutedUpdate();
-				}
-
+				maybeSendMutedUpdate(wasMuteState);
 				_channel->session().api().applyUpdates(updates);
 			}).fail([=](const RPCError &error) {
 				LOG(("Call Error: Could not join, error: %1"
@@ -251,12 +248,11 @@ void GroupCall::applySelfInCallLocally() {
 	const auto lastActive = (i != end(participants))
 		? i->lastActive
 		: TimeId(0);
-	const auto muted = (_muted.current() != MuteState::Active);
-	const auto cantSelfUnmute = (_muted.current() == MuteState::ForceMuted);
-	const auto flags = (cantSelfUnmute ? Flag(0) : Flag::f_can_self_unmute)
+	const auto canSelfUnmute = (muted() != MuteState::ForceMuted);
+	const auto flags = (canSelfUnmute ? Flag::f_can_self_unmute : Flag(0))
 		| (lastActive ? Flag::f_active_date : Flag(0))
 		| (_mySsrc ? Flag(0) : Flag::f_left)
-		| (muted ? Flag::f_muted : Flag(0));
+		| ((muted() != MuteState::Active) ? Flag::f_muted : Flag(0));
 	call->applyUpdateChecked(
 		MTP_updateGroupCallParticipants(
 			inputCall(),
@@ -488,11 +484,19 @@ void GroupCall::createAndStartController() {
 	LOG(("Call Info: Creating group instance"));
 	_instance = std::make_unique<tgcalls::GroupInstanceImpl>(
 		std::move(descriptor));
-	_instance->setIsMuted(_muted.current() != MuteState::Active);
+	updateInstanceMuteState();
 
 	//raw->setAudioOutputDuckingEnabled(settings.callAudioDuckingEnabled());
 }
 
+void GroupCall::updateInstanceMuteState() {
+	Expects(_instance != nullptr);
+
+	const auto state = muted();
+	_instance->setIsMuted(state != MuteState::Active
+		&& state != MuteState::PushToTalk);
+}
+
 void GroupCall::handleLevelsUpdated(
 		gsl::span<const std::pair<std::uint32_t, float>> data) {
 	Expects(!data.empty());
@@ -609,10 +613,23 @@ void GroupCall::setInstanceConnected(bool connected) {
 	}
 }
 
+void GroupCall::maybeSendMutedUpdate(MuteState previous) {
+	// Send only Active <-> !Active changes.
+	const auto now = muted();
+	const auto wasActive = (previous == MuteState::Active);
+	const auto nowActive = (now == MuteState::Active);
+	if (now == MuteState::ForceMuted
+		|| previous == MuteState::ForceMuted
+		|| (nowActive == wasActive)) {
+		return;
+	}
+	sendMutedUpdate();
+}
+
 void GroupCall::sendMutedUpdate() {
 	_api.request(_updateMuteRequestId).cancel();
 	_updateMuteRequestId = _api.request(MTPphone_EditGroupCallMember(
-		MTP_flags((_muted.current() != MuteState::Active)
+		MTP_flags((muted() != MuteState::Active)
 			? MTPphone_EditGroupCallMember::Flag::f_muted
 			: MTPphone_EditGroupCallMember::Flag(0)),
 		inputCall(),
@@ -758,8 +775,9 @@ void GroupCall::applyGlobalShortcutChanges() {
 	}
 	_pushToTalk = shortcut;
 	_shortcutManager->startWatching(_pushToTalk, [=](bool pressed) {
-		if (_muted.current() != MuteState::ForceMuted) {
-			setMuted(pressed ? MuteState::Active : MuteState::Muted);
+		if (muted() != MuteState::ForceMuted
+			&& muted() != MuteState::Active) {
+			setMuted(pressed ? MuteState::PushToTalk : MuteState::Muted);
 		}
 	});
 }
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 739b6295b..eab1f503a 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -28,10 +28,17 @@ namespace Calls {
 
 enum class MuteState {
 	Active,
+	PushToTalk,
 	Muted,
 	ForceMuted,
 };
 
+[[nodiscard]] inline auto MapPushToTalkToActive() {
+	return rpl::map([=](MuteState state) {
+		return (state == MuteState::PushToTalk) ? MuteState::Active : state;
+	});
+}
+
 struct LevelUpdate {
 	uint32 ssrc = 0;
 	float value = 0.;
@@ -132,7 +139,9 @@ private:
 
 	void setState(State state);
 	void finish(FinishType type);
+	void maybeSendMutedUpdate(MuteState previous);
 	void sendMutedUpdate();
+	void updateInstanceMuteState();
 	void applySelfInCallLocally();
 	void rejoin();
 
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 6e66af6c0..fab99d7b6 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -317,13 +317,13 @@ void GroupPanel::hangup(bool discardCallChecked) {
 void GroupPanel::initControls() {
 	_mute->clicks(
 	) | rpl::filter([=](Qt::MouseButton button) {
-		return (button == Qt::LeftButton);
+		return (button == Qt::LeftButton)
+			&& _call
+			&& (_call->muted() != MuteState::ForceMuted);
 	}) | rpl::start_with_next([=] {
-		if (_call && _call->muted() != MuteState::ForceMuted) {
-			_call->setMuted((_call->muted() == MuteState::Active)
-				? MuteState::Muted
-				: MuteState::Active);
-		}
+		_call->setMuted((_call->muted() == MuteState::Muted)
+			? MuteState::Active
+			: MuteState::Muted);
 	}, _mute->lifetime());
 
 	_hangup->setClickedCallback([=] { hangup(false); });
@@ -381,19 +381,20 @@ void GroupPanel::initWithCall(GroupCall *call) {
 
 	using namespace rpl::mappers;
 	rpl::combine(
-		_call->mutedValue(),
+		_call->mutedValue() | MapPushToTalkToActive(),
 		_call->stateValue() | rpl::map(
 			_1 == State::Creating
 			|| _1 == State::Joining
 			|| _1 == State::Connecting
 		)
+	) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](MuteState mute, bool connecting) {
 		_mute->setState(Ui::CallMuteButtonState{
 			.text = (connecting
 				? tr::lng_group_call_connecting(tr::now)
 				: mute == MuteState::ForceMuted
 				? tr::lng_group_call_force_muted(tr::now)
-				: mute != MuteState::Active
+				: mute == MuteState::Muted
 				? tr::lng_group_call_unmute(tr::now)
 				: tr::lng_group_call_you_are_live(tr::now)),
 			.type = (connecting
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 9b48078ef..a54c94d69 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -198,9 +198,9 @@ void TopBar::initControls() {
 			call->setMuted(!call->muted());
 		} else if (const auto group = _groupCall.get()) {
 			if (group->muted() != MuteState::ForceMuted) {
-				group->setMuted((group->muted() == MuteState::Active)
-					? MuteState::Muted
-					: MuteState::Active);
+				group->setMuted((group->muted() == MuteState::Muted)
+					? MuteState::Active
+					: MuteState::Muted);
 			}
 		}
 	});
@@ -212,7 +212,9 @@ void TopBar::initControls() {
 		_call ? mapToState(_call->muted()) : _groupCall->muted());
 	auto muted = _call
 		? _call->mutedValue() | rpl::map(mapToState)
-		: _groupCall->mutedValue();
+		: (_groupCall->mutedValue()
+			| MapPushToTalkToActive()
+			| rpl::distinct_until_changed());
 	std::move(
 		muted
 	) | rpl::start_with_next([=](MuteState state) {

From 80b7858f5e0dc5346324ef77657a6a3e813e4919 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 6 Dec 2020 16:16:11 +0400
Subject: [PATCH 232/370] Don't reorder members while menu is shown.

---
 .../SourceFiles/calls/calls_group_call.cpp    |  8 +++-
 .../SourceFiles/calls/calls_group_members.cpp | 41 +++++++++++++++++--
 Telegram/SourceFiles/data/data_group_call.cpp | 11 +++--
 3 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 319c7223c..933bcb5e6 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -325,8 +325,14 @@ void GroupCall::finish(FinishType type) {
 }
 
 void GroupCall::setMuted(MuteState mute) {
+	const auto wasMuted = (muted() == MuteState::Muted)
+		|| (muted() == MuteState::PushToTalk);
 	_muted = mute;
-	applySelfInCallLocally();
+	const auto nowMuted = (muted() == MuteState::Muted)
+		|| (muted() == MuteState::PushToTalk);
+	if (wasMuted != nowMuted) {
+		applySelfInCallLocally();
+	}
 }
 
 void GroupCall::handleUpdate(const MTPGroupCall &call) {
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index fb48433f6..6b190731f 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -182,6 +182,7 @@ public:
 	MembersController(
 		not_null<GroupCall*> call,
 		not_null<QWidget*> menuParent);
+	~MembersController();
 
 	using MuteRequest = GroupMembers::MuteRequest;
 
@@ -246,6 +247,7 @@ private:
 
 	not_null<QWidget*> _menuParent;
 	base::unique_qptr<Ui::PopupMenu> _menu;
+	base::flat_set<not_null<PeerData*>> _menuCheckRowsAfterHidden;
 
 	base::flat_map<uint32, not_null<Row*>> _speakingRowBySsrc;
 	Ui::Animations::Basic _speakingAnimation;
@@ -276,7 +278,8 @@ void Row::updateState(const Data::GroupCall::Participant *participant) {
 		}
 		setState(State::Inactive);
 		setSpeaking(false);
-	} else if (!participant->muted) {
+	} else if (!participant->muted
+		|| (participant->speaking && participant->ssrc != 0)) {
 		setState(State::Active);
 		setSpeaking(participant->speaking && participant->ssrc != 0);
 	} else if (participant->canSelfUnmute) {
@@ -550,6 +553,13 @@ MembersController::MembersController(
 	});
 }
 
+MembersController::~MembersController() {
+	if (_menu) {
+		_menu->setDestroyedCallback(nullptr);
+		_menu = nullptr;
+	}
+}
+
 void MembersController::setupListChangeViewers(not_null<GroupCall*> call) {
 	const auto channel = call->channel();
 	channel->session().changes().peerFlagsValue(
@@ -638,6 +648,11 @@ void MembersController::updateRow(
 }
 
 void MembersController::checkSpeakingRowPosition(not_null<Row*> row) {
+	if (_menu) {
+		// Don't reorder rows while we show the popup menu.
+		_menuCheckRowsAfterHidden.emplace(row->peer());
+		return;
+	}
 	// Check if there are non-speaking rows above this one.
 	const auto count = delegate()->peerListFullRowsCount();
 	for (auto i = 0; i != count; ++i) {
@@ -873,11 +888,28 @@ auto MembersController::kickMemberRequests() const
 
 void MembersController::rowClicked(not_null<PeerListRow*> row) {
 	if (_menu) {
+		_menu->setDestroyedCallback(nullptr);
 		_menu->deleteLater();
 		_menu = nullptr;
 	}
 	_menu = rowContextMenu(_menuParent, row);
-	_menu->popup(QCursor::pos());
+	if (const auto raw = _menu.get()) {
+		raw->setDestroyedCallback([=] {
+			if (_menu && _menu.get() != raw) {
+				return;
+			}
+			auto saved = base::take(_menu);
+			for (const auto peer : base::take(_menuCheckRowsAfterHidden)) {
+				if (const auto row = findRow(peer->asUser())) {
+					if (row->speaking()) {
+						checkSpeakingRowPosition(row);
+					}
+				}
+			}
+			_menu = std::move(saved);
+		});
+		raw->popup(QCursor::pos());
+	}
 }
 
 void MembersController::rowActionClicked(
@@ -890,6 +922,9 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 		not_null<PeerListRow*> row) {
 	Expects(row->peer()->isUser());
 
+	if (row->peer()->isSelf()) {
+		return nullptr;
+	}
 	const auto real = static_cast<Row*>(row.get());
 	const auto user = row->peer()->asUser();
 	auto result = base::make_unique_q<Ui::PopupMenu>(
@@ -951,7 +986,7 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 		_kickMemberRequests.fire_copy(user);
 	});
 
-	if (!user->isSelf() && _channel->canManageCall()) {
+	if (_channel->canManageCall()) {
 		result->addAction(
 			(mute
 				? tr::lng_group_call_context_mute(tr::now)
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index aad2b3415..a5df582cf 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -207,14 +207,16 @@ void GroupCall::applyParticipantsSlice(
 			const auto was = (i != end(_participants))
 				? std::make_optional(*i)
 				: std::nullopt;
+			const auto canSelfUnmute = !data.is_muted()
+				|| data.is_can_self_unmute();
 			const auto value = Participant{
 				.user = user,
 				.date = data.vdate().v,
 				.lastActive = was ? was->lastActive : 0,
 				.ssrc = uint32(data.vsource().v),
-				.speaking = !data.is_muted() && (was ? was->speaking : false),
+				.speaking = canSelfUnmute && (was ? was->speaking : false),
 				.muted = data.is_muted(),
-				.canSelfUnmute = !data.is_muted() || data.is_can_self_unmute(),
+				.canSelfUnmute = canSelfUnmute,
 			};
 			if (i == end(_participants)) {
 				_userBySsrc.emplace(value.ssrc, user);
@@ -258,7 +260,7 @@ void GroupCall::applyParticipantsMutes(
 				const auto was = *i;
 				i->muted = data.is_muted();
 				i->canSelfUnmute = !i->muted || data.is_can_self_unmute();
-				if (i->muted) {
+				if (!i->canSelfUnmute) {
 					i->speaking = false;
 				}
 				_participantUpdates.fire({
@@ -280,7 +282,8 @@ void GroupCall::applyLastSpoke(uint32 ssrc, crl::time when, crl::time now) {
 	const auto j = ranges::find(_participants, i->second, &Participant::user);
 	Assert(j != end(_participants));
 
-	const auto speaking = (when + kSpeakStatusKeptFor >= now) && !j->muted;
+	const auto speaking = (when + kSpeakStatusKeptFor >= now)
+		&& j->canSelfUnmute;
 	if (j->speaking != speaking) {
 		const auto was = *j;
 		j->speaking = speaking;

From 72a8b92827f2820ac7331f7b5af88397c2090306 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 6 Dec 2020 16:44:20 +0400
Subject: [PATCH 233/370] Add push-to-talk release delay.

---
 Telegram/Resources/langs/lang.strings         |  3 ++
 Telegram/SourceFiles/calls/calls.style        | 17 ++++++
 .../SourceFiles/calls/calls_group_call.cpp    | 25 +++++++--
 Telegram/SourceFiles/calls/calls_group_call.h |  2 +
 .../calls/calls_group_settings.cpp            | 53 +++++++++++++++++--
 Telegram/SourceFiles/core/core_settings.cpp   | 15 ++++--
 Telegram/SourceFiles/core/core_settings.h     |  7 +++
 7 files changed, 111 insertions(+), 11 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 69f04bae1..290aa3ed4 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1839,6 +1839,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_push_to_talk" = "Push to Talk";
 "lng_group_call_ptt_shortcut" = "Edit Shortcut";
 "lng_group_call_ptt_recording" = "Stop Recording";
+"lng_group_call_ptt_delay_ms" = "{amount} ms";
+"lng_group_call_ptt_delay_s" = "{amount}s";
+"lng_group_call_ptt_delay" = "Push to Talk release delay: {delay}";
 "lng_group_call_share" = "Share Invite Link";
 "lng_group_call_end" = "End Voice Chat";
 "lng_group_call_join" = "Join";
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 5849c0254..abc37b882 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -670,6 +670,23 @@ groupCallBoxLabel: FlatLabel(boxLabel) {
 groupCallRowBlobMinRadius: 27px;
 groupCallRowBlobMaxRadius: 29px;
 
+groupCallDelayLabel: LabelSimple(defaultLabelSimple) {
+	textFg: groupCallMembersFg;
+	font: boxTextFont;
+}
+groupCallDelayLabelMargin: margins(22px, 10px, 20px, 5px);
+groupCallDelaySlider: MediaSlider(defaultContinuousSlider) {
+	seekSize: size(15px, 15px);
+	activeFg: groupCallActiveFg;
+	inactiveFg: groupCallMemberNotJoinedStatus;
+	activeFgOver: groupCallActiveFg;
+	inactiveFgOver: groupCallMemberNotJoinedStatus;
+	activeFgDisabled: groupCallActiveFg;
+	inactiveFgDisabled: groupCallMemberNotJoinedStatus;
+	receivedTillFg: groupCallMemberNotJoinedStatus;
+}
+groupCallDelayMargin: margins(22px, 5px, 20px, 10px);
+
 callTopBarMuteCrossLine: CrossLineAnimation {
 	fg: callBarFg;
 	icon: icon {{ "calls/call_record_active", callBarFg }};
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 933bcb5e6..b90eef418 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -52,7 +52,8 @@ GroupCall::GroupCall(
 , _history(channel->owner().history(channel))
 , _api(&_channel->session().mtp())
 , _lastSpokeCheckTimer([=] { checkLastSpoke(); })
-, _checkJoinedTimer([=] { checkJoined(); }) {
+, _checkJoinedTimer([=] { checkJoined(); })
+, _pushToTalkCancelTimer([=] { pushToTalkCancel(); }) {
 	_muted.value(
 	) | rpl::combine_previous(
 	) | rpl::start_with_next([=](MuteState previous, MuteState state) {
@@ -781,12 +782,28 @@ void GroupCall::applyGlobalShortcutChanges() {
 	}
 	_pushToTalk = shortcut;
 	_shortcutManager->startWatching(_pushToTalk, [=](bool pressed) {
-		if (muted() != MuteState::ForceMuted
-			&& muted() != MuteState::Active) {
-			setMuted(pressed ? MuteState::PushToTalk : MuteState::Muted);
+		const auto delay = Core::App().settings().groupCallPushToTalkDelay();
+		if (muted() == MuteState::ForceMuted
+			|| muted() == MuteState::Active) {
+			return;
+		} else if (pressed) {
+			_pushToTalkCancelTimer.cancel();
+			setMuted(MuteState::PushToTalk);
+		} else if (delay) {
+			_pushToTalkCancelTimer.callOnce(delay);
+		} else {
+			pushToTalkCancel();
 		}
 	});
 }
+
+void GroupCall::pushToTalkCancel() {
+	_pushToTalkCancelTimer.cancel();
+	if (muted() == MuteState::PushToTalk) {
+		setMuted(MuteState::Muted);
+	}
+}
+
 //void GroupCall::setAudioVolume(bool input, float level) {
 //	if (_instance) {
 //		if (input) {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index eab1f503a..0c6cc9fbd 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -152,6 +152,7 @@ private:
 		gsl::span<const std::pair<std::uint32_t, float>> data);
 	void setInstanceConnected(bool connected);
 	void checkLastSpoke();
+	void pushToTalkCancel();
 
 	void checkJoined();
 
@@ -183,6 +184,7 @@ private:
 
 	std::shared_ptr<GlobalShortcutManager> _shortcutManager;
 	std::shared_ptr<GlobalShortcutValue> _pushToTalk;
+	base::Timer _pushToTalkCancelTimer;
 	bool _pushToTalkStarted = false;
 
 	rpl::lifetime _lifetime;
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
index fffb45f7c..4b993c009 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_group_panel.h" // LeaveGroupCallBox.
 #include "calls/calls_instance.h"
 #include "ui/widgets/level_meter.h"
+#include "ui/widgets/continuous_sliders.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/toast/toast.h"
@@ -36,6 +37,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Calls {
 namespace {
 
+constexpr auto kDelaysCount = 201;
+
 void SaveCallJoinMuted(
 		not_null<ChannelData*> channel,
 		uint64 callId,
@@ -56,6 +59,22 @@ void SaveCallJoinMuted(
 	)).send();
 }
 
+[[nodiscard]] crl::time DelayByIndex(int index) {
+	return index * crl::time(10);
+}
+
+[[nodiscard]] QString FormatDelay(crl::time delay) {
+	return (delay < crl::time(1000))
+		? tr::lng_group_call_ptt_delay_ms(
+			tr::now,
+			lt_amount,
+			QString::number(delay))
+		: tr::lng_group_call_ptt_delay_s(
+			tr::now,
+			lt_amount,
+			QString::number(delay / 1000., 'f', 2));
+}
+
 } // namespace
 
 void GroupCallSettingsBox(
@@ -164,6 +183,7 @@ void GroupCallSettingsBox(
 		rpl::variable<QString> recordText = tr::lng_group_call_ptt_shortcut();
 		rpl::variable<QString> shortcutText;
 		GlobalShortcut shortcut;
+		crl::time delay = 0;
 		bool recording = false;
 	};
 	const auto manager = call->ensureGlobalShortcutManager();
@@ -171,6 +191,7 @@ void GroupCallSettingsBox(
 		const auto state = box->lifetime().make_state<PushToTalkState>();
 		state->shortcut = manager->shortcutFromSerialized(
 			settings.groupCallPushToTalkShortcut());
+		state->delay = settings.groupCallPushToTalkDelay();
 		state->shortcutText = state->shortcut
 			? state->shortcut->toDisplayString()
 			: QString();
@@ -240,16 +261,40 @@ void GroupCallSettingsBox(
 			recordingWrap->toggle(toggled, anim::type::normal);
 		}, pushToTalk->lifetime());
 
+		const auto label = layout->add(
+			object_ptr<Ui::LabelSimple>(layout, st::groupCallDelayLabel),
+			st::groupCallDelayLabelMargin);
+		const auto value = std::clamp(
+			state->delay,
+			crl::time(0),
+			DelayByIndex(kDelaysCount - 1));
+		const auto callback = [=](crl::time delay) {
+			state->delay = delay;
+			label->setText(tr::lng_group_call_ptt_delay(
+				tr::now,
+				lt_delay,
+				FormatDelay(delay)));
+			Core::App().settings().setGroupCallPushToTalkDelay(delay);
+			Core::App().saveSettingsDelayed();
+		};
+		callback(value);
+		const auto slider = layout->add(
+			object_ptr<Ui::MediaSlider>(layout, st::groupCallDelaySlider),
+			st::groupCallDelayMargin);
+		slider->resize(st::groupCallDelaySlider.seekSize);
+		slider->setPseudoDiscrete(
+			kDelaysCount,
+			DelayByIndex,
+			value,
+			callback);
+
 		box->boxClosing(
 		) | rpl::start_with_next([=] {
 			call->applyGlobalShortcutChanges();
 		}, box->lifetime());
 
 		auto boxKeyFilter = [=](not_null<QEvent*> e) {
-			if (e->type() != QEvent::KeyPress) {
-				return base::EventFilterResult::Continue;
-			}
-			return (state->recording)
+			return (e->type() == QEvent::KeyPress && state->recording)
 				? base::EventFilterResult::Cancel
 				: base::EventFilterResult::Continue;
 		};
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 4dd8852ea..332b20c59 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -111,7 +111,8 @@ QByteArray Settings::serialize() const {
 			<< _callVideoInputDeviceId
 			<< qint32(_ipRevealWarning ? 1 : 0)
 			<< qint32(_groupCallPushToTalk ? 1 : 0)
-			<< _groupCallPushToTalkShortcut;
+			<< _groupCallPushToTalkShortcut
+			<< qint64(_groupCallPushToTalkDelay);
 	}
 	return result;
 }
@@ -181,6 +182,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 ipRevealWarning = _ipRevealWarning ? 1 : 0;
 	qint32 groupCallPushToTalk = _groupCallPushToTalk ? 1 : 0;
 	QByteArray groupCallPushToTalkShortcut = _groupCallPushToTalkShortcut;
+	qint64 groupCallPushToTalkDelay = _groupCallPushToTalkDelay;
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -270,9 +272,11 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream
 			>> groupCallPushToTalk
-			>> groupCallPushToTalkShortcut;
+			>> groupCallPushToTalkShortcut
+			>> groupCallPushToTalkDelay;
 	}
-	if (stream.status() != QDataStream::Ok) {
+	if (false && stream.status() != QDataStream::Ok) {
+		AssertIsDebug();
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
 		return;
@@ -365,6 +369,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_systemDarkModeEnabled = (systemDarkModeEnabled == 1);
 	_groupCallPushToTalk = (groupCallPushToTalk == 1);
 	_groupCallPushToTalkShortcut = groupCallPushToTalkShortcut;
+	_groupCallPushToTalkDelay = groupCallPushToTalkDelay;
 }
 
 bool Settings::chatWide() const {
@@ -471,6 +476,10 @@ void Settings::resetOnLastLogout() {
 	//_callInputVolume = 100;
 	//_callAudioDuckingEnabled = true;
 
+	_groupCallPushToTalk = false;
+	_groupCallPushToTalkShortcut = QByteArray();
+	_groupCallPushToTalkDelay = 20;
+
 	//_themesAccentColors = Window::Theme::AccentColors();
 
 	_lastSeenWarningSeen = false;
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index c193ed64c..c6333ba82 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -229,6 +229,12 @@ public:
 	void setGroupCallPushToTalkShortcut(const QByteArray &serialized) {
 		_groupCallPushToTalkShortcut = serialized;
 	}
+	[[nodiscard]] crl::time groupCallPushToTalkDelay() const {
+		return _groupCallPushToTalkDelay;
+	}
+	void setGroupCallPushToTalkDelay(crl::time delay) {
+		_groupCallPushToTalkDelay = delay;
+	}
 	[[nodiscard]] Window::Theme::AccentColors &themesAccentColors() {
 		return _themesAccentColors;
 	}
@@ -527,6 +533,7 @@ private:
 	bool _callAudioDuckingEnabled = true;
 	bool _groupCallPushToTalk = false;
 	QByteArray _groupCallPushToTalkShortcut;
+	crl::time _groupCallPushToTalkDelay = 20;
 	Window::Theme::AccentColors _themesAccentColors;
 	bool _lastSeenWarningSeen = false;
 	Ui::SendFilesWay _sendFilesWay;

From fa55fd7dd70a48dd6495c7ca78b5b1c5a834eccc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 6 Dec 2020 16:46:14 +0400
Subject: [PATCH 234/370] Update API scheme.

---
 Telegram/Resources/tl/api.tl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index cb7ea4274..35edc5b54 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -124,7 +124,7 @@ userStatusLastMonth#77ebc742 = UserStatus;
 chatEmpty#9ba2d800 id:int = Chat;
 chat#3bda1bde flags:# creator:flags.0?true kicked:flags.1?true left:flags.2?true deactivated:flags.5?true id:int title:string photo:ChatPhoto participants_count:int date:int version:int migrated_to:flags.6?InputChannel admin_rights:flags.14?ChatAdminRights default_banned_rights:flags.18?ChatBannedRights = Chat;
 chatForbidden#7328bdb id:int title:string = Chat;
-channel#d31a961e flags:# creator:flags.0?true left:flags.2?true broadcast:flags.5?true verified:flags.7?true megagroup:flags.8?true restricted:flags.9?true signatures:flags.11?true min:flags.12?true scam:flags.19?true has_link:flags.20?true has_geo:flags.21?true slowmode_enabled:flags.22?true call_active:flags.23?true id:int access_hash:flags.13?long title:string username:flags.6?string photo:ChatPhoto date:int version:int restriction_reason:flags.9?Vector<RestrictionReason> admin_rights:flags.14?ChatAdminRights banned_rights:flags.15?ChatBannedRights default_banned_rights:flags.18?ChatBannedRights participants_count:flags.17?int = Chat;
+channel#d31a961e flags:# creator:flags.0?true left:flags.2?true broadcast:flags.5?true verified:flags.7?true megagroup:flags.8?true restricted:flags.9?true signatures:flags.11?true min:flags.12?true scam:flags.19?true has_link:flags.20?true has_geo:flags.21?true slowmode_enabled:flags.22?true call_active:flags.23?true call_not_empty:flags.24?true id:int access_hash:flags.13?long title:string username:flags.6?string photo:ChatPhoto date:int version:int restriction_reason:flags.9?Vector<RestrictionReason> admin_rights:flags.14?ChatAdminRights banned_rights:flags.15?ChatBannedRights default_banned_rights:flags.18?ChatBannedRights participants_count:flags.17?int = Chat;
 channelForbidden#289da732 flags:# broadcast:flags.5?true megagroup:flags.8?true id:int access_hash:long title:string until_date:flags.16?int = Chat;
 
 chatFull#1b7c9db3 flags:# can_set_username:flags.7?true has_scheduled:flags.8?true id:int about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int = ChatFull;

From 732bc38e8e6a1b6b33eda46725b5e7b5cab1b232 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 6 Dec 2020 17:28:27 +0400
Subject: [PATCH 235/370] Show chats list badge only for non-empty calls.

---
 Telegram/SourceFiles/data/data_channel.cpp    |  5 ++--
 Telegram/SourceFiles/data/data_channel.h      |  2 +-
 Telegram/SourceFiles/data/data_group_call.cpp | 23 +++++++++++++++++++
 Telegram/SourceFiles/data/data_group_call.h   |  1 +
 .../SourceFiles/data/data_peer_values.cpp     |  2 +-
 Telegram/SourceFiles/data/data_session.cpp    |  6 ++++-
 .../dialogs/dialogs_inner_widget.cpp          |  8 ++-----
 Telegram/SourceFiles/dialogs/dialogs_row.cpp  |  3 ++-
 8 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index e972e4388..4a766585e 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -67,7 +67,7 @@ ChannelData::ChannelData(not_null<Data::Session*> owner, PeerId id)
 				mgInfo = nullptr;
 			}
 		}
-		if (change.diff & MTPDchannel::Flag::f_call_active) {
+		if (change.diff & MTPDchannel::Flag::f_call_not_empty) {
 			if (const auto history = this->owner().historyLoaded(this)) {
 				history->updateChatListEntry();
 			}
@@ -708,7 +708,8 @@ void ChannelData::clearCall() {
 	owner().unregisterGroupCall(_call.get());
 	_call = nullptr;
 	session().changes().peerUpdated(this, UpdateFlag::GroupCall);
-	removeFlags(MTPDchannel::Flag::f_call_active);
+	removeFlags(MTPDchannel::Flag::f_call_active
+		| MTPDchannel::Flag::f_call_not_empty);
 }
 
 namespace Data {
diff --git a/Telegram/SourceFiles/data/data_channel.h b/Telegram/SourceFiles/data/data_channel.h
index b98dec3f4..278799196 100644
--- a/Telegram/SourceFiles/data/data_channel.h
+++ b/Telegram/SourceFiles/data/data_channel.h
@@ -102,7 +102,7 @@ public:
 		| MTPDchannel::Flag::f_restricted
 		| MTPDchannel::Flag::f_signatures
 		| MTPDchannel::Flag::f_username
-		| MTPDchannel::Flag::f_call_active
+		| MTPDchannel::Flag::f_call_not_empty
 		| MTPDchannel::Flag::f_slowmode_enabled;
 	using Flags = Data::Flags<
 		MTPDchannel::Flags,
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index a5df582cf..6e0381331 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -85,13 +85,34 @@ void GroupCall::requestParticipants() {
 		});
 		_participantsSliceAdded.fire({});
 		_participantsRequestId = 0;
+		changeChannelEmptyCallFlag();
 	}).fail([=](const RPCError &error) {
 		_fullCount = _participants.size();
 		_allReceived = true;
 		_participantsRequestId = 0;
+		changeChannelEmptyCallFlag();
 	}).send();
 }
 
+void GroupCall::changeChannelEmptyCallFlag() {
+	constexpr auto flag = MTPDchannel::Flag::f_call_not_empty;
+	if (_channel->call() != this) {
+		return;
+	} else if (fullCount() > 0) {
+		if (!(_channel->flags() & flag)) {
+			_channel->addFlags(flag);
+			_channel->session().changes().peerUpdated(
+				_channel,
+				Data::PeerUpdate::Flag::GroupCall);
+		}
+	} else if (_channel->flags() & flag) {
+		_channel->removeFlags(flag);
+		_channel->session().changes().peerUpdated(
+			_channel,
+			Data::PeerUpdate::Flag::GroupCall);
+	}
+}
+
 int GroupCall::fullCount() const {
 	return _fullCount.current();
 }
@@ -138,6 +159,7 @@ void GroupCall::applyCall(const MTPGroupCall &call, bool force) {
 		_canChangeJoinMuted = data.is_can_change_join_muted();
 		_version = data.vversion().v;
 		_fullCount = data.vparticipants_count().v;
+		changeChannelEmptyCallFlag();
 	}, [&](const MTPDgroupCallDiscarded &data) {
 		const auto id = _id;
 		const auto channel = _channel;
@@ -240,6 +262,7 @@ void GroupCall::applyParticipantsSlice(
 	}
 	if (sliceSource == ApplySliceSource::UpdateReceived) {
 		_fullCount = changedCount;
+		changeChannelEmptyCallFlag();
 	}
 }
 
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 56d480297..947fed4d9 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -78,6 +78,7 @@ private:
 	void applyParticipantsMutes(
 		const MTPDupdateGroupCallParticipants &update);
 	void requestUnknownSsrcs();
+	void changeChannelEmptyCallFlag();
 
 	const not_null<ChannelData*> _channel;
 	const uint64 _id = 0;
diff --git a/Telegram/SourceFiles/data/data_peer_values.cpp b/Telegram/SourceFiles/data/data_peer_values.cpp
index 74eb650bf..85f28a301 100644
--- a/Telegram/SourceFiles/data/data_peer_values.cpp
+++ b/Telegram/SourceFiles/data/data_peer_values.cpp
@@ -443,7 +443,7 @@ bool IsUserOnline(not_null<UserData*> user) {
 }
 
 bool ChannelHasActiveCall(not_null<ChannelData*> channel) {
-	return (channel->flags() & MTPDchannel::Flag::f_call_active);
+	return (channel->flags() & MTPDchannel::Flag::f_call_not_empty);
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index bf914276c..ca9ee4f56 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -686,7 +686,11 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 			} else {
 				channel->setUnavailableReasons({});
 			}
-			channel->setFlags(data.vflags().v);
+			const auto callFlag = MTPDchannel::Flag::f_call_not_empty;
+			const auto callNotEmpty = (data.vflags().v & callFlag)
+				|| (channel->call() && channel->call()->fullCount() > 0);
+			channel->setFlags(data.vflags().v
+				| (callNotEmpty ? callFlag : MTPDchannel::Flag(0)));
 			//if (const auto feedId = data.vfeed_id()) { // #feed
 			//	channel->setFeed(feed(feedId->v));
 			//} else {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 63ca47022..67adfa4f3 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -3010,9 +3010,7 @@ void InnerWidget::userOnlineUpdated(not_null<PeerData*> peer) {
 	if (!history) {
 		return;
 	}
-	updateRowCornerStatusShown(
-		history,
-		Data::OnlineTextActive(user, base::unixtime::now()));
+	updateRowCornerStatusShown(history, Data::IsUserOnline(user));
 }
 
 void InnerWidget::groupHasCallUpdated(not_null<PeerData*> peer) {
@@ -3024,9 +3022,7 @@ void InnerWidget::groupHasCallUpdated(not_null<PeerData*> peer) {
 	if (!history) {
 		return;
 	}
-	updateRowCornerStatusShown(
-		history,
-		group->flags() & MTPDchannel::Flag::f_call_active);
+	updateRowCornerStatusShown(history, Data::ChannelHasActiveCall(group));
 }
 
 void InnerWidget::updateRowCornerStatusShown(
diff --git a/Telegram/SourceFiles/dialogs/dialogs_row.cpp b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
index ba46161dd..0159eee80 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_row.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_row.cpp
@@ -238,13 +238,13 @@ void BasicRow::paintUserpic(
 	if (historyForCornerBadge->peer->isUser()) {
 		return;
 	}
-	p.setOpacity(shown);
 	const auto actionPainter = historyForCornerBadge->sendActionPainter();
 	const auto bg = active
 		? st::dialogsBgActive
 		: st::dialogsBg;
 	const auto size = st::dialogsCallBadgeSize;
 	const auto skip = st::dialogsCallBadgeSkip;
+	p.setOpacity(shown);
 	p.translate(st::dialogsPadding);
 	actionPainter->paintSpeaking(
 		p,
@@ -254,6 +254,7 @@ void BasicRow::paintUserpic(
 		bg,
 		now);
 	p.translate(-st::dialogsPadding);
+	p.setOpacity(1.);
 }
 
 Row::Row(Key key, int pos) : _id(key), _pos(pos) {

From 78067fd996aa4771cd29ab558856c79f34efdf78 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 6 Dec 2020 17:53:17 +0400
Subject: [PATCH 236/370] Improve group call window controls on Windows.

---
 .../Resources/icons/title_button_close.png    | Bin 164 -> 0 bytes
 .../Resources/icons/title_button_close@2x.png | Bin 224 -> 0 bytes
 .../Resources/icons/title_button_close@3x.png | Bin 376 -> 0 bytes
 .../Resources/icons/title_button_maximize.png | Bin 119 -> 0 bytes
 .../icons/title_button_maximize@2x.png        | Bin 144 -> 0 bytes
 .../icons/title_button_maximize@3x.png        | Bin 184 -> 0 bytes
 .../Resources/icons/title_button_minimize.png | Bin 100 -> 0 bytes
 .../icons/title_button_minimize@2x.png        | Bin 122 -> 0 bytes
 .../icons/title_button_minimize@3x.png        | Bin 149 -> 0 bytes
 .../Resources/icons/title_button_restore.png  | Bin 136 -> 0 bytes
 .../icons/title_button_restore@2x.png         | Bin 160 -> 0 bytes
 .../icons/title_button_restore@3x.png         | Bin 209 -> 0 bytes
 Telegram/SourceFiles/calls/calls.style        |  63 ++++++++++++++++++
 .../SourceFiles/calls/calls_group_panel.cpp   |   2 +-
 Telegram/lib_ui                               |   2 +-
 15 files changed, 65 insertions(+), 2 deletions(-)
 delete mode 100644 Telegram/Resources/icons/title_button_close.png
 delete mode 100644 Telegram/Resources/icons/title_button_close@2x.png
 delete mode 100644 Telegram/Resources/icons/title_button_close@3x.png
 delete mode 100644 Telegram/Resources/icons/title_button_maximize.png
 delete mode 100644 Telegram/Resources/icons/title_button_maximize@2x.png
 delete mode 100644 Telegram/Resources/icons/title_button_maximize@3x.png
 delete mode 100644 Telegram/Resources/icons/title_button_minimize.png
 delete mode 100644 Telegram/Resources/icons/title_button_minimize@2x.png
 delete mode 100644 Telegram/Resources/icons/title_button_minimize@3x.png
 delete mode 100644 Telegram/Resources/icons/title_button_restore.png
 delete mode 100644 Telegram/Resources/icons/title_button_restore@2x.png
 delete mode 100644 Telegram/Resources/icons/title_button_restore@3x.png

diff --git a/Telegram/Resources/icons/title_button_close.png b/Telegram/Resources/icons/title_button_close.png
deleted file mode 100644
index 22cfe520c4a6e3b0da93e628ac6a63dbdfbd3ff8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^{2(?58;~rMGjRk`*`6+rAsQ36PCCeYK!JzZ_o&Ft
z`u;Nqnc@!D25x0hoV99NMMBZ0NdXKTp0be!2j1~by6iNm;QNEs@{=a1OuF^aFvjU2
zQ_lwuodcG8CjM|P+Vy<<<#pfZZoS69koN7y(wU7<zTOM1s&SjY?>VRCw<o#lSMt9C
PTFc<+>gTe~DWM4fa(F?q

diff --git a/Telegram/Resources/icons/title_button_close@2x.png b/Telegram/Resources/icons/title_button_close@2x.png
deleted file mode 100644
index e43b4d8a7f57ad85cab66305bb7f748d60fcbf96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 224
zcmV<603ZK}P)<h;3K|Lk000e1NJLTq0015U000^Y1^@s6prP!v0001|Nkl<ZNQv#%
z(F(&b2nA5PpS)iu=zj)op8{jEF-c*Lu?s#`JR!764-ugh<WYhC;kN(~Gg}_2ssbSG
zV^jdx<L+TkRPIiaY^@Q%s5gFKW_->J-q9X2TZf}TBYdSdg=YtDpgEik-bCl%E8qq?
z4@dY7bPc}3H&B+HTryhKYn5zu$;(ypIh7nBB}Zo2B~f-Qc05^iSgM+#Ji7kreCI#c
aPr@fwnMp8>+vjos0000<MNUMnLSTa5Zdbhk

diff --git a/Telegram/Resources/icons/title_button_close@3x.png b/Telegram/Resources/icons/title_button_close@3x.png
deleted file mode 100644
index 18c8496e155a4fe123a871e5e3473f821b82a346..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 376
zcmV-;0f+vHP)<h;3K|Lk000e1NJLTq001oj001Wl1^@s6n}Nan0003$Nkl<ZScUD_
zL5_tW3<lu7X~G%H_1eI}^cp0c6_dAkDwWn5C;kaLkT1|E@&W*bo8{}b0cY}{ugZhI
zDkd}$0W$+4x=fCUAR<6S=CL}`h)7#&s;XK_QA8XXx783)YptrP+FDa0vW!3Olym+8
z_sqcG!97O!aVHVcPdNks1nv<LKlI*27Wm$CYOR(9m|vk0xFdKRJp*?J+t6p=0bo1Y
z0uKV8Lyy2yN>SkR=p*>DEK%S&^btG=JdYlQJA!@C0H7%)UDtK9R8mS_;Okb}<B;Ws
zw$!vEd=6Yn*(`}bxIehoy8E7Xfct|-zKD}>Kd|-eF#(SQ2f|~)LGXBR0Q|TUGrMi=
z9-Nu|&{zG9=bU|O`W+r|?_mIsqdT0L-Odn*s3Ky$sL@xK-zoq90`jlqL0^?yqQ3!4
Wn%LNot(hYL0000<MNUMnLSTaCZK(GE

diff --git a/Telegram/Resources/icons/title_button_maximize.png b/Telegram/Resources/icons/title_button_maximize.png
deleted file mode 100644
index 2759b3f41fb4546fd9657d29a75ff0376a61f91a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^0w6XA8<1SE`<)7qvh#Ft4AGdFoRX06<Gcf7!Xg)A
zW+31;dj7xuk<8%}Cp?tJ6E-tSCKM|k)stXjOW<`$T0B`xFCj(Z#S$I{-#Bh5ufO>w
QK$93eUHx3vIVCg!0O)}s5dZ)H

diff --git a/Telegram/Resources/icons/title_button_maximize@2x.png b/Telegram/Resources/icons/title_button_maximize@2x.png
deleted file mode 100644
index 00daaae190fcb9c1850a3310d52ce1d8b17e11ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ey!3HF+&5pANQsJI1jv*eMZ>Je@9WdZw_Fwq_
z|0e5HPSXmGj1?xgocSUx!~!I?&go}oc<@pxw0yDR%guS^3Jkeyex=55OwLZY+sMG8
rz`!Vxf9Ur9$J2nkj+mqM>=le|%G@S}f<ixmRxo(F`njxgN@xNAg=a0K

diff --git a/Telegram/Resources/icons/title_button_maximize@3x.png b/Telegram/Resources/icons/title_button_maximize@3x.png
deleted file mode 100644
index 4d8073fd5a8adfb1dd13a0ce7766ecf1551536f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^20*ON!3HEfFP>fkr0P9g977^n-`))5YB1nox#;`x
zpL?EdW7M5P0yn<L9y}<-G;PV!V{Ct!*0Ed=a@bwQxArK{s#U*iF8||JX_&@v>zYWF
z(XpBTET6wmU(0Y(exvo`Prkpkr!Yh@WpFM~1*(Yp%}_nFc)H<q(Fbb|F5j}>2_zhL
fik~kGq~fkvK3~v*@74E!PGRtL^>bP0l+XkK=VnL=

diff --git a/Telegram/Resources/icons/title_button_minimize.png b/Telegram/Resources/icons/title_button_minimize.png
deleted file mode 100644
index 85934ddde82b3cd1145635cb7d27990c40a2d6ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^0w6XA8<1SE`<)7q()M(54AGdFoRX06<Gcf7!XlT?
yD;N(SV-QO@_y7NqrJ8PTZm)JWOiWxb*@)rFbymr6QOEB<Z492SelF{r5}E)<KOgx3

diff --git a/Telegram/Resources/icons/title_button_minimize@2x.png b/Telegram/Resources/icons/title_button_minimize@2x.png
deleted file mode 100644
index d70a497345422f53019806ba8e63117d01e31278..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ey!3HF+&5pANQjVT3jv*eMZ?A3SWia4iK3G2G
zZ@3zFi=L3{JRz?6D`XZ(%rTYJb7){-WMbhEVA!zR`ReUOQ=aUS|KHG%p#4v_fWb0@
V)mTvD=VG8?44$rjF6*2UngCEZBTxVU

diff --git a/Telegram/Resources/icons/title_button_minimize@3x.png b/Telegram/Resources/icons/title_button_minimize@3x.png
deleted file mode 100644
index 93e36c271dd9953cc321759af5337f39141de495..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^20*ON!3HEfFP>fkq+&c>977^n-`+IjI$*%Va&Y&9
z|Mih|PE49&2mRI_>bBbHsn%`#h54URLmI<bhFOdz%o%JKcos-H7()fNd}Vxo`T|dJ
oZO(72&2`KmNz=N54Im}EWp!A6H=Mob1GI<1)78&qol`;+06e!cH~;_u

diff --git a/Telegram/Resources/icons/title_button_restore.png b/Telegram/Resources/icons/title_button_restore.png
deleted file mode 100644
index c9f276b51732c3288cbfd0f6fcb37689c993d295..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^0w6XA8<1SE`<)7q^7nLc4AGdlb+R{?gCY;J`lG+=
zW5N$Pzh-}QdQ)qr(~5=z0cYC;)0e3*bQRaWTyWXA_uZ?kLhd?w#oe2V)2)9jZ=HLr
kL-@h6-t})d4*h9mOA8iM_L-zo4m6s<)78&qol`;+0BFE5bpQYW

diff --git a/Telegram/Resources/icons/title_button_restore@2x.png b/Telegram/Resources/icons/title_button_restore@2x.png
deleted file mode 100644
index 63c3e1b1e0ff1333fe1b1771c82493c2403cb0f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ey!3HF+&5pANQt6&9jv*eMZ>I-x9WdZ=Dt+@W
z{M<fsjfs~M7yc6G2#Moa$P!@is>qIyVf(F!t!yGE!*kUIn2Xr<Z4SPgnr_cjzqD4x
zx=|uyyTjb4Ic0BHk`&mUL>sKm>;9&`;gwlW3Q+Npm;amC7jp^PvS%t^16s-8>FVdQ
I&MBb@0A_(UdjJ3c

diff --git a/Telegram/Resources/icons/title_button_restore@3x.png b/Telegram/Resources/icons/title_button_restore@3x.png
deleted file mode 100644
index 44b93232b2bf02340aee9fd69ea25cba61f75308..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^20*ON!3HEfFP>fkq-J=!IEF;DzMUD!bwGi~Ir`?`
z{x!P~v}|2^dehTduBQHJZWqtyNE$NNHfViea!>snb-r}|?)Y_=!yTA1R2r6<w3ba?
z=v1=lVt7Mb!fmH~j+NFIAW~{FDalXfKA-b)uXT{;9LbHcD|5d!icMmW;#@G1Vb-PY
zHO(1ue>OA4uAHT)bD?nlN{9PSLJrD|CV9V<4?F1>Fh#x+iJtuVtu4@v44$rjF6*2U
FngGSRQknn&

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index abc37b882..0677bb9c6 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -687,6 +687,69 @@ groupCallDelaySlider: MediaSlider(defaultContinuousSlider) {
 }
 groupCallDelayMargin: margins(22px, 5px, 20px, 10px);
 
+groupCallTitleButton: IconButton {
+	width: 24px;
+	height: 21px;
+	iconPosition: point(0px, 0px);
+}
+groupCallTitleMinimizeIcon: icon {
+	{ "title_button_minimize", groupCallMemberNotJoinedStatus, point(4px, 4px) },
+};
+groupCallTitleMinimizeIconOver: icon {
+	{ size(24px, 21px), groupCallMembersBgOver },
+	{ "title_button_minimize", groupCallMembersFg, point(4px, 4px) },
+};
+groupCallTitleMaximizeIcon: icon {
+	{ "title_button_maximize", groupCallMemberNotJoinedStatus, point(4px, 4px) },
+};
+groupCallTitleMaximizeIconOver: icon {
+	{ size(24px, 21px), groupCallMembersBgOver },
+	{ "title_button_maximize", groupCallMembersFg, point(4px, 4px) },
+};
+groupCallTitleRestoreIcon: icon {
+	{ "title_button_restore", groupCallMemberNotJoinedStatus, point(4px, 4px) },
+};
+groupCallTitleRestoreIconOver: icon {
+	{ size(24px, 21px), groupCallMembersBgOver },
+	{ "title_button_restore", groupCallMembersFg, point(4px, 4px) },
+};
+groupCallTitleCloseIcon: icon {
+	{ "title_button_close", groupCallMemberNotJoinedStatus, point(4px, 4px) },
+};
+groupCallTitleCloseIconOver: icon {
+	{ size(24px, 21px), titleButtonCloseBgOver },
+	{ "title_button_close", titleButtonCloseFgOver, point(4px, 4px) },
+};
+groupCallTitle: WindowTitle(defaultWindowTitle) {
+	height: 0px;
+	bg: groupCallBg;
+	bgActive: groupCallBg;
+	fg: transparent;
+	fgActive: transparent;
+	minimize: IconButton(groupCallTitleButton) {
+		icon: groupCallTitleMinimizeIcon;
+		iconOver: groupCallTitleMinimizeIconOver;
+	}
+	minimizeIconActive: groupCallTitleMinimizeIcon;
+	minimizeIconActiveOver: groupCallTitleMinimizeIconOver;
+	maximize: IconButton(groupCallTitleButton) {
+		icon: groupCallTitleMaximizeIcon;
+		iconOver: groupCallTitleMaximizeIconOver;
+	}
+	maximizeIconActive: groupCallTitleMaximizeIcon;
+	maximizeIconActiveOver: groupCallTitleMaximizeIconOver;
+	restoreIcon: groupCallTitleRestoreIcon;
+	restoreIconOver: groupCallTitleRestoreIconOver;
+	restoreIconActive: groupCallTitleRestoreIcon;
+	restoreIconActiveOver: groupCallTitleRestoreIconOver;
+	close: IconButton(groupCallTitleButton) {
+		icon: groupCallTitleCloseIcon;
+		iconOver: groupCallTitleCloseIconOver;
+	}
+	closeIconActive: groupCallTitleCloseIcon;
+	closeIconActiveOver: groupCallTitleCloseIconOver;
+}
+
 callTopBarMuteCrossLine: CrossLineAnimation {
 	fg: callBarFg;
 	icon: icon {{ "calls/call_record_active", callBarFg }};
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index fab99d7b6..b3132c43b 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -217,7 +217,7 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 #ifdef Q_OS_WIN
 , _controls(std::make_unique<Ui::Platform::TitleControls>(
 	_window.get(),
-	st::callTitle))
+	st::groupCallTitle))
 #endif // Q_OS_WIN
 , _members(widget(), call)
 , _settings(widget(), st::groupCallSettings)
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index f24411cd9..577e8f94a 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit f24411cd96b2e3503d572418a63d2df8bae90fc9
+Subproject commit 577e8f94ab538b3b4b2a1365a078293c92506616

From bfce832a7af106ec9bd0056d5bd1cb225daf84eb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 6 Dec 2020 18:12:24 +0400
Subject: [PATCH 237/370] Don't leave call when joining other call from other
 device.

---
 Telegram/SourceFiles/calls/calls_instance.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index e5e9f9510..38e3fb256 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -411,7 +411,8 @@ void Instance::handleGroupCallUpdate(
 		existing->applyUpdate(update);
 	}
 	if (_currentGroupCall
-		&& (&_currentGroupCall->channel()->session() == session)) {
+		&& (&_currentGroupCall->channel()->session() == session)
+		&& (_currentGroupCall->id() == callId)) {
 		_currentGroupCall->handleUpdate(update);
 	}
 }

From 628a02d99cf4aa21e09d26ad0635fce8b6acb2ac Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 6 Dec 2020 19:13:18 +0400
Subject: [PATCH 238/370] Hide push to talk release delay option by default.

---
 .../SourceFiles/calls/calls_group_call.cpp    |   9 +-
 .../calls/calls_group_settings.cpp            | 100 ++++++++++--------
 Telegram/lib_base                             |   2 +-
 3 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index b90eef418..6082a0150 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -746,13 +746,8 @@ auto GroupCall::ensureGlobalShortcutManager()
 
 void GroupCall::applyGlobalShortcutChanges() {
 	auto &settings = Core::App().settings();
-	if (!settings.groupCallPushToTalk()) {
-		_shortcutManager = nullptr;
-		_pushToTalk = nullptr;
-		return;
-	} else if (settings.groupCallPushToTalkShortcut().isEmpty()) {
-		settings.setGroupCallPushToTalk(false);
-		Core::App().saveSettingsDelayed();
+	if (!settings.groupCallPushToTalk()
+		|| settings.groupCallPushToTalkShortcut().isEmpty()) {
 		_shortcutManager = nullptr;
 		_pushToTalk = nullptr;
 		return;
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
index 4b993c009..15e3fb3cb 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -200,38 +200,25 @@ void GroupCallSettingsBox(
 			tr::lng_group_call_push_to_talk(),
 			st::groupCallSettingsButton
 		)->toggleOn(rpl::single(settings.groupCallPushToTalk()));
-		const auto recordingWrap = layout->add(
-			object_ptr<Ui::SlideWrap<Button>>(
+		const auto pushToTalkWrap = layout->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 				layout,
-				object_ptr<Button>(
-					layout,
-					state->recordText.value(),
-					st::groupCallSettingsButton)));
-		const auto recording = recordingWrap->entity();
+				object_ptr<Ui::VerticalLayout>(layout)));
+		const auto pushToTalkInner = pushToTalkWrap->entity();
+		const auto recording = pushToTalkInner->add(
+			object_ptr<Button>(
+				layout,
+				state->recordText.value(),
+				st::groupCallSettingsButton));
 		CreateRightLabel(
 			recording,
 			state->shortcutText.value(),
 			st::groupCallSettingsButton,
 			state->recordText.value());
-		const auto startRecording = [=] {
-			state->recording = true;
-			state->recordText = tr::lng_group_call_ptt_recording();
-			auto progress = crl::guard(box, [=](GlobalShortcut shortcut) {
-				state->shortcutText = shortcut->toDisplayString();
-			});
-			auto done = crl::guard(box, [=](GlobalShortcut shortcut) {
-				state->recording = false;
-				state->shortcut = shortcut;
-				state->shortcutText = shortcut
-					? shortcut->toDisplayString()
-					: QString();
-				state->recordText = tr::lng_group_call_ptt_shortcut();
-				Core::App().settings().setGroupCallPushToTalkShortcut(shortcut
-					? shortcut->serialize()
-					: QByteArray());
-				Core::App().saveSettingsDelayed();
-			});
-			manager->startRecording(std::move(progress), std::move(done));
+
+		const auto applyAndSave = [=] {
+			call->applyGlobalShortcutChanges();
+			Core::App().saveSettingsDelayed();
 		};
 		const auto stopRecording = [=] {
 			state->recording = false;
@@ -239,8 +226,27 @@ void GroupCallSettingsBox(
 			state->shortcutText = state->shortcut
 				? state->shortcut->toDisplayString()
 				: QString();
+			recording->setColorOverride(std::nullopt);
 			manager->stopRecording();
 		};
+		const auto startRecording = [=] {
+			state->recording = true;
+			state->recordText = tr::lng_group_call_ptt_recording();
+			recording->setColorOverride(
+				st::groupCallSettingsAttentionButton.textFg->c);
+			auto progress = crl::guard(box, [=](GlobalShortcut shortcut) {
+				state->shortcutText = shortcut->toDisplayString();
+			});
+			auto done = crl::guard(box, [=](GlobalShortcut shortcut) {
+				state->shortcut = shortcut;
+				Core::App().settings().setGroupCallPushToTalkShortcut(shortcut
+					? shortcut->serialize()
+					: QByteArray());
+				applyAndSave();
+				stopRecording();
+			});
+			manager->startRecording(std::move(progress), std::move(done));
+		};
 		recording->addClickHandler([=] {
 			if (state->recording) {
 				stopRecording();
@@ -248,21 +254,11 @@ void GroupCallSettingsBox(
 				startRecording();
 			}
 		});
-		recordingWrap->toggle(
-			settings.groupCallPushToTalk(),
-			anim::type::instant);
-		pushToTalk->toggledChanges(
-		) | rpl::start_with_next([=](bool toggled) {
-			if (!toggled) {
-				stopRecording();
-			}
-			Core::App().settings().setGroupCallPushToTalk(toggled);
-			Core::App().saveSettingsDelayed();
-			recordingWrap->toggle(toggled, anim::type::normal);
-		}, pushToTalk->lifetime());
 
-		const auto label = layout->add(
-			object_ptr<Ui::LabelSimple>(layout, st::groupCallDelayLabel),
+		const auto label = pushToTalkInner->add(
+			object_ptr<Ui::LabelSimple>(
+				pushToTalkInner,
+				st::groupCallDelayLabel),
 			st::groupCallDelayLabelMargin);
 		const auto value = std::clamp(
 			state->delay,
@@ -275,11 +271,13 @@ void GroupCallSettingsBox(
 				lt_delay,
 				FormatDelay(delay)));
 			Core::App().settings().setGroupCallPushToTalkDelay(delay);
-			Core::App().saveSettingsDelayed();
+			applyAndSave();
 		};
 		callback(value);
-		const auto slider = layout->add(
-			object_ptr<Ui::MediaSlider>(layout, st::groupCallDelaySlider),
+		const auto slider = pushToTalkInner->add(
+			object_ptr<Ui::MediaSlider>(
+				pushToTalkInner,
+				st::groupCallDelaySlider),
 			st::groupCallDelayMargin);
 		slider->resize(st::groupCallDelaySlider.seekSize);
 		slider->setPseudoDiscrete(
@@ -288,10 +286,18 @@ void GroupCallSettingsBox(
 			value,
 			callback);
 
-		box->boxClosing(
-		) | rpl::start_with_next([=] {
-			call->applyGlobalShortcutChanges();
-		}, box->lifetime());
+		pushToTalkWrap->toggle(
+			settings.groupCallPushToTalk(),
+			anim::type::instant);
+		pushToTalk->toggledChanges(
+		) | rpl::start_with_next([=](bool toggled) {
+			if (!toggled) {
+				stopRecording();
+			}
+			Core::App().settings().setGroupCallPushToTalk(toggled);
+			applyAndSave();
+			pushToTalkWrap->toggle(toggled, anim::type::normal);
+		}, pushToTalk->lifetime());
 
 		auto boxKeyFilter = [=](not_null<QEvent*> e) {
 			return (e->type() == QEvent::KeyPress && state->recording)
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 79b9ed178..aadebb110 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 79b9ed178aa1fa9779afb51470f571c4153866fc
+Subproject commit aadebb110e2fe3438cf99b64427b604564ea4ade

From 54567a42534ffb2bfe334942f96184adea8c78bb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 6 Dec 2020 18:01:37 +0300
Subject: [PATCH 239/370] Replaced Application::appDeactivates with
 appDeactivatedValue.

---
 .../SourceFiles/calls/calls_group_members.cpp   |  2 +-
 .../SourceFiles/calls/calls_group_panel.cpp     |  2 +-
 Telegram/SourceFiles/core/application.cpp       | 17 +++++++++++------
 Telegram/SourceFiles/core/application.h         |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 6b190731f..b173239af 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -521,7 +521,7 @@ MembersController::MembersController(
 
 	rpl::combine(
 		rpl::single(anim::Disabled()) | rpl::then(anim::Disables()),
-		rpl::single(false) | rpl::then(Core::App().appDeactivates())
+		rpl::single(false) | rpl::then(Core::App().appDeactivatedValue())
 	) | rpl::start_with_next([=](bool animDisabled, bool deactivated) {
 		const auto hide = !(!animDisabled && !deactivated);
 
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index b3132c43b..80339859d 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -223,7 +223,7 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 , _settings(widget(), st::groupCallSettings)
 , _mute(std::make_unique<Ui::CallMuteButton>(
 	widget(),
-	Core::App().appDeactivates(),
+	Core::App().appDeactivatedValue(),
 	Ui::CallMuteButtonState{
 		.text = tr::lng_group_call_connecting(tr::now),
 		.type = Ui::CallMuteButtonType::Connecting,
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 211316c7b..2d2b59b9e 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -247,7 +247,7 @@ void Application::run() {
 
 	QCoreApplication::instance()->installEventFilter(this);
 
-	appDeactivates(
+	appDeactivatedValue(
 	) | rpl::start_with_next([=](bool deactivated) {
 		if (deactivated) {
 			handleAppDeactivated();
@@ -652,11 +652,16 @@ void Application::handleAppDeactivated() {
 	Ui::Tooltip::Hide();
 }
 
-rpl::producer<bool> Application::appDeactivates() const {
-	return base::qt_signal_producer(
-		static_cast<QGuiApplication*>(QCoreApplication::instance()),
-		&QGuiApplication::applicationStateChanged
-	) | rpl::map([=](Qt::ApplicationState state) {
+rpl::producer<bool> Application::appDeactivatedValue() const {
+	const auto &app =
+		static_cast<QGuiApplication*>(QCoreApplication::instance());
+	return rpl::single(
+		app->applicationState()
+	) | rpl::then(
+		base::qt_signal_producer(
+			app,
+			&QGuiApplication::applicationStateChanged
+	)) | rpl::map([=](Qt::ApplicationState state) {
 		return (state != Qt::ApplicationActive);
 	});
 }
diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h
index 1238bd39d..82b5cd390 100644
--- a/Telegram/SourceFiles/core/application.h
+++ b/Telegram/SourceFiles/core/application.h
@@ -271,7 +271,7 @@ public:
 
 	void handleAppActivated();
 	void handleAppDeactivated();
-	[[nodiscard]] rpl::producer<bool> appDeactivates() const;
+	[[nodiscard]] rpl::producer<bool> appDeactivatedValue() const;
 
 	void switchDebugMode();
 	void switchFreeType();

From e97140a311dd66513519df1c39d5ab8cbb4d4870 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 6 Dec 2020 19:56:42 +0300
Subject: [PATCH 240/370] Fixed blob animations in group calls with enabled
 push-to-talk.

---
 .../SourceFiles/calls/calls_group_members.cpp | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index b173239af..9acddb3b3 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -86,6 +86,7 @@ public:
 		Muted,
 	};
 
+	void setSkipLevelUpdate(bool value);
 	void updateState(const Data::GroupCall::Participant *participant);
 	void updateLevel(float level);
 	void updateBlobAnimation(crl::time now);
@@ -171,6 +172,7 @@ private:
 	Ui::Animations::Simple _activeAnimation; // For icon cross animation.
 	uint32 _ssrc = 0;
 	bool _speaking = false;
+	bool _skipLevelUpdate = false;
 
 };
 
@@ -268,6 +270,10 @@ Row::Row(not_null<RowDelegate*> delegate, not_null<UserData*> user)
 	refreshStatus();
 }
 
+void Row::setSkipLevelUpdate(bool value) {
+	_skipLevelUpdate = value;
+}
+
 void Row::updateState(const Data::GroupCall::Participant *participant) {
 	setSsrc(participant ? participant->ssrc : 0);
 	if (!participant) {
@@ -346,6 +352,10 @@ void Row::setSsrc(uint32 ssrc) {
 void Row::updateLevel(float level) {
 	Expects(_blobsAnimation != nullptr);
 
+	if (_skipLevelUpdate) {
+		return;
+	}
+
 	if (level >= GroupCall::kSpeakLevelThreshold) {
 		_blobsAnimation->lastSpeakingUpdateTime = crl::now();
 	}
@@ -521,7 +531,7 @@ MembersController::MembersController(
 
 	rpl::combine(
 		rpl::single(anim::Disabled()) | rpl::then(anim::Disables()),
-		rpl::single(false) | rpl::then(Core::App().appDeactivatedValue())
+		Core::App().appDeactivatedValue()
 	) | rpl::start_with_next([=](bool animDisabled, bool deactivated) {
 		const auto hide = !(!animDisabled && !deactivated);
 
@@ -532,16 +542,17 @@ MembersController::MembersController(
 			if (hide) {
 				updateRowLevel(row, 0.);
 			}
-			if (!hide && !_speakingAnimation.animating()) {
-				_speakingAnimation.start();
-			}
+			row->setSkipLevelUpdate(hide);
+		}
+		if (!hide && !_speakingAnimation.animating()) {
+			_speakingAnimation.start();
 		}
 		_skipRowLevelUpdate = hide;
 	}, _lifetime);
 
 	_speakingAnimation.init([=](crl::time now) {
 		if (const auto &last = _speakingAnimationHideLastTime; (last > 0)
-			&& (now - last >= Ui::Paint::Blobs::kHideBlobsDuration)) {
+			&& (now - last >= kBlobsEnterDuration)) {
 			_speakingAnimation.stop();
 			return false;
 		}
@@ -688,6 +699,7 @@ void MembersController::updateRow(
 		const Data::GroupCall::Participant *participant) {
 	const auto wasSpeaking = row->speaking();
 	const auto wasSsrc = row->ssrc();
+	row->setSkipLevelUpdate(_skipRowLevelUpdate);
 	row->updateState(participant);
 	const auto nowSpeaking = row->speaking();
 	const auto nowSsrc = row->ssrc();

From 25ffdcc919e50ac222b88a2188a9e8396ec6c960 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 7 Dec 2020 15:50:22 +0400
Subject: [PATCH 241/370] Update Qt to 5.15.2.

---
 .../chat_helpers/spellchecker_common.cpp           |  2 +-
 Telegram/build/docker/centos_env/Dockerfile        | 10 +++++-----
 Telegram/lib_ui                                    |  2 +-
 cmake                                              |  2 +-
 docs/building-msvc.md                              | 14 +++++++-------
 docs/building-xcode.md                             | 14 +++++++-------
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp b/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp
index 9b04c3e65..9574a7511 100644
--- a/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp
+++ b/Telegram/SourceFiles/chat_helpers/spellchecker_common.cpp
@@ -91,7 +91,7 @@ const auto kDictionaries = {
 	Dict{{ QLocale::Korean,              615, 1'256'987, "\xed\x95\x9c\xea\xb5\xad\xec\x96\xb4" }}, // ko_KR
 	Dict{{ QLocale::Lithuanian,          616,   267'427, "\x4c\x69\x65\x74\x75\x76\x69\xc5\xb3" }}, // lt_LT
 	Dict{{ QLocale::Latvian,             617,   641'602, "\x4c\x61\x74\x76\x69\x65\xc5\xa1\x75" }}, // lv_LV
-	Dict{{ QLocale::Norwegian,           618,   588'650, "\x4e\x6f\x72\x73\x6b" }}, // nb_NO
+	Dict{{ QLocale::NorwegianBokmal,     618,   588'650, "\x4e\x6f\x72\x73\x6b" }}, // nb_NO
 	Dict{{ QLocale::Dutch,               619,   743'406, "\x4e\x65\x64\x65\x72\x6c\x61\x6e\x64\x73" }}, // nl_NL
 	Dict{{ QLocale::Polish,              620, 1'015'747, "\x50\x6f\x6c\x73\x6b\x69" }}, // pl_PL
 	Dict{{ QLocale::Portuguese,          621, 1'231'999, "\x50\x6f\x72\x74\x75\x67\x75\xc3\xaa\x73 (Brazil)" }}, // pt_BR
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index e3f3b23f3..bb0061188 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -2,9 +2,9 @@ FROM centos:7 AS builder
 
 ENV GIT https://github.com
 ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig
-ENV QT 5_15_1
-ENV QT_TAG v5.15.1
-ENV QT_PREFIX /usr/local/desktop-app/Qt-5.15.1
+ENV QT 5_15_2
+ENV QT_TAG v5.15.2
+ENV QT_PREFIX /usr/local/desktop-app/Qt-5.15.2
 ENV OPENSSL_VER 1_1_1
 ENV OPENSSL_PREFIX /usr/local/desktop-app/openssl-1.1.1
 
@@ -28,7 +28,7 @@ WORKDIR $LibrariesPath
 
 FROM builder AS patches
 RUN git clone $GIT/desktop-app/patches.git
-RUN cd patches && git checkout e052c49
+RUN cd patches && git checkout f22ccc5
 
 FROM builder AS libffi
 RUN git clone -b v3.3 --depth=1 $GIT/libffi/libffi.git
@@ -489,7 +489,7 @@ COPY --from=openssl ${LibrariesPath}/openssl-cache /
 RUN git clone --recursive $GIT/desktop-app/tg_owt.git
 
 WORKDIR tg_owt
-RUN git checkout c73a471
+RUN git checkout 75ac669
 
 RUN cmake3 -B out/Release . \
 	-DCMAKE_BUILD_TYPE=Release \
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 577e8f94a..ea840471d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 577e8f94ab538b3b4b2a1365a078293c92506616
+Subproject commit ea840471d2330c2763567c2e46b2414af6e0429d
diff --git a/cmake b/cmake
index 4436815d1..28b11b099 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 4436815d19035aaba79cb69b7e2d599ae286297d
+Subproject commit 28b11b099ad54151f38b7d5c0c00ff9ce12d4674
diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index dab0de014..4730d90f8 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -33,7 +33,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     cd ThirdParty
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout e052c49
+    git checkout f22ccc5
     cd ../
     git clone https://chromium.googlesource.com/external/gyp
     cd gyp
@@ -63,7 +63,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
 
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout e052c49
+    git checkout f22ccc5
     cd ..
 
     git clone https://github.com/desktop-app/lzma.git
@@ -161,17 +161,17 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     cd ..
 
     SET LibrariesPath=%cd%
-    git clone git://code.qt.io/qt/qt5.git qt_5_15_1
-    cd qt_5_15_1
+    git clone git://code.qt.io/qt/qt5.git qt_5_15_2
+    cd qt_5_15_2
     perl init-repository --module-subset=qtbase,qtimageformats
-    git checkout v5.15.1
+    git checkout v5.15.2
     git submodule update qtbase qtimageformats
     cd qtbase
-    for /r %i in (..\..\patches\qtbase_5_15_1\*) do git apply %i
+    for /r %i in (..\..\patches\qtbase_5_15_2\*) do git apply %i
     cd ..
 
     configure ^
-        -prefix "%LibrariesPath%\Qt-5.15.1" ^
+        -prefix "%LibrariesPath%\Qt-5.15.2" ^
         -debug-and-release ^
         -force-debug-info ^
         -opensource ^
diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index e1ec69eba..a5b043ed5 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 e052c49
+    git checkout f22ccc5
     cd ../
     git clone https://chromium.googlesource.com/external/gyp
     git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@@ -58,7 +58,7 @@ Go to ***BuildPath*** and run
 
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout e052c49
+    git checkout f22ccc5
     cd ..
 
     git clone https://git.tukaani.org/xz.git
@@ -269,16 +269,16 @@ Go to ***BuildPath*** and run
     ninja -C out/Release
     cd ..
 
-    git clone git://code.qt.io/qt/qt5.git qt_5_15_1
-    cd qt_5_15_1
+    git clone git://code.qt.io/qt/qt5.git qt_5_15_2
+    cd qt_5_15_2
     perl init-repository --module-subset=qtbase,qtimageformats
-    git checkout v5.15.1
+    git checkout v5.15.2
     git submodule update qtbase qtimageformats
     cd qtbase
-    find ../../patches/qtbase_5_15_1 -type f -print0 | sort -z | xargs -0 git apply
+    find ../../patches/qtbase_5_15_2 -type f -print0 | sort -z | xargs -0 git apply
     cd ..
 
-    ./configure -prefix "/usr/local/desktop-app/Qt-5.15.1" \
+    ./configure -prefix "/usr/local/desktop-app/Qt-5.15.2" \
         -debug-and-release \
         -force-debug-info \
         -opensource \

From f11df0519e3ca778e14bdad5e63cd75929f2381e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 7 Dec 2020 15:47:39 +0400
Subject: [PATCH 242/370] Add global shortcut permissions check on macOS.

---
 Telegram/Resources/langs/lang.strings         |   4 +
 .../SourceFiles/calls/calls_group_call.cpp    |  22 ++--
 Telegram/SourceFiles/calls/calls_group_call.h |   1 +
 .../calls/calls_group_settings.cpp            | 109 ++++++++++++++++--
 Telegram/lib_base                             |   2 +-
 5 files changed, 120 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 290aa3ed4..2fbfdf870 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1862,6 +1862,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_duration_minutes#other" = "{count} minutes";
 "lng_group_call_duration_seconds#one" = "{count} second";
 "lng_group_call_duration_seconds#other" = "{count} seconds";
+"lng_group_call_mac_access" = "Telegram Desktop does not have access to system wide keyboard input required for Push to Talk.";
+"lng_group_call_mac_input" = "Please allow **Input Monitoring** for Telegram in Privacy Settings.";
+"lng_group_call_mac_accessibility" = "Please allow **Accessibility** for Telegram in Privacy Settings.\n\nApp restart may be required.";
+"lng_group_call_mac_settings" = "Open Settings";
 
 "lng_no_mic_permission" = "Telegram needs access to your microphone so that you can make calls and record voice messages.";
 
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 6082a0150..fd057e1e6 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -65,6 +65,8 @@ GroupCall::GroupCall(
 		}
 	}, _lifetime);
 
+	checkGlobalShortcutAvailability();
+
 	const auto id = inputCall.c_inputGroupCall().vid().v;
 	if (id) {
 		if (const auto call = _channel->call(); call && call->id() == id) {
@@ -83,6 +85,16 @@ GroupCall::~GroupCall() {
 	destroyController();
 }
 
+void GroupCall::checkGlobalShortcutAvailability() {
+	auto &settings = Core::App().settings();
+	if (!settings.groupCallPushToTalk()) {
+		return;
+	} else if (!base::GlobalShortcutsAllowed()) {
+		settings.setGroupCallPushToTalk(false);
+		Core::App().saveSettingsDelayed();
+	}
+}
+
 void GroupCall::setState(State state) {
 	if (_state.current() == State::Failed) {
 		return;
@@ -747,18 +759,14 @@ auto GroupCall::ensureGlobalShortcutManager()
 void GroupCall::applyGlobalShortcutChanges() {
 	auto &settings = Core::App().settings();
 	if (!settings.groupCallPushToTalk()
-		|| settings.groupCallPushToTalkShortcut().isEmpty()) {
+		|| settings.groupCallPushToTalkShortcut().isEmpty()
+		|| !base::GlobalShortcutsAvailable()
+		|| !base::GlobalShortcutsAllowed()) {
 		_shortcutManager = nullptr;
 		_pushToTalk = nullptr;
 		return;
 	}
 	ensureGlobalShortcutManager();
-	if (!_shortcutManager) {
-		settings.setGroupCallPushToTalk(false);
-		Core::App().saveSettingsDelayed();
-		_pushToTalk = nullptr;
-		return;
-	}
 	const auto shortcut = _shortcutManager->shortcutFromSerialized(
 		settings.groupCallPushToTalkShortcut());
 	if (!shortcut) {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 0c6cc9fbd..6f54d0100 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -154,6 +154,7 @@ private:
 	void checkLastSpoke();
 	void pushToTalkCancel();
 
+	void checkGlobalShortcutAvailability();
 	void checkJoined();
 
 	[[nodiscard]] MTPInputGroupCall inputCall() const;
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
index 15e3fb3cb..04747441b 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -14,10 +14,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/continuous_sliders.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/slide_wrap.h"
+#include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "lang/lang_keys.h"
+#include "base/timer_rpl.h"
 #include "base/event_filter.h"
 #include "base/global_shortcuts.h"
+#include "base/platform/base_platform_info.h"
 #include "data/data_channel.h"
 #include "data/data_group_call.h"
 #include "core/application.h"
@@ -38,6 +41,7 @@ namespace Calls {
 namespace {
 
 constexpr auto kDelaysCount = 201;
+constexpr auto kCheckAccessibilityInterval = crl::time(500);
 
 void SaveCallJoinMuted(
 		not_null<ChannelData*> channel,
@@ -182,24 +186,39 @@ void GroupCallSettingsBox(
 	struct PushToTalkState {
 		rpl::variable<QString> recordText = tr::lng_group_call_ptt_shortcut();
 		rpl::variable<QString> shortcutText;
+		rpl::event_stream<bool> pushToTalkToggles;
+		std::shared_ptr<base::GlobalShortcutManager> manager;
 		GlobalShortcut shortcut;
 		crl::time delay = 0;
 		bool recording = false;
 	};
-	const auto manager = call->ensureGlobalShortcutManager();
-	if (manager) {
+	if (base::GlobalShortcutsAvailable()) {
 		const auto state = box->lifetime().make_state<PushToTalkState>();
-		state->shortcut = manager->shortcutFromSerialized(
-			settings.groupCallPushToTalkShortcut());
+		if (!base::GlobalShortcutsAllowed()) {
+			Core::App().settings().setGroupCallPushToTalk(false);
+		}
+		const auto tryFillFromManager = [=] {
+			state->shortcut = state->manager
+				? state->manager->shortcutFromSerialized(
+					Core::App().settings().groupCallPushToTalkShortcut())
+				: nullptr;
+			state->shortcutText = state->shortcut
+				? state->shortcut->toDisplayString()
+				: QString();
+		};
+		state->manager = settings.groupCallPushToTalk()
+			? call->ensureGlobalShortcutManager()
+			: nullptr;
+		tryFillFromManager();
+
 		state->delay = settings.groupCallPushToTalkDelay();
-		state->shortcutText = state->shortcut
-			? state->shortcut->toDisplayString()
-			: QString();
 		const auto pushToTalk = AddButton(
 			layout,
 			tr::lng_group_call_push_to_talk(),
 			st::groupCallSettingsButton
-		)->toggleOn(rpl::single(settings.groupCallPushToTalk()));
+		)->toggleOn(rpl::single(
+			settings.groupCallPushToTalk()
+		) | rpl::then(state->pushToTalkToggles.events()));
 		const auto pushToTalkWrap = layout->add(
 			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 				layout,
@@ -220,6 +239,65 @@ void GroupCallSettingsBox(
 			call->applyGlobalShortcutChanges();
 			Core::App().saveSettingsDelayed();
 		};
+		const auto showPrivacyRequest = [=] {
+#ifdef Q_OS_MAC
+			if (!Platform::IsMac10_14OrGreater()) {
+				return;
+			}
+			const auto requestInputMonitoring = Platform::IsMac10_15OrGreater();
+			box->getDelegate()->show(Box([=](not_null<Ui::GenericBox*> box) {
+				box->addRow(
+					object_ptr<Ui::FlatLabel>(
+						box.get(),
+						rpl::combine(
+							tr::lng_group_call_mac_access(),
+							(requestInputMonitoring
+								? tr::lng_group_call_mac_input()
+								: tr::lng_group_call_mac_accessibility())
+						) | rpl::map([](QString a, QString b) {
+							auto result = Ui::Text::RichLangValue(a);
+							result.append("\n\n").append(Ui::Text::RichLangValue(b));
+							return result;
+						}),
+						st::groupCallBoxLabel),
+					style::margins(
+						st::boxRowPadding.left(),
+						st::boxPadding.top(),
+						st::boxRowPadding.right(),
+						st::boxPadding.bottom()));
+				box->addButton(tr::lng_group_call_mac_settings(), [=] {
+					if (requestInputMonitoring) {
+						Platform::OpenInputMonitoringPrivacySettings();
+					} else {
+						Platform::OpenAccessibilityPrivacySettings();
+					}
+				});
+				box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+
+				if (!requestInputMonitoring) {
+					// Accessibility is enabled without app restart, so short-poll it.
+					base::timer_each(
+						kCheckAccessibilityInterval
+					) | rpl::filter([] {
+						return base::GlobalShortcutsAllowed();
+					}) | rpl::start_with_next([=] {
+						box->closeBox();
+					}, box->lifetime());
+				}
+			}));
+#endif // Q_OS_MAC
+		};
+		const auto ensureManager = [=] {
+			if (state->manager) {
+				return true;
+			} else if (base::GlobalShortcutsAllowed()) {
+				state->manager = call->ensureGlobalShortcutManager();
+				tryFillFromManager();
+				return true;
+			}
+			showPrivacyRequest();
+			return false;
+		};
 		const auto stopRecording = [=] {
 			state->recording = false;
 			state->recordText = tr::lng_group_call_ptt_shortcut();
@@ -227,9 +305,16 @@ void GroupCallSettingsBox(
 				? state->shortcut->toDisplayString()
 				: QString();
 			recording->setColorOverride(std::nullopt);
-			manager->stopRecording();
+			if (state->manager) {
+				state->manager->stopRecording();
+			}
 		};
 		const auto startRecording = [=] {
+			if (!ensureManager()) {
+				state->pushToTalkToggles.fire(false);
+				pushToTalkWrap->hide(anim::type::instant);
+				return;
+			}
 			state->recording = true;
 			state->recordText = tr::lng_group_call_ptt_recording();
 			recording->setColorOverride(
@@ -245,7 +330,7 @@ void GroupCallSettingsBox(
 				applyAndSave();
 				stopRecording();
 			});
-			manager->startRecording(std::move(progress), std::move(done));
+			state->manager->startRecording(std::move(progress), std::move(done));
 		};
 		recording->addClickHandler([=] {
 			if (state->recording) {
@@ -293,6 +378,10 @@ void GroupCallSettingsBox(
 		) | rpl::start_with_next([=](bool toggled) {
 			if (!toggled) {
 				stopRecording();
+			} else if (!ensureManager()) {
+				state->pushToTalkToggles.fire(false);
+				pushToTalkWrap->hide(anim::type::instant);
+				return;
 			}
 			Core::App().settings().setGroupCallPushToTalk(toggled);
 			applyAndSave();
diff --git a/Telegram/lib_base b/Telegram/lib_base
index aadebb110..01a7497eb 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit aadebb110e2fe3438cf99b64427b604564ea4ade
+Subproject commit 01a7497eb84abc2353011d7f5dd4a5e6441e6957

From 8b0430a255e9fd16e79cd16cc2f4b7c4eaf6872c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 7 Dec 2020 17:15:34 +0400
Subject: [PATCH 243/370] Improve group call error messages.

---
 Telegram/Resources/langs/lang.strings          |  3 ++-
 .../SourceFiles/calls/calls_group_call.cpp     | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 2fbfdf870..1f35557d8 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1851,7 +1851,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_no_members" = "No members";
 "lng_group_call_members#one" = "{count} member";
 "lng_group_call_members#other" = "{count} members";
-"lng_group_call_no_anonymous" = "Anonymous admins can't join voice chats :(";
+"lng_group_call_no_anonymous" = "Sorry, anonymous group admins can't join voice chats.";
+"lng_group_call_too_many" = "Sorry, there are too many members in this voice chat. Please try again later.";
 "lng_group_call_context_mute" = "Mute";
 "lng_group_call_context_unmute" = "Allow to speak";
 "lng_group_call_duration_days#one" = "{count} day";
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index fd057e1e6..cef96ef3b 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_send_progress.h"
 #include "apiwrap.h"
 #include "lang/lang_keys.h"
+#include "lang/lang_hardcoded.h"
 #include "boxes/confirm_box.h"
 #include "ui/toasts/common_toasts.h"
 #include "base/unixtime.h"
@@ -230,14 +231,17 @@ void GroupCall::rejoin() {
 				maybeSendMutedUpdate(wasMuteState);
 				_channel->session().api().applyUpdates(updates);
 			}).fail([=](const RPCError &error) {
-				LOG(("Call Error: Could not join, error: %1"
-					).arg(error.type()));
+				const auto type = error.type();
+				LOG(("Call Error: Could not join, error: %1").arg(type));
 				hangup();
-				if (error.type() == u"GROUP_CALL_ANONYMOUS_FORBIDDEN"_q) {
-					Ui::ShowMultilineToast({
-						.text = tr::lng_group_call_no_anonymous(tr::now),
-					});
-				}
+
+				Ui::ShowMultilineToast({
+					.text = (type == u"GROUP_CALL_ANONYMOUS_FORBIDDEN"_q
+						? tr::lng_group_call_no_anonymous(tr::now)
+						: type == u"GROUPCALL_PARTICIPANTS_TOO_MUCH"_q
+						? tr::lng_group_call_too_many(tr::now)
+						: Lang::Hard::ServerError()),
+				});
 			}).send();
 		});
 	});

From ba185d1f6fc4fcbba3e36d54b36b3b10a801cf47 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 7 Dec 2020 17:15:45 +0400
Subject: [PATCH 244/370] Change group call icon in top bar.

---
 .../Resources/icons/top_bar_group_call.png    | Bin 0 -> 588 bytes
 .../Resources/icons/top_bar_group_call@2x.png | Bin 0 -> 1065 bytes
 .../Resources/icons/top_bar_group_call@3x.png | Bin 0 -> 1470 bytes
 .../view/history_view_top_bar_widget.cpp      |  32 +++++++++++++-----
 .../view/history_view_top_bar_widget.h        |   6 ++--
 Telegram/SourceFiles/info/info.style          |   5 +++
 6 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 Telegram/Resources/icons/top_bar_group_call.png
 create mode 100644 Telegram/Resources/icons/top_bar_group_call@2x.png
 create mode 100644 Telegram/Resources/icons/top_bar_group_call@3x.png

diff --git a/Telegram/Resources/icons/top_bar_group_call.png b/Telegram/Resources/icons/top_bar_group_call.png
new file mode 100644
index 0000000000000000000000000000000000000000..b084f255bf41951b0a142928394b5fb70b6d3310
GIT binary patch
literal 588
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfY@4TxV~7Xu
z)e!4GCPN<6!|r#wm@g;<7O*dHFc9UvBGO@e!PmZ^Q;=6=4pS#z+x+Wh76%?AmS6PS
zIBkte-{-hDN6s-aOiELWOFLoyK)oqzD_5Y1qs;M!j{TPoKV;}W%9OSB*6F#Ht{x9s
zewqiZzs@?jaHg+VNwMSm@4q9orpn3Indpmk-*{Wbn!Gj2cHT~*fT)zu!UcO%?B*YT
z{IO&CWlrwarU^UD6%zW`ET(4~%|6>;>U-|F@dhD5fyQECwX=4Su@%h+86vMv`=V%+
za<x|O`|rIwrk+mS8qYYn{br;q<G$!<7CqN3Gdus(H~kKl=9J=VZ~K}z>-_Vex8>co
zldt>PDeQcuU!eSdh5^srTc14ty3Q28RkU-;kDB}Jx>nW+x4qUfS<USexly&3ZB^QH
z4aMlQeW&Y8q->WixtsSmZ~Nt*S&MJJ>F~4CGPm^=pPwdlFFDsls$yr1Pe7KT$6KkD
zvDW`@@4S9I#KHAZ>C&LW+=fdtSSq*sso%&kJ9P2&*Mi-5Pt_RB+{3*2+a=Cpk2kU@
zCJV5<sGP_8>D)BG1GamwW<4yiI-0imC#S`;FNzswT#WL|;&-fHd%wgnU;!v5Jzf1=
J);T3K0RRKa=#KyZ

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/top_bar_group_call@2x.png b/Telegram/Resources/icons/top_bar_group_call@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..12534f22479726a7bd6f9de06372aae8c939ed02
GIT binary patch
literal 1065
zcmV+^1lIeBP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFlSxEDRA>e5SUpQKK@eU)Fe(ZP
zK@|J}7Wom9PHgNf1e*xytR&V})(V#XgH-wlj6zx!3mZX25Yk8>DjE{!oynUyZ}#ro
zy*0TQ$igzSpYuGko4L&lDWw2w-<ILNMcxKJAkga*{P6^)r>E84-k!R=yi~PXO#wh6
z_4V~t-Q3)${r!D4J3DLi5&eh*HJi=C!@~n&?rnK~eumZ6)c`&p=5X*|UthgNu32AO
zTZ<wg3E;K)6Q0-bL#0xIbUGbILK46`FV=p3e!}kVE-Wl8ge~q$-`w0BY;SMF`}@1V
za&T}EW=|5hy1EjJ2)ysUC93E1d4c8r{yxmUB!JOIEK1Vzx}&D1rl8qudU)t}IXXJ3
zlaK_w*=<GNH0gG=S{0CHW@ZF|AHM?#*14>#tf;4_r&cAsn?*1Zbg_YkohpL&wj$ki
zpPrq-;^Ly`bidA>ojf7o9nWoTCCYQDR0?vrT&t3<&ok{~dqSoYAcqL!Cc`|xSS)%|
zN#}l+-e6ndewL<jp4T-3^nv3-IvZrkV=TF!CHJ%BeqEXfI7gweu`#suzxZ|TOG-Ku
zND83I&VYc)L){*CK7o3@?qT!mUS~pzGlA37QxBqF_c{|)L<r=t#u9Oeac=khhm46t
zNp=8BeI7m~fWF35N!Q1@ZTb%2Jn3OJ$WkA-ZQDK-O#AhWfUSrBECCZR+i}wg1fmcn
zmHY+&Qu>>T>iCyZQF4t7UTdY}3lO-wyW{ySxw*M1+DSGxHa67o@HfQA$4Av@Gy)Jr
z1nB#;N}R+N<!w$*PGEk1UN`|=B-&eBTk!Jo!hy|6S|_&1IORp-q!x*U4w~ER>+7-h
ziehJ-T4cj<lDl*gyv{F|mzUw=<0A@_RliemmqE~VqTd8%>-2<|Zk^Y#%w#g4hd_Nz
zR2w4=V0s-ey$+aO4|NXPK`HO6ZCf|)Ux!(U))T=$hpr?>6%!bj@y-&U%o%x4FNH$E
z1)R+qHv(^OZvrD_l<9?fc6KKEsd0FCXamG`jvImV^K$|8_VyO2>V;A+_%U(?XS2?Y
zz|PK&jy2G}xVV7v@o^gvznSAkU}R(jN~KZ&G<RHIU)w~G-vH;eZUiXmP>4G^Is$y3
zFz!}9|M>VACMPG^Kv(5ZJN%(=FZ5zvT3S*Q6BDXjE-Q@x?wiG2*%1OUZFY3}_gl52
j+a|Z!fIxD-4!86V(iI;pmgx;p00000NkvXXu0mjfj|bch

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/top_bar_group_call@3x.png b/Telegram/Resources/icons/top_bar_group_call@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..08df3a7faac815831ad0d28617af0440adc3492a
GIT binary patch
literal 1470
zcmV;v1ws0WP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS=C`m*?RCodHn>{Q9K@@=Z&iSbX
z5g|k*6e9i-3Z;fbO-LkEq7{uObQ%;ol}@Fh(<p>OqEHbeD)AqGk%*u8d*+GTEc<3>
z=XUl_W|Ga#y_tRU-ZyV%cJ5{qhG77^bm9<5a^zb4LqG!(gn|a70SO2Qigg4D0Hp-w
zw&JFyCZngP$LQ$jFe)o6jgpcQBP%P*Rxb*I&(BZe`uf^9Jv}wn*4B*W<z-`QYfIWR
zT;_#Wb#*l?EiFOZ)9UIfG&VL0{k1R=!|Cekg8TdXxU(_se|~<3{{DWqkemS_ocH&4
zQ~7_&3=R&ufy4)d!|Fdp&fm^`d3k}>)>aWDKA`_F=lq58_xtANW@docYV}u_`5lMc
z^z<~ew6s7@PL8O7(8^P()c1ruF);xcExgp(+392>9YK?mlcYX`)85|hq%e|Y*x`?l
zkEBoY^YczN(}39X0;vom$Fc;*DnB|pO8RtkbmZg*4e0#*oK%LxDz1Ra%gafh-rn9I
znN0Hhq5<)i_9)LeZaVJn?v8|1TwF{7;_k(G+lSZJS7t|i6VHA&p_5K=0g<(R60)c?
zrlzJ0Hmtud%%dzSi3}|=4w;Y{t^8s@Y|Wv}kG3u^FKun1ptQ7<*B<RKsf7vsFq&Er
zQ07NlvVbBn#LCLb7>nPDlBH_|JtWDV3NnIZ+ww9bWg`eXML8gR6hJ3%nBawZl&NaV
z%aDu&AlV+4jUd_j){cn;AlV+4by&8(7eKyD($oY?$(Z4hPrd+(yw?&2YCr;58juDg
zARs8#5u^bL2ndRG1cd?U;^M;AEG4s5ilD%k2wGTJu(?XfY?UG^AUBa-9_RIDmGcV#
z3jh+fNG{tMvYTOR`;pkJS`BiOmjxsnp;jAW2}pMLZ*^EUFAK<*Ntzigm8c1vl1V95
zSecwRWW%1>L+WuO_cCPM=(pC9jUaX}?O2e2csBSUmj%QfVjmwL2+x*SZ`)*X67cM2
zf3=ftZ~<LiU6D65G&GR%I0)I{1*5RA&}J&aVgK3N<S5_*IzB!oZ|LpqCFOAt@@zjl
zJ2UXeFfWmlt3E(w&dp}#7btxM&*WleegR_P=K0__JLL}SbUW14)Yx>Rey6LuyBiJ<
z4|$8JGI_>_IMH}j$ABLm9;6`k_4NUp6O=*VDe`;_7$K=TNRE-@6fx;CJRs_HB9-TC
zCUVaQ$<s!wcohMMTUsCQv%bDQkb~<=UqwheqvB<jv@YtiqM`y$PEIlj1gU#`d6~uP
z5Uy_c2!O|gaTm@z>`7T|)nm;U6coVj?k;tUCmGuf0B$X|x3^(tW(L~Y+JsSTwd*JE
zyqXX<2pi#fMd`}T&4u;#b>1z&4qXC!H%-_krCX6KJV1#=0u~n+xo~hL8yFY}6Arc=
z9-!ITSuPwb7#|-G8;(DKaO_hlJ3HHSnD<&h`o6ijIkT=GohYGGeFRZIp`znsV`Gq?
zpARD=BaRP(_{`++YCzE7)B{>sSxE<i?NjuGjF0|#d3ixYaB5FIAe>k;Ne2f9P*hap
zWNa8^>H)F$JYZ*MM~V>+%c`oXFaU_!R1XLzz}nhcxVgD;1?l$o7Mh!zMTUk|?hhb@
zgnO&Ky*)=r`}_M)S63I7^KRPp4-i7aC*`4`A=ud1fTyRYZ&>*A2Yw$O9tP{uFR}Ex
zaZE{_#E((zBbbE$D)8Rf3dRDtRsshkXI}WVx&LZ}Z(1}g(0~N}paE$>0s?|!9YF#>
YUj=u(mr!ET7ytkO07*qoM6N<$f<D5GU;qFB

literal 0
HcmV?d00001

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 d57c4903b..2fb223b15 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -64,6 +64,7 @@ TopBarWidget::TopBarWidget(
 , _delete(this, tr::lng_selected_delete(), st::defaultActiveButton)
 , _back(this, st::historyTopBarBack)
 , _call(this, st::topBarCall)
+, _groupCall(this, st::topBarGroupCall)
 , _search(this, st::topBarSearch)
 , _infoToggle(this, st::topBarInfo)
 , _menuToggle(this, st::topBarMenuToggle)
@@ -83,8 +84,9 @@ TopBarWidget::TopBarWidget(
 	_delete->setClickedCallback([=] { _deleteSelection.fire({}); });
 	_delete->setWidthChangedCallback([=] { updateControlsGeometry(); });
 	_clear->setClickedCallback([=] { _clearSelection.fire({}); });
-	_call->setClickedCallback([=] { onCall(); });
-	_search->setClickedCallback([=] { onSearch(); });
+	_call->setClickedCallback([=] { call(); });
+	_groupCall->setClickedCallback([=] { groupCall(); });
+	_search->setClickedCallback([=] { search(); });
 	_menuToggle->setClickedCallback([=] { showMenu(); });
 	_infoToggle->setClickedCallback([=] { toggleInfoSection(); });
 	_back->addClickHandler([=] { backClicked(); });
@@ -202,21 +204,27 @@ void TopBarWidget::refreshLang() {
 	InvokeQueued(this, [this] { updateControlsGeometry(); });
 }
 
-void TopBarWidget::onSearch() {
+void TopBarWidget::search() {
 	if (_activeChat.key) {
 		_controller->content()->searchInChat(_activeChat.key);
 	}
 }
 
-void TopBarWidget::onCall() {
+void TopBarWidget::call() {
 	if (const auto peer = _activeChat.key.peer()) {
 		if (const auto user = peer->asUser()) {
 			Core::App().calls().startOutgoingCall(user, false);
-		} else if (const auto megagroup = peer->asMegagroup()) {
+		}
+	}
+}
+
+void TopBarWidget::groupCall() {
+	if (const auto peer = _activeChat.key.peer()) {
+		if (const auto megagroup = peer->asMegagroup()) {
 			if (megagroup->amAnonymous()) {
 				Ui::ShowMultilineToast({
 					.text = tr::lng_group_call_no_anonymous(tr::now),
-				});
+					});
 			} else if (const auto call = megagroup->call()) {
 				Core::App().calls().joinGroupCall(megagroup, call->input());
 			} else {
@@ -653,6 +661,7 @@ void TopBarWidget::updateControlsGeometry() {
 	_search->moveToRight(_rightTaken, otherButtonsTop);
 	_rightTaken += _search->width() + st::topBarCallSkip;
 	_call->moveToRight(_rightTaken, otherButtonsTop);
+	_groupCall->moveToRight(_rightTaken, otherButtonsTop);
 	_rightTaken += _call->width();
 
 	updateMembersShowArea();
@@ -713,13 +722,20 @@ void TopBarWidget::updateControlsVisibility() {
 			if (const auto user = peer->asUser()) {
 				return session().serverConfig().phoneCallsEnabled.current()
 					&& user->hasCalls();
-			} else if (const auto megagroup = peer->asMegagroup()) {
-				return megagroup->canManageCall();
 			}
 		}
 		return false;
 	}();
 	_call->setVisible(historyMode && callsEnabled);
+	const auto groupCallsEnabled = [&] {
+		if (const auto peer = _activeChat.key.peer()) {
+			if (const auto megagroup = peer->asMegagroup()) {
+				return megagroup->canManageCall();
+			}
+		}
+		return false;
+	}();
+	_groupCall->setVisible(historyMode && groupCallsEnabled);
 
 	if (_membersShowArea) {
 		_membersShowArea->show();
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 988758b46..a79b5dcc2 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
@@ -95,8 +95,9 @@ private:
 	void selectedShowCallback();
 	void updateInfoToggleActive();
 
-	void onCall();
-	void onSearch();
+	void call();
+	void groupCall();
+	void search();
 	void showMenu();
 	void toggleInfoSection();
 
@@ -144,6 +145,7 @@ private:
 	object_ptr<Ui::AbstractButton> _info = { nullptr };
 
 	object_ptr<Ui::IconButton> _call;
+	object_ptr<Ui::IconButton> _groupCall;
 	object_ptr<Ui::IconButton> _search;
 	object_ptr<Ui::IconButton> _infoToggle;
 	object_ptr<Ui::IconButton> _menuToggle;
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index d311f6fe1..dcc1db0c8 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -763,6 +763,11 @@ topBarCall: IconButton(topBarSearch) {
 	icon: icon {{ "top_bar_call", menuIconFg }};
 	iconOver: icon {{ "top_bar_call", menuIconFgOver }};
 }
+topBarGroupCall: IconButton(topBarSearch) {
+	icon: icon {{ "top_bar_group_call", menuIconFg }};
+	iconOver: icon {{ "top_bar_group_call", menuIconFgOver }};
+	iconPosition: point(8px, 15px);
+}
 topBarInfo: IconButton(topBarSearch) {
 	icon: icon {{ "top_bar_profile", menuIconFg }};
 	iconOver: icon {{ "top_bar_profile", menuIconFgOver }};

From a527d5c535301574bea7e192ead202a51fdfae65 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Dec 2020 10:44:22 +0400
Subject: [PATCH 245/370] Improve join group call bar style.

---
 Telegram/Resources/langs/lang.strings         |  2 +-
 Telegram/SourceFiles/calls/calls.style        |  6 ++---
 Telegram/SourceFiles/core/core_settings.cpp   |  3 +--
 .../SourceFiles/history/history_widget.cpp    | 20 ++++++++--------
 .../SourceFiles/ui/chat/group_call_bar.cpp    | 24 ++++++++++---------
 5 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1f35557d8..0b6976833 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1848,7 +1848,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_invite_done_user" = "You invited {user} to the voice chat.";
 "lng_group_call_invite_done_many#one" = "You invited **{count} member** to the voice chat.";
 "lng_group_call_invite_done_many#other" = "You invited **{count} members** to the voice chat.";
-"lng_group_call_no_members" = "No members";
+"lng_group_call_no_members" = "click to join";
 "lng_group_call_members#one" = "{count} member";
 "lng_group_call_members#other" = "{count} members";
 "lng_group_call_no_anonymous" = "Sorry, anonymous group admins can't join voice chats.";
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 0677bb9c6..45ed1b11a 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -591,9 +591,9 @@ groupCallTopBarUserpicSize: 28px;
 groupCallTopBarUserpicShift: 8px;
 groupCallTopBarUserpicStroke: 2px;
 groupCallTopBarJoin: RoundButton(defaultActiveButton) {
-	width: -30px;
-	height: 28px;
-	textTop: 5px;
+	width: -26px;
+	height: 26px;
+	textTop: 4px;
 }
 groupCallBox: Box(defaultBox) {
 	button: RoundButton(defaultBoxButton) {
diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 332b20c59..cecd332f0 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -275,8 +275,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 			>> groupCallPushToTalkShortcut
 			>> groupCallPushToTalkDelay;
 	}
-	if (false && stream.status() != QDataStream::Ok) {
-		AssertIsDebug();
+	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
 		return;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index aa9250236..bb0ec76a0 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1262,12 +1262,12 @@ void HistoryWidget::orderWidgets() {
 	if (_contactStatus) {
 		_contactStatus->raise();
 	}
-	if (_groupCallBar) {
-		_groupCallBar->raise();
-	}
 	if (_pinnedBar) {
 		_pinnedBar->raise();
 	}
+	if (_groupCallBar) {
+		_groupCallBar->raise();
+	}
 	_topShadow->raise();
 	if (_fieldAutocomplete) {
 		_fieldAutocomplete->raise();
@@ -4448,17 +4448,17 @@ void HistoryWidget::updateControlsGeometry() {
 
 	moveFieldControls();
 
-	const auto pinnedBarTop = _topBar->bottomNoMargins();
-	if (_pinnedBar) {
-		_pinnedBar->move(0, pinnedBarTop);
-		_pinnedBar->resizeToWidth(width());
-	}
-	const auto groupCallTop = pinnedBarTop + (_pinnedBar ? _pinnedBar->height() : 0);
+	const auto groupCallTop = _topBar->bottomNoMargins();
 	if (_groupCallBar) {
 		_groupCallBar->move(0, groupCallTop);
 		_groupCallBar->resizeToWidth(width());
 	}
-	const auto contactStatusTop = groupCallTop + (_groupCallBar ? _groupCallBar->height() : 0);
+	const auto pinnedBarTop = groupCallTop + (_groupCallBar ? _groupCallBar->height() : 0);
+	if (_pinnedBar) {
+		_pinnedBar->move(0, pinnedBarTop);
+		_pinnedBar->resizeToWidth(width());
+	}
+	const auto contactStatusTop = pinnedBarTop + (_pinnedBar ? _pinnedBar->height() : 0);
 	if (_contactStatus) {
 		_contactStatus->move(0, contactStatusTop);
 	}
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
index cff4ed1f5..d1bb247f7 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "styles/style_chat.h"
 #include "styles/style_calls.h"
+#include "styles/style_info.h" // st::topBarArrowPadding, like TopBarWidget.
 #include "styles/palette.h"
 
 #include <QtGui/QtEvents>
@@ -116,17 +117,7 @@ void GroupCallBar::setupInner() {
 void GroupCallBar::paint(Painter &p) {
 	p.fillRect(_inner->rect(), st::historyComposeAreaBg);
 
-	auto left = st::msgReplyBarSkip;
-	if (!_content.userpics.isNull()) {
-		const auto imageSize = _content.userpics.size()
-			/ _content.userpics.devicePixelRatio();
-		// Skip shadow of the bar above.
-		const auto imageTop = (st::historyReplyHeight
-			- st::lineWidth
-			- imageSize.height()) / 2 + st::lineWidth;
-		p.drawImage(left, imageTop, _content.userpics);
-		left += imageSize.width() + st::msgReplyBarSkip;
-	}
+	const auto left = st::topBarArrowPadding.right();
 	const auto titleTop = st::msgReplyPadding.top();
 	const auto textTop = titleTop + st::msgServiceNameFont->height;
 	const auto width = _inner->width();
@@ -142,6 +133,17 @@ void GroupCallBar::paint(Painter &p) {
 		(_content.count > 0
 			? tr::lng_group_call_members(tr::now, lt_count, _content.count)
 			: tr::lng_group_call_no_members(tr::now)));
+
+	if (!_content.userpics.isNull()) {
+		const auto imageSize = _content.userpics.size()
+			/ _content.userpics.devicePixelRatio();
+		// Skip shadow of the bar above.
+		const auto imageTop = (st::historyReplyHeight
+			- st::lineWidth
+			- imageSize.height()) / 2 + st::lineWidth;
+		const auto imageLeft = (_inner->width() - imageSize.width()) / 2;
+		p.drawImage(imageLeft, imageTop, _content.userpics);
+	}
 }
 
 void GroupCallBar::updateControlsGeometry(QRect wrapGeometry) {

From dde94d486b69f1c138628f36758edcc5a23999a0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Dec 2020 11:19:23 +0400
Subject: [PATCH 246/370] Change button round radius.

---
 .../SourceFiles/boxes/sticker_set_box.cpp     |  6 ++--
 Telegram/SourceFiles/boxes/stickers_box.cpp   |  4 +--
 .../calls/calls_emoji_fingerprint.cpp         |  2 +-
 .../SourceFiles/chat_helpers/bot_keyboard.cpp |  2 +-
 .../chat_helpers/emoji_list_widget.cpp        | 10 +++----
 .../chat_helpers/field_autocomplete.cpp       |  8 ++---
 .../chat_helpers/gifs_list_widget.cpp         |  8 ++---
 .../chat_helpers/stickers_list_widget.cpp     | 30 +++++++++----------
 .../SourceFiles/chat_helpers/tabbed_panel.cpp |  6 ++--
 .../chat_helpers/tabbed_selector.cpp          |  6 ++--
 .../history/view/media/history_view_gif.cpp   |  2 +-
 .../inline_bot_layout_internal.cpp            |  8 ++---
 .../inline_bots/inline_results_inner.cpp      | 14 ++++-----
 .../inline_bots/inline_results_widget.cpp     | 14 ++++-----
 .../inline_bots/inline_results_widget.h       |  4 +--
 .../player/media_player_volume_controller.cpp |  2 +-
 .../SourceFiles/ui/cached_round_corners.cpp   | 24 +++++++--------
 Telegram/SourceFiles/ui/empty_userpic.cpp     |  6 ++--
 .../window/themes/window_theme_preview.cpp    |  2 +-
 Telegram/lib_ui                               |  2 +-
 20 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 62f75f797..497a5b9aa 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -597,8 +597,8 @@ void StickerSetBox::Inner::paintEvent(QPaintEvent *e) {
 
 QSize StickerSetBox::Inner::boundingBoxSize() const {
 	return QSize(
-		st::stickersSize.width() - st::buttonRadius * 2,
-		st::stickersSize.height() - st::buttonRadius * 2);
+		st::stickersSize.width() - st::roundRadiusSmall * 2,
+		st::stickersSize.height() - st::roundRadiusSmall * 2);
 }
 
 void StickerSetBox::Inner::visibleTopBottomUpdated(
@@ -684,7 +684,7 @@ void StickerSetBox::Inner::paintSticker(
 		w = std::max(size.width(), 1);
 		h = std::max(size.height(), 1);
 	} else {
-		auto coef = qMin((st::stickersSize.width() - st::buttonRadius * 2) / float64(document->dimensions.width()), (st::stickersSize.height() - st::buttonRadius * 2) / float64(document->dimensions.height()));
+		auto coef = qMin((st::stickersSize.width() - st::roundRadiusSmall * 2) / float64(document->dimensions.width()), (st::stickersSize.height() - st::roundRadiusSmall * 2) / float64(document->dimensions.height()));
 		if (coef > 1) coef = 1;
 		w = std::max(qRound(coef * document->dimensions.width()), 1);
 		h = std::max(qRound(coef * document->dimensions.height()), 1);
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 37508535f..6ee3d8930 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -1369,7 +1369,7 @@ void StickersBox::Inner::setActionDown(int newActionDown) {
 			if (_section == Section::Installed) {
 				if (row->removed) {
 					auto rippleSize = QSize(_undoWidth - st::stickersUndoRemove.width, st::stickersUndoRemove.height);
-					auto rippleMask = Ui::RippleAnimation::roundRectMask(rippleSize, st::buttonRadius);
+					auto rippleMask = Ui::RippleAnimation::roundRectMask(rippleSize, st::roundRadiusSmall);
 					ensureRipple(st::stickersUndoRemove.ripple, std::move(rippleMask), removeButton);
 				} else {
 					auto rippleSize = st::stickersRemove.rippleAreaSize;
@@ -1378,7 +1378,7 @@ void StickersBox::Inner::setActionDown(int newActionDown) {
 				}
 			} else if (!row->installed || row->archived || row->removed) {
 				auto rippleSize = QSize(_addWidth - st::stickersTrendingAdd.width, st::stickersTrendingAdd.height);
-				auto rippleMask = Ui::RippleAnimation::roundRectMask(rippleSize, st::buttonRadius);
+				auto rippleMask = Ui::RippleAnimation::roundRectMask(rippleSize, st::roundRadiusSmall);
 				ensureRipple(st::stickersTrendingAdd.ripple, std::move(rippleMask), removeButton);
 			}
 		}
diff --git a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
index bd95df7a5..61ec38db5 100644
--- a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
+++ b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
@@ -253,7 +253,7 @@ object_ptr<Ui::RpWidget> CreateFingerprintAndSignalBars(
 			fullBarsSize.width(),
 			height);
 		const auto bigRadius = height / 2;
-		const auto smallRadius = st::buttonRadius;
+		const auto smallRadius = st::roundRadiusSmall;
 		const auto hq = PainterHighQualityEnabler(p);
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::callBgButton);
diff --git a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
index 17ee74a6b..4f6b82d03 100644
--- a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
+++ b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
@@ -69,7 +69,7 @@ void Style::repaint(not_null<const HistoryItem*> item) const {
 }
 
 int Style::buttonRadius() const {
-	return st::buttonRadius;
+	return st::roundRadiusSmall;
 }
 
 void Style::paintButtonBg(
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index ea5213b66..7d4322672 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -478,7 +478,7 @@ EmojiListWidget::SectionInfo EmojiListWidget::sectionInfoByOffset(int yOffset) c
 }
 
 int EmojiListWidget::countDesiredHeight(int newWidth) {
-	auto fullWidth = (st::buttonRadius + newWidth + st::emojiScroll.width);
+	auto fullWidth = (st::roundRadiusSmall + newWidth + st::emojiScroll.width);
 	_columnCount = std::max(
 		(fullWidth - st::emojiPadding * 2) / st::emojiPanDesiredSize,
 		1);
@@ -487,7 +487,7 @@ int EmojiListWidget::countDesiredHeight(int newWidth) {
 	auto rowsRight = std::max(_rowsLeft, st::emojiScroll.width);
 	auto singleWidth = (fullWidth - _rowsLeft - rowsRight)
 		/ _columnCount;
-	_rowsLeft -= st::buttonRadius;
+	_rowsLeft -= st::roundRadiusSmall;
 	_singleSize = QSize(singleWidth, singleWidth - 4 * st::lineWidth);
 	_picker->setSingleSize(_singleSize);
 	return sectionInfo(kEmojiSectionCount - 1).rowsBottom + st::emojiPanPadding;
@@ -541,7 +541,7 @@ void EmojiListWidget::paintEvent(QPaintEvent *e) {
 		if (info.section > 0 && r.top() < info.rowsTop) {
 			p.setFont(st::emojiPanHeaderFont);
 			p.setPen(st::emojiPanHeaderFg);
-			p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, info.top + st::emojiPanHeaderTop, width(), ChatHelpers::EmojiCategoryTitle(info.section)(tr::now));
+			p.drawTextLeft(st::emojiPanHeaderLeft - st::roundRadiusSmall, info.top + st::emojiPanHeaderTop, width(), ChatHelpers::EmojiCategoryTitle(info.section)(tr::now));
 		}
 		if (r.top() + r.height() > info.rowsTop) {
 			ensureLoaded(info.section);
@@ -663,9 +663,9 @@ void EmojiListWidget::showPicker() {
 		_picker->showEmoji(_emoji[section][sel]);
 
 		auto y = emojiRect(section, sel).y();
-		y -= _picker->height() - st::buttonRadius + getVisibleTop();
+		y -= _picker->height() - st::roundRadiusSmall + getVisibleTop();
 		if (y < st::emojiPanHeader) {
-			y += _picker->height() - st::buttonRadius + _singleSize.height() - st::buttonRadius;
+			y += _picker->height() - st::roundRadiusSmall + _singleSize.height() - st::roundRadiusSmall;
 		}
 		auto xmax = width() - _picker->width();
 		auto coef = float64(sel % _columnCount) / float64(_columnCount - 1);
diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
index 6faeb1b66..3b939b3d7 100644
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
@@ -801,8 +801,8 @@ void FieldAutocomplete::Inner::paintEvent(QPaintEvent *e) {
 				} else {
 					const auto coef = std::min(
 						std::min(
-							(st::stickerPanSize.width() - st::buttonRadius * 2) / float64(document->dimensions.width()),
-							(st::stickerPanSize.height() - st::buttonRadius * 2) / float64(document->dimensions.height())),
+							(st::stickerPanSize.width() - st::roundRadiusSmall * 2) / float64(document->dimensions.width()),
+							(st::stickerPanSize.height() - st::roundRadiusSmall * 2) / float64(document->dimensions.height())),
 						1.);
 					w = std::max(qRound(coef * document->dimensions.width()), 1);
 					h = std::max(qRound(coef * document->dimensions.height()), 1);
@@ -1220,8 +1220,8 @@ void FieldAutocomplete::Inner::setupLottie(StickerSuggestion &suggestion) {
 
 QSize FieldAutocomplete::Inner::stickerBoundingBox() const {
 	return QSize(
-		st::stickerPanSize.width() - st::buttonRadius * 2,
-		st::stickerPanSize.height() - st::buttonRadius * 2);
+		st::stickerPanSize.width() - st::roundRadiusSmall * 2,
+		st::stickerPanSize.height() - st::roundRadiusSmall * 2);
 }
 
 void FieldAutocomplete::Inner::repaintSticker(
diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
index 0960a8cb6..c00104e21 100644
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@@ -329,7 +329,7 @@ void GifsListWidget::paintInlineItems(Painter &p, QRect clip) {
 			break;
 		}
 		if (top + inlineRow.height > clip.top()) {
-			auto left = st::inlineResultsLeft - st::buttonRadius;
+			auto left = st::inlineResultsLeft - st::roundRadiusSmall;
 			if (row == rows - 1) context.lastRow = true;
 			for (int col = 0, cols = inlineRow.items.size(); col < cols; ++col) {
 				if (left >= tox) break;
@@ -559,7 +559,7 @@ bool GifsListWidget::inlineRowFinalize(Row &row, int32 &sumWidth, bool force) {
 	auto full = (row.items.size() >= kInlineItemsMaxPerRow);
 
 	// Currently use the same GIFs layout for all widget sizes.
-//	auto big = (sumWidth >= st::buttonRadius + width() - st::inlineResultsLeft);
+//	auto big = (sumWidth >= st::roundRadiusSmall + width() - st::inlineResultsLeft);
 	auto big = (sumWidth >= st::emojiPanWidth - st::inlineResultsLeft);
 	if (full || big || force) {
 		row.maxWidth = (full || big) ? sumWidth : 0;
@@ -701,7 +701,7 @@ void GifsListWidget::layoutInlineRow(Row &row, int fullWidth) {
 
 	auto desiredWidth = row.maxWidth;
 	row.height = 0;
-	int availw = fullWidth - (st::inlineResultsLeft - st::buttonRadius);
+	int availw = fullWidth - (st::inlineResultsLeft - st::roundRadiusSmall);
 	for (int i = 0; i < count; ++i) {
 		const auto index = indices[i];
 		const auto &item = row.items[index];
@@ -1020,7 +1020,7 @@ void GifsListWidget::updateSelected() {
 	}
 
 	auto p = mapFromGlobal(_lastMousePos);
-	int sx = (rtl() ? width() - p.x() : p.x()) - (st::inlineResultsLeft - st::buttonRadius);
+	int sx = (rtl() ? width() - p.x() : p.x()) - (st::inlineResultsLeft - st::roundRadiusSmall);
 	int sy = p.y() - st::stickerPanPadding;
 	int row = -1, col = -1, sel = -1;
 	ClickHandlerPtr lnk;
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index 0cb159ae9..017c5e27e 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -1124,16 +1124,16 @@ int StickersListWidget::countDesiredHeight(int newWidth) {
 	if (newWidth <= st::stickerPanWidthMin) {
 		return 0;
 	}
-	auto availableWidth = newWidth - (st::stickerPanPadding - st::buttonRadius);
+	auto availableWidth = newWidth - (st::stickerPanPadding - st::roundRadiusSmall);
 	auto columnCount = availableWidth / st::stickerPanWidthMin;
 	auto singleWidth = availableWidth / columnCount;
-	auto fullWidth = (st::buttonRadius + newWidth + st::emojiScroll.width);
+	auto fullWidth = (st::roundRadiusSmall + newWidth + st::emojiScroll.width);
 	auto rowsRight = (fullWidth - columnCount * singleWidth) / 2;
 	accumulate_max(rowsRight, st::emojiScroll.width);
 	_rowsLeft = fullWidth
 		- columnCount * singleWidth
 		- rowsRight
-		- st::buttonRadius;
+		- st::roundRadiusSmall;
 	_singleSize = QSize(singleWidth, singleWidth);
 	setColumnCount(columnCount);
 
@@ -1531,7 +1531,7 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 				? set.count
 				: loadedCount;
 
-			auto widthForTitle = stickersRight() - (st::emojiPanHeaderLeft - st::buttonRadius);
+			auto widthForTitle = stickersRight() - (st::emojiPanHeaderLeft - st::roundRadiusSmall);
 			if (featuredHasAddButton(info.section)) {
 				auto add = featuredAddRect(info.section);
 				auto selected = selectedButton ? (selectedButton->section == info.section) : false;
@@ -1567,7 +1567,7 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 			}
 			p.setFont(st::stickersTrendingHeaderFont);
 			p.setPen(st::stickersTrendingHeaderFg);
-			p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, info.top + st::stickersTrendingHeaderTop, width(), titleText, titleWidth);
+			p.drawTextLeft(st::emojiPanHeaderLeft - st::roundRadiusSmall, info.top + st::stickersTrendingHeaderTop, width(), titleText, titleWidth);
 
 			if (set.flags & MTPDstickerSet_ClientFlag::f_unread) {
 				p.setPen(Qt::NoPen);
@@ -1575,14 +1575,14 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 
 				{
 					PainterHighQualityEnabler hq(p);
-					p.drawEllipse(style::rtlrect(st::emojiPanHeaderLeft - st::buttonRadius + titleWidth + st::stickersFeaturedUnreadSkip, info.top + st::stickersTrendingHeaderTop + st::stickersFeaturedUnreadTop, st::stickersFeaturedUnreadSize, st::stickersFeaturedUnreadSize, width()));
+					p.drawEllipse(style::rtlrect(st::emojiPanHeaderLeft - st::roundRadiusSmall + titleWidth + st::stickersFeaturedUnreadSkip, info.top + st::stickersTrendingHeaderTop + st::stickersFeaturedUnreadTop, st::stickersFeaturedUnreadSize, st::stickersFeaturedUnreadSize, width()));
 				}
 			}
 
 			auto statusText = (count > 0) ? tr::lng_stickers_count(tr::now, lt_count, count) : tr::lng_contacts_loading(tr::now);
 			p.setFont(st::stickersTrendingSubheaderFont);
 			p.setPen(st::stickersTrendingSubheaderFg);
-			p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, info.top + st::stickersTrendingSubheaderTop, width(), statusText);
+			p.drawTextLeft(st::emojiPanHeaderLeft - st::roundRadiusSmall, info.top + st::stickersTrendingSubheaderTop, width(), statusText);
 
 			if (info.rowsTop >= clip.y() + clip.height()) {
 				return true;
@@ -1602,7 +1602,7 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 		if (setHasTitle(set) && clip.top() < info.rowsTop) {
 			auto titleText = set.title;
 			auto titleWidth = st::stickersTrendingHeaderFont->width(titleText);
-			auto widthForTitle = stickersRight() - (st::emojiPanHeaderLeft - st::buttonRadius);
+			auto widthForTitle = stickersRight() - (st::emojiPanHeaderLeft - st::roundRadiusSmall);
 			if (hasRemoveButton(info.section)) {
 				auto remove = removeButtonRect(info.section);
 				auto selected = selectedButton ? (selectedButton->section == info.section) : false;
@@ -1622,7 +1622,7 @@ void StickersListWidget::paintStickers(Painter &p, QRect clip) {
 			}
 			p.setFont(st::emojiPanHeaderFont);
 			p.setPen(st::emojiPanHeaderFg);
-			p.drawTextLeft(st::emojiPanHeaderLeft - st::buttonRadius, info.top + st::emojiPanHeaderTop, width(), titleText, titleWidth);
+			p.drawTextLeft(st::emojiPanHeaderLeft - st::roundRadiusSmall, info.top + st::emojiPanHeaderTop, width(), titleText, titleWidth);
 		}
 		if (clip.top() + clip.height() <= info.rowsTop) {
 			return true;
@@ -1753,7 +1753,7 @@ void StickersListWidget::paintEmptySearchResults(Painter &p) {
 }
 
 int StickersListWidget::megagroupSetInfoLeft() const {
-	return st::emojiPanHeaderLeft - st::buttonRadius;
+	return st::emojiPanHeaderLeft - st::roundRadiusSmall;
 }
 
 void StickersListWidget::paintMegagroupEmptySet(Painter &p, int y, bool buttonSelected) {
@@ -1821,8 +1821,8 @@ void StickersListWidget::setupLottie(Set &set, int section, int index) {
 
 QSize StickersListWidget::boundingBoxSize() const {
 	return QSize(
-		_singleSize.width() - st::buttonRadius * 2,
-		_singleSize.height() - st::buttonRadius * 2);
+		_singleSize.width() - st::roundRadiusSmall * 2,
+		_singleSize.height() - st::roundRadiusSmall * 2);
 }
 
 void StickersListWidget::paintSticker(Painter &p, Set &set, int y, int section, int index, bool selected, bool deleteSelected) {
@@ -1860,7 +1860,7 @@ void StickersListWidget::paintSticker(Painter &p, Set &set, int y, int section,
 		w = std::max(size.width(), 1);
 		h = std::max(size.height(), 1);
 	} else {
-		auto coef = qMin((_singleSize.width() - st::buttonRadius * 2) / float64(document->dimensions.width()), (_singleSize.height() - st::buttonRadius * 2) / float64(document->dimensions.height()));
+		auto coef = qMin((_singleSize.width() - st::roundRadiusSmall * 2) / float64(document->dimensions.width()), (_singleSize.height() - st::roundRadiusSmall * 2) / float64(document->dimensions.height()));
 		if (coef > 1) coef = 1;
 		w = std::max(qRound(coef * document->dimensions.width()), 1);
 		h = std::max(qRound(coef * document->dimensions.height()), 1);
@@ -1997,7 +1997,7 @@ void StickersListWidget::setPressed(OverState newPressed) {
 	} else if (std::get_if<OverGroupAdd>(&_pressed)) {
 		if (!_megagroupSetButtonRipple) {
 			auto maskSize = _megagroupSetButtonRect.size();
-			auto mask = Ui::RippleAnimation::roundRectMask(maskSize, st::buttonRadius);
+			auto mask = Ui::RippleAnimation::roundRectMask(maskSize, st::roundRadiusSmall);
 			_megagroupSetButtonRipple = std::make_unique<Ui::RippleAnimation>(st::stickerGroupCategoryAdd.ripple, std::move(mask), [this] {
 				rtlupdate(megagroupSetButtonRectFinal());
 			});
@@ -2025,7 +2025,7 @@ std::unique_ptr<Ui::RippleAnimation> StickersListWidget::createButtonRipple(int
 
 	if (shownSets()[section].externalLayout) {
 		auto maskSize = QSize(_addWidth - st::stickersTrendingAdd.width, st::stickersTrendingAdd.height);
-		auto mask = Ui::RippleAnimation::roundRectMask(maskSize, st::buttonRadius);
+		auto mask = Ui::RippleAnimation::roundRectMask(maskSize, st::roundRadiusSmall);
 		return std::make_unique<Ui::RippleAnimation>(
 			st::stickersTrendingAdd.ripple,
 			std::move(mask),
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
index 86c5e97ec..04afc8f33 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
@@ -54,7 +54,7 @@ TabbedPanel::TabbedPanel(
 	Expects(_selector != nullptr);
 
 	_selector->setParent(this);
-	_selector->setRoundRadius(st::buttonRadius);
+	_selector->setRoundRadius(st::roundRadiusSmall);
 	_selector->setAfterShownCallback([=](SelectorTab tab) {
 		if (tab == SelectorTab::Gifs || tab == SelectorTab::Stickers) {
 			_controller->enableGifPauseReason(
@@ -441,8 +441,8 @@ bool TabbedPanel::overlaps(const QRect &globalRect) const {
 
 	auto testRect = QRect(mapFromGlobal(globalRect.topLeft()), globalRect.size());
 	auto inner = rect().marginsRemoved(st::emojiPanMargins);
-	return inner.marginsRemoved(QMargins(st::buttonRadius, 0, st::buttonRadius, 0)).contains(testRect)
-		|| inner.marginsRemoved(QMargins(0, st::buttonRadius, 0, st::buttonRadius)).contains(testRect);
+	return inner.marginsRemoved(QMargins(st::roundRadiusSmall, 0, st::roundRadiusSmall, 0)).contains(testRect)
+		|| inner.marginsRemoved(QMargins(0, st::roundRadiusSmall, 0, st::roundRadiusSmall)).contains(testRect);
 }
 
 TabbedPanel::~TabbedPanel() {
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 1121c7cf4..a3ccef428 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -451,13 +451,13 @@ void TabbedSelector::resizeEvent(QResizeEvent *e) {
 			st::lineWidth);
 	}
 
-	auto scrollWidth = width() - st::buttonRadius;
+	auto scrollWidth = width() - st::roundRadiusSmall;
 	auto scrollHeight = height() - scrollTop() - marginBottom();
 	auto inner = currentTab()->widget();
 	auto innerWidth = scrollWidth - st::emojiScroll.width;
 	auto updateScrollGeometry = [&] {
 		_scroll->setGeometryToLeft(
-			st::buttonRadius,
+			st::roundRadiusSmall,
 			scrollTop(),
 			scrollWidth,
 			scrollHeight);
@@ -561,7 +561,7 @@ void TabbedSelector::paintContent(Painter &p) {
 		p.fillRect(0, sidesTop, width(), sidesHeight, st::emojiPanBg);
 	} else {
 		p.fillRect(myrtlrect(width() - st::emojiScroll.width, sidesTop, st::emojiScroll.width, sidesHeight), st::emojiPanBg);
-		p.fillRect(myrtlrect(0, sidesTop, st::buttonRadius, sidesHeight), st::emojiPanBg);
+		p.fillRect(myrtlrect(0, sidesTop, st::roundRadiusSmall, sidesHeight), st::emojiPanBg);
 	}
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index 883e32407..58b2eec0e 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -445,7 +445,7 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
 					const auto roundTop = (roundCorners & RectPart::TopLeft);
 					const auto roundBottom = (roundCorners & RectPart::BottomLeft);
 					const auto margin = inWebPage
-						? st::buttonRadius
+						? st::roundRadiusSmall
 						: st::historyMessageRadius;
 					const auto parts = roundCorners
 						| RectPart::NoTopBottom
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
index df750a65e..6796114e3 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@@ -508,8 +508,8 @@ void Sticker::clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) {
 
 QSize Sticker::getThumbSize() const {
 	int width = qMax(content_width(), 1), height = qMax(content_height(), 1);
-	float64 coefw = (st::stickerPanSize.width() - st::buttonRadius * 2) / float64(width);
-	float64 coefh = (st::stickerPanSize.height() - st::buttonRadius * 2) / float64(height);
+	float64 coefw = (st::stickerPanSize.width() - st::roundRadiusSmall * 2) / float64(width);
+	float64 coefh = (st::stickerPanSize.height() - st::roundRadiusSmall * 2) / float64(height);
 	float64 coef = qMin(qMin(coefw, coefh), 1.);
 	int w = qRound(coef * content_width()), h = qRound(coef * content_height());
 	return QSize(qMax(w, 1), qMax(h, 1));
@@ -522,8 +522,8 @@ void Sticker::setupLottie() const {
 		_dataMedia.get(),
 		ChatHelpers::StickerLottieSize::InlineResults,
 		QSize(
-			st::stickerPanSize.width() - st::buttonRadius * 2,
-			st::stickerPanSize.height() - st::buttonRadius * 2
+			st::stickerPanSize.width() - st::roundRadiusSmall * 2,
+			st::stickerPanSize.height() - st::roundRadiusSmall * 2
 		) * cIntRetinaFactor());
 
 	_lottie->updates(
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
index 28acc81c8..4507e698a 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_inner.cpp
@@ -37,7 +37,7 @@ Inner::Inner(
 , _controller(controller)
 , _updateInlineItems([=] { updateInlineItems(); })
 , _previewTimer([=] { showPreview(); }) {
-	resize(st::emojiPanWidth - st::emojiScroll.width - st::buttonRadius, st::inlineResultsMinHeight);
+	resize(st::emojiPanWidth - st::emojiScroll.width - st::roundRadiusSmall, st::inlineResultsMinHeight);
 
 	setMouseTracking(true);
 	setAttribute(Qt::WA_OpaquePaintEvent);
@@ -85,8 +85,8 @@ void Inner::checkRestrictedPeer() {
 			if (!_restrictedLabel) {
 				_restrictedLabel.create(this, *error, st::stickersRestrictedLabel);
 				_restrictedLabel->show();
-				_restrictedLabel->move(st::inlineResultsLeft - st::buttonRadius, st::stickerPanPadding);
-				_restrictedLabel->resizeToNaturalWidth(width() - (st::inlineResultsLeft - st::buttonRadius) * 2);
+				_restrictedLabel->move(st::inlineResultsLeft - st::roundRadiusSmall, st::stickerPanPadding);
+				_restrictedLabel->resizeToNaturalWidth(width() - (st::inlineResultsLeft - st::roundRadiusSmall) * 2);
 				if (_switchPmButton) {
 					_switchPmButton->hide();
 				}
@@ -181,7 +181,7 @@ void Inner::paintInlineItems(Painter &p, const QRect &r) {
 		auto &inlineRow = _rows[row];
 		if (top >= r.top() + r.height()) break;
 		if (top + inlineRow.height > r.top()) {
-			auto left = st::inlineResultsLeft - st::buttonRadius;
+			auto left = st::inlineResultsLeft - st::roundRadiusSmall;
 			if (row == rows - 1) context.lastRow = true;
 			for (int col = 0, cols = inlineRow.items.size(); col < cols; ++col) {
 				if (left >= tox) break;
@@ -430,7 +430,7 @@ Inner::Row &Inner::layoutInlineRow(Row &row, int32 sumWidth) {
 	});
 
 	row.height = 0;
-	int availw = width() - (st::inlineResultsLeft - st::buttonRadius);
+	int availw = width() - (st::inlineResultsLeft - st::roundRadiusSmall);
 	for (int i = 0; i < count; ++i) {
 		int index = indices[i];
 		int w = sumWidth ? (row.items.at(index)->maxWidth() * availw / sumWidth) : row.items.at(index)->maxWidth();
@@ -478,7 +478,7 @@ void Inner::refreshSwitchPmButton(const CacheEntry *entry) {
 		_switchPmButton->setText(rpl::single(entry->switchPmText));
 		_switchPmStartToken = entry->switchPmStartToken;
 		const auto buttonTop = st::stickerPanPadding;
-		_switchPmButton->move(st::inlineResultsLeft - st::buttonRadius, buttonTop);
+		_switchPmButton->move(st::inlineResultsLeft - st::roundRadiusSmall, buttonTop);
 		if (isRestrictedView()) {
 			_switchPmButton->hide();
 		}
@@ -652,7 +652,7 @@ void Inner::updateSelected() {
 	auto newSelected = -1;
 	auto p = mapFromGlobal(_lastMousePos);
 
-	int sx = (rtl() ? width() - p.x() : p.x()) - (st::inlineResultsLeft - st::buttonRadius);
+	int sx = (rtl() ? width() - p.x() : p.x()) - (st::inlineResultsLeft - st::roundRadiusSmall);
 	int sy = p.y() - st::stickerPanPadding;
 	if (_switchPmButton) {
 		sy -= _switchPmButton->height() + st::inlineResultsSkip;
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
index 2878c3166..a384d1f2e 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
@@ -41,7 +41,7 @@ Widget::Widget(
 	_width = width();
 	_height = height();
 
-	_scroll->resize(st::emojiPanWidth - st::buttonRadius, _contentHeight);
+	_scroll->resize(st::emojiPanWidth - st::roundRadiusSmall, _contentHeight);
 
 	_scroll->move(verticalRect().topLeft());
 	_inner = _scroll->setOwnedWidget(object_ptr<Inner>(this, controller));
@@ -71,7 +71,7 @@ Widget::Widget(
 	// But we should force it to repaint so that GIFs will continue to animate without update() calls.
 	// We do that by creating a transparent widget above our _inner.
 	auto forceRepaintOnScroll = object_ptr<TWidget>(this);
-	forceRepaintOnScroll->setGeometry(innerRect().x() + st::buttonRadius, innerRect().y() + st::buttonRadius, st::buttonRadius, st::buttonRadius);
+	forceRepaintOnScroll->setGeometry(innerRect().x() + st::roundRadiusSmall, innerRect().y() + st::roundRadiusSmall, st::roundRadiusSmall, st::roundRadiusSmall);
 	forceRepaintOnScroll->setAttribute(Qt::WA_TransparentForMouseEvents);
 	forceRepaintOnScroll->show();
 
@@ -154,7 +154,7 @@ void Widget::paintContent(Painter &p) {
 	auto sidesTop = horizontal.y();
 	auto sidesHeight = horizontal.height();
 	p.fillRect(myrtlrect(inner.x() + inner.width() - st::emojiScroll.width, sidesTop, st::emojiScroll.width, sidesHeight), st::emojiPanBg);
-	p.fillRect(myrtlrect(inner.x(), sidesTop, st::buttonRadius, sidesHeight), st::emojiPanBg);
+	p.fillRect(myrtlrect(inner.x(), sidesTop, st::roundRadiusSmall, sidesHeight), st::emojiPanBg);
 }
 
 void Widget::moveByBottom() {
@@ -303,11 +303,11 @@ QRect Widget::innerRect() const {
 }
 
 QRect Widget::horizontalRect() const {
-	return innerRect().marginsRemoved(style::margins(0, st::buttonRadius, 0, st::buttonRadius));
+	return innerRect().marginsRemoved(style::margins(0, st::roundRadiusSmall, 0, st::roundRadiusSmall));
 }
 
 QRect Widget::verticalRect() const {
-	return innerRect().marginsRemoved(style::margins(st::buttonRadius, 0, st::buttonRadius, 0));
+	return innerRect().marginsRemoved(style::margins(st::roundRadiusSmall, 0, st::roundRadiusSmall, 0));
 }
 
 void Widget::clearInlineBot() {
@@ -319,8 +319,8 @@ bool Widget::overlaps(const QRect &globalRect) const {
 
 	auto testRect = QRect(mapFromGlobal(globalRect.topLeft()), globalRect.size());
 	auto inner = rect().marginsRemoved(st::emojiPanMargins);
-	return inner.marginsRemoved(QMargins(st::buttonRadius, 0, st::buttonRadius, 0)).contains(testRect)
-		|| inner.marginsRemoved(QMargins(0, st::buttonRadius, 0, st::buttonRadius)).contains(testRect);
+	return inner.marginsRemoved(QMargins(st::roundRadiusSmall, 0, st::roundRadiusSmall, 0)).contains(testRect)
+		|| inner.marginsRemoved(QMargins(0, st::roundRadiusSmall, 0, st::roundRadiusSmall)).contains(testRect);
 }
 
 void Widget::inlineBotChanged() {
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.h b/Telegram/SourceFiles/inline_bots/inline_results_widget.h
index d8fe739bf..4a8cd2f80 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.h
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.h
@@ -96,11 +96,11 @@ private:
 	// Rounded rect which has shadow around it.
 	QRect innerRect() const;
 
-	// Inner rect with removed st::buttonRadius from top and bottom.
+	// Inner rect with removed st::roundRadiusSmall from top and bottom.
 	// This one is allowed to be not rounded.
 	QRect horizontalRect() const;
 
-	// Inner rect with removed st::buttonRadius from left and right.
+	// Inner rect with removed st::roundRadiusSmall from left and right.
 	// This one is allowed to be not rounded.
 	QRect verticalRect() const;
 
diff --git a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
index 2e2c452af..082b49077 100644
--- a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
@@ -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;
-	Ui::FillRoundRect(p, QRect(shadowedRect.x(), -st::buttonRadius, shadowedRect.width(), shadowedRect.y() + shadowedRect.height() + st::buttonRadius), st::menuBg, Ui::MenuCorners, nullptr, parts);
+	Ui::FillRoundRect(p, QRect(shadowedRect.x(), -st::roundRadiusSmall, shadowedRect.width(), shadowedRect.y() + shadowedRect.height() + st::roundRadiusSmall), st::menuBg, Ui::MenuCorners, nullptr, parts);
 }
 
 void VolumeWidget::enterEventHook(QEvent *e) {
diff --git a/Telegram/SourceFiles/ui/cached_round_corners.cpp b/Telegram/SourceFiles/ui/cached_round_corners.cpp
index 3402363b9..4637bea36 100644
--- a/Telegram/SourceFiles/ui/cached_round_corners.cpp
+++ b/Telegram/SourceFiles/ui/cached_round_corners.cpp
@@ -61,7 +61,7 @@ void PrepareCorners(CachedRoundCorners index, int32 radius, const QBrush &brush,
 
 void CreateMaskCorners() {
 	QImage mask[4];
-	PrepareCorners(SmallMaskCorners, st::buttonRadius, QColor(255, 255, 255), nullptr, mask);
+	PrepareCorners(SmallMaskCorners, st::roundRadiusSmall, 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());
@@ -74,12 +74,12 @@ void CreateMaskCorners() {
 }
 
 void CreatePaletteCorners() {
-	PrepareCorners(MenuCorners, st::buttonRadius, st::menuBg);
+	PrepareCorners(MenuCorners, st::roundRadiusSmall, 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(SelectedOverlaySmallCorners, st::roundRadiusSmall, st::msgSelectOverlay);
 	PrepareCorners(SelectedOverlayLargeCorners, st::historyMessageRadius, st::msgSelectOverlay);
 	PrepareCorners(DateCorners, st::dateRadius, st::msgDateImgBg);
 	PrepareCorners(DateSelectedCorners, st::dateRadius, st::msgDateImgBgSelected);
@@ -89,15 +89,15 @@ void CreatePaletteCorners() {
 	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(EmojiHoverCorners, st::roundRadiusSmall, st::emojiPanHover);
+	PrepareCorners(StickerHoverCorners, st::roundRadiusSmall, st::emojiPanHover);
+	PrepareCorners(BotKeyboardCorners, st::roundRadiusSmall, st::botKbBg);
+	PrepareCorners(PhotoSelectOverlayCorners, st::roundRadiusSmall, 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(Doc1Corners, st::roundRadiusSmall, st::msgFile1Bg);
+	PrepareCorners(Doc2Corners, st::roundRadiusSmall, st::msgFile2Bg);
+	PrepareCorners(Doc3Corners, st::roundRadiusSmall, st::msgFile3Bg);
+	PrepareCorners(Doc4Corners, st::roundRadiusSmall, st::msgFile4Bg);
 
 	PrepareCorners(MessageInCorners, st::historyMessageRadius, st::msgInBg, &st::msgInShadow);
 	PrepareCorners(MessageInSelectedCorners, st::historyMessageRadius, st::msgInBgSelected, &st::msgInShadowSelected);
@@ -237,7 +237,7 @@ void FillRoundRect(Painter &p, int32 x, int32 y, int32 w, int32 h, style::color
 	if (i == CornersMap.cend()) {
 		QImage images[4];
 		switch (radius) {
-		case ImageRoundRadius::Small: PrepareCorners(SmallMaskCorners, st::buttonRadius, bg, nullptr, images); break;
+		case ImageRoundRadius::Small: PrepareCorners(SmallMaskCorners, st::roundRadiusSmall, bg, nullptr, images); break;
 		case ImageRoundRadius::Large: PrepareCorners(LargeMaskCorners, st::historyMessageRadius, bg, nullptr, images); break;
 		default: p.fillRect(x, y, w, h, bg); return;
 		}
diff --git a/Telegram/SourceFiles/ui/empty_userpic.cpp b/Telegram/SourceFiles/ui/empty_userpic.cpp
index 7fdd39374..9b4497f11 100644
--- a/Telegram/SourceFiles/ui/empty_userpic.cpp
+++ b/Telegram/SourceFiles/ui/empty_userpic.cpp
@@ -179,7 +179,7 @@ void EmptyUserpic::paint(
 
 void EmptyUserpic::paintRounded(Painter &p, int x, int y, int outerWidth, int size) const {
 	paint(p, x, y, outerWidth, size, [&p, x, y, size] {
-		p.drawRoundedRect(x, y, size, size, st::buttonRadius, st::buttonRadius);
+		p.drawRoundedRect(x, y, size, size, st::roundRadiusSmall, st::roundRadiusSmall);
 	});
 }
 
@@ -242,7 +242,7 @@ void EmptyUserpic::PaintSavedMessagesRounded(
 	PainterHighQualityEnabler hq(p);
 	p.setBrush(bg);
 	p.setPen(Qt::NoPen);
-	p.drawRoundedRect(x, y, size, size, st::buttonRadius, st::buttonRadius);
+	p.drawRoundedRect(x, y, size, size, st::roundRadiusSmall, st::roundRadiusSmall);
 
 	PaintSavedMessagesInner(p, x, y, size, bg, fg);
 }
@@ -312,7 +312,7 @@ void EmptyUserpic::PaintRepliesMessagesRounded(
 	PainterHighQualityEnabler hq(p);
 	p.setBrush(bg);
 	p.setPen(Qt::NoPen);
-	p.drawRoundedRect(x, y, size, size, st::buttonRadius, st::buttonRadius);
+	p.drawRoundedRect(x, y, size, size, st::roundRadiusSmall, st::roundRadiusSmall);
 
 	PaintRepliesMessagesInner(p, x, y, size, bg, fg);
 }
diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
index 6743916ea..3350a6a06 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
@@ -561,7 +561,7 @@ void Generator::paintDialogs() {
 	_p->setBrush(st::dialogsFilter.bgColor[_palette]);
 	{
 		PainterHighQualityEnabler hq(*_p);
-		_p->drawRoundedRect(QRectF(filter).marginsRemoved(QMarginsF(st::dialogsFilter.borderWidth / 2., st::dialogsFilter.borderWidth / 2., st::dialogsFilter.borderWidth / 2., st::dialogsFilter.borderWidth / 2.)), st::buttonRadius - (st::dialogsFilter.borderWidth / 2.), st::buttonRadius - (st::dialogsFilter.borderWidth / 2.));
+		_p->drawRoundedRect(QRectF(filter).marginsRemoved(QMarginsF(st::dialogsFilter.borderWidth / 2., st::dialogsFilter.borderWidth / 2., st::dialogsFilter.borderWidth / 2., st::dialogsFilter.borderWidth / 2.)), st::roundRadiusSmall - (st::dialogsFilter.borderWidth / 2.), st::roundRadiusSmall - (st::dialogsFilter.borderWidth / 2.));
 	}
 
 	if (!st::dialogsFilter.icon.empty()) {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index ea840471d..dfc0f0b88 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit ea840471d2330c2763567c2e46b2414af6e0429d
+Subproject commit dfc0f0b889375c10782a870a377936a19fcac7f3

From a14a62eefa79ee0954c16b073587fcd706453847 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Dec 2020 12:45:40 +0400
Subject: [PATCH 247/370] Update API scheme, add group call admin log events.

---
 Telegram/Resources/langs/lang.strings         |  6 ++
 Telegram/Resources/tl/api.tl                  | 13 +++-
 .../SourceFiles/calls/calls_group_call.cpp    |  8 +-
 .../admin_log/history_admin_log_item.cpp      | 75 +++++++++++++++++++
 4 files changed, 97 insertions(+), 5 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 0b6976833..04a47b633 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2068,6 +2068,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_admin_log_removed_location_chat" = "{from} removed the group location";
 "lng_admin_log_changed_slow_mode" = "{from} changed slow mode to {duration}";
 "lng_admin_log_removed_slow_mode" = "{from} disabled slow mode";
+"lng_admin_log_started_group_call" = "{from} started a new voice chat";
+"lng_admin_log_discarded_group_call" = "{from} discarded a voice chat";
+"lng_admin_log_muted_participant" = "{from} muted {user} in a voice chat";
+"lng_admin_log_unmuted_participant" = "{from} unmuted {user} in a voice chat";
+"lng_admin_log_allowed_unmute_self" = "{from} allowed new voice chat members to speak";
+"lng_admin_log_disallowed_unmute_self" = "{from} started muting new voice chat members";
 "lng_admin_log_user_with_username" = "{name} ({mention})";
 "lng_admin_log_restricted_forever" = "indefinitely";
 "lng_admin_log_restricted_until" = "until {date}";
diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index 35edc5b54..ddd731705 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -315,7 +315,7 @@ updateNewStickerSet#688a30aa stickerset:messages.StickerSet = Update;
 updateStickerSetsOrder#bb2d201 flags:# masks:flags.0?true order:Vector<long> = Update;
 updateStickerSets#43ae3dec = Update;
 updateSavedGifs#9375341e = Update;
-updateBotInlineQuery#54826690 flags:# query_id:long user_id:int query:string geo:flags.0?GeoPoint offset:string = Update;
+updateBotInlineQuery#3f2038db flags:# query_id:long user_id:int query:string geo:flags.0?GeoPoint peer_type:flags.1?InlineQueryPeerType 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;
 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;
@@ -879,6 +879,11 @@ channelAdminLogEventActionStopPoll#8f079643 message:Message = ChannelAdminLogEve
 channelAdminLogEventActionChangeLinkedChat#a26f881b prev_value:int new_value:int = ChannelAdminLogEventAction;
 channelAdminLogEventActionChangeLocation#e6b76ae prev_value:ChannelLocation new_value:ChannelLocation = ChannelAdminLogEventAction;
 channelAdminLogEventActionToggleSlowMode#53909779 prev_value:int new_value:int = ChannelAdminLogEventAction;
+channelAdminLogEventActionStartGroupCall#23209745 call:InputGroupCall = ChannelAdminLogEventAction;
+channelAdminLogEventActionDiscardGroupCall#db9f9140 call:InputGroupCall = ChannelAdminLogEventAction;
+channelAdminLogEventActionParticipantMute#f92424d2 participant:GroupCallParticipant = ChannelAdminLogEventAction;
+channelAdminLogEventActionParticipantUnmute#e64429c0 participant:GroupCallParticipant = ChannelAdminLogEventAction;
+channelAdminLogEventActionToggleGroupCallSetting#56d6a247 join_muted:Bool = ChannelAdminLogEventAction;
 
 channelAdminLogEvent#3b5a3e40 id:long date:int user_id:int action:ChannelAdminLogEventAction = ChannelAdminLogEvent;
 
@@ -1195,6 +1200,12 @@ phone.groupCall#66ab0bfc call:GroupCall participants:Vector<GroupCallParticipant
 
 phone.groupParticipants#9cfeb92d count:int participants:Vector<GroupCallParticipant> next_offset:string users:Vector<User> version:int = phone.GroupParticipants;
 
+inlineQueryPeerTypeSameBotPM#3081ed9d = InlineQueryPeerType;
+inlineQueryPeerTypePM#833c0fac = InlineQueryPeerType;
+inlineQueryPeerTypeChat#d766c50a = InlineQueryPeerType;
+inlineQueryPeerTypeMegagroup#5ec4be43 = InlineQueryPeerType;
+inlineQueryPeerTypeBroadcast#6334ee9a = InlineQueryPeerType;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index cef96ef3b..40e57ffaf 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -147,7 +147,7 @@ void GroupCall::start() {
 		LOG(("Call Error: Could not create, error: %1"
 			).arg(error.type()));
 		hangup();
-		if (error.type() == u"GROUP_CALL_ANONYMOUS_FORBIDDEN"_q) {
+		if (error.type() == u"GROUPCALL_ANONYMOUS_FORBIDDEN"_q) {
 			Ui::ShowMultilineToast({
 				.text = tr::lng_group_call_no_anonymous(tr::now),
 			});
@@ -236,7 +236,7 @@ void GroupCall::rejoin() {
 				hangup();
 
 				Ui::ShowMultilineToast({
-					.text = (type == u"GROUP_CALL_ANONYMOUS_FORBIDDEN"_q
+					.text = (type == u"GROUPCALL_ANONYMOUS_FORBIDDEN"_q
 						? tr::lng_group_call_no_anonymous(tr::now)
 						: type == u"GROUPCALL_PARTICIPANTS_TOO_MUCH"_q
 						? tr::lng_group_call_too_many(tr::now)
@@ -662,7 +662,7 @@ void GroupCall::sendMutedUpdate() {
 		_channel->session().api().applyUpdates(result);
 	}).fail([=](const RPCError &error) {
 		_updateMuteRequestId = 0;
-		if (error.type() == u"GROUP_CALL_FORBIDDEN"_q) {
+		if (error.type() == u"GROUPCALL_FORBIDDEN"_q) {
 			LOG(("Call Info: Rejoin after error '%1' in editGroupCallMember."
 				).arg(error.type()));
 			rejoin();
@@ -694,7 +694,7 @@ void GroupCall::toggleMute(not_null<UserData*> user, bool mute) {
 	)).done([=](const MTPUpdates &result) {
 		_channel->session().api().applyUpdates(result);
 	}).fail([=](const RPCError &error) {
-		if (error.type() == u"GROUP_CALL_FORBIDDEN"_q) {
+		if (error.type() == u"GROUPCALL_FORBIDDEN"_q) {
 			LOG(("Call Info: Rejoin after error '%1' in editGroupCallMember."
 				).arg(error.type()));
 			rejoin();
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 27df26a23..7ac1783af 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_item.cpp
@@ -824,6 +824,71 @@ void GenerateItems(
 		}
 	};
 
+	auto createStartGroupCall = [&](const MTPDchannelAdminLogEventActionStartGroupCall &data) {
+		const auto text = tr::lng_admin_log_started_group_call(tr::now, lt_from, fromLinkText);
+		addSimpleServiceMessage(text);
+	};
+
+	auto createDiscardGroupCall = [&](const MTPDchannelAdminLogEventActionDiscardGroupCall &data) {
+		const auto text = tr::lng_admin_log_discarded_group_call(tr::now, lt_from, fromLinkText);
+		addSimpleServiceMessage(text);
+	};
+
+	auto createParticipantMute = [&](const MTPDchannelAdminLogEventActionParticipantMute &data) {
+		data.vparticipant().match([&](const MTPDgroupCallParticipant &data) {
+			const auto user = history->owner().user(data.vuser_id().v);
+			const auto userLink = user->createOpenLink();
+			const auto userLinkText = textcmdLink(1, user->name);
+			auto text = tr::lng_admin_log_muted_participant(
+				tr::now,
+				lt_from,
+				fromLinkText,
+				lt_user,
+				userLinkText);
+			auto message = HistoryService::PreparedText{ text };
+			message.links.push_back(fromLink);
+			message.links.push_back(userLink);
+			addPart(history->makeServiceMessage(
+				history->nextNonHistoryEntryId(),
+				MTPDmessage_ClientFlag::f_admin_log_entry,
+				date,
+				message,
+				MTPDmessage::Flags(0),
+				peerToUser(from->id)));
+		});
+	};
+
+	auto createParticipantUnmute = [&](const MTPDchannelAdminLogEventActionParticipantUnmute &data) {
+		data.vparticipant().match([&](const MTPDgroupCallParticipant &data) {
+			const auto user = history->owner().user(data.vuser_id().v);
+			const auto userLink = user->createOpenLink();
+			const auto userLinkText = textcmdLink(1, user->name);
+			auto text = tr::lng_admin_log_unmuted_participant(
+				tr::now,
+				lt_from,
+				fromLinkText,
+				lt_user,
+				userLinkText);
+			auto message = HistoryService::PreparedText{ text };
+			message.links.push_back(fromLink);
+			message.links.push_back(userLink);
+			addPart(history->makeServiceMessage(
+				history->nextNonHistoryEntryId(),
+				MTPDmessage_ClientFlag::f_admin_log_entry,
+				date,
+				message,
+				MTPDmessage::Flags(0),
+				peerToUser(from->id)));
+		});
+	};
+
+	auto createToggleGroupCallSetting = [&](const MTPDchannelAdminLogEventActionToggleGroupCallSetting &data) {
+		const auto text = mtpIsTrue(data.vjoin_muted())
+			? tr::lng_admin_log_disallowed_unmute_self(tr::now, lt_from, fromLinkText)
+			: tr::lng_admin_log_allowed_unmute_self(tr::now, lt_from, fromLinkText);
+		addSimpleServiceMessage(text);
+	};
+
 	action.match([&](const MTPDchannelAdminLogEventActionChangeTitle &data) {
 		createChangeTitle(data);
 	}, [&](const MTPDchannelAdminLogEventActionChangeAbout &data) {
@@ -866,6 +931,16 @@ void GenerateItems(
 		createChangeLocation(data);
 	}, [&](const MTPDchannelAdminLogEventActionToggleSlowMode &data) {
 		createToggleSlowMode(data);
+	}, [&](const MTPDchannelAdminLogEventActionStartGroupCall &data) {
+		createStartGroupCall(data);
+	}, [&](const MTPDchannelAdminLogEventActionDiscardGroupCall &data) {
+		createDiscardGroupCall(data);
+	}, [&](const MTPDchannelAdminLogEventActionParticipantMute &data) {
+		createParticipantMute(data);
+	}, [&](const MTPDchannelAdminLogEventActionParticipantUnmute &data) {
+		createParticipantUnmute(data);
+	}, [&](const MTPDchannelAdminLogEventActionToggleGroupCallSetting &data) {
+		createToggleGroupCallSetting(data);
 	});
 }
 

From 49fc066480150e1ea7859f8aaa1600d66c7e7a4d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Dec 2020 13:39:54 +0400
Subject: [PATCH 248/370] Handle GROUPCALL_FORBIDDEN in joinGroupCall.

---
 Telegram/SourceFiles/calls/calls_group_call.cpp | 2 ++
 Telegram/SourceFiles/data/data_peer.cpp         | 9 ++++++---
 Telegram/SourceFiles/history/history_widget.cpp | 6 +++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 40e57ffaf..9ba7dccc5 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -240,6 +240,8 @@ void GroupCall::rejoin() {
 						? tr::lng_group_call_no_anonymous(tr::now)
 						: type == u"GROUPCALL_PARTICIPANTS_TOO_MUCH"_q
 						? tr::lng_group_call_too_many(tr::now)
+						: type == u"GROUPCALL_FORBIDDEN"_q
+						? tr::lng_group_not_accessible(tr::now)
 						: Lang::Hard::ServerError()),
 				});
 			}).send();
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 2883bf42c..ed236792e 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/image/image.h"
 #include "ui/empty_userpic.h"
 #include "ui/text/text_options.h"
+#include "ui/toasts/common_toasts.h"
 #include "history/history.h"
 #include "history/view/history_view_element.h"
 #include "history/history_item.h"
@@ -108,9 +109,11 @@ void PeerClickHandler::onClick(ClickContext context) const {
 			&& !clickedChannel->amIn()
 			&& (!currentPeer->isChannel()
 				|| currentPeer->asChannel()->linkedChat() != clickedChannel)) {
-			Ui::show(Box<InformBox>(_peer->isMegagroup()
-				? tr::lng_group_not_accessible(tr::now)
-				: tr::lng_channel_not_accessible(tr::now)));
+			Ui::ShowMultilineToast({
+				.text = (_peer->isMegagroup()
+					? tr::lng_group_not_accessible(tr::now)
+					: tr::lng_channel_not_accessible(tr::now)),
+			});
 		} else {
 			window->showPeerHistory(
 				_peer,
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index bb0ec76a0..feefa41fb 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2397,7 +2397,11 @@ void HistoryWidget::messagesFailed(const RPCError &error, int requestId) {
 		|| error.type() == qstr("USER_BANNED_IN_CHANNEL")) {
 		auto was = _peer;
 		controller()->showBackFromStack();
-		Ui::show(Box<InformBox>((was && was->isMegagroup()) ? tr::lng_group_not_accessible(tr::now) : tr::lng_channel_not_accessible(tr::now)));
+		Ui::ShowMultilineToast({
+			.text = ((was && was->isMegagroup())
+				? tr::lng_group_not_accessible(tr::now)
+				: tr::lng_channel_not_accessible(tr::now)),
+		});
 		return;
 	}
 

From a61567e1a8933c30f667588802f50b2ad463be9e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Dec 2020 13:52:11 +0400
Subject: [PATCH 249/370] Create a call in legacy group with migration.

---
 .../history/view/history_view_top_bar_widget.cpp           | 7 +++++++
 Telegram/lib_base                                          | 2 +-
 cmake                                                      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

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 2fb223b15..a3885c7ea 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -230,6 +230,11 @@ void TopBarWidget::groupCall() {
 			} else {
 				Core::App().calls().startGroupCall(megagroup);
 			}
+		} else if (const auto chat = peer->asChat()) {
+			const auto start = [=](not_null<ChannelData*> megagroup) {
+				Core::App().calls().startGroupCall(megagroup);
+			};
+			peer->session().api().migrateChat(chat, crl::guard(this, start));
 		}
 	}
 }
@@ -731,6 +736,8 @@ void TopBarWidget::updateControlsVisibility() {
 		if (const auto peer = _activeChat.key.peer()) {
 			if (const auto megagroup = peer->asMegagroup()) {
 				return megagroup->canManageCall();
+			} else if (const auto chat = peer->asChat()) {
+				return chat->amCreator();
 			}
 		}
 		return false;
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 01a7497eb..69f70b8f4 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 01a7497eb84abc2353011d7f5dd4a5e6441e6957
+Subproject commit 69f70b8f47a8c0e3bf75a3ae38d39bd1877655d0
diff --git a/cmake b/cmake
index 28b11b099..f29f5e727 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 28b11b099ad54151f38b7d5c0c00ff9ce12d4674
+Subproject commit f29f5e727f9a4e947ce7cc4456256eb07d3c8c7f

From 33fc3fe3540481fe0215f7bfa4612241c1444397 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Dec 2020 15:51:18 +0400
Subject: [PATCH 250/370] Make 'voice chat' links clickable in service
 messages.

---
 Telegram/Resources/langs/lang.strings         |  15 +-
 .../SourceFiles/history/history_service.cpp   | 216 ++++++++++++++----
 .../SourceFiles/history/history_service.h     |   4 +
 3 files changed, 185 insertions(+), 50 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 04a47b633..896824f54 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1062,11 +1062,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_duration_minsec_seconds#other" = "{count} sec";
 "lng_duration_minutes_seconds" = "{minutes_count} {seconds_count}";
 
-"lng_action_invite_user" = "{from} invited {user} to the voice chat";
-"lng_action_invite_users_many" = "{from} invited {users} to the voice chat";
+"lng_action_invite_user" = "{from} invited {user} to {chat}";
+"lng_action_invite_users_many" = "{from} invited {users} to {chat}";
+"lng_action_invite_user_chat" = "the voice chat";
 "lng_action_invite_users_and_one" = "{accumulated}, {user}";
 "lng_action_invite_users_and_last" = "{accumulated} and {user}";
-"lng_action_group_call_started" = "{from} started a voice chat";
+"lng_action_group_call_started" = "{from} started {chat}";
+"lng_action_group_call_started_chat" = "a voice chat";
 "lng_action_group_call_finished" = "Voice chat finished ({duration})";
 "lng_action_add_user" = "{from} added {user}";
 "lng_action_add_users_many" = "{from} added {users}";
@@ -1142,13 +1144,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_migrate_body" = "To add more members, you can upgrade your group to a supergroup.";
 "lng_profile_migrate_learn_more" = "Learn more »";
 "lng_profile_migrate_button" = "Upgrade to supergroup";
-"lng_profile_convert_title" = "Convert to supergroup";
-"lng_profile_convert_feature1" = "— New members see the full message history";
-"lng_profile_convert_feature2" = "— Messages are deleted for all members";
-"lng_profile_convert_feature3" = "— Admins can pin important messages";
-"lng_profile_convert_feature4" = "— Creator can set a public link for the group";
-"lng_profile_convert_warning" = "{bold_start}Note:{bold_end} This action can not be undone";
-"lng_profile_convert_confirm" = "Convert";
 "lng_profile_add_more_after_create" = "You will be able to add more members after you create the group.";
 
 "lng_channel_not_accessible" = "Sorry, this channel is not accessible.";
diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index 7467f196f..d804a75c6 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -24,7 +24,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel.h"
 #include "data/data_user.h"
 #include "data/data_changes.h"
+#include "data/data_group_call.h" // Data::GroupCall::id().
 #include "core/application.h"
+#include "calls/calls_instance.h" // Core::App().calls().joinGroupCall.
 #include "window/notifications_manager.h"
 #include "window/window_session_controller.h"
 #include "storage/storage_shared_media.h"
@@ -35,6 +37,44 @@ namespace {
 
 constexpr auto kPinnedMessageTextLimit = 16;
 
+[[nodiscard]] rpl::producer<bool> ChannelHasThisCallValue(
+		not_null<ChannelData*> channel,
+		uint64 id) {
+	return channel->session().changes().peerFlagsValue(
+		channel,
+		Data::PeerUpdate::Flag::GroupCall
+	) | rpl::filter([=] {
+		return (channel->call() != nullptr)
+			|| !(channel->flags()
+				& MTPDchannel::Flag::f_call_active);
+	}) | rpl::map([=] {
+		const auto call = channel->call();
+		return (call && call->id() == id);
+	}) | rpl::distinct_until_changed(
+	) | rpl::take_while([=](bool hasThisCall) {
+		return hasThisCall;
+	}) | rpl::then(
+		rpl::single(false)
+	);
+}
+
+[[nodiscard]] std::optional<bool> ChannelHasThisCall(
+		not_null<ChannelData*> channel,
+		uint64 id) {
+	const auto call = channel->call();
+	return call
+		? std::make_optional(call->id() == id)
+		: (channel->flags() & MTPDchannel::Flag::f_call_active)
+		? std::nullopt
+		: std::make_optional(false);
+}
+
+[[nodiscard]] uint64 CallIdFromInput(const MTPInputGroupCall &data) {
+	return data.match([&](const MTPDinputGroupCall &data) {
+		return data.vid().v;
+	});
+}
+
 } // namespace
 
 void HistoryService::setMessageByAction(const MTPmessageAction &action) {
@@ -278,53 +318,32 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 		if (const auto duration = action.vduration()) {
 			return prepareDiscardedCallText(duration->v);
 		}
-		auto result = PreparedText{};
-		result.links.push_back(fromLink());
-		result.text = tr::lng_action_group_call_started(tr::now, lt_from, fromLinkText());
-		return result;
+		const auto callId = CallIdFromInput(action.vcall());
+		const auto channel = history()->peer->asChannel();
+		const auto linkCallId = !channel
+			? 0
+			: ChannelHasThisCall(channel, callId).value_or(false)
+			? callId
+			: 0;
+		return prepareStartedCallText(linkCallId);
 	};
 
 	auto prepareInviteToGroupCall = [this](const MTPDmessageActionInviteToGroupCall &action) {
-		const auto channel = history()->peer->asChannel();
-		const auto callId = action.vcall().match([&](const MTPDinputGroupCall &data) {
-			return data.vid().v;
-		});
+		const auto callId = CallIdFromInput(action.vcall());
 		const auto owner = &history()->owner();
-		const auto registerUser = [&](UserId userId) {
-			const auto user = owner->user(userId);
+		const auto channel = history()->peer->asChannel();
+		for (const auto id : action.vusers().v) {
+			const auto user = owner->user(id.v);
 			if (channel && callId) {
 				owner->registerInvitedToCallUser(callId, channel, user);
 			}
-			return user;
 		};
-		auto result = PreparedText{};
-		auto &users = action.vusers().v;
-		if (users.size() == 1) {
-			auto user = registerUser(users[0].v);
-			result.links.push_back(fromLink());
-			result.links.push_back(user->createOpenLink());
-			result.text = tr::lng_action_invite_user(tr::now, lt_from, fromLinkText(), lt_user, textcmdLink(2, user->name));
-		} else if (users.isEmpty()) {
-			result.links.push_back(fromLink());
-			result.text = tr::lng_action_invite_user(tr::now, lt_from, fromLinkText(), lt_user, qsl("somebody"));
-		} else {
-			result.links.push_back(fromLink());
-			for (auto i = 0, l = users.size(); i != l; ++i) {
-				auto user = registerUser(users[i].v);
-				result.links.push_back(user->createOpenLink());
-
-				auto linkText = textcmdLink(i + 2, user->name);
-				if (i == 0) {
-					result.text = linkText;
-				} else if (i + 1 == l) {
-					result.text = tr::lng_action_invite_users_and_last(tr::now, lt_accumulated, result.text, lt_user, linkText);
-				} else {
-					result.text = tr::lng_action_invite_users_and_one(tr::now, lt_accumulated, result.text, lt_user, linkText);
-				}
-			}
-			result.text = tr::lng_action_invite_users_many(tr::now, lt_from, fromLinkText(), lt_users, result.text);
-		}
-		return result;
+		const auto linkCallId = !channel
+			? 0
+			: ChannelHasThisCall(channel, callId).value_or(false)
+			? callId
+			: 0;
+		return prepareInvitedToCallText(action.vusers().v, linkCallId);
 	};
 
 	const auto messageText = action.match([&](
@@ -492,6 +511,73 @@ HistoryService::PreparedText HistoryService::prepareDiscardedCallText(
 	return PreparedText{ tr::lng_action_group_call_finished(tr::now, lt_duration, text) };
 }
 
+HistoryService::PreparedText HistoryService::prepareStartedCallText(
+		uint64 linkCallId) {
+	auto result = PreparedText{};
+	result.links.push_back(fromLink());
+	const auto channel = history()->peer->asChannel();
+	auto chatText = tr::lng_action_group_call_started_chat(tr::now);
+	if (channel && linkCallId) {
+		result.links.push_back(std::make_shared<LambdaClickHandler>([=] {
+			const auto call = channel->call();
+			if (call && call->id() == linkCallId) {
+				Core::App().calls().joinGroupCall(channel, call->input());
+			}
+		}));
+		chatText = textcmdLink(2, chatText);
+	}
+	result.text = tr::lng_action_group_call_started(
+		tr::now,
+		lt_from,
+		fromLinkText(),
+		lt_chat,
+		chatText);
+	return result;
+}
+
+HistoryService::PreparedText HistoryService::prepareInvitedToCallText(
+		const QVector<MTPint> &users,
+		uint64 linkCallId) {
+	const auto channel = history()->peer->asChannel();
+	const auto owner = &channel->owner();
+	auto chatText = tr::lng_action_invite_user_chat(tr::now);
+	auto result = PreparedText{};
+	result.links.push_back(fromLink());
+	auto linkIndex = 1;
+	if (channel && linkCallId) {
+		result.links.push_back(std::make_shared<LambdaClickHandler>([=] {
+			const auto call = channel->call();
+			if (call && call->id() == linkCallId) {
+				Core::App().calls().joinGroupCall(channel, call->input());
+			}
+		}));
+		chatText = textcmdLink(++linkIndex, chatText);
+	}
+	if (users.size() == 1) {
+		auto user = owner->user(users[0].v);
+		result.links.push_back(user->createOpenLink());
+		result.text = tr::lng_action_invite_user(tr::now, lt_from, fromLinkText(), lt_user, textcmdLink(++linkIndex, user->name), lt_chat, chatText);
+	} else if (users.isEmpty()) {
+		result.text = tr::lng_action_invite_user(tr::now, lt_from, fromLinkText(), lt_user, qsl("somebody"), lt_chat, chatText);
+	} else {
+		for (auto i = 0, l = users.size(); i != l; ++i) {
+			auto user = owner->user(users[i].v);
+			result.links.push_back(user->createOpenLink());
+
+			auto linkText = textcmdLink(++linkIndex, user->name);
+			if (i == 0) {
+				result.text = linkText;
+			} else if (i + 1 == l) {
+				result.text = tr::lng_action_invite_users_and_last(tr::now, lt_accumulated, result.text, lt_user, linkText);
+			} else {
+				result.text = tr::lng_action_invite_users_and_one(tr::now, lt_accumulated, result.text, lt_user, linkText);
+			}
+		}
+		result.text = tr::lng_action_invite_users_many(tr::now, lt_from, fromLinkText(), lt_users, result.text, lt_chat, chatText);
+	}
+	return result;
+}
+
 HistoryService::PreparedText HistoryService::preparePinnedText() {
 	auto result = PreparedText {};
 	auto pinned = Get<HistoryServicePinned>();
@@ -831,8 +917,9 @@ void HistoryService::createFromMtp(const MTPDmessageService &message) {
 		} else {
 			UpdateComponents(HistoryServiceOngoingCall::Bit());
 			const auto call = Get<HistoryServiceOngoingCall>();
-			const auto id = data.vcall().c_inputGroupCall().vid().v;
+			const auto id = CallIdFromInput(data.vcall());
 			call->lifetime.destroy();
+
 			history()->owner().groupCallDiscards(
 			) | rpl::filter([=](Data::Session::GroupCallDiscard discard) {
 				return (discard.id == id);
@@ -841,6 +928,55 @@ void HistoryService::createFromMtp(const MTPDmessageService &message) {
 				RemoveComponents(HistoryServiceOngoingCall::Bit());
 				updateText(prepareDiscardedCallText(discard.duration));
 			}, call->lifetime);
+
+			if (const auto channel = history()->peer->asChannel()) {
+				const auto has = ChannelHasThisCall(channel, id);
+				if (!has.has_value()) {
+					ChannelHasThisCallValue(
+						channel,
+						id
+					) | rpl::start_with_next([=](bool has) {
+						updateText(prepareStartedCallText(has ? id : 0));
+					}, call->lifetime);
+				} else if (*has) {
+					ChannelHasThisCallValue(
+						channel,
+						id
+					) | rpl::skip(1) | rpl::start_with_next([=](bool has) {
+						Assert(!has);
+						updateText(prepareStartedCallText(0));
+					}, call->lifetime);
+				}
+			}
+		}
+	} else if (message.vaction().type() == mtpc_messageActionInviteToGroupCall) {
+		const auto &data = message.vaction().c_messageActionInviteToGroupCall();
+		const auto id = CallIdFromInput(data.vcall());
+		const auto channel = history()->peer->asChannel();
+		const auto has = channel
+			? ChannelHasThisCall(channel, id)
+			: std::make_optional(false);
+		auto hasLink = !has.has_value()
+			? ChannelHasThisCallValue(channel, id)
+			: (*has)
+			? ChannelHasThisCallValue(
+				channel,
+				id) | rpl::skip(1) | rpl::type_erased()
+			: rpl::producer<bool>();
+		if (!hasLink) {
+			RemoveComponents(HistoryServiceOngoingCall::Bit());
+		} else {
+			UpdateComponents(HistoryServiceOngoingCall::Bit());
+			const auto call = Get<HistoryServiceOngoingCall>();
+			call->lifetime.destroy();
+
+			const auto users = data.vusers().v;
+			std::move(hasLink) | rpl::start_with_next([=](bool has) {
+				updateText(prepareInvitedToCallText(users, has ? id : 0));
+				if (!has) {
+					RemoveComponents(HistoryServiceOngoingCall::Bit());
+				}
+			}, call->lifetime);
 		}
 	}
 	if (const auto replyTo = message.vreply_to()) {
diff --git a/Telegram/SourceFiles/history/history_service.h b/Telegram/SourceFiles/history/history_service.h
index f9f93240a..7b7bcbab3 100644
--- a/Telegram/SourceFiles/history/history_service.h
+++ b/Telegram/SourceFiles/history/history_service.h
@@ -157,6 +157,10 @@ private:
 	PreparedText prepareGameScoreText();
 	PreparedText preparePaymentSentText();
 	PreparedText prepareDiscardedCallText(int duration);
+	PreparedText prepareStartedCallText(uint64 linkCallId);
+	PreparedText prepareInvitedToCallText(
+		const QVector<MTPint> &users,
+		uint64 linkCallId);
 
 	friend class HistoryView::Service;
 

From 529c12ea3a2a4bdb9e0fe45e56f26162ebc7cc33 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Dec 2020 16:03:59 +0400
Subject: [PATCH 251/370] Hide call panel when starting hanging up.

---
 Telegram/SourceFiles/calls/calls_group_panel.cpp | 10 ++++++++++
 Telegram/SourceFiles/calls/calls_instance.cpp    | 12 +++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 80339859d..0c7c78540 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -353,6 +353,16 @@ void GroupPanel::initWithCall(GroupCall *call) {
 
 	_channel = _call->channel();
 
+	call->stateValue(
+	) | rpl::filter([](State state) {
+		return (state == State::HangingUp)
+			|| (state == State::Ended)
+			|| (state == State::FailedHangingUp)
+			|| (state == State::Failed);
+	}) | rpl::start_with_next([=] {
+		closeBeforeDestroy();
+	}, _callLifetime);
+
 	call->levelUpdates(
 	) | rpl::filter([=](const LevelUpdate &update) {
 		return update.self;
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index 38e3fb256..f1c405810 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -196,6 +196,9 @@ void Instance::destroyGroupCall(not_null<GroupCall*> call) {
 void Instance::createGroupCall(
 		not_null<ChannelData*> channel,
 		const MTPInputGroupCall &inputCall) {
+	if (_currentGroupCall) {
+		destroyGroupCall(_currentGroupCall.get());
+	}
 	auto call = std::make_unique<GroupCall>(
 		getGroupCallDelegate(),
 		channel,
@@ -433,7 +436,14 @@ bool Instance::inCall() const {
 }
 
 bool Instance::inGroupCall() const {
-	return (_currentGroupCall != nullptr);
+	if (!_currentGroupCall) {
+		return false;
+	}
+	const auto state = _currentGroupCall->state();
+	return (state != GroupCall::State::HangingUp)
+		&& (state != GroupCall::State::Ended)
+		&& (state != GroupCall::State::FailedHangingUp)
+		&& (state != GroupCall::State::Failed);
 }
 
 bool Instance::activateCurrentCall() {

From 546881c72037e52044835bcfe4d3256054ee44a2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Dec 2020 19:09:13 +0400
Subject: [PATCH 252/370] Join other calls with confirmation.

---
 Telegram/Resources/langs/lang.strings         |  2 +
 Telegram/SourceFiles/calls/calls_call.cpp     | 15 ++++---
 .../SourceFiles/calls/calls_group_call.cpp    | 15 ++++---
 Telegram/SourceFiles/calls/calls_instance.cpp | 43 +++++++++++--------
 Telegram/SourceFiles/calls/calls_instance.h   | 12 +++---
 .../SourceFiles/history/history_service.cpp   | 33 ++++++++------
 .../SourceFiles/history/history_widget.cpp    |  4 +-
 .../view/history_view_top_bar_widget.cpp      | 12 +-----
 .../view/history_view_top_bar_widget.h        |  1 +
 .../window/window_session_controller.cpp      | 36 ++++++++++++++++
 .../window/window_session_controller.h        |  4 ++
 11 files changed, 119 insertions(+), 58 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 896824f54..a935525e0 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1777,6 +1777,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_call_error_audio_io" = "There seems to be a problem with audio playback on your computer. Please make sure that your computer's speakers and microphone are working and try again.";
 
 "lng_call_bar_hangup" = "End call";
+"lng_call_leave_to_other_sure" = "Do you want to end your active call and join a voice chat in this group?";
 
 "lng_call_box_title" = "Calls";
 "lng_call_box_about" = "You haven't made any Telegram calls yet.";
@@ -1824,6 +1825,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_leave" = "Leave";
 "lng_group_call_leave_title" = "Leave voice chat";
 "lng_group_call_leave_sure" = "Are you sure you want to leave this voice chat?";
+"lng_group_call_leave_to_other_sure" = "Do you want to leave your active voice chat and join a voice chat in this group?";
 "lng_group_call_also_end" = "End voice chat";
 "lng_group_call_settings_title" = "Settings";
 "lng_group_call_invite_title" = "Invite members";
diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 913536660..669d9153c 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -1036,7 +1036,12 @@ void Call::finish(FinishType type, const MTPPhoneCallDiscardReason &reason) {
 		|| (_videoOutgoing->state() != Webrtc::VideoState::Inactive))
 		? MTPphone_DiscardCall::Flag::f_video
 		: MTPphone_DiscardCall::Flag(0);
-	_api.request(MTPphone_DiscardCall(
+
+	// We want to discard request still being sent and processed even if
+	// the call is already destroyed.
+	const auto session = &_user->session();
+	const auto weak = base::make_weak(this);
+	session->api().request(MTPphone_DiscardCall( // We send 'discard' here.
 		MTP_flags(flags),
 		MTP_inputPhoneCall(
 			MTP_long(_id),
@@ -1047,11 +1052,11 @@ void Call::finish(FinishType type, const MTPPhoneCallDiscardReason &reason) {
 	)).done([=](const MTPUpdates &result) {
 		// Here 'this' could be destroyed by updates, so we set Ended after
 		// updates being handled, but in a guarded way.
-		crl::on_main(this, [=] { setState(finalState); });
-		_user->session().api().applyUpdates(result);
-	}).fail([this, finalState](const RPCError &error) {
+		crl::on_main(weak, [=] { setState(finalState); });
+		session->api().applyUpdates(result);
+	}).fail(crl::guard(weak, [this, finalState](const RPCError &error) {
 		setState(finalState);
-	}).send();
+	})).send();
 }
 
 void Call::setStateQueued(State state) {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 9ba7dccc5..af8541429 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -330,17 +330,22 @@ void GroupCall::finish(FinishType type) {
 	}
 
 	setState(hangupState);
-	_api.request(MTPphone_LeaveGroupCall(
+
+	// We want to leave request still being sent and processed even if
+	// the call is already destroyed.
+	const auto session = &_channel->session();
+	const auto weak = base::make_weak(this);
+	session->api().request(MTPphone_LeaveGroupCall(
 		inputCall(),
 		MTP_int(_mySsrc)
 	)).done([=](const MTPUpdates &result) {
 		// Here 'this' could be destroyed by updates, so we set Ended after
 		// updates being handled, but in a guarded way.
-		crl::on_main(this, [=] { setState(finalState); });
-		_channel->session().api().applyUpdates(result);
-	}).fail([=](const RPCError &error) {
+		crl::on_main(weak, [=] { setState(finalState); });
+		session->api().applyUpdates(result);
+	}).fail(crl::guard(weak, [=](const RPCError &error) {
 		setState(finalState);
-	}).send();
+	})).send();
 }
 
 void GroupCall::setMuted(MuteState mute) {
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index f1c405810..e05bbfc16 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -58,23 +58,13 @@ void Instance::startOutgoingCall(not_null<UserData*> user, bool video) {
 	}), video);
 }
 
-void Instance::startGroupCall(not_null<ChannelData*> channel) {
-	if (activateCurrentCall()) {
-		return;
-	}
+void Instance::startOrJoinGroupCall(not_null<ChannelData*> channel) {
+	destroyCurrentCall();
 	requestPermissionsOrFail(crl::guard(this, [=] {
-		createGroupCall(channel, MTP_inputGroupCall(MTPlong(), MTPlong()));
-	}), false);
-}
-
-void Instance::joinGroupCall(
-		not_null<ChannelData*> channel,
-		const MTPInputGroupCall &call) {
-	if (activateCurrentCall()) {
-		return;
-	}
-	requestPermissionsOrFail(crl::guard(this, [=] {
-		createGroupCall(channel, call);
+		const auto call = channel->call();
+		createGroupCall(
+			channel,
+			call ? call->input() : MTP_inputGroupCall(MTPlong(), MTPlong()));
 	}), false);
 }
 
@@ -432,7 +422,11 @@ void Instance::handleSignalingData(
 }
 
 bool Instance::inCall() const {
-	return (_currentCall && _currentCall->state() != Call::State::Busy);
+	if (!_currentCall) {
+		return false;
+	}
+	const auto state = _currentCall->state();
+	return (state != Call::State::Busy);
 }
 
 bool Instance::inGroupCall() const {
@@ -446,6 +440,21 @@ bool Instance::inGroupCall() const {
 		&& (state != GroupCall::State::Failed);
 }
 
+void Instance::destroyCurrentCall() {
+	if (const auto current = currentCall()) {
+		current->hangup();
+		if (const auto still = currentCall()) {
+			destroyCall(still);
+		}
+	}
+	if (const auto current = currentGroupCall()) {
+		current->hangup();
+		if (const auto still = currentGroupCall()) {
+			destroyGroupCall(still);
+		}
+	}
+}
+
 bool Instance::activateCurrentCall() {
 	if (inCall()) {
 		_currentCallPanel->showAndActivate();
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index 10d9b56b1..0c9458cdc 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -40,10 +40,7 @@ public:
 	~Instance();
 
 	void startOutgoingCall(not_null<UserData*> user, bool video);
-	void startGroupCall(not_null<ChannelData*> channel);
-	void joinGroupCall(
-		not_null<ChannelData*> channel,
-		const MTPInputGroupCall &call);
+	void startOrJoinGroupCall(not_null<ChannelData*> channel);
 	void handleUpdate(
 		not_null<Main::Session*> session,
 		const MTPUpdate &update);
@@ -53,6 +50,9 @@ public:
 	[[nodiscard]] rpl::producer<Call*> currentCallValue() const;
 	[[nodiscard]] GroupCall *currentGroupCall() const;
 	[[nodiscard]] rpl::producer<GroupCall*> currentGroupCallValue() const;
+	[[nodiscard]] bool inCall() const;
+	[[nodiscard]] bool inGroupCall() const;
+	bool activateCurrentCall();
 	std::shared_ptr<tgcalls::VideoCaptureInterface> getVideoCapture() override;
 
 	void setCurrentAudioDevice(bool input, const QString &deviceId);
@@ -98,9 +98,7 @@ private:
 	void refreshServerConfig(not_null<Main::Session*> session);
 	bytes::const_span updateDhConfig(const MTPmessages_DhConfig &data);
 
-	bool activateCurrentCall();
-	[[nodiscard]] bool inCall() const;
-	[[nodiscard]] bool inGroupCall() const;
+	void destroyCurrentCall();
 	void handleCallUpdate(
 		not_null<Main::Session*> session,
 		const MTPPhoneCall &call);
diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index d804a75c6..528943345 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "mainwidget.h"
 #include "main/main_session.h"
+#include "main/main_domain.h" // Core::App().domain().activate().
 #include "apiwrap.h"
 #include "layout.h"
 #include "history/history.h"
@@ -75,6 +76,24 @@ constexpr auto kPinnedMessageTextLimit = 16;
 	});
 }
 
+[[nodiscard]] ClickHandlerPtr ChannelCallClickHandler(
+		not_null<ChannelData*> megagroup,
+		uint64 callId) {
+	return std::make_shared<LambdaClickHandler>([=] {
+		const auto call = megagroup->call();
+		if (call && call->id() == callId) {
+			const auto &windows = megagroup->session().windows();
+			if (windows.empty()) {
+				Core::App().domain().activate(&megagroup->session().account());
+				if (windows.empty()) {
+					return;
+				}
+			}
+			windows.front()->startOrJoinGroupCall(megagroup);
+		}
+	});
+}
+
 } // namespace
 
 void HistoryService::setMessageByAction(const MTPmessageAction &action) {
@@ -518,12 +537,7 @@ HistoryService::PreparedText HistoryService::prepareStartedCallText(
 	const auto channel = history()->peer->asChannel();
 	auto chatText = tr::lng_action_group_call_started_chat(tr::now);
 	if (channel && linkCallId) {
-		result.links.push_back(std::make_shared<LambdaClickHandler>([=] {
-			const auto call = channel->call();
-			if (call && call->id() == linkCallId) {
-				Core::App().calls().joinGroupCall(channel, call->input());
-			}
-		}));
+		result.links.push_back(ChannelCallClickHandler(channel, linkCallId));
 		chatText = textcmdLink(2, chatText);
 	}
 	result.text = tr::lng_action_group_call_started(
@@ -545,12 +559,7 @@ HistoryService::PreparedText HistoryService::prepareInvitedToCallText(
 	result.links.push_back(fromLink());
 	auto linkIndex = 1;
 	if (channel && linkCallId) {
-		result.links.push_back(std::make_shared<LambdaClickHandler>([=] {
-			const auto call = channel->call();
-			if (call && call->id() == linkCallId) {
-				Core::App().calls().joinGroupCall(channel, call->input());
-			}
-		}));
+		result.links.push_back(ChannelCallClickHandler(channel, linkCallId));
 		chatText = textcmdLink(++linkIndex, chatText);
 	}
 	if (users.size() == 1) {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index feefa41fb..fe5c964c0 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5441,8 +5441,8 @@ void HistoryWidget::setupGroupCallTracker() {
 				.text = tr::lng_group_call_no_anonymous(tr::now),
 				});
 			return;
-		} else if (const auto call = channel->call()) {
-			Core::App().calls().joinGroupCall(channel, call->input());
+		} else if (channel->call()) {
+			controller()->startOrJoinGroupCall(channel);
 		}
 	}, _groupCallBar->lifetime());
 
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 a3885c7ea..0741b2e29 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -221,18 +221,10 @@ void TopBarWidget::call() {
 void TopBarWidget::groupCall() {
 	if (const auto peer = _activeChat.key.peer()) {
 		if (const auto megagroup = peer->asMegagroup()) {
-			if (megagroup->amAnonymous()) {
-				Ui::ShowMultilineToast({
-					.text = tr::lng_group_call_no_anonymous(tr::now),
-					});
-			} else if (const auto call = megagroup->call()) {
-				Core::App().calls().joinGroupCall(megagroup, call->input());
-			} else {
-				Core::App().calls().startGroupCall(megagroup);
-			}
+			_controller->startOrJoinGroupCall(megagroup);
 		} else if (const auto chat = peer->asChat()) {
 			const auto start = [=](not_null<ChannelData*> megagroup) {
-				Core::App().calls().startGroupCall(megagroup);
+				_controller->startOrJoinGroupCall(megagroup);
 			};
 			peer->session().api().migrateChat(chat, crl::guard(this, start));
 		}
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 a79b5dcc2..076c56f0d 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
@@ -97,6 +97,7 @@ private:
 
 	void call();
 	void groupCall();
+	void startGroupCall(not_null<ChannelData*> megagroup, bool confirmed);
 	void search();
 	void showMenu();
 	void toggleInfoSection();
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 7828489c0..27eb8fc10 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -38,6 +38,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/delayed_activation.h"
 #include "ui/toast/toast.h"
+#include "ui/toasts/common_toasts.h"
+#include "calls/calls_instance.h" // Core::App().calls().inCall().
 #include "boxes/calendar_box.h"
 #include "boxes/confirm_box.h"
 #include "mainwidget.h"
@@ -930,6 +932,40 @@ void SessionController::closeThirdSection() {
 	}
 }
 
+void SessionController::startOrJoinGroupCall(
+		not_null<ChannelData*> megagroup,
+		bool confirmedLeaveOther) {
+	if (megagroup->amAnonymous()) {
+		Ui::ShowMultilineToast({
+			.text = tr::lng_group_call_no_anonymous(tr::now),
+		});
+		return;
+	}
+	auto &calls = Core::App().calls();
+	const auto confirm = [&](QString text, QString button) {
+		Ui::show(Box<ConfirmBox>(text, button, crl::guard(this, [=] {
+			Ui::hideLayer();
+			startOrJoinGroupCall(megagroup, true);
+		})));
+	};
+	if (!confirmedLeaveOther && calls.inCall()) {
+		// Do you want to leave your active voice chat to join a voice chat in this group?
+		confirm(
+			tr::lng_call_leave_to_other_sure(tr::now),
+			tr::lng_call_bar_hangup(tr::now));
+	} else if (!confirmedLeaveOther && calls.inGroupCall()) {
+		if (calls.currentGroupCall()->channel() == megagroup) {
+			calls.activateCurrentCall();
+		} else {
+			confirm(
+				tr::lng_group_call_leave_to_other_sure(tr::now),
+				tr::lng_group_call_leave(tr::now));
+		}
+	} else {
+		calls.startOrJoinGroupCall(megagroup);
+	}
+}
+
 void SessionController::showJumpToDate(Dialogs::Key chat, QDate requestedDate) {
 	const auto currentPeerDate = [&] {
 		if (const auto history = chat.history()) {
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 2feaa18ec..065d8e3ec 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -296,6 +296,10 @@ public:
 	void resizeForThirdSection();
 	void closeThirdSection();
 
+	void startOrJoinGroupCall(
+		not_null<ChannelData*> megagroup,
+		bool confirmedLeaveOther = false);
+
 	void showSection(
 		SectionMemento &&memento,
 		const SectionShow &params = SectionShow()) override;

From d6ab9347c1035bf39e73d57e79cc5cba3d8313f7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Dec 2020 20:05:55 +0400
Subject: [PATCH 253/370] Update API scheme, add admin log filter.

---
 Telegram/Resources/langs/lang.strings                      | 1 +
 Telegram/Resources/tl/api.tl                               | 2 +-
 Telegram/SourceFiles/calls/calls_group_call.cpp            | 7 ++++++-
 .../history/admin_log/history_admin_log_filter.cpp         | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index a935525e0..d3a4b9732 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2000,6 +2000,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_admin_log_filter_messages_deleted" = "Deleted messages";
 "lng_admin_log_filter_messages_edited" = "Edited messages";
 "lng_admin_log_filter_messages_pinned" = "Pinned messages";
+"lng_admin_log_filter_voice_chats" = "Voice chat";
 "lng_admin_log_filter_members_removed" = "Leaving members";
 "lng_admin_log_filter_all_admins" = "All users and admins";
 "lng_admin_log_about" = "What is this?";
diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index ddd731705..4c7722f4a 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -889,7 +889,7 @@ channelAdminLogEvent#3b5a3e40 id:long date:int user_id:int action:ChannelAdminLo
 
 channels.adminLogResults#ed8af74d events:Vector<ChannelAdminLogEvent> chats:Vector<Chat> users:Vector<User> = channels.AdminLogResults;
 
-channelAdminLogEventsFilter#ea107ae4 flags:# join:flags.0?true leave:flags.1?true invite:flags.2?true ban:flags.3?true unban:flags.4?true kick:flags.5?true unkick:flags.6?true promote:flags.7?true demote:flags.8?true info:flags.9?true settings:flags.10?true pinned:flags.11?true edit:flags.12?true delete:flags.13?true = ChannelAdminLogEventsFilter;
+channelAdminLogEventsFilter#ea107ae4 flags:# join:flags.0?true leave:flags.1?true invite:flags.2?true ban:flags.3?true unban:flags.4?true kick:flags.5?true unkick:flags.6?true promote:flags.7?true demote:flags.8?true info:flags.9?true settings:flags.10?true pinned:flags.11?true edit:flags.12?true delete:flags.13?true group_call:flags.14?true = ChannelAdminLogEventsFilter;
 
 popularContact#5ce14175 client_id:long importers:int = PopularContact;
 
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index af8541429..8f3f51ca9 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -233,8 +233,13 @@ void GroupCall::rejoin() {
 			}).fail([=](const RPCError &error) {
 				const auto type = error.type();
 				LOG(("Call Error: Could not join, error: %1").arg(type));
-				hangup();
 
+				if (type == u"GROUPCALL_SSRC_DUPLICATE_MUCH") {
+					rejoin();
+					return;
+				}
+
+				hangup();
 				Ui::ShowMultilineToast({
 					.text = (type == u"GROUPCALL_ANONYMOUS_FORBIDDEN"_q
 						? tr::lng_group_call_no_anonymous(tr::now)
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_filter.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_filter.cpp
index d78e68c49..da48d045b 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_filter.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_filter.cpp
@@ -282,6 +282,7 @@ void FilterBox::Inner::createActionsCheckboxes(const FilterValue &filter) {
 	addFlag(Flag::f_edit, tr::lng_admin_log_filter_messages_edited(tr::now));
 	if (isGroup) {
 		addFlag(Flag::f_pinned, tr::lng_admin_log_filter_messages_pinned(tr::now));
+		addFlag(Flag::f_group_call, tr::lng_admin_log_filter_voice_chats(tr::now));
 	}
 	addFlag(Flag::f_leave, tr::lng_admin_log_filter_members_removed(tr::now));
 }

From 5fe8c0ed7ec08185c8c334bd5f1d7f3c2b6c3e9e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Dec 2020 21:06:56 +0400
Subject: [PATCH 254/370] Show user as active when in call panel.

---
 Telegram/SourceFiles/calls/calls_group_panel.cpp |  6 ++++++
 Telegram/SourceFiles/calls/calls_group_panel.h   |  1 +
 Telegram/SourceFiles/calls/calls_instance.cpp    | 11 +++++++++++
 Telegram/SourceFiles/calls/calls_instance.h      |  2 ++
 Telegram/SourceFiles/calls/calls_panel.cpp       |  6 ++++++
 Telegram/SourceFiles/calls/calls_panel.h         |  1 +
 Telegram/SourceFiles/core/application.cpp        |  7 +++++--
 7 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 0c7c78540..9508d592b 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -241,6 +241,12 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 
 GroupPanel::~GroupPanel() = default;
 
+bool GroupPanel::isActive() const {
+	return _window->isActiveWindow()
+		&& _window->isVisible()
+		&& !(_window->windowState() & Qt::WindowMinimized);
+}
+
 void GroupPanel::showAndActivate() {
 	if (_window->isHidden()) {
 		_window->show();
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h
index 6fd1f2190..2d6a0a3ef 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/calls_group_panel.h
@@ -67,6 +67,7 @@ public:
 	GroupPanel(not_null<GroupCall*> call);
 	~GroupPanel();
 
+	[[nodiscard]] bool isActive() const;
 	void showAndActivate();
 	void closeBeforeDestroy();
 
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index e05bbfc16..80622d9d7 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -455,6 +455,17 @@ void Instance::destroyCurrentCall() {
 	}
 }
 
+bool Instance::hasActivePanel(not_null<Main::Session*> session) const {
+	if (inCall()) {
+		return (&_currentCall->user()->session() == session)
+			&& _currentCallPanel->isActive();
+	} else if (inGroupCall()) {
+		return (&_currentGroupCall->channel()->session() == session)
+			&& _currentGroupCallPanel->isActive();
+	}
+	return false;
+}
+
 bool Instance::activateCurrentCall() {
 	if (inCall()) {
 		_currentCallPanel->showAndActivate();
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index 0c9458cdc..4fde646e1 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -52,6 +52,8 @@ public:
 	[[nodiscard]] rpl::producer<GroupCall*> currentGroupCallValue() const;
 	[[nodiscard]] bool inCall() const;
 	[[nodiscard]] bool inGroupCall() const;
+	[[nodiscard]] bool hasActivePanel(
+		not_null<Main::Session*> session) const;
 	bool activateCurrentCall();
 	std::shared_ptr<tgcalls::VideoCaptureInterface> getVideoCapture() override;
 
diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index 0d87b44c4..1c862f859 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -202,6 +202,12 @@ Panel::Panel(not_null<Call*> call)
 
 Panel::~Panel() = default;
 
+bool Panel::isActive() const {
+	return _window->isActiveWindow()
+		&& _window->isVisible()
+		&& !(_window->windowState() & Qt::WindowMinimized);
+}
+
 void Panel::showAndActivate() {
 	_window->raise();
 	_window->setWindowState(_window->windowState() | Qt::WindowActive);
diff --git a/Telegram/SourceFiles/calls/calls_panel.h b/Telegram/SourceFiles/calls/calls_panel.h
index 3bd6a59c0..8b6580503 100644
--- a/Telegram/SourceFiles/calls/calls_panel.h
+++ b/Telegram/SourceFiles/calls/calls_panel.h
@@ -51,6 +51,7 @@ public:
 	Panel(not_null<Call*> call);
 	~Panel();
 
+	[[nodiscard]] bool isActive() const;
 	void showAndActivate();
 	void replaceCall(not_null<Call*> call);
 	void closeBeforeDestroy();
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 2d2b59b9e..17d48f779 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -880,9 +880,12 @@ void Application::localPasscodeChanged() {
 bool Application::hasActiveWindow(not_null<Main::Session*> session) const {
 	if (App::quitting() || !_window) {
 		return false;
+	} else if (_calls->hasActivePanel(session)) {
+		return true;
 	} else if (const auto controller = _window->sessionController()) {
-		if (&controller->session() == session) {
-			return _window->widget()->isActive();
+		if (&controller->session() == session
+			&& _window->widget()->isActive()) {
+			return true;
 		}
 	}
 	return false;

From 61b7b5d03ba565477c12f93fd3e4dbc972803aff Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Tue, 1 Dec 2020 00:53:14 +0000
Subject: [PATCH 255/370] Update User-Agent for DNS to Chrome 86.0.4240.198.

---
 .../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 cb9b824c8..8d9a56849 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.111 Safari/537.36");
+		"Chrome/86.0.4240.198 Safari/537.36");
 	return kResult;
 }
 

From f88c132c9635ad9000dac573a086246cae764aee Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 2 Dec 2020 10:16:25 +0400
Subject: [PATCH 256/370] Use gtk not only to get image from clipboard, but
 also to set

---
 .../SourceFiles/boxes/edit_caption_box.cpp    |  2 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp |  2 +-
 .../admin_log/history_admin_log_inner.cpp     |  5 +-
 .../history/history_inner_widget.cpp          |  5 +-
 .../SourceFiles/history/history_widget.cpp    |  2 +-
 .../view/history_view_context_menu.cpp        |  5 +-
 .../view/history_view_replies_section.cpp     |  2 +-
 .../view/history_view_scheduled_section.cpp   |  2 +-
 .../media/view/media_view_overlay_widget.cpp  | 12 +++-
 .../SourceFiles/platform/linux/linux_libs.cpp | 13 ++--
 .../SourceFiles/platform/linux/linux_libs.h   |  6 ++
 .../platform/linux/specific_linux.cpp         | 62 ++++++++++++++++++-
 .../SourceFiles/platform/mac/specific_mac.h   |  6 +-
 .../SourceFiles/platform/platform_specific.h  |  3 +-
 .../SourceFiles/platform/win/specific_win.h   |  6 +-
 15 files changed, 112 insertions(+), 21 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index edcb57b56..f91645178 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -80,7 +80,7 @@ auto ListFromMimeData(not_null<const QMimeData*> data) {
 	if (result.error == Error::None) {
 		return result;
 	} else if (data->hasImage()) {
-		auto image = Platform::GetImageFromClipboard();
+		auto image = Platform::GetClipboardImage();
 		if (image.isNull()) {
 			image = qvariant_cast<QImage>(data->imageData());
 		}
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 041ae00e5..bbefbb8bc 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -767,7 +767,7 @@ bool SendFilesBox::addFiles(not_null<const QMimeData*> data) {
 		if (result.error == Ui::PreparedList::Error::None) {
 			return result;
 		} else if (data->hasImage()) {
-			auto image = Platform::GetImageFromClipboard();
+			auto image = Platform::GetClipboardImage();
 			if (image.isNull()) {
 				image = qvariant_cast<QImage>(data->imageData());
 			}
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 bf383ddec..0f9dba8db 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/message_field.h"
 #include "boxes/sticker_set_box.h"
 #include "base/platform/base_platform_info.h"
+#include "platform/platform_specific.h"
 #include "mainwindow.h"
 #include "mainwidget.h"
 #include "core/application.h"
@@ -1219,7 +1220,9 @@ void InnerWidget::copyContextImage(not_null<PhotoData*> photo) {
 	}
 
 	const auto image = media->image(Data::PhotoSize::Large)->original();
-	QGuiApplication::clipboard()->setImage(image);
+	if (!Platform::SetClipboardImage(image)) {
+		QGuiApplication::clipboard()->setImage(image);
+	}
 }
 
 void InnerWidget::copySelectedText() {
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 9e96faf10..36ed444e4 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -38,6 +38,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/sticker_set_box.h"
 #include "chat_helpers/message_field.h"
 #include "history/history_widget.h"
+#include "platform/platform_specific.h"
 #include "base/platform/base_platform_info.h"
 #include "base/unixtime.h"
 #include "mainwindow.h"
@@ -1899,7 +1900,9 @@ void HistoryInner::copyContextImage(not_null<PhotoData*> photo) {
 	}
 
 	const auto image = media->image(Data::PhotoSize::Large)->original();
-	QGuiApplication::clipboard()->setImage(image);
+	if (!Platform::SetClipboardImage(image)) {
+		QGuiApplication::clipboard()->setImage(image);
+	}
 }
 
 void HistoryInner::showStickerPackInfo(not_null<DocumentData*> document) {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index fe5c964c0..a03f8e27b 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4335,7 +4335,7 @@ bool HistoryWidget::confirmSendingFiles(
 	}
 
 	if (hasImage) {
-		auto image = Platform::GetImageFromClipboard();
+		auto image = Platform::GetClipboardImage();
 		if (image.isNull()) {
 			image = qvariant_cast<QImage>(data->imageData());
 		}
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 961efe7d9..815805c1b 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -39,6 +39,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_scheduled_messages.h"
 #include "core/file_utilities.h"
 #include "base/platform/base_platform_info.h"
+#include "platform/platform_specific.h"
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
 #include "lang/lang_keys.h"
@@ -125,7 +126,9 @@ void CopyImage(not_null<PhotoData*> photo) {
 	}
 
 	const auto image = media->image(Data::PhotoSize::Large)->original();
-	QGuiApplication::clipboard()->setImage(image);
+	if (!Platform::SetClipboardImage(image)) {
+		QGuiApplication::clipboard()->setImage(image);
+	}
 }
 
 void ShowStickerPackInfo(
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 1787f399b..2551912cf 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -603,7 +603,7 @@ bool RepliesWidget::confirmSendingFiles(
 	}
 
 	if (hasImage) {
-		auto image = Platform::GetImageFromClipboard();
+		auto image = Platform::GetClipboardImage();
 		if (image.isNull()) {
 			image = qvariant_cast<QImage>(data->imageData());
 		}
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 484fbd69b..48098ec80 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -335,7 +335,7 @@ bool ScheduledWidget::confirmSendingFiles(
 	}
 
 	if (hasImage) {
-		auto image = Platform::GetImageFromClipboard();
+		auto image = Platform::GetClipboardImage();
 		if (image.isNull()) {
 			image = qvariant_cast<QImage>(data->imageData());
 		}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index d6c8fc141..abea774de 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -50,6 +50,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
 #include "window/window_controller.h"
+#include "platform/platform_specific.h"
 #include "base/platform/base_platform_info.h"
 #include "base/unixtime.h"
 #include "main/main_account.h"
@@ -1652,13 +1653,18 @@ void OverlayWidget::onOverview() {
 void OverlayWidget::onCopy() {
 	_dropdown->hideAnimated(Ui::DropdownMenu::HideOption::IgnoreShow);
 	if (_document) {
-		QGuiApplication::clipboard()->setImage(videoShown()
+		const auto image = videoShown()
 			? transformVideoFrame(videoFrame())
-			: transformStaticContent(_staticContent));
+			: transformStaticContent(_staticContent);
+		if (!Platform::SetClipboardImage(image)) {
+			QGuiApplication::clipboard()->setImage(image);
+		}
 	} else if (_photo && _photoMedia->loaded()) {
 		const auto image = _photoMedia->image(
 			Data::PhotoSize::Large)->original();
-		QGuiApplication::clipboard()->setImage(image);
+		if (!Platform::SetClipboardImage(image)) {
+			QGuiApplication::clipboard()->setImage(image);
+		}
 	}
 }
 
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
index 793b811d7..4cfba56ea 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
@@ -73,10 +73,6 @@ bool setupGtkBase(QLibrary &lib_gtk) {
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_widget_get_type", gtk_widget_get_type)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_clipboard_get", gtk_clipboard_get)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_clipboard_store", gtk_clipboard_store)) return false;
-	if (!LOAD_SYMBOL(lib_gtk, "gtk_clipboard_wait_for_contents", gtk_clipboard_wait_for_contents)) return false;
-	if (!LOAD_SYMBOL(lib_gtk, "gtk_clipboard_wait_for_image", gtk_clipboard_wait_for_image)) return false;
-	if (!LOAD_SYMBOL(lib_gtk, "gtk_selection_data_targets_include_image", gtk_selection_data_targets_include_image)) return false;
-	if (!LOAD_SYMBOL(lib_gtk, "gtk_selection_data_free", gtk_selection_data_free)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_file_chooser_dialog_new", gtk_file_chooser_dialog_new)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_file_chooser_get_type", gtk_file_chooser_get_type)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_image_get_type", gtk_image_get_type)) return false;
@@ -215,6 +211,7 @@ f_gtk_widget_destroy gtk_widget_destroy = nullptr;
 f_gtk_widget_get_type gtk_widget_get_type = nullptr;
 f_gtk_clipboard_get gtk_clipboard_get = nullptr;
 f_gtk_clipboard_store gtk_clipboard_store = nullptr;
+f_gtk_clipboard_set_image gtk_clipboard_set_image = nullptr;
 f_gtk_clipboard_wait_for_contents gtk_clipboard_wait_for_contents = nullptr;
 f_gtk_clipboard_wait_for_image gtk_clipboard_wait_for_image = nullptr;
 f_gtk_selection_data_targets_include_image gtk_selection_data_targets_include_image = nullptr;
@@ -257,6 +254,7 @@ f_gdk_window_focus gdk_window_focus = nullptr;
 f_gtk_dialog_get_type gtk_dialog_get_type = nullptr;
 f_gtk_dialog_run gtk_dialog_run = nullptr;
 f_gdk_atom_intern gdk_atom_intern = nullptr;
+f_gdk_pixbuf_new_from_data gdk_pixbuf_new_from_data = nullptr;
 f_gdk_pixbuf_new_from_file_at_size gdk_pixbuf_new_from_file_at_size = nullptr;
 f_gdk_pixbuf_get_has_alpha gdk_pixbuf_get_has_alpha = nullptr;
 f_gdk_pixbuf_get_pixels gdk_pixbuf_get_pixels = nullptr;
@@ -296,6 +294,7 @@ void start() {
 	}
 
 	if (gtkLoaded) {
+		LOAD_SYMBOL(lib_gtk, "gdk_pixbuf_new_from_data", gdk_pixbuf_new_from_data);
 		LOAD_SYMBOL(lib_gtk, "gdk_pixbuf_new_from_file_at_size", gdk_pixbuf_new_from_file_at_size);
 		LOAD_SYMBOL(lib_gtk, "gdk_pixbuf_get_has_alpha", gdk_pixbuf_get_has_alpha);
 		LOAD_SYMBOL(lib_gtk, "gdk_pixbuf_get_pixels", gdk_pixbuf_get_pixels);
@@ -305,6 +304,12 @@ void start() {
 
 		internal::GdkHelperLoad(lib_gtk);
 
+		LOAD_SYMBOL(lib_gtk, "gtk_clipboard_set_image", gtk_clipboard_set_image);
+		LOAD_SYMBOL(lib_gtk, "gtk_clipboard_wait_for_contents", gtk_clipboard_wait_for_contents);
+		LOAD_SYMBOL(lib_gtk, "gtk_clipboard_wait_for_image", gtk_clipboard_wait_for_image);
+		LOAD_SYMBOL(lib_gtk, "gtk_selection_data_targets_include_image", gtk_selection_data_targets_include_image);
+		LOAD_SYMBOL(lib_gtk, "gtk_selection_data_free", gtk_selection_data_free);
+
 		LOAD_SYMBOL(lib_gtk, "gtk_dialog_get_widget_for_response", gtk_dialog_get_widget_for_response);
 		LOAD_SYMBOL(lib_gtk, "gtk_button_set_label", gtk_button_set_label);
 		LOAD_SYMBOL(lib_gtk, "gtk_button_get_type", gtk_button_get_type);
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h
index fa651615d..543019b7d 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.h
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
@@ -88,6 +88,9 @@ extern f_gtk_clipboard_get gtk_clipboard_get;
 typedef void (*f_gtk_clipboard_store)(::GtkClipboard *clipboard);
 extern f_gtk_clipboard_store gtk_clipboard_store;
 
+typedef void (*f_gtk_clipboard_set_image)(::GtkClipboard *clipboard, GdkPixbuf *pixbuf);
+extern f_gtk_clipboard_set_image gtk_clipboard_set_image;
+
 typedef GtkSelectionData* (*f_gtk_clipboard_wait_for_contents)(::GtkClipboard *clipboard, GdkAtom target);
 extern f_gtk_clipboard_wait_for_contents gtk_clipboard_wait_for_contents;
 
@@ -268,6 +271,9 @@ extern f_gtk_dialog_run gtk_dialog_run;
 typedef GdkAtom (*f_gdk_atom_intern)(const gchar *atom_name, gboolean only_if_exists);
 extern f_gdk_atom_intern gdk_atom_intern;
 
+typedef GdkPixbuf* (*f_gdk_pixbuf_new_from_data)(const guchar *data, GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height, int rowstride, GdkPixbufDestroyNotify destroy_fn, gpointer destroy_fn_data);
+extern f_gdk_pixbuf_new_from_data gdk_pixbuf_new_from_data;
+
 typedef GdkPixbuf* (*f_gdk_pixbuf_new_from_file_at_size)(const gchar *filename, int width, int height, GError **error);
 extern f_gdk_pixbuf_new_from_file_at_size gdk_pixbuf_new_from_file_at_size;
 
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 2f9f3d35b..69e9f21b6 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -325,7 +325,7 @@ bool GenerateDesktopFile(
 }
 
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
-bool GetImageFromClipboardSupported() {
+bool GetClipboardImageSupported() {
 	return (Libs::gtk_clipboard_wait_for_contents != nullptr)
 		&& (Libs::gtk_clipboard_wait_for_image != nullptr)
 		&& (Libs::gtk_selection_data_targets_include_image != nullptr)
@@ -337,6 +337,11 @@ bool GetImageFromClipboardSupported() {
 		&& (Libs::gdk_pixbuf_get_has_alpha != nullptr)
 		&& (Libs::gdk_atom_intern != nullptr);
 }
+
+bool SetClipboardImageSupported() {
+	return (Libs::gtk_clipboard_set_image != nullptr)
+		&& (Libs::gdk_pixbuf_new_from_data != nullptr);
+}
 #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
 
 uint XCBMoveResizeFromEdges(Qt::Edges edges) {
@@ -729,11 +734,11 @@ QString GetIconName() {
 	return Result;
 }
 
-QImage GetImageFromClipboard() {
+QImage GetClipboardImage() {
 	QImage data;
 
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
-	if (!GetImageFromClipboardSupported() || !Libs::GtkClipboard()) {
+	if (!GetClipboardImageSupported() || !Libs::GtkClipboard()) {
 		return data;
 	}
 
@@ -767,6 +772,57 @@ QImage GetImageFromClipboard() {
 	return data;
 }
 
+bool SetClipboardImage(const QImage &image) {
+#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
+	if (!SetClipboardImageSupported()
+		|| !Libs::GtkClipboard()
+		|| image.isNull()) {
+		return false;
+	}
+
+	const auto convertedImage = [&] {
+		if (image.hasAlphaChannel()) {
+			if (image.format() != QImage::Format_RGBA8888) {
+				return image.convertToFormat(QImage::Format_RGBA8888);
+			}
+		} else {
+			if (image.format() != QImage::Format_RGB888) {
+				return image.convertToFormat(QImage::Format_RGB888);
+			}
+		}
+		return image;
+	}();
+
+	auto imageBuf = reinterpret_cast<guchar*>(
+		malloc(convertedImage.sizeInBytes()));
+
+	memcpy(
+		imageBuf,
+		convertedImage.constBits(),
+		convertedImage.sizeInBytes());
+
+	auto imagePixbuf = Libs::gdk_pixbuf_new_from_data(
+		imageBuf,
+		GDK_COLORSPACE_RGB,
+		convertedImage.hasAlphaChannel(),
+		8,
+		convertedImage.width(),
+		convertedImage.height(),
+		convertedImage.bytesPerLine(),
+		[](guchar *pixels, gpointer data) {
+			free(pixels);
+		},
+		nullptr);
+
+	Libs::gtk_clipboard_set_image(Libs::GtkClipboard(), imagePixbuf);
+	g_object_unref(imagePixbuf);
+
+	return true;
+#else // !TDESKTOP_DISABLE_GTK_INTEGRATION
+	return false;
+#endif // TDESKTOP_DISABLE_GTK_INTEGRATION
+}
+
 std::optional<bool> IsDarkMode() {
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
 	if (Libs::GtkSettingSupported() && Libs::GtkLoaded()) {
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h
index 00b0bb44c..5ad6335fb 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.h
@@ -18,10 +18,14 @@ namespace Platform {
 
 [[nodiscard]] bool IsDarkMenuBar();
 
-inline QImage GetImageFromClipboard() {
+inline QImage GetClipboardImage() {
 	return {};
 }
 
+inline bool SetClipboardImage(const QImage &image) {
+	return false;
+}
+
 inline bool StartSystemMove(QWindow *window) {
 	return false;
 }
diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h
index 45fafaefa..71cb05b67 100644
--- a/Telegram/SourceFiles/platform/platform_specific.h
+++ b/Telegram/SourceFiles/platform/platform_specific.h
@@ -41,7 +41,8 @@ void IgnoreApplicationActivationRightNow();
 bool AutostartSupported();
 bool TrayIconSupported();
 bool SkipTaskbarSupported();
-QImage GetImageFromClipboard();
+QImage GetClipboardImage();
+bool SetClipboardImage(const QImage &image);
 bool StartSystemMove(QWindow *window);
 bool StartSystemResize(QWindow *window, Qt::Edges edges);
 bool ShowWindowMenu(QWindow *window);
diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h
index c5fa006a5..98fd7adc2 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.h
+++ b/Telegram/SourceFiles/platform/win/specific_win.h
@@ -22,10 +22,14 @@ inline void SetWatchingMediaKeys(bool watching) {
 inline void IgnoreApplicationActivationRightNow() {
 }
 
-inline QImage GetImageFromClipboard() {
+inline QImage GetClipboardImage() {
 	return {};
 }
 
+inline bool SetClipboardImage(const QImage &image) {
+	return false;
+}
+
 inline bool StartSystemMove(QWindow *window) {
 	return false;
 }

From cffb05e3c97a05ff80296083db21163081c01578 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 23 Nov 2020 10:11:52 +0400
Subject: [PATCH 257/370] Detect more dark themes on Linux

---
 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 69e9f21b6..7897e7ec1 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -835,7 +835,7 @@ std::optional<bool> IsDarkMode() {
 
 		const auto themeName = Libs::GtkSetting("gtk-theme-name").toLower();
 
-		if (themeName.endsWith(qsl("-dark"))) {
+		if (themeName.contains(qsl("-dark"))) {
 			return true;
 		}
 

From 8819938bf2258337ec5a6e5483d7faea15caf52b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 23 Nov 2020 10:00:54 +0400
Subject: [PATCH 258/370] Remove unneeded moveToScreen calls

---
 .../media/view/media_view_overlay_widget.cpp         | 12 ++----------
 1 file changed, 2 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 abea774de..73615c240 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -361,7 +361,6 @@ OverlayWidget::OverlayWidget()
 		setWindowFlags(Qt::FramelessWindowHint);
 	}
 	updateGeometry(QApplication::primaryScreen()->geometry());
-	moveToScreen();
 	setAttribute(Qt::WA_NoSystemBackground, true);
 	setAttribute(Qt::WA_TranslucentBackground, true);
 	setMouseTracking(true);
@@ -435,6 +434,8 @@ void OverlayWidget::refreshLang() {
 }
 
 void OverlayWidget::moveToScreen() {
+	Expects(windowHandle());
+
 	const auto widgetScreen = [&](auto &&widget) -> QScreen* {
 		if (auto handle = widget ? widget->windowHandle() : nullptr) {
 			return handle->screen();
@@ -445,12 +446,9 @@ void OverlayWidget::moveToScreen() {
 		? Core::App().activeWindow()->widget().get()
 		: nullptr;
 	const auto activeWindowScreen = widgetScreen(window);
-	const auto myScreen = widgetScreen(this);
 	// Wayland doesn't support positioning, but Qt emits screenChanged anyway
 	// and geometry of the widget become broken
 	if (activeWindowScreen
-		&& myScreen
-		&& myScreen != activeWindowScreen
 		&& !Platform::IsWayland()) {
 		windowHandle()->setScreen(activeWindowScreen);
 	}
@@ -1318,12 +1316,6 @@ void OverlayWidget::onScreenResized(int screen) {
 		&& windowHandle()->screen() == changed) {
 		updateGeometry(changed->geometry());
 	}
-	if (!windowHandle()
-		|| !windowHandle()->screen()
-		|| !changed
-		|| windowHandle()->screen() == changed) {
-		moveToScreen();
-	}
 }
 
 void OverlayWidget::handleVisibleChanged(bool visible) {

From 86be105c2518f14b92eb74474771ee31fabcbb14 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 24 Nov 2020 23:17:57 +0400
Subject: [PATCH 259/370] Media Play key is expected to behave like Toggle
 Media Play/Pause

Looks like Qt maps "Media Play" to the common play/pause button on keyboards:
https://github.com/qt/qtbase/blob/5.15/src/platformsupport/input/xkbcommon/qxkbcommon.cpp#L293
https://github.com/qt/qtbase/blob/5.15/src/plugins/platforms/windows/qwindowskeymapper.cpp#L392
https://github.com/qt/qtbase/blob/5.15/src/plugins/platforms/android/androidjniinput.cpp#L519
https://github.com/qt/qtbase/blob/5.15/src/plugins/platforms/android/androidjniinput.cpp#L607

While "Toggle Media Play/Pause" is some special case:
https://github.com/qt/qtbase/blob/5.15/src/plugins/platforms/windows/qwindowskeymapper.cpp#L488
https://github.com/qt/qtbase/blob/5.15/src/plugins/platforms/ios/quiview.mm#L584

It is worth to behave on "Media Play" like on "Toggle Media Play/Pause".
---
 Telegram/SourceFiles/media/player/media_player_instance.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp
index 7d3016df3..f483ce0ec 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp
@@ -737,7 +737,7 @@ void Instance::setupShortcuts() {
 	) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
 		using Command = Shortcuts::Command;
 		request->check(Command::MediaPlay) && request->handle([=] {
-			play();
+			playPause();
 			return true;
 		});
 		request->check(Command::MediaPause) && request->handle([=] {

From 4bc6c6c3c84dc7658596b2624932da218c036606 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 26 Nov 2020 04:51:23 +0400
Subject: [PATCH 260/370] Handle cursor size in the custom GTK integration

---
 .../SourceFiles/platform/linux/linux_libs.cpp | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
index 4cfba56ea..86e9719eb 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
@@ -161,6 +161,14 @@ bool IconThemeShouldBeSet() {
 	return Result;
 }
 
+bool CursorSizeShouldBeSet() {
+	// change the cursor size only on Wayland and if it wasn't already set
+	static const auto Result = IsWayland()
+		&& qEnvironmentVariableIsEmpty("XCURSOR_SIZE");
+
+	return Result;
+}
+
 void SetIconTheme() {
 	Core::Sandbox::Instance().customEnterFromEventLoop([] {
 		if (GtkSettingSupported()
@@ -183,6 +191,21 @@ void SetIconTheme() {
 	});
 }
 
+void SetCursorSize() {
+	Core::Sandbox::Instance().customEnterFromEventLoop([] {
+		if (GtkSettingSupported()
+			&& GtkLoaded()
+			&& CursorSizeShouldBeSet()) {
+			DEBUG_LOG(("Setting GTK cursor size"));
+
+			const auto newCursorSize = GtkSetting<gint>("gtk-cursor-theme-size");
+			qputenv("XCURSOR_SIZE", QByteArray::number(newCursorSize));
+
+			DEBUG_LOG(("New cursor size: %1").arg(newCursorSize));
+		}
+	});
+}
+
 void DarkModeChanged() {
 	Core::Sandbox::Instance().customEnterFromEventLoop([] {
 		Core::App().settings().setSystemDarkMode(IsDarkMode());
@@ -319,10 +342,12 @@ void start() {
 		LOAD_SYMBOL(lib_gtk, "gtk_app_chooser_get_type", gtk_app_chooser_get_type);
 
 		SetIconTheme();
+		SetCursorSize();
 
 		const auto settings = gtk_settings_get_default();
 		g_signal_connect(settings, "notify::gtk-icon-theme-name", G_CALLBACK(SetIconTheme), nullptr);
 		g_signal_connect(settings, "notify::gtk-theme-name", G_CALLBACK(DarkModeChanged), nullptr);
+		g_signal_connect(settings, "notify::gtk-cursor-theme-size", G_CALLBACK(SetCursorSize), nullptr);
 
 		if (!gtk_check_version(3, 0, 0)) {
 			g_signal_connect(settings, "notify::gtk-application-prefer-dark-theme", G_CALLBACK(DarkModeChanged), nullptr);

From 569570ddc426295aafc40773fc96d08ad2ce42cf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Dec 2020 10:46:59 +0400
Subject: [PATCH 261/370] Update tg_owt commit in snap build.

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

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 3efba1dc7..dd1afe1dd 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -260,7 +260,7 @@ parts:
   webrtc:
     source: https://github.com/desktop-app/tg_owt.git
     source-depth: 1
-    source-commit: 12f4a27f2f02f9dd40f9891d8ec6e58bc1ff5263
+    source-commit: 75ac66937341d8a9207375aaee79b4bdc500146c
     plugin: cmake
     build-packages:
       - yasm

From 448b6bb905b70b4660a2864f0568612b985684c7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 8 Dec 2020 23:16:27 +0300
Subject: [PATCH 262/370] Added initial implementation of LinearBlob animation
 to Calls::TopBar.

---
 Telegram/SourceFiles/calls/calls.style       |  11 ++
 Telegram/SourceFiles/calls/calls_top_bar.cpp | 178 +++++++++++++++++++
 Telegram/SourceFiles/calls/calls_top_bar.h   |  10 ++
 Telegram/lib_ui                              |   2 +-
 4 files changed, 200 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 45ed1b11a..bce9ea347 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -750,6 +750,17 @@ groupCallTitle: WindowTitle(defaultWindowTitle) {
 	closeIconActiveOver: groupCallTitleCloseIconOver;
 }
 
+groupCallMajorBlobMinRadius: 2px;
+groupCallMajorBlobMaxRadius: 2px;
+
+groupCallMinorBlobMinRadius: 3px;
+groupCallMinorBlobMaxRadius: 9px;
+
+groupCallMajorBlobTopOffset: 0px;
+groupCallMinorBlobTopOffset: 6px;
+
+groupCallBlobWidthAdditional: 40px;
+
 callTopBarMuteCrossLine: CrossLineAnimation {
 	fg: callBarFg;
 	icon: icon {{ "calls/call_record_active", callBarFg }};
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index a54c94d69..4c51f0804 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_top_bar.h"
 
 #include "ui/effects/cross_line.h"
+#include "ui/paint/blobs_linear.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/chat/group_call_bar.h" // Ui::GroupCallBarContent.
@@ -38,6 +39,43 @@ namespace {
 constexpr auto kUpdateDebugTimeoutMs = crl::time(500);
 constexpr auto kSwitchStateDuration = 120;
 
+constexpr auto kMinorBlobAlpha = 76. / 255.;
+
+constexpr auto kBlobLevelDuration1 = 250;
+constexpr auto kBlobLevelDuration2 = 120;
+
+auto LinearBlobs() -> std::array<Ui::Paint::LinearBlobs::BlobData, 3> {
+	return { {
+		{
+			.segmentsCount = 5,
+			.minScale = 1.,
+			.minRadius = (float)st::groupCallMajorBlobMinRadius,
+			.maxRadius = (float)st::groupCallMajorBlobMaxRadius,
+			.speedScale = .3,
+			.alpha = 1.,
+			.topOffset = st::groupCallMajorBlobTopOffset,
+		},
+		{
+			.segmentsCount = 7,
+			.minScale = 1.,
+			.minRadius = (float)st::groupCallMinorBlobMinRadius,
+			.maxRadius = (float)st::groupCallMinorBlobMaxRadius,
+			.speedScale = .7,
+			.alpha = kMinorBlobAlpha,
+			.topOffset = st::groupCallMinorBlobTopOffset,
+		},
+		{
+			.segmentsCount = 8,
+			.minScale = 1.,
+			.minRadius = (float)st::groupCallMinorBlobMinRadius,
+			.maxRadius = (float)st::groupCallMinorBlobMaxRadius,
+			.speedScale = .7,
+			.alpha = kMinorBlobAlpha,
+			.topOffset = st::groupCallMinorBlobTopOffset,
+		},
+	} };
+}
+
 auto Colors() {
 	using Vector = std::vector<QColor>;
 	return base::flat_map<MuteState, Vector>{
@@ -187,6 +225,12 @@ TopBar::TopBar(
 , _mute(this, st::callBarMuteToggle)
 , _info(this)
 , _hangup(this, st::callBarHangup)
+, _blobs(base::make_unique_q<Ui::RpWidget>(parent))
+, _blobsPaint(std::make_unique<Ui::Paint::LinearBlobs>(
+	LinearBlobs() | ranges::to_vector,
+	kBlobLevelDuration1,
+	kBlobLevelDuration2,
+	1.))
 , _gradients(Colors(), QPointF(), QPointF()) {
 	initControls();
 	resize(width(), st::callBarHeight);
@@ -303,6 +347,140 @@ void TopBar::initControls() {
 	});
 	_updateDurationTimer.setCallback([this] { updateDurationText(); });
 	updateDurationText();
+
+	initBlobs();
+}
+
+void TopBar::initBlobs() {
+	const auto &hideDuration = kBlobLevelDuration1 * 2;
+	const auto hideLastTime = _blobs->lifetime().make_state<crl::time>(0);
+	const auto lastTime = _blobs->lifetime().make_state<crl::time>(0);
+	const auto blobsRect =
+		_blobs->lifetime().make_state<QRect>(_blobs->rect());
+
+	_blobsAnimation.init([=](crl::time now) {
+		if (const auto last = *hideLastTime; (last > 0)
+			&& (now - last >= hideDuration)) {
+			_blobsAnimation.stop();
+			return false;
+		}
+		_blobsPaint->updateLevel(now - *lastTime);
+		*lastTime = now;
+
+		_blobs->update();
+		return true;
+	});
+
+	_groupCall->stateValue(
+	) | rpl::start_with_next([=](Calls::GroupCall::State state) {
+		if (state == Calls::GroupCall::State::HangingUp) {
+			_blobs->hide();
+		}
+	}, lifetime());
+
+	auto hideBlobs = rpl::combine(
+		rpl::single(anim::Disabled()) | rpl::then(anim::Disables()),
+		Core::App().appDeactivatedValue(),
+		_groupCall->stateValue(
+		) | rpl::map([](Calls::GroupCall::State state) {
+			using State = Calls::GroupCall::State;
+			if (state != State::Creating
+				&& state != State::Joining
+				&& state != State::Joined
+				&& state != State::Connecting) {
+				return true;
+			}
+			return false;
+		}) | rpl::distinct_until_changed()
+	) | rpl::map([](bool animDisabled, bool hide, bool isBadState) {
+		return isBadState || !(!animDisabled && !hide);
+	});
+
+	std::move(
+		hideBlobs
+	) | rpl::start_with_next([=](bool hide) {
+		if (hide) {
+			_blobsPaint->setLevel(0.);
+		}
+		*hideLastTime = hide ? crl::now() : 0;
+		if (!hide && !_blobsAnimation.animating()) {
+			_blobsAnimation.start();
+		}
+
+		const auto from = hide ? 0. : 1.;
+		const auto to = hide ? 1. : 0.;
+		_blobsHideAnimation.start([=](float64 value) {
+			blobsRect->setHeight(anim::interpolate(0, -20, value));
+		}, from, to, hideDuration);
+	}, lifetime());
+
+	///
+
+	const auto parent = static_cast<Ui::RpWidget*>(parentWidget());
+	geometryValue(
+	) | rpl::start_with_next([=](QRect rect) {
+		_blobs->resize(rect.width(), rect.height());
+
+		{
+			const auto &r = _blobs->rect();
+			*blobsRect = QRect(
+				r.x(),
+				r.y(),
+				r.width() + st::groupCallBlobWidthAdditional,
+				0);
+		}
+
+		const auto relativePos = mapTo(parent, rect.topLeft());
+		_blobs->moveToLeft(relativePos.x(), relativePos.y() + rect.height());
+	}, lifetime());
+
+	shownValue(
+	) | rpl::start_with_next([=](bool shown) {
+		_blobs->setVisible(shown);
+	}, lifetime());
+
+	_blobs->paintRequest(
+	) | rpl::start_with_next([=](QRect clip) {
+		Painter p(_blobs);
+
+		const auto alpha = 1. - _blobsHideAnimation.value(0.);
+		if (alpha < 1.) {
+			p.setOpacity(alpha);
+		}
+		_blobsPaint->paint(p, _groupBrush, *blobsRect, 0, 0);
+	}, _blobs->lifetime());
+
+	rpl::single(
+	) | rpl::then(
+		events(
+		) | rpl::filter([](not_null<QEvent*> e) {
+			return e->type() == QEvent::ZOrderChange;
+		}) | rpl::to_empty
+	) | rpl::start_with_next([=] {
+		crl::on_main(_blobs.get(), [=] {
+			_blobs->raise();
+		});
+	}, lifetime());
+
+	_groupCall->levelUpdates(
+	) | rpl::filter([=](const LevelUpdate &update) {
+		return update.self;
+	}) | rpl::start_with_next([=](const LevelUpdate &update) {
+		if (*hideLastTime) {
+			 return;
+		}
+		_blobsPaint->setLevel(update.value);
+	}, _blobs->lifetime());
+
+	_blobs->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_blobs->show();
+	_blobsAnimation.start();
+
+	crl::on_main([=] {
+		const auto r = rect();
+		const auto relativePos = mapTo(parent, r.topLeft());
+		_blobs->moveToLeft(relativePos.x(), relativePos.y() + r.height());
+	});
 }
 
 void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.h b/Telegram/SourceFiles/calls/calls_top_bar.h
index db16eea21..ab5f9cc33 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.h
+++ b/Telegram/SourceFiles/calls/calls_top_bar.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/weak_ptr.h"
 #include "base/timer.h"
 #include "base/object_ptr.h"
+#include "base/unique_qptr.h"
 #include "ui/effects/animations.h"
 #include "ui/effects/gradient.h"
 #include "ui/rp_widget.h"
@@ -19,6 +20,9 @@ class IconButton;
 class AbstractButton;
 class LabelSimple;
 class FlatLabel;
+namespace Paint {
+class LinearBlobs;
+} // namespace Paint
 } // namespace Ui
 
 namespace Main {
@@ -51,6 +55,7 @@ private:
 		const base::weak_ptr<GroupCall> &groupCall);
 
 	void initControls();
+	void initBlobs();
 	void updateInfoLabels();
 	void setInfoLabels();
 	void updateDurationText();
@@ -73,11 +78,16 @@ private:
 	object_ptr<Mute> _mute;
 	object_ptr<Ui::AbstractButton> _info;
 	object_ptr<Ui::IconButton> _hangup;
+	base::unique_qptr<Ui::RpWidget> _blobs;
+	std::unique_ptr<Ui::Paint::LinearBlobs> _blobsPaint;
 
 	QBrush _groupBrush;
 	anim::linear_gradients<MuteState> _gradients;
 	Ui::Animations::Simple _switchStateAnimation;
 
+	Ui::Animations::Simple _blobsHideAnimation;
+	Ui::Animations::Basic _blobsAnimation;
+
 	base::Timer _updateDurationTimer;
 
 };
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index dfc0f0b88..a02c8923d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit dfc0f0b889375c10782a870a377936a19fcac7f3
+Subproject commit a02c8923dc6d00bcb4f4c2b1470cd48e2743903a

From d55a05739bf5b796dad9fe863b0e8c81d05d5dc8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Dec 2020 22:32:11 +0400
Subject: [PATCH 263/370] Beta version 2.4.12.

- Voice chats in groups. (alpha version)
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 ++++----
 Telegram/Resources/winrc/Updater.rc          |  8 ++++----
 Telegram/SourceFiles/core/changelogs.cpp     |  4 ++++
 Telegram/SourceFiles/core/version.h          |  8 ++++----
 Telegram/build/version                       | 12 ++++++------
 changelog.txt                                |  4 ++++
 7 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 9b5824ca7..cb9419d4e 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.11.1" />
+    Version="2.4.12.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 46f41032f..6c6b9dc5d 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,11,1
- PRODUCTVERSION 2,4,11,1
+ FILEVERSION 2,4,12,0
+ PRODUCTVERSION 2,4,12,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.11.1"
+            VALUE "FileVersion", "2.4.12.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.11.1"
+            VALUE "ProductVersion", "2.4.12.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 6fd121b85..805fdc3f4 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,11,1
- PRODUCTVERSION 2,4,11,1
+ FILEVERSION 2,4,12,0
+ PRODUCTVERSION 2,4,12,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.11.1"
+            VALUE "FileVersion", "2.4.12.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.11.1"
+            VALUE "ProductVersion", "2.4.12.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index 279f7e7a4..f8ce04ef3 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -105,6 +105,10 @@ std::map<int, const char*> BetaLogs() {
 
 		"- Fix adding additional photos when sending an album to a group with enabled slow mode.\n"
 	},
+	{
+		2004012,
+		"- Voice chats in groups. (alpha version)\n"
+	},
 	};
 };
 
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 3ec410ef6..36394117b 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/const_string.h"
 
-#define TDESKTOP_REQUESTED_ALPHA_VERSION (2004011001ULL)
+#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL)
 
 #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA
 #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
@@ -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 = 2004011;
-constexpr auto AppVersionStr = "2.4.11";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 2004012;
+constexpr auto AppVersionStr = "2.4.12";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index b8284de81..813f35cdf 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2004011
+AppVersion         2004012
 AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.11
-AppVersionStr      2.4.11
-BetaChannel        0
-AlphaVersion       2004011001
-AppVersionOriginal 2.4.11.1
+AppVersionStrSmall 2.4.12
+AppVersionStr      2.4.12
+BetaChannel        1
+AlphaVersion       0
+AppVersionOriginal 2.4.12.beta
diff --git a/changelog.txt b/changelog.txt
index 2fe67af33..3c480f30e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+2.4.12 beta (09.12.20)
+
+- Voice chats in groups. (alpha version)
+
 2.4.11 beta (19.11.20)
 
 - Improve locked voice message recording.

From 468597f54d3525b76fc181a521097fde5127cd40 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Dec 2020 12:40:11 +0400
Subject: [PATCH 264/370] Beta version 2.4.12: Fix Release build on macOS.

---
 Telegram/SourceFiles/calls/calls_top_bar.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 4c51f0804..ab9167555 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -258,7 +258,8 @@ void TopBar::initControls() {
 		? _call->mutedValue() | rpl::map(mapToState)
 		: (_groupCall->mutedValue()
 			| MapPushToTalkToActive()
-			| rpl::distinct_until_changed());
+			| rpl::distinct_until_changed()
+			| rpl::type_erased());
 	std::move(
 		muted
 	) | rpl::start_with_next([=](MuteState state) {

From e523687328d7ac1851e78d719684069e8750ea2e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Dec 2020 13:08:36 +0400
Subject: [PATCH 265/370] Show bar waves from any member-s level.

---
 Telegram/SourceFiles/apiwrap.cpp              |  7 +++---
 Telegram/SourceFiles/calls/calls_top_bar.cpp  | 22 ++++++++++++-------
 Telegram/SourceFiles/calls/calls_top_bar.h    |  2 ++
 .../SourceFiles/settings/settings_codes.cpp   |  4 ++--
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 29a91fb31..4dc9a726c 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3981,6 +3981,7 @@ void ApiWrap::forwardMessages(
 			++shared->requestsLeft;
 		}
 		const auto requestType = Data::Histories::RequestType::Send;
+		const auto idsCopy = localIds;
 		histories.sendRequest(history, requestType, [=](Fn<void()> finish) {
 			history->sendRequestId = request(MTPmessages_ForwardMessages(
 				MTP_flags(sendFlags),
@@ -3995,9 +3996,9 @@ void ApiWrap::forwardMessages(
 					shared->callback();
 				}
 				finish();
-			}).fail([=, ids = localIds](const RPCError &error) {
-				if (ids) {
-					for (const auto &[randomId, itemId] : *ids) {
+			}).fail([=](const RPCError &error) {
+				if (idsCopy) {
+					for (const auto &[randomId, itemId] : *idsCopy) {
 						sendMessageFail(error, peer, randomId, itemId);
 					}
 				} else {
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index ab9167555..30ba5d18f 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -43,6 +43,7 @@ constexpr auto kMinorBlobAlpha = 76. / 255.;
 
 constexpr auto kBlobLevelDuration1 = 250;
 constexpr auto kBlobLevelDuration2 = 120;
+constexpr auto kBlobUpdateInterval = crl::time(100);
 
 auto LinearBlobs() -> std::array<Ui::Paint::LinearBlobs::BlobData, 3> {
 	return { {
@@ -231,7 +232,9 @@ TopBar::TopBar(
 	kBlobLevelDuration1,
 	kBlobLevelDuration2,
 	1.))
-, _gradients(Colors(), QPointF(), QPointF()) {
+, _blobsLevelTimer([=] { _blobsLastLevel = 0.; })
+, _gradients(Colors(), QPointF(), QPointF())
+, _updateDurationTimer([=] { updateDurationText(); }) {
 	initControls();
 	resize(width(), st::callBarHeight);
 }
@@ -346,7 +349,6 @@ void TopBar::initControls() {
 				BoxContext::MainWindow));
 		}
 	});
-	_updateDurationTimer.setCallback([this] { updateDurationText(); });
 	updateDurationText();
 
 	initBlobs();
@@ -394,7 +396,7 @@ void TopBar::initBlobs() {
 			return false;
 		}) | rpl::distinct_until_changed()
 	) | rpl::map([](bool animDisabled, bool hide, bool isBadState) {
-		return isBadState || !(!animDisabled && !hide);
+		return isBadState || animDisabled || hide;
 	});
 
 	std::move(
@@ -407,6 +409,12 @@ void TopBar::initBlobs() {
 		if (!hide && !_blobsAnimation.animating()) {
 			_blobsAnimation.start();
 		}
+		if (hide) {
+			_blobsLevelTimer.cancel();
+		} else {
+			_blobsLastLevel = 0.;
+			_blobsLevelTimer.callEach(kBlobUpdateInterval);
+		}
 
 		const auto from = hide ? 0. : 1.;
 		const auto to = hide ? 1. : 0.;
@@ -465,12 +473,10 @@ void TopBar::initBlobs() {
 
 	_groupCall->levelUpdates(
 	) | rpl::filter([=](const LevelUpdate &update) {
-		return update.self;
+		return !*hideLastTime && (update.value > _blobsLastLevel);
 	}) | rpl::start_with_next([=](const LevelUpdate &update) {
-		if (*hideLastTime) {
-			 return;
-		}
-		_blobsPaint->setLevel(update.value);
+		_blobsLastLevel = update.value;
+		_blobsPaint->setLevel(_blobsLastLevel);
 	}, _blobs->lifetime());
 
 	_blobs->setAttribute(Qt::WA_TransparentForMouseEvents);
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.h b/Telegram/SourceFiles/calls/calls_top_bar.h
index ab5f9cc33..e9ea27513 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.h
+++ b/Telegram/SourceFiles/calls/calls_top_bar.h
@@ -80,6 +80,8 @@ private:
 	object_ptr<Ui::IconButton> _hangup;
 	base::unique_qptr<Ui::RpWidget> _blobs;
 	std::unique_ptr<Ui::Paint::LinearBlobs> _blobsPaint;
+	float _blobsLastLevel = 0.;
+	base::Timer _blobsLevelTimer;
 
 	QBrush _groupBrush;
 	anim::linear_gradients<MuteState> _gradients;
diff --git a/Telegram/SourceFiles/settings/settings_codes.cpp b/Telegram/SourceFiles/settings/settings_codes.cpp
index a83e690ce..ef99f5c1f 100644
--- a/Telegram/SourceFiles/settings/settings_codes.cpp
+++ b/Telegram/SourceFiles/settings/settings_codes.cpp
@@ -108,8 +108,8 @@ auto GenerateCodes() {
 				if (const auto strong = weak.get()) {
 					loadFor(strong);
 				} else {
-					for (const auto &[index, account] : Core::App().domain().accounts()) {
-						loadFor(account.get());
+					for (const auto &pair : Core::App().domain().accounts()) {
+						loadFor(pair.account.get());
 					}
 				}
 			}

From 9f2903f81d7419cb6b8a5b74d39ce0e0503152e9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Dec 2020 14:48:07 +0400
Subject: [PATCH 266/370] Fix crash in one-on-one calls.

---
 Telegram/SourceFiles/calls/calls_top_bar.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 30ba5d18f..c86897564 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -355,6 +355,11 @@ void TopBar::initControls() {
 }
 
 void TopBar::initBlobs() {
+	const auto group = _groupCall.get();
+	if (!group) {
+		return;
+	}
+
 	const auto &hideDuration = kBlobLevelDuration1 * 2;
 	const auto hideLastTime = _blobs->lifetime().make_state<crl::time>(0);
 	const auto lastTime = _blobs->lifetime().make_state<crl::time>(0);
@@ -374,7 +379,7 @@ void TopBar::initBlobs() {
 		return true;
 	});
 
-	_groupCall->stateValue(
+	group->stateValue(
 	) | rpl::start_with_next([=](Calls::GroupCall::State state) {
 		if (state == Calls::GroupCall::State::HangingUp) {
 			_blobs->hide();
@@ -384,7 +389,7 @@ void TopBar::initBlobs() {
 	auto hideBlobs = rpl::combine(
 		rpl::single(anim::Disabled()) | rpl::then(anim::Disables()),
 		Core::App().appDeactivatedValue(),
-		_groupCall->stateValue(
+		group->stateValue(
 		) | rpl::map([](Calls::GroupCall::State state) {
 			using State = Calls::GroupCall::State;
 			if (state != State::Creating
@@ -471,7 +476,7 @@ void TopBar::initBlobs() {
 		});
 	}, lifetime());
 
-	_groupCall->levelUpdates(
+	group->levelUpdates(
 	) | rpl::filter([=](const LevelUpdate &update) {
 		return !*hideLastTime && (update.value > _blobsLastLevel);
 	}) | rpl::start_with_next([=](const LevelUpdate &update) {

From 7f7ac64c6de7c045a59b0a2bca55dd19c53441e8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Dec 2020 15:43:54 +0400
Subject: [PATCH 267/370] Init top bar blobs geometry safely.

---
 Telegram/SourceFiles/calls/calls_top_bar.cpp | 155 ++++++++++---------
 Telegram/SourceFiles/calls/calls_top_bar.h   |  15 +-
 Telegram/SourceFiles/mainwidget.cpp          |   1 +
 3 files changed, 85 insertions(+), 86 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index c86897564..7234e03c2 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -226,13 +226,6 @@ TopBar::TopBar(
 , _mute(this, st::callBarMuteToggle)
 , _info(this)
 , _hangup(this, st::callBarHangup)
-, _blobs(base::make_unique_q<Ui::RpWidget>(parent))
-, _blobsPaint(std::make_unique<Ui::Paint::LinearBlobs>(
-	LinearBlobs() | ranges::to_vector,
-	kBlobLevelDuration1,
-	kBlobLevelDuration2,
-	1.))
-, _blobsLevelTimer([=] { _blobsLastLevel = 0.; })
 , _gradients(Colors(), QPointF(), QPointF())
 , _updateDurationTimer([=] { updateDurationText(); }) {
 	initControls();
@@ -350,30 +343,56 @@ void TopBar::initControls() {
 		}
 	});
 	updateDurationText();
-
-	initBlobs();
 }
 
-void TopBar::initBlobs() {
+void TopBar::initBlobsUnder(
+		QWidget *blobsParent,
+		rpl::producer<QRect> barGeometry) {
 	const auto group = _groupCall.get();
 	if (!group) {
 		return;
 	}
 
-	const auto &hideDuration = kBlobLevelDuration1 * 2;
-	const auto hideLastTime = _blobs->lifetime().make_state<crl::time>(0);
-	const auto lastTime = _blobs->lifetime().make_state<crl::time>(0);
-	const auto blobsRect =
-		_blobs->lifetime().make_state<QRect>(_blobs->rect());
+	static constexpr auto kHideDuration = kBlobLevelDuration1 * 2;
 
-	_blobsAnimation.init([=](crl::time now) {
-		if (const auto last = *hideLastTime; (last > 0)
-			&& (now - last >= hideDuration)) {
-			_blobsAnimation.stop();
+	struct State {
+		Ui::Paint::LinearBlobs paint = {
+			LinearBlobs() | ranges::to_vector,
+			kBlobLevelDuration1,
+			kBlobLevelDuration2,
+			1.
+		};
+		Ui::Animations::Simple hideAnimation;
+		Ui::Animations::Basic animation;
+		base::Timer levelTimer;
+		crl::time hideLastTime = 0;
+		crl::time lastTime = 0;
+		float lastLevel = 0.;
+		float levelBeforeLast = 0.;
+		int maxHeight = st::groupCallMinorBlobMinRadius
+			+ st::groupCallMinorBlobMaxRadius;
+	};
+
+	_blobs = base::make_unique_q<Ui::RpWidget>(blobsParent);
+
+	const auto state = _blobs->lifetime().make_state<State>();
+	state->levelTimer.setCallback([=] {
+		state->levelBeforeLast = state->lastLevel;
+		state->lastLevel = 0.;
+		if (state->levelBeforeLast == 0.) {
+			state->paint.setLevel(0.);
+			state->levelTimer.cancel();
+		}
+	});
+
+	state->animation.init([=](crl::time now) {
+		if (const auto last = state->hideLastTime; (last > 0)
+			&& (now - last >= kHideDuration)) {
+			state->animation.stop();
 			return false;
 		}
-		_blobsPaint->updateLevel(now - *lastTime);
-		*lastTime = now;
+		state->paint.updateLevel(now - state->lastTime);
+		state->lastTime = now;
 
 		_blobs->update();
 		return true;
@@ -408,44 +427,32 @@ void TopBar::initBlobs() {
 		hideBlobs
 	) | rpl::start_with_next([=](bool hide) {
 		if (hide) {
-			_blobsPaint->setLevel(0.);
+			state->paint.setLevel(0.);
 		}
-		*hideLastTime = hide ? crl::now() : 0;
-		if (!hide && !_blobsAnimation.animating()) {
-			_blobsAnimation.start();
+		state->hideLastTime = hide ? crl::now() : 0;
+		if (!hide && !state->animation.animating()) {
+			state->animation.start();
 		}
 		if (hide) {
-			_blobsLevelTimer.cancel();
+			state->levelTimer.cancel();
 		} else {
-			_blobsLastLevel = 0.;
-			_blobsLevelTimer.callEach(kBlobUpdateInterval);
+			state->lastLevel = 0.;
 		}
 
 		const auto from = hide ? 0. : 1.;
 		const auto to = hide ? 1. : 0.;
-		_blobsHideAnimation.start([=](float64 value) {
-			blobsRect->setHeight(anim::interpolate(0, -20, value));
-		}, from, to, hideDuration);
+		state->hideAnimation.start([=](float64) {
+			_blobs->update();
+		}, from, to, kHideDuration);
 	}, lifetime());
 
-	///
-
-	const auto parent = static_cast<Ui::RpWidget*>(parentWidget());
-	geometryValue(
+	std::move(
+		barGeometry
 	) | rpl::start_with_next([=](QRect rect) {
-		_blobs->resize(rect.width(), rect.height());
-
-		{
-			const auto &r = _blobs->rect();
-			*blobsRect = QRect(
-				r.x(),
-				r.y(),
-				r.width() + st::groupCallBlobWidthAdditional,
-				0);
-		}
-
-		const auto relativePos = mapTo(parent, rect.topLeft());
-		_blobs->moveToLeft(relativePos.x(), relativePos.y() + rect.height());
+		_blobs->resize(
+			rect.width(),
+			std::min(state->maxHeight, rect.height()));
+		_blobs->moveToLeft(rect.x(), rect.y() + rect.height());
 	}, lifetime());
 
 	shownValue(
@@ -455,44 +462,42 @@ void TopBar::initBlobs() {
 
 	_blobs->paintRequest(
 	) | rpl::start_with_next([=](QRect clip) {
-		Painter p(_blobs);
-
-		const auto alpha = 1. - _blobsHideAnimation.value(0.);
-		if (alpha < 1.) {
-			p.setOpacity(alpha);
+		const auto hidden = state->hideAnimation.value(
+			state->hideLastTime ? 1. : 0.);
+		if (hidden == 1.) {
+			return;
 		}
-		_blobsPaint->paint(p, _groupBrush, *blobsRect, 0, 0);
-	}, _blobs->lifetime());
 
-	rpl::single(
-	) | rpl::then(
-		events(
-		) | rpl::filter([](not_null<QEvent*> e) {
-			return e->type() == QEvent::ZOrderChange;
-		}) | rpl::to_empty
-	) | rpl::start_with_next([=] {
-		crl::on_main(_blobs.get(), [=] {
-			_blobs->raise();
-		});
-	}, lifetime());
+		Painter p(_blobs);
+		if (hidden > 0.) {
+			p.setOpacity(1. - hidden);
+		}
+		const auto top = -_blobs->height() * hidden;
+		const auto drawUnder = QRect(
+			0,
+			top,
+			_blobs->width() + st::groupCallBlobWidthAdditional,
+			0);
+		state->paint.paint(p, _groupBrush, drawUnder, 0, 0);
+	}, _blobs->lifetime());
 
 	group->levelUpdates(
 	) | rpl::filter([=](const LevelUpdate &update) {
-		return !*hideLastTime && (update.value > _blobsLastLevel);
+		return !state->hideLastTime && (update.value > state->lastLevel);
 	}) | rpl::start_with_next([=](const LevelUpdate &update) {
-		_blobsLastLevel = update.value;
-		_blobsPaint->setLevel(_blobsLastLevel);
+		if (state->lastLevel == 0.) {
+			state->levelTimer.callEach(kBlobUpdateInterval);
+		}
+		state->lastLevel = update.value;
+		state->paint.setLevel(update.value);
 	}, _blobs->lifetime());
 
 	_blobs->setAttribute(Qt::WA_TransparentForMouseEvents);
 	_blobs->show();
-	_blobsAnimation.start();
 
-	crl::on_main([=] {
-		const auto r = rect();
-		const auto relativePos = mapTo(parent, r.topLeft());
-		_blobs->moveToLeft(relativePos.x(), relativePos.y() + r.height());
-	});
+	if (!state->hideLastTime) {
+		state->animation.start();
+	}
 }
 
 void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.h b/Telegram/SourceFiles/calls/calls_top_bar.h
index e9ea27513..a87eb14f6 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.h
+++ b/Telegram/SourceFiles/calls/calls_top_bar.h
@@ -20,9 +20,6 @@ class IconButton;
 class AbstractButton;
 class LabelSimple;
 class FlatLabel;
-namespace Paint {
-class LinearBlobs;
-} // namespace Paint
 } // namespace Ui
 
 namespace Main {
@@ -41,9 +38,12 @@ class TopBar : public Ui::RpWidget {
 public:
 	TopBar(QWidget *parent, const base::weak_ptr<Call> &call);
 	TopBar(QWidget *parent, const base::weak_ptr<GroupCall> &call);
-
 	~TopBar();
 
+	void initBlobsUnder(
+		QWidget *blobsParent,
+		rpl::producer<QRect> barGeometry);
+
 protected:
 	void resizeEvent(QResizeEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
@@ -55,7 +55,6 @@ private:
 		const base::weak_ptr<GroupCall> &groupCall);
 
 	void initControls();
-	void initBlobs();
 	void updateInfoLabels();
 	void setInfoLabels();
 	void updateDurationText();
@@ -79,17 +78,11 @@ private:
 	object_ptr<Ui::AbstractButton> _info;
 	object_ptr<Ui::IconButton> _hangup;
 	base::unique_qptr<Ui::RpWidget> _blobs;
-	std::unique_ptr<Ui::Paint::LinearBlobs> _blobsPaint;
-	float _blobsLastLevel = 0.;
-	base::Timer _blobsLevelTimer;
 
 	QBrush _groupBrush;
 	anim::linear_gradients<MuteState> _gradients;
 	Ui::Animations::Simple _switchStateAnimation;
 
-	Ui::Animations::Simple _blobsHideAnimation;
-	Ui::Animations::Basic _blobsAnimation;
-
 	base::Timer _updateDurationTimer;
 
 };
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index bf47f7455..6802e12ba 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1000,6 +1000,7 @@ void MainWidget::createCallTopBar() {
 		(_currentCall
 			? object_ptr<Calls::TopBar>(this, _currentCall)
 			: object_ptr<Calls::TopBar>(this, _currentGroupCall)));
+	_callTopBar->entity()->initBlobsUnder(this, _callTopBar->geometryValue());
 	_callTopBar->heightValue(
 	) | rpl::start_with_next([this](int value) {
 		callTopBarHeightUpdated(value);

From 085eef15c22c961c58b29eff60e566b7c0ac8f63 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Dec 2020 15:50:40 +0400
Subject: [PATCH 268/370] Revert "Fixed draft applying while recording voice
 message in HistoryWidget."

This reverts commit 346547c23d21ae5f25befac3ab736610ed3e0e7a.

Fixes #9871.
---
 .../SourceFiles/history/history_widget.cpp     | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index a03f8e27b..4edbefdb7 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -821,13 +821,6 @@ void HistoryWidget::initVoiceRecordBar() {
 	}, lifetime());
 
 	_voiceRecordBar->hideFast();
-
-	_voiceRecordBar->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
-		if (!shown) {
-			applyDraft();
-		}
-	}, lifetime());
 }
 
 void HistoryWidget::initTabbedSelector() {
@@ -2089,15 +2082,8 @@ bool HistoryWidget::contentOverlapped(const QRect &globalRect) {
 }
 
 bool HistoryWidget::canWriteMessage() const {
-	if (!_history || !_canSendMessages) {
-		return false;
-	}
-	if (isBlocked() || isJoinChannel() || isMuteUnmute() || isBotStart()) {
-		return false;
-	}
-	if (!_voiceRecordBar->isHidden()) {
-		return false;
-	}
+	if (!_history || !_canSendMessages) return false;
+	if (isBlocked() || isJoinChannel() || isMuteUnmute() || isBotStart()) return false;
 	return true;
 }
 

From d15a5c9bdccc7a2d212be648bdb3822c7eee8402 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Dec 2020 16:01:09 +0400
Subject: [PATCH 269/370] Revert "Fixed accidental stop of voice recording in
 sections."

This reverts commit 5f9e497d382fba1fdd81f31f0947d5403c07b1fe.

Fixes #9871.
---
 .../history/view/controls/history_view_voice_record_bar.cpp     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 143ba1b11..b2ebaca31 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1288,7 +1288,6 @@ void VoiceRecordBar::stop(bool send) {
 }
 
 void VoiceRecordBar::finish() {
-	stopRecording(StopType::Cancel);
 	_recordingLifetime.destroy();
 	_lockShowing = false;
 	_recording = false;
@@ -1308,6 +1307,7 @@ void VoiceRecordBar::hideFast() {
 	hide();
 	_lock->hide();
 	_level->hide();
+	stopRecording(StopType::Cancel);
 }
 
 void VoiceRecordBar::stopRecording(StopType type) {

From 7feb84108116a8d402d5cb31e4f32f8c227c5ef8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Dec 2020 16:24:25 +0400
Subject: [PATCH 270/370] Create voice chats with confirmation.

---
 Telegram/Resources/langs/lang.strings         |  3 ++-
 .../view/history_view_top_bar_widget.cpp      | 22 +++++++++++++------
 .../window/window_session_controller.cpp      |  4 ++++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d3a4b9732..8823ce1ab 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1826,6 +1826,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_leave_title" = "Leave voice chat";
 "lng_group_call_leave_sure" = "Are you sure you want to leave this voice chat?";
 "lng_group_call_leave_to_other_sure" = "Do you want to leave your active voice chat and join a voice chat in this group?";
+"lng_group_call_create_sure" = "Do you really want to start a voice chat in this group?";
 "lng_group_call_also_end" = "End voice chat";
 "lng_group_call_settings_title" = "Settings";
 "lng_group_call_invite_title" = "Invite members";
@@ -1833,7 +1834,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_new_muted" = "Mute new members";
 "lng_group_call_speakers" = "Speakers";
 "lng_group_call_microphone" = "Microphone";
-"lng_group_call_push_to_talk" = "Push to Talk";
+"lng_group_call_push_to_talk" = "Push to Talk Shortcut";
 "lng_group_call_ptt_shortcut" = "Edit Shortcut";
 "lng_group_call_ptt_recording" = "Stop Recording";
 "lng_group_call_ptt_delay_ms" = "{amount} ms";
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 0741b2e29..6e612a293 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -223,10 +223,19 @@ void TopBarWidget::groupCall() {
 		if (const auto megagroup = peer->asMegagroup()) {
 			_controller->startOrJoinGroupCall(megagroup);
 		} else if (const auto chat = peer->asChat()) {
-			const auto start = [=](not_null<ChannelData*> megagroup) {
-				_controller->startOrJoinGroupCall(megagroup);
+			const auto callback = [=] {
+				Ui::hideLayer();
+				const auto start = [=](not_null<ChannelData*> megagroup) {
+					_controller->startOrJoinGroupCall(megagroup, true);
+				};
+				peer->session().api().migrateChat(
+					chat,
+					crl::guard(this, start));
 			};
-			peer->session().api().migrateChat(chat, crl::guard(this, start));
+			Ui::show(Box<ConfirmBox>(
+				tr::lng_group_call_create_sure(tr::now),
+				tr::lng_continue(tr::now),
+				crl::guard(this, callback)));
 		}
 	}
 }
@@ -655,11 +664,11 @@ void TopBarWidget::updateControlsGeometry() {
 	if (!_infoToggle->isHidden()) {
 		_rightTaken += _infoToggle->width() + st::topBarSkip;
 	}
-	_search->moveToRight(_rightTaken, otherButtonsTop);
-	_rightTaken += _search->width() + st::topBarCallSkip;
 	_call->moveToRight(_rightTaken, otherButtonsTop);
 	_groupCall->moveToRight(_rightTaken, otherButtonsTop);
 	_rightTaken += _call->width();
+	_search->moveToRight(_rightTaken, otherButtonsTop);
+	_rightTaken += _search->width() + st::topBarCallSkip;
 
 	updateMembersShowArea();
 }
@@ -717,8 +726,7 @@ void TopBarWidget::updateControlsVisibility() {
 	const auto callsEnabled = [&] {
 		if (const auto peer = _activeChat.key.peer()) {
 			if (const auto user = peer->asUser()) {
-				return session().serverConfig().phoneCallsEnabled.current()
-					&& user->hasCalls();
+				return true;
 			}
 		}
 		return false;
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 27eb8fc10..b1a3daf8d 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -961,6 +961,10 @@ void SessionController::startOrJoinGroupCall(
 				tr::lng_group_call_leave_to_other_sure(tr::now),
 				tr::lng_group_call_leave(tr::now));
 		}
+	} else if (!confirmedLeaveOther && !megagroup->call()) {
+		confirm(
+			tr::lng_group_call_create_sure(tr::now),
+			tr::lng_continue(tr::now));
 	} else {
 		calls.startOrJoinGroupCall(megagroup);
 	}

From 092e0990e89d55b26437e4a0259dfe815f89b452 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Dec 2020 17:11:42 +0400
Subject: [PATCH 271/370] Request mic permission only on unmute.

---
 .../SourceFiles/calls/calls_group_call.cpp    | 21 ++++++++++++-------
 Telegram/SourceFiles/calls/calls_group_call.h |  3 ++-
 Telegram/SourceFiles/calls/calls_instance.cpp | 16 +++++++-------
 Telegram/SourceFiles/calls/calls_instance.h   |  8 +++++--
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 8f3f51ca9..466dae4bf 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -354,13 +354,20 @@ void GroupCall::finish(FinishType type) {
 }
 
 void GroupCall::setMuted(MuteState mute) {
-	const auto wasMuted = (muted() == MuteState::Muted)
-		|| (muted() == MuteState::PushToTalk);
-	_muted = mute;
-	const auto nowMuted = (muted() == MuteState::Muted)
-		|| (muted() == MuteState::PushToTalk);
-	if (wasMuted != nowMuted) {
-		applySelfInCallLocally();
+	const auto set = [=] {
+		const auto wasMuted = (muted() == MuteState::Muted)
+			|| (muted() == MuteState::PushToTalk);
+		_muted = mute;
+		const auto nowMuted = (muted() == MuteState::Muted)
+			|| (muted() == MuteState::PushToTalk);
+		if (wasMuted != nowMuted) {
+			applySelfInCallLocally();
+		}
+	};
+	if (mute == MuteState::Active || mute == MuteState::PushToTalk) {
+		_delegate->groupCallRequestPermissionsOrFail(crl::guard(this, set));
+	} else {
+		set();
 	}
 }
 
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 6f54d0100..d2fcde07c 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -53,7 +53,8 @@ public:
 
 		virtual void groupCallFinished(not_null<GroupCall*> call) = 0;
 		virtual void groupCallFailed(not_null<GroupCall*> call) = 0;
-
+		virtual void groupCallRequestPermissionsOrFail(
+			Fn<void()> onSuccess) = 0;
 	};
 
 	using GlobalShortcutManager = base::GlobalShortcutManager;
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index 80622d9d7..5e11aefcf 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -60,12 +60,11 @@ void Instance::startOutgoingCall(not_null<UserData*> user, bool video) {
 
 void Instance::startOrJoinGroupCall(not_null<ChannelData*> channel) {
 	destroyCurrentCall();
-	requestPermissionsOrFail(crl::guard(this, [=] {
-		const auto call = channel->call();
-		createGroupCall(
-			channel,
-			call ? call->input() : MTP_inputGroupCall(MTPlong(), MTPlong()));
-	}), false);
+
+	const auto call = channel->call();
+	createGroupCall(
+		channel,
+		call ? call->input() : MTP_inputGroupCall(MTPlong(), MTPlong()));
 }
 
 void Instance::callFinished(not_null<Call*> call) {
@@ -186,9 +185,8 @@ void Instance::destroyGroupCall(not_null<GroupCall*> call) {
 void Instance::createGroupCall(
 		not_null<ChannelData*> channel,
 		const MTPInputGroupCall &inputCall) {
-	if (_currentGroupCall) {
-		destroyGroupCall(_currentGroupCall.get());
-	}
+	destroyCurrentCall();
+
 	auto call = std::make_unique<GroupCall>(
 		getGroupCallDelegate(),
 		channel,
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index 4fde646e1..e6e0a3731 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -55,7 +55,9 @@ public:
 	[[nodiscard]] bool hasActivePanel(
 		not_null<Main::Session*> session) const;
 	bool activateCurrentCall();
-	std::shared_ptr<tgcalls::VideoCaptureInterface> getVideoCapture() override;
+	auto getVideoCapture()
+		-> std::shared_ptr<tgcalls::VideoCaptureInterface> override;
+	void requestPermissionsOrFail(Fn<void()> onSuccess, bool video = true);
 
 	void setCurrentAudioDevice(bool input, const QString &deviceId);
 
@@ -82,6 +84,9 @@ private:
 
 	void groupCallFinished(not_null<GroupCall*> call) override;
 	void groupCallFailed(not_null<GroupCall*> call) override;
+	void groupCallRequestPermissionsOrFail(Fn<void()> onSuccess) override {
+		requestPermissionsOrFail(std::move(onSuccess), false);
+	}
 
 	using Sound = Call::Delegate::Sound;
 	void playSound(Sound sound) override;
@@ -93,7 +98,6 @@ private:
 		const MTPInputGroupCall &inputCall);
 	void destroyGroupCall(not_null<GroupCall*> call);
 
-	void requestPermissionsOrFail(Fn<void()> onSuccess, bool video = true);
 	void requestPermissionOrFail(Platform::PermissionType type, Fn<void()> onSuccess);
 
 	void refreshDhConfig();

From 376e43d9d589e02f6c4d70ded41f3b151d211185 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Dec 2020 17:26:25 +0400
Subject: [PATCH 272/370] Migrate actions to Qt 5.15.2.

---
 .github/workflows/mac.yml | 18 +++++++++---------
 .github/workflows/win.yml | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 21e486f17..3d259f333 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -57,9 +57,9 @@ jobs:
       PREFIX: "/usr/local/macos"
       MACOSX_DEPLOYMENT_TARGET: "10.12"
       XZ: "xz-5.2.4"
-      QT: "5_15_1"
+      QT: "5_15_2"
       OPENSSL_VER: "1_1_1"
-      QT_PREFIX: "/usr/local/desktop-app/Qt-5.15.1"
+      QT_PREFIX: "/usr/local/desktop-app/Qt-5.15.2"
       LIBICONV_VER: "libiconv-1.16"
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
@@ -419,20 +419,20 @@ jobs:
           build/gyp_crashpad.py -Dmac_deployment_target=10.10
           ninja -C out/Debug
 
-      - name: Qt 5.15.1 cache.
+      - name: Qt 5.15.2 cache.
         id: cache-qt
         uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/qt-cache
-          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_1/*') }}
-      - name: Use cached Qt 5.15.1.
+          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_2/*') }}
+      - name: Use cached Qt 5.15.2.
         if: steps.cache-qt.outputs.cache-hit == 'true'
         run: |
           cd $LibrariesPath
-          mv qt-cache Qt-5.15.1
+          mv qt-cache Qt-5.15.2
           sudo mkdir -p $QT_PREFIX
-          sudo mv -f Qt-5.15.1 "$(dirname "$QT_PREFIX")"/
-      - name: Qt 5.15.1 build.
+          sudo mv -f Qt-5.15.2 "$(dirname "$QT_PREFIX")"/
+      - name: Qt 5.15.2 build.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |
           cd $LibrariesPath
@@ -440,7 +440,7 @@ jobs:
           git clone git://code.qt.io/qt/qt5.git qt_$QT
           cd qt_$QT
           perl init-repository --module-subset=qtbase,qtimageformats
-          git checkout v5.15.1
+          git checkout v5.15.2
           git submodule update qtbase
           git submodule update qtimageformats
           cd qtbase
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 0f7e70d91..81b65aa12 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -59,8 +59,8 @@ jobs:
       SDK: "10.0.18362.0"
       VC: "call vcvars32.bat && cd Libraries"
       GIT: "https://github.com"
-      QT: "5_15_1"
-      QT_VER: "5.15.1"
+      QT: "5_15_2"
+      QT_VER: "5.15.2"
       OPENSSL_VER: "1_1_1"
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
@@ -211,7 +211,7 @@ jobs:
         run: |
           %VC%
 
-          git clone -b openal-soft-1.21.0 --depth=1 $GIT/kcat/openal-soft.git
+          git clone -b openal-soft-1.21.0 --depth=1 %GIT%/kcat/openal-soft.git
           cd openal-soft\build
           cmake .. ^
           -G "Visual Studio 16 2019" ^
@@ -299,13 +299,13 @@ jobs:
 
           rmdir /S /Q .git
 
-      - name: Qt 5.15.1 cache.
+      - name: Qt 5.15.2 cache.
         id: cache-qt
         uses: actions/cache@v2
         with:
           path: ${{ env.LibrariesPath }}/Qt-${{ env.QT_VER }}
-          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_1/*') }}
-      - name: Configure Qt 5.15.1.
+          key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_2/*') }}
+      - name: Configure Qt 5.15.2.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |
           %VC%
@@ -342,7 +342,7 @@ jobs:
           -I "%LibrariesPath%\mozjpeg" ^
           LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
           LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib"
-      - name: Qt 5.15.1 build.
+      - name: Qt 5.15.2 build.
         if: steps.cache-qt.outputs.cache-hit != 'true'
         run: |
           %VC%

From 43564d1850494887066f0e3203e7ceab69c0cb94 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Dec 2020 17:40:27 +0400
Subject: [PATCH 273/370] Beta version 2.4.13.

- Fix voice messages sending.
- Fix crash in voice calls.
---
 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 cb9419d4e..ceba0fce0 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.12.0" />
+    Version="2.4.13.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 6c6b9dc5d..c1a335b6a 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,12,0
- PRODUCTVERSION 2,4,12,0
+ FILEVERSION 2,4,13,0
+ PRODUCTVERSION 2,4,13,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.12.0"
+            VALUE "FileVersion", "2.4.13.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.12.0"
+            VALUE "ProductVersion", "2.4.13.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 805fdc3f4..2c83c4a03 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,12,0
- PRODUCTVERSION 2,4,12,0
+ FILEVERSION 2,4,13,0
+ PRODUCTVERSION 2,4,13,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.12.0"
+            VALUE "FileVersion", "2.4.13.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.12.0"
+            VALUE "ProductVersion", "2.4.13.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 36394117b..9518f32be 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 = 2004012;
-constexpr auto AppVersionStr = "2.4.12";
+constexpr auto AppVersion = 2004013;
+constexpr auto AppVersionStr = "2.4.13";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 813f35cdf..13797dc1b 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2004012
+AppVersion         2004013
 AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.12
-AppVersionStr      2.4.12
+AppVersionStrSmall 2.4.13
+AppVersionStr      2.4.13
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 2.4.12.beta
+AppVersionOriginal 2.4.13.beta
diff --git a/changelog.txt b/changelog.txt
index 3c480f30e..d3c45d163 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+2.4.13 beta (09.12.20)
+
+- Fix voice messages sending.
+- Fix crash in voice calls.
+
 2.4.12 beta (09.12.20)
 
 - Voice chats in groups. (alpha version)

From 3297bdadb564da8143dabae46b53e35e126b41fa Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 9 Dec 2020 17:07:10 +0400
Subject: [PATCH 274/370] Add new dependencies to snap build

---
 Telegram/lib_base   | 2 +-
 cmake               | 2 +-
 snap/snapcraft.yaml | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 69f70b8f4..f98f02214 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 69f70b8f47a8c0e3bf75a3ae38d39bd1877655d0
+Subproject commit f98f0221416746f0beaf5a51e95674a90442c3d5
diff --git a/cmake b/cmake
index f29f5e727..1c2be0df2 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit f29f5e727f9a4e947ce7cc4456256eb07d3c8c7f
+Subproject commit 1c2be0df28feb0c4629a1f37ccf7d23da2ff17c1
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index dd1afe1dd..a005dbbb6 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -79,6 +79,8 @@ parts:
       - libqt5waylandclient5-dev
       - libssl-dev
       - libxcb1-dev
+      - libxcb-keysyms1-dev
+      - libxcb-record0-dev
       - libxcb-screensaver0-dev
       - zlib1g-dev
     stage-packages:
@@ -93,6 +95,8 @@ parts:
       - libqt5waylandclient5
       - libssl1.1
       - libxcb1
+      - libxcb-keysyms1
+      - libxcb-record0
       - libxcb-screensaver0
       - zlib1g
     cmake-parameters:

From 05147016b072e690359d70dbfa1f98195ad2d8ee Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 10 Dec 2020 06:32:30 +0400
Subject: [PATCH 275/370] Simplify XErrorHandlerRestorer API

---
 .../SourceFiles/platform/linux/linux_libs.cpp |  7 +++----
 .../platform/linux/linux_xlib_helper.cpp      | 20 +++++++++----------
 .../platform/linux/linux_xlib_helper.h        |  3 ---
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
index 86e9719eb..879db8f75 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
@@ -17,6 +17,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_domain.h"
 #include "mainwindow.h"
 
+using Platform::internal::XErrorHandlerRestorer;
+
 namespace Platform {
 namespace Libs {
 namespace {
@@ -123,8 +125,7 @@ bool setupGtkBase(QLibrary &lib_gtk) {
 
 	// gtk_init will reset the Xlib error handler, and that causes
 	// Qt applications to quit on X errors. Therefore, we need to manually restore it.
-	internal::XErrorHandlerRestorer handlerRestorer;
-	handlerRestorer.save();
+	XErrorHandlerRestorer handlerRestorer;
 
 	DEBUG_LOG(("Library gtk functions loaded!"));
 	gtkTriedToInit = true;
@@ -135,8 +136,6 @@ bool setupGtkBase(QLibrary &lib_gtk) {
 	}
 	DEBUG_LOG(("Checked gtk with gtk_init_check!"));
 
-	handlerRestorer.restore();
-
 	// Use our custom log handler.
 	g_log_set_handler("Gtk", G_LOG_LEVEL_MESSAGE, gtkMessageHandler, nullptr);
 
diff --git a/Telegram/SourceFiles/platform/linux/linux_xlib_helper.cpp b/Telegram/SourceFiles/platform/linux/linux_xlib_helper.cpp
index 43e87e385..3396f1763 100644
--- a/Telegram/SourceFiles/platform/linux/linux_xlib_helper.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_xlib_helper.cpp
@@ -17,8 +17,16 @@ namespace internal {
 
 class XErrorHandlerRestorer::Private {
 public:
-	Private() {}
-	int (*oldErrorHandler)(Display *, XErrorEvent *);
+	Private()
+	: _oldErrorHandler(XSetErrorHandler(nullptr)) {
+	}
+
+	~Private() {
+		XSetErrorHandler(_oldErrorHandler);
+	}
+
+private:
+	int (*_oldErrorHandler)(Display *, XErrorEvent *);
 };
 
 XErrorHandlerRestorer::XErrorHandlerRestorer()
@@ -27,14 +35,6 @@ XErrorHandlerRestorer::XErrorHandlerRestorer()
 
 XErrorHandlerRestorer::~XErrorHandlerRestorer() = default;
 
-void XErrorHandlerRestorer::save() {
-	_private->oldErrorHandler = XSetErrorHandler(nullptr);
-}
-
-void XErrorHandlerRestorer::restore() {
-	XSetErrorHandler(_private->oldErrorHandler);
-}
-
 } // namespace internal
 } // namespace Platform
 #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
diff --git a/Telegram/SourceFiles/platform/linux/linux_xlib_helper.h b/Telegram/SourceFiles/platform/linux/linux_xlib_helper.h
index 65ad56310..def4c9bba 100644
--- a/Telegram/SourceFiles/platform/linux/linux_xlib_helper.h
+++ b/Telegram/SourceFiles/platform/linux/linux_xlib_helper.h
@@ -16,9 +16,6 @@ public:
 	XErrorHandlerRestorer();
 	~XErrorHandlerRestorer();
 
-	void save();
-	void restore();
-
 private:
 	class Private;
 	const std::unique_ptr<Private> _private;

From 6af180d6b529fee718a1f086d328fd35c1ed9185 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 10 Dec 2020 08:18:52 +0400
Subject: [PATCH 276/370] Remove unneeded anymore Yum install step from Linux
 action

---
 .github/workflows/linux.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 1da535e15..a39e31d76 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -72,12 +72,6 @@ jobs:
       - name: Get repository name.
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
-      - name: Yum install.
-        run: |
-          yum -y autoremove git
-          yum -y install https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-1.7-1.x86_64.rpm
-          yum -y install git
-
       - name: Clone.
         uses: actions/checkout@v2
         with:

From c4f985ca38d38f4b1df8143cb0bd64ad31eb5fe3 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 10 Dec 2020 08:07:59 +0400
Subject: [PATCH 277/370] Fix OpenAL build in Windows action

---
 .github/workflows/win.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 81b65aa12..f9d997ad9 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -218,7 +218,7 @@ jobs:
           -A Win32 ^
           -D LIBTYPE:STRING=STATIC ^
           -D FORCE_STATIC_VCRT=ON ^
-          -D ALSOFT_BACKEND_WASAPI=OFF
+          -D ALSOFT_BACKEND_DSOUND=OFF
 
           msbuild -m OpenAL.vcxproj /property:Configuration=Debug
 

From 379a3d74e2785316e8dca5a0277cfcf85b30bc83 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 10 Dec 2020 08:53:42 +0400
Subject: [PATCH 278/370] Fix build without gtk

---
 Telegram/SourceFiles/platform/linux/linux_libs.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
index 879db8f75..ed09f1bed 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
@@ -17,7 +17,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_domain.h"
 #include "mainwindow.h"
 
+#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
 using Platform::internal::XErrorHandlerRestorer;
+#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
 
 namespace Platform {
 namespace Libs {

From 7809cb8d30a7ed6f9631e233e3ecd919ac5b2514 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 10 Dec 2020 09:50:26 +0400
Subject: [PATCH 279/370] Add execute bit to
 Telegram/build/docker/centos_env/build.sh

---
 Telegram/build/docker/centos_env/build.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 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
old mode 100644
new mode 100755

From 64c791a9ce2e1082652f699b087f057a11178f15 Mon Sep 17 00:00:00 2001
From: Filippe LeMarchand <gasinvein@gmail.com>
Date: Thu, 19 Nov 2020 21:55:18 +0400
Subject: [PATCH 280/370] Add changelog2appdata.py from flatpak

---
 Telegram/build/changelog2appdata.py | 73 +++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100755 Telegram/build/changelog2appdata.py

diff --git a/Telegram/build/changelog2appdata.py b/Telegram/build/changelog2appdata.py
new file mode 100755
index 000000000..d97817eaa
--- /dev/null
+++ b/Telegram/build/changelog2appdata.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python3
+
+import re
+import datetime
+from xml.etree import ElementTree as ET
+import argparse
+
+def parse_changelog(changelog_path):
+    version_re = re.compile(r'([\d.-]+)\s+(\w+)?\s*\((\d{2}.\d{2}\.\d{2})\)')
+    entry_re = re.compile(r'-\s(.*)')
+
+    with open(changelog_path, "r") as f:
+        changelog_lines = f.read().splitlines()
+
+    releases = []
+    for l in changelog_lines:
+        version_match = version_re.match(l)
+        entry_match = entry_re.match(l)
+        if version_match is not None:
+            version, prerelease, date = version_match.groups()
+            release = (version,
+                       prerelease,
+                       datetime.datetime.strptime(date, '%d.%m.%y').date(),
+                       [])
+            releases.append(release)
+        elif entry_match is not None:
+            release[3].append(entry_match.group(1))
+
+    return releases
+
+def get_release_xml(version, prerelease, date, changes):
+    release = ET.Element("release")
+    if prerelease is None:
+        ver_str = version
+    else:
+        ver_str = f"{version}~{prerelease}"
+    release.set("version", ver_str)
+    release.set("date", date.isoformat())
+    description = ET.SubElement(release, "description")
+    changelist = ET.SubElement(description, "ul")
+    for c in changes:
+        change = ET.SubElement(changelist, "li")
+        change.text = c
+    return release
+
+def get_changelog_xml(changelog, max_items=None):
+    releases = ET.Element("releases")
+    if max_items is not None:
+        changelog = changelog[:max_items]
+    for rel in changelog:
+        release = get_release_xml(*rel)
+        releases.append(release)
+    return releases
+
+def update_appdata(appdata_path, changelog, max_items=None):
+    appdata = ET.parse(appdata_path)
+    appdata.getroot().append(
+        get_changelog_xml(changelog, max_items)
+    )
+    appdata.write(appdata_path, encoding="utf-8", xml_declaration=True)
+
+def main():
+    ap = argparse.ArgumentParser("Parse Telegram changelog")
+    ap.add_argument("-c", "--changelog-path", default="changelog.txt")
+    ap.add_argument("-a", "--appdata-path", default="lib/xdg/telegramdesktop.appdata.xml")
+    ap.add_argument("-n", "--num-releases", type=int, default=None)
+    args = ap.parse_args()
+    update_appdata(args.appdata_path,
+                   parse_changelog(args.changelog_path),
+                   max_items=args.num_releases)
+
+if __name__ == "__main__":
+    main()

From cc35653c2ca93153fc439d9621c947eb6210005f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 20 Nov 2020 00:21:05 +0400
Subject: [PATCH 281/370] Add changelog2appdata into cmake build

---
 Telegram/CMakeLists.txt                       |  2 ++
 .../cmake/generate_appdata_changelog.cmake    | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 Telegram/cmake/generate_appdata_changelog.cmake

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index e8072cf86..a93056460 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -33,6 +33,7 @@ include(cmake/td_mtproto.cmake)
 include(cmake/td_lang.cmake)
 include(cmake/td_scheme.cmake)
 include(cmake/td_ui.cmake)
+include(cmake/generate_appdata_changelog.cmake)
 
 set_target_properties(Telegram PROPERTIES AUTOMOC ON AUTORCC ON)
 
@@ -1319,6 +1320,7 @@ endif()
 if (LINUX AND DESKTOP_APP_USE_PACKAGED)
     include(GNUInstallDirs)
     configure_file("../lib/xdg/telegramdesktop.appdata.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.appdata.xml" @ONLY)
+    generate_appdata_changelog(Telegram "../changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.appdata.xml")
     install(TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}")
     install(FILES "Resources/art/icon16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "telegram.png")
     install(FILES "Resources/art/icon32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "telegram.png")
diff --git a/Telegram/cmake/generate_appdata_changelog.cmake b/Telegram/cmake/generate_appdata_changelog.cmake
new file mode 100644
index 000000000..6cbdd6461
--- /dev/null
+++ b/Telegram/cmake/generate_appdata_changelog.cmake
@@ -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
+
+function(generate_appdata_changelog target_name changelog_path appdata_path)
+    find_package(Python3 REQUIRED)
+
+    add_custom_target(${target_name}_appdata_changelog
+        ${Python3_EXECUTABLE}
+        ${submodules_loc}/build/changelog2appdata.py
+        -c "${changelog_path}"
+        -a "${appdata_path}"
+        -n 10
+    COMMENT "Generating AppData changelog (${target_name})"
+    DEPENDS
+        ${submodules_loc}/build/changelog2appdata.py
+        ${changelog_path}
+        ${appdata_path}
+    VERBATIM
+    )
+    add_dependencies(${target_name} ${target_name}_appdata_changelog)
+endfunction()

From df420e4ccf51dcf8649619aca6a32da3311e5f90 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Dec 2020 12:00:52 +0400
Subject: [PATCH 282/370] Revert "Use gtk not only to get image from clipboard,
 but also to set"

This reverts commit f88c132c9635ad9000dac573a086246cae764aee.

Fixes #9885.
---
 .../SourceFiles/boxes/edit_caption_box.cpp    |  2 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp |  2 +-
 .../admin_log/history_admin_log_inner.cpp     |  5 +-
 .../history/history_inner_widget.cpp          |  5 +-
 .../SourceFiles/history/history_widget.cpp    |  2 +-
 .../view/history_view_context_menu.cpp        |  5 +-
 .../view/history_view_replies_section.cpp     |  2 +-
 .../view/history_view_scheduled_section.cpp   |  2 +-
 .../media/view/media_view_overlay_widget.cpp  | 12 +---
 .../SourceFiles/platform/linux/linux_libs.cpp | 13 ++--
 .../SourceFiles/platform/linux/linux_libs.h   |  6 --
 .../platform/linux/specific_linux.cpp         | 62 +------------------
 .../SourceFiles/platform/mac/specific_mac.h   |  6 +-
 .../SourceFiles/platform/platform_specific.h  |  3 +-
 .../SourceFiles/platform/win/specific_win.h   |  6 +-
 15 files changed, 21 insertions(+), 112 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index f91645178..edcb57b56 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -80,7 +80,7 @@ auto ListFromMimeData(not_null<const QMimeData*> data) {
 	if (result.error == Error::None) {
 		return result;
 	} else if (data->hasImage()) {
-		auto image = Platform::GetClipboardImage();
+		auto image = Platform::GetImageFromClipboard();
 		if (image.isNull()) {
 			image = qvariant_cast<QImage>(data->imageData());
 		}
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index bbefbb8bc..041ae00e5 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -767,7 +767,7 @@ bool SendFilesBox::addFiles(not_null<const QMimeData*> data) {
 		if (result.error == Ui::PreparedList::Error::None) {
 			return result;
 		} else if (data->hasImage()) {
-			auto image = Platform::GetClipboardImage();
+			auto image = Platform::GetImageFromClipboard();
 			if (image.isNull()) {
 				image = qvariant_cast<QImage>(data->imageData());
 			}
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 0f9dba8db..bf383ddec 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -21,7 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/message_field.h"
 #include "boxes/sticker_set_box.h"
 #include "base/platform/base_platform_info.h"
-#include "platform/platform_specific.h"
 #include "mainwindow.h"
 #include "mainwidget.h"
 #include "core/application.h"
@@ -1220,9 +1219,7 @@ void InnerWidget::copyContextImage(not_null<PhotoData*> photo) {
 	}
 
 	const auto image = media->image(Data::PhotoSize::Large)->original();
-	if (!Platform::SetClipboardImage(image)) {
-		QGuiApplication::clipboard()->setImage(image);
-	}
+	QGuiApplication::clipboard()->setImage(image);
 }
 
 void InnerWidget::copySelectedText() {
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 36ed444e4..9e96faf10 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -38,7 +38,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/sticker_set_box.h"
 #include "chat_helpers/message_field.h"
 #include "history/history_widget.h"
-#include "platform/platform_specific.h"
 #include "base/platform/base_platform_info.h"
 #include "base/unixtime.h"
 #include "mainwindow.h"
@@ -1900,9 +1899,7 @@ void HistoryInner::copyContextImage(not_null<PhotoData*> photo) {
 	}
 
 	const auto image = media->image(Data::PhotoSize::Large)->original();
-	if (!Platform::SetClipboardImage(image)) {
-		QGuiApplication::clipboard()->setImage(image);
-	}
+	QGuiApplication::clipboard()->setImage(image);
 }
 
 void HistoryInner::showStickerPackInfo(not_null<DocumentData*> document) {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 4edbefdb7..74ae2dc45 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -4321,7 +4321,7 @@ bool HistoryWidget::confirmSendingFiles(
 	}
 
 	if (hasImage) {
-		auto image = Platform::GetClipboardImage();
+		auto image = Platform::GetImageFromClipboard();
 		if (image.isNull()) {
 			image = qvariant_cast<QImage>(data->imageData());
 		}
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 815805c1b..961efe7d9 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -39,7 +39,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_scheduled_messages.h"
 #include "core/file_utilities.h"
 #include "base/platform/base_platform_info.h"
-#include "platform/platform_specific.h"
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
 #include "lang/lang_keys.h"
@@ -126,9 +125,7 @@ void CopyImage(not_null<PhotoData*> photo) {
 	}
 
 	const auto image = media->image(Data::PhotoSize::Large)->original();
-	if (!Platform::SetClipboardImage(image)) {
-		QGuiApplication::clipboard()->setImage(image);
-	}
+	QGuiApplication::clipboard()->setImage(image);
 }
 
 void ShowStickerPackInfo(
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 2551912cf..1787f399b 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -603,7 +603,7 @@ bool RepliesWidget::confirmSendingFiles(
 	}
 
 	if (hasImage) {
-		auto image = Platform::GetClipboardImage();
+		auto image = Platform::GetImageFromClipboard();
 		if (image.isNull()) {
 			image = qvariant_cast<QImage>(data->imageData());
 		}
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 48098ec80..484fbd69b 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -335,7 +335,7 @@ bool ScheduledWidget::confirmSendingFiles(
 	}
 
 	if (hasImage) {
-		auto image = Platform::GetClipboardImage();
+		auto image = Platform::GetImageFromClipboard();
 		if (image.isNull()) {
 			image = qvariant_cast<QImage>(data->imageData());
 		}
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 73615c240..31dcd584a 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -50,7 +50,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_peer_menu.h"
 #include "window/window_session_controller.h"
 #include "window/window_controller.h"
-#include "platform/platform_specific.h"
 #include "base/platform/base_platform_info.h"
 #include "base/unixtime.h"
 #include "main/main_account.h"
@@ -1645,18 +1644,13 @@ void OverlayWidget::onOverview() {
 void OverlayWidget::onCopy() {
 	_dropdown->hideAnimated(Ui::DropdownMenu::HideOption::IgnoreShow);
 	if (_document) {
-		const auto image = videoShown()
+		QGuiApplication::clipboard()->setImage(videoShown()
 			? transformVideoFrame(videoFrame())
-			: transformStaticContent(_staticContent);
-		if (!Platform::SetClipboardImage(image)) {
-			QGuiApplication::clipboard()->setImage(image);
-		}
+			: transformStaticContent(_staticContent));
 	} else if (_photo && _photoMedia->loaded()) {
 		const auto image = _photoMedia->image(
 			Data::PhotoSize::Large)->original();
-		if (!Platform::SetClipboardImage(image)) {
-			QGuiApplication::clipboard()->setImage(image);
-		}
+		QGuiApplication::clipboard()->setImage(image);
 	}
 }
 
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.cpp b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
index ed09f1bed..244c99616 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.cpp
@@ -77,6 +77,10 @@ bool setupGtkBase(QLibrary &lib_gtk) {
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_widget_get_type", gtk_widget_get_type)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_clipboard_get", gtk_clipboard_get)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_clipboard_store", gtk_clipboard_store)) return false;
+	if (!LOAD_SYMBOL(lib_gtk, "gtk_clipboard_wait_for_contents", gtk_clipboard_wait_for_contents)) return false;
+	if (!LOAD_SYMBOL(lib_gtk, "gtk_clipboard_wait_for_image", gtk_clipboard_wait_for_image)) return false;
+	if (!LOAD_SYMBOL(lib_gtk, "gtk_selection_data_targets_include_image", gtk_selection_data_targets_include_image)) return false;
+	if (!LOAD_SYMBOL(lib_gtk, "gtk_selection_data_free", gtk_selection_data_free)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_file_chooser_dialog_new", gtk_file_chooser_dialog_new)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_file_chooser_get_type", gtk_file_chooser_get_type)) return false;
 	if (!LOAD_SYMBOL(lib_gtk, "gtk_image_get_type", gtk_image_get_type)) return false;
@@ -235,7 +239,6 @@ f_gtk_widget_destroy gtk_widget_destroy = nullptr;
 f_gtk_widget_get_type gtk_widget_get_type = nullptr;
 f_gtk_clipboard_get gtk_clipboard_get = nullptr;
 f_gtk_clipboard_store gtk_clipboard_store = nullptr;
-f_gtk_clipboard_set_image gtk_clipboard_set_image = nullptr;
 f_gtk_clipboard_wait_for_contents gtk_clipboard_wait_for_contents = nullptr;
 f_gtk_clipboard_wait_for_image gtk_clipboard_wait_for_image = nullptr;
 f_gtk_selection_data_targets_include_image gtk_selection_data_targets_include_image = nullptr;
@@ -278,7 +281,6 @@ f_gdk_window_focus gdk_window_focus = nullptr;
 f_gtk_dialog_get_type gtk_dialog_get_type = nullptr;
 f_gtk_dialog_run gtk_dialog_run = nullptr;
 f_gdk_atom_intern gdk_atom_intern = nullptr;
-f_gdk_pixbuf_new_from_data gdk_pixbuf_new_from_data = nullptr;
 f_gdk_pixbuf_new_from_file_at_size gdk_pixbuf_new_from_file_at_size = nullptr;
 f_gdk_pixbuf_get_has_alpha gdk_pixbuf_get_has_alpha = nullptr;
 f_gdk_pixbuf_get_pixels gdk_pixbuf_get_pixels = nullptr;
@@ -318,7 +320,6 @@ void start() {
 	}
 
 	if (gtkLoaded) {
-		LOAD_SYMBOL(lib_gtk, "gdk_pixbuf_new_from_data", gdk_pixbuf_new_from_data);
 		LOAD_SYMBOL(lib_gtk, "gdk_pixbuf_new_from_file_at_size", gdk_pixbuf_new_from_file_at_size);
 		LOAD_SYMBOL(lib_gtk, "gdk_pixbuf_get_has_alpha", gdk_pixbuf_get_has_alpha);
 		LOAD_SYMBOL(lib_gtk, "gdk_pixbuf_get_pixels", gdk_pixbuf_get_pixels);
@@ -328,12 +329,6 @@ void start() {
 
 		internal::GdkHelperLoad(lib_gtk);
 
-		LOAD_SYMBOL(lib_gtk, "gtk_clipboard_set_image", gtk_clipboard_set_image);
-		LOAD_SYMBOL(lib_gtk, "gtk_clipboard_wait_for_contents", gtk_clipboard_wait_for_contents);
-		LOAD_SYMBOL(lib_gtk, "gtk_clipboard_wait_for_image", gtk_clipboard_wait_for_image);
-		LOAD_SYMBOL(lib_gtk, "gtk_selection_data_targets_include_image", gtk_selection_data_targets_include_image);
-		LOAD_SYMBOL(lib_gtk, "gtk_selection_data_free", gtk_selection_data_free);
-
 		LOAD_SYMBOL(lib_gtk, "gtk_dialog_get_widget_for_response", gtk_dialog_get_widget_for_response);
 		LOAD_SYMBOL(lib_gtk, "gtk_button_set_label", gtk_button_set_label);
 		LOAD_SYMBOL(lib_gtk, "gtk_button_get_type", gtk_button_get_type);
diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h
index 543019b7d..fa651615d 100644
--- a/Telegram/SourceFiles/platform/linux/linux_libs.h
+++ b/Telegram/SourceFiles/platform/linux/linux_libs.h
@@ -88,9 +88,6 @@ extern f_gtk_clipboard_get gtk_clipboard_get;
 typedef void (*f_gtk_clipboard_store)(::GtkClipboard *clipboard);
 extern f_gtk_clipboard_store gtk_clipboard_store;
 
-typedef void (*f_gtk_clipboard_set_image)(::GtkClipboard *clipboard, GdkPixbuf *pixbuf);
-extern f_gtk_clipboard_set_image gtk_clipboard_set_image;
-
 typedef GtkSelectionData* (*f_gtk_clipboard_wait_for_contents)(::GtkClipboard *clipboard, GdkAtom target);
 extern f_gtk_clipboard_wait_for_contents gtk_clipboard_wait_for_contents;
 
@@ -271,9 +268,6 @@ extern f_gtk_dialog_run gtk_dialog_run;
 typedef GdkAtom (*f_gdk_atom_intern)(const gchar *atom_name, gboolean only_if_exists);
 extern f_gdk_atom_intern gdk_atom_intern;
 
-typedef GdkPixbuf* (*f_gdk_pixbuf_new_from_data)(const guchar *data, GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height, int rowstride, GdkPixbufDestroyNotify destroy_fn, gpointer destroy_fn_data);
-extern f_gdk_pixbuf_new_from_data gdk_pixbuf_new_from_data;
-
 typedef GdkPixbuf* (*f_gdk_pixbuf_new_from_file_at_size)(const gchar *filename, int width, int height, GError **error);
 extern f_gdk_pixbuf_new_from_file_at_size gdk_pixbuf_new_from_file_at_size;
 
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 7897e7ec1..6f79a9a8c 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -325,7 +325,7 @@ bool GenerateDesktopFile(
 }
 
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
-bool GetClipboardImageSupported() {
+bool GetImageFromClipboardSupported() {
 	return (Libs::gtk_clipboard_wait_for_contents != nullptr)
 		&& (Libs::gtk_clipboard_wait_for_image != nullptr)
 		&& (Libs::gtk_selection_data_targets_include_image != nullptr)
@@ -337,11 +337,6 @@ bool GetClipboardImageSupported() {
 		&& (Libs::gdk_pixbuf_get_has_alpha != nullptr)
 		&& (Libs::gdk_atom_intern != nullptr);
 }
-
-bool SetClipboardImageSupported() {
-	return (Libs::gtk_clipboard_set_image != nullptr)
-		&& (Libs::gdk_pixbuf_new_from_data != nullptr);
-}
 #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
 
 uint XCBMoveResizeFromEdges(Qt::Edges edges) {
@@ -734,11 +729,11 @@ QString GetIconName() {
 	return Result;
 }
 
-QImage GetClipboardImage() {
+QImage GetImageFromClipboard() {
 	QImage data;
 
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
-	if (!GetClipboardImageSupported() || !Libs::GtkClipboard()) {
+	if (!GetImageFromClipboardSupported() || !Libs::GtkClipboard()) {
 		return data;
 	}
 
@@ -772,57 +767,6 @@ QImage GetClipboardImage() {
 	return data;
 }
 
-bool SetClipboardImage(const QImage &image) {
-#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
-	if (!SetClipboardImageSupported()
-		|| !Libs::GtkClipboard()
-		|| image.isNull()) {
-		return false;
-	}
-
-	const auto convertedImage = [&] {
-		if (image.hasAlphaChannel()) {
-			if (image.format() != QImage::Format_RGBA8888) {
-				return image.convertToFormat(QImage::Format_RGBA8888);
-			}
-		} else {
-			if (image.format() != QImage::Format_RGB888) {
-				return image.convertToFormat(QImage::Format_RGB888);
-			}
-		}
-		return image;
-	}();
-
-	auto imageBuf = reinterpret_cast<guchar*>(
-		malloc(convertedImage.sizeInBytes()));
-
-	memcpy(
-		imageBuf,
-		convertedImage.constBits(),
-		convertedImage.sizeInBytes());
-
-	auto imagePixbuf = Libs::gdk_pixbuf_new_from_data(
-		imageBuf,
-		GDK_COLORSPACE_RGB,
-		convertedImage.hasAlphaChannel(),
-		8,
-		convertedImage.width(),
-		convertedImage.height(),
-		convertedImage.bytesPerLine(),
-		[](guchar *pixels, gpointer data) {
-			free(pixels);
-		},
-		nullptr);
-
-	Libs::gtk_clipboard_set_image(Libs::GtkClipboard(), imagePixbuf);
-	g_object_unref(imagePixbuf);
-
-	return true;
-#else // !TDESKTOP_DISABLE_GTK_INTEGRATION
-	return false;
-#endif // TDESKTOP_DISABLE_GTK_INTEGRATION
-}
-
 std::optional<bool> IsDarkMode() {
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
 	if (Libs::GtkSettingSupported() && Libs::GtkLoaded()) {
diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h
index 5ad6335fb..00b0bb44c 100644
--- a/Telegram/SourceFiles/platform/mac/specific_mac.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.h
@@ -18,14 +18,10 @@ namespace Platform {
 
 [[nodiscard]] bool IsDarkMenuBar();
 
-inline QImage GetClipboardImage() {
+inline QImage GetImageFromClipboard() {
 	return {};
 }
 
-inline bool SetClipboardImage(const QImage &image) {
-	return false;
-}
-
 inline bool StartSystemMove(QWindow *window) {
 	return false;
 }
diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h
index 71cb05b67..45fafaefa 100644
--- a/Telegram/SourceFiles/platform/platform_specific.h
+++ b/Telegram/SourceFiles/platform/platform_specific.h
@@ -41,8 +41,7 @@ void IgnoreApplicationActivationRightNow();
 bool AutostartSupported();
 bool TrayIconSupported();
 bool SkipTaskbarSupported();
-QImage GetClipboardImage();
-bool SetClipboardImage(const QImage &image);
+QImage GetImageFromClipboard();
 bool StartSystemMove(QWindow *window);
 bool StartSystemResize(QWindow *window, Qt::Edges edges);
 bool ShowWindowMenu(QWindow *window);
diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h
index 98fd7adc2..c5fa006a5 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.h
+++ b/Telegram/SourceFiles/platform/win/specific_win.h
@@ -22,14 +22,10 @@ inline void SetWatchingMediaKeys(bool watching) {
 inline void IgnoreApplicationActivationRightNow() {
 }
 
-inline QImage GetClipboardImage() {
+inline QImage GetImageFromClipboard() {
 	return {};
 }
 
-inline bool SetClipboardImage(const QImage &image) {
-	return false;
-}
-
 inline bool StartSystemMove(QWindow *window) {
 	return false;
 }

From 4b31b4792aa51b72af28ff5490767e3a9ffbc888 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Dec 2020 11:58:00 +0400
Subject: [PATCH 283/370] Restore call window from minimized on bar click.

---
 Telegram/SourceFiles/calls/calls_group_panel.cpp | 5 ++++-
 Telegram/SourceFiles/calls/calls_panel.cpp       | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 9508d592b..d2486af57 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -251,8 +251,11 @@ void GroupPanel::showAndActivate() {
 	if (_window->isHidden()) {
 		_window->show();
 	}
+	const auto state = _window->windowState();
+	if (state & Qt::WindowMinimized) {
+		_window->setWindowState(state & ~Qt::WindowMinimized);
+	}
 	_window->raise();
-	_window->setWindowState(_window->windowState() | Qt::WindowActive);
 	_window->activateWindow();
 	_window->setFocus();
 }
diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index 1c862f859..cca21afcb 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -209,8 +209,14 @@ bool Panel::isActive() const {
 }
 
 void Panel::showAndActivate() {
+	if (_window->isHidden()) {
+		_window->show();
+	}
+	const auto state = _window->windowState();
+	if (state & Qt::WindowMinimized) {
+		_window->setWindowState(state & ~Qt::WindowMinimized);
+	}
 	_window->raise();
-	_window->setWindowState(_window->windowState() | Qt::WindowActive);
 	_window->activateWindow();
 	_window->setFocus();
 }

From 49b8340695ff0b184e830a844458688692db54ff Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Dec 2020 14:20:17 +0400
Subject: [PATCH 284/370] Fix top bar controls in chat view.

---
 .../history/view/history_view_top_bar_widget.cpp       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 6e612a293..3cc30b46a 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -664,9 +664,11 @@ void TopBarWidget::updateControlsGeometry() {
 	if (!_infoToggle->isHidden()) {
 		_rightTaken += _infoToggle->width() + st::topBarSkip;
 	}
-	_call->moveToRight(_rightTaken, otherButtonsTop);
-	_groupCall->moveToRight(_rightTaken, otherButtonsTop);
-	_rightTaken += _call->width();
+	if (!_call->isHidden() || !_groupCall->isHidden()) {
+		_call->moveToRight(_rightTaken, otherButtonsTop);
+		_groupCall->moveToRight(_rightTaken, otherButtonsTop);
+		_rightTaken += _call->width();
+	}
 	_search->moveToRight(_rightTaken, otherButtonsTop);
 	_rightTaken += _search->width() + st::topBarCallSkip;
 
@@ -726,7 +728,7 @@ void TopBarWidget::updateControlsVisibility() {
 	const auto callsEnabled = [&] {
 		if (const auto peer = _activeChat.key.peer()) {
 			if (const auto user = peer->asUser()) {
-				return true;
+				return !user->isSelf() && !user->isBot();
 			}
 		}
 		return false;

From 424ba1dbeaea6ed8fc40bab82a47434e120035ca Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Dec 2020 15:04:34 +0400
Subject: [PATCH 285/370] Track speaking state in non-joined voice chats.

---
 Telegram/SourceFiles/api/api_updates.cpp      |  67 ++++--
 Telegram/SourceFiles/api/api_updates.h        |   3 +
 .../SourceFiles/calls/calls_group_call.cpp    |  11 +-
 Telegram/SourceFiles/calls/calls_top_bar.cpp  |  63 +++++-
 Telegram/SourceFiles/calls/calls_top_bar.h    |   4 +
 Telegram/SourceFiles/data/data_group_call.cpp | 194 ++++++++++++++++--
 Telegram/SourceFiles/data/data_group_call.h   |  16 +-
 .../view/history_view_group_call_tracker.cpp  |  58 +++++-
 .../view/history_view_group_call_tracker.h    |   1 +
 .../SourceFiles/ui/chat/group_call_bar.cpp    |  22 +-
 Telegram/SourceFiles/ui/chat/group_call_bar.h |   8 +-
 11 files changed, 386 insertions(+), 61 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index ca1c6f3cc..54ca13e7f 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel.h"
 #include "data/data_chat_filters.h"
 #include "data/data_cloud_themes.h"
+#include "data/data_group_call.h"
 #include "data/data_drafts.h"
 #include "data/data_histories.h"
 #include "data/data_folder.h"
@@ -232,6 +233,26 @@ Updates::Updates(not_null<Main::Session*> session)
 	)).done([=](const MTPupdates_State &result) {
 		stateDone(result);
 	}).send();
+
+	using namespace rpl::mappers;
+	base::ObservableViewer(
+		api().fullPeerUpdated()
+	) | rpl::map([=](not_null<PeerData*> peer) {
+		return peer->asChannel();
+	}) | rpl::filter(
+		_1 != nullptr
+	) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
+		if (const auto users = _pendingSpeakingCallMembers.take(channel)) {
+			if (const auto call = channel->call()) {
+				for (const auto [userId, when] : *users) {
+					call->applyActiveUpdate(
+						userId,
+						when,
+						channel->owner().userLoaded(userId));
+				}
+			}
+		}
+	}, _lifetime);
 }
 
 Main::Session &Updates::session() const {
@@ -1616,20 +1637,38 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		const auto &d = update.c_updateChannelUserTyping();
 		const auto history = session().data().historyLoaded(
 			peerFromChannel(d.vchannel_id()));
-		const auto user = (d.vuser_id().v == session().userId())
-			? nullptr
-			: session().data().userLoaded(d.vuser_id().v);
-		if (history && user) {
-			const auto when = requestingDifference()
-				? 0
-				: base::unixtime::now();
-			const auto rootId = d.vtop_msg_id().value_or_empty();
-			session().data().registerSendAction(
-				history,
-				rootId,
-				user,
-				d.vaction(),
-				when);
+		if (history) {
+			const auto userId = d.vuser_id().v;
+			const auto user = (userId == session().userId())
+				? session().user().get()
+				: session().data().userLoaded(userId);
+			const auto isSpeakingInCall = (d.vaction().type()
+				== mtpc_speakingInGroupCallAction);
+			if (isSpeakingInCall) {
+				const auto channel = history->peer->asChannel();
+				const auto call = channel->call();
+				const auto now = crl::now();
+				if (call) {
+					call->applyActiveUpdate(userId, now, user);
+				} else if (channel->flags()
+					& MTPDchannel::Flag::f_call_active) {
+					_pendingSpeakingCallMembers.emplace(
+						channel).first->second[userId] = now;
+					session().api().requestFullPeer(channel);
+				}
+			}
+			if (user && !user->isSelf()) {
+				const auto when = requestingDifference()
+					? 0
+					: base::unixtime::now();
+				const auto rootId = d.vtop_msg_id().value_or_empty();
+				session().data().registerSendAction(
+					history,
+					rootId,
+					user,
+					d.vaction(),
+					when);
+			}
 		}
 	} break;
 
diff --git a/Telegram/SourceFiles/api/api_updates.h b/Telegram/SourceFiles/api/api_updates.h
index b65744f51..dac0cf9c1 100644
--- a/Telegram/SourceFiles/api/api_updates.h
+++ b/Telegram/SourceFiles/api/api_updates.h
@@ -160,6 +160,9 @@ private:
 	bool _handlingChannelDifference = false;
 
 	base::flat_map<int, ActiveChatTracker> _activeChats;
+	base::flat_map<
+		not_null<ChannelData*>,
+		base::flat_map<UserId, crl::time>> _pendingSpeakingCallMembers;
 
 	mtpRequestId _onlineRequest = 0;
 	base::Timer _idleFinishTimer;
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 466dae4bf..4407b0582 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -108,9 +108,14 @@ void GroupCall::setState(State state) {
 	}
 	_state = state;
 
-	if (_state.current() == State::Joined && !_pushToTalkStarted) {
-		_pushToTalkStarted = true;
-		applyGlobalShortcutChanges();
+	if (_state.current() == State::Joined) {
+		if (!_pushToTalkStarted) {
+			_pushToTalkStarted = true;
+			applyGlobalShortcutChanges();
+		}
+		if (const auto call = _channel->call(); call && call->id() == _id) {
+			call->setInCall();
+		}
 	}
 
 	if (false
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 7234e03c2..0d2b14ecb 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -36,6 +36,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Calls {
 namespace {
 
+constexpr auto kMaxUsersInBar = 3;
 constexpr auto kUpdateDebugTimeoutMs = crl::time(500);
 constexpr auto kSwitchStateDuration = 120;
 
@@ -139,6 +140,10 @@ void DebugInfoBox::updateText() {
 
 } // namespace
 
+struct TopBar::User {
+	Ui::GroupCallBarContent::User data;
+};
+
 class Mute final : public Ui::IconButton {
 public:
 	Mute(QWidget *parent, const style::IconButton &st)
@@ -521,16 +526,66 @@ void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
 				.stroke = st::groupCallTopBarUserpicStroke,
 			});
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](const Ui::GroupCallBarContent &content) {
-		const auto changed = (_userpics.size() != content.userpics.size());
-		_userpics = content.userpics;
-		if (changed) {
+	) | rpl::filter([=](const Ui::GroupCallBarContent &content) {
+		if (_users.size() != content.users.size()) {
+			return true;
+		}
+		for (auto i = 0, count = int(_users.size()); i != count; ++i) {
+			if (_users[i].data.userpicKey != content.users[i].userpicKey
+				|| _users[i].data.id != content.users[i].id) {
+				return true;
+			}
+		}
+		return false;
+	}) | rpl::start_with_next([=](const Ui::GroupCallBarContent &content) {
+		const auto sizeChanged = (_users.size() != content.users.size());
+		_users = ranges::view::all(
+			content.users
+		) | ranges::view::transform([](const auto &user) {
+			return User{ user };
+		}) | ranges::to_vector;
+		generateUserpicsInRow();
+		if (sizeChanged) {
 			updateControlsGeometry();
 		}
 		update();
 	}, lifetime());
 }
 
+void TopBar::generateUserpicsInRow() {
+	const auto count = int(_users.size());
+	if (!count) {
+		_userpics = QImage();
+		return;
+	}
+	const auto limit = std::min(count, kMaxUsersInBar);
+	const auto single = st::groupCallTopBarUserpicSize;
+	const auto shift = st::groupCallTopBarUserpicShift;
+	const auto width = single + (limit - 1) * (single - shift);
+	if (_userpics.width() != width * cIntRetinaFactor()) {
+		_userpics = QImage(
+			QSize(width, single) * cIntRetinaFactor(),
+			QImage::Format_ARGB32_Premultiplied);
+	}
+	_userpics.fill(Qt::transparent);
+	_userpics.setDevicePixelRatio(cRetinaFactor());
+
+	auto q = Painter(&_userpics);
+	auto hq = PainterHighQualityEnabler(q);
+	auto pen = QPen(Qt::transparent);
+	pen.setWidth(st::groupCallTopBarUserpicStroke);
+	auto x = (count - 1) * (single - shift);
+	for (auto i = count; i != 0;) {
+		q.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		q.drawImage(x, 0, _users[--i].data.userpic);
+		q.setCompositionMode(QPainter::CompositionMode_Source);
+		q.setBrush(Qt::NoBrush);
+		q.setPen(pen);
+		q.drawEllipse(x, 0, single, single);
+		x -= single - shift;
+	}
+}
+
 void TopBar::updateInfoLabels() {
 	setInfoLabels();
 	updateControlsGeometry();
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.h b/Telegram/SourceFiles/calls/calls_top_bar.h
index a87eb14f6..6ea44da8f 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.h
+++ b/Telegram/SourceFiles/calls/calls_top_bar.h
@@ -49,6 +49,8 @@ protected:
 	void paintEvent(QPaintEvent *e) override;
 
 private:
+	struct User;
+
 	TopBar(
 		QWidget *parent,
 		const base::weak_ptr<Call> &call,
@@ -63,11 +65,13 @@ private:
 	void setMuted(bool mute);
 
 	void subscribeToMembersChanges(not_null<GroupCall*> call);
+	void generateUserpicsInRow();
 
 	const base::weak_ptr<Call> _call;
 	const base::weak_ptr<GroupCall> _groupCall;
 
 	bool _muted = false;
+	std::vector<User> _users;
 	QImage _userpics;
 	object_ptr<Ui::LabelSimple> _durationLabel;
 	object_ptr<SignalBars> _signalBars;
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index 6e0381331..3161b1c60 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -7,16 +7,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_group_call.h"
 
+#include "base/unixtime.h"
 #include "data/data_channel.h"
 #include "data/data_changes.h"
 #include "data/data_session.h"
 #include "main/main_session.h"
+#include "calls/calls_instance.h"
+#include "calls/calls_group_call.h"
+#include "core/application.h"
 #include "apiwrap.h"
 
 namespace Data {
 namespace {
 
 constexpr auto kRequestPerPage = 30;
+constexpr auto kSpeakingAfterActive = crl::time(6000);
+constexpr auto kActiveAfterJoined = crl::time(1000);
 
 } // namespace
 
@@ -26,11 +32,12 @@ GroupCall::GroupCall(
 	uint64 accessHash)
 : _channel(channel)
 , _id(id)
-, _accessHash(accessHash) {
+, _accessHash(accessHash)
+, _speakingByActiveFinishTimer([=] { checkFinishSpeakingByActive(); }) {
 }
 
 GroupCall::~GroupCall() {
-	api().request(_unknownSsrcsRequestId).cancel();
+	api().request(_unknownUsersRequestId).cancel();
 	api().request(_participantsRequestId).cancel();
 	api().request(_reloadRequestId).cancel();
 }
@@ -184,6 +191,7 @@ void GroupCall::reload() {
 		result.match([&](const MTPDphone_groupCall &data) {
 			_channel->owner().processUsers(data.vusers());
 			_participants.clear();
+			_speakingByActiveFinishes.clear();
 			_userBySsrc.clear();
 			applyParticipantsSlice(
 				data.vparticipants().v,
@@ -201,6 +209,10 @@ void GroupCall::reload() {
 void GroupCall::applyParticipantsSlice(
 		const QVector<MTPGroupCallParticipant> &list,
 		ApplySliceSource sliceSource) {
+	const auto amInCall = inCall();
+	const auto now = base::unixtime::now();
+	const auto speakingAfterActive = TimeId(kSpeakingAfterActive / 1000);
+
 	auto changedCount = _fullCount.current();
 	for (const auto &participant : list) {
 		participant.match([&](const MTPDgroupCallParticipant &data) {
@@ -216,6 +228,7 @@ void GroupCall::applyParticipantsSlice(
 						.was = *i,
 					};
 					_userBySsrc.erase(i->ssrc);
+					_speakingByActiveFinishes.remove(user);
 					_participants.erase(i);
 					if (sliceSource != ApplySliceSource::SliceLoaded) {
 						_participantUpdates.fire(std::move(update));
@@ -231,10 +244,16 @@ void GroupCall::applyParticipantsSlice(
 				: std::nullopt;
 			const auto canSelfUnmute = !data.is_muted()
 				|| data.is_can_self_unmute();
+			const auto lastActive = data.vactive_date().value_or(
+				was ? was->lastActive : 0);
+			const auto speaking = canSelfUnmute
+				&& ((was ? was->speaking : false)
+					|| (!amInCall
+						&& (lastActive + speakingAfterActive > now)));
 			const auto value = Participant{
 				.user = user,
 				.date = data.vdate().v,
-				.lastActive = was ? was->lastActive : 0,
+				.lastActive = lastActive,
 				.ssrc = uint32(data.vsource().v),
 				.speaking = canSelfUnmute && (was ? was->speaking : false),
 				.muted = data.is_muted(),
@@ -285,6 +304,7 @@ void GroupCall::applyParticipantsMutes(
 				i->canSelfUnmute = !i->muted || data.is_can_self_unmute();
 				if (!i->canSelfUnmute) {
 					i->speaking = false;
+					_speakingByActiveFinishes.remove(i->user);
 				}
 				_participantUpdates.fire({
 					.was = was,
@@ -298,13 +318,14 @@ void GroupCall::applyParticipantsMutes(
 void GroupCall::applyLastSpoke(uint32 ssrc, crl::time when, crl::time now) {
 	const auto i = _userBySsrc.find(ssrc);
 	if (i == end(_userBySsrc)) {
-		_unknownSpokenSsrcs.emplace(ssrc, when);
-		requestUnknownSsrcs();
+		_unknownSpokenSsrcs[ssrc] = when;
+		requestUnknownParticipants();
 		return;
 	}
 	const auto j = ranges::find(_participants, i->second, &Participant::user);
 	Assert(j != end(_participants));
 
+	_speakingByActiveFinishes.remove(j->user);
 	const auto speaking = (when + kSpeakStatusKeptFor >= now)
 		&& j->canSelfUnmute;
 	if (j->speaking != speaking) {
@@ -317,8 +338,85 @@ void GroupCall::applyLastSpoke(uint32 ssrc, crl::time when, crl::time now) {
 	}
 }
 
-void GroupCall::requestUnknownSsrcs() {
-	if (_unknownSsrcsRequestId || _unknownSpokenSsrcs.empty()) {
+void GroupCall::applyActiveUpdate(
+		UserId userId,
+		crl::time when,
+		UserData *userLoaded) {
+	if (inCall()) {
+		return;
+	}
+	const auto i = userLoaded
+		? ranges::find(
+			_participants,
+			not_null{ userLoaded },
+			&Participant::user)
+		: _participants.end();
+	if (i == end(_participants)) {
+		_unknownSpokenUids[userId] = when;
+		requestUnknownParticipants();
+		return;
+	} else if (!i->canSelfUnmute) {
+		return;
+	}
+	const auto was = std::make_optional(*i);
+	const auto now = crl::now();
+	const auto elapsed = TimeId((now - when) / crl::time(1000));
+	const auto lastActive = base::unixtime::now() - elapsed;
+	const auto finishes = when + kSpeakingAfterActive;
+	if (lastActive <= i->lastActive || finishes <= now) {
+		return;
+	}
+	_speakingByActiveFinishes[i->user] = finishes;
+	if (!_speakingByActiveFinishTimer.isActive()) {
+		_speakingByActiveFinishTimer.callOnce(finishes - now);
+	}
+
+	i->lastActive = lastActive;
+	i->speaking = true;
+	i->canSelfUnmute = true;
+	if (!was->speaking || !was->canSelfUnmute) {
+		_participantUpdates.fire({
+			.was = was,
+			.now = *i,
+		});
+	}
+}
+
+void GroupCall::checkFinishSpeakingByActive() {
+	const auto now = crl::now();
+	auto nearest = 0;
+	auto stop = std::vector<not_null<UserData*>>();
+	for (auto i = begin(_speakingByActiveFinishes); i != end(_speakingByActiveFinishes);) {
+		const auto when = i->second;
+		if (now >= when) {
+			stop.push_back(i->first);
+			i = _speakingByActiveFinishes.erase(i);
+		} else {
+			if (!nearest || nearest > when) {
+				nearest = when;
+			}
+			++i;
+		}
+	}
+	for (const auto user : stop) {
+		const auto i = ranges::find(_participants, user, &Participant::user);
+		if (i->speaking) {
+			const auto was = *i;
+			i->speaking = false;
+			_participantUpdates.fire({
+				.was = was,
+				.now = *i,
+			});
+		}
+	}
+	if (nearest) {
+		_speakingByActiveFinishTimer.callOnce(nearest - now);
+	}
+}
+
+void GroupCall::requestUnknownParticipants() {
+	if (_unknownUsersRequestId
+		|| (_unknownSpokenSsrcs.empty() && _unknownSpokenUids.empty())) {
 		return;
 	}
 	const auto ssrcs = [&] {
@@ -334,15 +432,36 @@ void GroupCall::requestUnknownSsrcs() {
 		}
 		return result;
 	}();
-	auto inputs = QVector<MTPint>();
-	inputs.reserve(ssrcs.size());
+	const auto uids = [&] {
+		if (_unknownSpokenUids.size() + ssrcs.size() < kRequestPerPage) {
+			return base::take(_unknownSpokenUids);
+		}
+		auto result = base::flat_map<UserId, crl::time>();
+		const auto available = (kRequestPerPage - int(ssrcs.size()));
+		if (available > 0) {
+			result.reserve(available);
+			while (result.size() < available) {
+				const auto [userId, when] = _unknownSpokenUids.back();
+				result.emplace(userId, when);
+				_unknownSpokenUids.erase(_unknownSpokenUids.end() - 1);
+			}
+		}
+		return result;
+	}();
+	auto ssrcInputs = QVector<MTPint>();
+	ssrcInputs.reserve(ssrcs.size());
 	for (const auto [ssrc, when] : ssrcs) {
-		inputs.push_back(MTP_int(ssrc));
+		ssrcInputs.push_back(MTP_int(ssrc));
 	}
-	_unknownSsrcsRequestId = api().request(MTPphone_GetGroupParticipants(
+	auto uidInputs = QVector<MTPint>();
+	uidInputs.reserve(uids.size());
+	for (const auto [userId, when] : uids) {
+		uidInputs.push_back(MTP_int(userId));
+	}
+	_unknownUsersRequestId = api().request(MTPphone_GetGroupParticipants(
 		input(),
-		MTP_vector<MTPint>(), // ids
-		MTP_vector<MTPint>(inputs),
+		MTP_vector<MTPint>(uidInputs),
+		MTP_vector<MTPint>(ssrcInputs),
 		MTP_string(QString()),
 		MTP_int(kRequestPerPage)
 	)).done([=](const MTPphone_GroupParticipants &result) {
@@ -352,22 +471,63 @@ void GroupCall::requestUnknownSsrcs() {
 				data.vparticipants().v,
 				ApplySliceSource::UnknownLoaded);
 		});
-		_unknownSsrcsRequestId = 0;
+		_unknownUsersRequestId = 0;
 		const auto now = crl::now();
 		for (const auto [ssrc, when] : ssrcs) {
 			applyLastSpoke(ssrc, when, now);
 			_unknownSpokenSsrcs.remove(ssrc);
 		}
-		requestUnknownSsrcs();
+		for (const auto [userId, when] : uids) {
+			if (const auto user = _channel->owner().userLoaded(userId)) {
+				const auto isParticipant = ranges::contains(
+					_participants,
+					not_null{ user },
+					&Participant::user);
+				if (isParticipant) {
+					applyActiveUpdate(userId, when, user);
+				}
+			}
+			_unknownSpokenUids.remove(userId);
+		}
+		requestUnknownParticipants();
 	}).fail([=](const RPCError &error) {
-		_unknownSsrcsRequestId = 0;
+		_unknownUsersRequestId = 0;
 		for (const auto [ssrc, when] : ssrcs) {
 			_unknownSpokenSsrcs.remove(ssrc);
 		}
-		requestUnknownSsrcs();
+		for (const auto [userId, when] : uids) {
+			_unknownSpokenUids.remove(userId);
+		}
+		requestUnknownParticipants();
 	}).send();
 }
 
+void GroupCall::setInCall() {
+	_unknownSpokenUids.clear();
+	if (_speakingByActiveFinishes.empty()) {
+		return;
+	}
+	auto restartTimer = true;
+	const auto latest = crl::now() + kActiveAfterJoined;
+	for (auto &[user, when] : _speakingByActiveFinishes) {
+		if (when > latest) {
+			when = latest;
+		} else {
+			restartTimer = false;
+		}
+	}
+	if (restartTimer) {
+		_speakingByActiveFinishTimer.callOnce(kActiveAfterJoined);
+	}
+}
+
+bool GroupCall::inCall() const {
+	const auto current = Core::App().calls().currentGroupCall();
+	return (current != nullptr)
+		&& (current->id() == _id)
+		&& (current->state() == Calls::GroupCall::State::Joined);
+}
+
 void GroupCall::applyUpdate(const MTPDupdateGroupCallParticipants &update) {
 	const auto version = update.vversion().v;
 	if (version < _version) {
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 947fed4d9..418720c2d 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/timer.h"
+
 class UserData;
 class ChannelData;
 
@@ -53,10 +55,15 @@ public:
 	void applyUpdateChecked(
 		const MTPDupdateGroupCallParticipants &update);
 	void applyLastSpoke(uint32 ssrc, crl::time when, crl::time now);
+	void applyActiveUpdate(
+		UserId userId,
+		crl::time when,
+		UserData *userLoaded);
 
 	[[nodiscard]] int fullCount() const;
 	[[nodiscard]] rpl::producer<int> fullCountValue() const;
 
+	void setInCall();
 	void reload();
 
 	void setJoinMutedLocally(bool muted);
@@ -71,14 +78,16 @@ private:
 	};
 	[[nodiscard]] ApiWrap &api() const;
 
+	[[nodiscard]] bool inCall() const;
 	void applyCall(const MTPGroupCall &call, bool force);
 	void applyParticipantsSlice(
 		const QVector<MTPGroupCallParticipant> &list,
 		ApplySliceSource sliceSource);
 	void applyParticipantsMutes(
 		const MTPDupdateGroupCallParticipants &update);
-	void requestUnknownSsrcs();
+	void requestUnknownParticipants();
 	void changeChannelEmptyCallFlag();
+	void checkFinishSpeakingByActive();
 
 	const not_null<ChannelData*> _channel;
 	const uint64 _id = 0;
@@ -90,11 +99,14 @@ private:
 
 	std::vector<Participant> _participants;
 	base::flat_map<uint32, not_null<UserData*>> _userBySsrc;
+	base::flat_map<not_null<UserData*>, crl::time> _speakingByActiveFinishes;
+	base::Timer _speakingByActiveFinishTimer;
 	QString _nextOffset;
 	rpl::variable<int> _fullCount = 0;
 
 	base::flat_map<uint32, crl::time> _unknownSpokenSsrcs;
-	mtpRequestId _unknownSsrcsRequestId = 0;
+	base::flat_map<UserId, crl::time> _unknownSpokenUids;
+	mtpRequestId _unknownUsersRequestId = 0;
 
 	rpl::event_stream<ParticipantUpdate> _participantUpdates;
 	rpl::event_stream<> _participantsSliceAdded;
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
index 77a97d8ce..09a249e20 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
@@ -118,7 +118,10 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 		}
 		for (auto i = 0; i != kLimit - already; ++i) {
 			if (adding[i]) {
-				state->userpics.push_back(UserpicInRow{ adding[i]->user });
+				state->userpics.push_back(UserpicInRow{
+					.peer = adding[i]->user,
+					.speaking = adding[i]->speaking,
+				});
 			}
 		}
 		return true;
@@ -133,12 +136,18 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 		if (!result) {
 			return false;
 		}
-		GenerateUserpicsInRow(
-			state->current.userpics,
-			state->userpics,
-			st);
+		state->current.users.reserve(state->userpics.size());
+		state->current.users.clear();
 		state->someUserpicsNotLoaded = false;
+		using User = Ui::GroupCallBarContent::User;
 		for (const auto &userpic : state->userpics) {
+			const auto pic = userpic.peer->genUserpic(userpic.view, st.size);
+			state->current.users.push_back({
+				.userpic = pic.toImage(),
+				.userpicKey = userpic.uniqueKey,
+				.id = userpic.peer->bareId(),
+				.speaking = userpic.speaking,
+			});
 			if (userpic.peer->hasUserpic()
 				&& userpic.peer->useEmptyUserpic(userpic.view)) {
 				state->someUserpicsNotLoaded = true;
@@ -172,12 +181,17 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 		Expects(state->userpics.size() <= kLimit);
 
 		const auto &participants = call->participants();
-		auto i = state->userpics.begin();
+		auto i = begin(state->userpics);
 
 		// Find where to put a new speaking userpic.
-		for (; i != state->userpics.end(); ++i) {
+		for (; i != end(state->userpics); ++i) {
 			if (i->peer == user) {
-				return false;
+				if (i->speaking) {
+					return false;
+				}
+				const auto index = i - begin(state->userpics);
+				state->current.users[index].speaking = i->speaking = true;
+				return true;
 			}
 			const auto j = ranges::find(
 				participants,
@@ -194,7 +208,10 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 		}
 
 		// Add the new speaking to the place we found.
-		const auto added = state->userpics.insert(i, UserpicInRow{ user });
+		const auto added = state->userpics.insert(i, UserpicInRow{
+			.peer = user,
+			.speaking = true,
+		});
 
 		// Remove him from the tail, if he was there.
 		for (auto i = added + 1; i != state->userpics.end(); ++i) {
@@ -252,8 +269,27 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 				if (CheckPushToFront(state, call, user, st)) {
 					pushNext();
 				}
-			} else if (RegenerateUserpics(state, call, st)) {
-				pushNext();
+			} else {
+				auto updateSpeakingState = update.was.has_value()
+					&& (update.now->speaking != update.was->speaking);
+				if (updateSpeakingState) {
+					const auto i = ranges::find(
+						state->userpics,
+						user,
+						&UserpicInRow::peer);
+					if (i != end(state->userpics)) {
+						const auto index = i - begin(state->userpics);
+						state->current.users[index].speaking
+							= i->speaking
+							= update.now->speaking;
+					} else {
+						updateSpeakingState = false;
+					}
+				}
+				if (RegenerateUserpics(state, call, st)
+					|| updateSpeakingState) {
+					pushNext();
+				}
 			}
 		}, lifetime);
 
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h
index e93cbf432..70ab0dc26 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h
@@ -22,6 +22,7 @@ namespace HistoryView {
 
 struct UserpicInRow {
 	not_null<PeerData*> peer;
+	bool speaking = false;
 	mutable std::shared_ptr<Data::CloudImageView> view;
 	mutable InMemoryKey uniqueKey;
 };
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
index d1bb247f7..78a011162 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -134,15 +134,19 @@ void GroupCallBar::paint(Painter &p) {
 			? tr::lng_group_call_members(tr::now, lt_count, _content.count)
 			: tr::lng_group_call_no_members(tr::now)));
 
-	if (!_content.userpics.isNull()) {
-		const auto imageSize = _content.userpics.size()
-			/ _content.userpics.devicePixelRatio();
-		// Skip shadow of the bar above.
-		const auto imageTop = (st::historyReplyHeight
-			- st::lineWidth
-			- imageSize.height()) / 2 + st::lineWidth;
-		const auto imageLeft = (_inner->width() - imageSize.width()) / 2;
-		p.drawImage(imageLeft, imageTop, _content.userpics);
+	const auto picsSize = _content.users.size() * st::historyGroupCallUserpicSize;
+	// Skip shadow of the bar above.
+	const auto imageTop = (st::historyReplyHeight
+		- st::lineWidth
+		- st::historyGroupCallUserpicSize) / 2 + st::lineWidth;
+	const auto picsLeft = (_inner->width() - picsSize) / 2;
+	auto imageLeft = picsLeft;
+	for (const auto &user : _content.users) {
+		if (user.speaking) {
+			p.fillRect(imageLeft, imageTop, st::historyGroupCallUserpicSize, st::historyGroupCallUserpicSize, QColor(255, 128, 128));
+		}
+		p.drawImage(imageLeft, imageTop, user.userpic);
+		imageLeft += st::historyGroupCallUserpicSize;
 	}
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.h b/Telegram/SourceFiles/ui/chat/group_call_bar.h
index 9fba26326..8f5acd56c 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.h
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.h
@@ -18,9 +18,15 @@ class PlainShadow;
 class RoundButton;
 
 struct GroupCallBarContent {
+	struct User {
+		QImage userpic;
+		std::pair<uint64, uint64> userpicKey = {};
+		int32 id = 0;
+		bool speaking = false;
+	};
 	int count = 0;
 	bool shown = false;
-	QImage userpics;
+	std::vector<User> users;
 };
 
 class GroupCallBar final {

From fe23ba086a9f2b0253ab62a72d72385ed6d60363 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Dec 2020 17:16:37 +0400
Subject: [PATCH 286/370] Animate userpics in join voice chat bar.

---
 .../view/history_view_group_call_tracker.cpp  |   3 +-
 .../SourceFiles/ui/chat/group_call_bar.cpp    | 217 +++++++++++++++++-
 Telegram/SourceFiles/ui/chat/group_call_bar.h |  24 ++
 3 files changed, 234 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
index 09a249e20..6718e5f19 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
@@ -140,8 +140,9 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 		state->current.users.clear();
 		state->someUserpicsNotLoaded = false;
 		using User = Ui::GroupCallBarContent::User;
-		for (const auto &userpic : state->userpics) {
+		for (auto &userpic : state->userpics) {
 			const auto pic = userpic.peer->genUserpic(userpic.view, st.size);
+			userpic.uniqueKey = userpic.peer->userpicUniqueKey(userpic.view);
 			state->current.users.push_back({
 				.userpic = pic.toImage(),
 				.userpicKey = userpic.uniqueKey,
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
index 78a011162..c7191d83a 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -19,6 +19,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QtEvents>
 
 namespace Ui {
+namespace {
+
+constexpr auto kDuration = 160;
+constexpr auto kMaxUserpics = 4;
+constexpr auto kWideScale = 5;
+
+} // namespace
 
 GroupCallBar::GroupCallBar(
 	not_null<QWidget*> parent,
@@ -33,6 +40,12 @@ GroupCallBar::GroupCallBar(
 	_wrap.hide(anim::type::instant);
 	_shadow->hide();
 
+	const auto limit = kMaxUserpics;
+	const auto single = st::historyGroupCallUserpicSize;
+	const auto shift = st::historyGroupCallUserpicShift;
+	// + 1 * single for the blobs.
+	_maxUserpicsWidth = 2 * single + (limit - 1) * (single - shift);
+
 	_wrap.entity()->paintRequest(
 	) | rpl::start_with_next([=](QRect clip) {
 		QPainter(_wrap.entity()).fillRect(clip, st::historyPinnedBg);
@@ -47,6 +60,7 @@ GroupCallBar::GroupCallBar(
 		copy
 	) | rpl::start_with_next([=](GroupCallBarContent &&content) {
 		_content = content;
+		updateUserpicsFromContent();
 		_inner->update();
 	}, lifetime());
 
@@ -134,19 +148,102 @@ void GroupCallBar::paint(Painter &p) {
 			? tr::lng_group_call_members(tr::now, lt_count, _content.count)
 			: tr::lng_group_call_no_members(tr::now)));
 
-	const auto picsSize = _content.users.size() * st::historyGroupCallUserpicSize;
 	// Skip shadow of the bar above.
-	const auto imageTop = (st::historyReplyHeight
+	paintUserpics(p);
+}
+
+void GroupCallBar::paintUserpics(Painter &p) {
+	const auto top = (st::historyReplyHeight
 		- st::lineWidth
 		- st::historyGroupCallUserpicSize) / 2 + st::lineWidth;
-	const auto picsLeft = (_inner->width() - picsSize) / 2;
-	auto imageLeft = picsLeft;
-	for (const auto &user : _content.users) {
-		if (user.speaking) {
-			p.fillRect(imageLeft, imageTop, st::historyGroupCallUserpicSize, st::historyGroupCallUserpicSize, QColor(255, 128, 128));
+	const auto middle = _inner->width()  / 2;
+	const auto size = st::historyGroupCallUserpicSize;
+	const auto factor = style::DevicePixelRatio();
+	for (auto &userpic : ranges::view::reverse(_userpics)) {
+		const auto shown = userpic.shownAnimation.value(
+			userpic.hiding ? 0. : 1.);
+		if (shown == 0.) {
+			continue;
+		}
+		validateUserpicCache(userpic);
+		p.setOpacity(shown);
+		const auto left = middle + userpic.leftAnimation.value(userpic.left);
+		if (userpic.data.speaking) {
+			//p.fillRect(left, top, size, size, QColor(255, 128, 128));
+		}
+		if (shown == 1.) {
+			const auto skip = ((kWideScale - 1) / 2) * size * factor;
+			p.drawImage(
+				QRect(left, top, size, size),
+				userpic.cache,
+				QRect(skip, skip, size * factor, size * factor));
+		} else {
+			const auto scale = 0.5 + shown / 2.;
+			auto target = QRect(
+				left + (1 - kWideScale) / 2 * size,
+				top + (1 - kWideScale) / 2 * size,
+				kWideScale * size,
+				kWideScale * size);
+			auto shrink = anim::interpolate(
+				(1 - kWideScale) / 2 * size,
+				0,
+				scale);
+			auto margins = QMargins(shrink, shrink, shrink, shrink);
+			p.drawImage(target.marginsAdded(margins), userpic.cache);
+		}
+	}
+	p.setOpacity(1.);
+
+	const auto hidden = [](const Userpic &userpic) {
+		return userpic.hiding && !userpic.shownAnimation.animating();
+	};
+	_userpics.erase(ranges::remove_if(_userpics, hidden), end(_userpics));
+}
+
+bool GroupCallBar::needUserpicCacheRefresh(Userpic &userpic) {
+	if (userpic.cache.isNull()) {
+		return true;
+	} else if (userpic.hiding) {
+		return false;
+	} else if (userpic.cacheKey != userpic.data.userpicKey) {
+		return true;
+	}
+	const auto shouldBeMasked = !userpic.topMost;
+	if (userpic.cacheMasked == shouldBeMasked || !shouldBeMasked) {
+		return true;
+	}
+	return !userpic.leftAnimation.animating();
+}
+
+void GroupCallBar::validateUserpicCache(Userpic &userpic) {
+	if (!needUserpicCacheRefresh(userpic)) {
+		return;
+	}
+	const auto factor = style::DevicePixelRatio();
+	const auto size = st::historyGroupCallUserpicSize;
+	const auto shift = st::historyGroupCallUserpicShift;
+	const auto full = QSize(size, size) * kWideScale * factor;
+	if (userpic.cache.isNull()) {
+		userpic.cache = QImage(full, QImage::Format_ARGB32_Premultiplied);
+		userpic.cache.setDevicePixelRatio(factor);
+	}
+	userpic.cacheKey = userpic.data.userpicKey;
+	userpic.cacheMasked = !userpic.topMost;
+	userpic.cache.fill(Qt::transparent);
+	{
+		Painter p(&userpic.cache);
+		const auto skip = (kWideScale - 1) / 2 * size;
+		p.drawImage(skip, skip, userpic.data.userpic);
+
+		if (userpic.cacheMasked) {
+			auto hq = PainterHighQualityEnabler(p);
+			auto pen = QPen(Qt::transparent);
+			pen.setWidth(st::historyGroupCallUserpicStroke);
+			p.setCompositionMode(QPainter::CompositionMode_Source);
+			p.setBrush(Qt::transparent);
+			p.setPen(pen);
+			p.drawEllipse(skip - size + shift, skip, size, size);
 		}
-		p.drawImage(imageLeft, imageTop, user.userpic);
-		imageLeft += st::historyGroupCallUserpicSize;
 	}
 }
 
@@ -174,6 +271,108 @@ void GroupCallBar::updateShadowGeometry(QRect wrapGeometry) {
 		: regular);
 }
 
+void GroupCallBar::updateUserpicsFromContent() {
+	const auto idFromUserpic = [](const Userpic &userpic) {
+		return userpic.data.id;
+	};
+
+	// Use "topMost" as "willBeHidden" flag.
+	for (auto &userpic : _userpics) {
+		userpic.topMost = true;
+	}
+	for (const auto &user : _content.users) {
+		const auto i = ranges::find(_userpics, user.id, idFromUserpic);
+		if (i == end(_userpics)) {
+			_userpics.push_back(Userpic{ user });
+			toggleUserpic(_userpics.back(), true);
+			continue;
+		}
+		i->topMost = false;
+
+		if (i->hiding) {
+			toggleUserpic(*i, true);
+		}
+		i->data = user;
+
+		// Put this one after the last we are not hiding.
+		for (auto j = end(_userpics) - 1; j != i; --j) {
+			if (!j->topMost) {
+				ranges::rotate(i, i + 1, j + 1);
+				break;
+			}
+		}
+	}
+
+	// Hide the ones that "willBeHidden" (currently having "topMost" flag).
+	// Set correct real values of "topMost" flag.
+	const auto userpicsBegin = begin(_userpics);
+	const auto userpicsEnd = end(_userpics);
+	auto markedTopMost = userpicsEnd;
+	for (auto i = userpicsBegin; i != userpicsEnd; ++i) {
+		auto &userpic = *i;
+		if (userpic.topMost) {
+			toggleUserpic(userpic, false);
+			userpic.topMost = false;
+		} else if (markedTopMost == userpicsEnd) {
+			userpic.topMost = true;
+			markedTopMost = i;
+		}
+	}
+	if (markedTopMost != userpicsEnd && markedTopMost != userpicsBegin) {
+		// Bring the topMost userpic to the very beginning, above all hiding.
+		std::rotate(userpicsBegin, markedTopMost, markedTopMost + 1);
+	}
+	updateUserpicsPositions();
+}
+
+void GroupCallBar::toggleUserpic(Userpic &userpic, bool shown) {
+	userpic.hiding = !shown;
+	userpic.shownAnimation.start(
+		[=] { updateUserpics(); },
+		shown ? 0. : 1.,
+		shown ? 1. : 0.,
+		kDuration);
+}
+
+void GroupCallBar::updateUserpicsPositions() {
+	const auto shownCount = ranges::count(_userpics, false, &Userpic::hiding);
+	if (!shownCount) {
+		return;
+	}
+	const auto single = st::historyGroupCallUserpicSize;
+	const auto shift = st::historyGroupCallUserpicShift;
+	// + 1 * single for the blobs.
+	const auto fullWidth = single + (shownCount - 1) * (single - shift);
+	auto left = (-fullWidth / 2);
+	for (auto &userpic : _userpics) {
+		if (userpic.hiding) {
+			continue;
+		}
+		if (!userpic.positionInited) {
+			userpic.positionInited = true;
+			userpic.left = left;
+		} else if (userpic.left != left) {
+			userpic.leftAnimation.start(
+				[=] { updateUserpics(); },
+				userpic.left,
+				left,
+				kDuration);
+			userpic.left = left;
+		}
+		left += (single - shift);
+	}
+}
+
+void GroupCallBar::updateUserpics() {
+	const auto widget = _wrap.entity();
+	const auto middle = widget->width() / 2;
+	_wrap.entity()->update(
+		(middle - _maxUserpicsWidth / 2),
+		0,
+		_maxUserpicsWidth,
+		widget->height());
+}
+
 void GroupCallBar::show() {
 	if (!_forceHidden) {
 		return;
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.h b/Telegram/SourceFiles/ui/chat/group_call_bar.h
index 8f5acd56c..ae013a446 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.h
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "ui/wrap/slide_wrap.h"
+#include "ui/effects/animations.h"
 #include "base/object_ptr.h"
 
 class Painter;
@@ -55,10 +56,31 @@ public:
 	}
 
 private:
+	using User = GroupCallBarContent::User;
+	struct Userpic {
+		User data;
+		std::pair<uint64, uint64> cacheKey;
+		QImage cache;
+		Animations::Simple leftAnimation;
+		Animations::Simple shownAnimation;
+		int left = 0;
+		bool positionInited = false;
+		bool topMost = false;
+		bool hiding = false;
+		bool cacheMasked = false;
+	};
 	void updateShadowGeometry(QRect wrapGeometry);
 	void updateControlsGeometry(QRect wrapGeometry);
+	void updateUserpicsFromContent();
 	void setupInner();
 	void paint(Painter &p);
+	void paintUserpics(Painter &p);
+
+	void toggleUserpic(Userpic &userpic, bool shown);
+	void updateUserpics();
+	void updateUserpicsPositions();
+	void validateUserpicCache(Userpic &userpic);
+	[[nodiscard]] bool needUserpicCacheRefresh(Userpic &userpic);
 
 	SlideWrap<> _wrap;
 	not_null<RpWidget*> _inner;
@@ -66,6 +88,8 @@ private:
 	std::unique_ptr<PlainShadow> _shadow;
 	rpl::event_stream<> _barClicks;
 	Fn<QRect(QRect)> _shadowGeometryPostprocess;
+	std::vector<Userpic> _userpics;
+	int _maxUserpicsWidth = 0;
 	bool _shouldBeShown = false;
 	bool _forceHidden = false;
 

From 7217d14f0941d6767fb8ddf90aa11230ba29a67b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Dec 2020 18:53:02 +0400
Subject: [PATCH 287/370] Show speaking animations in voice chat bar.

---
 .../SourceFiles/calls/calls_group_members.cpp |   1 +
 .../view/history_view_group_call_tracker.cpp  |   1 +
 Telegram/SourceFiles/ui/chat/chat.style       |   6 +-
 .../SourceFiles/ui/chat/group_call_bar.cpp    | 150 +++++++++++++++++-
 Telegram/SourceFiles/ui/chat/group_call_bar.h |  20 +--
 5 files changed, 158 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 9acddb3b3..f7ba37e17 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -417,6 +417,7 @@ auto Row::generatePaintUserpicCallback() -> PaintRoundImageCallback {
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
 		if (_blobsAnimation) {
 			const auto shift = QPointF(x + size / 2., y + size / 2.);
+			auto hq = PainterHighQualityEnabler(p);
 			p.translate(shift);
 			_blobsAnimation->blobs.paint(p, st::groupCallMemberActiveStatus);
 			p.translate(-shift);
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
index 6718e5f19..e3be07c56 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
@@ -141,6 +141,7 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 		state->someUserpicsNotLoaded = false;
 		using User = Ui::GroupCallBarContent::User;
 		for (auto &userpic : state->userpics) {
+			userpic.peer->loadUserpic();
 			const auto pic = userpic.peer->genUserpic(userpic.view, st.size);
 			userpic.uniqueKey = userpic.peer->userpicUniqueKey(userpic.view);
 			state->current.users.push_back({
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index d65f8d885..a2b4a256d 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -797,9 +797,11 @@ historyCommentsOpenOutSelected: icon {{ "history_comments_open", msgFileThumbLin
 
 historySlowmodeCounterMargins: margins(0px, 0px, 10px, 0px);
 
-historyGroupCallUserpicSize: 36px;
+historyGroupCallUserpicSize: 32px;
 historyGroupCallUserpicShift: 12px;
-historyGroupCallUserpicStroke: 2px;
+historyGroupCallUserpicStroke: 4px;
+historyGroupCallBlobMinRadius: 23px;
+historyGroupCallBlobMaxRadius: 25px;
 
 largeEmojiSize: 36px;
 largeEmojiOutline: 1px;
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
index c7191d83a..a244b4bbc 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -10,7 +10,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/message_bar.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/buttons.h"
+#include "ui/paint/blobs.h"
 #include "lang/lang_keys.h"
+#include "base/openssl_help.h"
 #include "styles/style_chat.h"
 #include "styles/style_calls.h"
 #include "styles/style_info.h" // st::topBarArrowPadding, like TopBarWidget.
@@ -25,8 +27,66 @@ constexpr auto kDuration = 160;
 constexpr auto kMaxUserpics = 4;
 constexpr auto kWideScale = 5;
 
+constexpr auto kBlobsEnterDuration = crl::time(250);
+constexpr auto kLevelDuration = 100. + 500. * 0.23;
+constexpr auto kBlobScale = 0.605;
+constexpr auto kMinorBlobFactor = 0.9f;
+constexpr auto kUserpicMinScale = 0.8;
+constexpr auto kMaxLevel = 1.;
+constexpr auto kSendRandomLevelInterval = crl::time(100);
+
+auto Blobs()->std::array<Ui::Paint::Blobs::BlobData, 2> {
+	return { {
+		{
+			.segmentsCount = 6,
+			.minScale = kBlobScale * kMinorBlobFactor,
+			.minRadius = st::historyGroupCallBlobMinRadius * kMinorBlobFactor,
+			.maxRadius = st::historyGroupCallBlobMaxRadius * kMinorBlobFactor,
+			.speedScale = 1.,
+			.alpha = .5,
+		},
+		{
+			.segmentsCount = 8,
+			.minScale = kBlobScale,
+			.minRadius = (float)st::historyGroupCallBlobMinRadius,
+			.maxRadius = (float)st::historyGroupCallBlobMaxRadius,
+			.speedScale = 1.,
+			.alpha = .2,
+		},
+	} };
+}
+
 } // namespace
 
+struct GroupCallBar::BlobsAnimation {
+	BlobsAnimation(
+		std::vector<Ui::Paint::Blobs::BlobData> blobDatas,
+		float levelDuration,
+		float maxLevel)
+	: blobs(std::move(blobDatas), levelDuration, maxLevel) {
+	}
+
+	Ui::Paint::Blobs blobs;
+	crl::time lastTime = 0;
+	crl::time lastSpeakingUpdateTime = 0;
+	float64 enter = 0.;
+};
+
+struct GroupCallBar::Userpic {
+	User data;
+	std::pair<uint64, uint64> cacheKey;
+	crl::time speakingStarted = 0;
+	QImage cache;
+	Animations::Simple leftAnimation;
+	Animations::Simple shownAnimation;
+	std::unique_ptr<BlobsAnimation> blobsAnimation;
+	int left = 0;
+	bool positionInited = false;
+	bool topMost = false;
+	bool hiding = false;
+	bool cacheMasked = false;
+};
+
 GroupCallBar::GroupCallBar(
 	not_null<QWidget*> parent,
 	rpl::producer<GroupCallBarContent> content)
@@ -36,7 +96,8 @@ GroupCallBar::GroupCallBar(
 	_inner.get(),
 	tr::lng_group_call_join(),
 	st::groupCallTopBarJoin))
-, _shadow(std::make_unique<PlainShadow>(_wrap.parentWidget())) {
+, _shadow(std::make_unique<PlainShadow>(_wrap.parentWidget()))
+, _randomSpeakingTimer([=] { sendRandomLevels(); }) {
 	_wrap.hide(anim::type::instant);
 	_shadow->hide();
 
@@ -78,6 +139,28 @@ GroupCallBar::GroupCallBar(
 		_wrap.toggle(false, anim::type::normal);
 	}, lifetime());
 
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		for (auto &userpic : _userpics) {
+			userpic.cache = QImage();
+		}
+	}, lifetime());
+
+	_speakingAnimation.init([=](crl::time now) {
+		//if (const auto &last = _speakingAnimationHideLastTime; (last > 0)
+		//	&& (now - last >= kBlobsEnterDuration)) {
+		//	_speakingAnimation.stop();
+		//	return false;
+		//}
+		for (auto &userpic : _userpics) {
+			if (const auto blobs = userpic.blobsAnimation.get()) {
+				blobs->blobs.updateLevel(now - blobs->lastTime);
+				blobs->lastTime = now;
+			}
+		}
+		updateUserpics();
+	});
+
 	setupInner();
 }
 
@@ -168,17 +251,30 @@ void GroupCallBar::paintUserpics(Painter &p) {
 		validateUserpicCache(userpic);
 		p.setOpacity(shown);
 		const auto left = middle + userpic.leftAnimation.value(userpic.left);
-		if (userpic.data.speaking) {
-			//p.fillRect(left, top, size, size, QColor(255, 128, 128));
+		const auto blobs = userpic.blobsAnimation.get();
+		const auto shownScale = 0.5 + shown / 2.;
+		const auto &minScale = kUserpicMinScale;
+		const auto scale = shownScale * (blobs
+			? (minScale + (1. - minScale) * blobs->blobs.currentLevel())
+			: 1.);
+		if (blobs) {
+			auto hq = PainterHighQualityEnabler(p);
+
+			const auto shift = QPointF(left + size / 2., top + size / 2.);
+			p.translate(shift);
+			blobs->blobs.paint(p, st::windowActiveTextFg);
+			p.translate(-shift);
+			p.setOpacity(1.);
 		}
-		if (shown == 1.) {
+		if (std::abs(scale - 1.) < 0.001) {
 			const auto skip = ((kWideScale - 1) / 2) * size * factor;
 			p.drawImage(
 				QRect(left, top, size, size),
 				userpic.cache,
 				QRect(skip, skip, size * factor, size * factor));
 		} else {
-			const auto scale = 0.5 + shown / 2.;
+			auto hq = PainterHighQualityEnabler(p);
+
 			auto target = QRect(
 				left + (1 - kWideScale) / 2 * size,
 				top + (1 - kWideScale) / 2 * size,
@@ -215,6 +311,26 @@ bool GroupCallBar::needUserpicCacheRefresh(Userpic &userpic) {
 	return !userpic.leftAnimation.animating();
 }
 
+void GroupCallBar::ensureBlobsAnimation(Userpic &userpic) {
+	if (userpic.blobsAnimation) {
+		return;
+	}
+	userpic.blobsAnimation = std::make_unique<BlobsAnimation>(
+		Blobs() | ranges::to_vector,
+		kLevelDuration,
+		kMaxLevel);
+	userpic.blobsAnimation->lastTime = crl::now();
+}
+
+void GroupCallBar::sendRandomLevels() {
+	for (auto &userpic : _userpics) {
+		if (const auto blobs = userpic.blobsAnimation.get()) {
+			const auto value = 30 + (openssl::RandomValue<uint32>() % 70);
+			userpic.blobsAnimation->blobs.setLevel(float64(value) / 100.);
+		}
+	}
+}
+
 void GroupCallBar::validateUserpicCache(Userpic &userpic) {
 	if (!needUserpicCacheRefresh(userpic)) {
 		return;
@@ -248,7 +364,6 @@ void GroupCallBar::validateUserpicCache(Userpic &userpic) {
 }
 
 void GroupCallBar::updateControlsGeometry(QRect wrapGeometry) {
-	_inner->resizeToWidth(wrapGeometry.width());
 	const auto hidden = _wrap.isHidden() || !wrapGeometry.height();
 	if (_shadow->isHidden() != hidden) {
 		_shadow->setVisible(!hidden);
@@ -308,8 +423,15 @@ void GroupCallBar::updateUserpicsFromContent() {
 	const auto userpicsBegin = begin(_userpics);
 	const auto userpicsEnd = end(_userpics);
 	auto markedTopMost = userpicsEnd;
+	auto hasBlobs = false;
 	for (auto i = userpicsBegin; i != userpicsEnd; ++i) {
 		auto &userpic = *i;
+		if (userpic.data.speaking) {
+			ensureBlobsAnimation(userpic);
+			hasBlobs = true;
+		} else {
+			userpic.blobsAnimation = nullptr;
+		}
 		if (userpic.topMost) {
 			toggleUserpic(userpic, false);
 			userpic.topMost = false;
@@ -323,6 +445,21 @@ void GroupCallBar::updateUserpicsFromContent() {
 		std::rotate(userpicsBegin, markedTopMost, markedTopMost + 1);
 	}
 	updateUserpicsPositions();
+
+	if (!hasBlobs) {
+		_randomSpeakingTimer.cancel();
+		_speakingAnimation.stop();
+	} else if (!_randomSpeakingTimer.isActive()) {
+		_randomSpeakingTimer.callEach(kSendRandomLevelInterval);
+		_speakingAnimation.start();
+	}
+
+	if (_wrap.isHidden()) {
+		for (auto &userpic : _userpics) {
+			userpic.shownAnimation.stop();
+			userpic.leftAnimation.stop();
+		}
+	}
 }
 
 void GroupCallBar::toggleUserpic(Userpic &userpic, bool shown) {
@@ -408,6 +545,7 @@ void GroupCallBar::move(int x, int y) {
 
 void GroupCallBar::resizeToWidth(int width) {
 	_wrap.entity()->resizeToWidth(width);
+	_inner->resizeToWidth(width);
 }
 
 int GroupCallBar::height() const {
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.h b/Telegram/SourceFiles/ui/chat/group_call_bar.h
index ae013a446..616babafc 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.h
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/slide_wrap.h"
 #include "ui/effects/animations.h"
 #include "base/object_ptr.h"
+#include "base/timer.h"
 
 class Painter;
 
@@ -57,18 +58,9 @@ public:
 
 private:
 	using User = GroupCallBarContent::User;
-	struct Userpic {
-		User data;
-		std::pair<uint64, uint64> cacheKey;
-		QImage cache;
-		Animations::Simple leftAnimation;
-		Animations::Simple shownAnimation;
-		int left = 0;
-		bool positionInited = false;
-		bool topMost = false;
-		bool hiding = false;
-		bool cacheMasked = false;
-	};
+	struct BlobsAnimation;
+	struct Userpic;
+
 	void updateShadowGeometry(QRect wrapGeometry);
 	void updateControlsGeometry(QRect wrapGeometry);
 	void updateUserpicsFromContent();
@@ -81,6 +73,8 @@ private:
 	void updateUserpicsPositions();
 	void validateUserpicCache(Userpic &userpic);
 	[[nodiscard]] bool needUserpicCacheRefresh(Userpic &userpic);
+	void ensureBlobsAnimation(Userpic &userpic);
+	void sendRandomLevels();
 
 	SlideWrap<> _wrap;
 	not_null<RpWidget*> _inner;
@@ -89,6 +83,8 @@ private:
 	rpl::event_stream<> _barClicks;
 	Fn<QRect(QRect)> _shadowGeometryPostprocess;
 	std::vector<Userpic> _userpics;
+	base::Timer _randomSpeakingTimer;
+	Ui::Animations::Basic _speakingAnimation;
 	int _maxUserpicsWidth = 0;
 	bool _shouldBeShown = false;
 	bool _forceHidden = false;

From 2b91eedcd47a9e9b4351f03d2780cafd34d61ff3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 13 Dec 2020 23:27:51 +0400
Subject: [PATCH 288/370] Update API scheme.

---
 Telegram/Resources/tl/api.tl                  | 13 ++++---
 .../SourceFiles/boxes/sticker_set_box.cpp     | 22 +++++++----
 .../SourceFiles/calls/calls_group_call.cpp    |  2 +-
 .../data/stickers/data_stickers.cpp           | 38 ++++++++++++++-----
 4 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index 4c7722f4a..9dd424472 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -122,12 +122,12 @@ userStatusLastWeek#7bf09fc = UserStatus;
 userStatusLastMonth#77ebc742 = UserStatus;
 
 chatEmpty#9ba2d800 id:int = Chat;
-chat#3bda1bde flags:# creator:flags.0?true kicked:flags.1?true left:flags.2?true deactivated:flags.5?true id:int title:string photo:ChatPhoto participants_count:int date:int version:int migrated_to:flags.6?InputChannel admin_rights:flags.14?ChatAdminRights default_banned_rights:flags.18?ChatBannedRights = Chat;
+chat#3bda1bde flags:# creator:flags.0?true kicked:flags.1?true left:flags.2?true deactivated:flags.5?true call_active:flags.23?true call_not_empty:flags.24?true id:int title:string photo:ChatPhoto participants_count:int date:int version:int migrated_to:flags.6?InputChannel admin_rights:flags.14?ChatAdminRights default_banned_rights:flags.18?ChatBannedRights = Chat;
 chatForbidden#7328bdb id:int title:string = Chat;
 channel#d31a961e flags:# creator:flags.0?true left:flags.2?true broadcast:flags.5?true verified:flags.7?true megagroup:flags.8?true restricted:flags.9?true signatures:flags.11?true min:flags.12?true scam:flags.19?true has_link:flags.20?true has_geo:flags.21?true slowmode_enabled:flags.22?true call_active:flags.23?true call_not_empty:flags.24?true id:int access_hash:flags.13?long title:string username:flags.6?string photo:ChatPhoto date:int version:int restriction_reason:flags.9?Vector<RestrictionReason> admin_rights:flags.14?ChatAdminRights banned_rights:flags.15?ChatBannedRights default_banned_rights:flags.18?ChatBannedRights participants_count:flags.17?int = Chat;
 channelForbidden#289da732 flags:# broadcast:flags.5?true megagroup:flags.8?true id:int access_hash:long title:string until_date:flags.16?int = Chat;
 
-chatFull#1b7c9db3 flags:# can_set_username:flags.7?true has_scheduled:flags.8?true id:int about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int = ChatFull;
+chatFull#dc8c181 flags:# can_set_username:flags.7?true has_scheduled:flags.8?true id:int about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int call:flags.12?InputGroupCall = ChatFull;
 channelFull#ef3a6acd flags:# can_view_participants:flags.3?true can_set_username:flags.6?true can_set_stickers:flags.7?true hidden_prehistory:flags.10?true can_set_location:flags.16?true has_scheduled:flags.19?true can_view_stats:flags.20?true blocked:flags.22?true id:int about:string participants_count:flags.0?int admins_count:flags.1?int kicked_count:flags.2?int banned_count:flags.2?int online_count:flags.13?int read_inbox_max_id:int read_outbox_max_id:int unread_count:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?int migrated_from_max_id:flags.4?int pinned_msg_id:flags.5?int stickerset:flags.8?StickerSet available_min_id:flags.9?int folder_id:flags.11?int linked_chat_id:flags.14?int location:flags.15?ChannelLocation slowmode_seconds:flags.17?int slowmode_next_send_date:flags.18?int stats_dc:flags.12?int pts:int call:flags.21?InputGroupCall = ChatFull;
 
 chatParticipant#c8d7493e user_id:int inviter_id:int date:int = ChatParticipant;
@@ -365,8 +365,9 @@ 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;
+updateChat#1330a196 chat_id:int = Update;
 updateGroupCallParticipants#f2ebdb4e call:InputGroupCall participants:Vector<GroupCallParticipant> version:int = Update;
-updateGroupCall#5724806e channel_id:int call:GroupCall = Update;
+updateGroupCall#a45eb99b chat_id:int call:GroupCall = Update;
 
 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;
 
@@ -547,7 +548,7 @@ inputStickerSetShortName#861cc8a0 short_name:string = InputStickerSet;
 inputStickerSetAnimatedEmoji#28703c8 = InputStickerSet;
 inputStickerSetDice#e67f520e emoticon:string = InputStickerSet;
 
-stickerSet#eeb46f27 flags:# archived:flags.1?true official:flags.2?true masks:flags.3?true animated:flags.5?true installed_date:flags.0?int id:long access_hash:long title:string short_name:string thumb:flags.4?PhotoSize thumb_dc_id:flags.4?int count:int hash:int = StickerSet;
+stickerSet#40e237a8 flags:# archived:flags.1?true official:flags.2?true masks:flags.3?true animated:flags.5?true installed_date:flags.0?int id:long access_hash:long title:string short_name:string thumbs:flags.4?Vector<PhotoSize> thumb_dc_id:flags.4?int count:int hash:int = StickerSet;
 
 messages.stickerSet#b60a24a6 set:StickerSet packs:Vector<StickerPack> documents:Vector<Document> = messages.StickerSet;
 
@@ -1194,7 +1195,7 @@ groupCall#55903081 flags:# join_muted:flags.1?true can_change_join_muted:flags.2
 
 inputGroupCall#d8aa840f id:long access_hash:long = InputGroupCall;
 
-groupCallParticipant#56b087c9 flags:# muted:flags.0?true left:flags.1?true can_self_unmute:flags.2?true user_id:int date:int active_date:flags.3?int source:int = GroupCallParticipant;
+groupCallParticipant#56b087c9 flags:# muted:flags.0?true left:flags.1?true can_self_unmute:flags.2?true just_joined:flags.4?true user_id:int date:int active_date:flags.3?int source:int = GroupCallParticipant;
 
 phone.groupCall#66ab0bfc call:GroupCall participants:Vector<GroupCallParticipant> participants_next_offset:string users:Vector<User> = phone.GroupCall;
 
@@ -1560,7 +1561,7 @@ phone.discardCall#b2cbc1c0 flags:# video:flags.0?true peer:InputPhoneCall durati
 phone.setCallRating#59ead627 flags:# user_initiative:flags.0?true peer:InputPhoneCall rating:int comment:string = Updates;
 phone.saveCallDebug#277add7e peer:InputPhoneCall debug:DataJSON = Bool;
 phone.sendSignalingData#ff7a9383 peer:InputPhoneCall data:bytes = Bool;
-phone.createGroupCall#e428fa02 channel:InputChannel random_id:int = Updates;
+phone.createGroupCall#bd3dabe0 peer:InputPeer random_id:int = Updates;
 phone.joinGroupCall#5f9c8e62 flags:# muted:flags.0?true call:InputGroupCall params:DataJSON = Updates;
 phone.leaveGroupCall#500377f9 call:InputGroupCall source:int = Updates;
 phone.editGroupCallMember#63146ae4 flags:# muted:flags.0?true call:InputGroupCall user_id:InputUser = Updates;
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 497a5b9aa..b4eafa102 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -334,14 +334,20 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
 			_setHash = set.vhash().v;
 			_setFlags = set.vflags().v;
 			_setInstallDate = set.vinstalled_date().value_or(0);
-			if (const auto thumb = set.vthumb()) {
-				_setThumbnail = Images::FromPhotoSize(
-					&_controller->session(),
-					set,
-					*thumb);
-			} else {
-				_setThumbnail = ImageWithLocation();
-			}
+			_setThumbnail = [&] {
+				if (const auto thumbs = set.vthumbs()) {
+					for (const auto &thumb : thumbs->v) {
+						const auto result = Images::FromPhotoSize(
+							&_controller->session(),
+							set,
+							thumb);
+						if (result.location.valid()) {
+							return result;
+						}
+					}
+				}
+				return ImageWithLocation();
+			}();
 			const auto &sets = _controller->session().data().stickers().sets();
 			const auto it = sets.find(_setId);
 			if (it != sets.cend()) {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 4407b0582..fc27f6f68 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -142,7 +142,7 @@ void GroupCall::setState(State state) {
 
 void GroupCall::start() {
 	_createRequestId = _api.request(MTPphone_CreateGroupCall(
-		_channel->inputChannel,
+		_channel->input,
 		MTP_int(rand_value<int32>())
 	)).done([=](const MTPUpdates &result) {
 		_acceptFields = true;
diff --git a/Telegram/SourceFiles/data/stickers/data_stickers.cpp b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
index 0ea087e99..96f5566bb 100644
--- a/Telegram/SourceFiles/data/stickers/data_stickers.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_stickers.cpp
@@ -321,7 +321,7 @@ bool Stickers::applyArchivedResultFake() {
 					MTP_long(raw->access),
 					MTP_string(raw->title),
 					MTP_string(raw->shortName),
-					MTP_photoSizeEmpty(MTP_string()),
+					MTP_vector<MTPPhotoSize>(),
 					MTP_int(0),
 					MTP_int(raw->count),
 					MTP_int(raw->hash));
@@ -814,10 +814,20 @@ void Stickers::featuredSetsReceived(
 		auto it = sets.find(data->vid().v);
 		const auto title = getSetTitle(*data);
 		const auto installDate = data->vinstalled_date().value_or_empty();
-		const auto thumb = data->vthumb();
-		const auto thumbnail = thumb
-			? Images::FromPhotoSize(&session(), *data, *thumb)
-			: ImageWithLocation();
+		const auto thumbnail = [&] {
+			if (const auto thumbs = data->vthumbs()) {
+				for (const auto &thumb : thumbs->v) {
+					const auto result = Images::FromPhotoSize(
+						&session(),
+						*data,
+						thumb);
+					if (result.location.valid()) {
+						return result;
+					}
+				}
+			}
+			return ImageWithLocation();
+		}();
 		if (it == sets.cend()) {
 			auto setClientFlags = MTPDstickerSet_ClientFlag::f_featured
 				| MTPDstickerSet_ClientFlag::f_not_loaded;
@@ -1126,10 +1136,20 @@ StickersSet *Stickers::feedSet(const MTPDstickerSet &data) {
 	auto it = sets.find(data.vid().v);
 	auto title = getSetTitle(data);
 	auto flags = MTPDstickerSet::Flags(0);
-	const auto thumb = data.vthumb();
-	const auto thumbnail = thumb
-		? Images::FromPhotoSize(&session(), data, *thumb)
-		: ImageWithLocation();
+	const auto thumbnail = [&] {
+		if (const auto thumbs = data.vthumbs()) {
+			for (const auto &thumb : thumbs->v) {
+				const auto result = Images::FromPhotoSize(
+					&session(),
+					data,
+					thumb);
+				if (result.location.valid()) {
+					return result;
+				}
+			}
+		}
+		return ImageWithLocation();
+	}();
 	if (it == sets.cend()) {
 		it = sets.emplace(data.vid().v, std::make_unique<StickersSet>(
 			&owner(),

From 78a666a19d30fc158647599da1a6e8b00f581a60 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 12 Dec 2020 13:09:03 +0400
Subject: [PATCH 289/370] Make updateGeometry don't need the argument

---
 .../media/view/media_view_overlay_widget.cpp   | 18 +++++++++---------
 .../media/view/media_view_overlay_widget.h     |  2 +-
 2 files changed, 10 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 31dcd584a..f9f620ac2 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -359,7 +359,7 @@ OverlayWidget::OverlayWidget()
 	} else {
 		setWindowFlags(Qt::FramelessWindowHint);
 	}
-	updateGeometry(QApplication::primaryScreen()->geometry());
+	updateGeometry();
 	setAttribute(Qt::WA_NoSystemBackground, true);
 	setAttribute(Qt::WA_TranslucentBackground, true);
 	setMouseTracking(true);
@@ -453,8 +453,11 @@ void OverlayWidget::moveToScreen() {
 	}
 }
 
-void OverlayWidget::updateGeometry(const QRect &rect) {
-	setGeometry(rect);
+void OverlayWidget::updateGeometry() {
+	const auto screen = windowHandle() && windowHandle()->screen()
+		? windowHandle()->screen()
+		: QApplication::primaryScreen();
+	setGeometry(screen->geometry());
 
 	auto navSkip = 2 * st::mediaviewControlMargin + st::mediaviewControlSize;
 	_closeNav = myrtlrect(width() - st::mediaviewControlMargin - st::mediaviewControlSize, st::mediaviewControlMargin, st::mediaviewControlSize, st::mediaviewControlSize);
@@ -1313,21 +1316,18 @@ void OverlayWidget::onScreenResized(int screen) {
 		&& windowHandle()->screen()
 		&& changed
 		&& windowHandle()->screen() == changed) {
-		updateGeometry(changed->geometry());
+		updateGeometry();
 	}
 }
 
 void OverlayWidget::handleVisibleChanged(bool visible) {
 	if (visible) {
-		const auto screen = windowHandle()->screen()
-			? windowHandle()->screen()
-			: QApplication::primaryScreen();
-		updateGeometry(screen->geometry());
+		updateGeometry();
 	}
 }
 
 void OverlayWidget::handleScreenChanged(QScreen *screen) {
-	updateGeometry(screen->geometry());
+	updateGeometry();
 }
 
 void OverlayWidget::onToMessage() {
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 88e0b663e..3879d04ad 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -209,10 +209,10 @@ private:
 
 	void updateOver(QPoint mpos);
 	void moveToScreen();
+	void updateGeometry();
 	bool moveToNext(int delta);
 	void preloadData(int delta);
 
-	void updateGeometry(const QRect &rect);
 	void handleVisibleChanged(bool visible);
 	void handleScreenChanged(QScreen *screen);
 

From c9d2ef278f3b7b0bc36e9ad284821567d81f6088 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 13 Dec 2020 09:30:41 +0400
Subject: [PATCH 290/370] Call moveToScreen from handleVisibleChanged in
 OverlayWidget

---
 .../SourceFiles/media/view/media_view_overlay_widget.cpp  | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index f9f620ac2..7bf0af4f5 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1322,7 +1322,7 @@ void OverlayWidget::onScreenResized(int screen) {
 
 void OverlayWidget::handleVisibleChanged(bool visible) {
 	if (visible) {
-		updateGeometry();
+		moveToScreen();
 	}
 }
 
@@ -2186,9 +2186,6 @@ void OverlayWidget::displayPhoto(not_null<PhotoData*> photo, HistoryItem *item)
 		displayDocument(nullptr, item);
 		return;
 	}
-	if (isHidden()) {
-		moveToScreen();
-	}
 	_touchbarDisplay.fire(TouchBarItemType::Photo);
 
 	clearStreaming();
@@ -2255,9 +2252,6 @@ void OverlayWidget::displayDocument(
 		HistoryItem *item,
 		const Data::CloudTheme &cloud,
 		bool continueStreaming) {
-	if (isHidden()) {
-		moveToScreen();
-	}
 	_fullScreenVideo = false;
 	_staticContent = QPixmap();
 	clearStreaming(_document != doc);

From dcd1e62c366fb45d7277bf46d982e0587db6d448 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 13 Dec 2020 10:23:43 +0400
Subject: [PATCH 291/370] Move media viewer back to the right screen if it was
 moved by window manager

---
 .../media/view/media_view_overlay_widget.cpp          | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 7bf0af4f5..c1ebb4d69 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -445,19 +445,26 @@ void OverlayWidget::moveToScreen() {
 		? Core::App().activeWindow()->widget().get()
 		: nullptr;
 	const auto activeWindowScreen = widgetScreen(window);
+	const auto myScreen = widgetScreen(this);
 	// Wayland doesn't support positioning, but Qt emits screenChanged anyway
 	// and geometry of the widget become broken
 	if (activeWindowScreen
+		&& myScreen != activeWindowScreen
 		&& !Platform::IsWayland()) {
 		windowHandle()->setScreen(activeWindowScreen);
 	}
+	updateGeometry();
 }
 
 void OverlayWidget::updateGeometry() {
 	const auto screen = windowHandle() && windowHandle()->screen()
 		? windowHandle()->screen()
 		: QApplication::primaryScreen();
-	setGeometry(screen->geometry());
+	const auto available = screen->geometry();
+	if (geometry() == available) {
+		return;
+	}
+	setGeometry(available);
 
 	auto navSkip = 2 * st::mediaviewControlMargin + st::mediaviewControlSize;
 	_closeNav = myrtlrect(width() - st::mediaviewControlMargin - st::mediaviewControlSize, st::mediaviewControlMargin, st::mediaviewControlSize, st::mediaviewControlSize);
@@ -1327,7 +1334,7 @@ void OverlayWidget::handleVisibleChanged(bool visible) {
 }
 
 void OverlayWidget::handleScreenChanged(QScreen *screen) {
-	updateGeometry();
+	moveToScreen();
 }
 
 void OverlayWidget::onToMessage() {

From 144e2e217f4a18318c5795378f52aebbe6b40fff Mon Sep 17 00:00:00 2001
From: Andrew Lane <contact@lungers.com>
Date: Sun, 13 Dec 2020 01:16:37 -0500
Subject: [PATCH 292/370] Update Linux build instructions

Co-authored-by: Ilya Fedin <fedin-ilja2010@ya.ru>
---
 docs/building-cmake.md | 368 +++--------------------------------------
 1 file changed, 25 insertions(+), 343 deletions(-)

diff --git a/docs/building-cmake.md b/docs/building-cmake.md
index 6f3dccceb..d39d7bd9f 100644
--- a/docs/building-cmake.md
+++ b/docs/building-cmake.md
@@ -1,362 +1,44 @@
-## Build instructions for CMake under Ubuntu 14.04
-
-**NB** These are outdated.
-
-### Prepare folder
-
-Choose an empty folder for the future build, for example **/home/user/TBuild**. It will be named ***BuildPath*** in the rest of this document.
+## Build instructions for CMake using Docker
 
 ### Obtain your API credentials
 
 You will require **api_id** and **api_hash** to access the Telegram API servers. To learn how to obtain them [click here][api_credentials].
 
-### Install software and required packages
-
-You will need GCC 8 installed. To install them and all the required dependencies run
-
-    sudo apt-get install software-properties-common -y && \
-    sudo apt-get install git libexif-dev liblzma-dev libz-dev libssl-dev \
-    libgtk2.0-dev libice-dev libsm-dev libicu-dev libdrm-dev dh-autoreconf \
-    autoconf automake build-essential libxml2-dev libass-dev libfreetype6-dev \
-    libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev \
-    libvorbis-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev \
-    libxcb-screensaver0-dev ninja-build libegl1-mesa-dev \
-    libxcb-xfixes0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libatspi2.0-dev \
-    libxcb-render-util0-dev libxcb-util0-dev libxcb-xkb-dev libxrender-dev \
-    libasound-dev libpulse-dev libxcb-sync0-dev libxcb-randr0-dev \
-    libx11-xcb-dev libffi-dev libncurses5-dev pkg-config texi2html bison yasm \
-    zlib1g-dev xutils-dev python-xcbgen chrpath gperf -y --force-yes && \
-    sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-    sudo apt-get update && \
-    sudo apt-get install gcc-8 g++-8 -y && \
-    sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 && \
-    sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 60 && \
-    sudo update-alternatives --config gcc && \
-    sudo add-apt-repository --remove ppa:ubuntu-toolchain-r/test -y
-
-You can set the multithreaded make parameter by running
-
-    MAKE_THREADS_CNT=-j8
-
-### Clone source code and prepare libraries
-
-Go to ***BuildPath*** and run
+### Clone source code
 
     git clone --recursive https://github.com/telegramdesktop/tdesktop.git
 
-    mkdir Libraries
-    cd Libraries
+### Prepare libraries
 
-    git clone https://github.com/Kitware/CMake cmake
-    cd cmake
-    git checkout v3.16.0
-    ./bootstrap
-    make $MAKE_THREADS_CNT
-    sudo make install
-    cd ..
+Go to the `tdesktop` directory and run
 
-    git clone https://github.com/desktop-app/patches.git
-    cd patches
-    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
-    ./autogen.sh
-    ./configure
-    make $MAKE_THREADS_CNT
-    sudo make install
-    cd ..
-
-    git clone https://github.com/intel/libva.git
-    cd libva
-    CFLAGS=-fPIC CPPFLAGS=-fPIC LDFLAGS=-fPIC ./autogen.sh --enable-static
-    make $MAKE_THREADS_CNT
-    sudo make install
-    cd ..
-
-    git clone https://gitlab.freedesktop.org/vdpau/libvdpau.git --depth=1 -b libvdpau-1.2
-    cd libvdpau
-    CFLAGS=-fPIC CPPFLAGS=-fPIC LDFLAGS=-fPIC ./autogen.sh --enable-static
-    make $MAKE_THREADS_CNT
-    sudo make install
-    cd ..
-
-    git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg
-    cd ffmpeg
-    git checkout release/3.4
-
-    ./configure \
-    --extra-cflags="-fPIC" \
-    --extra-cxxflags="-fPIC" \
-    --extra-ldflags="-fPIC" \
-    --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
-
-    make $MAKE_THREADS_CNT
-    sudo make install
-    cd ..
-
-    git clone git://repo.or.cz/openal-soft.git
-    cd openal-soft
-    git checkout openal-soft-1.19.1
-    cd build
-    cmake .. \
-    -DLIBTYPE:STRING=STATIC \
-    -DALSOFT_EXAMPLES=OFF \
-    -DALSOFT_TESTS=OFF \
-    -DALSOFT_UTILS=OFF \
-    -DALSOFT_CONFIG=OFF
-    make $MAKE_THREADS_CNT
-    sudo make install
-    cd ../..
-
-    git clone https://github.com/openssl/openssl openssl_1_1_1
-    cd openssl_1_1_1
-    git checkout OpenSSL_1_1_1-stable
-    ./config --prefix=/usr/local/desktop-app/openssl-1.1.1 no-tests
-    make $MAKE_THREADS_CNT
-    sudo make install_sw
-    cd ..
-
-    git clone -b 1.18.0 https://gitlab.freedesktop.org/wayland/wayland
-    cd wayland
-    ./autogen.sh \
-    --enable-static \
-    --disable-documentation \
-    --disable-dtd-validation
-    make $MAKE_THREADS_CNT
-    sudo make install
-    cd ..
-
-    git clone https://github.com/xkbcommon/libxkbcommon.git
-    cd libxkbcommon
-    git checkout xkbcommon-0.8.4
-    ./autogen.sh \
-    --disable-docs \
-    --disable-wayland \
-    --with-xkb-config-root=/usr/share/X11/xkb \
-    --with-x-locale-root=/usr/share/X11/locale
-    make $MAKE_THREADS_CNT
-    sudo make install
-    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,qtwayland,qtimageformats,qtsvg
-    git checkout v5.12.8
-    git submodule update qtbase qtwayland qtimageformats qtsvg
-    cd qtbase
-    find ../../patches/qtbase_5_12_8 -type f -print0 | sort -z | xargs -r0 git apply
-    cd ..
-    cd qtwayland
-    find ../../patches/qtwayland_5_12_8 -type f -print0 | sort -z | xargs -r0 git apply
-    cd ..
-
-    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" \
-        -I "/usr/local/include" \
-        LIBJPEG_LIBS="/usr/local/lib/libjpeg.a" \
-        -nomake examples \
-        -nomake tests
-
-    make $MAKE_THREADS_CNT
-    sudo make install
-    cd ..
-
-    git clone https://github.com/desktop-app/tg_owt.git
-    cd tg_owt
-    mkdir out
-    cd out
-    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 ../..
-    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 ../..
-    ninja
-    cd ../../..
-
-    git clone https://chromium.googlesource.com/external/gyp
-    cd gyp
-    git checkout 9f2a7bb1
-    git apply ../patches/gyp.diff
-    cd ..
-
-    git clone https://chromium.googlesource.com/breakpad/breakpad
-    cd breakpad
-    git checkout bc8fb886
-    git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss
-    cd src/third_party/lss
-    git checkout a91633d1
-    cd ../../..
-    ./configure
-    make $MAKE_THREADS_CNT
-    sudo make install
-    cd src
-    rm -r testing
-    git clone https://github.com/google/googletest testing
-    cd tools
-    sed -i 's/minidump_upload.m/minidump_upload.cc/' linux/tools_linux.gypi
-    ../../../gyp/gyp  --depth=. --generator-output=.. -Goutput_dir=../out tools.gyp --format=cmake
-    cd ../../out/Default
-    cmake .
-    make $MAKE_THREADS_CNT dump_syms
-    cd ../../..
+    docker build -t tdesktop:centos_env Telegram/build/docker/centos_env/
 
 ### Building the project
 
-Go to ***BuildPath*/tdesktop/Telegram** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
+Make sure that you're still in the `tdesktop` directory and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
 
-    ./configure.sh -D TDESKTOP_API_ID=YOUR_API_ID -D TDESKTOP_API_HASH=YOUR_API_HASH -D DESKTOP_APP_USE_PACKAGED=OFF -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF
+    docker run --rm \
+        -v $PWD:/usr/src/tdesktop \
+        tdesktop:centos_env \
+        /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \
+        -D TDESKTOP_API_ID=YOUR_API_ID \
+        -D TDESKTOP_API_HASH=YOUR_API_HASH \
+        -D DESKTOP_APP_USE_PACKAGED=OFF \
+        -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF
 
-To make Debug version go to ***BuildPath*/tdesktop/out/Debug** and run
+Or, to create a debug build, run (also using [your **api_id** and **api_hash**](#obtain-your-api-credentials))
 
-    make $MAKE_THREADS_CNT
+    docker run --rm \
+        -v $PWD:/usr/src/tdesktop \
+        -e DEBUG=1 \
+        tdesktop:centos_env \
+        /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \
+        -D TDESKTOP_API_ID=YOUR_API_ID \
+        -D TDESKTOP_API_HASH=YOUR_API_HASH \
+        -D DESKTOP_APP_USE_PACKAGED=OFF \
+        -D DESKTOP_APP_DISABLE_CRASH_REPORTS=OFF
 
-To make Release version go to ***BuildPath*/tdesktop/out/Release** and run
-
-    make $MAKE_THREADS_CNT
-
-You can debug your builds from Qt Creator, just open ***BuildPath*/tdesktop/CMakeLists.txt**, configure to a separate directory with correct options and launch with debug.
+The built files will be in the `out` directory.
 
 [api_credentials]: api_credentials.md

From e9e4c7a8ccd729189c6a225e2d5b1b9a168bb3f9 Mon Sep 17 00:00:00 2001
From: Himself65 <himself65@outlook.com>
Date: Mon, 14 Dec 2020 16:46:51 +0800
Subject: [PATCH 293/370] Update VS2019 build instructions

Clone submodules in https://github.com/desktop-app/tg_owt
---
 docs/building-msvc-x64.md | 2 +-
 docs/building-msvc.md     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/building-msvc-x64.md b/docs/building-msvc-x64.md
index 91c1fa4fe..586339642 100644
--- a/docs/building-msvc-x64.md
+++ b/docs/building-msvc-x64.md
@@ -195,7 +195,7 @@ Open **x64 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     jom -j8 install
     cd ..
 
-    git clone https://github.com/desktop-app/tg_owt.git
+    git clone --recursive https://github.com/desktop-app/tg_owt.git
     cd tg_owt
     mkdir out
     cd out
diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index 4730d90f8..3a6bb6430 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -195,7 +195,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     jom -j8 install
     cd ..
 
-    git clone https://github.com/desktop-app/tg_owt.git
+    git clone --recursive https://github.com/desktop-app/tg_owt.git
     cd tg_owt
     mkdir out
     cd out

From cd3b989e706112f076a9d9dd613be0090ce5b937 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 14 Dec 2020 14:38:03 +0400
Subject: [PATCH 294/370] Use xcb to set transient parent for gtk file dialog

---
 .../platform/linux/linux_gdk_helper.cpp       | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/linux_gdk_helper.cpp b/Telegram/SourceFiles/platform/linux/linux_gdk_helper.cpp
index 35f3c0c1c..5e4a00611 100644
--- a/Telegram/SourceFiles/platform/linux/linux_gdk_helper.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_gdk_helper.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/linux_gdk_helper.h"
 
 #include "platform/linux/linux_libs.h"
+#include "base/platform/linux/base_xcb_utilities_linux.h"
 
 extern "C" {
 #undef signals
@@ -31,9 +32,6 @@ GtkLoaded gdk_helper_loaded = GtkLoaded::GtkNone;
 #define GdkDrawable GdkWindow
 
 // Gtk 2
-using f_gdk_x11_drawable_get_xdisplay = Display*(*)(GdkDrawable*);
-f_gdk_x11_drawable_get_xdisplay gdk_x11_drawable_get_xdisplay = nullptr;
-
 using f_gdk_x11_drawable_get_xid = XID(*)(GdkDrawable*);
 f_gdk_x11_drawable_get_xid gdk_x11_drawable_get_xid = nullptr;
 
@@ -47,12 +45,6 @@ inline bool gdk_is_x11_window_check(Object *obj) {
 	return Libs::g_type_cit_helper(obj, gdk_x11_window_get_type());
 }
 
-using f_gdk_window_get_display = GdkDisplay*(*)(GdkWindow *window);
-f_gdk_window_get_display gdk_window_get_display = nullptr;
-
-using f_gdk_x11_display_get_xdisplay = Display*(*)(GdkDisplay *display);
-f_gdk_x11_display_get_xdisplay gdk_x11_display_get_xdisplay = nullptr;
-
 using f_gdk_x11_window_get_xid = Window(*)(GdkWindow *window);
 f_gdk_x11_window_get_xid gdk_x11_window_get_xid = nullptr;
 
@@ -60,7 +52,6 @@ bool GdkHelperLoadGtk2(QLibrary &lib) {
 #if defined DESKTOP_APP_USE_PACKAGED && !defined DESKTOP_APP_USE_PACKAGED_LAZY
 	return false;
 #else // DESKTOP_APP_USE_PACKAGED && !DESKTOP_APP_USE_PACKAGED_LAZY
-	if (!LOAD_SYMBOL(lib, "gdk_x11_drawable_get_xdisplay", gdk_x11_drawable_get_xdisplay)) return false;
 	if (!LOAD_SYMBOL(lib, "gdk_x11_drawable_get_xid", gdk_x11_drawable_get_xid)) return false;
 	return true;
 #endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY
@@ -68,8 +59,6 @@ bool GdkHelperLoadGtk2(QLibrary &lib) {
 
 bool GdkHelperLoadGtk3(QLibrary &lib) {
 	if (!LOAD_SYMBOL(lib, "gdk_x11_window_get_type", gdk_x11_window_get_type)) return false;
-	if (!LOAD_SYMBOL(lib, "gdk_window_get_display", gdk_window_get_display)) return false;
-	if (!LOAD_SYMBOL(lib, "gdk_x11_display_get_xdisplay", gdk_x11_display_get_xdisplay)) return false;
 	if (!LOAD_SYMBOL(lib, "gdk_x11_window_get_xid", gdk_x11_window_get_xid)) return false;
 	return true;
 }
@@ -89,14 +78,26 @@ bool GdkHelperLoaded() {
 
 void XSetTransientForHint(GdkWindow *window, quintptr winId) {
 	if (gdk_helper_loaded == GtkLoaded::Gtk2) {
-		::XSetTransientForHint(gdk_x11_drawable_get_xdisplay(window),
-							   gdk_x11_drawable_get_xid(window),
-							   winId);
+		xcb_change_property(
+			base::Platform::XCB::GetConnectionFromQt(),
+			XCB_PROP_MODE_REPLACE,
+			gdk_x11_drawable_get_xid(window),
+			XCB_ATOM_WM_TRANSIENT_FOR,
+			XCB_ATOM_WINDOW,
+			32,
+			1,
+			&winId);
 	} else if (gdk_helper_loaded == GtkLoaded::Gtk3) {
 		if (gdk_is_x11_window_check(window)) {
-			::XSetTransientForHint(gdk_x11_display_get_xdisplay(gdk_window_get_display(window)),
-								   gdk_x11_window_get_xid(window),
-								   winId);
+			xcb_change_property(
+				base::Platform::XCB::GetConnectionFromQt(),
+				XCB_PROP_MODE_REPLACE,
+				gdk_x11_window_get_xid(window),
+				XCB_ATOM_WM_TRANSIENT_FOR,
+				XCB_ATOM_WINDOW,
+				32,
+				1,
+				&winId);
 		}
 	}
 }

From 1b624d67b8cf1ca888b37133a6d3eaf7fc240ac3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 14 Dec 2020 16:52:18 +0400
Subject: [PATCH 295/370] Support voice chats in legacy groups, with migration.

---
 Telegram/SourceFiles/api/api_updates.cpp      | 136 +++++++++---------
 Telegram/SourceFiles/api/api_updates.h        |   8 +-
 .../SourceFiles/calls/calls_group_call.cpp    |  65 +++++----
 Telegram/SourceFiles/calls/calls_group_call.h |  10 +-
 .../SourceFiles/calls/calls_group_members.cpp |  60 +++++---
 .../SourceFiles/calls/calls_group_members.h   |   1 +
 .../SourceFiles/calls/calls_group_panel.cpp   | 107 +++++++-------
 .../SourceFiles/calls/calls_group_panel.h     |   7 +-
 .../calls/calls_group_settings.cpp            |  53 ++++---
 Telegram/SourceFiles/calls/calls_instance.cpp |  19 +--
 Telegram/SourceFiles/calls/calls_instance.h   |   4 +-
 Telegram/SourceFiles/calls/calls_top_bar.cpp  |  25 +++-
 Telegram/SourceFiles/data/data_channel.cpp    |  32 +++--
 Telegram/SourceFiles/data/data_channel.h      |  16 +--
 Telegram/SourceFiles/data/data_chat.cpp       |  61 ++++++++
 Telegram/SourceFiles/data/data_chat.h         |  13 +-
 Telegram/SourceFiles/data/data_group_call.cpp |  89 +++++++-----
 Telegram/SourceFiles/data/data_group_call.h   |  12 +-
 Telegram/SourceFiles/data/data_peer.cpp       |  20 +++
 Telegram/SourceFiles/data/data_peer.h         |   4 +
 Telegram/SourceFiles/data/data_session.cpp    |  25 +++-
 Telegram/SourceFiles/data/data_session.h      |   2 +-
 Telegram/SourceFiles/history/history.cpp      |   6 +-
 .../SourceFiles/history/history_service.cpp   | 127 ++++++++--------
 .../SourceFiles/history/history_widget.cpp    |  11 +-
 .../view/history_view_group_call_tracker.cpp  |  16 +--
 .../view/history_view_group_call_tracker.h    |   4 +-
 .../view/history_view_top_bar_widget.cpp      |  25 +---
 .../window/window_session_controller.cpp      |  13 +-
 .../window/window_session_controller.h        |   2 +-
 30 files changed, 584 insertions(+), 389 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 54ca13e7f..48013f6fc 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -237,18 +237,16 @@ Updates::Updates(not_null<Main::Session*> session)
 	using namespace rpl::mappers;
 	base::ObservableViewer(
 		api().fullPeerUpdated()
-	) | rpl::map([=](not_null<PeerData*> peer) {
-		return peer->asChannel();
-	}) | rpl::filter(
-		_1 != nullptr
-	) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
-		if (const auto users = _pendingSpeakingCallMembers.take(channel)) {
-			if (const auto call = channel->call()) {
+	) | rpl::filter([](not_null<PeerData*> peer) {
+		return peer->isChat() || peer->isMegagroup();
+	}) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+		if (const auto users = _pendingSpeakingCallMembers.take(peer)) {
+			if (const auto call = peer->groupCall()) {
 				for (const auto [userId, when] : *users) {
 					call->applyActiveUpdate(
 						userId,
 						when,
-						channel->owner().userLoaded(userId));
+						peer->owner().userLoaded(userId));
 				}
 			}
 		}
@@ -911,6 +909,52 @@ bool Updates::isQuitPrevent() {
 	updateOnline();
 	return true;
 }
+void Updates::handleSendActionUpdate(
+		PeerId peerId,
+		MsgId rootId,
+		UserId userId,
+		const MTPSendMessageAction &action) {
+	const auto history = session().data().historyLoaded(peerId);
+	if (!history) {
+		return;
+	}
+	const auto peer = history->peer;
+	const auto user = (userId == session().userId())
+		? session().user().get()
+		: session().data().userLoaded(userId);
+	const auto isSpeakingInCall = (action.type()
+		== mtpc_speakingInGroupCallAction);
+	if (isSpeakingInCall) {
+		const auto call = peer->groupCall();
+		const auto now = crl::now();
+		if (call) {
+			call->applyActiveUpdate(userId, now, user);
+		} else {
+			const auto chat = peer->asChat();
+			const auto channel = peer->asChannel();
+			const auto active = chat
+				? (chat->flags() & MTPDchat::Flag::f_call_active)
+				: (channel->flags() & MTPDchannel::Flag::f_call_active);
+			if (active) {
+				_pendingSpeakingCallMembers.emplace(
+					channel).first->second[userId] = now;
+				session().api().requestFullPeer(channel);
+			}
+		}
+	}
+	if (!user || user->isSelf()) {
+		return;
+	}
+	const auto when = requestingDifference()
+		? 0
+		: base::unixtime::now();
+	session().data().registerSendAction(
+		history,
+		rootId,
+		user,
+		action,
+		when);
+}
 
 void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 	switch (updates.type()) {
@@ -1601,75 +1645,29 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 
 	case mtpc_updateUserTyping: {
 		auto &d = update.c_updateUserTyping();
-		const auto userId = peerFromUser(d.vuser_id());
-		const auto history = session().data().historyLoaded(userId);
-		const auto user = session().data().userLoaded(d.vuser_id().v);
-		if (history && user) {
-			const auto when = requestingDifference() ? 0 : base::unixtime::now();
-			session().data().registerSendAction(
-				history,
-				MsgId(),
-				user,
-				d.vaction(),
-				when);
-		}
+		handleSendActionUpdate(
+			peerFromUser(d.vuser_id()),
+			0,
+			d.vuser_id().v,
+			d.vaction());
 	} break;
 
 	case mtpc_updateChatUserTyping: {
 		auto &d = update.c_updateChatUserTyping();
-		const auto history = session().data().historyLoaded(
-			peerFromChat(d.vchat_id()));
-		const auto user = (d.vuser_id().v == session().userId())
-			? nullptr
-			: session().data().userLoaded(d.vuser_id().v);
-		if (history && user) {
-			const auto when = requestingDifference() ? 0 : base::unixtime::now();
-			session().data().registerSendAction(
-				history,
-				MsgId(),
-				user,
-				d.vaction(),
-				when);
-		}
+		handleSendActionUpdate(
+			peerFromChat(d.vchat_id()),
+			0,
+			d.vuser_id().v,
+			d.vaction());
 	} break;
 
 	case mtpc_updateChannelUserTyping: {
 		const auto &d = update.c_updateChannelUserTyping();
-		const auto history = session().data().historyLoaded(
-			peerFromChannel(d.vchannel_id()));
-		if (history) {
-			const auto userId = d.vuser_id().v;
-			const auto user = (userId == session().userId())
-				? session().user().get()
-				: session().data().userLoaded(userId);
-			const auto isSpeakingInCall = (d.vaction().type()
-				== mtpc_speakingInGroupCallAction);
-			if (isSpeakingInCall) {
-				const auto channel = history->peer->asChannel();
-				const auto call = channel->call();
-				const auto now = crl::now();
-				if (call) {
-					call->applyActiveUpdate(userId, now, user);
-				} else if (channel->flags()
-					& MTPDchannel::Flag::f_call_active) {
-					_pendingSpeakingCallMembers.emplace(
-						channel).first->second[userId] = now;
-					session().api().requestFullPeer(channel);
-				}
-			}
-			if (user && !user->isSelf()) {
-				const auto when = requestingDifference()
-					? 0
-					: base::unixtime::now();
-				const auto rootId = d.vtop_msg_id().value_or_empty();
-				session().data().registerSendAction(
-					history,
-					rootId,
-					user,
-					d.vaction(),
-					when);
-			}
-		}
+		handleSendActionUpdate(
+			peerFromChannel(d.vchannel_id()),
+			d.vtop_msg_id().value_or_empty(),
+			d.vuser_id().v,
+			d.vaction());
 	} break;
 
 	case mtpc_updateChatParticipants: {
diff --git a/Telegram/SourceFiles/api/api_updates.h b/Telegram/SourceFiles/api/api_updates.h
index dac0cf9c1..e6ca8502c 100644
--- a/Telegram/SourceFiles/api/api_updates.h
+++ b/Telegram/SourceFiles/api/api_updates.h
@@ -122,6 +122,12 @@ private:
 		base::flat_map<not_null<ChannelData*>, crl::time> &whenMap,
 		crl::time &curTime);
 
+	void handleSendActionUpdate(
+		PeerId peerId,
+		MsgId rootId,
+		UserId userId,
+		const MTPSendMessageAction &action);
+
 	const not_null<Main::Session*> _session;
 
 	int32 _updatesDate = 0;
@@ -161,7 +167,7 @@ private:
 
 	base::flat_map<int, ActiveChatTracker> _activeChats;
 	base::flat_map<
-		not_null<ChannelData*>,
+		not_null<PeerData*>,
 		base::flat_map<UserId, crl::time>> _pendingSpeakingCallMembers;
 
 	mtpRequestId _onlineRequest = 0;
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index fc27f6f68..18e999db3 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -12,13 +12,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "lang/lang_keys.h"
 #include "lang/lang_hardcoded.h"
-#include "boxes/confirm_box.h"
+#include "boxes/peers/edit_participants_box.h" // SubscribeToMigration.
 #include "ui/toasts/common_toasts.h"
 #include "base/unixtime.h"
 #include "core/application.h"
 #include "core/core_settings.h"
 #include "data/data_changes.h"
 #include "data/data_user.h"
+#include "data/data_chat.h"
 #include "data/data_channel.h"
 #include "data/data_group_call.h"
 #include "data/data_session.h"
@@ -46,12 +47,12 @@ constexpr auto kUpdateSendActionEach = crl::time(500);
 
 GroupCall::GroupCall(
 	not_null<Delegate*> delegate,
-	not_null<ChannelData*> channel,
+	not_null<PeerData*> peer,
 	const MTPInputGroupCall &inputCall)
 : _delegate(delegate)
-, _channel(channel)
-, _history(channel->owner().history(channel))
-, _api(&_channel->session().mtp())
+, _peer(peer)
+, _history(peer->owner().history(peer))
+, _api(&peer->session().mtp())
 , _lastSpokeCheckTimer([=] { checkLastSpoke(); })
 , _checkJoinedTimer([=] { checkJoined(); })
 , _pushToTalkCancelTimer([=] { pushToTalkCancel(); }) {
@@ -70,8 +71,8 @@ GroupCall::GroupCall(
 
 	const auto id = inputCall.c_inputGroupCall().vid().v;
 	if (id) {
-		if (const auto call = _channel->call(); call && call->id() == id) {
-			if (!_channel->canManageCall() && call->joinMuted()) {
+		if (const auto call = _peer->groupCall(); call && call->id() == id) {
+			if (!_peer->canManageGroupCall() && call->joinMuted()) {
 				_muted = MuteState::ForceMuted;
 			}
 		}
@@ -113,7 +114,7 @@ void GroupCall::setState(State state) {
 			_pushToTalkStarted = true;
 			applyGlobalShortcutChanges();
 		}
-		if (const auto call = _channel->call(); call && call->id() == _id) {
+		if (const auto call = _peer->groupCall(); call && call->id() == _id) {
 			call->setInCall();
 		}
 	}
@@ -142,11 +143,11 @@ void GroupCall::setState(State state) {
 
 void GroupCall::start() {
 	_createRequestId = _api.request(MTPphone_CreateGroupCall(
-		_channel->input,
+		_peer->input,
 		MTP_int(rand_value<int32>())
 	)).done([=](const MTPUpdates &result) {
 		_acceptFields = true;
-		_channel->session().api().applyUpdates(result);
+		_peer->session().api().applyUpdates(result);
 		_acceptFields = false;
 	}).fail([=](const RPCError &error) {
 		LOG(("Call Error: Could not create, error: %1"
@@ -162,7 +163,13 @@ void GroupCall::start() {
 
 void GroupCall::join(const MTPInputGroupCall &inputCall) {
 	setState(State::Joining);
-	_channel->setCall(inputCall);
+	if (const auto chat = _peer->asChat()) {
+		chat->setGroupCall(inputCall);
+	} else if (const auto group = _peer->asMegagroup()) {
+		group->setGroupCall(inputCall);
+	} else {
+		Unexpected("Peer type in GroupCall::join.");
+	}
 
 	inputCall.match([&](const MTPDinputGroupCall &data) {
 		_id = data.vid().v;
@@ -171,7 +178,7 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 	});
 
 	using Update = Data::GroupCall::ParticipantUpdate;
-	_channel->call()->participantUpdated(
+	_peer->groupCall()->participantUpdated(
 	) | rpl::filter([=](const Update &update) {
 		return (_instance != nullptr) && !update.now;
 	}) | rpl::start_with_next([=](const Update &update) {
@@ -179,6 +186,10 @@ void GroupCall::join(const MTPInputGroupCall &inputCall) {
 
 		_instance->removeSsrcs({ update.was->ssrc });
 	}, _lifetime);
+
+	SubscribeToMigration(_peer, _lifetime, [=](not_null<ChannelData*> group) {
+		_peer = group;
+	});
 }
 
 void GroupCall::rejoin() {
@@ -234,7 +245,7 @@ void GroupCall::rejoin() {
 					: State::Connecting);
 				applySelfInCallLocally();
 				maybeSendMutedUpdate(wasMuteState);
-				_channel->session().api().applyUpdates(updates);
+				_peer->session().api().applyUpdates(updates);
 			}).fail([=](const RPCError &error) {
 				const auto type = error.type();
 				LOG(("Call Error: Could not join, error: %1").arg(type));
@@ -260,13 +271,13 @@ void GroupCall::rejoin() {
 }
 
 void GroupCall::applySelfInCallLocally() {
-	const auto call = _channel->call();
+	const auto call = _peer->groupCall();
 	if (!call || call->id() != _id) {
 		return;
 	}
 	using Flag = MTPDgroupCallParticipant::Flag;
 	const auto &participants = call->participants();
-	const auto self = _channel->session().user();
+	const auto self = _peer->session().user();
 	const auto i = ranges::find(
 		participants,
 		self,
@@ -312,7 +323,7 @@ void GroupCall::discard() {
 		// Here 'this' could be destroyed by updates, so we set Ended after
 		// updates being handled, but in a guarded way.
 		crl::on_main(this, [=] { hangup(); });
-		_channel->session().api().applyUpdates(result);
+		_peer->session().api().applyUpdates(result);
 	}).fail([=](const RPCError &error) {
 		hangup();
 	}).send();
@@ -343,7 +354,7 @@ void GroupCall::finish(FinishType type) {
 
 	// We want to leave request still being sent and processed even if
 	// the call is already destroyed.
-	const auto session = &_channel->session();
+	const auto session = &_peer->session();
 	const auto weak = base::make_weak(this);
 	session->api().request(MTPphone_LeaveGroupCall(
 		inputCall(),
@@ -458,7 +469,7 @@ void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
 		return;
 	}
 
-	const auto self = _channel->session().userId();
+	const auto self = _peer->session().userId();
 	for (const auto &participant : data.vparticipants().v) {
 		participant.match([&](const MTPDgroupCallParticipant &data) {
 			if (data.vuser_id().v != self) {
@@ -565,7 +576,7 @@ void GroupCall::handleLevelsUpdated(
 			&& (!_lastSendProgressUpdate
 				|| _lastSendProgressUpdate + kUpdateSendActionEach < now)) {
 			_lastSendProgressUpdate = now;
-			_channel->session().sendProgressManager().update(
+			_peer->session().sendProgressManager().update(
 				_history,
 				Api::SendProgressType::Speaking);
 		}
@@ -600,7 +611,7 @@ void GroupCall::audioLevelsUpdated(
 }
 
 void GroupCall::checkLastSpoke() {
-	const auto real = _channel->call();
+	const auto real = _peer->groupCall();
 	if (!real || real->id() != _id) {
 		return;
 	}
@@ -683,7 +694,7 @@ void GroupCall::sendMutedUpdate() {
 		MTP_inputUserSelf()
 	)).done([=](const MTPUpdates &result) {
 		_updateMuteRequestId = 0;
-		_channel->session().api().applyUpdates(result);
+		_peer->session().api().applyUpdates(result);
 	}).fail([=](const RPCError &error) {
 		_updateMuteRequestId = 0;
 		if (error.type() == u"GROUPCALL_FORBIDDEN"_q) {
@@ -716,7 +727,7 @@ void GroupCall::toggleMute(not_null<UserData*> user, bool mute) {
 		inputCall(),
 		user->inputUser
 	)).done([=](const MTPUpdates &result) {
-		_channel->session().api().applyUpdates(result);
+		_peer->session().api().applyUpdates(result);
 	}).fail([=](const RPCError &error) {
 		if (error.type() == u"GROUPCALL_FORBIDDEN"_q) {
 			LOG(("Call Info: Rejoin after error '%1' in editGroupCallMember."
@@ -728,11 +739,11 @@ void GroupCall::toggleMute(not_null<UserData*> user, bool mute) {
 
 std::variant<int, not_null<UserData*>> GroupCall::inviteUsers(
 		const std::vector<not_null<UserData*>> &users) {
-	const auto real = _channel->call();
+	const auto real = _peer->groupCall();
 	if (!real || real->id() != _id) {
 		return 0;
 	}
-	const auto owner = &_channel->owner();
+	const auto owner = &_peer->owner();
 	const auto &invited = owner->invitedToCallUsers(_id);
 	const auto &participants = real->participants();
 	auto &&toInvite = users | ranges::view::filter([&](
@@ -753,7 +764,7 @@ std::variant<int, not_null<UserData*>> GroupCall::inviteUsers(
 			inputCall(),
 			MTP_vector<MTPInputUser>(slice)
 		)).done([=](const MTPUpdates &result) {
-			_channel->session().api().applyUpdates(result);
+			_peer->session().api().applyUpdates(result);
 		}).send();
 		slice.clear();
 	};
@@ -761,7 +772,7 @@ std::variant<int, not_null<UserData*>> GroupCall::inviteUsers(
 		if (!count && slice.empty()) {
 			result = user;
 		}
-		owner->registerInvitedToCallUser(_id, _channel, user);
+		owner->registerInvitedToCallUser(_id, _peer, user);
 		slice.push_back(user->inputUser);
 		if (slice.size() == kMaxInvitePerSlice) {
 			sendSlice();
@@ -869,7 +880,7 @@ void GroupCall::handleControllerError(const QString &error) {
 		//		"{user}",
 		//		_user->name)));
 	} else if (error == u"ERROR_AUDIO_IO"_q) {
-		Ui::show(Box<InformBox>(tr::lng_call_error_audio_io(tr::now)));
+		//Ui::show(Box<InformBox>(tr::lng_call_error_audio_io(tr::now)));
 	}
 	//finish(FinishType::Failed);
 }
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index d2fcde07c..9b2b802e9 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -61,15 +61,15 @@ public:
 
 	GroupCall(
 		not_null<Delegate*> delegate,
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		const MTPInputGroupCall &inputCall);
 	~GroupCall();
 
 	[[nodiscard]] uint64 id() const {
 		return _id;
 	}
-	[[nodiscard]] not_null<ChannelData*> channel() const {
-		return _channel;
+	[[nodiscard]] not_null<PeerData*> peer() const {
+		return _peer;
 	}
 
 	void start();
@@ -161,8 +161,8 @@ private:
 	[[nodiscard]] MTPInputGroupCall inputCall() const;
 
 	const not_null<Delegate*> _delegate;
-	const not_null<ChannelData*> _channel;
-	const not_null<History*> _history;
+	not_null<PeerData*> _peer; // Can change in legacy group migration.
+	not_null<History*> _history; // Can change in legacy group migration.
 	MTP::Sender _api;
 	rpl::variable<State> _state = State::Creating;
 	bool _instanceConnected = false;
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index f7ba37e17..cfffc4696 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "calls/calls_group_call.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_user.h"
 #include "data/data_changes.h"
 #include "data/data_group_call.h"
@@ -24,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_domain.h" // Core::App().domain().activate.
 #include "main/main_session.h"
 #include "base/timer.h"
-#include "boxes/peers/edit_participants_box.h"
+#include "boxes/peers/edit_participants_box.h" // SubscribeToMigration.
 #include "lang/lang_keys.h"
 #include "window/window_controller.h" // Controller::sessionController.
 #include "window/window_session_controller.h"
@@ -237,7 +238,7 @@ private:
 	[[nodiscard]] Data::GroupCall *resolvedRealCall() const;
 
 	const base::weak_ptr<GroupCall> _call;
-	const not_null<ChannelData*> _channel;
+	not_null<PeerData*> _peer;
 
 	// Use only resolvedRealCall() method, not this value directly.
 	Data::GroupCall *_realCallRawValue = nullptr;
@@ -518,7 +519,7 @@ MembersController::MembersController(
 	not_null<GroupCall*> call,
 	not_null<QWidget*> menuParent)
 : _call(call)
-, _channel(call->channel())
+, _peer(call->peer())
 , _menuParent(menuParent)
 , _inactiveCrossLine(st::groupCallMemberInactiveCrossLine)
 , _coloredCrossLine(st::groupCallMemberColoredCrossLine) {
@@ -573,12 +574,12 @@ MembersController::~MembersController() {
 }
 
 void MembersController::setupListChangeViewers(not_null<GroupCall*> call) {
-	const auto channel = call->channel();
-	channel->session().changes().peerFlagsValue(
-		channel,
+	const auto peer = call->peer();
+	peer->session().changes().peerFlagsValue(
+		peer,
 		Data::PeerUpdate::Flag::GroupCall
 	) | rpl::map([=] {
-		return channel->call();
+		return peer->groupCall();
 	}) | rpl::filter([=](Data::GroupCall *real) {
 		const auto call = _call.get();
 		return call && real && (real->id() == call->id());
@@ -591,7 +592,7 @@ void MembersController::setupListChangeViewers(not_null<GroupCall*> call) {
 	call->stateValue(
 	) | rpl::start_with_next([=] {
 		const auto call = _call.get();
-		const auto real = channel->call();
+		const auto real = peer->groupCall();
 		if (call && real && (real->id() == call->id())) {
 			//updateRow(channel->session().user());
 		}
@@ -751,14 +752,14 @@ Row *MembersController::findRow(not_null<UserData*> user) const {
 
 Data::GroupCall *MembersController::resolvedRealCall() const {
 	return (_realCallRawValue
-		&& (_channel->call() == _realCallRawValue)
+		&& (_peer->groupCall() == _realCallRawValue)
 		&& (_realCallRawValue->id() == _realId))
 		? _realCallRawValue
 		: nullptr;
 }
 
 Main::Session &MembersController::session() const {
-	return _call->channel()->session();
+	return _call->peer()->session();
 }
 
 void MembersController::prepare() {
@@ -768,7 +769,7 @@ void MembersController::prepare() {
 	setSearchNoResultsText(tr::lng_blocked_list_not_found(tr::now));
 
 	const auto call = _call.get();
-	if (const auto real = _channel->call();
+	if (const auto real = _peer->groupCall();
 		real && call && real->id() == call->id()) {
 		prepareRows(real);
 	} else if (auto row = createSelfRow()) {
@@ -804,10 +805,10 @@ void MembersController::prepareRows(not_null<Data::GroupCall*> real) {
 		}
 	}
 	if (!foundSelf) {
-		const auto self = _channel->session().user();
+		const auto self = _peer->session().user();
 		const auto i = ranges::find(
 			participants,
-			_channel->session().user(),
+			_peer->session().user(),
 			&Data::GroupCall::Participant::user);
 		auto row = (i != end(participants)) ? createRow(*i) : createSelfRow();
 		if (row) {
@@ -827,7 +828,7 @@ void MembersController::prepareRows(not_null<Data::GroupCall*> real) {
 }
 
 void MembersController::loadMoreRows() {
-	if (const auto real = _channel->call()) {
+	if (const auto real = _peer->groupCall()) {
 		real->requestParticipants();
 	}
 }
@@ -838,7 +839,7 @@ auto MembersController::toggleMuteRequests() const
 }
 
 bool MembersController::rowCanMuteMembers() {
-	return _channel->canManageCall();
+	return _peer->canManageGroupCall();
 }
 
 void MembersController::rowUpdateRow(not_null<Row*> row) {
@@ -999,7 +1000,7 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 		_kickMemberRequests.fire_copy(user);
 	});
 
-	if (_channel->canManageCall()) {
+	if (_peer->canManageGroupCall()) {
 		result->addAction(
 			(mute
 				? tr::lng_group_call_context_mute(tr::now)
@@ -1012,7 +1013,16 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 	result->addAction(
 		tr::lng_context_send_message(tr::now),
 		showHistory);
-	if (_channel->canRestrictUser(user)) {
+	const auto canKick = [&] {
+		if (const auto chat = _peer->asChat()) {
+			return chat->amCreator()
+				|| (chat->canBanMembers() && !chat->admins.contains(user));
+		} else if (const auto group = _peer->asMegagroup()) {
+			return group->canRestrictUser(user);
+		}
+		return false;
+	}();
+	if (canKick) {
 		result->addAction(
 			tr::lng_context_remove_from_group(tr::now),
 			removeFromGroup);
@@ -1021,7 +1031,7 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 }
 
 std::unique_ptr<Row> MembersController::createSelfRow() {
-	const auto self = _channel->session().user();
+	const auto self = _peer->session().user();
 	auto result = std::make_unique<Row>(this, self);
 	updateRow(result.get(), nullptr);
 	return result;
@@ -1075,7 +1085,7 @@ int GroupMembers::desiredHeight() const {
 	auto desired = _header ? _header->height() : 0;
 	auto count = [&] {
 		if (const auto call = _call.get()) {
-			if (const auto real = call->channel()->call()) {
+			if (const auto real = call->peer()->groupCall()) {
 				if (call->id() == real->id()) {
 					return real->fullCount();
 				}
@@ -1138,9 +1148,15 @@ object_ptr<Ui::FlatLabel> GroupMembers::setupTitle(
 void GroupMembers::setupButtons(not_null<GroupCall*> call) {
 	using namespace rpl::mappers;
 
-	_addMember->showOn(Data::CanWriteValue(
-		call->channel().get()
-	));
+	_canAddMembers = Data::CanWriteValue(call->peer().get());
+	SubscribeToMigration(
+		call->peer(),
+		lifetime(),
+		[=](not_null<ChannelData*> channel) {
+			_canAddMembers = Data::CanWriteValue(channel.get());
+		});
+
+	_addMember->showOn(_canAddMembers.value());
 	_addMember->addClickHandler([=] { // TODO throttle(ripple duration)
 		_addMemberRequests.fire({});
 	});
diff --git a/Telegram/SourceFiles/calls/calls_group_members.h b/Telegram/SourceFiles/calls/calls_group_members.h
index de42404ee..d886d288c 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.h
+++ b/Telegram/SourceFiles/calls/calls_group_members.h
@@ -86,6 +86,7 @@ private:
 	Ui::RpWidget *_titleWrap = nullptr;
 	Ui::FlatLabel *_title = nullptr;
 	Ui::IconButton *_addMember = nullptr;
+	rpl::variable<bool> _canAddMembers;
 
 };
 
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index d2486af57..651e23edc 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "lang/lang_keys.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_user.h"
 #include "data/data_group_call.h"
 #include "data/data_session.h"
@@ -47,7 +48,7 @@ namespace {
 class InviteController final : public ParticipantsBoxController {
 public:
 	InviteController(
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		base::flat_set<not_null<UserData*>> alreadyIn,
 		int fullInCount);
 
@@ -65,7 +66,6 @@ public:
 		not_null<GroupCall*> call) const;
 
 private:
-	void updateTitle() const;
 	[[nodiscard]] int alreadyInCount() const;
 	[[nodiscard]] bool isAlreadyIn(not_null<UserData*> user) const;
 	[[nodiscard]] int fullCount() const;
@@ -73,7 +73,7 @@ private:
 	std::unique_ptr<PeerListRow> createRow(
 		not_null<UserData*> user) const override;
 
-	const not_null<ChannelData*> _channel;
+	not_null<PeerData*> _peer;
 	const base::flat_set<not_null<UserData*>> _alreadyIn;
 	const int _fullInCount = 0;
 	mutable base::flat_set<not_null<UserData*>> _skippedUsers;
@@ -81,24 +81,27 @@ private:
 };
 
 InviteController::InviteController(
-	not_null<ChannelData*> channel,
+	not_null<PeerData*> peer,
 	base::flat_set<not_null<UserData*>> alreadyIn,
 	int fullInCount)
-: ParticipantsBoxController(CreateTag{}, nullptr, channel, Role::Members)
-, _channel(channel)
+: ParticipantsBoxController(CreateTag{}, nullptr, peer, Role::Members)
+, _peer(peer)
 , _alreadyIn(std::move(alreadyIn))
 , _fullInCount(std::max(fullInCount, int(_alreadyIn.size()))) {
-	_skippedUsers.emplace(channel->session().user());
+	_skippedUsers.emplace(peer->session().user());
+	SubscribeToMigration(
+		_peer,
+		lifetime(),
+		[=](not_null<ChannelData*> channel) { _peer = channel; });
 }
 
 void InviteController::prepare() {
 	ParticipantsBoxController::prepare();
-	updateTitle();
+	delegate()->peerListSetTitle(tr::lng_group_call_invite_title());
 }
 
 void InviteController::rowClicked(not_null<PeerListRow*> row) {
 	delegate()->peerListSetRowChecked(row, !row->checked());
-	updateTitle();
 }
 
 base::unique_qptr<Ui::PopupMenu> InviteController::rowContextMenu(
@@ -108,7 +111,6 @@ base::unique_qptr<Ui::PopupMenu> InviteController::rowContextMenu(
 }
 
 void InviteController::itemDeselectedHook(not_null<PeerData*> peer) {
-	updateTitle();
 }
 
 int InviteController::alreadyInCount() const {
@@ -126,9 +128,7 @@ int InviteController::fullCount() const {
 std::unique_ptr<PeerListRow> InviteController::createRow(
 		not_null<UserData*> user) const {
 	if (user->isSelf() || user->isBot()) {
-		if (_skippedUsers.emplace(user).second) {
-			updateTitle();
-		}
+		_skippedUsers.emplace(user);
 		return nullptr;
 	}
 	auto result = std::make_unique<PeerListRow>(user);
@@ -138,20 +138,6 @@ std::unique_ptr<PeerListRow> InviteController::createRow(
 	return result;
 }
 
-void InviteController::updateTitle() const {
-	const auto inOrInvited = fullCount() - 1; // minus self
-	const auto canBeInvited = std::max({
-		delegate()->peerListFullRowsCount(), // minus self and bots
-		_channel->membersCount() - int(_skippedUsers.size()), // self + bots
-		inOrInvited
-	});
-	const auto additional = canBeInvited
-		? qsl("%1 / %2").arg(inOrInvited).arg(canBeInvited)
-		: QString();
-	delegate()->peerListSetTitle(tr::lng_group_call_invite_title());
-	delegate()->peerListSetAdditionalTitle(rpl::single(additional));
-}
-
 std::variant<int, not_null<UserData*>> InviteController::inviteSelectedUsers(
 		not_null<PeerListBox*> box,
 		not_null<GroupCall*> call) const {
@@ -180,7 +166,7 @@ void LeaveGroupCallBox(
 		box.get(),
 		tr::lng_group_call_leave_sure(),
 		(inCall ? st::groupCallBoxLabel : st::boxLabel)));
-	const auto discard = call->channel()->canManageCall()
+	const auto discard = call->peer()->canManageGroupCall()
 		? box->addRow(object_ptr<Ui::Checkbox>(
 			box.get(),
 			tr::lng_group_call_end(),
@@ -211,7 +197,7 @@ void LeaveGroupCallBox(
 
 GroupPanel::GroupPanel(not_null<GroupCall*> call)
 : _call(call)
-, _channel(call->channel())
+, _peer(call->peer())
 , _window(std::make_unique<Ui::Window>(Core::App().getModalParent()))
 , _layerBg(std::make_unique<Ui::LayerManager>(_window->body()))
 #ifdef Q_OS_WIN
@@ -232,6 +218,11 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
 	_settings->setColorOverrides(_mute->colorOverrides());
 
+	SubscribeToMigration(
+		_peer,
+		_window->lifetime(),
+		[=](not_null<ChannelData*> channel) { migrate(channel); });
+
 	initWindow();
 	initWidget();
 	initControls();
@@ -260,6 +251,22 @@ void GroupPanel::showAndActivate() {
 	_window->setFocus();
 }
 
+void GroupPanel::migrate(not_null<ChannelData*> channel) {
+	_peer = channel;
+	_peerLifetime.destroy();
+	subscribeToPeerChanges();
+	_title.destroy();
+	refreshTitle();
+}
+
+void GroupPanel::subscribeToPeerChanges() {
+	Info::Profile::NameValue(
+		_peer
+	) | rpl::start_with_next([=](const TextWithEntities &name) {
+		_window->setTitle(name.text);
+	}, _peerLifetime);
+}
+
 void GroupPanel::initWindow() {
 	_window->setAttribute(Qt::WA_OpaquePaintEvent);
 	_window->setAttribute(Qt::WA_NoSystemBackground);
@@ -267,11 +274,7 @@ void GroupPanel::initWindow() {
 		QIcon(QPixmap::fromImage(Image::Empty()->original(), Qt::ColorOnly)));
 	_window->setTitleStyle(st::callTitle);
 
-	Info::Profile::NameValue(
-		_channel
-	) | rpl::start_with_next([=](const TextWithEntities &name) {
-		_window->setTitle(name.text);
-	}, _window->lifetime());
+	subscribeToPeerChanges();
 
 	base::install_event_filter(_window.get(), [=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::Close && handleClose()) {
@@ -360,7 +363,7 @@ void GroupPanel::initWithCall(GroupCall *call) {
 		return;
 	}
 
-	_channel = _call->channel();
+	_peer = _call->peer();
 
 	call->stateValue(
 	) | rpl::filter([](State state) {
@@ -428,17 +431,17 @@ void GroupPanel::initWithCall(GroupCall *call) {
 }
 
 void GroupPanel::addMembers() {
-	const auto real = _channel->call();
+	const auto real = _peer->groupCall();
 	if (!_call || !real || real->id() != _call->id()) {
 		return;
 	}
-	auto alreadyIn = _channel->owner().invitedToCallUsers(real->id());
+	auto alreadyIn = _peer->owner().invitedToCallUsers(real->id());
 	for (const auto &participant : real->participants()) {
 		alreadyIn.emplace(participant.user);
 	}
-	alreadyIn.emplace(_channel->session().user());
+	alreadyIn.emplace(_peer->session().user());
 	auto controller = std::make_unique<InviteController>(
-		_channel,
+		_peer,
 		std::move(alreadyIn),
 		real->fullCount());
 	controller->setStyleOverrides(
@@ -511,17 +514,21 @@ void GroupPanel::kickMember(not_null<UserData*> user) {
 }
 
 void GroupPanel::kickMemberSure(not_null<UserData*> user) {
-	const auto currentRestrictedRights = [&]() -> MTPChatBannedRights {
-		const auto it = _channel->mgInfo->lastRestricted.find(user);
-		return (it != _channel->mgInfo->lastRestricted.cend())
-			? it->second.rights
-			: MTP_chatBannedRights(MTP_flags(0), MTP_int(0));
-	}();
+	if (const auto chat = _peer->asChat()) {
+		chat->session().api().kickParticipant(chat, user);
+	} else if (const auto channel = _peer->asChannel()) {
+		const auto currentRestrictedRights = [&]() -> MTPChatBannedRights {
+			const auto it = channel->mgInfo->lastRestricted.find(user);
+			return (it != channel->mgInfo->lastRestricted.cend())
+				? it->second.rights
+				: MTP_chatBannedRights(MTP_flags(0), MTP_int(0));
+		}();
 
-	_channel->session().api().kickParticipant(
-		_channel,
-		user,
-		currentRestrictedRights);
+		channel->session().api().kickParticipant(
+			channel,
+			user,
+			currentRestrictedRights);
+	}
 }
 
 void GroupPanel::initLayout() {
@@ -612,7 +619,7 @@ void GroupPanel::refreshTitle() {
 		if (!_title) {
 			_title.create(
 				widget(),
-				Info::Profile::NameValue(_channel),
+				Info::Profile::NameValue(_peer),
 				st::groupCallHeaderLabel);
 			_title->setAttribute(Qt::WA_TransparentForMouseEvents);
 		}
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h
index 2d6a0a3ef..7716ca190 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/calls_group_panel.h
@@ -99,8 +99,11 @@ private:
 	[[nodiscard]] std::optional<QRect> computeTitleRect() const;
 	void refreshTitle();
 
+	void migrate(not_null<ChannelData*> channel);
+	void subscribeToPeerChanges();
+
 	GroupCall *_call = nullptr;
-	not_null<ChannelData*> _channel;
+	not_null<PeerData*> _peer;
 
 	const std::unique_ptr<Ui::Window> _window;
 	const std::unique_ptr<Ui::LayerManager> _layerBg;
@@ -118,6 +121,8 @@ private:
 	std::unique_ptr<Ui::CallMuteButton> _mute;
 	object_ptr<Ui::CallButton> _hangup;
 
+	rpl::lifetime _peerLifetime;
+
 };
 
 } // namespace Calls
diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp
index 04747441b..0a9414506 100644
--- a/Telegram/SourceFiles/calls/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/global_shortcuts.h"
 #include "base/platform/base_platform_info.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_group_call.h"
 #include "core/application.h"
 #include "boxes/single_choice_box.h"
@@ -44,19 +45,19 @@ constexpr auto kDelaysCount = 201;
 constexpr auto kCheckAccessibilityInterval = crl::time(500);
 
 void SaveCallJoinMuted(
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		uint64 callId,
 		bool joinMuted) {
-	const auto call = channel->call();
+	const auto call = peer->groupCall();
 	if (!call
 		|| call->id() != callId
-		|| !channel->canManageCall()
+		|| !peer->canManageGroupCall()
 		|| !call->canChangeJoinMuted()
 		|| call->joinMuted() == joinMuted) {
 		return;
 	}
 	call->setJoinMutedLocally(joinMuted);
-	channel->session().api().request(MTPphone_ToggleGroupCallSettings(
+	peer->session().api().request(MTPphone_ToggleGroupCallSettings(
 		MTP_flags(MTPphone_ToggleGroupCallSettings::Flag::f_join_muted),
 		call->input(),
 		MTP_bool(joinMuted)
@@ -101,8 +102,8 @@ void GroupCallSettingsBox(
 	};
 	const auto state = box->lifetime().make_state<State>();
 
-	const auto channel = call->channel();
-	const auto real = channel->call();
+	const auto peer = call->peer();
+	const auto real = peer->groupCall();
 	const auto id = call->id();
 	const auto goodReal = (real && real->id() == id);
 
@@ -111,7 +112,7 @@ void GroupCallSettingsBox(
 
 	const auto joinMuted = goodReal ? real->joinMuted() : false;
 	const auto canChangeJoinMuted = (goodReal && real->canChangeJoinMuted());
-	const auto addCheck = (channel->canManageCall() && canChangeJoinMuted);
+	const auto addCheck = (peer->canManageGroupCall() && canChangeJoinMuted);
 	if (addCheck) {
 		AddSkip(layout);
 	}
@@ -402,11 +403,24 @@ void GroupCallSettingsBox(
 	//AddSkip(layout);
 
 	const auto lookupLink = [=] {
-		return channel->hasUsername()
-			? channel->session().createInternalLinkFull(channel->username)
-			: channel->inviteLink();
+		if (const auto group = peer->asMegagroup()) {
+			return group->hasUsername()
+				? group->session().createInternalLinkFull(group->username)
+				: group->inviteLink();
+		} else if (const auto chat = peer->asChat()) {
+			return chat->inviteLink();
+		}
+		return QString();
 	};
-	if (!lookupLink().isEmpty() || channel->canHaveInviteLink()) {
+	const auto canCreateLink = [&] {
+		if (const auto chat = peer->asChat()) {
+			return chat->canHaveInviteLink();
+		} else if (const auto group = peer->asMegagroup()) {
+			return group->canHaveInviteLink();
+		}
+		return false;
+	};
+	if (!lookupLink().isEmpty() || canCreateLink()) {
 		const auto copyLink = [=] {
 			const auto link = lookupLink();
 			if (link.isEmpty()) {
@@ -427,12 +441,17 @@ void GroupCallSettingsBox(
 		)->addClickHandler([=] {
 			if (!copyLink() && !state->generatingLink) {
 				state->generatingLink = true;
-				channel->session().api().request(MTPmessages_ExportChatInvite(
-					channel->input
+				peer->session().api().request(MTPmessages_ExportChatInvite(
+					peer->input
 				)).done([=](const MTPExportedChatInvite &result) {
 					if (result.type() == mtpc_chatInviteExported) {
-						channel->setInviteLink(
-							qs(result.c_chatInviteExported().vlink()));
+						const auto link = qs(
+							result.c_chatInviteExported().vlink());
+						if (const auto chat = peer->asChat()) {
+							chat->setInviteLink(link);
+						} else if (const auto channel = peer->asChannel()) {
+							channel->setInviteLink(link);
+						}
 						copyLink();
 					}
 				}).send();
@@ -440,7 +459,7 @@ void GroupCallSettingsBox(
 		});
 	}
 
-	if (channel->canManageCall()) {
+	if (peer->canManageGroupCall()) {
 		AddButton(
 			layout,
 			tr::lng_group_call_end(),
@@ -472,7 +491,7 @@ void GroupCallSettingsBox(
 		if (canChangeJoinMuted
 			&& muteJoined
 			&& muteJoined->toggled() != joinMuted) {
-			SaveCallJoinMuted(channel, id, muteJoined->toggled());
+			SaveCallJoinMuted(peer, id, muteJoined->toggled());
 		}
 	}, box->lifetime());
 	box->addButton(tr::lng_box_done(), [=] {
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index 5e11aefcf..93ffbb202 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/data_group_call.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_session.h"
 #include "media/audio/media_audio_track.h"
 #include "platform/platform_specific.h"
@@ -58,12 +59,12 @@ void Instance::startOutgoingCall(not_null<UserData*> user, bool video) {
 	}), video);
 }
 
-void Instance::startOrJoinGroupCall(not_null<ChannelData*> channel) {
+void Instance::startOrJoinGroupCall(not_null<PeerData*> peer) {
 	destroyCurrentCall();
 
-	const auto call = channel->call();
+	const auto call = peer->groupCall();
 	createGroupCall(
-		channel,
+		peer,
 		call ? call->input() : MTP_inputGroupCall(MTPlong(), MTPlong()));
 }
 
@@ -183,17 +184,17 @@ void Instance::destroyGroupCall(not_null<GroupCall*> call) {
 }
 
 void Instance::createGroupCall(
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		const MTPInputGroupCall &inputCall) {
 	destroyCurrentCall();
 
 	auto call = std::make_unique<GroupCall>(
 		getGroupCallDelegate(),
-		channel,
+		peer,
 		inputCall);
 	const auto raw = call.get();
 
-	channel->session().account().sessionChanges(
+	peer->session().account().sessionChanges(
 	) | rpl::start_with_next([=] {
 		destroyGroupCall(raw);
 	}, raw->lifetime());
@@ -387,7 +388,7 @@ void Instance::handleGroupCallUpdate(
 		existing->applyUpdate(call);
 	}
 	if (_currentGroupCall
-		&& (&_currentGroupCall->channel()->session() == session)) {
+		&& (&_currentGroupCall->peer()->session() == session)) {
 		_currentGroupCall->handleUpdate(call);
 	}
 }
@@ -402,7 +403,7 @@ void Instance::handleGroupCallUpdate(
 		existing->applyUpdate(update);
 	}
 	if (_currentGroupCall
-		&& (&_currentGroupCall->channel()->session() == session)
+		&& (&_currentGroupCall->peer()->session() == session)
 		&& (_currentGroupCall->id() == callId)) {
 		_currentGroupCall->handleUpdate(update);
 	}
@@ -458,7 +459,7 @@ bool Instance::hasActivePanel(not_null<Main::Session*> session) const {
 		return (&_currentCall->user()->session() == session)
 			&& _currentCallPanel->isActive();
 	} else if (inGroupCall()) {
-		return (&_currentGroupCall->channel()->session() == session)
+		return (&_currentGroupCall->peer()->session() == session)
 			&& _currentGroupCallPanel->isActive();
 	}
 	return false;
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index e6e0a3731..0e2820800 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -40,7 +40,7 @@ public:
 	~Instance();
 
 	void startOutgoingCall(not_null<UserData*> user, bool video);
-	void startOrJoinGroupCall(not_null<ChannelData*> channel);
+	void startOrJoinGroupCall(not_null<PeerData*> peer);
 	void handleUpdate(
 		not_null<Main::Session*> session,
 		const MTPUpdate &update);
@@ -94,7 +94,7 @@ private:
 	void destroyCall(not_null<Call*> call);
 
 	void createGroupCall(
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		const MTPInputGroupCall &inputCall);
 	void destroyGroupCall(not_null<GroupCall*> call);
 
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 0d2b14ecb..a8d23213d 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -24,7 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_group_call_tracker.h" // ContentByCall.
 #include "data/data_user.h"
 #include "data/data_group_call.h"
-#include "data/data_channel.h"
+#include "data/data_peer.h"
 #include "data/data_changes.h"
 #include "main/main_session.h"
 #include "boxes/abstract_box.h"
@@ -506,12 +506,12 @@ void TopBar::initBlobsUnder(
 }
 
 void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
-	const auto channel = call->channel();
-	channel->session().changes().peerFlagsValue(
-		channel,
+	const auto peer = call->peer();
+	peer->session().changes().peerFlagsValue(
+		peer,
 		Data::PeerUpdate::Flag::GroupCall
 	) | rpl::map([=] {
-		return channel->call();
+		return peer->groupCall();
 	}) | rpl::filter([=](Data::GroupCall *real) {
 		const auto call = _groupCall.get();
 		return call && real && (real->id() == call->id());
@@ -550,6 +550,17 @@ void TopBar::subscribeToMembersChanges(not_null<GroupCall*> call) {
 		}
 		update();
 	}, lifetime());
+
+	call->peer()->session().changes().peerUpdates(
+		Data::PeerUpdate::Flag::Name
+	) | rpl::filter([=](const Data::PeerUpdate &update) {
+		// _peer may change for the same Panel.
+		const auto call = _groupCall.get();
+		return (call != nullptr) && (update.peer == call->peer());
+	}) | rpl::start_with_next([=] {
+		updateInfoLabels();
+	}, lifetime());
+
 }
 
 void TopBar::generateUserpicsInRow() {
@@ -599,8 +610,8 @@ void TopBar::setInfoLabels() {
 		_fullInfoLabel->setText(fullName.toUpper());
 		_shortInfoLabel->setText(shortName.toUpper());
 	} else if (const auto group = _groupCall.get()) {
-		const auto channel = group->channel();
-		const auto name = channel->name;
+		const auto peer = group->peer();
+		const auto name = peer->name;
 		_fullInfoLabel->setText(name.toUpper());
 		_shortInfoLabel->setText(name.toUpper());
 	}
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index 4a766585e..569b2736c 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -104,13 +104,9 @@ void ChannelData::setInviteLink(const QString &newInviteLink) {
 	}
 }
 
-QString ChannelData::inviteLink() const {
-	return _inviteLink;
-}
-
 bool ChannelData::canHaveInviteLink() const {
-	return (adminRights() & AdminRight::f_invite_users)
-		|| amCreator();
+	return amCreator()
+		|| (adminRights() & AdminRight::f_invite_users);
 }
 
 void ChannelData::setLocation(const MTPChannelLocation &data) {
@@ -524,10 +520,6 @@ bool ChannelData::canRestrictUser(not_null<UserData*> user) const {
 	return adminRights() & AdminRight::f_ban_users;
 }
 
-bool ChannelData::canManageCall() const {
-	return amCreator() || (adminRights() & AdminRight::f_manage_call);
-}
-
 void ChannelData::setAdminRights(const MTPChatAdminRights &rights) {
 	if (rights.c_chatAdminRights().vflags().v == adminRights()) {
 		return;
@@ -677,14 +669,24 @@ void ChannelData::privateErrorReceived() {
 	}
 }
 
-void ChannelData::setCall(const MTPInputGroupCall &call) {
+void ChannelData::migrateCall(std::unique_ptr<Data::GroupCall> call) {
+	Expects(_call == nullptr);
+	Expects(call != nullptr);
+
+	_call = std::move(call);
+	_call->setPeer(this);
+	session().changes().peerUpdated(this, UpdateFlag::GroupCall);
+	addFlags(MTPDchannel::Flag::f_call_active);
+}
+
+void ChannelData::setGroupCall(const MTPInputGroupCall &call) {
 	call.match([&](const MTPDinputGroupCall &data) {
 		if (_call && _call->id() == data.vid().v) {
 			return;
 		} else if (!_call && !data.vid().v) {
 			return;
 		} else if (!data.vid().v) {
-			clearCall();
+			clearGroupCall();
 			return;
 		}
 		const auto hasCall = (_call != nullptr);
@@ -701,7 +703,7 @@ void ChannelData::setCall(const MTPInputGroupCall &call) {
 	});
 }
 
-void ChannelData::clearCall() {
+void ChannelData::clearGroupCall() {
 	if (!_call) {
 		return;
 	}
@@ -744,9 +746,9 @@ void ApplyChannelUpdate(
 	auto canEditStickers = channel->canEditStickers();
 
 	if (const auto call = update.vcall()) {
-		channel->setCall(*call);
+		channel->setGroupCall(*call);
 	} else {
-		channel->clearCall();
+		channel->clearGroupCall();
 	}
 
 	channel->setFullFlags(update.vflags().v);
diff --git a/Telegram/SourceFiles/data/data_channel.h b/Telegram/SourceFiles/data/data_channel.h
index 278799196..c478fab2a 100644
--- a/Telegram/SourceFiles/data/data_channel.h
+++ b/Telegram/SourceFiles/data/data_channel.h
@@ -11,10 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_pts_waiter.h"
 #include "data/data_location.h"
 
-namespace Data {
-class GroupCall;
-} // namespace Data
-
 struct ChannelLocation {
 	QString address;
 	Data::LocationPoint point;
@@ -307,10 +303,11 @@ public:
 	[[nodiscard]] bool canDelete() const;
 	[[nodiscard]] bool canEditAdmin(not_null<UserData*> user) const;
 	[[nodiscard]] bool canRestrictUser(not_null<UserData*> user) const;
-	[[nodiscard]] bool canManageCall() const;
 
 	void setInviteLink(const QString &newInviteLink);
-	[[nodiscard]] QString inviteLink() const;
+	[[nodiscard]] QString inviteLink() const {
+		return _inviteLink;
+	}
 	[[nodiscard]] bool canHaveInviteLink() const;
 
 	void setLocation(const MTPChannelLocation &data);
@@ -399,11 +396,12 @@ public:
 	[[nodiscard]] QString invitePeekHash() const;
 	void privateErrorReceived();
 
-	[[nodiscard]] Data::GroupCall *call() const {
+	[[nodiscard]] Data::GroupCall *groupCall() const {
 		return _call.get();
 	}
-	void setCall(const MTPInputGroupCall &call);
-	void clearCall();
+	void migrateCall(std::unique_ptr<Data::GroupCall> call);
+	void setGroupCall(const MTPInputGroupCall &call);
+	void clearGroupCall();
 
 	// Still public data members.
 	uint64 access = 0;
diff --git a/Telegram/SourceFiles/data/data_chat.cpp b/Telegram/SourceFiles/data/data_chat.cpp
index 568cf04ab..51cace340 100644
--- a/Telegram/SourceFiles/data/data_chat.cpp
+++ b/Telegram/SourceFiles/data/data_chat.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
+#include "data/data_group_call.h"
 #include "history/history.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
@@ -24,6 +25,14 @@ using UpdateFlag = Data::PeerUpdate::Flag;
 ChatData::ChatData(not_null<Data::Session*> owner, PeerId id)
 : PeerData(owner, id)
 , inputChat(MTP_int(bareId())) {
+	_flags.changes(
+	) | rpl::start_with_next([=](const Flags::Change &change) {
+		if (change.diff & MTPDchat::Flag::f_call_not_empty) {
+			if (const auto history = this->owner().historyLoaded(this)) {
+				history->updateChatListEntry();
+			}
+		}
+	}, _lifetime);
 }
 
 void ChatData::setPhoto(const MTPChatPhoto &photo) {
@@ -124,6 +133,11 @@ void ChatData::setInviteLink(const QString &newInviteLink) {
 	}
 }
 
+bool ChatData::canHaveInviteLink() const {
+	return amCreator()
+		|| (adminRights() & AdminRight::f_invite_users);
+}
+
 void ChatData::setAdminRights(const MTPChatAdminRights &rights) {
 	if (rights.c_chatAdminRights().vflags().v == adminRights()) {
 		return;
@@ -176,6 +190,47 @@ void ChatData::setMigrateToChannel(ChannelData *channel) {
 	}
 }
 
+void ChatData::setGroupCall(const MTPInputGroupCall &call) {
+	if (migrateTo()) {
+		return;
+	}
+	call.match([&](const MTPDinputGroupCall &data) {
+		if (_call && _call->id() == data.vid().v) {
+			return;
+		} else if (!_call && !data.vid().v) {
+			return;
+		} else if (!data.vid().v) {
+			clearGroupCall();
+			return;
+		}
+		const auto hasCall = (_call != nullptr);
+		if (hasCall) {
+			owner().unregisterGroupCall(_call.get());
+		}
+		_call = std::make_unique<Data::GroupCall>(
+			this,
+			data.vid().v,
+			data.vaccess_hash().v);
+		owner().registerGroupCall(_call.get());
+		session().changes().peerUpdated(this, UpdateFlag::GroupCall);
+		addFlags(MTPDchat::Flag::f_call_active);
+	});
+}
+
+void ChatData::clearGroupCall() {
+	if (!_call) {
+		return;
+	} else if (const auto group = migrateTo(); group && !group->groupCall()) {
+		group->migrateCall(base::take(_call));
+	} else {
+		owner().unregisterGroupCall(_call.get());
+		_call = nullptr;
+	}
+	session().changes().peerUpdated(this, UpdateFlag::GroupCall);
+	removeFlags(MTPDchat::Flag::f_call_active
+		| MTPDchat::Flag::f_call_not_empty);
+}
+
 namespace Data {
 
 void ApplyChatUpdate(
@@ -310,6 +365,12 @@ void ApplyChatUpdate(
 void ApplyChatUpdate(not_null<ChatData*> chat, const MTPDchatFull &update) {
 	ApplyChatUpdate(chat, update.vparticipants());
 
+	if (const auto call = update.vcall()) {
+		chat->setGroupCall(*call);
+	} else {
+		chat->clearGroupCall();
+	}
+
 	if (const auto info = update.vbot_info()) {
 		for (const auto &item : info->v) {
 			item.match([&](const MTPDbotInfo &data) {
diff --git a/Telegram/SourceFiles/data/data_chat.h b/Telegram/SourceFiles/data/data_chat.h
index 3084767cb..52cc3e1de 100644
--- a/Telegram/SourceFiles/data/data_chat.h
+++ b/Telegram/SourceFiles/data/data_chat.h
@@ -18,6 +18,7 @@ public:
 		| MTPDchat::Flag::f_deactivated
 		| MTPDchat::Flag::f_migrated_to
 		| MTPDchat::Flag::f_admin_rights
+		| MTPDchat::Flag::f_call_not_empty
 		| MTPDchat::Flag::f_default_banned_rights;
 	using Flags = Data::Flags<
 		MTPDchat::Flags,
@@ -141,9 +142,10 @@ public:
 	void applyEditAdmin(not_null<UserData*> user, bool isAdmin);
 
 	void setInviteLink(const QString &newInviteLink);
-	QString inviteLink() const {
+	[[nodiscard]] QString inviteLink() const {
 		return _inviteLink;
 	}
+	[[nodiscard]] bool canHaveInviteLink() const;
 	void refreshBotStatus();
 
 	enum class UpdateStatus {
@@ -162,6 +164,12 @@ public:
 	ChannelData *getMigrateToChannel() const;
 	void setMigrateToChannel(ChannelData *channel);
 
+	[[nodiscard]] Data::GroupCall *groupCall() const {
+		return _call.get();
+	}
+	void setGroupCall(const MTPInputGroupCall &call);
+	void clearGroupCall();
+
 	// Still public data members.
 	const MTPint inputChat;
 
@@ -185,7 +193,10 @@ private:
 	AdminRightFlags _adminRights;
 	int _version = 0;
 
+	std::unique_ptr<Data::GroupCall> _call;
+
 	ChannelData *_migratedTo = nullptr;
+	rpl::lifetime _lifetime;
 
 };
 
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index 3161b1c60..c56ba42ba 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/unixtime.h"
 #include "data/data_channel.h"
+#include "data/data_chat.h"
 #include "data/data_changes.h"
 #include "data/data_session.h"
 #include "main/main_session.h"
@@ -27,12 +28,12 @@ constexpr auto kActiveAfterJoined = crl::time(1000);
 } // namespace
 
 GroupCall::GroupCall(
-	not_null<ChannelData*> channel,
+	not_null<PeerData*> peer,
 	uint64 id,
 	uint64 accessHash)
-: _channel(channel)
-, _id(id)
+: _id(id)
 , _accessHash(accessHash)
+, _peer(peer) // #TODO calls migration
 , _speakingByActiveFinishTimer([=] { checkFinishSpeakingByActive(); }) {
 }
 
@@ -46,14 +47,21 @@ uint64 GroupCall::id() const {
 	return _id;
 }
 
-not_null<ChannelData*> GroupCall::channel() const {
-	return _channel;
+not_null<PeerData*> GroupCall::peer() const {
+	return _peer;
 }
 
 MTPInputGroupCall GroupCall::input() const {
 	return MTP_inputGroupCall(MTP_long(_id), MTP_long(_accessHash));
 }
 
+void GroupCall::setPeer(not_null<PeerData*> peer) {
+	Expects(peer->migrateFrom() == _peer);
+	Expects(_peer->migrateTo() == peer);
+
+	_peer = peer;
+}
+
 auto GroupCall::participants() const
 -> const std::vector<Participant> & {
 	return _participants;
@@ -77,7 +85,7 @@ void GroupCall::requestParticipants() {
 	)).done([=](const MTPphone_GroupParticipants &result) {
 		result.match([&](const MTPDphone_groupParticipants &data) {
 			_nextOffset = qs(data.vnext_offset());
-			_channel->owner().processUsers(data.vusers());
+			_peer->owner().processUsers(data.vusers());
 			applyParticipantsSlice(
 				data.vparticipants().v,
 				ApplySliceSource::SliceLoaded);
@@ -92,30 +100,43 @@ void GroupCall::requestParticipants() {
 		});
 		_participantsSliceAdded.fire({});
 		_participantsRequestId = 0;
-		changeChannelEmptyCallFlag();
+		changePeerEmptyCallFlag();
 	}).fail([=](const RPCError &error) {
 		_fullCount = _participants.size();
 		_allReceived = true;
 		_participantsRequestId = 0;
-		changeChannelEmptyCallFlag();
+		changePeerEmptyCallFlag();
 	}).send();
 }
 
-void GroupCall::changeChannelEmptyCallFlag() {
-	constexpr auto flag = MTPDchannel::Flag::f_call_not_empty;
-	if (_channel->call() != this) {
+void GroupCall::changePeerEmptyCallFlag() {
+	const auto chat = _peer->asChat();
+	const auto channel = _peer->asChannel();
+	constexpr auto chatFlag = MTPDchat::Flag::f_call_not_empty;
+	constexpr auto channelFlag = MTPDchannel::Flag::f_call_not_empty;
+	if (_peer->groupCall() != this) {
 		return;
 	} else if (fullCount() > 0) {
-		if (!(_channel->flags() & flag)) {
-			_channel->addFlags(flag);
-			_channel->session().changes().peerUpdated(
-				_channel,
+		if (chat && !(chat->flags() & chatFlag)) {
+			chat->addFlags(chatFlag);
+			chat->session().changes().peerUpdated(
+				chat,
+				Data::PeerUpdate::Flag::GroupCall);
+		} else if (channel && !(channel->flags() & channelFlag)) {
+			channel->addFlags(channelFlag);
+			channel->session().changes().peerUpdated(
+				channel,
 				Data::PeerUpdate::Flag::GroupCall);
 		}
-	} else if (_channel->flags() & flag) {
-		_channel->removeFlags(flag);
-		_channel->session().changes().peerUpdated(
-			_channel,
+	} else if (chat && (chat->flags() & chatFlag)) {
+		chat->removeFlags(chatFlag);
+		chat->session().changes().peerUpdated(
+			chat,
+			Data::PeerUpdate::Flag::GroupCall);
+	} else if (channel && (channel->flags() & channelFlag)) {
+		channel->removeFlags(channelFlag);
+		channel->session().changes().peerUpdated(
+			channel,
 			Data::PeerUpdate::Flag::GroupCall);
 	}
 }
@@ -166,13 +187,17 @@ void GroupCall::applyCall(const MTPGroupCall &call, bool force) {
 		_canChangeJoinMuted = data.is_can_change_join_muted();
 		_version = data.vversion().v;
 		_fullCount = data.vparticipants_count().v;
-		changeChannelEmptyCallFlag();
+		changePeerEmptyCallFlag();
 	}, [&](const MTPDgroupCallDiscarded &data) {
 		const auto id = _id;
-		const auto channel = _channel;
-		crl::on_main(&channel->session(), [=] {
-			if (channel->call() && channel->call()->id() == id) {
-				channel->clearCall();
+		const auto peer = _peer;
+		crl::on_main(&peer->session(), [=] {
+			if (peer->groupCall() && peer->groupCall()->id() == id) {
+				if (const auto chat = peer->asChat()) {
+					chat->clearGroupCall();
+				} else if (const auto channel = peer->asChannel()) {
+					channel->clearGroupCall();
+				}
 			}
 		});
 	});
@@ -189,7 +214,7 @@ void GroupCall::reload() {
 		MTPphone_GetGroupCall(input())
 	).done([=](const MTPphone_GroupCall &result) {
 		result.match([&](const MTPDphone_groupCall &data) {
-			_channel->owner().processUsers(data.vusers());
+			_peer->owner().processUsers(data.vusers());
 			_participants.clear();
 			_speakingByActiveFinishes.clear();
 			_userBySsrc.clear();
@@ -217,7 +242,7 @@ void GroupCall::applyParticipantsSlice(
 	for (const auto &participant : list) {
 		participant.match([&](const MTPDgroupCallParticipant &data) {
 			const auto userId = data.vuser_id().v;
-			const auto user = _channel->owner().user(userId);
+			const auto user = _peer->owner().user(userId);
 			const auto i = ranges::find(
 				_participants,
 				user,
@@ -262,7 +287,7 @@ void GroupCall::applyParticipantsSlice(
 			if (i == end(_participants)) {
 				_userBySsrc.emplace(value.ssrc, user);
 				_participants.push_back(value);
-				_channel->owner().unregisterInvitedToCallUser(_id, user);
+				_peer->owner().unregisterInvitedToCallUser(_id, user);
 				++changedCount;
 			} else {
 				if (i->ssrc != value.ssrc) {
@@ -281,7 +306,7 @@ void GroupCall::applyParticipantsSlice(
 	}
 	if (sliceSource == ApplySliceSource::UpdateReceived) {
 		_fullCount = changedCount;
-		changeChannelEmptyCallFlag();
+		changePeerEmptyCallFlag();
 	}
 }
 
@@ -293,7 +318,7 @@ void GroupCall::applyParticipantsMutes(
 				return;
 			}
 			const auto userId = data.vuser_id().v;
-			const auto user = _channel->owner().user(userId);
+			const auto user = _peer->owner().user(userId);
 			const auto i = ranges::find(
 				_participants,
 				user,
@@ -466,7 +491,7 @@ void GroupCall::requestUnknownParticipants() {
 		MTP_int(kRequestPerPage)
 	)).done([=](const MTPphone_GroupParticipants &result) {
 		result.match([&](const MTPDphone_groupParticipants &data) {
-			_channel->owner().processUsers(data.vusers());
+			_peer->owner().processUsers(data.vusers());
 			applyParticipantsSlice(
 				data.vparticipants().v,
 				ApplySliceSource::UnknownLoaded);
@@ -478,7 +503,7 @@ void GroupCall::requestUnknownParticipants() {
 			_unknownSpokenSsrcs.remove(ssrc);
 		}
 		for (const auto [userId, when] : uids) {
-			if (const auto user = _channel->owner().userLoaded(userId)) {
+			if (const auto user = _peer->owner().userLoaded(userId)) {
 				const auto isParticipant = ranges::contains(
 					_participants,
 					not_null{ user },
@@ -564,7 +589,7 @@ bool GroupCall::canChangeJoinMuted() const {
 }
 
 ApiWrap &GroupCall::api() const {
-	return _channel->session().api();
+	return _peer->session().api();
 }
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 418720c2d..0010c6851 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 
 class UserData;
-class ChannelData;
+class PeerData;
 
 class ApiWrap;
 
@@ -18,13 +18,15 @@ namespace Data {
 
 class GroupCall final {
 public:
-	GroupCall(not_null<ChannelData*> channel, uint64 id, uint64 accessHash);
+	GroupCall(not_null<PeerData*> peer, uint64 id, uint64 accessHash);
 	~GroupCall();
 
 	[[nodiscard]] uint64 id() const;
-	[[nodiscard]] not_null<ChannelData*> channel() const;
+	[[nodiscard]] not_null<PeerData*> peer() const;
 	[[nodiscard]] MTPInputGroupCall input() const;
 
+	void setPeer(not_null<PeerData*> peer);
+
 	struct Participant {
 		not_null<UserData*> user;
 		TimeId date = 0;
@@ -86,13 +88,13 @@ private:
 	void applyParticipantsMutes(
 		const MTPDupdateGroupCallParticipants &update);
 	void requestUnknownParticipants();
-	void changeChannelEmptyCallFlag();
+	void changePeerEmptyCallFlag();
 	void checkFinishSpeakingByActive();
 
-	const not_null<ChannelData*> _channel;
 	const uint64 _id = 0;
 	const uint64 _accessHash = 0;
 
+	not_null<PeerData*> _peer;
 	int _version = 0;
 	mtpRequestId _participantsRequestId = 0;
 	mtpRequestId _reloadRequestId = 0;
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index ed236792e..75edd778e 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -888,6 +888,26 @@ bool PeerData::canSendPolls() const {
 	return false;
 }
 
+bool PeerData::canManageGroupCall() const {
+	if (const auto chat = asChat()) {
+		return chat->amCreator()
+			|| (chat->adminRights() & ChatAdminRight::f_manage_call);
+	} else if (const auto group = asMegagroup()) {
+		return group->amCreator()
+			|| (group->adminRights() & ChatAdminRight::f_manage_call);
+	}
+	return false;
+}
+
+Data::GroupCall *PeerData::groupCall() const {
+	if (const auto chat = asChat()) {
+		return chat->groupCall();
+	} else if (const auto group = asMegagroup()) {
+		return group->groupCall();
+	}
+	return nullptr;
+}
+
 void PeerData::setIsBlocked(bool is) {
 	const auto status = is
 		? BlockStatus::Blocked
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index 07a76fd77..cb38944d4 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 GroupCall;
 
 int PeerColorIndex(PeerId peerId);
 int PeerColorIndex(int32 bareId);
@@ -202,6 +203,7 @@ public:
 	[[nodiscard]] rpl::producer<bool> slowmodeAppliedValue() const;
 	[[nodiscard]] int slowmodeSecondsLeft() const;
 	[[nodiscard]] bool canSendPolls() const;
+	[[nodiscard]] bool canManageGroupCall() const;
 
 	[[nodiscard]] UserData *asUser();
 	[[nodiscard]] const UserData *asUser() const;
@@ -383,6 +385,8 @@ public:
 	}
 	void setLoadedStatus(LoadedStatus status);
 
+	[[nodiscard]] Data::GroupCall *groupCall() const;
+
 	const PeerId id;
 	QString name;
 	MTPinputPeer input = MTP_inputPeerEmpty();
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index ca9ee4f56..9b5908639 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -604,7 +604,12 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 			});
 		}
 
-		chat->setFlags(data.vflags().v);
+		const auto callFlag = MTPDchat::Flag::f_call_not_empty;
+		const auto callNotEmpty = (data.vflags().v & callFlag)
+			|| (chat->groupCall()
+				&& chat->groupCall()->fullCount() > 0);
+		chat->setFlags(data.vflags().v
+			| (callNotEmpty ? callFlag : MTPDchat::Flag(0)));
 		chat->count = data.vparticipants_count().v;
 
 		if (canAddMembers != chat->canAddMembers()) {
@@ -651,13 +656,21 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 			channel->setDefaultRestrictions(
 				MTP_chatBannedRights(MTP_flags(0), MTP_int(0)));
 		}
+		const auto callFlag = MTPDchannel::Flag::f_call_not_empty;
+		const auto callNotEmpty = (data.vflags().v & callFlag)
+			|| (channel->groupCall()
+				&& channel->groupCall()->fullCount() > 0);
 		if (minimal) {
 			auto mask = 0
 				| MTPDchannel::Flag::f_broadcast
 				| MTPDchannel::Flag::f_verified
 				| MTPDchannel::Flag::f_megagroup
+				| MTPDchannel::Flag::f_call_active
+				| MTPDchannel::Flag::f_call_not_empty
 				| MTPDchannel_ClientFlag::f_forbidden;
-			channel->setFlags((channel->flags() & ~mask) | (data.vflags().v & mask));
+			channel->setFlags((channel->flags() & ~mask)
+				| (data.vflags().v & mask)
+				| (callNotEmpty ? callFlag : MTPDchannel::Flag(0)));
 			if (channel->input.type() == mtpc_inputPeerEmpty
 				|| channel->inputChannel.type() == mtpc_inputChannelEmpty) {
 				channel->setAccessHash(data.vaccess_hash().value_or_empty());
@@ -686,9 +699,6 @@ not_null<PeerData*> Session::processChat(const MTPChat &data) {
 			} else {
 				channel->setUnavailableReasons({});
 			}
-			const auto callFlag = MTPDchannel::Flag::f_call_not_empty;
-			const auto callNotEmpty = (data.vflags().v & callFlag)
-				|| (channel->call() && channel->call()->fullCount() > 0);
 			channel->setFlags(data.vflags().v
 				| (callNotEmpty ? callFlag : MTPDchannel::Flag(0)));
 			//if (const auto feedId = data.vfeed_id()) { // #feed
@@ -826,9 +836,9 @@ auto Session::invitedToCallUsers(uint64 callId) const
 
 void Session::registerInvitedToCallUser(
 		uint64 callId,
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		not_null<UserData*> user) {
-	const auto call = channel->call();
+	const auto call = peer->groupCall();
 	if (call && call->id() == callId) {
 		const auto inCall = ranges::contains(
 			call->participants(),
@@ -1164,6 +1174,7 @@ void Session::setupMigrationViewer() {
 			return;
 		}
 
+		chat->clearGroupCall();
 		if (const auto from = historyLoaded(chat)) {
 			if (const auto to = historyLoaded(channel)) {
 				if (to->inChatList() && from->inChatList()) {
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 583c36ec1..0fc1c8b66 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -169,7 +169,7 @@ public:
 		-> const base::flat_set<not_null<UserData*>> &;
 	void registerInvitedToCallUser(
 		uint64 callId,
-		not_null<ChannelData*> channel,
+		not_null<PeerData*> peer,
 		not_null<UserData*> user);
 	void unregisterInvitedToCallUser(uint64 callId, not_null<UserData*> user);
 
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 6a81805dd..753b3abfd 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -1053,9 +1053,11 @@ void History::applyServiceChanges(
 	} break;
 
 	case mtpc_messageActionGroupCall: {
+		const auto &d = action.c_messageActionGroupCall();
 		if (const auto channel = peer->asChannel()) {
-			const auto &d = action.c_messageActionGroupCall();
-			channel->setCall(d.vcall());
+			channel->setGroupCall(d.vcall());
+		} else if (const auto chat = peer->asChat()) {
+			chat->setGroupCall(d.vcall());
 		}
 	} break;
 	}
diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index 528943345..2486188b1 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_game.h"
 #include "data/data_channel.h"
 #include "data/data_user.h"
+#include "data/data_chat.h"
 #include "data/data_changes.h"
 #include "data/data_group_call.h" // Data::GroupCall::id().
 #include "core/application.h"
@@ -38,18 +39,27 @@ namespace {
 
 constexpr auto kPinnedMessageTextLimit = 16;
 
-[[nodiscard]] rpl::producer<bool> ChannelHasThisCallValue(
-		not_null<ChannelData*> channel,
+[[nodiscard]] bool PeerCallKnown(not_null<PeerData*> peer) {
+	if (peer->groupCall() != nullptr) {
+		return true;
+	} else if (const auto chat = peer->asChat()) {
+		return !(chat->flags() & MTPDchat::Flag::f_call_active);
+	} else if (const auto channel = peer->asChannel()) {
+		return !(channel->flags() & MTPDchannel::Flag::f_call_active);
+	}
+	return true;
+}
+
+[[nodiscard]] rpl::producer<bool> PeerHasThisCallValue(
+		not_null<PeerData*> peer,
 		uint64 id) {
-	return channel->session().changes().peerFlagsValue(
-		channel,
+	return peer->session().changes().peerFlagsValue(
+		peer,
 		Data::PeerUpdate::Flag::GroupCall
 	) | rpl::filter([=] {
-		return (channel->call() != nullptr)
-			|| !(channel->flags()
-				& MTPDchannel::Flag::f_call_active);
+		return PeerCallKnown(peer);
 	}) | rpl::map([=] {
-		const auto call = channel->call();
+		const auto call = peer->groupCall();
 		return (call && call->id() == id);
 	}) | rpl::distinct_until_changed(
 	) | rpl::take_while([=](bool hasThisCall) {
@@ -59,15 +69,15 @@ constexpr auto kPinnedMessageTextLimit = 16;
 	);
 }
 
-[[nodiscard]] std::optional<bool> ChannelHasThisCall(
-		not_null<ChannelData*> channel,
+[[nodiscard]] std::optional<bool> PeerHasThisCall(
+		not_null<PeerData*> peer,
 		uint64 id) {
-	const auto call = channel->call();
+	const auto call = peer->groupCall();
 	return call
 		? std::make_optional(call->id() == id)
-		: (channel->flags() & MTPDchannel::Flag::f_call_active)
-		? std::nullopt
-		: std::make_optional(false);
+		: PeerCallKnown(peer)
+		? std::make_optional(false)
+		: std::nullopt;
 }
 
 [[nodiscard]] uint64 CallIdFromInput(const MTPInputGroupCall &data) {
@@ -76,20 +86,20 @@ constexpr auto kPinnedMessageTextLimit = 16;
 	});
 }
 
-[[nodiscard]] ClickHandlerPtr ChannelCallClickHandler(
-		not_null<ChannelData*> megagroup,
+[[nodiscard]] ClickHandlerPtr GroupCallClickHandler(
+		not_null<PeerData*> peer,
 		uint64 callId) {
 	return std::make_shared<LambdaClickHandler>([=] {
-		const auto call = megagroup->call();
+		const auto call = peer->groupCall();
 		if (call && call->id() == callId) {
-			const auto &windows = megagroup->session().windows();
+			const auto &windows = peer->session().windows();
 			if (windows.empty()) {
-				Core::App().domain().activate(&megagroup->session().account());
+				Core::App().domain().activate(&peer->session().account());
 				if (windows.empty()) {
 					return;
 				}
 			}
-			windows.front()->startOrJoinGroupCall(megagroup);
+			windows.front()->startOrJoinGroupCall(peer);
 		}
 	});
 }
@@ -338,10 +348,8 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 			return prepareDiscardedCallText(duration->v);
 		}
 		const auto callId = CallIdFromInput(action.vcall());
-		const auto channel = history()->peer->asChannel();
-		const auto linkCallId = !channel
-			? 0
-			: ChannelHasThisCall(channel, callId).value_or(false)
+		const auto peer = history()->peer;
+		const auto linkCallId = PeerHasThisCall(peer, callId).value_or(false)
 			? callId
 			: 0;
 		return prepareStartedCallText(linkCallId);
@@ -350,16 +358,14 @@ void HistoryService::setMessageByAction(const MTPmessageAction &action) {
 	auto prepareInviteToGroupCall = [this](const MTPDmessageActionInviteToGroupCall &action) {
 		const auto callId = CallIdFromInput(action.vcall());
 		const auto owner = &history()->owner();
-		const auto channel = history()->peer->asChannel();
+		const auto peer = history()->peer;
 		for (const auto id : action.vusers().v) {
 			const auto user = owner->user(id.v);
-			if (channel && callId) {
-				owner->registerInvitedToCallUser(callId, channel, user);
+			if (callId) {
+				owner->registerInvitedToCallUser(callId, peer, user);
 			}
 		};
-		const auto linkCallId = !channel
-			? 0
-			: ChannelHasThisCall(channel, callId).value_or(false)
+		const auto linkCallId = PeerHasThisCall(peer, callId).value_or(false)
 			? callId
 			: 0;
 		return prepareInvitedToCallText(action.vusers().v, linkCallId);
@@ -534,10 +540,10 @@ HistoryService::PreparedText HistoryService::prepareStartedCallText(
 		uint64 linkCallId) {
 	auto result = PreparedText{};
 	result.links.push_back(fromLink());
-	const auto channel = history()->peer->asChannel();
 	auto chatText = tr::lng_action_group_call_started_chat(tr::now);
-	if (channel && linkCallId) {
-		result.links.push_back(ChannelCallClickHandler(channel, linkCallId));
+	if (linkCallId) {
+		const auto peer = history()->peer;
+		result.links.push_back(GroupCallClickHandler(peer, linkCallId));
 		chatText = textcmdLink(2, chatText);
 	}
 	result.text = tr::lng_action_group_call_started(
@@ -552,14 +558,14 @@ HistoryService::PreparedText HistoryService::prepareStartedCallText(
 HistoryService::PreparedText HistoryService::prepareInvitedToCallText(
 		const QVector<MTPint> &users,
 		uint64 linkCallId) {
-	const auto channel = history()->peer->asChannel();
-	const auto owner = &channel->owner();
+	const auto owner = &history()->owner();
 	auto chatText = tr::lng_action_invite_user_chat(tr::now);
 	auto result = PreparedText{};
 	result.links.push_back(fromLink());
 	auto linkIndex = 1;
-	if (channel && linkCallId) {
-		result.links.push_back(ChannelCallClickHandler(channel, linkCallId));
+	if (linkCallId) {
+		const auto peer = history()->peer;
+		result.links.push_back(GroupCallClickHandler(peer, linkCallId));
 		chatText = textcmdLink(++linkIndex, chatText);
 	}
 	if (users.size() == 1) {
@@ -938,38 +944,35 @@ void HistoryService::createFromMtp(const MTPDmessageService &message) {
 				updateText(prepareDiscardedCallText(discard.duration));
 			}, call->lifetime);
 
-			if (const auto channel = history()->peer->asChannel()) {
-				const auto has = ChannelHasThisCall(channel, id);
-				if (!has.has_value()) {
-					ChannelHasThisCallValue(
-						channel,
-						id
-					) | rpl::start_with_next([=](bool has) {
-						updateText(prepareStartedCallText(has ? id : 0));
-					}, call->lifetime);
-				} else if (*has) {
-					ChannelHasThisCallValue(
-						channel,
-						id
-					) | rpl::skip(1) | rpl::start_with_next([=](bool has) {
-						Assert(!has);
-						updateText(prepareStartedCallText(0));
-					}, call->lifetime);
-				}
+			const auto peer = history()->peer;
+			const auto has = PeerHasThisCall(peer, id);
+			if (!has.has_value()) {
+				PeerHasThisCallValue(
+					peer,
+					id
+				) | rpl::start_with_next([=](bool has) {
+					updateText(prepareStartedCallText(has ? id : 0));
+				}, call->lifetime);
+			} else if (*has) {
+				PeerHasThisCallValue(
+					peer,
+					id
+				) | rpl::skip(1) | rpl::start_with_next([=](bool has) {
+					Assert(!has);
+					updateText(prepareStartedCallText(0));
+				}, call->lifetime);
 			}
 		}
 	} else if (message.vaction().type() == mtpc_messageActionInviteToGroupCall) {
 		const auto &data = message.vaction().c_messageActionInviteToGroupCall();
 		const auto id = CallIdFromInput(data.vcall());
-		const auto channel = history()->peer->asChannel();
-		const auto has = channel
-			? ChannelHasThisCall(channel, id)
-			: std::make_optional(false);
+		const auto peer = history()->peer;
+		const auto has = PeerHasThisCall(peer, id);
 		auto hasLink = !has.has_value()
-			? ChannelHasThisCallValue(channel, id)
+			? PeerHasThisCallValue(peer, id)
 			: (*has)
-			? ChannelHasThisCallValue(
-				channel,
+			? PeerHasThisCallValue(
+				peer,
 				id) | rpl::skip(1) | rpl::type_erased()
 			: rpl::producer<bool>();
 		if (!hasLink) {
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 74ae2dc45..d0827e992 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5419,16 +5419,15 @@ void HistoryWidget::setupGroupCallTracker() {
 		_groupCallBar->barClicks(),
 		_groupCallBar->joinClicks()
 	) | rpl::start_with_next([=] {
-		const auto channel = _history->peer->asChannel();
-		if (!channel) {
-			return;
-		} else if (channel->amAnonymous()) {
+		const auto peer = _history->peer;
+		const auto channel = peer->asChannel();
+		if (channel && channel->amAnonymous()) {
 			Ui::ShowMultilineToast({
 				.text = tr::lng_group_call_no_anonymous(tr::now),
 				});
 			return;
-		} else if (channel->call()) {
-			controller()->startOrJoinGroupCall(channel);
+		} else if (peer->groupCall()) {
+			controller()->startOrJoinGroupCall(peer);
 		}
 	}, _groupCallBar->lifetime());
 
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
index e3be07c56..cf8da4876 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
@@ -61,8 +61,8 @@ void GenerateUserpicsInRow(
 	}
 }
 
-GroupCallTracker::GroupCallTracker(not_null<ChannelData*> channel)
-: _channel(channel) {
+GroupCallTracker::GroupCallTracker(not_null<PeerData*> peer)
+: _peer(peer) {
 }
 
 rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
@@ -300,7 +300,7 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 			return RegenerateUserpics(state, call, st);
 		}) | rpl::start_with_next(pushNext, lifetime);
 
-		call->channel()->session().downloaderTaskFinished(
+		call->peer()->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return state->someUserpicsNotLoaded;
 		}) | rpl::start_with_next([=] {
@@ -327,15 +327,15 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 }
 
 rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::content() const {
-	const auto channel = _channel;
+	const auto peer = _peer;
 	return rpl::combine(
-		channel->session().changes().peerFlagsValue(
-			channel,
+		peer->session().changes().peerFlagsValue(
+			peer,
 			Data::PeerUpdate::Flag::GroupCall),
 		Core::App().calls().currentGroupCallValue()
 	) | rpl::map([=](const auto&, Calls::GroupCall *current) {
-		const auto call = channel->call();
-		return (call && (!current || current->channel() != channel))
+		const auto call = peer->groupCall();
+		return (call && (!current || current->peer() != peer))
 			? call
 			: nullptr;
 	}) | rpl::distinct_until_changed(
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h
index 70ab0dc26..b1bed1790 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.h
@@ -41,7 +41,7 @@ void GenerateUserpicsInRow(
 
 class GroupCallTracker final {
 public:
-	GroupCallTracker(not_null<ChannelData*> channel);
+	explicit GroupCallTracker(not_null<PeerData*> peer);
 
 	[[nodiscard]] rpl::producer<Ui::GroupCallBarContent> content() const;
 	[[nodiscard]] rpl::producer<> joinClicks() const;
@@ -51,7 +51,7 @@ public:
 		const UserpicsInRowStyle &st);
 
 private:
-	not_null<ChannelData*> _channel;
+	const not_null<PeerData*> _peer;
 
 	rpl::event_stream<> _joinClicks;
 
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 3cc30b46a..ebadf7133 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -220,23 +220,7 @@ void TopBarWidget::call() {
 
 void TopBarWidget::groupCall() {
 	if (const auto peer = _activeChat.key.peer()) {
-		if (const auto megagroup = peer->asMegagroup()) {
-			_controller->startOrJoinGroupCall(megagroup);
-		} else if (const auto chat = peer->asChat()) {
-			const auto callback = [=] {
-				Ui::hideLayer();
-				const auto start = [=](not_null<ChannelData*> megagroup) {
-					_controller->startOrJoinGroupCall(megagroup, true);
-				};
-				peer->session().api().migrateChat(
-					chat,
-					crl::guard(this, start));
-			};
-			Ui::show(Box<ConfirmBox>(
-				tr::lng_group_call_create_sure(tr::now),
-				tr::lng_continue(tr::now),
-				crl::guard(this, callback)));
-		}
+		_controller->startOrJoinGroupCall(peer);
 	}
 }
 
@@ -543,6 +527,7 @@ void TopBarWidget::setActiveChat(
 	}
 	_activeChat = activeChat;
 	_sendAction = sendAction;
+	_titlePeerText.clear();
 	_back->clearState();
 	update();
 
@@ -736,11 +721,7 @@ void TopBarWidget::updateControlsVisibility() {
 	_call->setVisible(historyMode && callsEnabled);
 	const auto groupCallsEnabled = [&] {
 		if (const auto peer = _activeChat.key.peer()) {
-			if (const auto megagroup = peer->asMegagroup()) {
-				return megagroup->canManageCall();
-			} else if (const auto chat = peer->asChat()) {
-				return chat->amCreator();
-			}
+			return peer->canManageGroupCall();
 		}
 		return false;
 	}();
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index b1a3daf8d..56a7c2e19 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -933,9 +933,10 @@ void SessionController::closeThirdSection() {
 }
 
 void SessionController::startOrJoinGroupCall(
-		not_null<ChannelData*> megagroup,
+		not_null<PeerData*> peer,
 		bool confirmedLeaveOther) {
-	if (megagroup->amAnonymous()) {
+	const auto channel = peer->asChannel();
+	if (channel && channel->amAnonymous()) {
 		Ui::ShowMultilineToast({
 			.text = tr::lng_group_call_no_anonymous(tr::now),
 		});
@@ -945,7 +946,7 @@ void SessionController::startOrJoinGroupCall(
 	const auto confirm = [&](QString text, QString button) {
 		Ui::show(Box<ConfirmBox>(text, button, crl::guard(this, [=] {
 			Ui::hideLayer();
-			startOrJoinGroupCall(megagroup, true);
+			startOrJoinGroupCall(peer, true);
 		})));
 	};
 	if (!confirmedLeaveOther && calls.inCall()) {
@@ -954,19 +955,19 @@ void SessionController::startOrJoinGroupCall(
 			tr::lng_call_leave_to_other_sure(tr::now),
 			tr::lng_call_bar_hangup(tr::now));
 	} else if (!confirmedLeaveOther && calls.inGroupCall()) {
-		if (calls.currentGroupCall()->channel() == megagroup) {
+		if (calls.currentGroupCall()->peer() == peer) {
 			calls.activateCurrentCall();
 		} else {
 			confirm(
 				tr::lng_group_call_leave_to_other_sure(tr::now),
 				tr::lng_group_call_leave(tr::now));
 		}
-	} else if (!confirmedLeaveOther && !megagroup->call()) {
+	} else if (!confirmedLeaveOther && !peer->groupCall()) {
 		confirm(
 			tr::lng_group_call_create_sure(tr::now),
 			tr::lng_continue(tr::now));
 	} else {
-		calls.startOrJoinGroupCall(megagroup);
+		calls.startOrJoinGroupCall(peer);
 	}
 }
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 065d8e3ec..900ad2487 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -297,7 +297,7 @@ public:
 	void closeThirdSection();
 
 	void startOrJoinGroupCall(
-		not_null<ChannelData*> megagroup,
+		not_null<PeerData*> peer,
 		bool confirmedLeaveOther = false);
 
 	void showSection(

From de20ff05eb71bd9dbfc4fc43e68ac054b7c0a985 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 10 Dec 2020 08:39:03 +0300
Subject: [PATCH 296/370] Fixed draft applying while recording voice message in
 HistoryWidget.

Relevant commit: d15a5c9bdc.
---
 Telegram/SourceFiles/history/history_widget.cpp        | 10 +++++++++-
 .../view/controls/history_view_voice_record_bar.cpp    |  4 ++++
 .../view/controls/history_view_voice_record_bar.h      |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index d0827e992..eca6160ea 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -820,6 +820,13 @@ void HistoryWidget::initVoiceRecordBar() {
 		_scroll->viewportEvent(e);
 	}, lifetime());
 
+	_voiceRecordBar->shownValue(
+	) | rpl::start_with_next([=](bool shown) {
+		if (!shown) {
+			applyDraft();
+		}
+	}, lifetime());
+
 	_voiceRecordBar->hideFast();
 }
 
@@ -1621,7 +1628,8 @@ void HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 		: _history->localEditDraft()
 		? _history->localEditDraft()
 		: _history->localDraft();
-	auto fieldAvailable = canWriteMessage();
+	auto fieldAvailable = canWriteMessage()
+		&& !_voiceRecordBar->preventDraftApply();
 	if (!draft || (!_history->localEditDraft() && !fieldAvailable)) {
 		auto fieldWillBeHiddenAfterEdit = (!fieldAvailable && _editMsgId != 0);
 		clearFieldText(0, fieldHistoryAction);
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index b2ebaca31..5964e7617 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1414,6 +1414,10 @@ bool VoiceRecordBar::isRecording() const {
 	return _recording.current();
 }
 
+bool VoiceRecordBar::preventDraftApply() const {
+	return isRecording() || isListenState();
+}
+
 void VoiceRecordBar::hideAnimated() {
 	if (isHidden()) {
 		return;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index bc96898f5..cb1fc1cfd 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -72,6 +72,7 @@ public:
 	[[nodiscard]] bool isRecording() const;
 	[[nodiscard]] bool isLockPresent() const;
 	[[nodiscard]] bool isListenState() const;
+	[[nodiscard]] bool preventDraftApply() const;
 
 private:
 	enum class StopType {

From 62fe44bde8c2b7f34e57f0401113bc272a63f9cc Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 10 Dec 2020 16:24:02 +0300
Subject: [PATCH 297/370] Slightly refactored LinearBlob animation in
 Calls::TopBar.

---
 Telegram/SourceFiles/calls/calls.style       | 13 ++---
 Telegram/SourceFiles/calls/calls_top_bar.cpp | 52 ++++++++------------
 2 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index bce9ea347..9a33dd382 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -750,16 +750,11 @@ groupCallTitle: WindowTitle(defaultWindowTitle) {
 	closeIconActiveOver: groupCallTitleCloseIconOver;
 }
 
-groupCallMajorBlobMinRadius: 2px;
-groupCallMajorBlobMaxRadius: 2px;
+groupCallMajorBlobIdleRadius: 2px;
+groupCallMajorBlobMaxRadius: 4px;
 
-groupCallMinorBlobMinRadius: 3px;
-groupCallMinorBlobMaxRadius: 9px;
-
-groupCallMajorBlobTopOffset: 0px;
-groupCallMinorBlobTopOffset: 6px;
-
-groupCallBlobWidthAdditional: 40px;
+groupCallMinorBlobIdleRadius: 3px;
+groupCallMinorBlobMaxRadius: 12px;
 
 callTopBarMuteCrossLine: CrossLineAnimation {
 	fg: callBarFg;
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index a8d23213d..24795adc3 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -42,40 +42,37 @@ constexpr auto kSwitchStateDuration = 120;
 
 constexpr auto kMinorBlobAlpha = 76. / 255.;
 
-constexpr auto kBlobLevelDuration1 = 250;
-constexpr auto kBlobLevelDuration2 = 120;
+constexpr auto kHideBlobsDuration = crl::time(500);
+constexpr auto kBlobLevelDuration = crl::time(250);
 constexpr auto kBlobUpdateInterval = crl::time(100);
 
-auto LinearBlobs() -> std::array<Ui::Paint::LinearBlobs::BlobData, 3> {
-	return { {
+auto LinearBlobs() {
+	return std::vector<Ui::Paint::LinearBlobs::BlobData>{
 		{
 			.segmentsCount = 5,
-			.minScale = 1.,
-			.minRadius = (float)st::groupCallMajorBlobMinRadius,
+			.minRadius = 0.,
 			.maxRadius = (float)st::groupCallMajorBlobMaxRadius,
+			.idleRadius = (float)st::groupCallMinorBlobIdleRadius,
 			.speedScale = .3,
 			.alpha = 1.,
-			.topOffset = st::groupCallMajorBlobTopOffset,
 		},
 		{
 			.segmentsCount = 7,
-			.minScale = 1.,
-			.minRadius = (float)st::groupCallMinorBlobMinRadius,
+			.minRadius = 0.,
 			.maxRadius = (float)st::groupCallMinorBlobMaxRadius,
+			.idleRadius = (float)st::groupCallMinorBlobIdleRadius,
 			.speedScale = .7,
 			.alpha = kMinorBlobAlpha,
-			.topOffset = st::groupCallMinorBlobTopOffset,
 		},
 		{
 			.segmentsCount = 8,
-			.minScale = 1.,
-			.minRadius = (float)st::groupCallMinorBlobMinRadius,
+			.minRadius = 0.,
 			.maxRadius = (float)st::groupCallMinorBlobMaxRadius,
+			.idleRadius = (float)st::groupCallMinorBlobIdleRadius,
 			.speedScale = .7,
 			.alpha = kMinorBlobAlpha,
-			.topOffset = st::groupCallMinorBlobTopOffset,
 		},
-	} };
+	};
 }
 
 auto Colors() {
@@ -358,14 +355,12 @@ void TopBar::initBlobsUnder(
 		return;
 	}
 
-	static constexpr auto kHideDuration = kBlobLevelDuration1 * 2;
-
 	struct State {
 		Ui::Paint::LinearBlobs paint = {
-			LinearBlobs() | ranges::to_vector,
-			kBlobLevelDuration1,
-			kBlobLevelDuration2,
-			1.
+			LinearBlobs(),
+			kBlobLevelDuration,
+			1.,
+			Ui::Paint::LinearBlob::Direction::TopDown
 		};
 		Ui::Animations::Simple hideAnimation;
 		Ui::Animations::Basic animation;
@@ -374,8 +369,6 @@ void TopBar::initBlobsUnder(
 		crl::time lastTime = 0;
 		float lastLevel = 0.;
 		float levelBeforeLast = 0.;
-		int maxHeight = st::groupCallMinorBlobMinRadius
-			+ st::groupCallMinorBlobMaxRadius;
 	};
 
 	_blobs = base::make_unique_q<Ui::RpWidget>(blobsParent);
@@ -392,7 +385,7 @@ void TopBar::initBlobsUnder(
 
 	state->animation.init([=](crl::time now) {
 		if (const auto last = state->hideLastTime; (last > 0)
-			&& (now - last >= kHideDuration)) {
+			&& (now - last >= kHideBlobsDuration)) {
 			state->animation.stop();
 			return false;
 		}
@@ -448,7 +441,7 @@ void TopBar::initBlobsUnder(
 		const auto to = hide ? 1. : 0.;
 		state->hideAnimation.start([=](float64) {
 			_blobs->update();
-		}, from, to, kHideDuration);
+		}, from, to, kHideBlobsDuration);
 	}, lifetime());
 
 	std::move(
@@ -456,7 +449,7 @@ void TopBar::initBlobsUnder(
 	) | rpl::start_with_next([=](QRect rect) {
 		_blobs->resize(
 			rect.width(),
-			std::min(state->maxHeight, rect.height()));
+			(int)state->paint.maxRadius());
 		_blobs->moveToLeft(rect.x(), rect.y() + rect.height());
 	}, lifetime());
 
@@ -478,12 +471,9 @@ void TopBar::initBlobsUnder(
 			p.setOpacity(1. - hidden);
 		}
 		const auto top = -_blobs->height() * hidden;
-		const auto drawUnder = QRect(
-			0,
-			top,
-			_blobs->width() + st::groupCallBlobWidthAdditional,
-			0);
-		state->paint.paint(p, _groupBrush, drawUnder, 0, 0);
+		const auto width = _blobs->width();
+		p.translate(0, top);
+		state->paint.paint(p, _groupBrush, width);
 	}, _blobs->lifetime());
 
 	group->levelUpdates(

From bb4be4f3dd88d25bbd1697eedc233ad8f6d0b178 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 11 Dec 2020 11:00:51 +0300
Subject: [PATCH 298/370] Replaced float interpolation with implementation from
 lib_ui.

---
 Telegram/SourceFiles/calls/calls_top_bar.cpp          |  2 +-
 .../view/controls/history_view_voice_record_bar.cpp   | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 24795adc3..182830864 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -292,7 +292,7 @@ void TopBar::initControls() {
 
 			const auto crossProgress = (crossFrom == crossTo)
 				? crossTo
-				: (crossFrom + float64(crossTo - crossFrom) * value);
+				: anim::interpolateF(crossFrom, crossTo, value);
 			_mute->setProgress(crossProgress);
 		};
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 5964e7617..485fba028 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 #include "styles/style_media_player.h"
 #include "ui/controls/send_button.h"
+#include "ui/effects/animation_value.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/text/format_values.h"
 #include "window/window_session_controller.h"
@@ -61,10 +62,6 @@ enum class FilterType {
 	Cancel,
 };
 
-inline float64 InterpolateF(int a, int b, float64 b_ratio) {
-	return a + float64(b - a) * b_ratio;
-}
-
 [[nodiscard]] auto InactiveColor(const QColor &c) {
 	return QColor(c.red(), c.green(), c.blue(), kInactiveWaveformBarAlpha);
 }
@@ -786,15 +783,15 @@ void RecordLock::drawProgress(Painter &p) {
 
 		const auto &blockHeight = st::historyRecordLockIconBottomHeight;
 
-		const auto blockRectWidth = InterpolateF(
+		const auto blockRectWidth = anim::interpolateF(
 			size.width(),
 			st::historyRecordStopIconWidth,
 			lockToStopProgress);
-		const auto blockRectHeight = InterpolateF(
+		const auto blockRectHeight = anim::interpolateF(
 			blockHeight,
 			st::historyRecordStopIconWidth,
 			lockToStopProgress);
-		const auto blockRectTop = InterpolateF(
+		const auto blockRectTop = anim::interpolateF(
 			size.height() - blockHeight,
 			std::round((size.height() - blockRectHeight) / 2.),
 			lockToStopProgress);

From de6b46075465c5600812fcb20324ddb459d9062d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 13 Dec 2020 20:12:34 +0300
Subject: [PATCH 299/370] Fixed visual glitch in Replies section with tall
 input field.

---
 .../view/controls/history_view_compose_controls.cpp    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 76ba6c160..3bea246b3 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1639,7 +1639,15 @@ void ComposeControls::updateControlsGeometry(QSize size) {
 		- _send->width()
 		- _tabbedSelectorToggle->width()
 		- (_botCommandShown ? _botCommandStart->width() : 0);
-	_field->resizeToWidth(fieldWidth);
+	{
+		const auto oldFieldHeight = _field->height();
+		_field->resizeToWidth(fieldWidth);
+		// If a height of the field is changed
+		// then this method will be called with the updated size.
+		if (oldFieldHeight != _field->height()) {
+			return;
+		}
+	}
 
 	const auto buttonsTop = size.height() - _attachToggle->height();
 

From c8643aa1ee84d6e3d4fa7ca57a8434ee77978f35 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 22 Nov 2020 01:37:05 +0300
Subject: [PATCH 300/370] Wrapped raw SectionMemento with unique_ptr.

---
 Telegram/SourceFiles/apiwrap.cpp              |  2 +-
 .../boxes/peers/edit_peer_info_box.cpp        |  8 ++++---
 Telegram/SourceFiles/core/update_checker.cpp  |  2 +-
 .../SourceFiles/data/data_shared_media.cpp    |  2 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  4 ++--
 .../SourceFiles/history/history_widget.cpp    | 10 ++++----
 .../history_view_compose_controls.cpp         |  2 +-
 .../view/history_view_top_bar_widget.cpp      |  6 ++---
 .../info/feed/info_feed_channels.cpp          |  2 +-
 .../SourceFiles/info/feed/info_feed_cover.cpp |  2 +-
 Telegram/SourceFiles/info/info_controller.cpp |  8 +++----
 Telegram/SourceFiles/info/info_controller.h   |  4 ++--
 .../SourceFiles/info/info_layer_widget.cpp    |  2 +-
 Telegram/SourceFiles/info/info_memento.cpp    |  4 ++--
 Telegram/SourceFiles/info/info_memento.h      |  2 +-
 .../info/media/info_media_buttons.h           |  4 ++--
 .../info/profile/info_profile_actions.cpp     |  2 +-
 .../profile/info_profile_inner_widget.cpp     |  3 ++-
 .../info/profile/info_profile_members.cpp     |  2 +-
 Telegram/SourceFiles/mainwidget.cpp           | 24 +++++++++----------
 Telegram/SourceFiles/mainwidget.h             |  4 ++--
 .../window/notifications_manager.cpp          |  2 +-
 .../SourceFiles/window/window_peer_menu.cpp   |  2 +-
 .../window/window_session_controller.cpp      | 23 +++++++++---------
 .../window/window_session_controller.h        |  4 ++--
 25 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 4dc9a726c..577d0b995 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3412,7 +3412,7 @@ void ApiWrap::jumpToHistoryDate(not_null<PeerData*> peer, const QDate &date) {
 //	requestMessageAfterDate(feed, date, [=](Data::MessagePosition result) {
 //		Ui::hideLayer();
 //		App::wnd()->sessionController()->showSection(
-//			HistoryFeed::Memento(feed, result));
+//			std::make_unique<HistoryFeed::Memento>(feed, result));
 //	});
 //}
 
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 0b0801f48..a4df0596a 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -1000,13 +1000,15 @@ void Controller::fillManageSection() {
 			st::infoIconBlacklist);
 	}
 	if (hasRecentActions) {
+		auto callback = [=] {
+			_navigation->showSection(
+				std::make_unique<AdminLog::SectionMemento>(channel));
+		};
 		AddButtonWithCount(
 			_controls.buttonsLayout,
 			tr::lng_manage_peer_recent_actions(),
 			rpl::single(QString()), //Empty count.
-			[=] {
-				_navigation->showSection(AdminLog::SectionMemento(channel));
-			},
+			std::move(callback),
 			st::infoIconRecentActions);
 	}
 
diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
index 79320c9e1..4863ea4ce 100644
--- a/Telegram/SourceFiles/core/update_checker.cpp
+++ b/Telegram/SourceFiles/core/update_checker.cpp
@@ -1591,7 +1591,7 @@ void UpdateApplication() {
 		if (const auto window = App::wnd()) {
 			if (const auto controller = window->sessionController()) {
 				controller->showSection(
-					Info::Memento(
+					std::make_unique<Info::Memento>(
 						Info::Settings::Tag{ controller->session().user() },
 						Info::Section::SettingsType::Advanced),
 					Window::SectionShow());
diff --git a/Telegram/SourceFiles/data/data_shared_media.cpp b/Telegram/SourceFiles/data/data_shared_media.cpp
index 8497ce8f7..9c988dd3b 100644
--- a/Telegram/SourceFiles/data/data_shared_media.cpp
+++ b/Telegram/SourceFiles/data/data_shared_media.cpp
@@ -56,7 +56,7 @@ void SharedMediaShowOverview(
 				return;
 			}
 		}
-		windows.front()->showSection(Info::Memento(
+		windows.front()->showSection(std::make_unique<Info::Memento>(
 			history->peer,
 			Info::Section(type)));
 	}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index fd08fb769..ecd92806d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1776,7 +1776,7 @@ bool Widget::onCancelSearch() {
 			if (const auto peer = _searchInChat.peer()) {
 				Ui::showPeerHistory(peer, ShowAtUnreadMsgId);
 			//} else if (const auto feed = _searchInChat.feed()) { // #feed
-			//	controller()->showSection(HistoryFeed::Memento(feed));
+			//	controller()->showSection(std::make_unique<HistoryFeed::Memento>(feed));
 			} else {
 				Unexpected("Empty key in onCancelSearch().");
 			}
@@ -1800,7 +1800,7 @@ void Widget::onCancelSearchInChat() {
 			if (const auto peer = _searchInChat.peer()) {
 				Ui::showPeerHistory(peer, ShowAtUnreadMsgId);
 			//} else if (const auto feed = _searchInChat.feed()) { // #feed
-			//	controller()->showSection(HistoryFeed::Memento(feed));
+			//	controller()->showSection(std::make_unique<HistoryFeed::Memento>(feed));
 			} else {
 				Unexpected("Empty key in onCancelSearchInPeer().");
 			}
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index eca6160ea..10e3a9064 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -687,7 +687,7 @@ HistoryWidget::HistoryWidget(
 			cancelReply(lastKeyboardUsed);
 			crl::on_main(this, [=, history = action.history]{
 				controller->showSection(
-					HistoryView::ScheduledMemento(history));
+					std::make_unique<HistoryView::ScheduledMemento>(history));
 			});
 		} else {
 			fastShowAtEnd(action.history);
@@ -1505,7 +1505,7 @@ bool HistoryWidget::notify_switchInlineBotButtonReceived(const QString &query, U
 		} else if (to.section == Section::Scheduled) {
 			history->setDraft(Data::DraftKey::Scheduled(), std::move(draft));
 			controller()->showSection(
-				HistoryView::ScheduledMemento(history));
+				std::make_unique<HistoryView::ScheduledMemento>(history));
 		} else {
 			history->setLocalDraft(std::move(draft));
 			if (history == _history) {
@@ -2073,7 +2073,7 @@ void HistoryWidget::refreshScheduledToggle() {
 		_scheduled->show();
 		_scheduled->addClickHandler([=] {
 			controller()->showSection(
-				HistoryView::ScheduledMemento(_history));
+				std::make_unique<HistoryView::ScheduledMemento>(_history));
 		});
 		orderWidgets(); // Raise drag areas to the top.
 	} else if (_scheduled && !has) {
@@ -3883,7 +3883,7 @@ bool HistoryWidget::pushTabbedSelectorToThirdSection(
 	Core::App().settings().setTabbedReplacedWithInfo(false);
 	controller()->resizeForThirdSection();
 	controller()->showSection(
-		ChatHelpers::TabbedMemento(),
+		std::make_unique<ChatHelpers::TabbedMemento>(),
 		params.withThirdColumn());
 	return true;
 }
@@ -5382,7 +5382,7 @@ void HistoryWidget::refreshPinnedBarButton(bool many) {
 			const auto id = _pinnedTracker->currentMessageId();
 			if (id.message) {
 				controller()->showSection(
-					HistoryView::PinnedMemento(
+					std::make_unique<HistoryView::PinnedMemento>(
 						_history,
 						((!_migrated || id.message.channel)
 							? id.message.msg
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 3bea246b3..c848c00d7 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1736,7 +1736,7 @@ bool ComposeControls::pushTabbedSelectorToThirdSection(
 		&st::historyRecordVoiceRippleBgActive);
 	_window->resizeForThirdSection();
 	_window->showSection(
-		ChatHelpers::TabbedMemento(),
+		std::make_unique<ChatHelpers::TabbedMemento>(),
 		params.withThirdColumn());
 	return true;
 }
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 ebadf7133..4c74a042c 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -493,15 +493,15 @@ void TopBarWidget::infoClicked() {
 	} else if (key.folder()) {
 		_controller->closeFolder();
 	//} else if (const auto feed = _activeChat.feed()) { // #feed
-	//	_controller->showSection(Info::Memento(
+	//	_controller->showSection(std::make_unique<Info::Memento>(
 	//		feed,
 	//		Info::Section(Info::Section::Type::Profile)));
 	} else if (key.peer()->isSelf()) {
-		_controller->showSection(Info::Memento(
+		_controller->showSection(std::make_unique<Info::Memento>(
 			key.peer(),
 			Info::Section(Storage::SharedMediaType::Photo)));
 	} else if (key.peer()->isRepliesChat()) {
-		_controller->showSection(Info::Memento(
+		_controller->showSection(std::make_unique<Info::Memento>(
 			key.peer(),
 			Info::Section(Storage::SharedMediaType::Photo)));
 	} else {
diff --git a/Telegram/SourceFiles/info/feed/info_feed_channels.cpp b/Telegram/SourceFiles/info/feed/info_feed_channels.cpp
index ee1acb753..0d636df82 100644
--- a/Telegram/SourceFiles/info/feed/info_feed_channels.cpp
+++ b/Telegram/SourceFiles/info/feed/info_feed_channels.cpp
@@ -281,7 +281,7 @@ void Channels::showChannelsWithSearch(bool withSearch) {
 	auto mementoStack = std::vector<std::unique_ptr<ContentMemento>>();
 	mementoStack.push_back(std::move(contentMemento));
 	_controller->showSection(
-		Info::Memento(std::move(mementoStack)));
+		std::make_unique<Info::Memento>(std::move(mementoStack)));
 }
 
 void Channels::visibleTopBottomUpdated(
diff --git a/Telegram/SourceFiles/info/feed/info_feed_cover.cpp b/Telegram/SourceFiles/info/feed/info_feed_cover.cpp
index fea34f570..1ec2be9e8 100644
--- a/Telegram/SourceFiles/info/feed/info_feed_cover.cpp
+++ b/Telegram/SourceFiles/info/feed/info_feed_cover.cpp
@@ -84,7 +84,7 @@ void Cover::refreshStatusText() {
 	}();
 	_status->setRichText(textcmdLink(1, statusText));
 	_status->setLink(1, std::make_shared<LambdaClickHandler>([=] {
-		_controller->showSection(Info::Memento(
+		_controller->showSection(std::make_unique<Info::Memento>(
 			_feed,
 			Section::Type::Channels));
 	}));
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index 9def98def..b7ff86b31 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -123,7 +123,7 @@ PollData *AbstractController::poll() const {
 }
 
 void AbstractController::showSection(
-		Window::SectionMemento &&memento,
+		std::unique_ptr<Window::SectionMemento> &&memento,
 		const Window::SectionShow &params) {
 	return parentController()->showSection(std::move(memento), params);
 }
@@ -170,7 +170,7 @@ void Controller::setupMigrationViewer() {
 		const auto section = _section;
 		InvokeQueued(_widget, [=] {
 			window->showSection(
-				Memento(peer, section),
+				std::make_unique<Memento>(peer, section),
 				Window::SectionShow(
 					Window::SectionShow::Way::Backward,
 					anim::type::instant,
@@ -261,9 +261,9 @@ void Controller::saveSearchState(not_null<ContentMemento*> memento) {
 }
 
 void Controller::showSection(
-		Window::SectionMemento &&memento,
+		std::unique_ptr<Window::SectionMemento> &&memento,
 		const Window::SectionShow &params) {
-	if (!_widget->showInternal(&memento, params)) {
+	if (!_widget->showInternal(memento.get(), params)) {
 		AbstractController::showSection(std::move(memento), params);
 	}
 }
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index c0f117efe..44926fbee 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -136,7 +136,7 @@ public:
 	virtual rpl::producer<QString> mediaSourceQueryValue() const;
 
 	void showSection(
-		Window::SectionMemento &&memento,
+		std::unique_ptr<Window::SectionMemento> &&memento,
 		const Window::SectionShow &params = Window::SectionShow()) override;
 	void showBackFromStack(
 		const Window::SectionShow &params = Window::SectionShow()) override;
@@ -202,7 +202,7 @@ public:
 	void saveSearchState(not_null<ContentMemento*> memento);
 
 	void showSection(
-		Window::SectionMemento &&memento,
+		std::unique_ptr<Window::SectionMemento> &&memento,
 		const Window::SectionShow &params = Window::SectionShow()) override;
 	void showBackFromStack(
 		const Window::SectionShow &params = Window::SectionShow()) override;
diff --git a/Telegram/SourceFiles/info/info_layer_widget.cpp b/Telegram/SourceFiles/info/info_layer_widget.cpp
index 1627b1383..9460b7f05 100644
--- a/Telegram/SourceFiles/info/info_layer_widget.cpp
+++ b/Telegram/SourceFiles/info/info_layer_widget.cpp
@@ -106,7 +106,7 @@ void LayerWidget::parentResized() {
 		Ui::FocusPersister persister(this);
 		restoreFloatPlayerDelegate();
 
-		auto memento = MoveMemento(std::move(_content));
+		auto memento = std::make_unique<MoveMemento>(std::move(_content));
 
 		// We want to call hideSpecialLayer synchronously to avoid glitches,
 		// but we can't destroy LayerStackWidget from its' resizeEvent,
diff --git a/Telegram/SourceFiles/info/info_memento.cpp b/Telegram/SourceFiles/info/info_memento.cpp
index 8f32c1578..ba15952f5 100644
--- a/Telegram/SourceFiles/info/info_memento.cpp
+++ b/Telegram/SourceFiles/info/info_memento.cpp
@@ -101,8 +101,8 @@ Section Memento::DefaultSection(not_null<PeerData*> peer) {
 //	return Section(Section::Type::Profile);
 //}
 
-Memento Memento::Default(not_null<PeerData*> peer) {
-	return Memento(peer, DefaultSection(peer));
+std::unique_ptr<Memento> Memento::Default(not_null<PeerData*> peer) {
+	return std::make_unique<Memento>(peer, DefaultSection(peer));
 }
 // // #feed
 //Memento Memento::Default(Dialogs::Key key) {
diff --git a/Telegram/SourceFiles/info/info_memento.h b/Telegram/SourceFiles/info/info_memento.h
index c317116cb..bcd9b6aac 100644
--- a/Telegram/SourceFiles/info/info_memento.h
+++ b/Telegram/SourceFiles/info/info_memento.h
@@ -62,7 +62,7 @@ public:
 
 	static Section DefaultSection(not_null<PeerData*> peer);
 	//static Section DefaultSection(Dialogs::Key key); // #feed
-	static Memento Default(not_null<PeerData*> peer);
+	static std::unique_ptr<Memento> Default(not_null<PeerData*> peer);
 	//static Memento Default(Dialogs::Key key); // #feed
 
 	~Memento();
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h
index eaf2154ad..78e199c02 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.h
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.h
@@ -92,7 +92,7 @@ inline auto AddButton(
 		tracker)->entity();
 	result->addClickHandler([=] {
 		navigation->showSection(
-			Info::Memento(peer, Section(type)));
+			std::make_unique<Info::Memento>(peer, Section(type)));
 	});
 	return result;
 };
@@ -111,7 +111,7 @@ inline auto AddCommonGroupsButton(
 		tracker)->entity();
 	result->addClickHandler([=] {
 		navigation->showSection(
-			Info::Memento(user, Section::Type::CommonGroups));
+			std::make_unique<Info::Memento>(user, Section::Type::CommonGroups));
 	});
 	return result;
 };
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 1a0e78b85..1413d3ef8 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -843,7 +843,7 @@ object_ptr<Ui::RpWidget> SetupChannelMembers(
 		lt_count_decimal,
 		MembersCountValue(channel) | tr::to_count());
 	auto membersCallback = [=] {
-		controller->showSection(Info::Memento(
+		controller->showSection(std::make_unique<Info::Memento>(
 			channel,
 			Section::Type::Members));
 	};
diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
index 77e6648b9..e55010909 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
@@ -81,7 +81,8 @@ object_ptr<Ui::RpWidget> InnerWidget::setupContent(
 		_controller->parentController()));
 	_cover->showSection(
 	) | rpl::start_with_next([=](Section section) {
-		_controller->showSection(Info::Memento(_peer, section));
+		_controller->showSection(
+			std::make_unique<Info::Memento>(_peer, section));
 	}, _cover->lifetime());
 	_cover->setOnlineCount(rpl::single(0));
 	auto details = SetupDetails(_controller, parent, _peer);
diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.cpp b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
index d95ed2d0b..0923499d3 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_members.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
@@ -349,7 +349,7 @@ void Members::showMembersWithSearch(bool withSearch) {
 	auto mementoStack = std::vector<std::unique_ptr<ContentMemento>>();
 	mementoStack.push_back(std::move(contentMemento));
 	_controller->showSection(
-		Info::Memento(std::move(mementoStack)));
+		std::make_unique<Info::Memento>(std::move(mementoStack)));
 }
 
 //void Members::toggleSearch(anim::type animated) {
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 6802e12ba..1d83b39ae 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -192,8 +192,8 @@ public:
 	StackItemType type() const override {
 		return SectionStackItem;
 	}
-	Window::SectionMemento *memento() const {
-		return _memento.get();
+	std::unique_ptr<Window::SectionMemento> takeMemento() {
+		return std::move(_memento);
 	}
 
 private:
@@ -1599,10 +1599,10 @@ void MainWidget::saveSectionInStack() {
 }
 
 void MainWidget::showSection(
-		Window::SectionMemento &&memento,
+		std::unique_ptr<Window::SectionMemento> &&memento,
 		const SectionShow &params) {
 	if (_mainSection && _mainSection->showInternal(
-			&memento,
+			memento.get(),
 			params)) {
 		if (const auto entry = _mainSection->activeChat(); entry.key) {
 			_controller->setActiveChatEntry(entry);
@@ -1720,7 +1720,7 @@ Window::SectionSlideParams MainWidget::prepareDialogsAnimation() {
 }
 
 void MainWidget::showNewSection(
-		Window::SectionMemento &&memento,
+		std::unique_ptr<Window::SectionMemento> &&memento,
 		const SectionShow &params) {
 	using Column = Window::Column;
 
@@ -1732,7 +1732,7 @@ void MainWidget::showNewSection(
 		st::columnMinimalWidthThird,
 		height() - thirdSectionTop);
 	auto newThirdSection = (Adaptive::ThreeColumn() && params.thirdColumn)
-		? memento.createWidget(
+		? memento->createWidget(
 			this,
 			_controller,
 			Column::Third,
@@ -1741,7 +1741,7 @@ void MainWidget::showNewSection(
 	const auto layerRect = parentWidget()->rect();
 	if (newThirdSection) {
 		saveInStack = false;
-	} else if (auto layer = memento.createLayer(_controller, layerRect)) {
+	} else if (auto layer = memento->createLayer(_controller, layerRect)) {
 		if (params.activation != anim::activation::background) {
 			Ui::hideLayer(anim::type::instant);
 		}
@@ -1766,7 +1766,7 @@ void MainWidget::showNewSection(
 		height() - mainSectionTop);
 	auto newMainSection = newThirdSection
 		? nullptr
-		: memento.createWidget(
+		: memento->createWidget(
 			this,
 			_controller,
 			Adaptive::OneColumn() ? Column::First : Column::Second,
@@ -1777,7 +1777,7 @@ void MainWidget::showNewSection(
 		if (_a_show.animating()
 			|| Core::App().passcodeLocked()
 			|| (params.animated == anim::type::instant)
-			|| memento.instant()) {
+			|| memento->instant()) {
 			return false;
 		}
 		if (!Adaptive::OneColumn() && params.way == SectionShow::Way::ClearStack) {
@@ -1908,12 +1908,12 @@ void MainWidget::showBackFromStack(
 	} else if (item->type() == SectionStackItem) {
 		auto sectionItem = static_cast<StackItemSection*>(item.get());
 		showNewSection(
-			std::move(*sectionItem->memento()),
+			sectionItem->takeMemento(),
 			params.withWay(SectionShow::Way::Backward));
 	}
 	if (_thirdSectionFromStack && _thirdSection) {
 		_controller->showSection(
-			std::move(*base::take(_thirdSectionFromStack)),
+			base::take(_thirdSectionFromStack),
 			SectionShow(
 				SectionShow::Way::ClearStack,
 				anim::type::instant,
@@ -2455,7 +2455,7 @@ void MainWidget::updateThirdColumnToCurrentChat(
 		}
 
 		_controller->showSection(
-			std::move(*thirdSectionForCurrentMainSection(key)),
+			thirdSectionForCurrentMainSection(key),
 			params.withThirdColumn());
 	};
 	auto switchTabbedFast = [&](not_null<PeerData*> peer) {
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 6a1f0e666..3575dea9e 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -134,7 +134,7 @@ public:
 
 	int backgroundFromY() const;
 	void showSection(
-		Window::SectionMemento &&memento,
+		std::unique_ptr<Window::SectionMemento> &&memento,
 		const SectionShow &params);
 	void updateColumnLayout();
 	bool stackIsEmpty() const;
@@ -271,7 +271,7 @@ private:
 	Window::SectionSlideParams prepareShowAnimation(
 		bool willHaveTopBarShadow);
 	void showNewSection(
-		Window::SectionMemento &&memento,
+		std::unique_ptr<Window::SectionMemento> &&memento,
 		const SectionShow &params);
 	void dropMainSection(Window::SectionWidget *widget);
 
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index e6d772506..00f822f8e 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -650,7 +650,7 @@ void Manager::openNotificationMessage(
 		Ui::showPeerHistory(history, messageId);
 	//} else if (messageFeed) { // #feed
 	//	App::wnd()->sessionController()->showSection(
-	//		HistoryFeed::Memento(messageFeed));
+	//		std::make_unique<HistoryFeed::Memento>(messageFeed));
 	} else {
 		Ui::showPeerHistory(history, ShowAtUnreadMsgId);
 	}
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 9e5f7653f..1efe6f16d 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -714,7 +714,7 @@ void Filler::addTogglesForArchive() {
 //	const auto controller = _controller;
 //	const auto feed = _feed;
 //	_addAction(tr::lng_context_view_feed_info(tr::now), [=] {
-//		controller->showSection(Info::Memento(
+//		controller->showSection(std::make_unique<Info::Memento>(
 //			feed,
 //			Info::Section(Info::Section::Type::Profile)));
 //	});
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 56a7c2e19..b6e13be53 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -253,12 +253,12 @@ void SessionNavigation::showRepliesForMessage(
 	const auto channelId = history->channelId();
 	//const auto item = _session->data().message(channelId, rootId);
 	//if (!commentId && (!item || !item->repliesAreComments())) {
-	//	showSection(HistoryView::RepliesMemento(history, rootId));
+	//	showSection(std::make_unique<HistoryView::RepliesMemento>(history, rootId));
 	//	return;
 	//} else if (const auto id = item ? item->commentsItemId() : FullMsgId()) {
 	//	if (const auto commentsItem = _session->data().message(id)) {
 	//		showSection(
-	//			HistoryView::RepliesMemento(commentsItem));
+	//			std::make_unique<HistoryView::RepliesMemento>(commentsItem));
 	//		return;
 	//	}
 	//}
@@ -314,8 +314,9 @@ void SessionNavigation::showRepliesForMessage(
 						post->setRepliesOutboxReadTill(readTill->v);
 					}
 				}
-				showSection(
-					HistoryView::RepliesMemento(item, commentId));
+				showSection(std::make_unique<HistoryView::RepliesMemento>(
+					item,
+					commentId));
 			}
 		});
 	}).fail([=](const RPCError &error) {
@@ -341,7 +342,7 @@ void SessionNavigation::showPeerInfo(
 	//	Core::App().settings().setThirdSectionInfoEnabled(true);
 	//	Core::App().saveSettingsDelayed();
 	//}
-	showSection(Info::Memento(peer), params);
+	showSection(std::make_unique<Info::Memento>(peer), params);
 }
 
 void SessionNavigation::showPeerInfo(
@@ -374,7 +375,7 @@ void SessionNavigation::showSettings(
 		Settings::Type type,
 		const SectionShow &params) {
 	showSection(
-		Info::Memento(
+		std::make_unique<Info::Memento>(
 			Info::Settings::Tag{ _session->user() },
 			Info::Section(type)),
 		params);
@@ -388,7 +389,7 @@ void SessionNavigation::showPollResults(
 		not_null<PollData*> poll,
 		FullMsgId contextId,
 		const SectionShow &params) {
-	showSection(Info::Memento(poll, contextId), params);
+	showSection(std::make_unique<Info::Memento>(poll, contextId), params);
 }
 
 SessionController::SessionController(
@@ -639,9 +640,9 @@ bool SessionController::jumpToChatListEntry(Dialogs::RowDescriptor row) {
 		return true;
 	//} else if (const auto feed = row.key.feed()) { // #feed
 	//	if (const auto item = session().data().message(row.fullId)) {
-	//		showSection(HistoryFeed::Memento(feed, item->position()));
+	//		showSection(std::make_unique<HistoryFeed::Memento>(feed, item->position()));
 	//	} else {
-	//		showSection(HistoryFeed::Memento(feed));
+	//		showSection(std::make_unique<HistoryFeed::Memento>(feed));
 	//	}
 	}
 	return false;
@@ -1086,10 +1087,10 @@ void SessionController::showPeerHistory(
 }
 
 void SessionController::showSection(
-		SectionMemento &&memento,
+		std::unique_ptr<SectionMemento> &&memento,
 		const SectionShow &params) {
 	if (!params.thirdColumn && widget()->showSectionInExistingLayer(
-			&memento,
+			memento.get(),
 			params)) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 900ad2487..88f563031 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -132,7 +132,7 @@ public:
 	Main::Session &session() const;
 
 	virtual void showSection(
-		SectionMemento &&memento,
+		std::unique_ptr<SectionMemento> &&memento,
 		const SectionShow &params = SectionShow()) = 0;
 	virtual void showBackFromStack(
 		const SectionShow &params = SectionShow()) = 0;
@@ -301,7 +301,7 @@ public:
 		bool confirmedLeaveOther = false);
 
 	void showSection(
-		SectionMemento &&memento,
+		std::unique_ptr<SectionMemento> &&memento,
 		const SectionShow &params = SectionShow()) override;
 	void showBackFromStack(
 		const SectionShow &params = SectionShow()) override;

From 24b8377a2a233414288636c4a739b71ad91770bd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 22 Nov 2020 02:18:58 +0300
Subject: [PATCH 301/370] Added initial implementation of display sections
 prevent.

---
 .../SourceFiles/history/history_widget.cpp    |  8 +++++
 Telegram/SourceFiles/history/history_widget.h |  2 ++
 .../history_view_compose_controls.cpp         |  8 +++++
 .../controls/history_view_compose_controls.h  |  2 ++
 .../history_view_voice_record_bar.cpp         | 25 +++++++++++--
 .../controls/history_view_voice_record_bar.h  |  2 ++
 .../view/history_view_replies_section.cpp     |  4 +++
 .../view/history_view_replies_section.h       |  1 +
 .../view/history_view_scheduled_section.cpp   |  4 +++
 .../view/history_view_scheduled_section.h     |  1 +
 Telegram/SourceFiles/mainwidget.cpp           | 35 ++++++++++++++++++-
 Telegram/SourceFiles/mainwidget.h             |  3 ++
 Telegram/SourceFiles/window/section_widget.h  |  4 +++
 13 files changed, 95 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 10e3a9064..829025603 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -3914,6 +3914,14 @@ void HistoryWidget::setTabbedPanel(std::unique_ptr<TabbedPanel> panel) {
 	}
 }
 
+bool HistoryWidget::preventsClose(Fn<void()> &&continueCallback) const {
+	if (isRecording()) {
+		_voiceRecordBar->showDiscardRecordingBox(std::move(continueCallback));
+		return true;
+	}
+	return false;
+}
+
 void HistoryWidget::toggleTabbedSelectorMode() {
 	if (!_peer) {
 		return;
diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h
index 62e61c5e7..163b9ac01 100644
--- a/Telegram/SourceFiles/history/history_widget.h
+++ b/Telegram/SourceFiles/history/history_widget.h
@@ -119,6 +119,8 @@ public:
 
 	void historyLoaded();
 
+	[[nodiscard]] bool preventsClose(Fn<void()> &&continueCallback) const;
+
 	// When resizing the widget with top edge moved up or down and we
 	// want to add this top movement to the scroll position, so inner
 	// content will not move.
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index c848c00d7..8b0d40b03 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2138,6 +2138,14 @@ bool ComposeControls::isRecording() const {
 	return _voiceRecordBar->isRecording();
 }
 
+bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const {
+	if (isRecording()) {
+		_voiceRecordBar->showDiscardRecordingBox(std::move(continueCallback));
+		return true;
+	}
+	return false;
+}
+
 void ComposeControls::updateInlineBotQuery() {
 	if (!_history) {
 		return;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 8ca65f62b..30201f1ac 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -135,6 +135,8 @@ public:
 	[[nodiscard]] bool isEditingMessage() const;
 	[[nodiscard]] FullMsgId replyingToMessage() const;
 
+	[[nodiscard]] bool preventsClose(Fn<void()> &&continueCallback) const;
+
 	void showForGrab();
 	void showStarted();
 	void showFinished();
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 485fba028..5866a8ad5 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1536,9 +1536,10 @@ void VoiceRecordBar::installClickOutsideFilter() {
 		} else if (type == QEvent::ContextMenu || type == QEvent::Shortcut) {
 			return Type::ShowBox;
 		} else if (type == QEvent::MouseButtonPress) {
-			return (noBox && !_inField.current() && !_lock->underMouse())
-				? Type::ShowBox
-				: Type::Continue;
+			return Type::Continue;
+			// return (noBox && !_inField.current() && !_lock->underMouse())
+			// 	? Type::ShowBox
+			// 	: Type::Continue;
 		}
 		return Type::Continue;
 	};
@@ -1609,4 +1610,22 @@ void VoiceRecordBar::installListenStateFilter() {
 		std::move(keyFilter));
 }
 
+void VoiceRecordBar::showDiscardRecordingBox(Fn<void()> &&callback) {
+	if (!isRecording()) {
+		return;
+	}
+	auto sure = [=, callback = std::move(callback)](Fn<void()> &&close) {
+		hideFast();
+		close();
+		if (callback) {
+			callback();
+		}
+	};
+	Ui::show(Box<ConfirmBox>(
+		tr::lng_record_lock_cancel_sure(tr::now),
+		tr::lng_record_lock_discard(tr::now),
+		st::attentionBoxButton,
+		std::move(sure)));
+}
+
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index cb1fc1cfd..ff25e279f 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -47,6 +47,8 @@ public:
 		int recorderHeight);
 	~VoiceRecordBar();
 
+	void showDiscardRecordingBox(Fn<void()> &&callback);
+
 	void startRecording();
 	void finishAnimating();
 	void hideAnimated();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index 1787f399b..dc8a02bac 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1315,6 +1315,10 @@ Dialogs::RowDescriptor RepliesWidget::activeChat() const {
 	};
 }
 
+bool RepliesWidget::preventsClose(Fn<void()> &&continueCallback) const {
+	return _composeControls->preventsClose(std::move(continueCallback));
+}
+
 QPixmap RepliesWidget::grabForShowAnimation(const Window::SectionSlideParams &params) {
 	_topBar->updateControlsVisibility();
 	if (params.withTopBarShadow) _topBarShadow->hide();
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index 93ea4fbb1..fd36d703d 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -75,6 +75,7 @@ public:
 
 	[[nodiscard]] not_null<History*> history() const;
 	Dialogs::RowDescriptor activeChat() const override;
+	bool preventsClose(Fn<void()> &&continueCallback) const override;
 
 	bool hasTopBarShadow() const override {
 		return true;
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index 484fbd69b..fdd6c5cc7 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -894,6 +894,10 @@ Dialogs::RowDescriptor ScheduledWidget::activeChat() const {
 	};
 }
 
+bool ScheduledWidget::preventsClose(Fn<void()> &&continueCallback) const {
+	return _composeControls->preventsClose(std::move(continueCallback));
+}
+
 QPixmap ScheduledWidget::grabForShowAnimation(const Window::SectionSlideParams &params) {
 	_topBar->updateControlsVisibility();
 	if (params.withTopBarShadow) _topBarShadow->hide();
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 31716aaee..0d65a09fd 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -60,6 +60,7 @@ public:
 
 	not_null<History*> history() const;
 	Dialogs::RowDescriptor activeChat() const override;
+	bool preventsClose(Fn<void()> &&continueCallback) const override;
 
 	bool hasTopBarShadow() const override {
 		return true;
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 1d83b39ae..ec111f0e0 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1403,6 +1403,7 @@ void MainWidget::ui_showPeerHistory(
 		PeerId peerId,
 		const SectionShow &params,
 		MsgId showAtMsgId) {
+
 	if (auto peer = session().data().peerLoaded(peerId)) {
 		if (peer->migrateTo()) {
 			peer = peer->migrateTo();
@@ -1423,6 +1424,13 @@ void MainWidget::ui_showPeerHistory(
 		return;
 	}
 
+	if (!(_history->peer() && _history->peer()->id == peerId)
+		&& preventsCloseSection(
+			[=] { ui_showPeerHistory(peerId, params, showAtMsgId); },
+			params)) {
+		return;
+	}
+
 	using OriginMessage = SectionShow::OriginMessage;
 	if (const auto origin = std::get_if<OriginMessage>(&params.origin)) {
 		if (const auto returnTo = session().data().message(origin->id)) {
@@ -1618,13 +1626,22 @@ void MainWidget::showSection(
 	//	return;
 	}
 
+	using MementoPtr = std::unique_ptr<Window::SectionMemento>;
+	const auto sharedMemento = std::make_shared<MementoPtr>(
+		std::move(memento));
+	if (preventsCloseSection(
+		[=] { showSection(base::take(*sharedMemento), params); },
+		params)) {
+		return;
+	}
+
 	// If the window was not resized, but we've enabled
 	// tabbedSelectorSectionEnabled or thirdSectionInfoEnabled
 	// we need to update adaptive layout to Adaptive::ThirdColumn().
 	updateColumnLayout();
 
 	showNewSection(
-		std::move(memento),
+		std::move(*sharedMemento),
 		params);
 }
 
@@ -1880,8 +1897,24 @@ bool MainWidget::stackIsEmpty() const {
 	return _stack.empty();
 }
 
+bool MainWidget::preventsCloseSection(
+		Fn<void()> callback,
+		const SectionShow &params) const {
+	if (params.thirdColumn || Core::App().passcodeLocked()) {
+		return false;
+	}
+	auto copy = callback;
+	return (_mainSection && _mainSection->preventsClose(std::move(copy)))
+		|| (_history && _history->preventsClose(std::move(callback)));
+}
+
 void MainWidget::showBackFromStack(
 		const SectionShow &params) {
+
+	if (preventsCloseSection([=] { showBackFromStack(params); }, params)) {
+		return;
+	}
+
 	if (selectingPeer()) {
 		return;
 	}
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 3575dea9e..41956098a 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -274,6 +274,9 @@ private:
 		std::unique_ptr<Window::SectionMemento> &&memento,
 		const SectionShow &params);
 	void dropMainSection(Window::SectionWidget *widget);
+	bool preventsCloseSection(
+		Fn<void()> callback,
+		const SectionShow &params) const;
 
 	Window::SectionSlideParams prepareThirdSectionAnimation(Window::SectionWidget *section);
 
diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h
index 6d5f3b7fd..472d5e2b4 100644
--- a/Telegram/SourceFiles/window/section_widget.h
+++ b/Telegram/SourceFiles/window/section_widget.h
@@ -129,6 +129,10 @@ public:
 		return false;
 	}
 
+	virtual bool preventsClose(Fn<void()> &&continueCallback) const {
+		return false;
+	}
+
 	// Create a memento of that section to store it in the history stack.
 	// This method may modify the section ("take" heavy items).
 	virtual std::unique_ptr<SectionMemento> createMemento();

From dc7a75441822aa303a87bbfb820299a7e9859c1e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 13 Dec 2020 16:08:16 +0300
Subject: [PATCH 302/370] Added ability to prevent application lock and account
 switch.

---
 Telegram/SourceFiles/core/application.cpp         | 12 ++++++++++--
 Telegram/SourceFiles/core/application.h           |  2 ++
 Telegram/SourceFiles/main/main_domain.cpp         |  6 ++++++
 Telegram/SourceFiles/main/main_domain.h           |  1 +
 Telegram/SourceFiles/mainwidget.cpp               | 14 ++++++++++----
 Telegram/SourceFiles/mainwidget.h                 |  8 +++++---
 Telegram/SourceFiles/mainwindow.cpp               |  7 +++++++
 Telegram/SourceFiles/mainwindow.h                 |  2 ++
 Telegram/SourceFiles/window/window_controller.cpp |  4 ++++
 Telegram/SourceFiles/window/window_controller.h   |  2 ++
 Telegram/SourceFiles/window/window_main_menu.cpp  |  6 ++++--
 11 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 17d48f779..6b527cc10 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -789,9 +789,17 @@ bool Application::openCustomUrl(
 
 }
 
+void Application::preventOrInvoke(Fn<void()> &&callback) {
+	_window->preventOrInvoke(std::move(callback));
+}
+
 void Application::lockByPasscode() {
-	_passcodeLock = true;
-	_window->setupPasscodeLock();
+	preventOrInvoke([=] {
+		if (_window) {
+			_passcodeLock = true;
+			_window->setupPasscodeLock();
+		}
+	});
 }
 
 void Application::unlockPasscode() {
diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h
index 82b5cd390..15a5fcb1a 100644
--- a/Telegram/SourceFiles/core/application.h
+++ b/Telegram/SourceFiles/core/application.h
@@ -277,6 +277,8 @@ public:
 	void switchFreeType();
 	void writeInstallBetaVersionsSetting();
 
+	void preventOrInvoke(Fn<void()> &&callback);
+
 	void call_handleObservables();
 
 protected:
diff --git a/Telegram/SourceFiles/main/main_domain.cpp b/Telegram/SourceFiles/main/main_domain.cpp
index 0501264dd..672da38dc 100644
--- a/Telegram/SourceFiles/main/main_domain.cpp
+++ b/Telegram/SourceFiles/main/main_domain.cpp
@@ -385,6 +385,12 @@ void Domain::checkForLastProductionConfig(
 	Core::App().refreshFallbackProductionConfig(mtp->config());
 }
 
+void Domain::maybeActivate(not_null<Main::Account*> account) {
+	Core::App().preventOrInvoke(crl::guard(account, [=] {
+		activate(account);
+	}));
+}
+
 void Domain::activate(not_null<Main::Account*> account) {
 	if (_active.current() == account.get()) {
 		return;
diff --git a/Telegram/SourceFiles/main/main_domain.h b/Telegram/SourceFiles/main/main_domain.h
index 4adadf21e..ad4d6f11f 100644
--- a/Telegram/SourceFiles/main/main_domain.h
+++ b/Telegram/SourceFiles/main/main_domain.h
@@ -63,6 +63,7 @@ public:
 	void notifyUnreadBadgeChanged();
 
 	[[nodiscard]] not_null<Main::Account*> add(MTP::Environment environment);
+	void maybeActivate(not_null<Main::Account*> account);
 	void activate(not_null<Main::Account*> account);
 	void addActivated(MTP::Environment environment);
 
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index ec111f0e0..2172cf0ea 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -1897,10 +1897,8 @@ bool MainWidget::stackIsEmpty() const {
 	return _stack.empty();
 }
 
-bool MainWidget::preventsCloseSection(
-		Fn<void()> callback,
-		const SectionShow &params) const {
-	if (params.thirdColumn || Core::App().passcodeLocked()) {
+bool MainWidget::preventsCloseSection(Fn<void()> callback) const {
+	if (Core::App().passcodeLocked()) {
 		return false;
 	}
 	auto copy = callback;
@@ -1908,6 +1906,14 @@ bool MainWidget::preventsCloseSection(
 		|| (_history && _history->preventsClose(std::move(callback)));
 }
 
+bool MainWidget::preventsCloseSection(
+		Fn<void()> callback,
+		const SectionShow &params) const {
+	return params.thirdColumn
+		? false
+		: preventsCloseSection(std::move(callback));
+}
+
 void MainWidget::showBackFromStack(
 		const SectionShow &params) {
 
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 41956098a..586157c83 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -223,6 +223,11 @@ public:
 	void closeBothPlayers();
 	void stopAndClosePlayer();
 
+	bool preventsCloseSection(Fn<void()> callback) const;
+	bool preventsCloseSection(
+		Fn<void()> callback,
+		const SectionShow &params) const;
+
 public slots:
 	void inlineResultLoadProgress(FileLoader *loader);
 	void inlineResultLoadFailed(FileLoader *loader, bool started);
@@ -274,9 +279,6 @@ private:
 		std::unique_ptr<Window::SectionMemento> &&memento,
 		const SectionShow &params);
 	void dropMainSection(Window::SectionWidget *widget);
-	bool preventsCloseSection(
-		Fn<void()> callback,
-		const SectionShow &params) const;
 
 	Window::SectionSlideParams prepareThirdSectionAnimation(Window::SectionWidget *section);
 
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index 5e2047646..c80e59c11 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -221,6 +221,13 @@ QPixmap MainWindow::grabInner() {
 	return {};
 }
 
+void MainWindow::preventOrInvoke(Fn<void()> callback) {
+	if (_main && _main->preventsCloseSection(callback)) {
+		return;
+	}
+	callback();
+}
+
 void MainWindow::setupPasscodeLock() {
 	auto animated = (_main || _intro);
 	auto bg = animated ? grabInner() : QPixmap();
diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h
index 57a67eb50..d7d925cac 100644
--- a/Telegram/SourceFiles/mainwindow.h
+++ b/Telegram/SourceFiles/mainwindow.h
@@ -48,6 +48,8 @@ public:
 
 	void finishFirstShow();
 
+	void preventOrInvoke(Fn<void()> callback);
+
 	void setupPasscodeLock();
 	void clearPasscodeLock();
 	void setupIntro(Intro::EnterPoint point);
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index fbb53d508..eb514d7e0 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -317,6 +317,10 @@ void Controller::close() {
 	_widget.close();
 }
 
+void Controller::preventOrInvoke(Fn<void()> &&callback) {
+	_widget.preventOrInvoke(std::move(callback));
+}
+
 QPoint Controller::getPointForCallPanelCenter() const {
 	Expects(_widget.windowHandle() != nullptr);
 
diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h
index 05c6e02fd..975626974 100644
--- a/Telegram/SourceFiles/window/window_controller.h
+++ b/Telegram/SourceFiles/window/window_controller.h
@@ -72,6 +72,8 @@ public:
 	void minimize();
 	void close();
 
+	void preventOrInvoke(Fn<void()> &&callback);
+
 	QPoint getPointForCallPanelCenter() const;
 
 private:
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index c4cfe2a0b..2213c1b84 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -761,7 +761,7 @@ void MainMenu::rebuildAccounts() {
 				}
 				auto activate = [=, guard = _accountSwitchGuard.make_guard()]{
 					if (guard) {
-						Core::App().domain().activate(account);
+						Core::App().domain().maybeActivate(account);
 					}
 				};
 				base::call_delayed(
@@ -815,7 +815,9 @@ not_null<Ui::SlideWrap<Ui::RippleButton>*> MainMenu::setupAddAccount(
 	}, button->lifetime());
 
 	const auto add = [=](MTP::Environment environment) {
-		Core::App().domain().addActivated(environment);
+		Core::App().preventOrInvoke([=] {
+			Core::App().domain().addActivated(environment);
+		});
 	};
 
 	button->setAcceptBoth(true);

From 77775b5f7cb2ea3533493edc2a40c8cf6787f7cc Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 13 Dec 2020 18:58:42 +0300
Subject: [PATCH 303/370] Added ability to use application while recording
 voice message.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 .../SourceFiles/history/history_widget.cpp    |  15 ++-
 .../history_view_compose_controls.cpp         |  14 +--
 .../history_view_voice_record_bar.cpp         | 109 +++---------------
 .../controls/history_view_voice_record_bar.h  |   9 +-
 5 files changed, 36 insertions(+), 112 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 8823ce1ab..13c8a8cd1 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1345,6 +1345,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_record_cancel" = "Release outside this field to cancel";
 "lng_record_lock_cancel" = "Click outside of the circle to cancel";
 "lng_record_lock_cancel_sure" = "Are you sure you want to stop recording and discard your voice message?";
+"lng_record_listen_cancel_sure" = "Are you sure you want to discard your recorded voice message?";
 "lng_record_lock_discard" = "Discard";
 "lng_will_be_notified" = "Members will be notified when you post";
 "lng_wont_be_notified" = "Members will not be notified when you post";
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 829025603..617c42bda 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -757,9 +757,6 @@ void HistoryWidget::initVoiceRecordBar() {
 		});
 		_voiceRecordBar->setLockBottom(std::move(scrollHeight));
 	}
-	_voiceRecordBar->setEscFilter([=]() -> bool {
-		return _replyToId || (_nonEmptySelection && _list);
-	});
 
 	_voiceRecordBar->setSendButtonGeometryValue(_send->geometryValue());
 
@@ -1629,7 +1626,7 @@ void HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 		? _history->localEditDraft()
 		: _history->localDraft();
 	auto fieldAvailable = canWriteMessage()
-		&& !_voiceRecordBar->preventDraftApply();
+		&& !_voiceRecordBar->isActive();
 	if (!draft || (!_history->localEditDraft() && !fieldAvailable)) {
 		auto fieldWillBeHiddenAfterEdit = (!fieldAvailable && _editMsgId != 0);
 		clearFieldText(0, fieldHistoryAction);
@@ -3099,7 +3096,7 @@ void HistoryWidget::send(Api::SendOptions options) {
 		return;
 	}
 
-	if (_voiceRecordBar && _voiceRecordBar->isListenState()) {
+	if (_voiceRecordBar->isListenState()) {
 		_voiceRecordBar->requestToSendWithOptions(options);
 		return;
 	}
@@ -3915,8 +3912,8 @@ void HistoryWidget::setTabbedPanel(std::unique_ptr<TabbedPanel> panel) {
 }
 
 bool HistoryWidget::preventsClose(Fn<void()> &&continueCallback) const {
-	if (isRecording()) {
-		_voiceRecordBar->showDiscardRecordingBox(std::move(continueCallback));
+	if (_voiceRecordBar->isActive()) {
+		_voiceRecordBar->showDiscardBox(std::move(continueCallback));
 		return true;
 	}
 	return false;
@@ -5648,7 +5645,7 @@ void HistoryWidget::editMessage(FullMsgId itemId) {
 }
 
 void HistoryWidget::editMessage(not_null<HistoryItem*> item) {
-	if (_voiceRecordBar && _voiceRecordBar->isListenState()) {
+	if (_voiceRecordBar->isListenState()) {
 		Ui::show(Box<InformBox>(tr::lng_edit_caption_voice(tr::now)));
 		return;
 	}
@@ -6122,6 +6119,8 @@ void HistoryWidget::escape() {
 		_fieldAutocomplete->hideAnimated();
 	} else if (_replyToId && _field->getTextWithTags().text.isEmpty()) {
 		cancelReply();
+	} else if (auto &voice = _voiceRecordBar; voice->isActive()) {
+		voice->showDiscardBox(nullptr, anim::type::normal);
 	} else {
 		_cancelRequests.fire({});
 	}
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 8b0d40b03..236af8558 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1567,10 +1567,6 @@ void ComposeControls::initVoiceRecordBar() {
 		_voiceRecordBar->setLockBottom(std::move(bottom));
 	}
 
-	_voiceRecordBar->setEscFilter([=] {
-		return (isEditingMessage() || replyingToMessage());
-	});
-
 	_voiceRecordBar->updateSendButtonTypeRequests(
 	) | rpl::start_with_next([=] {
 		updateSendButtonType();
@@ -1716,7 +1712,11 @@ void ComposeControls::paintBackground(QRect clip) {
 }
 
 void ComposeControls::escape() {
-	_cancelRequests.fire({});
+	if (auto &voice = _voiceRecordBar; !voice->isActive()) {
+		voice->showDiscardBox(nullptr, anim::type::normal);
+	} else {
+		_cancelRequests.fire({});
+	}
 }
 
 bool ComposeControls::pushTabbedSelectorToThirdSection(
@@ -2139,8 +2139,8 @@ bool ComposeControls::isRecording() const {
 }
 
 bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const {
-	if (isRecording()) {
-		_voiceRecordBar->showDiscardRecordingBox(std::move(continueCallback));
+	if (_voiceRecordBar->isActive()) {
+		_voiceRecordBar->showDiscardBox(std::move(continueCallback));
 		return true;
 	}
 	return false;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 5866a8ad5..f6505a1d5 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1070,7 +1070,6 @@ void VoiceRecordBar::init() {
 
 	_lock->locks(
 	) | rpl::start_with_next([=] {
-		installClickOutsideFilter();
 		_level->setType(VoiceRecordButton::Type::Send);
 
 		_level->clicks(
@@ -1173,10 +1172,6 @@ void VoiceRecordBar::visibilityAnimate(bool show, Fn<void()> &&callback) {
 	_showAnimation.start(std::move(animationCallback), from, to, duration);
 }
 
-void VoiceRecordBar::setEscFilter(Fn<bool()> &&callback) {
-	_escFilter = std::move(callback);
-}
-
 void VoiceRecordBar::setStartRecordingFilter(Fn<bool()> &&callback) {
 	_startRecordingFilter = std::move(callback);
 }
@@ -1227,6 +1222,9 @@ void VoiceRecordBar::startRecording() {
 		}, [=] {
 			stop(false);
 		}, _recordingLifetime);
+		_recordingLifetime.add([=] {
+			_recording = false;
+		});
 	};
 	visibilityAnimate(true, std::move(appearanceCallback));
 	show();
@@ -1287,7 +1285,6 @@ void VoiceRecordBar::stop(bool send) {
 void VoiceRecordBar::finish() {
 	_recordingLifetime.destroy();
 	_lockShowing = false;
-	_recording = false;
 	_inField = false;
 	_redCircleProgress = 0.;
 	_recordingSamples = 0;
@@ -1411,7 +1408,7 @@ bool VoiceRecordBar::isRecording() const {
 	return _recording.current();
 }
 
-bool VoiceRecordBar::preventDraftApply() const {
+bool VoiceRecordBar::isActive() const {
 	return isRecording() || isListenState();
 }
 
@@ -1419,7 +1416,7 @@ void VoiceRecordBar::hideAnimated() {
 	if (isHidden()) {
 		return;
 	}
-	visibilityAnimate(false, [=] { hide(); });
+	visibilityAnimate(false, [=] { hideFast(); });
 }
 
 void VoiceRecordBar::finishAnimating() {
@@ -1494,77 +1491,6 @@ void VoiceRecordBar::orderControls() {
 	_lock->raise();
 }
 
-void VoiceRecordBar::installClickOutsideFilter() {
-	const auto box = _recordingLifetime.make_state<QPointer<ConfirmBox>>();
-	const auto showBox = [=] {
-		if (*box) {
-			return;
-		}
-		auto sure = [=](Fn<void()> &&close) {
-			stop(false);
-			close();
-		};
-		*box = Ui::show(Box<ConfirmBox>(
-			tr::lng_record_lock_cancel_sure(tr::now),
-			tr::lng_record_lock_discard(tr::now),
-			st::attentionBoxButton,
-			std::move(sure)));
-	};
-
-	const auto computeResult = [=](not_null<QEvent*> e) {
-		using Type = FilterType;
-		if (!_lock->isLocked()) {
-			return Type::Continue;
-		}
-		const auto type = e->type();
-		const auto noBox = !(*box);
-		if (type == QEvent::KeyPress) {
-			const auto key = static_cast<QKeyEvent*>(e.get())->key();
-			const auto isEsc = (key == Qt::Key_Escape);
-			const auto isEnter = (key == Qt::Key_Enter
-				|| key == Qt::Key_Return);
-			if (noBox) {
-				if (isEnter) {
-					stop(true);
-					return Type::Cancel;
-				} else if (isEsc && (_escFilter && _escFilter())) {
-					return Type::Continue;
-				}
-				return Type::ShowBox;
-			}
-			return (isEsc || isEnter) ? Type::Continue : Type::ShowBox;
-		} else if (type == QEvent::ContextMenu || type == QEvent::Shortcut) {
-			return Type::ShowBox;
-		} else if (type == QEvent::MouseButtonPress) {
-			return Type::Continue;
-			// return (noBox && !_inField.current() && !_lock->underMouse())
-			// 	? Type::ShowBox
-			// 	: Type::Continue;
-		}
-		return Type::Continue;
-	};
-
-	auto filterCallback = [=](not_null<QEvent*> e) {
-		using Result = base::EventFilterResult;
-		switch(computeResult(e)) {
-		case FilterType::ShowBox: {
-			showBox();
-			return Result::Cancel;
-		}
-		case FilterType::Continue: return Result::Continue;
-		case FilterType::Cancel: return Result::Cancel;
-		default: return Result::Continue;
-		}
-	};
-
-	auto filter = base::install_event_filter(
-		QCoreApplication::instance(),
-		std::move(filterCallback));
-
-	_recordingLifetime.make_state<base::unique_qptr<QObject>>(
-		std::move(filter));
-}
-
 void VoiceRecordBar::installListenStateFilter() {
 	auto keyFilterCallback = [=](not_null<QEvent*> e) {
 		using Result = base::EventFilterResult;
@@ -1577,7 +1503,6 @@ void VoiceRecordBar::installListenStateFilter() {
 			const auto keyEvent = static_cast<QKeyEvent*>(e.get());
 			const auto key = keyEvent->key();
 			const auto isSpace = (key == Qt::Key_Space);
-			const auto isEsc = (key == Qt::Key_Escape);
 			const auto isEnter = (key == Qt::Key_Enter
 				|| key == Qt::Key_Return);
 			if (isSpace && !keyEvent->isAutoRepeat() && _listen) {
@@ -1588,14 +1513,6 @@ void VoiceRecordBar::installListenStateFilter() {
 				requestToSendWithOptions({});
 				return Result::Cancel;
 			}
-			if (isEsc) {
-				if (_escFilter && _escFilter()) {
-					return Result::Continue;
-				} else {
-					hideAnimated();
-					return Result::Cancel;
-				}
-			}
 			return Result::Continue;
 		}
 		default: return Result::Continue;
@@ -1610,19 +1527,27 @@ void VoiceRecordBar::installListenStateFilter() {
 		std::move(keyFilter));
 }
 
-void VoiceRecordBar::showDiscardRecordingBox(Fn<void()> &&callback) {
-	if (!isRecording()) {
+void VoiceRecordBar::showDiscardBox(
+		Fn<void()> &&callback,
+		anim::type animated) {
+	if (!isActive()) {
 		return;
 	}
 	auto sure = [=, callback = std::move(callback)](Fn<void()> &&close) {
-		hideFast();
+		if (animated == anim::type::instant) {
+			hideFast();
+		} else {
+			hideAnimated();
+		}
 		close();
 		if (callback) {
 			callback();
 		}
 	};
 	Ui::show(Box<ConfirmBox>(
-		tr::lng_record_lock_cancel_sure(tr::now),
+		(isListenState()
+			? tr::lng_record_listen_cancel_sure
+			: tr::lng_record_lock_cancel_sure)(tr::now),
 		tr::lng_record_lock_discard(tr::now),
 		st::attentionBoxButton,
 		std::move(sure)));
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index ff25e279f..c7653ebc4 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -47,7 +47,9 @@ public:
 		int recorderHeight);
 	~VoiceRecordBar();
 
-	void showDiscardRecordingBox(Fn<void()> &&callback);
+	void showDiscardBox(
+		Fn<void()> &&callback,
+		anim::type animated = anim::type::instant);
 
 	void startRecording();
 	void finishAnimating();
@@ -68,13 +70,12 @@ public:
 
 	void setLockBottom(rpl::producer<int> &&bottom);
 	void setSendButtonGeometryValue(rpl::producer<QRect> &&geometry);
-	void setEscFilter(Fn<bool()> &&callback);
 	void setStartRecordingFilter(Fn<bool()> &&callback);
 
 	[[nodiscard]] bool isRecording() const;
 	[[nodiscard]] bool isLockPresent() const;
 	[[nodiscard]] bool isListenState() const;
-	[[nodiscard]] bool preventDraftApply() const;
+	[[nodiscard]] bool isActive() const;
 
 private:
 	enum class StopType {
@@ -102,7 +103,6 @@ private:
 	void drawMessage(Painter &p, float64 recordActive);
 
 	void startRedCircleAnimation();
-	void installClickOutsideFilter();
 	void installListenStateFilter();
 
 	bool isTypeRecord() const;
@@ -137,7 +137,6 @@ private:
 
 	Ui::Text::String _message;
 
-	Fn<bool()> _escFilter;
 	Fn<bool()> _startRecordingFilter;
 
 	rpl::variable<bool> _recording = false;

From baba7e272da6a7fb3e72e5e284204ea0ee066550 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 14 Dec 2020 16:09:55 +0300
Subject: [PATCH 304/370] Updated phrase and colors for force muted state in
 group calls.

---
 Telegram/Resources/langs/lang.strings                           | 2 +-
 Telegram/SourceFiles/calls/calls_top_bar.cpp                    | 2 +-
 .../history/view/history_view_group_call_tracker.cpp            | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 13c8a8cd1..db32ac4ca 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1821,7 +1821,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_settings" = "Settings";
 "lng_group_call_unmute" = "Unmute";
 "lng_group_call_you_are_live" = "You are Live";
-"lng_group_call_force_muted" = "You are muted";
+"lng_group_call_force_muted" = "You are in Listen Only mode";
 "lng_group_call_connecting" = "Connecting...";
 "lng_group_call_leave" = "Leave";
 "lng_group_call_leave_title" = "Leave voice chat";
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 182830864..eb7d2e2de 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -80,7 +80,7 @@ auto Colors() {
 	return base::flat_map<MuteState, Vector>{
 		{
 			MuteState::ForceMuted,
-			Vector{ st::groupCallMembersBg->c, st::groupCallMembersBg->c }
+			Vector{ st::groupCallForceMuted1->c, st::groupCallForceMuted2->c }
 		},
 		{
 			MuteState::Active,
diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
index cf8da4876..0dd370922 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_call_tracker.cpp
@@ -139,7 +139,6 @@ rpl::producer<Ui::GroupCallBarContent> GroupCallTracker::ContentByCall(
 		state->current.users.reserve(state->userpics.size());
 		state->current.users.clear();
 		state->someUserpicsNotLoaded = false;
-		using User = Ui::GroupCallBarContent::User;
 		for (auto &userpic : state->userpics) {
 			userpic.peer->loadUserpic();
 			const auto pic = userpic.peer->genUserpic(userpic.view, st.size);

From b6483cb65cceca59e3230b787e7bfc744532b8a9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 14 Dec 2020 18:48:10 +0400
Subject: [PATCH 305/370] Use shared_ptr<Memento> for sections.

---
 Telegram/SourceFiles/apiwrap.cpp              |  2 +-
 .../boxes/peers/edit_peer_info_box.cpp        |  2 +-
 Telegram/SourceFiles/core/update_checker.cpp  |  2 +-
 .../SourceFiles/data/data_shared_media.cpp    |  2 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  4 +-
 .../admin_log/history_admin_log_section.cpp   |  4 +-
 .../admin_log/history_admin_log_section.h     |  2 +-
 .../SourceFiles/history/history_widget.cpp    | 10 ++---
 .../history_view_compose_controls.cpp         |  2 +-
 .../view/history_view_pinned_section.cpp      |  4 +-
 .../view/history_view_pinned_section.h        |  2 +-
 .../view/history_view_replies_section.cpp     |  4 +-
 .../view/history_view_replies_section.h       |  2 +-
 .../view/history_view_scheduled_section.cpp   |  4 +-
 .../view/history_view_scheduled_section.h     |  2 +-
 .../view/history_view_top_bar_widget.cpp      |  6 +--
 .../info_common_groups_widget.cpp             |  4 +-
 .../common_groups/info_common_groups_widget.h |  2 +-
 .../SourceFiles/info/info_content_widget.cpp  |  2 +-
 .../SourceFiles/info/info_content_widget.h    |  4 +-
 Telegram/SourceFiles/info/info_controller.cpp |  6 +--
 Telegram/SourceFiles/info/info_controller.h   |  4 +-
 .../SourceFiles/info/info_layer_widget.cpp    |  2 +-
 Telegram/SourceFiles/info/info_memento.cpp    | 44 +++++++++----------
 Telegram/SourceFiles/info/info_memento.h      | 20 ++++-----
 .../SourceFiles/info/info_section_widget.cpp  |  2 +-
 .../SourceFiles/info/info_section_widget.h    |  2 +-
 .../SourceFiles/info/info_wrap_widget.cpp     | 20 ++++-----
 Telegram/SourceFiles/info/info_wrap_widget.h  | 10 ++---
 .../info/media/info_media_buttons.h           |  4 +-
 .../info/media/info_media_widget.cpp          |  4 +-
 .../info/media/info_media_widget.h            |  2 +-
 .../info/members/info_members_widget.cpp      |  4 +-
 .../info/members/info_members_widget.h        |  2 +-
 .../info/polls/info_polls_results_widget.cpp  |  4 +-
 .../info/polls/info_polls_results_widget.h    |  2 +-
 .../info/profile/info_profile_actions.cpp     |  2 +-
 .../profile/info_profile_inner_widget.cpp     |  2 +-
 .../info/profile/info_profile_members.cpp     |  6 +--
 .../info/profile/info_profile_widget.cpp      |  4 +-
 .../info/profile/info_profile_widget.h        |  2 +-
 .../info/settings/info_settings_widget.cpp    |  4 +-
 .../info/settings/info_settings_widget.h      |  2 +-
 Telegram/SourceFiles/mainwidget.cpp           | 35 +++++++--------
 Telegram/SourceFiles/mainwidget.h             |  8 ++--
 .../window/notifications_manager.cpp          |  2 +-
 .../SourceFiles/window/section_widget.cpp     |  2 +-
 Telegram/SourceFiles/window/section_widget.h  |  2 +-
 .../SourceFiles/window/window_peer_menu.cpp   |  2 +-
 .../window/window_session_controller.cpp      | 18 ++++----
 .../window/window_session_controller.h        |  4 +-
 Telegram/lib_base                             |  2 +-
 Telegram/lib_ui                               |  2 +-
 cmake                                         |  2 +-
 54 files changed, 147 insertions(+), 152 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 577d0b995..7c94a819f 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3412,7 +3412,7 @@ void ApiWrap::jumpToHistoryDate(not_null<PeerData*> peer, const QDate &date) {
 //	requestMessageAfterDate(feed, date, [=](Data::MessagePosition result) {
 //		Ui::hideLayer();
 //		App::wnd()->sessionController()->showSection(
-//			std::make_unique<HistoryFeed::Memento>(feed, result));
+//			std::make_shared<HistoryFeed::Memento>(feed, result));
 //	});
 //}
 
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index a4df0596a..d78421756 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -1002,7 +1002,7 @@ void Controller::fillManageSection() {
 	if (hasRecentActions) {
 		auto callback = [=] {
 			_navigation->showSection(
-				std::make_unique<AdminLog::SectionMemento>(channel));
+				std::make_shared<AdminLog::SectionMemento>(channel));
 		};
 		AddButtonWithCount(
 			_controls.buttonsLayout,
diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
index 4863ea4ce..c4e94f8d9 100644
--- a/Telegram/SourceFiles/core/update_checker.cpp
+++ b/Telegram/SourceFiles/core/update_checker.cpp
@@ -1591,7 +1591,7 @@ void UpdateApplication() {
 		if (const auto window = App::wnd()) {
 			if (const auto controller = window->sessionController()) {
 				controller->showSection(
-					std::make_unique<Info::Memento>(
+					std::make_shared<Info::Memento>(
 						Info::Settings::Tag{ controller->session().user() },
 						Info::Section::SettingsType::Advanced),
 					Window::SectionShow());
diff --git a/Telegram/SourceFiles/data/data_shared_media.cpp b/Telegram/SourceFiles/data/data_shared_media.cpp
index 9c988dd3b..e1dc70e52 100644
--- a/Telegram/SourceFiles/data/data_shared_media.cpp
+++ b/Telegram/SourceFiles/data/data_shared_media.cpp
@@ -56,7 +56,7 @@ void SharedMediaShowOverview(
 				return;
 			}
 		}
-		windows.front()->showSection(std::make_unique<Info::Memento>(
+		windows.front()->showSection(std::make_shared<Info::Memento>(
 			history->peer,
 			Info::Section(type)));
 	}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index ecd92806d..508e325aa 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1776,7 +1776,7 @@ bool Widget::onCancelSearch() {
 			if (const auto peer = _searchInChat.peer()) {
 				Ui::showPeerHistory(peer, ShowAtUnreadMsgId);
 			//} else if (const auto feed = _searchInChat.feed()) { // #feed
-			//	controller()->showSection(std::make_unique<HistoryFeed::Memento>(feed));
+			//	controller()->showSection(std::make_shared<HistoryFeed::Memento>(feed));
 			} else {
 				Unexpected("Empty key in onCancelSearch().");
 			}
@@ -1800,7 +1800,7 @@ void Widget::onCancelSearchInChat() {
 			if (const auto peer = _searchInChat.peer()) {
 				Ui::showPeerHistory(peer, ShowAtUnreadMsgId);
 			//} else if (const auto feed = _searchInChat.feed()) { // #feed
-			//	controller()->showSection(std::make_unique<HistoryFeed::Memento>(feed));
+			//	controller()->showSection(std::make_shared<HistoryFeed::Memento>(feed));
 			} else {
 				Unexpected("Empty key in onCancelSearchInPeer().");
 			}
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 4200080ce..57427a6ce 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
@@ -371,8 +371,8 @@ void Widget::setupShortcuts() {
 	}, lifetime());
 }
 
-std::unique_ptr<Window::SectionMemento> Widget::createMemento() {
-	auto result = std::make_unique<SectionMemento>(channel());
+std::shared_ptr<Window::SectionMemento> Widget::createMemento() {
+	auto result = std::make_shared<SectionMemento>(channel());
 	saveState(result.get());
 	return result;
 }
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.h b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.h
index 0bd28fb9b..38c915bd4 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.h
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.h
@@ -59,7 +59,7 @@ public:
 	bool showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
-	std::unique_ptr<Window::SectionMemento> createMemento() override;
+	std::shared_ptr<Window::SectionMemento> createMemento() override;
 
 	void setInternalState(const QRect &geometry, not_null<SectionMemento*> memento);
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 617c42bda..912389af6 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -687,7 +687,7 @@ HistoryWidget::HistoryWidget(
 			cancelReply(lastKeyboardUsed);
 			crl::on_main(this, [=, history = action.history]{
 				controller->showSection(
-					std::make_unique<HistoryView::ScheduledMemento>(history));
+					std::make_shared<HistoryView::ScheduledMemento>(history));
 			});
 		} else {
 			fastShowAtEnd(action.history);
@@ -1502,7 +1502,7 @@ bool HistoryWidget::notify_switchInlineBotButtonReceived(const QString &query, U
 		} else if (to.section == Section::Scheduled) {
 			history->setDraft(Data::DraftKey::Scheduled(), std::move(draft));
 			controller()->showSection(
-				std::make_unique<HistoryView::ScheduledMemento>(history));
+				std::make_shared<HistoryView::ScheduledMemento>(history));
 		} else {
 			history->setLocalDraft(std::move(draft));
 			if (history == _history) {
@@ -2070,7 +2070,7 @@ void HistoryWidget::refreshScheduledToggle() {
 		_scheduled->show();
 		_scheduled->addClickHandler([=] {
 			controller()->showSection(
-				std::make_unique<HistoryView::ScheduledMemento>(_history));
+				std::make_shared<HistoryView::ScheduledMemento>(_history));
 		});
 		orderWidgets(); // Raise drag areas to the top.
 	} else if (_scheduled && !has) {
@@ -3880,7 +3880,7 @@ bool HistoryWidget::pushTabbedSelectorToThirdSection(
 	Core::App().settings().setTabbedReplacedWithInfo(false);
 	controller()->resizeForThirdSection();
 	controller()->showSection(
-		std::make_unique<ChatHelpers::TabbedMemento>(),
+		std::make_shared<ChatHelpers::TabbedMemento>(),
 		params.withThirdColumn());
 	return true;
 }
@@ -5387,7 +5387,7 @@ void HistoryWidget::refreshPinnedBarButton(bool many) {
 			const auto id = _pinnedTracker->currentMessageId();
 			if (id.message) {
 				controller()->showSection(
-					std::make_unique<HistoryView::PinnedMemento>(
+					std::make_shared<HistoryView::PinnedMemento>(
 						_history,
 						((!_migrated || id.message.channel)
 							? id.message.msg
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 236af8558..623fe13ce 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1736,7 +1736,7 @@ bool ComposeControls::pushTabbedSelectorToThirdSection(
 		&st::historyRecordVoiceRippleBgActive);
 	_window->resizeForThirdSection();
 	_window->showSection(
-		std::make_unique<ChatHelpers::TabbedMemento>(),
+		std::make_shared<ChatHelpers::TabbedMemento>(),
 		params.withThirdColumn());
 	return true;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 8ea4d512f..00199717d 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -342,8 +342,8 @@ void PinnedWidget::setInternalState(
 	restoreState(memento);
 }
 
-std::unique_ptr<Window::SectionMemento> PinnedWidget::createMemento() {
-	auto result = std::make_unique<PinnedMemento>(history());
+std::shared_ptr<Window::SectionMemento> PinnedWidget::createMemento() {
+	auto result = std::make_shared<PinnedMemento>(history());
 	saveState(result.get());
 	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 ec4250346..0420b4d70 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.h
@@ -56,7 +56,7 @@ public:
 	bool showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
-	std::unique_ptr<Window::SectionMemento> createMemento() override;
+	std::shared_ptr<Window::SectionMemento> createMemento() override;
 	bool showMessage(
 		PeerId peerId,
 		const Window::SectionShow &params,
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
index dc8a02bac..89ef5e3d0 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp
@@ -1367,8 +1367,8 @@ bool RepliesWidget::returnTabbedSelector() {
 	return _composeControls->returnTabbedSelector();
 }
 
-std::unique_ptr<Window::SectionMemento> RepliesWidget::createMemento() {
-	auto result = std::make_unique<RepliesMemento>(history(), _rootId);
+std::shared_ptr<Window::SectionMemento> RepliesWidget::createMemento() {
+	auto result = std::make_shared<RepliesMemento>(history(), _rootId);
 	saveState(result.get());
 	return result;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.h b/Telegram/SourceFiles/history/view/history_view_replies_section.h
index fd36d703d..f3a329b9c 100644
--- a/Telegram/SourceFiles/history/view/history_view_replies_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_replies_section.h
@@ -87,7 +87,7 @@ public:
 	bool showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
-	std::unique_ptr<Window::SectionMemento> createMemento() override;
+	std::shared_ptr<Window::SectionMemento> createMemento() override;
 	bool showMessage(
 		PeerId peerId,
 		const Window::SectionShow &params,
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index fdd6c5cc7..9191bd357 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -941,8 +941,8 @@ bool ScheduledWidget::returnTabbedSelector() {
 	return _composeControls->returnTabbedSelector();
 }
 
-std::unique_ptr<Window::SectionMemento> ScheduledWidget::createMemento() {
-	auto result = std::make_unique<ScheduledMemento>(history());
+std::shared_ptr<Window::SectionMemento> ScheduledWidget::createMemento() {
+	auto result = std::make_shared<ScheduledMemento>(history());
 	saveState(result.get());
 	return result;
 }
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
index 0d65a09fd..28f2c3fea 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.h
@@ -72,7 +72,7 @@ public:
 	bool showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
-	std::unique_ptr<Window::SectionMemento> createMemento() override;
+	std::shared_ptr<Window::SectionMemento> createMemento() override;
 
 	void setInternalState(
 		const QRect &geometry,
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 4c74a042c..aa9d0ade6 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -493,15 +493,15 @@ void TopBarWidget::infoClicked() {
 	} else if (key.folder()) {
 		_controller->closeFolder();
 	//} else if (const auto feed = _activeChat.feed()) { // #feed
-	//	_controller->showSection(std::make_unique<Info::Memento>(
+	//	_controller->showSection(std::make_shared<Info::Memento>(
 	//		feed,
 	//		Info::Section(Info::Section::Type::Profile)));
 	} else if (key.peer()->isSelf()) {
-		_controller->showSection(std::make_unique<Info::Memento>(
+		_controller->showSection(std::make_shared<Info::Memento>(
 			key.peer(),
 			Info::Section(Storage::SharedMediaType::Photo)));
 	} else if (key.peer()->isRepliesChat()) {
-		_controller->showSection(std::make_unique<Info::Memento>(
+		_controller->showSection(std::make_shared<Info::Memento>(
 			key.peer(),
 			Info::Section(Storage::SharedMediaType::Photo)));
 	} else {
diff --git a/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp b/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp
index d9d51639b..f8c1c85ca 100644
--- a/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp
@@ -87,8 +87,8 @@ void Widget::setInternalState(
 	restoreState(memento);
 }
 
-std::unique_ptr<ContentMemento> Widget::doCreateMemento() {
-	auto result = std::make_unique<Memento>(user());
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(user());
 	saveState(result.get());
 	return result;
 }
diff --git a/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.h b/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.h
index ebc5ca940..02d04466d 100644
--- a/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.h
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.h
@@ -64,7 +64,7 @@ private:
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
-	std::unique_ptr<ContentMemento> doCreateMemento() override;
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
 	InnerWidget *_inner = nullptr;
 
diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp
index 832c04533..b0e6f628f 100644
--- a/Telegram/SourceFiles/info/info_content_widget.cpp
+++ b/Telegram/SourceFiles/info/info_content_widget.cpp
@@ -94,7 +94,7 @@ void ContentWidget::updateControlsGeometry() {
 	}
 }
 
-std::unique_ptr<ContentMemento> ContentWidget::createMemento() {
+std::shared_ptr<ContentMemento> ContentWidget::createMemento() {
 	auto result = doCreateMemento();
 	_controller->saveSearchState(result.get());
 	return result;
diff --git a/Telegram/SourceFiles/info/info_content_widget.h b/Telegram/SourceFiles/info/info_content_widget.h
index 9d2a5f423..8eef9f81a 100644
--- a/Telegram/SourceFiles/info/info_content_widget.h
+++ b/Telegram/SourceFiles/info/info_content_widget.h
@@ -39,7 +39,7 @@ public:
 
 	virtual bool showInternal(
 		not_null<ContentMemento*> memento) = 0;
-	std::unique_ptr<ContentMemento> createMemento();
+	std::shared_ptr<ContentMemento> createMemento();
 
 	virtual void setIsStackBottom(bool isStackBottom) {
 	}
@@ -96,7 +96,7 @@ private:
 	void updateControlsGeometry();
 	void refreshSearchField(bool shown);
 
-	virtual std::unique_ptr<ContentMemento> doCreateMemento() = 0;
+	virtual std::shared_ptr<ContentMemento> doCreateMemento() = 0;
 
 	const not_null<Controller*> _controller;
 
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index b7ff86b31..24f9e4f47 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -123,7 +123,7 @@ PollData *AbstractController::poll() const {
 }
 
 void AbstractController::showSection(
-		std::unique_ptr<Window::SectionMemento> &&memento,
+		std::shared_ptr<Window::SectionMemento> memento,
 		const Window::SectionShow &params) {
 	return parentController()->showSection(std::move(memento), params);
 }
@@ -170,7 +170,7 @@ void Controller::setupMigrationViewer() {
 		const auto section = _section;
 		InvokeQueued(_widget, [=] {
 			window->showSection(
-				std::make_unique<Memento>(peer, section),
+				std::make_shared<Memento>(peer, section),
 				Window::SectionShow(
 					Window::SectionShow::Way::Backward,
 					anim::type::instant,
@@ -261,7 +261,7 @@ void Controller::saveSearchState(not_null<ContentMemento*> memento) {
 }
 
 void Controller::showSection(
-		std::unique_ptr<Window::SectionMemento> &&memento,
+		std::shared_ptr<Window::SectionMemento> memento,
 		const Window::SectionShow &params) {
 	if (!_widget->showInternal(memento.get(), params)) {
 		AbstractController::showSection(std::move(memento), params);
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index 44926fbee..ff58f95e9 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -136,7 +136,7 @@ public:
 	virtual rpl::producer<QString> mediaSourceQueryValue() const;
 
 	void showSection(
-		std::unique_ptr<Window::SectionMemento> &&memento,
+		std::shared_ptr<Window::SectionMemento> memento,
 		const Window::SectionShow &params = Window::SectionShow()) override;
 	void showBackFromStack(
 		const Window::SectionShow &params = Window::SectionShow()) override;
@@ -202,7 +202,7 @@ public:
 	void saveSearchState(not_null<ContentMemento*> memento);
 
 	void showSection(
-		std::unique_ptr<Window::SectionMemento> &&memento,
+		std::shared_ptr<Window::SectionMemento> memento,
 		const Window::SectionShow &params = Window::SectionShow()) override;
 	void showBackFromStack(
 		const Window::SectionShow &params = Window::SectionShow()) override;
diff --git a/Telegram/SourceFiles/info/info_layer_widget.cpp b/Telegram/SourceFiles/info/info_layer_widget.cpp
index 9460b7f05..0c4b30780 100644
--- a/Telegram/SourceFiles/info/info_layer_widget.cpp
+++ b/Telegram/SourceFiles/info/info_layer_widget.cpp
@@ -106,7 +106,7 @@ void LayerWidget::parentResized() {
 		Ui::FocusPersister persister(this);
 		restoreFloatPlayerDelegate();
 
-		auto memento = std::make_unique<MoveMemento>(std::move(_content));
+		auto memento = std::make_shared<MoveMemento>(std::move(_content));
 
 		// We want to call hideSpecialLayer synchronously to avoid glitches,
 		// but we can't destroy LayerStackWidget from its' resizeEvent,
diff --git a/Telegram/SourceFiles/info/info_memento.cpp b/Telegram/SourceFiles/info/info_memento.cpp
index ba15952f5..84d3aa26c 100644
--- a/Telegram/SourceFiles/info/info_memento.cpp
+++ b/Telegram/SourceFiles/info/info_memento.cpp
@@ -47,41 +47,41 @@ Memento::Memento(not_null<PollData*> poll, FullMsgId contextId)
 : Memento(DefaultStack(poll, contextId)) {
 }
 
-Memento::Memento(std::vector<std::unique_ptr<ContentMemento>> stack)
+Memento::Memento(std::vector<std::shared_ptr<ContentMemento>> stack)
 : _stack(std::move(stack)) {
 }
 
-std::vector<std::unique_ptr<ContentMemento>> Memento::DefaultStack(
+std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
 		not_null<PeerData*> peer,
 		Section section) {
-	auto result = std::vector<std::unique_ptr<ContentMemento>>();
+	auto result = std::vector<std::shared_ptr<ContentMemento>>();
 	result.push_back(DefaultContent(peer, section));
 	return result;
 }
 
-//std::vector<std::unique_ptr<ContentMemento>> Memento::DefaultStack( // #feed
+//std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack( // #feed
 //		not_null<Data::Feed*> feed,
 //		Section section) {
-//	auto result = std::vector<std::unique_ptr<ContentMemento>>();
+//	auto result = std::vector<std::shared_ptr<ContentMemento>>();
 //	result.push_back(DefaultContent(feed, section));
 //	return result;
 //}
 //
-std::vector<std::unique_ptr<ContentMemento>> Memento::DefaultStack(
+std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
 		Settings::Tag settings,
 		Section section) {
-	auto result = std::vector<std::unique_ptr<ContentMemento>>();
-	result.push_back(std::make_unique<Settings::Memento>(
+	auto result = std::vector<std::shared_ptr<ContentMemento>>();
+	result.push_back(std::make_shared<Settings::Memento>(
 		settings.self,
 		section.settingsType()));
 	return result;
 }
 
-std::vector<std::unique_ptr<ContentMemento>> Memento::DefaultStack(
+std::vector<std::shared_ptr<ContentMemento>> Memento::DefaultStack(
 		not_null<PollData*> poll,
 		FullMsgId contextId) {
-	auto result = std::vector<std::unique_ptr<ContentMemento>>();
-	result.push_back(std::make_unique<Polls::Memento>(poll, contextId));
+	auto result = std::vector<std::shared_ptr<ContentMemento>>();
+	result.push_back(std::make_shared<Polls::Memento>(poll, contextId));
 	return result;
 }
 
@@ -101,8 +101,8 @@ Section Memento::DefaultSection(not_null<PeerData*> peer) {
 //	return Section(Section::Type::Profile);
 //}
 
-std::unique_ptr<Memento> Memento::Default(not_null<PeerData*> peer) {
-	return std::make_unique<Memento>(peer, DefaultSection(peer));
+std::shared_ptr<Memento> Memento::Default(not_null<PeerData*> peer) {
+	return std::make_shared<Memento>(peer, DefaultSection(peer));
 }
 // // #feed
 //Memento Memento::Default(Dialogs::Key key) {
@@ -112,7 +112,7 @@ std::unique_ptr<Memento> Memento::Default(not_null<PeerData*> peer) {
 //	return Memento(key.feed(), DefaultSection(key));
 //}
 
-std::unique_ptr<ContentMemento> Memento::DefaultContent(
+std::shared_ptr<ContentMemento> Memento::DefaultContent(
 		not_null<PeerData*> peer,
 		Section section) {
 	if (auto to = peer->migrateTo()) {
@@ -123,32 +123,32 @@ std::unique_ptr<ContentMemento> Memento::DefaultContent(
 
 	switch (section.type()) {
 	case Section::Type::Profile:
-		return std::make_unique<Profile::Memento>(
+		return std::make_shared<Profile::Memento>(
 			peer,
 			migratedPeerId);
 	case Section::Type::Media:
-		return std::make_unique<Media::Memento>(
+		return std::make_shared<Media::Memento>(
 			peer,
 			migratedPeerId,
 			section.mediaType());
 	case Section::Type::CommonGroups:
-		return std::make_unique<CommonGroups::Memento>(peer->asUser());
+		return std::make_shared<CommonGroups::Memento>(peer->asUser());
 	case Section::Type::Members:
-		return std::make_unique<Members::Memento>(
+		return std::make_shared<Members::Memento>(
 			peer,
 			migratedPeerId);
 	}
 	Unexpected("Wrong section type in Info::Memento::DefaultContent()");
 }
 //
-//std::unique_ptr<ContentMemento> Memento::DefaultContent( // #feed
+//std::shared_ptr<ContentMemento> Memento::DefaultContent( // #feed
 //		not_null<Data::Feed*> feed,
 //		Section section) {
 //	switch (section.type()) {
 //	case Section::Type::Profile:
-//		return std::make_unique<FeedProfile::Memento>(feed);
+//		return std::make_shared<FeedProfile::Memento>(feed);
 //	case Section::Type::Channels:
-//		return std::make_unique<Channels::Memento>(feed);
+//		return std::make_shared<Channels::Memento>(feed);
 //	}
 //	Unexpected("Wrong feed section in Info::Memento::DefaultContent()");
 //}
@@ -179,7 +179,7 @@ object_ptr<Ui::LayerWidget> Memento::createLayer(
 	return nullptr;
 }
 
-std::vector<std::unique_ptr<ContentMemento>> Memento::takeStack() {
+std::vector<std::shared_ptr<ContentMemento>> Memento::takeStack() {
 	return std::move(_stack);
 }
 
diff --git a/Telegram/SourceFiles/info/info_memento.h b/Telegram/SourceFiles/info/info_memento.h
index bcd9b6aac..2b58224df 100644
--- a/Telegram/SourceFiles/info/info_memento.h
+++ b/Telegram/SourceFiles/info/info_memento.h
@@ -37,7 +37,7 @@ public:
 	//Memento(not_null<Data::Feed*> feed, Section section); // #feed
 	Memento(Settings::Tag settings, Section section);
 	Memento(not_null<PollData*> poll, FullMsgId contextId);
-	explicit Memento(std::vector<std::unique_ptr<ContentMemento>> stack);
+	explicit Memento(std::vector<std::shared_ptr<ContentMemento>> stack);
 
 	object_ptr<Window::SectionWidget> createWidget(
 		QWidget *parent,
@@ -52,7 +52,7 @@ public:
 	int stackSize() const {
 		return int(_stack.size());
 	}
-	std::vector<std::unique_ptr<ContentMemento>> takeStack();
+	std::vector<std::shared_ptr<ContentMemento>> takeStack();
 
 	not_null<ContentMemento*> content() {
 		Expects(!_stack.empty());
@@ -62,33 +62,33 @@ public:
 
 	static Section DefaultSection(not_null<PeerData*> peer);
 	//static Section DefaultSection(Dialogs::Key key); // #feed
-	static std::unique_ptr<Memento> Default(not_null<PeerData*> peer);
+	static std::shared_ptr<Memento> Default(not_null<PeerData*> peer);
 	//static Memento Default(Dialogs::Key key); // #feed
 
 	~Memento();
 
 private:
-	static std::vector<std::unique_ptr<ContentMemento>> DefaultStack(
+	static std::vector<std::shared_ptr<ContentMemento>> DefaultStack(
 		not_null<PeerData*> peer,
 		Section section);
-	//static std::vector<std::unique_ptr<ContentMemento>> DefaultStack( // #feed
+	//static std::vector<std::shared_ptr<ContentMemento>> DefaultStack( // #feed
 	//	not_null<Data::Feed*> feed,
 	//	Section section);
-	static std::vector<std::unique_ptr<ContentMemento>> DefaultStack(
+	static std::vector<std::shared_ptr<ContentMemento>> DefaultStack(
 		Settings::Tag settings,
 		Section section);
-	static std::vector<std::unique_ptr<ContentMemento>> DefaultStack(
+	static std::vector<std::shared_ptr<ContentMemento>> DefaultStack(
 		not_null<PollData*> poll,
 		FullMsgId contextId);
 
-	//static std::unique_ptr<ContentMemento> DefaultContent( // #feed
+	//static std::shared_ptr<ContentMemento> DefaultContent( // #feed
 	//	not_null<Data::Feed*> feed,
 	//	Section section);
-	static std::unique_ptr<ContentMemento> DefaultContent(
+	static std::shared_ptr<ContentMemento> DefaultContent(
 		not_null<PeerData*> peer,
 		Section section);
 
-	std::vector<std::unique_ptr<ContentMemento>> _stack;
+	std::vector<std::shared_ptr<ContentMemento>> _stack;
 
 };
 
diff --git a/Telegram/SourceFiles/info/info_section_widget.cpp b/Telegram/SourceFiles/info/info_section_widget.cpp
index b679bcc7c..99b289bf9 100644
--- a/Telegram/SourceFiles/info/info_section_widget.cpp
+++ b/Telegram/SourceFiles/info/info_section_widget.cpp
@@ -92,7 +92,7 @@ bool SectionWidget::showInternal(
 	return _content->showInternal(memento, params);
 }
 
-std::unique_ptr<Window::SectionMemento> SectionWidget::createMemento() {
+std::shared_ptr<Window::SectionMemento> SectionWidget::createMemento() {
 	return _content->createMemento();
 }
 
diff --git a/Telegram/SourceFiles/info/info_section_widget.h b/Telegram/SourceFiles/info/info_section_widget.h
index 79d5cf7e0..7a4e470c2 100644
--- a/Telegram/SourceFiles/info/info_section_widget.h
+++ b/Telegram/SourceFiles/info/info_section_widget.h
@@ -48,7 +48,7 @@ public:
 	bool showInternal(
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
-	std::unique_ptr<Window::SectionMemento> createMemento() override;
+	std::shared_ptr<Window::SectionMemento> createMemento() override;
 
 	object_ptr<Ui::LayerWidget> moveContentToLayer(
 		QRect bodyGeometry) override;
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 22ab43419..9adf008f9 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -50,8 +50,8 @@ const style::InfoTopBar &TopBarStyle(Wrap wrap) {
 } // namespace
 
 struct WrapWidget::StackItem {
-	std::unique_ptr<ContentMemento> section;
-//	std::unique_ptr<ContentMemento> anotherTab;
+	std::shared_ptr<ContentMemento> section;
+//	std::shared_ptr<ContentMemento> anotherTab;
 };
 
 WrapWidget::WrapWidget(
@@ -96,7 +96,7 @@ void WrapWidget::setupShortcuts() {
 }
 
 void WrapWidget::restoreHistoryStack(
-		std::vector<std::unique_ptr<ContentMemento>> stack) {
+		std::vector<std::shared_ptr<ContentMemento>> stack) {
 	Expects(!stack.empty());
 	Expects(!hasStackHistory());
 
@@ -188,7 +188,7 @@ void WrapWidget::injectActivePeerProfile(not_null<PeerData*> peer) {
 //}
 
 void WrapWidget::injectActiveProfileMemento(
-		std::unique_ptr<ContentMemento> memento) {
+		std::shared_ptr<ContentMemento> memento) {
 	auto injected = StackItem();
 	injected.section = std::move(memento);
 	_historyStack.insert(
@@ -712,13 +712,13 @@ rpl::producer<SelectedItems> WrapWidget::selectedListValue() const {
 
 // Was done for top level tabs support.
 //
-//std::unique_ptr<ContentMemento> WrapWidget::createTabMemento(
+//std::shared_ptr<ContentMemento> WrapWidget::createTabMemento(
 //		Tab tab) {
 //	switch (tab) {
-//	case Tab::Profile: return std::make_unique<Profile::Memento>(
+//	case Tab::Profile: return std::make_shared<Profile::Memento>(
 //		_controller->peerId(),
 //		_controller->migratedPeerId());
-//	case Tab::Media: return std::make_unique<Media::Memento>(
+//	case Tab::Media: return std::make_shared<Media::Memento>(
 //		_controller->peerId(),
 //		_controller->migratedPeerId(),
 //		Media::Type::Photo);
@@ -884,8 +884,8 @@ void WrapWidget::highlightTopBar() {
 	}
 }
 
-std::unique_ptr<Window::SectionMemento> WrapWidget::createMemento() {
-	auto stack = std::vector<std::unique_ptr<ContentMemento>>();
+std::shared_ptr<Window::SectionMemento> WrapWidget::createMemento() {
+	auto stack = std::vector<std::shared_ptr<ContentMemento>>();
 	stack.reserve(_historyStack.size() + 1);
 	for (auto &stackItem : base::take(_historyStack)) {
 		stack.push_back(std::move(stackItem.section));
@@ -895,7 +895,7 @@ std::unique_ptr<Window::SectionMemento> WrapWidget::createMemento() {
 	// We're not in valid state anymore and supposed to be destroyed.
 	_controller = nullptr;
 
-	return std::make_unique<Memento>(std::move(stack));
+	return std::make_shared<Memento>(std::move(stack));
 }
 
 rpl::producer<int> WrapWidget::desiredHeightValue() const {
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h
index 13929ded2..76afa06a4 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.h
+++ b/Telegram/SourceFiles/info/info_wrap_widget.h
@@ -101,7 +101,7 @@ public:
 		not_null<Window::SectionMemento*> memento,
 		const Window::SectionShow &params) override;
 	bool showBackFromStackInternal(const Window::SectionShow &params);
-	std::unique_ptr<Window::SectionMemento> createMemento() override;
+	std::shared_ptr<Window::SectionMemento> createMemento() override;
 
 	rpl::producer<int> desiredHeightValue() const override;
 
@@ -146,10 +146,10 @@ private:
 	void injectActivePeerProfile(not_null<PeerData*> peer);
 	//void injectActiveFeedProfile(not_null<Data::Feed*> feed); // #feed
 	void injectActiveProfileMemento(
-		std::unique_ptr<ContentMemento> memento);
+		std::shared_ptr<ContentMemento> memento);
 	void checkBeforeClose(Fn<void()> close);
 	void restoreHistoryStack(
-		std::vector<std::unique_ptr<ContentMemento>> stack);
+		std::vector<std::shared_ptr<ContentMemento>> stack);
 	bool hasStackHistory() const {
 		return !_historyStack.empty();
 	}
@@ -178,7 +178,7 @@ private:
 
 	//void showTab(Tab tab);
 	void showContent(object_ptr<ContentWidget> content);
-	//std::unique_ptr<ContentMemento> createTabMemento(Tab tab);
+	//std::shared_ptr<ContentMemento> createTabMemento(Tab tab);
 	object_ptr<ContentWidget> createContent(
 		not_null<ContentMemento*> memento,
 		not_null<Controller*> controller);
@@ -212,7 +212,7 @@ private:
 	base::unique_qptr<Ui::DropdownMenu> _topBarMenu;
 
 //	Tab _tab = Tab::Profile;
-//	std::unique_ptr<ContentMemento> _anotherTabMemento;
+//	std::shared_ptr<ContentMemento> _anotherTabMemento;
 	std::vector<StackItem> _historyStack;
 
 	rpl::event_stream<rpl::producer<int>> _desiredHeights;
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h
index 78e199c02..4e091e515 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.h
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.h
@@ -92,7 +92,7 @@ inline auto AddButton(
 		tracker)->entity();
 	result->addClickHandler([=] {
 		navigation->showSection(
-			std::make_unique<Info::Memento>(peer, Section(type)));
+			std::make_shared<Info::Memento>(peer, Section(type)));
 	});
 	return result;
 };
@@ -111,7 +111,7 @@ inline auto AddCommonGroupsButton(
 		tracker)->entity();
 	result->addClickHandler([=] {
 		navigation->showSection(
-			std::make_unique<Info::Memento>(user, Section::Type::CommonGroups));
+			std::make_shared<Info::Memento>(user, Section::Type::CommonGroups));
 	});
 	return result;
 };
diff --git a/Telegram/SourceFiles/info/media/info_media_widget.cpp b/Telegram/SourceFiles/info/media/info_media_widget.cpp
index 8fa06414c..66df479dd 100644
--- a/Telegram/SourceFiles/info/media/info_media_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_widget.cpp
@@ -115,8 +115,8 @@ void Widget::setInternalState(
 	restoreState(memento);
 }
 
-std::unique_ptr<ContentMemento> Widget::doCreateMemento() {
-	auto result = std::make_unique<Memento>(controller());
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(controller());
 	saveState(result.get());
 	return result;
 }
diff --git a/Telegram/SourceFiles/info/media/info_media_widget.h b/Telegram/SourceFiles/info/media/info_media_widget.h
index 1f1632aa1..d09d972b6 100644
--- a/Telegram/SourceFiles/info/media/info_media_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_widget.h
@@ -103,7 +103,7 @@ private:
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
-	std::unique_ptr<ContentMemento> doCreateMemento() override;
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
 	InnerWidget *_inner = nullptr;
 
diff --git a/Telegram/SourceFiles/info/members/info_members_widget.cpp b/Telegram/SourceFiles/info/members/info_members_widget.cpp
index 6e1c78603..45747d131 100644
--- a/Telegram/SourceFiles/info/members/info_members_widget.cpp
+++ b/Telegram/SourceFiles/info/members/info_members_widget.cpp
@@ -79,8 +79,8 @@ void Widget::setInternalState(
 	restoreState(memento);
 }
 
-std::unique_ptr<ContentMemento> Widget::doCreateMemento() {
-	auto result = std::make_unique<Memento>(controller());
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(controller());
 	saveState(result.get());
 	return result;
 }
diff --git a/Telegram/SourceFiles/info/members/info_members_widget.h b/Telegram/SourceFiles/info/members/info_members_widget.h
index 1e43f7c78..23a2eac46 100644
--- a/Telegram/SourceFiles/info/members/info_members_widget.h
+++ b/Telegram/SourceFiles/info/members/info_members_widget.h
@@ -60,7 +60,7 @@ private:
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
-	std::unique_ptr<ContentMemento> doCreateMemento() override;
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
 	Profile::Members *_inner = nullptr;
 
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp b/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp
index e979fd3f4..1d3dcdcdb 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_widget.cpp
@@ -90,8 +90,8 @@ void Widget::setInternalState(
 	restoreState(memento);
 }
 
-std::unique_ptr<ContentMemento> Widget::doCreateMemento() {
-	auto result = std::make_unique<Memento>(poll(), contextId());
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(poll(), contextId());
 	saveState(result.get());
 	return result;
 }
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_widget.h b/Telegram/SourceFiles/info/polls/info_polls_results_widget.h
index f8a140711..6f3fa8a42 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_widget.h
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_widget.h
@@ -60,7 +60,7 @@ private:
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
-	std::unique_ptr<ContentMemento> doCreateMemento() override;
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
 	not_null<InnerWidget*> _inner;
 
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 1413d3ef8..ba4c19842 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -843,7 +843,7 @@ object_ptr<Ui::RpWidget> SetupChannelMembers(
 		lt_count_decimal,
 		MembersCountValue(channel) | tr::to_count());
 	auto membersCallback = [=] {
-		controller->showSection(std::make_unique<Info::Memento>(
+		controller->showSection(std::make_shared<Info::Memento>(
 			channel,
 			Section::Type::Members));
 	};
diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
index e55010909..cf72e9904 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
@@ -82,7 +82,7 @@ object_ptr<Ui::RpWidget> InnerWidget::setupContent(
 	_cover->showSection(
 	) | rpl::start_with_next([=](Section section) {
 		_controller->showSection(
-			std::make_unique<Info::Memento>(_peer, section));
+			std::make_shared<Info::Memento>(_peer, section));
 	}, _cover->lifetime());
 	_cover->setOnlineCount(rpl::single(0));
 	auto details = SetupDetails(_controller, parent, _peer);
diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.cpp b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
index 0923499d3..f071ab4e3 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_members.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
@@ -342,14 +342,14 @@ void Members::showMembersWithSearch(bool withSearch) {
 	//if (!_searchShown) {
 	//	toggleSearch();
 	//}
-	auto contentMemento = std::make_unique<Info::Members::Memento>(
+	auto contentMemento = std::make_shared<Info::Members::Memento>(
 		_controller);
 	contentMemento->setState(saveState());
 	contentMemento->setSearchStartsFocused(withSearch);
-	auto mementoStack = std::vector<std::unique_ptr<ContentMemento>>();
+	auto mementoStack = std::vector<std::shared_ptr<ContentMemento>>();
 	mementoStack.push_back(std::move(contentMemento));
 	_controller->showSection(
-		std::make_unique<Info::Memento>(std::move(mementoStack)));
+		std::make_shared<Info::Memento>(std::move(mementoStack)));
 }
 
 //void Members::toggleSearch(anim::type animated) {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_widget.cpp
index d9c25e619..531125813 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_widget.cpp
@@ -99,8 +99,8 @@ void Widget::setInternalState(
 	restoreState(memento);
 }
 
-std::unique_ptr<ContentMemento> Widget::doCreateMemento() {
-	auto result = std::make_unique<Memento>(controller());
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(controller());
 	saveState(result.get());
 	return result;
 }
diff --git a/Telegram/SourceFiles/info/profile/info_profile_widget.h b/Telegram/SourceFiles/info/profile/info_profile_widget.h
index 8e944f44d..6b9af0236 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_widget.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_widget.h
@@ -66,7 +66,7 @@ private:
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
-	std::unique_ptr<ContentMemento> doCreateMemento() override;
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
 	InnerWidget *_inner = nullptr;
 
diff --git a/Telegram/SourceFiles/info/settings/info_settings_widget.cpp b/Telegram/SourceFiles/info/settings/info_settings_widget.cpp
index 553a2345d..c1fd45cd0 100644
--- a/Telegram/SourceFiles/info/settings/info_settings_widget.cpp
+++ b/Telegram/SourceFiles/info/settings/info_settings_widget.cpp
@@ -95,8 +95,8 @@ rpl::producer<bool> Widget::desiredShadowVisibility() const {
 		: rpl::single(true);
 }
 
-std::unique_ptr<ContentMemento> Widget::doCreateMemento() {
-	auto result = std::make_unique<Memento>(self(), _type);
+std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
+	auto result = std::make_shared<Memento>(self(), _type);
 	saveState(result.get());
 	return result;
 }
diff --git a/Telegram/SourceFiles/info/settings/info_settings_widget.h b/Telegram/SourceFiles/info/settings/info_settings_widget.h
index d5be88734..7033edf4a 100644
--- a/Telegram/SourceFiles/info/settings/info_settings_widget.h
+++ b/Telegram/SourceFiles/info/settings/info_settings_widget.h
@@ -72,7 +72,7 @@ private:
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
-	std::unique_ptr<ContentMemento> doCreateMemento() override;
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
 	not_null<UserData*> _self;
 	Type _type = Type();
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 2172cf0ea..1949de3e3 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -140,8 +140,8 @@ public:
 	}
 
 	void setThirdSectionMemento(
-		std::unique_ptr<Window::SectionMemento> &&memento);
-	std::unique_ptr<Window::SectionMemento> takeThirdSectionMemento() {
+		std::shared_ptr<Window::SectionMemento> memento);
+	std::shared_ptr<Window::SectionMemento> takeThirdSectionMemento() {
 		return std::move(_thirdSectionMemento);
 	}
 
@@ -158,7 +158,7 @@ public:
 private:
 	PeerData *_peer = nullptr;
 	QPointer<Window::SectionWidget> _thirdSectionWeak;
-	std::unique_ptr<Window::SectionMemento> _thirdSectionMemento;
+	std::shared_ptr<Window::SectionMemento> _thirdSectionMemento;
 
 };
 
@@ -187,27 +187,27 @@ public:
 class StackItemSection : public StackItem {
 public:
 	StackItemSection(
-		std::unique_ptr<Window::SectionMemento> &&memento);
+		std::shared_ptr<Window::SectionMemento> memento);
 
 	StackItemType type() const override {
 		return SectionStackItem;
 	}
-	std::unique_ptr<Window::SectionMemento> takeMemento() {
+	std::shared_ptr<Window::SectionMemento> takeMemento() {
 		return std::move(_memento);
 	}
 
 private:
-	std::unique_ptr<Window::SectionMemento> _memento;
+	std::shared_ptr<Window::SectionMemento> _memento;
 
 };
 
 void StackItem::setThirdSectionMemento(
-		std::unique_ptr<Window::SectionMemento> &&memento) {
+		std::shared_ptr<Window::SectionMemento> memento) {
 	_thirdSectionMemento = std::move(memento);
 }
 
 StackItemSection::StackItemSection(
-	std::unique_ptr<Window::SectionMemento> &&memento)
+	std::shared_ptr<Window::SectionMemento> memento)
 : StackItem(nullptr)
 , _memento(std::move(memento)) {
 }
@@ -1607,7 +1607,7 @@ void MainWidget::saveSectionInStack() {
 }
 
 void MainWidget::showSection(
-		std::unique_ptr<Window::SectionMemento> &&memento,
+		std::shared_ptr<Window::SectionMemento> memento,
 		const SectionShow &params) {
 	if (_mainSection && _mainSection->showInternal(
 			memento.get(),
@@ -1626,11 +1626,8 @@ void MainWidget::showSection(
 	//	return;
 	}
 
-	using MementoPtr = std::unique_ptr<Window::SectionMemento>;
-	const auto sharedMemento = std::make_shared<MementoPtr>(
-		std::move(memento));
 	if (preventsCloseSection(
-		[=] { showSection(base::take(*sharedMemento), params); },
+		[=] { showSection(memento, params); },
 		params)) {
 		return;
 	}
@@ -1640,9 +1637,7 @@ void MainWidget::showSection(
 	// we need to update adaptive layout to Adaptive::ThirdColumn().
 	updateColumnLayout();
 
-	showNewSection(
-		std::move(*sharedMemento),
-		params);
+	showNewSection(std::move(memento), params);
 }
 
 void MainWidget::updateColumnLayout() {
@@ -1737,7 +1732,7 @@ Window::SectionSlideParams MainWidget::prepareDialogsAnimation() {
 }
 
 void MainWidget::showNewSection(
-		std::unique_ptr<Window::SectionMemento> &&memento,
+		std::shared_ptr<Window::SectionMemento> memento,
 		const SectionShow &params) {
 	using Column = Window::Column;
 
@@ -2451,15 +2446,15 @@ bool MainWidget::saveThirdSectionToStackBack() const {
 
 auto MainWidget::thirdSectionForCurrentMainSection(
 	Dialogs::Key key)
--> std::unique_ptr<Window::SectionMemento> {
+-> std::shared_ptr<Window::SectionMemento> {
 	if (_thirdSectionFromStack) {
 		return std::move(_thirdSectionFromStack);
 	} else if (const auto peer = key.peer()) {
-		return std::make_unique<Info::Memento>(
+		return std::make_shared<Info::Memento>(
 			peer,
 			Info::Memento::DefaultSection(peer));
 	//} else if (const auto feed = key.feed()) { // #feed
-	//	return std::make_unique<Info::Memento>(
+	//	return std::make_shared<Info::Memento>(
 	//		feed,
 	//		Info::Memento::DefaultSection(key));
 	}
diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h
index 586157c83..79b25a047 100644
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@@ -134,7 +134,7 @@ public:
 
 	int backgroundFromY() const;
 	void showSection(
-		std::unique_ptr<Window::SectionMemento> &&memento,
+		std::shared_ptr<Window::SectionMemento> memento,
 		const SectionShow &params);
 	void updateColumnLayout();
 	bool stackIsEmpty() const;
@@ -256,7 +256,7 @@ private:
 		bool canWrite);
 	[[nodiscard]] bool saveThirdSectionToStackBack() const;
 	[[nodiscard]] auto thirdSectionForCurrentMainSection(Dialogs::Key key)
-		-> std::unique_ptr<Window::SectionMemento>;
+		-> std::shared_ptr<Window::SectionMemento>;
 
 	void setupConnectingWidget();
 	void createPlayer();
@@ -276,7 +276,7 @@ private:
 	Window::SectionSlideParams prepareShowAnimation(
 		bool willHaveTopBarShadow);
 	void showNewSection(
-		std::unique_ptr<Window::SectionMemento> &&memento,
+		std::shared_ptr<Window::SectionMemento> memento,
 		const SectionShow &params);
 	void dropMainSection(Window::SectionWidget *widget);
 
@@ -353,7 +353,7 @@ private:
 	object_ptr<HistoryWidget> _history;
 	object_ptr<Window::SectionWidget> _mainSection = { nullptr };
 	object_ptr<Window::SectionWidget> _thirdSection = { nullptr };
-	std::unique_ptr<Window::SectionMemento> _thirdSectionFromStack;
+	std::shared_ptr<Window::SectionMemento> _thirdSectionFromStack;
 	std::unique_ptr<Window::ConnectionState> _connecting;
 
 	base::weak_ptr<Calls::Call> _currentCall;
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index 00f822f8e..02d26f9b8 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -650,7 +650,7 @@ void Manager::openNotificationMessage(
 		Ui::showPeerHistory(history, messageId);
 	//} else if (messageFeed) { // #feed
 	//	App::wnd()->sessionController()->showSection(
-	//		std::make_unique<HistoryFeed::Memento>(messageFeed));
+	//		std::make_shared<HistoryFeed::Memento>(messageFeed));
 	} else {
 		Ui::showPeerHistory(history, ShowAtUnreadMsgId);
 	}
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index 5a7119ae6..1e4fa8702 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -70,7 +70,7 @@ void SectionWidget::showAnimated(
 	show();
 }
 
-std::unique_ptr<SectionMemento> SectionWidget::createMemento() {
+std::shared_ptr<SectionMemento> SectionWidget::createMemento() {
 	return nullptr;
 }
 
diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h
index 472d5e2b4..4ee0db362 100644
--- a/Telegram/SourceFiles/window/section_widget.h
+++ b/Telegram/SourceFiles/window/section_widget.h
@@ -135,7 +135,7 @@ public:
 
 	// Create a memento of that section to store it in the history stack.
 	// This method may modify the section ("take" heavy items).
-	virtual std::unique_ptr<SectionMemento> createMemento();
+	virtual std::shared_ptr<SectionMemento> createMemento();
 
 	void setInnerFocus() {
 		doSetInnerFocus();
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 1efe6f16d..3e8a06744 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -714,7 +714,7 @@ void Filler::addTogglesForArchive() {
 //	const auto controller = _controller;
 //	const auto feed = _feed;
 //	_addAction(tr::lng_context_view_feed_info(tr::now), [=] {
-//		controller->showSection(std::make_unique<Info::Memento>(
+//		controller->showSection(std::make_shared<Info::Memento>(
 //			feed,
 //			Info::Section(Info::Section::Type::Profile)));
 //	});
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index b6e13be53..a4063bd14 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -253,12 +253,12 @@ void SessionNavigation::showRepliesForMessage(
 	const auto channelId = history->channelId();
 	//const auto item = _session->data().message(channelId, rootId);
 	//if (!commentId && (!item || !item->repliesAreComments())) {
-	//	showSection(std::make_unique<HistoryView::RepliesMemento>(history, rootId));
+	//	showSection(std::make_shared<HistoryView::RepliesMemento>(history, rootId));
 	//	return;
 	//} else if (const auto id = item ? item->commentsItemId() : FullMsgId()) {
 	//	if (const auto commentsItem = _session->data().message(id)) {
 	//		showSection(
-	//			std::make_unique<HistoryView::RepliesMemento>(commentsItem));
+	//			std::make_shared<HistoryView::RepliesMemento>(commentsItem));
 	//		return;
 	//	}
 	//}
@@ -314,7 +314,7 @@ void SessionNavigation::showRepliesForMessage(
 						post->setRepliesOutboxReadTill(readTill->v);
 					}
 				}
-				showSection(std::make_unique<HistoryView::RepliesMemento>(
+				showSection(std::make_shared<HistoryView::RepliesMemento>(
 					item,
 					commentId));
 			}
@@ -342,7 +342,7 @@ void SessionNavigation::showPeerInfo(
 	//	Core::App().settings().setThirdSectionInfoEnabled(true);
 	//	Core::App().saveSettingsDelayed();
 	//}
-	showSection(std::make_unique<Info::Memento>(peer), params);
+	showSection(std::make_shared<Info::Memento>(peer), params);
 }
 
 void SessionNavigation::showPeerInfo(
@@ -375,7 +375,7 @@ void SessionNavigation::showSettings(
 		Settings::Type type,
 		const SectionShow &params) {
 	showSection(
-		std::make_unique<Info::Memento>(
+		std::make_shared<Info::Memento>(
 			Info::Settings::Tag{ _session->user() },
 			Info::Section(type)),
 		params);
@@ -389,7 +389,7 @@ void SessionNavigation::showPollResults(
 		not_null<PollData*> poll,
 		FullMsgId contextId,
 		const SectionShow &params) {
-	showSection(std::make_unique<Info::Memento>(poll, contextId), params);
+	showSection(std::make_shared<Info::Memento>(poll, contextId), params);
 }
 
 SessionController::SessionController(
@@ -640,9 +640,9 @@ bool SessionController::jumpToChatListEntry(Dialogs::RowDescriptor row) {
 		return true;
 	//} else if (const auto feed = row.key.feed()) { // #feed
 	//	if (const auto item = session().data().message(row.fullId)) {
-	//		showSection(std::make_unique<HistoryFeed::Memento>(feed, item->position()));
+	//		showSection(std::make_shared<HistoryFeed::Memento>(feed, item->position()));
 	//	} else {
-	//		showSection(std::make_unique<HistoryFeed::Memento>(feed));
+	//		showSection(std::make_shared<HistoryFeed::Memento>(feed));
 	//	}
 	}
 	return false;
@@ -1087,7 +1087,7 @@ void SessionController::showPeerHistory(
 }
 
 void SessionController::showSection(
-		std::unique_ptr<SectionMemento> &&memento,
+		std::shared_ptr<SectionMemento> memento,
 		const SectionShow &params) {
 	if (!params.thirdColumn && widget()->showSectionInExistingLayer(
 			memento.get(),
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 88f563031..64f3b8b66 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -132,7 +132,7 @@ public:
 	Main::Session &session() const;
 
 	virtual void showSection(
-		std::unique_ptr<SectionMemento> &&memento,
+		std::shared_ptr<SectionMemento> memento,
 		const SectionShow &params = SectionShow()) = 0;
 	virtual void showBackFromStack(
 		const SectionShow &params = SectionShow()) = 0;
@@ -301,7 +301,7 @@ public:
 		bool confirmedLeaveOther = false);
 
 	void showSection(
-		std::unique_ptr<SectionMemento> &&memento,
+		std::shared_ptr<SectionMemento> memento,
 		const SectionShow &params = SectionShow()) override;
 	void showBackFromStack(
 		const SectionShow &params = SectionShow()) override;
diff --git a/Telegram/lib_base b/Telegram/lib_base
index f98f02214..b95d2b4b3 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit f98f0221416746f0beaf5a51e95674a90442c3d5
+Subproject commit b95d2b4b378092daf3acb493515ff41a8e21f003
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index a02c8923d..e08a0de35 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit a02c8923dc6d00bcb4f4c2b1470cd48e2743903a
+Subproject commit e08a0de35dd2d0bbf26d88d127ac7b80efb94150
diff --git a/cmake b/cmake
index 1c2be0df2..ceb580893 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 1c2be0df28feb0c4629a1f37ccf7d23da2ff17c1
+Subproject commit ceb5808939cf770c33be996ab3a1d38a998bf16d

From d69caacded0f9cc023e9e95756cc79feac29800e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 14 Dec 2020 19:56:01 +0400
Subject: [PATCH 306/370] Improve top bar icons layout.

---
 .../SourceFiles/history/view/history_view_top_bar_widget.cpp  | 3 ++-
 Telegram/SourceFiles/info/info.style                          | 4 ++--
 Telegram/SourceFiles/window/themes/window_theme_preview.cpp   | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

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 aa9d0ade6..0fec8df2d 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -647,7 +647,8 @@ void TopBarWidget::updateControlsGeometry() {
 	}
 	_infoToggle->moveToRight(_rightTaken, otherButtonsTop);
 	if (!_infoToggle->isHidden()) {
-		_rightTaken += _infoToggle->width() + st::topBarSkip;
+		_infoToggle->moveToRight(_rightTaken, otherButtonsTop);
+		_rightTaken += _infoToggle->width();
 	}
 	if (!_call->isHidden() || !_groupCall->isHidden()) {
 		_call->moveToRight(_rightTaken, otherButtonsTop);
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index dcc1db0c8..bcf621494 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -748,7 +748,7 @@ topBarSearch: IconButton {
 		color: windowBgOver;
 	}
 }
-topBarSkip: -2px;
+topBarSkip: -5px;
 topBarCallSkip: -1px;
 topBarMenuToggle: IconButton(topBarSearch) {
 	width: 44px;
@@ -766,7 +766,7 @@ topBarCall: IconButton(topBarSearch) {
 topBarGroupCall: IconButton(topBarSearch) {
 	icon: icon {{ "top_bar_group_call", menuIconFg }};
 	iconOver: icon {{ "top_bar_group_call", menuIconFgOver }};
-	iconPosition: point(8px, 15px);
+	iconPosition: point(8px, 16px);
 }
 topBarInfo: IconButton(topBarSearch) {
 	icon: icon {{ "top_bar_profile", menuIconFg }};
diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
index 3350a6a06..281896a36 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
@@ -473,10 +473,10 @@ void Generator::paintTopBar() {
 
 	auto right = st::topBarMenuToggle.width;
 	st::topBarMenuToggle.icon[_palette].paint(*_p, _topBar.x() + _topBar.width() - right + st::topBarMenuToggle.iconPosition.x(), _topBar.y() + st::topBarMenuToggle.iconPosition.y(), _rect.width());
+	right += st::topBarSkip + st::topBarCall.width;
+	st::topBarCall.icon[_palette].paint(*_p, _topBar.x() + _topBar.width() - right + st::topBarCall.iconPosition.x(), _topBar.y() + st::topBarCall.iconPosition.y(), _rect.width());
 	right += st::topBarSearch.width;
 	st::topBarSearch.icon[_palette].paint(*_p, _topBar.x() + _topBar.width() - right + st::topBarSearch.iconPosition.x(), _topBar.y() + st::topBarSearch.iconPosition.y(), _rect.width());
-	right += st::topBarCallSkip + st::topBarCall.width;
-	st::topBarCall.icon[_palette].paint(*_p, _topBar.x() + _topBar.width() - right + st::topBarCall.iconPosition.x(), _topBar.y() + st::topBarCall.iconPosition.y(), _rect.width());
 
 	auto decreaseWidth = st::topBarCall.width + st::topBarCallSkip + st::topBarSearch.width + st::topBarMenuToggle.width;
 	auto nameleft = _topBar.x() + st::topBarArrowPadding.right();

From 7ab919e2495d57b73bf68dadb95cc8d8d1e0d9a3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 14 Dec 2020 19:56:24 +0400
Subject: [PATCH 307/370] Allow skipping more bad packets after a good one.

---
 .../SourceFiles/media/streaming/media_streaming_utility.cpp     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_utility.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_utility.cpp
index 72bb56b70..3a4386b0a 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_utility.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_utility.cpp
@@ -59,6 +59,8 @@ FFmpeg::AvErrorWrap ProcessPacket(Stream &stream, FFmpeg::Packet &&packet) {
 				return FFmpeg::AvErrorWrap(); // Try to skip a bad packet.
 			}
 		}
+	} else {
+		stream.invalidDataPackets = 0;
 	}
 	return error;
 }

From ad2d2c203f3009c5a186999fa7015200f4cc4140 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 14 Dec 2020 20:08:47 +0400
Subject: [PATCH 308/370] Respect 'just_joined' participant flag.

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

diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index c56ba42ba..b754637b5 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -288,7 +288,6 @@ void GroupCall::applyParticipantsSlice(
 				_userBySsrc.emplace(value.ssrc, user);
 				_participants.push_back(value);
 				_peer->owner().unregisterInvitedToCallUser(_id, user);
-				++changedCount;
 			} else {
 				if (i->ssrc != value.ssrc) {
 					_userBySsrc.erase(i->ssrc);
@@ -296,6 +295,9 @@ void GroupCall::applyParticipantsSlice(
 				}
 				*i = value;
 			}
+			if (data.is_just_joined()) {
+				++changedCount;
+			}
 			if (sliceSource != ApplySliceSource::SliceLoaded) {
 				_participantUpdates.fire({
 					.was = was,

From cb6db82809e99505f19b421c664bfedba0c1dd1b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 14 Dec 2020 21:05:24 +0400
Subject: [PATCH 309/370] Beta version 2.4.14.

- Create voice chats in legacy groups.
- Fix sticker pack opening.
- Fix group status display.
- Fix group members display.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 ++++----
 Telegram/Resources/winrc/Updater.rc          |  8 ++++----
 Telegram/SourceFiles/core/changelogs.cpp     | 10 ++++++++++
 Telegram/SourceFiles/core/version.h          |  4 ++--
 Telegram/ThirdParty/tgcalls                  |  2 +-
 Telegram/build/version                       |  8 ++++----
 changelog.txt                                |  7 +++++++
 8 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index ceba0fce0..62160af4c 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.13.0" />
+    Version="2.4.14.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 c1a335b6a..7d84eeaa4 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,13,0
- PRODUCTVERSION 2,4,13,0
+ FILEVERSION 2,4,14,0
+ PRODUCTVERSION 2,4,14,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.13.0"
+            VALUE "FileVersion", "2.4.14.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.13.0"
+            VALUE "ProductVersion", "2.4.14.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 2c83c4a03..e45574c78 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,13,0
- PRODUCTVERSION 2,4,13,0
+ FILEVERSION 2,4,14,0
+ PRODUCTVERSION 2,4,14,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.13.0"
+            VALUE "FileVersion", "2.4.14.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.13.0"
+            VALUE "ProductVersion", "2.4.14.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index f8ce04ef3..cc68604b3 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -109,6 +109,16 @@ std::map<int, const char*> BetaLogs() {
 		2004012,
 		"- Voice chats in groups. (alpha version)\n"
 	},
+	{
+		2004014,
+		"- Create voice chats in legacy groups.\n"
+
+		"- Fix sticker pack opening.\n"
+
+		"- Fix group status display.\n"
+		
+		"- Fix group members display.\n"
+	},
 	};
 };
 
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 9518f32be..05faa323b 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 = 2004013;
-constexpr auto AppVersionStr = "2.4.13";
+constexpr auto AppVersion = 2004014;
+constexpr auto AppVersionStr = "2.4.14";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index 5879ef0c4..e884535f1 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit 5879ef0c4f42dad4ed0f7e2da856506d5ae9780c
+Subproject commit e884535f1854aa57616b162a4901bd60c8287575
diff --git a/Telegram/build/version b/Telegram/build/version
index 13797dc1b..864654f6b 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2004013
+AppVersion         2004014
 AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.13
-AppVersionStr      2.4.13
+AppVersionStrSmall 2.4.14
+AppVersionStr      2.4.14
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 2.4.13.beta
+AppVersionOriginal 2.4.14.beta
diff --git a/changelog.txt b/changelog.txt
index d3c45d163..ecd27ca4e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+2.4.14 beta (14.12.20)
+
+- Create voice chats in legacy groups.
+- Fix sticker pack opening.
+- Fix group status display.
+- Fix group members display.
+
 2.4.13 beta (09.12.20)
 
 - Fix voice messages sending.

From af17046a761c0c5b60987c442c56b69195b6491c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 14 Dec 2020 16:12:04 +0400
Subject: [PATCH 310/370] Enable xlib and libdrm in ffmpeg build in order to
 have va-x11 and va-drm enabled

---
 Telegram/build/docker/centos_env/Dockerfile | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index bb0061188..787a7ceeb 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -178,6 +178,19 @@ RUN make DESTDIR="$LibrariesPath/libXfixes-cache" install
 WORKDIR ..
 RUN rm -rf libxfixes
 
+FROM builder AS libXv
+COPY --from=libXext ${LibrariesPath}/libXext-cache /
+
+RUN git clone -b libXv-1.0.11 --depth=1 https://gitlab.freedesktop.org/xorg/lib/libxv.git
+
+WORKDIR libxv
+RUN ./autogen.sh --enable-static
+RUN make -j$(nproc)
+RUN make DESTDIR="$LibrariesPath/libXv-cache" install
+
+WORKDIR ..
+RUN rm -rf libxv
+
 FROM builder AS wayland
 COPY --from=libffi ${LibrariesPath}/libffi-cache /
 
@@ -226,6 +239,9 @@ RUN rm -rf libvdpau
 FROM builder AS ffmpeg
 
 COPY --from=opus ${LibrariesPath}/opus-cache /
+COPY --from=libXext ${LibrariesPath}/libXext-cache /
+COPY --from=libXfixes ${LibrariesPath}/libXfixes-cache /
+COPY --from=libXv ${LibrariesPath}/libXv-cache /
 COPY --from=libva ${LibrariesPath}/libva-cache /
 COPY --from=libvdpau ${LibrariesPath}/libvdpau-cache /
 
@@ -244,6 +260,8 @@ RUN ./configure \
 	--enable-libopus \
 	--enable-vaapi \
 	--enable-vdpau \
+	--enable-xlib \
+	--enable-libdrm \
 	--enable-protocol=file \
 	--enable-hwaccel=h264_vaapi \
 	--enable-hwaccel=h264_vdpau \
@@ -394,8 +412,6 @@ COPY --from=xcb-util ${LibrariesPath}/xcb-util-cache /
 COPY --from=xcb-image ${LibrariesPath}/xcb-image-cache /
 COPY --from=xcb-keysyms ${LibrariesPath}/xcb-keysyms-cache /
 COPY --from=xcb-render-util ${LibrariesPath}/xcb-render-util-cache /
-COPY --from=libXext ${LibrariesPath}/libXext-cache /
-COPY --from=libXfixes ${LibrariesPath}/libXfixes-cache /
 COPY --from=wayland ${LibrariesPath}/wayland-cache /
 COPY --from=openssl ${LibrariesPath}/openssl-cache /
 COPY --from=xkbcommon ${LibrariesPath}/xkbcommon-cache /
@@ -525,6 +541,7 @@ COPY --from=xcb-keysyms ${LibrariesPath}/xcb-keysyms-cache /
 COPY --from=xcb-render-util ${LibrariesPath}/xcb-render-util-cache /
 COPY --from=libXext ${LibrariesPath}/libXext-cache /
 COPY --from=libXfixes ${LibrariesPath}/libXfixes-cache /
+COPY --from=libXv ${LibrariesPath}/libXv-cache /
 COPY --from=wayland ${LibrariesPath}/wayland-cache /
 COPY --from=libva ${LibrariesPath}/libva-cache /
 COPY --from=libvdpau ${LibrariesPath}/libvdpau-cache /

From df9d19b16a446d3448a345eb13c9d6833394dfd9 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 15 Dec 2020 12:17:49 +0400
Subject: [PATCH 311/370] Clean up static plugins list

- Qt example's Wayland integrations
- Legacy xdg-shell implementations
- QSvgIcon that was never needed, but added by an accident with lxqt-qtplugin
---
 Telegram/SourceFiles/qt_static_plugins.cpp | 6 ------
 cmake                                      | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp
index 21c0980f2..b0704cc75 100644
--- a/Telegram/SourceFiles/qt_static_plugins.cpp
+++ b/Telegram/SourceFiles/qt_static_plugins.cpp
@@ -24,7 +24,6 @@ Q_IMPORT_PLUGIN(QGenericEnginePlugin)
 Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
 Q_IMPORT_PLUGIN(QGenericEnginePlugin)
 Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
-Q_IMPORT_PLUGIN(QSvgPlugin)
 Q_IMPORT_PLUGIN(QSvgIconPlugin)
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 Q_IMPORT_PLUGIN(QConnmanEnginePlugin)
@@ -33,14 +32,9 @@ Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin)
 Q_IMPORT_PLUGIN(QXdgDesktopPortalThemePlugin)
 #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #ifndef DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
-Q_IMPORT_PLUGIN(ShmServerBufferPlugin)
-Q_IMPORT_PLUGIN(DmaBufServerBufferPlugin)
-Q_IMPORT_PLUGIN(DrmEglServerBufferPlugin)
 Q_IMPORT_PLUGIN(QWaylandEglClientBufferPlugin)
 Q_IMPORT_PLUGIN(QWaylandIviShellIntegrationPlugin)
 Q_IMPORT_PLUGIN(QWaylandWlShellIntegrationPlugin)
-Q_IMPORT_PLUGIN(QWaylandXdgShellV5IntegrationPlugin)
-Q_IMPORT_PLUGIN(QWaylandXdgShellV6IntegrationPlugin)
 Q_IMPORT_PLUGIN(QWaylandXdgShellIntegrationPlugin)
 Q_IMPORT_PLUGIN(QWaylandBradientDecorationPlugin)
 Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin)
diff --git a/cmake b/cmake
index ceb580893..b5124ece3 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit ceb5808939cf770c33be996ab3a1d38a998bf16d
+Subproject commit b5124ece3e4d36fbaf34cfa84f6141c015580055

From 7f7e7b94d61b00a6f6eab783a854307407477eb2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Dec 2020 12:21:00 +0400
Subject: [PATCH 312/370] Fix Escape in comments section.

---
 .../view/controls/history_view_compose_controls.cpp    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 623fe13ce..b836c68c8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -796,6 +796,9 @@ void ComposeControls::showStarted() {
 	if (_voiceRecordBar) {
 		_voiceRecordBar->hideFast();
 	}
+	if (_autocomplete) {
+		_autocomplete->hideFast();
+	}
 	_wrap->hide();
 	_writeRestricted->hide();
 }
@@ -810,6 +813,9 @@ void ComposeControls::showFinished() {
 	if (_voiceRecordBar) {
 		_voiceRecordBar->hideFast();
 	}
+	if (_autocomplete) {
+		_autocomplete->hideFast();
+	}
 	updateWrappingVisibility();
 	_voiceRecordBar->orderControls();
 }
@@ -1154,6 +1160,8 @@ void ComposeControls::initAutocomplete() {
 		_autocomplete.get(),
 		[=] { checkAutocomplete(); },
 		Qt::QueuedConnection);
+
+	_autocomplete->hideFast();
 }
 
 void ComposeControls::updateStickersByEmoji() {
@@ -1712,7 +1720,7 @@ void ComposeControls::paintBackground(QRect clip) {
 }
 
 void ComposeControls::escape() {
-	if (auto &voice = _voiceRecordBar; !voice->isActive()) {
+	if (const auto voice = _voiceRecordBar.get(); voice->isActive()) {
 		voice->showDiscardBox(nullptr, anim::type::normal);
 	} else {
 		_cancelRequests.fire({});

From 15620b5c2d97fadc2197a634df2391d2d0263a0b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Dec 2020 14:16:44 +0400
Subject: [PATCH 313/370] Divide speaking status and background noise.

---
 Telegram/SourceFiles/api/api_updates.cpp      |  10 +-
 .../SourceFiles/calls/calls_group_call.cpp    |  64 ++++++-----
 Telegram/SourceFiles/calls/calls_group_call.h |  14 ++-
 .../SourceFiles/calls/calls_group_members.cpp | 104 +++++++++++-------
 Telegram/SourceFiles/data/data_group_call.cpp |  22 ++--
 Telegram/SourceFiles/data/data_group_call.h   |  16 ++-
 Telegram/ThirdParty/tgcalls                   |   2 +-
 7 files changed, 139 insertions(+), 93 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 48013f6fc..99fdf520c 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -245,7 +245,10 @@ Updates::Updates(not_null<Main::Session*> session)
 				for (const auto [userId, when] : *users) {
 					call->applyActiveUpdate(
 						userId,
-						when,
+						Data::LastSpokeTimes{
+							.anything = when,
+							.voice = when
+						},
 						peer->owner().userLoaded(userId));
 				}
 			}
@@ -928,7 +931,10 @@ void Updates::handleSendActionUpdate(
 		const auto call = peer->groupCall();
 		const auto now = crl::now();
 		if (call) {
-			call->applyActiveUpdate(userId, now, user);
+			call->applyActiveUpdate(
+				userId,
+				Data::LastSpokeTimes{ .anything = now, .voice = now },
+				user);
 		} else {
 			const auto chat = peer->asChat();
 			const auto channel = peer->asChannel();
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 18e999db3..f4a71eafd 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -498,28 +498,30 @@ void GroupCall::handleUpdate(const MTPDupdateGroupCallParticipants &data) {
 }
 
 void GroupCall::createAndStartController() {
-	using AudioLevels = std::vector<std::pair<uint32_t, float>>;
-
 	const auto &settings = Core::App().settings();
 
 	const auto weak = base::make_weak(this);
-	const auto myLevel = std::make_shared<float>();
+	const auto myLevel = std::make_shared<tgcalls::GroupLevelValue>();
 	tgcalls::GroupInstanceDescriptor descriptor = {
 		.config = tgcalls::GroupConfig{
 		},
 		.networkStateUpdated = [=](bool connected) {
 			crl::on_main(weak, [=] { setInstanceConnected(connected); });
 		},
-		.audioLevelsUpdated = [=](const AudioLevels &data) {
-			if (!data.empty()) {
-				crl::on_main(weak, [=] { audioLevelsUpdated(data); });
-			}
-		},
-		.myAudioLevelUpdated = [=](float level) {
-			if (*myLevel != level) { // Don't send many 0 while we're muted.
-				*myLevel = level;
-				crl::on_main(weak, [=] { myLevelUpdated(level); });
+		.audioLevelsUpdated = [=](const tgcalls::GroupLevelsUpdate &data) {
+			const auto &updates = data.updates;
+			if (updates.empty()) {
+				return;
+			} else if (updates.size() == 1 && !updates.front().ssrc) {
+				const auto &value = updates.front().value;
+				// Don't send many 0 while we're muted.
+				if (myLevel->level == value.level
+					&& myLevel->voice == value.voice) {
+					return;
+				}
+				*myLevel = updates.front().value;
 			}
+			crl::on_main(weak, [=] { audioLevelsUpdated(data); });
 		},
 		.initialInputDeviceId = settings.callInputDeviceId().toStdString(),
 		.initialOutputDeviceId = settings.callOutputDeviceId().toStdString(),
@@ -555,24 +557,28 @@ void GroupCall::updateInstanceMuteState() {
 		&& state != MuteState::PushToTalk);
 }
 
-void GroupCall::handleLevelsUpdated(
-		gsl::span<const std::pair<std::uint32_t, float>> data) {
-	Expects(!data.empty());
+void GroupCall::audioLevelsUpdated(const tgcalls::GroupLevelsUpdate &data) {
+	Expects(!data.updates.empty());
 
 	auto check = false;
 	auto checkNow = false;
 	const auto now = crl::now();
-	for (const auto &[ssrc, level] : data) {
+	for (const auto &[ssrcOrZero, value] : data.updates) {
+		const auto ssrc = ssrcOrZero ? ssrcOrZero : _mySsrc;
+		const auto level = value.level;
+		const auto voice = value.voice;
 		const auto self = (ssrc == _mySsrc);
 		_levelUpdates.fire(LevelUpdate{
 			.ssrc = ssrc,
 			.value = level,
+			.voice = voice,
 			.self = self
 		});
 		if (level <= kSpeakLevelThreshold) {
 			continue;
 		}
 		if (self
+			&& voice
 			&& (!_lastSendProgressUpdate
 				|| _lastSendProgressUpdate + kUpdateSendActionEach < now)) {
 			_lastSendProgressUpdate = now;
@@ -584,13 +590,21 @@ void GroupCall::handleLevelsUpdated(
 		check = true;
 		const auto i = _lastSpoke.find(ssrc);
 		if (i == _lastSpoke.end()) {
-			_lastSpoke.emplace(ssrc, now);
+			_lastSpoke.emplace(ssrc, Data::LastSpokeTimes{
+				.anything = now,
+				.voice = voice ? now : 0,
+			});
 			checkNow = true;
 		} else {
-			if (i->second + kCheckLastSpokeInterval / 3 <= now) {
+			if ((i->second.anything + kCheckLastSpokeInterval / 3 <= now)
+				|| (voice
+					&& i->second.voice + kCheckLastSpokeInterval / 3 <= now)) {
 				checkNow = true;
 			}
-			i->second = now;
+			i->second.anything = now;
+			if (voice) {
+				i->second.voice = now;
+			}
 		}
 	}
 	if (checkNow) {
@@ -600,16 +614,6 @@ void GroupCall::handleLevelsUpdated(
 	}
 }
 
-void GroupCall::myLevelUpdated(float level) {
-	const auto pair = std::pair<std::uint32_t, float>{ _mySsrc, level };
-	handleLevelsUpdated({ &pair, &pair + 1 });
-}
-
-void GroupCall::audioLevelsUpdated(
-		const std::vector<std::pair<std::uint32_t, float>> &data) {
-	handleLevelsUpdated(gsl::make_span(data));
-}
-
 void GroupCall::checkLastSpoke() {
 	const auto real = _peer->groupCall();
 	if (!real || real->id() != _id) {
@@ -621,7 +625,7 @@ void GroupCall::checkLastSpoke() {
 	auto list = base::take(_lastSpoke);
 	for (auto i = list.begin(); i != list.end();) {
 		const auto [ssrc, when] = *i;
-		if (when + kCheckLastSpokeInterval >= now) {
+		if (when.anything + kCheckLastSpokeInterval >= now) {
 			hasRecent = true;
 			++i;
 		} else {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 9b2b802e9..9a507b5e8 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -17,6 +17,7 @@ class History;
 
 namespace tgcalls {
 class GroupInstanceImpl;
+struct GroupLevelsUpdate;
 } // namespace tgcalls
 
 namespace base {
@@ -24,6 +25,10 @@ class GlobalShortcutManager;
 class GlobalShortcutValue;
 } // namespace base
 
+namespace Data {
+struct LastSpokeTimes;
+} // namespace Data
+
 namespace Calls {
 
 enum class MuteState {
@@ -42,6 +47,7 @@ enum class MuteState {
 struct LevelUpdate {
 	uint32 ssrc = 0;
 	float value = 0.;
+	bool voice = false;
 	bool self = false;
 };
 
@@ -146,11 +152,7 @@ private:
 	void applySelfInCallLocally();
 	void rejoin();
 
-	void myLevelUpdated(float level);
-	void audioLevelsUpdated(
-		const std::vector<std::pair<std::uint32_t, float>> &data);
-	void handleLevelsUpdated(
-		gsl::span<const std::pair<std::uint32_t, float>> data);
+	void audioLevelsUpdated(const tgcalls::GroupLevelsUpdate &data);
 	void setInstanceConnected(bool connected);
 	void checkLastSpoke();
 	void pushToTalkCancel();
@@ -178,7 +180,7 @@ private:
 
 	std::unique_ptr<tgcalls::GroupInstanceImpl> _instance;
 	rpl::event_stream<LevelUpdate> _levelUpdates;
-	base::flat_map<uint32, crl::time> _lastSpoke;
+	base::flat_map<uint32, Data::LastSpokeTimes> _lastSpoke;
 	base::Timer _lastSpokeCheckTimer;
 	base::Timer _checkJoinedTimer;
 
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index cfffc4696..64922c5e6 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -97,6 +97,9 @@ public:
 	[[nodiscard]] uint32 ssrc() const {
 		return _ssrc;
 	}
+	[[nodiscard]] bool sounding() const {
+		return _sounding;
+	}
 	[[nodiscard]] bool speaking() const {
 		return _speaking;
 	}
@@ -147,7 +150,7 @@ private:
 
 		Ui::Paint::Blobs blobs;
 		crl::time lastTime = 0;
-		crl::time lastSpeakingUpdateTime = 0;
+		crl::time lastSoundingUpdateTime = 0;
 		float64 enter = 0.;
 
 		QImage userpicCache;
@@ -156,6 +159,7 @@ private:
 		rpl::lifetime lifetime;
 	};
 	void refreshStatus() override;
+	void setSounding(bool sounding);
 	void setSpeaking(bool speaking);
 	void setState(State state);
 	void setSsrc(uint32 ssrc);
@@ -172,6 +176,7 @@ private:
 	Ui::Animations::Simple _mutedAnimation; // For gray/red icon.
 	Ui::Animations::Simple _activeAnimation; // For icon cross animation.
 	uint32 _ssrc = 0;
+	bool _sounding = false;
 	bool _speaking = false;
 	bool _skipLevelUpdate = false;
 
@@ -252,10 +257,10 @@ private:
 	base::unique_qptr<Ui::PopupMenu> _menu;
 	base::flat_set<not_null<PeerData*>> _menuCheckRowsAfterHidden;
 
-	base::flat_map<uint32, not_null<Row*>> _speakingRowBySsrc;
-	Ui::Animations::Basic _speakingAnimation;
+	base::flat_map<uint32, not_null<Row*>> _soundingRowBySsrc;
+	Ui::Animations::Basic _soundingAnimation;
 
-	crl::time _speakingAnimationHideLastTime = 0;
+	crl::time _soundingAnimationHideLastTime = 0;
 	bool _skipRowLevelUpdate = false;
 
 	Ui::CrossLineAnimation _inactiveCrossLine;
@@ -284,16 +289,20 @@ void Row::updateState(const Data::GroupCall::Participant *participant) {
 			setCustomStatus(QString());
 		}
 		setState(State::Inactive);
+		setSounding(false);
 		setSpeaking(false);
 	} else if (!participant->muted
-		|| (participant->speaking && participant->ssrc != 0)) {
+		|| (participant->sounding && participant->ssrc != 0)) {
 		setState(State::Active);
+		setSounding(participant->sounding && participant->ssrc != 0);
 		setSpeaking(participant->speaking && participant->ssrc != 0);
 	} else if (participant->canSelfUnmute) {
 		setState(State::Inactive);
+		setSounding(false);
 		setSpeaking(false);
 	} else {
 		setState(State::Muted);
+		setSounding(false);
 		setSpeaking(false);
 	}
 }
@@ -308,7 +317,14 @@ void Row::setSpeaking(bool speaking) {
 		_speaking ? 0. : 1.,
 		_speaking ? 1. : 0.,
 		st::widgetFadeDuration);
-	if (!_speaking) {
+}
+
+void Row::setSounding(bool sounding) {
+	if (_sounding == sounding) {
+		return;
+	}
+	_sounding = sounding;
+	if (!_sounding) {
 		_blobsAnimation = nullptr;
 	} else if (!_blobsAnimation) {
 		_blobsAnimation = std::make_unique<BlobsAnimation>(
@@ -358,7 +374,7 @@ void Row::updateLevel(float level) {
 	}
 
 	if (level >= GroupCall::kSpeakLevelThreshold) {
-		_blobsAnimation->lastSpeakingUpdateTime = crl::now();
+		_blobsAnimation->lastSoundingUpdateTime = crl::now();
 	}
 	_blobsAnimation->blobs.setLevel(level);
 }
@@ -366,14 +382,14 @@ void Row::updateLevel(float level) {
 void Row::updateBlobAnimation(crl::time now) {
 	Expects(_blobsAnimation != nullptr);
 
-	const auto speakingFinishesAt = _blobsAnimation->lastSpeakingUpdateTime
-		+ Data::GroupCall::kSpeakStatusKeptFor;
-	const auto speakingStartsFinishing = speakingFinishesAt
+	const auto soundingFinishesAt = _blobsAnimation->lastSoundingUpdateTime
+		+ Data::GroupCall::kSoundStatusKeptFor;
+	const auto soundingStartsFinishing = soundingFinishesAt
 		- kBlobsEnterDuration;
-	const auto speakingFinishes = (speakingStartsFinishing < now);
-	if (speakingFinishes) {
+	const auto soundingFinishes = (soundingStartsFinishing < now);
+	if (soundingFinishes) {
 		_blobsAnimation->enter = std::clamp(
-			(speakingFinishesAt - now) / float64(kBlobsEnterDuration),
+			(soundingFinishesAt - now) / float64(kBlobsEnterDuration),
 			0.,
 			1.);
 	} else if (_blobsAnimation->enter < 1.) {
@@ -418,9 +434,15 @@ auto Row::generatePaintUserpicCallback() -> PaintRoundImageCallback {
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
 		if (_blobsAnimation) {
 			const auto shift = QPointF(x + size / 2., y + size / 2.);
+			const auto speaking = _speakingAnimation.value(
+				_speaking ? 1. : 0.);
 			auto hq = PainterHighQualityEnabler(p);
 			p.translate(shift);
-			_blobsAnimation->blobs.paint(p, st::groupCallMemberActiveStatus);
+			const auto brush = anim::brush(
+				st::groupCallMemberInactiveStatus,
+				st::groupCallMemberActiveStatus,
+				speaking);
+			_blobsAnimation->blobs.paint(p, brush);
 			p.translate(-shift);
 			p.setOpacity(1.);
 
@@ -537,28 +559,28 @@ MembersController::MembersController(
 	) | rpl::start_with_next([=](bool animDisabled, bool deactivated) {
 		const auto hide = !(!animDisabled && !deactivated);
 
-		if (!(hide && _speakingAnimationHideLastTime)) {
-			_speakingAnimationHideLastTime = hide ? crl::now() : 0;
+		if (!(hide && _soundingAnimationHideLastTime)) {
+			_soundingAnimationHideLastTime = hide ? crl::now() : 0;
 		}
-		for (const auto [_, row] : _speakingRowBySsrc) {
+		for (const auto [_, row] : _soundingRowBySsrc) {
 			if (hide) {
 				updateRowLevel(row, 0.);
 			}
 			row->setSkipLevelUpdate(hide);
 		}
-		if (!hide && !_speakingAnimation.animating()) {
-			_speakingAnimation.start();
+		if (!hide && !_soundingAnimation.animating()) {
+			_soundingAnimation.start();
 		}
 		_skipRowLevelUpdate = hide;
 	}, _lifetime);
 
-	_speakingAnimation.init([=](crl::time now) {
-		if (const auto &last = _speakingAnimationHideLastTime; (last > 0)
+	_soundingAnimation.init([=](crl::time now) {
+		if (const auto &last = _soundingAnimationHideLastTime; (last > 0)
 			&& (now - last >= kBlobsEnterDuration)) {
-			_speakingAnimation.stop();
+			_soundingAnimation.stop();
 			return false;
 		}
-		for (const auto [ssrc, row] : _speakingRowBySsrc) {
+		for (const auto [ssrc, row] : _soundingRowBySsrc) {
 			row->updateBlobAnimation(now);
 			delegate()->peerListUpdateRow(row);
 		}
@@ -600,8 +622,8 @@ void MembersController::setupListChangeViewers(not_null<GroupCall*> call) {
 
 	call->levelUpdates(
 	) | rpl::start_with_next([=](const LevelUpdate &update) {
-		const auto i = _speakingRowBySsrc.find(update.ssrc);
-		if (i != end(_speakingRowBySsrc)) {
+		const auto i = _soundingRowBySsrc.find(update.ssrc);
+		if (i != end(_soundingRowBySsrc)) {
 			updateRowLevel(i->second, update.value);
 		}
 	}, _lifetime);
@@ -699,41 +721,41 @@ void MembersController::checkSpeakingRowPosition(not_null<Row*> row) {
 void MembersController::updateRow(
 		not_null<Row*> row,
 		const Data::GroupCall::Participant *participant) {
-	const auto wasSpeaking = row->speaking();
+	const auto wasSounding = row->sounding();
 	const auto wasSsrc = row->ssrc();
 	row->setSkipLevelUpdate(_skipRowLevelUpdate);
 	row->updateState(participant);
-	const auto nowSpeaking = row->speaking();
+	const auto nowSounding = row->sounding();
 	const auto nowSsrc = row->ssrc();
 
-	const auto wasNoSpeaking = _speakingRowBySsrc.empty();
+	const auto wasNoSounding = _soundingRowBySsrc.empty();
 	if (wasSsrc == nowSsrc) {
-		if (nowSpeaking != wasSpeaking) {
-			if (nowSpeaking) {
-				_speakingRowBySsrc.emplace(nowSsrc, row);
+		if (nowSounding != wasSounding) {
+			if (nowSounding) {
+				_soundingRowBySsrc.emplace(nowSsrc, row);
 			} else {
-				_speakingRowBySsrc.remove(nowSsrc);
+				_soundingRowBySsrc.remove(nowSsrc);
 			}
 		}
 	} else {
-		_speakingRowBySsrc.remove(wasSsrc);
-		if (nowSpeaking) {
+		_soundingRowBySsrc.remove(wasSsrc);
+		if (nowSounding) {
 			Assert(nowSsrc != 0);
-			_speakingRowBySsrc.emplace(nowSsrc, row);
+			_soundingRowBySsrc.emplace(nowSsrc, row);
 		}
 	}
-	const auto nowNoSpeaking = _speakingRowBySsrc.empty();
-	if (wasNoSpeaking && !nowNoSpeaking) {
-		_speakingAnimation.start();
-	} else if (nowNoSpeaking && !wasNoSpeaking) {
-		_speakingAnimation.stop();
+	const auto nowNoSounding = _soundingRowBySsrc.empty();
+	if (wasNoSounding && !nowNoSounding) {
+		_soundingAnimation.start();
+	} else if (nowNoSounding && !wasNoSounding) {
+		_soundingAnimation.stop();
 	}
 
 	delegate()->peerListUpdateRow(row);
 }
 
 void MembersController::removeRow(not_null<Row*> row) {
-	_speakingRowBySsrc.remove(row->ssrc());
+	_soundingRowBySsrc.remove(row->ssrc());
 	delegate()->peerListRemoveRow(row);
 }
 
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index b754637b5..ed4fa9618 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -342,7 +342,10 @@ void GroupCall::applyParticipantsMutes(
 	}
 }
 
-void GroupCall::applyLastSpoke(uint32 ssrc, crl::time when, crl::time now) {
+void GroupCall::applyLastSpoke(
+		uint32 ssrc,
+		LastSpokeTimes when,
+		crl::time now) {
 	const auto i = _userBySsrc.find(ssrc);
 	if (i == end(_userBySsrc)) {
 		_unknownSpokenSsrcs[ssrc] = when;
@@ -353,10 +356,13 @@ void GroupCall::applyLastSpoke(uint32 ssrc, crl::time when, crl::time now) {
 	Assert(j != end(_participants));
 
 	_speakingByActiveFinishes.remove(j->user);
-	const auto speaking = (when + kSpeakStatusKeptFor >= now)
+	const auto sounding = (when.anything + kSoundStatusKeptFor >= now)
 		&& j->canSelfUnmute;
-	if (j->speaking != speaking) {
+	const auto speaking = sounding
+		&& (when.voice + kSoundStatusKeptFor >= now);
+	if (j->sounding != sounding || j->speaking != speaking) {
 		const auto was = *j;
+		j->sounding = sounding;
 		j->speaking = speaking;
 		_participantUpdates.fire({
 			.was = was,
@@ -367,7 +373,7 @@ void GroupCall::applyLastSpoke(uint32 ssrc, crl::time when, crl::time now) {
 
 void GroupCall::applyActiveUpdate(
 		UserId userId,
-		crl::time when,
+		LastSpokeTimes when,
 		UserData *userLoaded) {
 	if (inCall()) {
 		return;
@@ -387,9 +393,9 @@ void GroupCall::applyActiveUpdate(
 	}
 	const auto was = std::make_optional(*i);
 	const auto now = crl::now();
-	const auto elapsed = TimeId((now - when) / crl::time(1000));
+	const auto elapsed = TimeId((now - when.anything) / crl::time(1000));
 	const auto lastActive = base::unixtime::now() - elapsed;
-	const auto finishes = when + kSpeakingAfterActive;
+	const auto finishes = when.anything + kSpeakingAfterActive;
 	if (lastActive <= i->lastActive || finishes <= now) {
 		return;
 	}
@@ -450,7 +456,7 @@ void GroupCall::requestUnknownParticipants() {
 		if (_unknownSpokenSsrcs.size() < kRequestPerPage) {
 			return base::take(_unknownSpokenSsrcs);
 		}
-		auto result = base::flat_map<uint32, crl::time>();
+		auto result = base::flat_map<uint32, LastSpokeTimes>();
 		result.reserve(kRequestPerPage);
 		while (result.size() < kRequestPerPage) {
 			const auto [ssrc, when] = _unknownSpokenSsrcs.back();
@@ -463,7 +469,7 @@ void GroupCall::requestUnknownParticipants() {
 		if (_unknownSpokenUids.size() + ssrcs.size() < kRequestPerPage) {
 			return base::take(_unknownSpokenUids);
 		}
-		auto result = base::flat_map<UserId, crl::time>();
+		auto result = base::flat_map<UserId, LastSpokeTimes>();
 		const auto available = (kRequestPerPage - int(ssrcs.size()));
 		if (available > 0) {
 			result.reserve(available);
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 0010c6851..3b778f8ec 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -16,6 +16,11 @@ class ApiWrap;
 
 namespace Data {
 
+struct LastSpokeTimes {
+	crl::time anything = 0;
+	crl::time voice = 0;
+};
+
 class GroupCall final {
 public:
 	GroupCall(not_null<PeerData*> peer, uint64 id, uint64 accessHash);
@@ -32,6 +37,7 @@ public:
 		TimeId date = 0;
 		TimeId lastActive = 0;
 		uint32 ssrc = 0;
+		bool sounding = false;
 		bool speaking = false;
 		bool muted = false;
 		bool canSelfUnmute = false;
@@ -41,7 +47,7 @@ public:
 		std::optional<Participant> now;
 	};
 
-	static constexpr auto kSpeakStatusKeptFor = crl::time(350);
+	static constexpr auto kSoundStatusKeptFor = crl::time(350);
 
 	[[nodiscard]] auto participants() const
 		-> const std::vector<Participant> &;
@@ -56,10 +62,10 @@ public:
 	void applyUpdate(const MTPDupdateGroupCallParticipants &update);
 	void applyUpdateChecked(
 		const MTPDupdateGroupCallParticipants &update);
-	void applyLastSpoke(uint32 ssrc, crl::time when, crl::time now);
+	void applyLastSpoke(uint32 ssrc, LastSpokeTimes when, crl::time now);
 	void applyActiveUpdate(
 		UserId userId,
-		crl::time when,
+		LastSpokeTimes when,
 		UserData *userLoaded);
 
 	[[nodiscard]] int fullCount() const;
@@ -106,8 +112,8 @@ private:
 	QString _nextOffset;
 	rpl::variable<int> _fullCount = 0;
 
-	base::flat_map<uint32, crl::time> _unknownSpokenSsrcs;
-	base::flat_map<UserId, crl::time> _unknownSpokenUids;
+	base::flat_map<uint32, LastSpokeTimes> _unknownSpokenSsrcs;
+	base::flat_map<UserId, LastSpokeTimes> _unknownSpokenUids;
 	mtpRequestId _unknownUsersRequestId = 0;
 
 	rpl::event_stream<ParticipantUpdate> _participantUpdates;
diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index e884535f1..b892eb58b 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit e884535f1854aa57616b162a4901bd60c8287575
+Subproject commit b892eb58bc941a4a1a67303439df8ffd379d6051

From aa5e8422bf67a74bd79201da5d28a333c6e2feaf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Dec 2020 14:23:40 +0400
Subject: [PATCH 314/370] Fix input device edit in Calls Settings.

Fixes #9930.
---
 Telegram/SourceFiles/calls/calls_group_members.cpp | 4 +---
 Telegram/SourceFiles/settings/settings_calls.cpp   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 64922c5e6..6316eb2f9 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -434,14 +434,12 @@ auto Row::generatePaintUserpicCallback() -> PaintRoundImageCallback {
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
 		if (_blobsAnimation) {
 			const auto shift = QPointF(x + size / 2., y + size / 2.);
-			const auto speaking = _speakingAnimation.value(
-				_speaking ? 1. : 0.);
 			auto hq = PainterHighQualityEnabler(p);
 			p.translate(shift);
 			const auto brush = anim::brush(
 				st::groupCallMemberInactiveStatus,
 				st::groupCallMemberActiveStatus,
-				speaking);
+				_speakingAnimation.value(_speaking ? 1. : 0.));
 			_blobsAnimation->blobs.paint(p, brush);
 			p.translate(-shift);
 			p.setOpacity(1.);
diff --git a/Telegram/SourceFiles/settings/settings_calls.cpp b/Telegram/SourceFiles/settings/settings_calls.cpp
index 7118f4139..1d4b10c4b 100644
--- a/Telegram/SourceFiles/settings/settings_calls.cpp
+++ b/Telegram/SourceFiles/settings/settings_calls.cpp
@@ -204,7 +204,7 @@ void Calls::setupContent() {
 		),
 		st::settingsButton
 	)->addClickHandler([=] {
-		Ui::show(ChooseAudioOutputBox(crl::guard(this, [=](
+		Ui::show(ChooseAudioInputBox(crl::guard(this, [=](
 				const QString &id,
 				const QString &name) {
 			_inputNameStream.fire_copy(name);

From b550eb5ab2d81d6b1c05d3ba688178b4c23ab965 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Dec 2020 14:49:08 +0400
Subject: [PATCH 315/370] Send speaking typings each 3 seconds.

---
 Telegram/SourceFiles/api/api_send_progress.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_send_progress.cpp b/Telegram/SourceFiles/api/api_send_progress.cpp
index c21a1a516..c3436f7ab 100644
--- a/Telegram/SourceFiles/api/api_send_progress.cpp
+++ b/Telegram/SourceFiles/api/api_send_progress.cpp
@@ -19,7 +19,8 @@ namespace Api {
 namespace {
 
 constexpr auto kCancelTypingActionTimeout = crl::time(5000);
-constexpr auto kSetMyActionForMs = 10 * crl::time(1000);
+constexpr auto kSendMySpeakingInterval = 3 * crl::time(1000);
+constexpr auto kSendMyTypingInterval = 5 * crl::time(1000);
 constexpr auto kSendTypingsToOfflineFor = TimeId(30);
 
 } // namespace
@@ -82,12 +83,15 @@ bool SendProgressManager::updated(const Key &key, bool doing) {
 	const auto now = crl::now();
 	const auto i = _updated.find(key);
 	if (doing) {
+		const auto sendEach = (key.type == SendProgressType::Speaking)
+			? kSendMySpeakingInterval
+			: kSendMyTypingInterval;
 		if (i == end(_updated)) {
-			_updated.emplace(key, now + kSetMyActionForMs);
-		} else if (i->second > now + (kSetMyActionForMs / 2)) {
+			_updated.emplace(key, now + 2 * sendEach);
+		} else if (i->second > now + sendEach) {
 			return false;
 		} else {
-			i->second = now + kSetMyActionForMs;
+			i->second = now + 2 * sendEach;
 		}
 	} else {
 		if (i == end(_updated)) {

From 703b21b4e5f0c7b73eea9f1f34c9fa6f2da025b4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Dec 2020 14:49:31 +0400
Subject: [PATCH 316/370] Leave voice chat without confirmation.

---
 Telegram/SourceFiles/calls/calls_group_panel.cpp |  9 ++++++---
 Telegram/SourceFiles/calls/calls_group_panel.h   |  2 +-
 Telegram/SourceFiles/calls/calls_top_bar.cpp     | 14 +++++++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 651e23edc..8b139398e 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -315,14 +315,17 @@ void GroupPanel::initWidget() {
 	}, widget()->lifetime());
 }
 
-void GroupPanel::hangup(bool discardCallChecked) {
+void GroupPanel::endCall() {
 	if (!_call) {
 		return;
+	} else if (!_call->peer()->canManageGroupCall()) {
+		_call->hangup();
+		return;
 	}
 	_layerBg->showBox(Box(
 		LeaveGroupCallBox,
 		_call,
-		discardCallChecked,
+		false,
 		BoxContext::GroupCallPanel));
 }
 
@@ -338,7 +341,7 @@ void GroupPanel::initControls() {
 			: MuteState::Muted);
 	}, _mute->lifetime());
 
-	_hangup->setClickedCallback([=] { hangup(false); });
+	_hangup->setClickedCallback([=] { endCall(); });
 	_settings->setClickedCallback([=] {
 		if (_call) {
 			_layerBg->showBox(Box(GroupCallSettingsBox, _call));
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h
index 7716ca190..154bca7c1 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/calls_group_panel.h
@@ -90,7 +90,7 @@ private:
 	void updateControlsGeometry();
 	void showControls();
 
-	void hangup(bool discardCallChecked);
+	void endCall();
 
 	void addMembers();
 	void kickMember(not_null<UserData*> user);
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index eb7d2e2de..c9527d23f 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -337,11 +337,15 @@ void TopBar::initControls() {
 		if (const auto call = _call.get()) {
 			call->hangup();
 		} else if (const auto group = _groupCall.get()) {
-			Ui::show(Box(
-				LeaveGroupCallBox,
-				group,
-				false,
-				BoxContext::MainWindow));
+			if (!group->peer()->canManageGroupCall()) {
+				group->hangup();
+			} else {
+				Ui::show(Box(
+					LeaveGroupCallBox,
+					group,
+					false,
+					BoxContext::MainWindow));
+			}
 		}
 	});
 	updateDurationText();

From 823409175ea53aec14b5b38dbc010463a1933623 Mon Sep 17 00:00:00 2001
From: tux93 <tux93@opensuse.org>
Date: Tue, 15 Dec 2020 01:20:02 +0100
Subject: [PATCH 317/370] Fix changelog.txt path in generate_appdata_changelog

---
 Telegram/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index a93056460..2ada5253d 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1320,7 +1320,7 @@ endif()
 if (LINUX AND DESKTOP_APP_USE_PACKAGED)
     include(GNUInstallDirs)
     configure_file("../lib/xdg/telegramdesktop.appdata.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.appdata.xml" @ONLY)
-    generate_appdata_changelog(Telegram "../changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.appdata.xml")
+    generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.appdata.xml")
     install(TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}")
     install(FILES "Resources/art/icon16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "telegram.png")
     install(FILES "Resources/art/icon32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "telegram.png")

From 9493a3e8d2b523a8609d034db111937e3413f3b6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 15 Dec 2020 18:27:08 +0400
Subject: [PATCH 318/370] Fix freeze on screen disconnect

---
 Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp | 4 +++-
 1 file changed, 3 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 c1ebb4d69..7139fb8ec 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1334,7 +1334,9 @@ void OverlayWidget::handleVisibleChanged(bool visible) {
 }
 
 void OverlayWidget::handleScreenChanged(QScreen *screen) {
-	moveToScreen();
+	if (isVisible()) {
+		moveToScreen();
+	}
 }
 
 void OverlayWidget::onToMessage() {

From 945fa2dd4b55be5e6506b89230394cba5476a414 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 15 Dec 2020 18:31:06 +0400
Subject: [PATCH 319/370] Build without libICE and libSM on Linux

There's no any session management anyway
---
 Telegram/build/docker/centos_env/Dockerfile | 5 +++--
 cmake                                       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 787a7ceeb..2c41e7986 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -12,8 +12,8 @@ RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
 RUN yum -y install https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-1.7-1.x86_64.rpm
 RUN yum -y install centos-release-scl
 
-RUN yum -y install git cmake3 zlib-devel gtk2-devel gtk3-devel libICE-devel \
-	libSM-devel libdrm-devel autoconf automake libtool fontconfig-devel \
+RUN yum -y install git cmake3 zlib-devel gtk2-devel gtk3-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 \
@@ -436,6 +436,7 @@ RUN echo './configure -prefix '$'\"''$QT_PREFIX'$'\"'' \
 	-qt-pcre \
 	-no-icu \
 	-no-gtk \
+	-no-feature-xcb-sm \
 	-no-feature-wayland-server \
 	-static \
 	-dbus-runtime \
diff --git a/cmake b/cmake
index b5124ece3..783efab5a 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit b5124ece3e4d36fbaf34cfa84f6141c015580055
+Subproject commit 783efab5aa41efb2db8a162174e016a254021b7d

From 6b5c422e95dd1371e5d626d2a364dcfc4c7f0a55 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Dec 2020 20:02:28 +0400
Subject: [PATCH 320/370] Fix mute another voice chat admin.

---
 .../SourceFiles/calls/calls_group_members.cpp | 26 +++++++++++++++++--
 Telegram/lib_ui                               |  2 +-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 6316eb2f9..415ae7889 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -965,7 +965,29 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 		parent,
 		st::groupCallPopupMenu);
 
-	const auto mute = (real->state() != Row::State::Muted);
+	const auto muteState = real->state();
+	const auto admin = [&] {
+		if (const auto chat = _peer->asChat()) {
+			return chat->admins.contains(user)
+				|| (chat->creator == user->bareId());
+		} else if (const auto group = _peer->asMegagroup()) {
+			if (const auto mgInfo = group->mgInfo.get()) {
+				if (mgInfo->creator == user) {
+					return true;
+				}
+				const auto i = mgInfo->lastAdmins.find(user);
+				if (i == mgInfo->lastAdmins.end()) {
+					return false;
+				}
+				const auto &rights = i->second.rights;
+				return rights.c_chatAdminRights().is_manage_call();
+			}
+		}
+		return false;
+	}();
+	const auto mute = admin
+		? (muteState == Row::State::Active)
+		: (muteState != Row::State::Muted);
 	const auto toggleMute = crl::guard(this, [=] {
 		_toggleMuteRequests.fire(MuteRequest{
 			.user = user,
@@ -1020,7 +1042,7 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 		_kickMemberRequests.fire_copy(user);
 	});
 
-	if (_peer->canManageGroupCall()) {
+	if (_peer->canManageGroupCall() && (!admin || mute)) {
 		result->addAction(
 			(mute
 				? tr::lng_group_call_context_mute(tr::now)
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index e08a0de35..300c5a9c6 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit e08a0de35dd2d0bbf26d88d127ac7b80efb94150
+Subproject commit 300c5a9c6638fd5ad797357246c7ef08a2587ab8

From 00fac7014096730e743f3874a4d13ba6e028c2f6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Dec 2020 18:23:41 +0400
Subject: [PATCH 321/370] Fix resetting all sessions.

---
 .../SourceFiles/api/api_authorizations.cpp    | 21 ++++++++++++-------
 Telegram/SourceFiles/boxes/sessions_box.cpp   |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_authorizations.cpp b/Telegram/SourceFiles/api/api_authorizations.cpp
index f1c988476..ea8bef14a 100644
--- a/Telegram/SourceFiles/api/api_authorizations.cpp
+++ b/Telegram/SourceFiles/api/api_authorizations.cpp
@@ -125,13 +125,20 @@ void Authorizations::requestTerminate(
 		Fn<void(const MTPBool &result)> &&done,
 		Fn<void(const RPCError &error)> &&fail,
 		std::optional<uint64> hash) {
-	auto request = hash
-		? MTPaccount_ResetAuthorization(MTP_long(*hash))
-		: MTPaccount_ResetAuthorization();
-	_api.request(std::move(request))
-	.done(std::move(done))
-	.fail(std::move(fail))
-	.send();
+	const auto send = [&](auto request) {
+		_api.request(
+			std::move(request)
+		).done(
+			std::move(done)
+		).fail(
+			std::move(fail)
+		).send();
+	};
+	if (hash) {
+		send(MTPaccount_ResetAuthorization(MTP_long(*hash)));
+	} else {
+		send(MTPauth_ResetAuthorizations());
+	}
 }
 
 Authorizations::List Authorizations::list() const {
diff --git a/Telegram/SourceFiles/boxes/sessions_box.cpp b/Telegram/SourceFiles/boxes/sessions_box.cpp
index 0efa9b961..9f447dcfa 100644
--- a/Telegram/SourceFiles/boxes/sessions_box.cpp
+++ b/Telegram/SourceFiles/boxes/sessions_box.cpp
@@ -292,7 +292,7 @@ void SessionsContent::terminateAll() {
 	auto callback = [=] {
 		const auto reset = crl::guard(weak, [=] {
 			_authorizations->cancelCurrentRequest();
-			shortPollSessions();
+			_authorizations->reload();
 		});
 		_authorizations->requestTerminate(
 			[=](const MTPBool &result) { reset(); },

From 146a9c27940367a0ca90e03385964dc71ec9d505 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Dec 2020 18:59:12 +0400
Subject: [PATCH 322/370] Don't edit old 'voice chat started' message.

---
 Telegram/SourceFiles/api/api_updates.cpp         | 9 ---------
 Telegram/SourceFiles/data/data_session.cpp       | 8 --------
 Telegram/SourceFiles/data/data_session.h         | 8 --------
 Telegram/SourceFiles/history/history_service.cpp | 9 ---------
 4 files changed, 34 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 99fdf520c..2449c4fe3 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -1842,15 +1842,6 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 	case mtpc_updatePhoneCallSignalingData:
 	case mtpc_updateGroupCallParticipants:
 	case mtpc_updateGroupCall: {
-		if (update.type() == mtpc_updateGroupCall) {
-			const auto &data = update.c_updateGroupCall();
-			if (data.vcall().type() == mtpc_groupCallDiscarded) {
-				const auto &call = data.vcall().c_groupCallDiscarded();
-				session().data().groupCallDiscarded(
-					call.vid().v,
-					call.vduration().v);
-			}
-		}
 		Core::App().calls().handleUpdate(&session(), update);
 	} break;
 
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 9b5908639..fa4df7c48 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -814,14 +814,6 @@ void Session::unregisterGroupCall(not_null<GroupCall*> call) {
 	_groupCalls.remove(call->id());
 }
 
-rpl::producer<Session::GroupCallDiscard> Session::groupCallDiscards() const {
-	return _groupCallDiscarded.events();
-}
-
-void Session::groupCallDiscarded(uint64 id, int duration) {
-	_groupCallDiscarded.fire({ id, duration });
-}
-
 GroupCall *Session::groupCall(uint64 callId) const {
 	const auto i = _groupCalls.find(callId);
 	return (i != end(_groupCalls)) ? i->second.get() : nullptr;
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 0fc1c8b66..811e8b8b7 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -158,13 +158,6 @@ public:
 	void unregisterGroupCall(not_null<GroupCall*> call);
 	GroupCall *groupCall(uint64 callId) const;
 
-	struct GroupCallDiscard {
-		uint64 id = 0;
-		int duration = 0;
-	};
-	rpl::producer<GroupCallDiscard> groupCallDiscards() const;
-	void groupCallDiscarded(uint64 id, int duration);
-
 	[[nodiscard]] auto invitedToCallUsers(uint64 callId) const
 		-> const base::flat_set<not_null<UserData*>> &;
 	void registerInvitedToCallUser(
@@ -931,7 +924,6 @@ private:
 
 	base::flat_map<uint64, not_null<GroupCall*>> _groupCalls;
 	base::flat_map<uint64, base::flat_set<not_null<UserData*>>> _invitedToCallUsers;
-	rpl::event_stream<GroupCallDiscard> _groupCallDiscarded;
 
 	History *_topPromoted = nullptr;
 
diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp
index 2486188b1..55403cdd9 100644
--- a/Telegram/SourceFiles/history/history_service.cpp
+++ b/Telegram/SourceFiles/history/history_service.cpp
@@ -935,15 +935,6 @@ void HistoryService::createFromMtp(const MTPDmessageService &message) {
 			const auto id = CallIdFromInput(data.vcall());
 			call->lifetime.destroy();
 
-			history()->owner().groupCallDiscards(
-			) | rpl::filter([=](Data::Session::GroupCallDiscard discard) {
-				return (discard.id == id);
-			}) | rpl::start_with_next([=](
-					Data::Session::GroupCallDiscard discard) {
-				RemoveComponents(HistoryServiceOngoingCall::Bit());
-				updateText(prepareDiscardedCallText(discard.duration));
-			}, call->lifetime);
-
 			const auto peer = history()->peer;
 			const auto has = PeerHasThisCall(peer, id);
 			if (!has.has_value()) {

From b68d5f854de9f1b52c395ffd1a5dbab8314beee0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Dec 2020 19:00:47 +0400
Subject: [PATCH 323/370] Fix infinite 'Loading...' when no members in the
 group.

---
 Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index 0d866296f..3ce97701f 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -1369,9 +1369,12 @@ bool ParticipantsBoxController::feedMegagroupLastParticipants() {
 		return false;
 	}
 
+	auto added = false;
 	_additional.fillFromPeer();
 	for (const auto user : info->lastParticipants) {
-		appendRow(user);
+		if (appendRow(user)) {
+			added = true;
+		}
 
 		//
 		// Don't count lastParticipants in _offset, because we don't know
@@ -1383,7 +1386,7 @@ bool ParticipantsBoxController::feedMegagroupLastParticipants() {
 	if (_onlineSorter) {
 		_onlineSorter->sort();
 	}
-	return true;
+	return added;
 }
 
 void ParticipantsBoxController::rowClicked(not_null<PeerListRow*> row) {

From d732a35904c1df5c05e74e6a060a74dafe6b928e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Dec 2020 19:01:50 +0400
Subject: [PATCH 324/370] Use 'participants' for voice chats.

---
 Telegram/Resources/langs/lang.strings | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index db32ac4ca..4e49409cd 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1848,8 +1848,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_invite_done_many#one" = "You invited **{count} member** to the voice chat.";
 "lng_group_call_invite_done_many#other" = "You invited **{count} members** to the voice chat.";
 "lng_group_call_no_members" = "click to join";
-"lng_group_call_members#one" = "{count} member";
-"lng_group_call_members#other" = "{count} members";
+"lng_group_call_members#one" = "{count} participant";
+"lng_group_call_members#other" = "{count} participants";
 "lng_group_call_no_anonymous" = "Sorry, anonymous group admins can't join voice chats.";
 "lng_group_call_too_many" = "Sorry, there are too many members in this voice chat. Please try again later.";
 "lng_group_call_context_mute" = "Mute";

From 29e7ea9b36984b00c07907f00f74d931e2ad93ab Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 16 Dec 2020 13:14:52 +0400
Subject: [PATCH 325/370] Use 'Space' in voice chat as push-to-talk key.

---
 .../SourceFiles/calls/calls_group_call.cpp    | 29 +++++++++++--------
 Telegram/SourceFiles/calls/calls_group_call.h |  2 ++
 .../SourceFiles/calls/calls_group_panel.cpp   | 11 +++++++
 Telegram/ThirdParty/tgcalls                   |  2 +-
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index f4a71eafd..5ee162687 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -828,21 +828,26 @@ void GroupCall::applyGlobalShortcutChanges() {
 	}
 	_pushToTalk = shortcut;
 	_shortcutManager->startWatching(_pushToTalk, [=](bool pressed) {
-		const auto delay = Core::App().settings().groupCallPushToTalkDelay();
-		if (muted() == MuteState::ForceMuted
-			|| muted() == MuteState::Active) {
-			return;
-		} else if (pressed) {
-			_pushToTalkCancelTimer.cancel();
-			setMuted(MuteState::PushToTalk);
-		} else if (delay) {
-			_pushToTalkCancelTimer.callOnce(delay);
-		} else {
-			pushToTalkCancel();
-		}
+		pushToTalk(
+			pressed,
+			Core::App().settings().groupCallPushToTalkDelay());
 	});
 }
 
+void GroupCall::pushToTalk(bool pressed, crl::time delay) {
+	if (muted() == MuteState::ForceMuted
+		|| muted() == MuteState::Active) {
+		return;
+	} else if (pressed) {
+		_pushToTalkCancelTimer.cancel();
+		setMuted(MuteState::PushToTalk);
+	} else if (delay) {
+		_pushToTalkCancelTimer.callOnce(delay);
+	} else {
+		pushToTalkCancel();
+	}
+}
+
 void GroupCall::pushToTalkCancel() {
 	_pushToTalkCancelTimer.cancel();
 	if (muted() == MuteState::PushToTalk) {
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 9a507b5e8..0ad338c41 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -126,6 +126,8 @@ public:
 	std::shared_ptr<GlobalShortcutManager> ensureGlobalShortcutManager();
 	void applyGlobalShortcutChanges();
 
+	void pushToTalk(bool pressed, crl::time delay);
+
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 8b139398e..57e289991 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -45,6 +45,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Calls {
 namespace {
 
+constexpr auto kSpacePushToTalkDelay = crl::time(250);
+
 class InviteController final : public ParticipantsBoxController {
 public:
 	InviteController(
@@ -280,6 +282,15 @@ void GroupPanel::initWindow() {
 		if (e->type() == QEvent::Close && handleClose()) {
 			e->ignore();
 			return base::EventFilterResult::Cancel;
+		} else if (e->type() == QEvent::KeyPress
+			|| e->type() == QEvent::KeyRelease) {
+			if (static_cast<QKeyEvent*>(e.get())->key() == Qt::Key_Space) {
+				if (_call) {
+					_call->pushToTalk(
+						e->type() == QEvent::KeyPress,
+						kSpacePushToTalkDelay);
+				}
+			}
 		}
 		return base::EventFilterResult::Continue;
 	});
diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index b892eb58b..905ed863c 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit b892eb58bc941a4a1a67303439df8ffd379d6051
+Subproject commit 905ed863c19bc39b04b3b1c070b39195fedfef1e

From a85be4ccd00baf4435f60ec67b3cd114289c7c16 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 16 Dec 2020 15:29:15 +0400
Subject: [PATCH 326/370] Show information about ForceMuted state.

---
 Telegram/SourceFiles/calls/calls_group_panel.cpp | 14 ++++++++------
 Telegram/SourceFiles/calls/calls_top_bar.cpp     |  9 +++++----
 Telegram/ThirdParty/tgcalls                      |  2 +-
 Telegram/lib_ui                                  |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 57e289991..7c8f1143a 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -343,13 +343,15 @@ void GroupPanel::endCall() {
 void GroupPanel::initControls() {
 	_mute->clicks(
 	) | rpl::filter([=](Qt::MouseButton button) {
-		return (button == Qt::LeftButton)
-			&& _call
-			&& (_call->muted() != MuteState::ForceMuted);
+		return (button == Qt::LeftButton) && (_call != nullptr);
 	}) | rpl::start_with_next([=] {
-		_call->setMuted((_call->muted() == MuteState::Muted)
-			? MuteState::Active
-			: MuteState::Muted);
+		if (_call->muted() == MuteState::ForceMuted) {
+			_mute->shake();
+		} else {
+			_call->setMuted((_call->muted() == MuteState::Muted)
+				? MuteState::Active
+				: MuteState::Muted);
+		}
 	}, _mute->lifetime());
 
 	_hangup->setClickedCallback([=] { endCall(); });
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index c9527d23f..5a3b78079 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/text/format_values.h"
+#include "ui/toast/toast.h"
 #include "lang/lang_keys.h"
 #include "core/application.h"
 #include "calls/calls_call.h"
@@ -239,7 +240,9 @@ void TopBar::initControls() {
 		if (const auto call = _call.get()) {
 			call->setMuted(!call->muted());
 		} else if (const auto group = _groupCall.get()) {
-			if (group->muted() != MuteState::ForceMuted) {
+			if (group->muted() == MuteState::ForceMuted) {
+				Ui::Toast::Show(tr::lng_group_call_force_muted(tr::now));
+			} else {
 				group->setMuted((group->muted() == MuteState::Muted)
 					? MuteState::Active
 					: MuteState::Muted);
@@ -268,9 +271,7 @@ void TopBar::initControls() {
 		if (isForceMuted) {
 			_mute->clearState();
 		}
-		_mute->setAttribute(
-			Qt::WA_TransparentForMouseEvents,
-			isForceMuted);
+		_mute->setPointerCursor(!isForceMuted);
 
 		const auto to = 1.;
 		const auto from = _switchStateAnimation.animating()
diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index 905ed863c..a21d24aeb 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit 905ed863c19bc39b04b3b1c070b39195fedfef1e
+Subproject commit a21d24aeb755f2c975eced1dcb101b6520614e15
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 300c5a9c6..3bd98ac56 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 300c5a9c6638fd5ad797357246c7ef08a2587ab8
+Subproject commit 3bd98ac5640523d2ccd241c2c0af49aba9494066

From cabd7a276b064089043878e79b7c2d817c3483a3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 16 Dec 2020 15:58:53 +0400
Subject: [PATCH 327/370] Add 'invited' members to voice chats.

---
 .../icons/calls/group_calls_invited.png       | Bin 0 -> 665 bytes
 .../icons/calls/group_calls_invited@2x.png    | Bin 0 -> 1162 bytes
 .../icons/calls/group_calls_invited@3x.png    | Bin 0 -> 1798 bytes
 Telegram/SourceFiles/calls/calls.style        |   2 +
 .../SourceFiles/calls/calls_group_members.cpp | 118 +++++++++++++++---
 Telegram/SourceFiles/data/data_session.cpp    |   1 +
 Telegram/SourceFiles/data/data_session.h      |   9 ++
 7 files changed, 116 insertions(+), 14 deletions(-)
 create mode 100644 Telegram/Resources/icons/calls/group_calls_invited.png
 create mode 100644 Telegram/Resources/icons/calls/group_calls_invited@2x.png
 create mode 100644 Telegram/Resources/icons/calls/group_calls_invited@3x.png

diff --git a/Telegram/Resources/icons/calls/group_calls_invited.png b/Telegram/Resources/icons/calls/group_calls_invited.png
new file mode 100644
index 0000000000000000000000000000000000000000..cddca3ac91785b0a2003704ccdd8660c6a8496bd
GIT binary patch
literal 665
zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d<g|ojKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uy?`0P1}Xf;AM%rdfr;7E#WBQ#
z_igCeRgQroamV9bxFjVspBnCI@GuOBJ8<B{k!Z<@Jb(5yOzd1DA*I1QWyzY|`={34
zx?UP{y!8ExbynBns{hvfj?NbC?ue+ZSDI(<xU=a`^WLSm^|xPq{WWOy)kP;$oPPg}
zGs(GQFO;)*wZG_-j}>PoTz+}v^UoNd;NkZHmt_UIG}u<0{#!Ty@y8t^ekwvqkLCVt
zZ(MneQ<!%N_hGi+A7AhGmYw%G>k(BR?7?s$=*Rn?SMDZnNH92YHEZhOhZ|xagwJSo
zQk3IilW1mm)qZ!jWK@TwQ_T4@EKCX#SsUc@lNVon5TmEgn%|g^t+1AngDpcdjfMC3
z!CQ;jHr{_foh2t|XUw)}cDL^hCJUl-V}(})XawxOt2Y0<yIg;J+hIk~ZdWV0eyt~)
zR~!#io4hc`%zI@>m(FP=Q?01=*SAFIWbBN&^t0yQoRY0?#HM<w?u*g0nSJ)15f=;7
zogA~u-FHtZS^PcFZ*fGM=lABBFVkI=1g&KFZf!A*yZ^RKbN>0udD|!JH5^RaEEx7d
zeX?g_%*qfAsotRV*C+QiZWWV`jJ25e`s*$M$zC^^?xQk~1DNZMI8I2vQp#q~wBzzi
zk0PtNW|L*lcQh-UU-4PyMv2wat68aPb=7V*pG;=>%g&n=wf0-c9Lbhkv!|z<W}GXZ
nAOCN8-BZQ?3F}MVdY@x|`l_m2_l(myP_poJ^>bP0l+XkKqox#C

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/calls/group_calls_invited@2x.png b/Telegram/Resources/icons/calls/group_calls_invited@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..921e358d077e5786e3dc4339e2ebd645f2465194
GIT binary patch
literal 1162
zcmV;51a<p~P)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91HlPCl1ONa40RR91HUIzs0P{mGqyPW|^hrcPRA>e5SjkHCKoG7OMDXIS
zxPah#@CDR^2NeVnZ@z?A&%TG?1NZ_8UPMLkpm-J$^dPw5ilQQj{nwY@&Qvm;)lAGt
z3YzXzS69_nRq5`eKtzh$pQGZRL-Y+O2UcyF%`=u~EF%%fOEDvf2<=9mvCyH4AUHKO
zMJp>SbbNeFFE1}v!x%iw{giN}O0^9R4yv7<9Th~7fox3w(gig>KCT`f9)d90^N_`w
z7~s+ahUl9>U0q$NwY4>?VeBTXiIKVVfVs=>^72y6&d!!)13b)0!rF*gO9vQl2GUP;
zadDwqTU$MyZEI^Q0|y-uz@-C>cRB|!Q>NTbLq-yGxMh5v(*efYxa}j}BOiwxbMl>o
zj<D-eJD|I}yV<Azba;5Ehk?D6l{$hJrUop?kxI;mPA?meEnAhPI503ko12@2vKbv6
zH3oloch}~3baW7J4ED3v05Xu(Bz0(>UmrUQtW*sR4Ov^a-WeF2QD0SU_ij)C$C)z%
zLlE2tG|n>9wh!K~9ndCFaFol^6IkZ2R9>LKM`rxmuU&!*g@Wqs?Nzn4wMGYj0!jl$
z=G<ke-%;5^CdTDg`(27KK&`K@Te?qAPpyqXJA*z6P*NW@6kL;V6!3?p)i4Gx;=NFV
zk$nkRUtgaLn6=yK@=6+%1X!VQ2^h)`nUaJJVS0Mnv87`kd=0unj>+i98JB>;K~rWv
zKR+ebY5=7Q-_ho-L=29$x3{UQtE<HP9`X4?6B843a&l5O7sTl7?4-%bNg5d$A^zSX
z{vM;o#zx|I+p(0RNKa2sba!`0x3{;nzrRmgTU*38eTQ7ogE7s>-1YUfBU3jwH?hiZ
zZf;H;92_`w#d&}Z=wd)&nzs<Zy}rI$KD@ubtKs3{FbZuM&XC&M+lzz2cMWtxw;w=b
zDasVr)zw+0$7c$?y}ijP-!TV)Ha0e>r>Dm#_xSio{F8>BpP%XL>&qciEEcK0zMh(!
zo2jX($uXxN&d<+jW@d(tj*c{|toKFE(vjyI8XDBu*;!fC@h572eqOb=w};jVS**cY
zH^ByMdH5LJaSuhdf#v08hYz^Wj*X4k^Fiyq=ApxVIfg9{`DB5i_CG#8Y+zizs=vSA
z%XnlyF4@qj3AQ}mw`74WEG%f7R=>2g6xn%?4A^?0Qxa?%)+7sTb#+zRR4pwnCZj*%
zL8m0xbOTHLXO8@n#MdsmzrSaj$r5xzw<c**^AZP!+kz(C7%D|lx3sD4)#yP|{o>-H
ztxAq<W<mq0TaLB*zyn$fR$HHVDP|=AIk2o`BCH>I#==G_D{^_pvXY6ge&iVo8>y_w
c{n?ED116*A6~G0b?*IS*07*qoM6N<$f_<I^TL1t6

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/icons/calls/group_calls_invited@3x.png b/Telegram/Resources/icons/calls/group_calls_invited@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e70c2acad2dbb8f21b05a6c2fb3c7b73508e977d
GIT binary patch
literal 1798
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
N!uaD+&Aw5z{{SsP9M}K=

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 9a33dd382..56a2ee093 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -562,6 +562,8 @@ groupCallMemberColoredCrossLine: CrossLineAnimation(groupCallMemberInactiveCross
 	fg: groupCallMemberMutedIcon;
 	icon: icon {{ "calls/group_calls_unmuted", groupCallMemberActiveIcon }};
 }
+groupCallMemberInvited: icon {{ "calls/group_calls_invited", groupCallMemberInactiveIcon }};
+groupCallMemberInvitedPosition: point(2px, 12px);
 
 groupCallSettings: CallButton(callMicrophoneMute) {
 	button: IconButton(callButton) {
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 415ae7889..3414f87dd 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_changes.h"
 #include "data/data_group_call.h"
 #include "data/data_peer_values.h" // Data::CanWriteValue.
+#include "data/data_session.h" // Data::Session::invitedToCallUsers.
 #include "ui/paint/blobs.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
@@ -85,6 +86,7 @@ public:
 		Active,
 		Inactive,
 		Muted,
+		Invited,
 	};
 
 	void setSkipLevelUpdate(bool value);
@@ -116,7 +118,9 @@ public:
 			st::groupCallActiveButton.height);
 	}
 	bool actionDisabled() const override {
-		return peer()->isSelf() || !_delegate->rowCanMuteMembers();
+		return peer()->isSelf()
+			|| (_state == State::Invited)
+			|| !_delegate->rowCanMuteMembers();
 	}
 	QMargins actionMargins() const override {
 		return QMargins(
@@ -135,6 +139,15 @@ public:
 
 	auto generatePaintUserpicCallback() -> PaintRoundImageCallback override;
 
+	void paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int availableWidth,
+		int outerWidth,
+		bool selected) override;
+
 private:
 	struct BlobsAnimation {
 		BlobsAnimation(
@@ -223,6 +236,8 @@ private:
 	[[nodiscard]] std::unique_ptr<Row> createSelfRow();
 	[[nodiscard]] std::unique_ptr<Row> createRow(
 		const Data::GroupCall::Participant &participant);
+	[[nodiscard]] std::unique_ptr<Row> createInvitedRow(
+		not_null<UserData*> user);
 
 	void prepareRows(not_null<Data::GroupCall*> real);
 	//void repaintByTimer();
@@ -241,6 +256,7 @@ private:
 	Row *findRow(not_null<UserData*> user) const;
 
 	[[nodiscard]] Data::GroupCall *resolvedRealCall() const;
+	void appendInvitedUsers();
 
 	const base::weak_ptr<GroupCall> _call;
 	not_null<PeerData*> _peer;
@@ -248,6 +264,7 @@ private:
 	// Use only resolvedRealCall() method, not this value directly.
 	Data::GroupCall *_realCallRawValue = nullptr;
 	uint64 _realId = 0;
+	bool _prepared = false;
 
 	rpl::event_stream<MuteRequest> _toggleMuteRequests;
 	rpl::event_stream<not_null<UserData*>> _kickMemberRequests;
@@ -283,12 +300,7 @@ void Row::setSkipLevelUpdate(bool value) {
 void Row::updateState(const Data::GroupCall::Participant *participant) {
 	setSsrc(participant ? participant->ssrc : 0);
 	if (!participant) {
-		if (peer()->isSelf()) {
-			setCustomStatus(tr::lng_group_call_connecting(tr::now));
-		} else {
-			setCustomStatus(QString());
-		}
-		setState(State::Inactive);
+		setState(State::Invited);
 		setSounding(false);
 		setSpeaking(false);
 	} else if (!participant->muted
@@ -476,6 +488,34 @@ auto Row::generatePaintUserpicCallback() -> PaintRoundImageCallback {
 	};
 }
 
+void Row::paintStatusText(
+		Painter &p,
+		const style::PeerListItem &st,
+		int x,
+		int y,
+		int availableWidth,
+		int outerWidth,
+		bool selected) {
+	if (_state != State::Invited) {
+		PeerListRow::paintStatusText(
+			p,
+			st,
+			x,
+			y,
+			availableWidth,
+			outerWidth,
+			selected);
+		return;
+	}
+	p.setFont(st::normalFont);
+	p.setPen(st::groupCallMemberNotJoinedStatus);
+	p.drawTextLeft(
+		x,
+		y,
+		outerWidth,
+		peer()->isSelf() ? "connecting..." : "invited");
+}
+
 void Row::paintAction(
 		Painter &p,
 		int x,
@@ -484,6 +524,20 @@ void Row::paintAction(
 		bool selected,
 		bool actionSelected) {
 	auto size = actionSize();
+	const auto iconRect = style::rtlrect(
+		x,
+		y,
+		size.width(),
+		size.height(),
+		outerWidth);
+	if (_state == State::Invited) {
+		_actionRipple = nullptr;
+		st::groupCallMemberInvited.paint(
+			p,
+			QPoint(x, y) + st::groupCallMemberInvitedPosition,
+			outerWidth);
+		return;
+	}
 	if (_actionRipple) {
 		_actionRipple->paint(
 			p,
@@ -494,12 +548,6 @@ void Row::paintAction(
 			_actionRipple.reset();
 		}
 	}
-	const auto iconRect = style::rtlrect(
-		x,
-		y,
-		size.width(),
-		size.height(),
-		outerWidth);
 	const auto speaking = _speakingAnimation.value(_speaking ? 1. : 0.);
 	const auto active = _activeAnimation.value(
 		(_state == State::Active) ? 1. : 0.);
@@ -649,6 +697,7 @@ void MembersController::subscribeToChanges(not_null<Data::GroupCall*> real) {
 		const auto user = update.was ? update.was->user : update.now->user;
 		if (!update.now) {
 			if (const auto row = findRow(user)) {
+				const auto owner = &user->owner();
 				if (user->isSelf()) {
 					updateRow(row, nullptr);
 				} else {
@@ -660,6 +709,30 @@ void MembersController::subscribeToChanges(not_null<Data::GroupCall*> real) {
 			updateRow(update.was, *update.now);
 		}
 	}, _lifetime);
+
+	if (_prepared) {
+		appendInvitedUsers();
+	}
+}
+
+void MembersController::appendInvitedUsers() {
+	for (const auto user : _peer->owner().invitedToCallUsers(_realId)) {
+		if (auto row = createInvitedRow(user)) {
+			delegate()->peerListAppendRow(std::move(row));
+		}
+	}
+	delegate()->peerListRefreshRows();
+
+	using Invite = Data::Session::InviteToCall;
+	_peer->owner().invitesToCalls(
+	) | rpl::filter([=](const Invite &invite) {
+		return (invite.id == _realId);
+	}) | rpl::start_with_next([=](const Invite &invite) {
+		if (auto row = createInvitedRow(invite.user)) {
+			delegate()->peerListAppendRow(std::move(row));
+			delegate()->peerListRefreshRows();
+		}
+	}, _lifetime);
 }
 
 void MembersController::updateRow(
@@ -796,7 +869,12 @@ void MembersController::prepare() {
 		delegate()->peerListAppendRow(std::move(row));
 		delegate()->peerListRefreshRows();
 	}
+
 	loadMoreRows();
+	if (_realId) {
+		appendInvitedUsers();
+	}
+	_prepared = true;
 }
 
 void MembersController::prepareRows(not_null<Data::GroupCall*> real) {
@@ -1056,7 +1134,9 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 		tr::lng_context_send_message(tr::now),
 		showHistory);
 	const auto canKick = [&] {
-		if (const auto chat = _peer->asChat()) {
+		if (static_cast<Row*>(row.get())->state() == Row::State::Invited) {
+			return false;
+		} else if (const auto chat = _peer->asChat()) {
 			return chat->amCreator()
 				|| (chat->canBanMembers() && !chat->admins.contains(user));
 		} else if (const auto group = _peer->asMegagroup()) {
@@ -1086,6 +1166,16 @@ std::unique_ptr<Row> MembersController::createRow(
 	return result;
 }
 
+std::unique_ptr<Row> MembersController::createInvitedRow(
+		not_null<UserData*> user) {
+	if (findRow(user)) {
+		return nullptr;
+	}
+	auto result = std::make_unique<Row>(this, user);
+	updateRow(result.get(), nullptr);
+	return result;
+}
+
 } // namespace
 
 GroupMembers::GroupMembers(
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index fa4df7c48..39b2353fd 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -841,6 +841,7 @@ void Session::registerInvitedToCallUser(
 		}
 	}
 	_invitedToCallUsers[callId].emplace(user);
+	_invitesToCalls.fire({ callId, user });
 }
 
 void Session::unregisterInvitedToCallUser(
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 811e8b8b7..ef3308820 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -166,6 +166,14 @@ public:
 		not_null<UserData*> user);
 	void unregisterInvitedToCallUser(uint64 callId, not_null<UserData*> user);
 
+	struct InviteToCall {
+		uint64 id = 0;
+		not_null<UserData*> user;
+	};
+	[[nodiscard]] rpl::producer<InviteToCall> invitesToCalls() const {
+		return _invitesToCalls.events();
+	}
+
 	void enumerateUsers(Fn<void(not_null<UserData*>)> action) const;
 	void enumerateGroups(Fn<void(not_null<PeerData*>)> action) const;
 	void enumerateChannels(Fn<void(not_null<ChannelData*>)> action) const;
@@ -923,6 +931,7 @@ private:
 	base::flat_set<not_null<ViewElement*>> _heavyViewParts;
 
 	base::flat_map<uint64, not_null<GroupCall*>> _groupCalls;
+	rpl::event_stream<InviteToCall> _invitesToCalls;
 	base::flat_map<uint64, base::flat_set<not_null<UserData*>>> _invitedToCallUsers;
 
 	History *_topPromoted = nullptr;

From 9dc6f117a76c0fcf05b54e671a68832459951b4d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 16 Dec 2020 19:31:16 +0400
Subject: [PATCH 328/370] Redesign invite members to voice chat button.

---
 Telegram/Resources/langs/lang.strings         |   2 +
 Telegram/SourceFiles/calls/calls.style        |  25 +--
 .../SourceFiles/calls/calls_group_members.cpp | 166 ++++++++----------
 .../SourceFiles/calls/calls_group_members.h   |  16 +-
 .../SourceFiles/calls/calls_group_panel.h     |   1 +
 5 files changed, 100 insertions(+), 110 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 4e49409cd..d0dd31de9 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1830,6 +1830,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_create_sure" = "Do you really want to start a voice chat in this group?";
 "lng_group_call_also_end" = "End voice chat";
 "lng_group_call_settings_title" = "Settings";
+"lng_group_call_invite" = "Invite Member";
+"lng_group_call_invited_status" = "invited";
 "lng_group_call_invite_title" = "Invite members";
 "lng_group_call_invite_button" = "Invite";
 "lng_group_call_new_muted" = "Mute new members";
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 56a2ee093..b290b2002 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -465,8 +465,8 @@ groupCallMembersListItem: PeerListItem(defaultPeerListItem) {
 	}
 	height: 52px;
 	photoPosition: point(12px, 6px);
-	namePosition: point(68px, 7px);
-	statusPosition: point(68px, 26px);
+	namePosition: point(63px, 7px);
+	statusPosition: point(63px, 26px);
 	photoSize: 40px;
 	nameFg: groupCallMembersFg;
 	nameFgChecked: groupCallMembersFg;
@@ -514,16 +514,21 @@ groupCallMultiSelect: MultiSelect(defaultMultiSelect) {
 
 groupCallMembersHeader: 47px;
 groupCallMembersMargin: margins(16px, 16px, 16px, 28px);
-groupCallAddMember: IconButton(defaultIconButton) {
-	width: 36px;
-	height: 36px;
-	iconPosition: point(3px, 5px);
-	icon: icon {{ "info_add_member", groupCallMemberInactiveIcon }};
-	iconOver: icon {{ "info_add_member", groupCallMemberInactiveIcon }};
-	rippleAreaPosition: point(0px, 0px);
-	rippleAreaSize: 36px;
+groupCallAddMember: SettingsButton(defaultSettingsButton) {
+	textFg: groupCallMemberNotJoinedStatus;
+	textFgOver: groupCallMemberNotJoinedStatus;
+	textBg: groupCallMembersBg;
+	textBgOver: groupCallMembersBgOver;
+
+	font: semiboldFont;
+
+	height: 22px;
+	padding: margins(63px, 17px, 22px, 11px);
+
 	ripple: groupCallRipple;
 }
+groupCallAddMemberIcon: icon {{ "info_add_member", groupCallMemberInactiveIcon, point(0px, 3px) }};
+groupCallAddMemberIconLeft: 16px;
 groupCallHeaderPosition: point(16px, 16px);
 groupCallHeaderLabel: FlatLabel(defaultFlatLabel) {
 	maxHeight: 18px;
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 3414f87dd..1e6f54e04 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_group_call.h"
 #include "data/data_peer_values.h" // Data::CanWriteValue.
 #include "data/data_session.h" // Data::Session::invitedToCallUsers.
+#include "settings/settings_common.h" // Settings::CreateButton.
 #include "ui/paint/blobs.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
@@ -513,7 +514,9 @@ void Row::paintStatusText(
 		x,
 		y,
 		outerWidth,
-		peer()->isSelf() ? "connecting..." : "invited");
+		(peer()->isSelf()
+			? tr::lng_status_connecting(tr::now)
+			: tr::lng_group_call_invited_status(tr::now)));
 }
 
 void Row::paintAction(
@@ -1185,20 +1188,11 @@ GroupMembers::GroupMembers(
 , _call(call)
 , _scroll(this, st::defaultSolidScroll)
 , _listController(std::make_unique<MembersController>(call, parent)) {
-	setupHeader(call);
+	setupAddMember(call);
 	setupList();
 	setContent(_list);
 	setupFakeRoundCorners();
 	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
-
-	paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
-		const auto headerPart = clip.intersected(
-			QRect(0, 0, width(), _header->height()));
-		if (!headerPart.isEmpty()) {
-			QPainter(this).fillRect(headerPart, st::groupCallMembersBg);
-		}
-	}, lifetime());
 }
 
 auto GroupMembers::toggleMuteRequests() const
@@ -1214,7 +1208,7 @@ auto GroupMembers::kickMemberRequests() const
 }
 
 int GroupMembers::desiredHeight() const {
-	auto desired = _header ? _header->height() : 0;
+	const auto top = _addMember ? _addMember->height() : 0;
 	auto count = [&] {
 		if (const auto call = _call.get()) {
 			if (const auto real = call->peer()->groupCall()) {
@@ -1226,7 +1220,7 @@ int GroupMembers::desiredHeight() const {
 		return 0;
 	}();
 	const auto use = std::max(count, _list->fullRowsCount());
-	return (_header ? _header->height() : 0)
+	return top
 		+ (use * st::groupCallMembersList.item.height)
 		+ (use ? st::lineWidth : 0);
 }
@@ -1236,48 +1230,14 @@ rpl::producer<int> GroupMembers::desiredHeightValue() const {
 		_listController.get());
 	return rpl::combine(
 		heightValue(),
+		_addMemberButton.value(),
 		controller->fullCountValue()
 	) | rpl::map([=] {
 		return desiredHeight();
 	});
 }
 
-void GroupMembers::setupHeader(not_null<GroupCall*> call) {
-	_header = object_ptr<Ui::FixedHeightWidget>(
-		this,
-		st::groupCallMembersHeader);
-	auto parent = _header.data();
-
-	_titleWrap = Ui::CreateChild<Ui::RpWidget>(parent);
-	_title = setupTitle(call);
-	_addMember = Ui::CreateChild<Ui::IconButton>(
-		parent,
-		st::groupCallAddMember);
-	setupButtons(call);
-
-	widthValue(
-	) | rpl::start_with_next([this](int width) {
-		_header->resizeToWidth(width);
-	}, _header->lifetime());
-}
-
-object_ptr<Ui::FlatLabel> GroupMembers::setupTitle(
-		not_null<GroupCall*> call) {
-	const auto controller = static_cast<MembersController*>(
-		_listController.get());
-	auto result = object_ptr<Ui::FlatLabel>(
-		_titleWrap,
-		tr::lng_chat_status_members(
-			lt_count_decimal,
-			controller->fullCountValue() | tr::to_count(),
-			Ui::Text::Upper
-		),
-		st::groupCallHeaderLabel);
-	result->setAttribute(Qt::WA_TransparentForMouseEvents);
-	return result;
-}
-
-void GroupMembers::setupButtons(not_null<GroupCall*> call) {
+void GroupMembers::setupAddMember(not_null<GroupCall*> call) {
 	using namespace rpl::mappers;
 
 	_canAddMembers = Data::CanWriteValue(call->peer().get());
@@ -1288,65 +1248,89 @@ void GroupMembers::setupButtons(not_null<GroupCall*> call) {
 			_canAddMembers = Data::CanWriteValue(channel.get());
 		});
 
-	_addMember->showOn(_canAddMembers.value());
-	_addMember->addClickHandler([=] { // TODO throttle(ripple duration)
-		_addMemberRequests.fire({});
-	});
+	_canAddMembers.value(
+	) | rpl::start_with_next([=](bool can) {
+		if (!can) {
+			_addMemberButton = nullptr;
+			_addMember.destroy();
+			updateControlsGeometry();
+			return;
+		}
+		_addMember = Settings::CreateButton(
+			this,
+			tr::lng_group_call_invite(),
+			st::groupCallAddMember,
+			&st::groupCallAddMemberIcon,
+			st::groupCallAddMemberIconLeft);
+		_addMember->show();
+
+		_addMember->addClickHandler([=] { // TODO throttle(ripple duration)
+			_addMemberRequests.fire({});
+		});
+		_addMemberButton = _addMember.data();
+
+		resizeToList();
+	}, lifetime());
 }
 
-void GroupMembers::setupList() {
-	auto topSkip = _header ? _header->height() : 0;
+rpl::producer<int> GroupMembers::fullCountValue() const {
+	return static_cast<MembersController*>(
+		_listController.get())->fullCountValue();
+}
 
+//tr::lng_chat_status_members(
+//	lt_count_decimal,
+//	controller->fullCountValue() | tr::to_count(),
+//	Ui::Text::Upper
+//),
+
+void GroupMembers::setupList() {
 	_listController->setStyleOverrides(&st::groupCallMembersList);
 	_list = _scroll->setOwnedWidget(object_ptr<ListWidget>(
 		this,
 		_listController.get()));
 
-	sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
-		_scroll->setGeometry(0, topSkip, size.width(), size.height() - topSkip);
-		_list->resizeToWidth(size.width());
+	_list->heightValue(
+	) | rpl::start_with_next([=] {
+		resizeToList();
 	}, _list->lifetime());
 
-	_list->heightValue(
-	) | rpl::start_with_next([=](int listHeight) {
-		auto newHeight = (listHeight > 0)
-			? (topSkip + listHeight + st::lineWidth)
-			: 0;
-		resize(width(), newHeight);
-	}, _list->lifetime());
-	_list->moveToLeft(0, topSkip);
-	_list->show();
+	updateControlsGeometry();
 }
 
 void GroupMembers::resizeEvent(QResizeEvent *e) {
-	if (_header) {
-		updateHeaderControlsGeometry(width());
+	updateControlsGeometry();
+}
+
+void GroupMembers::resizeToList() {
+	if (!_list) {
+		return;
+	}
+	const auto listHeight = _list->height();
+	const auto newHeight = (listHeight > 0)
+		? ((_addMember ? _addMember->height() : 0)
+			+ listHeight
+			+ st::lineWidth)
+		: 0;
+	if (height() == newHeight) {
+		updateControlsGeometry();
+	} else {
+		resize(width(), newHeight);
 	}
 }
 
-void GroupMembers::updateHeaderControlsGeometry(int newWidth) {
-	auto availableWidth = newWidth
-		- st::groupCallAddButtonPosition.x();
-	_addMember->moveToLeft(
-		availableWidth - _addMember->width(),
-		st::groupCallAddButtonPosition.y(),
-		newWidth);
-	if (!_addMember->isHidden()) {
-		availableWidth -= _addMember->width();
+void GroupMembers::updateControlsGeometry() {
+	if (!_list) {
+		return;
 	}
-
-	_titleWrap->resize(
-		availableWidth - _addMember->width() - st::groupCallHeaderPosition.x(),
-		_title->height());
-	_titleWrap->moveToLeft(
-		st::groupCallHeaderPosition.x(),
-		st::groupCallHeaderPosition.y(),
-		newWidth);
-	_titleWrap->setAttribute(Qt::WA_TransparentForMouseEvents);
-
-	_title->resizeToWidth(_titleWrap->width());
-	_title->moveToLeft(0, 0);
+	auto topSkip = 0;
+	if (_addMember) {
+		_addMember->resizeToWidth(width());
+		_addMember->move(0, 0);
+		topSkip = _addMember->height();
+	}
+	_scroll->setGeometry(0, topSkip, width(), height() - topSkip);
+	_list->resizeToWidth(width());
 }
 
 void GroupMembers::setupFakeRoundCorners() {
diff --git a/Telegram/SourceFiles/calls/calls_group_members.h b/Telegram/SourceFiles/calls/calls_group_members.h
index d886d288c..6216e35f7 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.h
+++ b/Telegram/SourceFiles/calls/calls_group_members.h
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 class ScrollArea;
+class SettingsButton;
 } // namespace Ui
 
 namespace Data {
@@ -36,6 +37,7 @@ public:
 
 	[[nodiscard]] int desiredHeight() const;
 	[[nodiscard]] rpl::producer<int> desiredHeightValue() const override;
+	[[nodiscard]] rpl::producer<int> fullCountValue() const;
 	[[nodiscard]] rpl::producer<MuteRequest> toggleMuteRequests() const;
 	[[nodiscard]] auto kickMemberRequests() const
 		-> rpl::producer<not_null<UserData*>>;
@@ -67,25 +69,21 @@ private:
 	void peerListSetDescription(
 		object_ptr<Ui::FlatLabel> description) override;
 
-	void setupHeader(not_null<GroupCall*> call);
-	object_ptr<Ui::FlatLabel> setupTitle(not_null<GroupCall*> call);
+	void setupAddMember(not_null<GroupCall*> call);
+	void resizeToList();
 	void setupList();
 	void setupFakeRoundCorners();
 
-	void setupButtons(not_null<GroupCall*> call);
-
-	void updateHeaderControlsGeometry(int newWidth);
+	void updateControlsGeometry();
 
 	const base::weak_ptr<GroupCall> _call;
 	object_ptr<Ui::ScrollArea> _scroll;
 	std::unique_ptr<PeerListController> _listController;
-	object_ptr<Ui::RpWidget> _header = { nullptr };
+	object_ptr<Ui::SettingsButton> _addMember = { nullptr };
+	rpl::variable<Ui::SettingsButton*> _addMemberButton = nullptr;
 	ListWidget *_list = { nullptr };
 	rpl::event_stream<> _addMemberRequests;
 
-	Ui::RpWidget *_titleWrap = nullptr;
-	Ui::FlatLabel *_title = nullptr;
-	Ui::IconButton *_addMember = nullptr;
 	rpl::variable<bool> _canAddMembers;
 
 };
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h
index 154bca7c1..c37778524 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/calls_group_panel.h
@@ -115,6 +115,7 @@ private:
 	rpl::lifetime _callLifetime;
 
 	object_ptr<Ui::FlatLabel> _title = { nullptr };
+	object_ptr<Ui::FlatLabel> _subtitle = { nullptr };
 	object_ptr<GroupMembers> _members;
 
 	object_ptr<Ui::CallButton> _settings;

From bb8647dd4c9d421859c99d1b0ffca62794fd1510 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Dec 2020 14:19:33 +0400
Subject: [PATCH 329/370] Show participants count in the subtitle.

---
 Telegram/SourceFiles/calls/calls.style        | 21 ++++++----
 .../SourceFiles/calls/calls_group_panel.cpp   | 42 ++++++++++++++-----
 .../SourceFiles/ui/chat/group_call_bar.cpp    |  2 +-
 Telegram/ThirdParty/libtgvoip                 |  2 +-
 Telegram/ThirdParty/tgcalls                   |  2 +-
 5 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index b290b2002..4dc45ad5b 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -512,7 +512,10 @@ groupCallMultiSelect: MultiSelect(defaultMultiSelect) {
 	}
 }
 
-groupCallMembersHeader: 47px;
+groupCallMembersTop: 62px;
+groupCallTitleTop: 14px;
+groupCallSubtitleTop: 33px;
+
 groupCallMembersMargin: margins(16px, 16px, 16px, 28px);
 groupCallAddMember: SettingsButton(defaultSettingsButton) {
 	textFg: groupCallMemberNotJoinedStatus;
@@ -529,14 +532,16 @@ groupCallAddMember: SettingsButton(defaultSettingsButton) {
 }
 groupCallAddMemberIcon: icon {{ "info_add_member", groupCallMemberInactiveIcon, point(0px, 3px) }};
 groupCallAddMemberIconLeft: 16px;
-groupCallHeaderPosition: point(16px, 16px);
-groupCallHeaderLabel: FlatLabel(defaultFlatLabel) {
+groupCallSubtitleLabel: FlatLabel(defaultFlatLabel) {
 	maxHeight: 18px;
+	textFg: groupCallMemberNotJoinedStatus;
+}
+groupCallTitleLabel: FlatLabel(groupCallSubtitleLabel) {
 	textFg: groupCallMembersFg;
 	style: TextStyle(defaultTextStyle) {
-		font: semiboldFont;
-		linkFont: semiboldFont;
-		linkFontOver: semiboldFont;
+		font: font(semibold 14px);
+		linkFont: font(semibold 14px);
+		linkFontOver: font(semibold 14px);
 	}
 }
 groupCallAddButtonPosition: point(10px, 7px);
@@ -729,8 +734,8 @@ groupCallTitleCloseIconOver: icon {
 };
 groupCallTitle: WindowTitle(defaultWindowTitle) {
 	height: 0px;
-	bg: groupCallBg;
-	bgActive: groupCallBg;
+	bg: transparent;
+	bgActive: transparent;
 	fg: transparent;
 	fgActive: transparent;
 	minimize: IconButton(groupCallTitleButton) {
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 7c8f1143a..34803e7cd 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -220,6 +220,8 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
 	_settings->setColorOverrides(_mute->colorOverrides());
 
+	_window->setTitleStyle(st::groupCallTitle);
+
 	SubscribeToMigration(
 		_peer,
 		_window->lifetime(),
@@ -576,22 +578,22 @@ void GroupPanel::initGeometry() {
 }
 
 int GroupPanel::computeMembersListTop() const {
-#ifdef Q_OS_WIN
-	return st::callTitleButton.height + st::groupCallMembersMargin.top() / 2;
-#elif defined Q_OS_MAC // Q_OS_WIN
-	return st::groupCallMembersMargin.top() * 2;
-#else // Q_OS_WIN || Q_OS_MAC
-	return st::groupCallMembersMargin.top();
-#endif // Q_OS_WIN || Q_OS_MAC
+	if (computeTitleRect().has_value()) {
+		return st::groupCallMembersTop;
+	}
+	return st::groupCallMembersTop
+		- (st::groupCallSubtitleTop - st::groupCallTitleTop);
 }
 
 std::optional<QRect> GroupPanel::computeTitleRect() const {
 #ifdef Q_OS_WIN
 	const auto controls = _controls->geometry();
 	return QRect(0, 0, controls.x(), controls.height());
-#else // Q_OS_WIN
+#elif Q_OS_MAC // Q_OS_WIN
+	return QRect(70, 0, widget()->width() - 70, 28);
+#else // Q_OS_WIN || Q_OS_MAC
 	return std::nullopt;
-#endif // Q_OS_WIN
+#endif // Q_OS_WIN || Q_OS_MAC
 }
 
 void GroupPanel::updateControlsGeometry() {
@@ -636,12 +638,13 @@ void GroupPanel::refreshTitle() {
 			_title.create(
 				widget(),
 				Info::Profile::NameValue(_peer),
-				st::groupCallHeaderLabel);
+				st::groupCallTitleLabel);
+			_title->show();
 			_title->setAttribute(Qt::WA_TransparentForMouseEvents);
 		}
 		const auto best = _title->naturalWidth();
 		const auto from = (widget()->width() - best) / 2;
-		const auto top = (computeMembersListTop() - _title->height()) / 2;
+		const auto top = st::groupCallTitleTop;
 		const auto left = titleRect->x();
 		if (from >= left && from + best <= left + titleRect->width()) {
 			_title->resizeToWidth(best);
@@ -659,6 +662,23 @@ void GroupPanel::refreshTitle() {
 	} else if (_title) {
 		_title.destroy();
 	}
+	if (!_subtitle) {
+		_subtitle.create(
+			widget(),
+			tr::lng_group_call_members(
+				lt_count_decimal,
+				_members->fullCountValue() | tr::to_count()),
+			st::groupCallSubtitleLabel);
+		_subtitle->show();
+		_subtitle->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
+	const auto middle = _title
+		? (_title->x() + _title->width() / 2)
+		: (widget()->width() / 2);
+	const auto top = _title
+		? st::groupCallSubtitleTop
+		: st::groupCallTitleTop;
+	_subtitle->moveToLeft(middle - (_subtitle->width() / 2), top);
 }
 
 void GroupPanel::paint(QRect clip) {
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
index a244b4bbc..521d3cb41 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -221,7 +221,7 @@ void GroupCallBar::paint(Painter &p) {
 	p.setPen(st::defaultMessageBar.textFg);
 	p.setFont(st::defaultMessageBar.title.font);
 	p.drawTextLeft(left, titleTop, width, tr::lng_group_call_title(tr::now));
-	p.setPen(st::historyComposeAreaFgService);
+	p.setPen(st::historyStatusFg);
 	p.setFont(st::defaultMessageBar.text.font);
 	p.drawTextLeft(
 		left,
diff --git a/Telegram/ThirdParty/libtgvoip b/Telegram/ThirdParty/libtgvoip
index 931f6a49c..37d98e984 160000
--- a/Telegram/ThirdParty/libtgvoip
+++ b/Telegram/ThirdParty/libtgvoip
@@ -1 +1 @@
-Subproject commit 931f6a49c531995d4daf64f8357042a1eeeef43f
+Subproject commit 37d98e984fd6fa389262307db826d52ab86c8241
diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index a21d24aeb..178983f72 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit a21d24aeb755f2c975eced1dcb101b6520614e15
+Subproject commit 178983f72312ca8bd422bc73810fd63f1a89bd9d

From 7aa12b6e07c66684aec43c4b7be999276ac4cabb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Dec 2020 15:59:41 +0400
Subject: [PATCH 330/370] Improve macOS voice chat window title.

---
 Telegram/SourceFiles/calls/calls_group_panel.cpp | 10 +++++-----
 Telegram/lib_ui                                  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 34803e7cd..3a148d70d 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -220,8 +220,6 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
 	_settings->setColorOverrides(_mute->colorOverrides());
 
-	_window->setTitleStyle(st::groupCallTitle);
-
 	SubscribeToMigration(
 		_peer,
 		_window->lifetime(),
@@ -276,7 +274,7 @@ void GroupPanel::initWindow() {
 	_window->setAttribute(Qt::WA_NoSystemBackground);
 	_window->setWindowIcon(
 		QIcon(QPixmap::fromImage(Image::Empty()->original(), Qt::ColorOnly)));
-	_window->setTitleStyle(st::callTitle);
+	_window->setTitleStyle(st::groupCallTitle);
 
 	subscribeToPeerChanges();
 
@@ -589,7 +587,7 @@ std::optional<QRect> GroupPanel::computeTitleRect() const {
 #ifdef Q_OS_WIN
 	const auto controls = _controls->geometry();
 	return QRect(0, 0, controls.x(), controls.height());
-#elif Q_OS_MAC // Q_OS_WIN
+#elif defined Q_OS_MAC // Q_OS_WIN
 	return QRect(70, 0, widget()->width() - 70, 28);
 #else // Q_OS_WIN || Q_OS_MAC
 	return std::nullopt;
@@ -678,7 +676,9 @@ void GroupPanel::refreshTitle() {
 	const auto top = _title
 		? st::groupCallSubtitleTop
 		: st::groupCallTitleTop;
-	_subtitle->moveToLeft(middle - (_subtitle->width() / 2), top);
+	_subtitle->moveToLeft(
+		(widget()->width() - _subtitle->width()) / 2,
+		top);
 }
 
 void GroupPanel::paint(QRect clip) {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 3bd98ac56..5e3897fcf 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 3bd98ac5640523d2ccd241c2c0af49aba9494066
+Subproject commit 5e3897fcff29c65c72fdf8f7f282aee0f6bed644

From cae7e9c502de88bd48f3b23467b2d1884aa6d97d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Dec 2020 16:06:36 +0400
Subject: [PATCH 331/370] Fix Open With menu position in macOS.

---
 Telegram/SourceFiles/platform/mac/file_utilities_mac.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
index 3d678abe4..3f94ee818 100644
--- a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
@@ -403,7 +403,7 @@ bool UnsafeShowOpenWithDropdown(const QString &filepath, QPoint menuPosition) {
 		if (!screen) {
 			return false;
 		}
-		const auto r = screen->availableGeometry();
+		const auto r = screen->geometry();
 		auto x = menuPosition.x();
 		auto y = r.y() + r.height() - menuPosition.y();
 		return !![menu popupAtX:x andY:y];

From d799dfe564b78696fb7c0ec080af57c39e36a2a1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 16 Dec 2020 13:06:37 +0300
Subject: [PATCH 332/370] Updated colors for force muted state in
 Calls::TopBar.

---
 Telegram/SourceFiles/calls/calls_top_bar.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 5a3b78079..91cd44af9 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -78,18 +78,22 @@ auto LinearBlobs() {
 
 auto Colors() {
 	using Vector = std::vector<QColor>;
-	return base::flat_map<MuteState, Vector>{
+	using Colors = anim::gradient_colors;
+	return base::flat_map<MuteState, Colors>{
 		{
 			MuteState::ForceMuted,
-			Vector{ st::groupCallForceMuted1->c, st::groupCallForceMuted2->c }
+			Colors(QGradientStops{
+				{ 0.0, st::groupCallForceMutedBar1->c },
+				{ .35, st::groupCallForceMutedBar2->c },
+				{ 1.0, st::groupCallForceMutedBar3->c } })
 		},
 		{
 			MuteState::Active,
-			Vector{ st::groupCallLive1->c, st::groupCallLive2->c }
+			Colors(Vector{ st::groupCallLive1->c, st::groupCallLive2->c })
 		},
 		{
 			MuteState::Muted,
-			Vector{ st::groupCallMuted1->c, st::groupCallMuted2->c }
+			Colors(Vector{ st::groupCallMuted1->c, st::groupCallMuted2->c })
 		},
 	};
 }

From f0b8d4e62b1c884faea543077622cfd9266a5efd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Dec 2020 17:25:09 +0400
Subject: [PATCH 333/370] Add sub-label-s to CallMuteButton.

---
 Telegram/Resources/langs/lang.strings              | 4 +++-
 Telegram/SourceFiles/calls/calls.style             | 4 ++--
 Telegram/SourceFiles/calls/calls_group_members.cpp | 4 +++-
 Telegram/SourceFiles/calls/calls_group_panel.cpp   | 7 +++++++
 Telegram/lib_ui                                    | 2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index d0dd31de9..667c07dac 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1820,8 +1820,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_inactive" = "listening";
 "lng_group_call_settings" = "Settings";
 "lng_group_call_unmute" = "Unmute";
+"lng_group_call_unmute_sub" = "or hold spacebar to talk";
 "lng_group_call_you_are_live" = "You are Live";
-"lng_group_call_force_muted" = "You are in Listen Only mode";
+"lng_group_call_force_muted" = "Muted by admin";
+"lng_group_call_force_muted_sub" = "You are in Listen Only mode";
 "lng_group_call_connecting" = "Connecting...";
 "lng_group_call_leave" = "Leave";
 "lng_group_call_leave_title" = "Leave voice chat";
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 4dc45ad5b..0fb1facc7 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -596,8 +596,8 @@ groupCallHangup: CallButton(callHangup) {
 	label: callButtonLabel;
 }
 groupCallButtonSkip: 43px;
-groupCallButtonBottomSkip: 134px;
-groupCallMuteBottomSkip: 149px;
+groupCallButtonBottomSkip: 145px;
+groupCallMuteBottomSkip: 160px;
 
 groupCallTopBarUserpicSize: 28px;
 groupCallTopBarUserpicShift: 8px;
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index 1e6f54e04..e343454de 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -1116,7 +1116,9 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
 	};
 	const auto showHistory = [=] {
 		performOnMainWindow([=](not_null<Window::SessionController*> window) {
-			window->showPeerHistory(user);
+			window->showPeerHistory(
+				user,
+				Window::SectionShow::Way::Forward);
 		});
 	};
 	const auto removeFromGroup = crl::guard(this, [=] {
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 3a148d70d..3823f0c2d 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -435,6 +435,13 @@ void GroupPanel::initWithCall(GroupCall *call) {
 				: mute == MuteState::Muted
 				? tr::lng_group_call_unmute(tr::now)
 				: tr::lng_group_call_you_are_live(tr::now)),
+			.subtext = (connecting
+				? QString()
+				: mute == MuteState::ForceMuted
+				? tr::lng_group_call_force_muted_sub(tr::now)
+				: mute == MuteState::Muted
+				? tr::lng_group_call_unmute_sub(tr::now)
+				: QString()),
 			.type = (connecting
 				? Ui::CallMuteButtonType::Connecting
 				: mute == MuteState::ForceMuted
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 5e3897fcf..407079e5b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 5e3897fcff29c65c72fdf8f7f282aee0f6bed644
+Subproject commit 407079e5b1cffdad2a08b0e00eafb78a175680c0

From a0b0799399565ecafa7e6d45c545d016d5e85fe8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 16 Dec 2020 11:05:06 +0400
Subject: [PATCH 334/370] Fully disable session manager interaction

Since session manager functionality is not used anyway
---
 Telegram/SourceFiles/core/launcher.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index aa50e19a2..f16787d00 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -311,6 +311,9 @@ void Launcher::init() {
 	// and https://github.com/telegramdesktop/tdesktop/issues/7549
 	// and https://github.com/telegramdesktop/tdesktop/issues/948
 	// more info: https://doc.qt.io/qt-5/qguiapplication.html#isFallbackSessionManagementEnabled
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+	QApplication::setAttribute(Qt::AA_DisableSessionManager, true);
+#endif // Qt >= 5.14
 	QApplication::setFallbackSessionManagementEnabled(false);
 
 	initHook();

From 50ed60f443e155fa5dd974750a2a0aa178542ff4 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 18 Dec 2020 03:40:43 +0300
Subject: [PATCH 335/370] Fixed ability to reply with voice message.

---
 .../SourceFiles/history/history_widget.cpp    | 24 ++++++++++++-------
 .../history_view_voice_record_bar.cpp         |  5 ++++
 .../controls/history_view_voice_record_bar.h  |  2 ++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 912389af6..4e141e7b5 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -773,6 +773,12 @@ void HistoryWidget::initVoiceRecordBar() {
 		return false;
 	});
 
+	const auto applyLocalDraft = [=] {
+		if (_history && _history->localDraft()) {
+			applyDraft();
+		}
+	};
+
 	_voiceRecordBar->sendActionUpdates(
 	) | rpl::start_with_next([=](const auto &data) {
 		if (!_history) {
@@ -799,8 +805,12 @@ void HistoryWidget::initVoiceRecordBar() {
 			data.duration,
 			action);
 		_voiceRecordBar->clearListenState();
+		applyLocalDraft();
 	}, lifetime());
 
+	_voiceRecordBar->cancelRequests(
+	) | rpl::start_with_next(applyLocalDraft, lifetime());
+
 	_voiceRecordBar->lockShowStarts(
 	) | rpl::start_with_next([=] {
 		updateHistoryDownVisibility();
@@ -817,13 +827,6 @@ void HistoryWidget::initVoiceRecordBar() {
 		_scroll->viewportEvent(e);
 	}, lifetime());
 
-	_voiceRecordBar->shownValue(
-	) | rpl::start_with_next([=](bool shown) {
-		if (!shown) {
-			applyDraft();
-		}
-	}, lifetime());
-
 	_voiceRecordBar->hideFast();
 }
 
@@ -1620,13 +1623,16 @@ void HistoryWidget::fastShowAtEnd(not_null<History*> history) {
 void HistoryWidget::applyDraft(FieldHistoryAction fieldHistoryAction) {
 	InvokeQueued(this, [=] { updateStickersByEmoji(); });
 
+	if (_voiceRecordBar->isActive()) {
+		return;
+	}
+
 	auto draft = !_history
 		? nullptr
 		: _history->localEditDraft()
 		? _history->localEditDraft()
 		: _history->localDraft();
-	auto fieldAvailable = canWriteMessage()
-		&& !_voiceRecordBar->isActive();
+	auto fieldAvailable = canWriteMessage();
 	if (!draft || (!_history->localEditDraft() && !fieldAvailable)) {
 		auto fieldWillBeHiddenAfterEdit = (!fieldAvailable && _editMsgId != 0);
 		clearFieldText(0, fieldHistoryAction);
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index f6505a1d5..92f603fbf 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1307,6 +1307,7 @@ void VoiceRecordBar::hideFast() {
 void VoiceRecordBar::stopRecording(StopType type) {
 	using namespace ::Media::Capture;
 	if (type == StopType::Cancel) {
+		_cancelRequests.fire({});
 		instance()->stop();
 		return;
 	}
@@ -1404,6 +1405,10 @@ rpl::producer<VoiceToSend> VoiceRecordBar::sendVoiceRequests() const {
 	return _sendVoiceRequests.events();
 }
 
+rpl::producer<> VoiceRecordBar::cancelRequests() const {
+	return _cancelRequests.events();
+}
+
 bool VoiceRecordBar::isRecording() const {
 	return _recording.current();
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index c7653ebc4..398bedb56 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -61,6 +61,7 @@ public:
 
 	[[nodiscard]] rpl::producer<SendActionUpdate> sendActionUpdates() const;
 	[[nodiscard]] rpl::producer<VoiceToSend> sendVoiceRequests() const;
+	[[nodiscard]] rpl::producer<> cancelRequests() const;
 	[[nodiscard]] rpl::producer<bool> recordingStateChanges() const;
 	[[nodiscard]] rpl::producer<bool> lockShowStarts() const;
 	[[nodiscard]] rpl::producer<not_null<QEvent*>> lockViewportEvents() const;
@@ -128,6 +129,7 @@ private:
 
 	rpl::event_stream<SendActionUpdate> _sendActionUpdates;
 	rpl::event_stream<VoiceToSend> _sendVoiceRequests;
+	rpl::event_stream<> _cancelRequests;
 	rpl::event_stream<> _listenChanges;
 
 	int _centerY = 0;

From f8039f9b9932f3734f00d330e2d4b1d14ce491c8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 18 Dec 2020 06:00:07 +0300
Subject: [PATCH 336/370] Added cancel button to VoiceRecordBar.

---
 Telegram/Resources/langs/lang.strings         |   1 -
 .../history_view_voice_record_bar.cpp         | 184 +++++++++++++-----
 .../controls/history_view_voice_record_bar.h  |   3 +
 Telegram/SourceFiles/ui/chat/chat.style       |   3 +
 4 files changed, 142 insertions(+), 49 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 667c07dac..4ced0747c 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1343,7 +1343,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_broadcast_silent_ph" = "Silent broadcast...";
 "lng_send_anonymous_ph" = "Send anonymously...";
 "lng_record_cancel" = "Release outside this field to cancel";
-"lng_record_lock_cancel" = "Click outside of the circle to cancel";
 "lng_record_lock_cancel_sure" = "Are you sure you want to stop recording and discard your voice message?";
 "lng_record_listen_cancel_sure" = "Are you sure you want to discard your recorded voice message?";
 "lng_record_lock_discard" = "Discard";
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 92f603fbf..3fff14c43 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -611,11 +611,14 @@ public:
 	RecordLock(not_null<Ui::RpWidget*> parent);
 
 	void requestPaintProgress(float64 progress);
+	void requestPaintLockToStopProgress(float64 progress);
 
 	[[nodiscard]] rpl::producer<> locks() const;
 	[[nodiscard]] bool isLocked() const;
 	[[nodiscard]] bool isStopState() const;
 
+	[[nodiscard]] float64 lockToStopProgress() const;
+
 protected:
 	QImage prepareRippleMask() const override;
 	QPoint prepareRippleStartPosition() const override;
@@ -630,9 +633,9 @@ private:
 	const QRect _rippleRect;
 	const QPen _arcPen;
 
-	Ui::Animations::Simple _lockAnimation;
 	Ui::Animations::Simple _lockEnderAnimation;
 
+	float64 _lockToStopProgress = 0.;
 	rpl::variable<float64> _progress = 0.;
 };
 
@@ -662,8 +665,8 @@ void RecordLock::init() {
 		if (!shown) {
 			setCursor(style::cur_default);
 			setAttribute(Qt::WA_TransparentForMouseEvents, true);
-			_lockAnimation.stop();
 			_lockEnderAnimation.stop();
+			_lockToStopProgress = 0.;
 			_progress = 0.;
 		}
 	}, lifetime());
@@ -675,32 +678,13 @@ void RecordLock::init() {
 			const auto top = anim::interpolate(
 				0,
 				height() - st::historyRecordLockTopShadow.height() * 2,
-				_lockAnimation.value(1.));
+				_lockToStopProgress);
 			p.translate(0, top);
 			drawProgress(p);
 			return;
 		}
 		drawProgress(p);
 	}, lifetime());
-
-	locks(
-	) | rpl::start_with_next([=] {
-		const auto &duration = st::historyRecordVoiceShowDuration;
-		const auto from = 0.;
-		const auto to = 1.;
-		auto callback = [=](float64 value) {
-			update();
-			if (value == to) {
-				setCursor(style::cur_pointer);
-				setAttribute(Qt::WA_TransparentForMouseEvents, false);
-
-				resize(
-					st::historyRecordLockTopShadow.width(),
-					st::historyRecordLockTopShadow.width());
-			}
-		};
-		_lockAnimation.start(std::move(callback), from, to, duration);
-	}, lifetime());
 }
 
 void RecordLock::drawProgress(Painter &p) {
@@ -773,8 +757,6 @@ void RecordLock::drawProgress(Painter &p) {
 	}
 	{
 		PainterHighQualityEnabler hq(p);
-		const auto lockToStopProgress =
-			_lockAnimation.value(isLocked() ? 1. : 0);
 		const auto &arcOffset = st::historyRecordLockIconLineSkip;
 		const auto &size = st::historyRecordLockIconSize;
 
@@ -786,15 +768,15 @@ void RecordLock::drawProgress(Painter &p) {
 		const auto blockRectWidth = anim::interpolateF(
 			size.width(),
 			st::historyRecordStopIconWidth,
-			lockToStopProgress);
+			_lockToStopProgress);
 		const auto blockRectHeight = anim::interpolateF(
 			blockHeight,
 			st::historyRecordStopIconWidth,
-			lockToStopProgress);
+			_lockToStopProgress);
 		const auto blockRectTop = anim::interpolateF(
 			size.height() - blockHeight,
 			std::round((size.height() - blockRectHeight) / 2.),
-			lockToStopProgress);
+			_lockToStopProgress);
 
 		const auto blockRect = QRectF(
 			(size.width() - blockRectWidth) / 2,
@@ -809,11 +791,11 @@ void RecordLock::drawProgress(Painter &p) {
 			inner.x() + (inner.width() - size.width()) / 2,
 			inner.y() + (originTop.height() * 2 - size.height()) / 2);
 		{
-			const auto xRadius = anim::interpolate(2, 3, lockToStopProgress);
+			const auto xRadius = anim::interpolate(2, 3, _lockToStopProgress);
 			p.drawRoundedRect(blockRect, xRadius, 3);
 		}
 
-		const auto offsetTranslate = lockToStopProgress *
+		const auto offsetTranslate = _lockToStopProgress *
 			(lineHeight + arcHeight + _arcPen.width() * 2);
 		p.translate(
 			size.width() - arcOffset,
@@ -835,7 +817,7 @@ void RecordLock::drawProgress(Painter &p) {
 			0,
 			180 * 16);
 
-		const auto lockProgress = 1. - _lockAnimation.value(1.);
+		const auto lockProgress = 1. - _lockToStopProgress;
 		if (progress == 1. && lockProgress < 1.) {
 			p.drawLine(
 				-arcWidth,
@@ -866,6 +848,23 @@ void RecordLock::requestPaintProgress(float64 progress) {
 	setProgress(progress);
 }
 
+void RecordLock::requestPaintLockToStopProgress(float64 progress) {
+	_lockToStopProgress = progress;
+	if (isStopState()) {
+		setCursor(style::cur_pointer);
+		setAttribute(Qt::WA_TransparentForMouseEvents, false);
+
+		resize(
+			st::historyRecordLockTopShadow.width(),
+			st::historyRecordLockTopShadow.width());
+	}
+	update();
+}
+
+float64 RecordLock::lockToStopProgress() const {
+	return _lockToStopProgress;
+}
+
 void RecordLock::setProgress(float64 progress) {
 	_progress = progress;
 	update();
@@ -876,7 +875,7 @@ bool RecordLock::isLocked() const {
 }
 
 bool RecordLock::isStopState() const {
-	return isLocked() && (_lockAnimation.value(1.) == 1.);
+	return isLocked() && (_lockToStopProgress == 1.);
 }
 
 rpl::producer<> RecordLock::locks() const {
@@ -892,6 +891,77 @@ QPoint RecordLock::prepareRippleStartPosition() const {
 	return mapFromGlobal(QCursor::pos()) - _rippleRect.topLeft();
 }
 
+class CancelButton final : public Ui::RippleButton {
+public:
+	CancelButton(not_null<Ui::RpWidget*> parent, int height);
+
+	void requestPaintProgress(float64 progress);
+
+protected:
+	QImage prepareRippleMask() const override;
+	QPoint prepareRippleStartPosition() const override;
+
+private:
+	void init();
+
+	const int _width;
+	const QRect _rippleRect;
+
+	rpl::variable<float64> _showProgress = 0.;
+
+	Ui::Text::String _text;
+
+};
+
+CancelButton::CancelButton(not_null<Ui::RpWidget*> parent, int height)
+: Ui::RippleButton(parent, st::defaultLightButton.ripple)
+, _width(st::historyRecordCancelButtonWidth)
+, _rippleRect(QRect(0, (height - _width) / 2, _width, _width))
+, _text(st::semiboldTextStyle, tr::lng_selected_clear(tr::now).toUpper()) {
+	resize(_width, height);
+	init();
+}
+
+void CancelButton::init() {
+	_showProgress.value(
+	) | rpl::start_with_next([=](float64 progress) {
+		const auto hasProgress = (progress > 0.);
+		if (isHidden() == !hasProgress) {
+			setVisible(hasProgress);
+		}
+		update();
+	}, lifetime());
+
+	paintRequest(
+	) | rpl::start_with_next([=] {
+		Painter p(this);
+
+		p.setOpacity(_showProgress.current());
+
+		paintRipple(p, _rippleRect.x(), _rippleRect.y());
+
+		p.setPen(st::historyRecordCancelButtonFg);
+		_text.draw(
+			p,
+			0,
+			(height() - _text.minHeight()) / 2,
+			width(),
+			style::al_center);
+	}, lifetime());
+}
+
+QImage CancelButton::prepareRippleMask() const {
+	return Ui::RippleAnimation::ellipseMask(_rippleRect.size());
+}
+
+QPoint CancelButton::prepareRippleStartPosition() const {
+	return mapFromGlobal(QCursor::pos()) - _rippleRect.topLeft();
+}
+
+void CancelButton::requestPaintProgress(float64 progress) {
+	_showProgress = progress;
+}
+
 VoiceRecordBar::VoiceRecordBar(
 	not_null<Ui::RpWidget*> parent,
 	not_null<Ui::RpWidget*> sectionWidget,
@@ -906,7 +976,12 @@ VoiceRecordBar::VoiceRecordBar(
 , _level(std::make_unique<VoiceRecordButton>(
 	sectionWidget,
 	_controller->widget()->leaveEvents()))
+, _cancel(std::make_unique<CancelButton>(this, recorderHeight))
 , _startTimer([=] { startRecording(); })
+, _message(
+	st::historyRecordTextStyle,
+	tr::lng_record_cancel(tr::now),
+	TextParseOptions{ TextParseMultiline, 0, 0, Qt::LayoutDirectionAuto })
 , _cancelFont(st::historyRecordFont) {
 	resize(QSize(parent->width(), recorderHeight));
 	init();
@@ -993,6 +1068,7 @@ void VoiceRecordBar::init() {
 				_cancelFont->width(FormatVoiceDuration(kMaxSamples)),
 				ascent);
 		}
+		_cancel->moveToLeft((size.width() - _cancel->width()) / 2, 0);
 		updateMessageGeometry();
 		updateLockGeometry();
 	}, lifetime());
@@ -1006,6 +1082,14 @@ void VoiceRecordBar::init() {
 		p.fillRect(clip, st::historyComposeAreaBg);
 
 		p.setOpacity(std::min(p.opacity(), 1. - showListenAnimationRatio()));
+		const auto opacity = p.opacity();
+		_cancel->requestPaintProgress(_lock->isStopState()
+			? (opacity * _lock->lockToStopProgress())
+			: 0.);
+
+		if (!opacity) {
+			return;
+		}
 		if (clip.intersects(_messageRect)) {
 			// The message should be painted first to avoid flickering.
 			drawMessage(p, activeAnimationRatio());
@@ -1056,7 +1140,8 @@ void VoiceRecordBar::init() {
 			const auto &duration = st::historyRecordVoiceShowDuration;
 			auto callback = [=](float64 value) {
 				_listen->requestPaintProgress(value);
-				_level->requestPaintProgress(to - value);
+				const auto reverseValue = to - value;
+				_level->requestPaintProgress(reverseValue);
 				update();
 				if (to == value) {
 					_recordingLifetime.destroy();
@@ -1084,23 +1169,15 @@ void VoiceRecordBar::init() {
 		) | rpl::start_with_next([=](bool enter) {
 			_inField = enter;
 		}, _recordingLifetime);
-	}, lifetime());
 
-	rpl::merge(
-		_lock->locks(),
-		shownValue() | rpl::to_empty
-	) | rpl::start_with_next([=] {
-		const auto direction = Qt::LayoutDirectionAuto;
-		_message.setText(
-			st::historyRecordTextStyle,
-			_lock->isLocked()
-				? tr::lng_record_lock_cancel(tr::now)
-				: tr::lng_record_cancel(tr::now),
-			TextParseOptions{ TextParseMultiline, 0, 0, direction });
-
-		updateMessageGeometry();
-		// Update a whole widget to clear a previous text.
-		update();
+		const auto &duration = st::historyRecordVoiceShowDuration;
+		const auto from = 0.;
+		const auto to = 1.;
+		auto callback = [=](float64 value) {
+			_lock->requestPaintLockToStopProgress(value);
+			update();
+		};
+		_lockToStopAnimation.start(std::move(callback), from, to, duration);
 	}, lifetime());
 
 	_send->events(
@@ -1135,6 +1212,10 @@ void VoiceRecordBar::init() {
 
 		installListenStateFilter();
 	}, lifetime());
+
+	_cancel->setClickedCallback([=] {
+		hideAnimated();
+	});
 }
 
 void VoiceRecordBar::activeAnimate(bool active) {
@@ -1290,6 +1371,7 @@ void VoiceRecordBar::finish() {
 	_recordingSamples = 0;
 
 	_showAnimation.stop();
+	_lockToStopAnimation.stop();
 
 	_listen = nullptr;
 
@@ -1378,12 +1460,17 @@ void VoiceRecordBar::drawMessage(Painter &p, float64 recordActive) {
 			st::historyRecordCancelActive,
 			1. - recordActive));
 
+	const auto opacity = p.opacity();
+	p.setOpacity(opacity * (1. - _lock->lockToStopProgress()));
+
 	_message.draw(
 		p,
 		_messageRect.x(),
 		_messageRect.y(),
 		_messageRect.width(),
 		style::al_center);
+
+	p.setOpacity(opacity);
 }
 
 void VoiceRecordBar::requestToSendWithOptions(Api::SendOptions options) {
@@ -1421,6 +1508,7 @@ void VoiceRecordBar::hideAnimated() {
 	if (isHidden()) {
 		return;
 	}
+	_lockShowing = false;
 	visibilityAnimate(false, [=] { hideFast(); });
 }
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 398bedb56..ff8e8cdbc 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -28,6 +28,7 @@ namespace HistoryView::Controls {
 class VoiceRecordButton;
 class ListenWrap;
 class RecordLock;
+class CancelButton;
 
 class VoiceRecordBar final : public Ui::RpWidget {
 public:
@@ -123,6 +124,7 @@ private:
 	const std::shared_ptr<Ui::SendButton> _send;
 	const std::unique_ptr<RecordLock> _lock;
 	const std::unique_ptr<VoiceRecordButton> _level;
+	const std::unique_ptr<CancelButton> _cancel;
 	std::unique_ptr<ListenWrap> _listen;
 
 	base::Timer _startTimer;
@@ -152,6 +154,7 @@ private:
 	rpl::lifetime _recordingLifetime;
 
 	Ui::Animations::Simple _showLockAnimation;
+	Ui::Animations::Simple _lockToStopAnimation;
 	Ui::Animations::Simple _showListenAnimation;
 	Ui::Animations::Simple _activeAnimation;
 	Ui::Animations::Simple _showAnimation;
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index a2b4a256d..320149008 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -395,6 +395,9 @@ historyRecordWaveformBar: 3px;
 
 historyRecordLockPosition: point(1px, 35px);
 
+historyRecordCancelButtonWidth: 100px;
+historyRecordCancelButtonFg: lightButtonFg;
+
 historySilentToggle: IconButton(historyBotKeyboardShow) {
 	icon: icon {{ "send_control_silent_off", historyComposeIconFg }};
 	iconOver: icon {{ "send_control_silent_off", historyComposeIconFgOver }};

From d301601360e5fbe40df82156e92c16079ce9733b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Dec 2020 12:43:51 +0400
Subject: [PATCH 337/370] Fix mouse/keyboard input on Windows.

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

diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
index f16787d00..aa50e19a2 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -311,9 +311,6 @@ void Launcher::init() {
 	// and https://github.com/telegramdesktop/tdesktop/issues/7549
 	// and https://github.com/telegramdesktop/tdesktop/issues/948
 	// more info: https://doc.qt.io/qt-5/qguiapplication.html#isFallbackSessionManagementEnabled
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-	QApplication::setAttribute(Qt::AA_DisableSessionManager, true);
-#endif // Qt >= 5.14
 	QApplication::setFallbackSessionManagementEnabled(false);
 
 	initHook();
diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
index 0a21a1841..f35c13be2 100644
--- a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
@@ -50,6 +50,10 @@ Launcher::Launcher(int argc, char *argv[])
 }
 
 void Launcher::initHook() {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+	QApplication::setAttribute(Qt::AA_DisableSessionManager, true);
+#endif // Qt >= 5.14
+
 	QApplication::setDesktopFileName(GetLauncherFilename());
 }
 

From c5ad7c7c892ebb9372da3eb3855d705373e519cb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Dec 2020 12:44:19 +0400
Subject: [PATCH 338/370] Add start/end/reconnecting sounds to voice chats.

---
 Telegram/Resources/qrc/telegram/sounds.qrc    |   3 +
 .../Resources/sounds/group_call_connect.mp3   | Bin 0 -> 43200 bytes
 Telegram/Resources/sounds/group_call_end.mp3  | Bin 0 -> 9600 bytes
 .../Resources/sounds/group_call_start.mp3     | Bin 0 -> 18240 bytes
 Telegram/SourceFiles/calls/calls_call.cpp     |   8 +--
 Telegram/SourceFiles/calls/calls_call.h       |   5 +-
 .../SourceFiles/calls/calls_group_call.cpp    |  38 ++++++++--
 Telegram/SourceFiles/calls/calls_group_call.h |  14 +++-
 Telegram/SourceFiles/calls/calls_instance.cpp |  66 ++++++++++--------
 Telegram/SourceFiles/calls/calls_instance.h   |  19 +++--
 Telegram/lib_ui                               |   2 +-
 11 files changed, 109 insertions(+), 46 deletions(-)
 create mode 100644 Telegram/Resources/sounds/group_call_connect.mp3
 create mode 100644 Telegram/Resources/sounds/group_call_end.mp3
 create mode 100644 Telegram/Resources/sounds/group_call_start.mp3

diff --git a/Telegram/Resources/qrc/telegram/sounds.qrc b/Telegram/Resources/qrc/telegram/sounds.qrc
index 6135e0050..69d1427e5 100644
--- a/Telegram/Resources/qrc/telegram/sounds.qrc
+++ b/Telegram/Resources/qrc/telegram/sounds.qrc
@@ -6,5 +6,8 @@
     <file alias="call_end.mp3">../../sounds/call_end.mp3</file>
     <file alias="call_incoming.mp3">../../sounds/call_incoming.mp3</file>
     <file alias="call_outgoing.mp3">../../sounds/call_outgoing.mp3</file>
+    <file alias="group_call_start.mp3">../../sounds/group_call_start.mp3</file>
+    <file alias="group_call_connect.mp3">../../sounds/group_call_connect.mp3</file>
+    <file alias="group_call_end.mp3">../../sounds/group_call_end.mp3</file>
   </qresource>
 </RCC>
diff --git a/Telegram/Resources/sounds/group_call_connect.mp3 b/Telegram/Resources/sounds/group_call_connect.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..4e0f60b4f1ea81e3f6549ec95f909fd5543f317c
GIT binary patch
literal 43200
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

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/sounds/group_call_end.mp3 b/Telegram/Resources/sounds/group_call_end.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..c03390958786c2c626c8b339a6bea2648f8567fe
GIT binary patch
literal 9600
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
aIKV{zta|zHw*ISM{CAcA-uM5y0{;Pqu$m<R

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/sounds/group_call_start.mp3 b/Telegram/Resources/sounds/group_call_start.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..527959c9da07445b3b328b093a044879d5c0753d
GIT binary patch
literal 18240
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
M=!lb1FcLxl06`k<y#N3J

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp
index 669d9153c..e78dbd8e9 100644
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -951,20 +951,20 @@ void Call::setState(State state) {
 			_startTime = crl::now();
 			break;
 		case State::ExchangingKeys:
-			_delegate->playSound(Delegate::Sound::Connecting);
+			_delegate->callPlaySound(Delegate::CallSound::Connecting);
 			break;
 		case State::Ended:
-			_delegate->playSound(Delegate::Sound::Ended);
+			_delegate->callPlaySound(Delegate::CallSound::Ended);
 			[[fallthrough]];
 		case State::EndedByOtherDevice:
 			_delegate->callFinished(this);
 			break;
 		case State::Failed:
-			_delegate->playSound(Delegate::Sound::Ended);
+			_delegate->callPlaySound(Delegate::CallSound::Ended);
 			_delegate->callFailed(this);
 			break;
 		case State::Busy:
-			_delegate->playSound(Delegate::Sound::Busy);
+			_delegate->callPlaySound(Delegate::CallSound::Busy);
 			break;
 		}
 	}
diff --git a/Telegram/SourceFiles/calls/calls_call.h b/Telegram/SourceFiles/calls/calls_call.h
index 531397c1d..e4dcf2d65 100644
--- a/Telegram/SourceFiles/calls/calls_call.h
+++ b/Telegram/SourceFiles/calls/calls_call.h
@@ -62,15 +62,16 @@ public:
 		virtual void callFailed(not_null<Call*> call) = 0;
 		virtual void callRedial(not_null<Call*> call) = 0;
 
-		enum class Sound {
+		enum class CallSound {
 			Connecting,
 			Busy,
 			Ended,
 		};
-		virtual void playSound(Sound sound) = 0;
+		virtual void callPlaySound(CallSound sound) = 0;
 		virtual void callRequestPermissionsOrFail(
 			Fn<void()> onSuccess,
 			bool video) = 0;
+
 		virtual auto getVideoCapture()
 			-> std::shared_ptr<tgcalls::VideoCaptureInterface> = 0;
 
diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index 5ee162687..e705c4377 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -42,6 +42,7 @@ constexpr auto kMaxInvitePerSlice = 10;
 constexpr auto kCheckLastSpokeInterval = crl::time(1000);
 constexpr auto kCheckJoinedTimeout = 4 * crl::time(1000);
 constexpr auto kUpdateSendActionEach = crl::time(500);
+constexpr auto kPlayConnectingEach = crl::time(1056) + 2 * crl::time(1000);
 
 } // namespace
 
@@ -55,7 +56,8 @@ GroupCall::GroupCall(
 , _api(&peer->session().mtp())
 , _lastSpokeCheckTimer([=] { checkLastSpoke(); })
 , _checkJoinedTimer([=] { checkJoined(); })
-, _pushToTalkCancelTimer([=] { pushToTalkCancel(); }) {
+, _pushToTalkCancelTimer([=] { pushToTalkCancel(); })
+, _connectingSoundTimer([=] { playConnectingSoundOnce(); }) {
 	_muted.value(
 	) | rpl::combine_previous(
 	) | rpl::start_with_next([=](MuteState previous, MuteState state) {
@@ -109,14 +111,22 @@ void GroupCall::setState(State state) {
 	}
 	_state = state;
 
-	if (_state.current() == State::Joined) {
-		if (!_pushToTalkStarted) {
-			_pushToTalkStarted = true;
+	if (state == State::Joined) {
+		stopConnectingSound();
+		if (!_hadJoinedState) {
+			_hadJoinedState = true;
 			applyGlobalShortcutChanges();
+			_delegate->groupCallPlaySound(Delegate::GroupCallSound::Started);
 		}
 		if (const auto call = _peer->groupCall(); call && call->id() == _id) {
 			call->setInCall();
 		}
+	} else if (state == State::Connecting || state == State::Joining) {
+		if (_hadJoinedState) {
+			playConnectingSound();
+		}
+	} else {
+		stopConnectingSound();
 	}
 
 	if (false
@@ -127,6 +137,10 @@ void GroupCall::setState(State state) {
 		destroyController();
 	}
 	switch (state) {
+	case State::HangingUp:
+	case State::FailedHangingUp:
+		_delegate->groupCallPlaySound(Delegate::GroupCallSound::Ended);
+		break;
 	case State::Ended:
 		_delegate->groupCallFinished(this);
 		break;
@@ -141,6 +155,22 @@ void GroupCall::setState(State state) {
 	}
 }
 
+void GroupCall::playConnectingSound() {
+	if (_connectingSoundTimer.isActive()) {
+		return;
+	}
+	playConnectingSoundOnce();
+	_connectingSoundTimer.callEach(kPlayConnectingEach);
+}
+
+void GroupCall::stopConnectingSound() {
+	_connectingSoundTimer.cancel();
+}
+
+void GroupCall::playConnectingSoundOnce() {
+	_delegate->groupCallPlaySound(Delegate::GroupCallSound::Connecting);
+}
+
 void GroupCall::start() {
 	_createRequestId = _api.request(MTPphone_CreateGroupCall(
 		_peer->input,
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 0ad338c41..8af623cee 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -61,6 +61,13 @@ public:
 		virtual void groupCallFailed(not_null<GroupCall*> call) = 0;
 		virtual void groupCallRequestPermissionsOrFail(
 			Fn<void()> onSuccess) = 0;
+
+		enum class GroupCallSound {
+			Started,
+			Connecting,
+			Ended,
+		};
+		virtual void groupCallPlaySound(GroupCallSound sound) = 0;
 	};
 
 	using GlobalShortcutManager = base::GlobalShortcutManager;
@@ -162,6 +169,10 @@ private:
 	void checkGlobalShortcutAvailability();
 	void checkJoined();
 
+	void playConnectingSound();
+	void stopConnectingSound();
+	void playConnectingSoundOnce();
+
 	[[nodiscard]] MTPInputGroupCall inputCall() const;
 
 	const not_null<Delegate*> _delegate;
@@ -191,7 +202,8 @@ private:
 	std::shared_ptr<GlobalShortcutManager> _shortcutManager;
 	std::shared_ptr<GlobalShortcutValue> _pushToTalk;
 	base::Timer _pushToTalkCancelTimer;
-	bool _pushToTalkStarted = false;
+	base::Timer _connectingSoundTimer;
+	bool _hadJoinedState = false;
 
 	rpl::lifetime _lifetime;
 
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index 93ffbb202..7ce5ede23 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -98,35 +98,45 @@ void Instance::groupCallFailed(not_null<GroupCall*> call) {
 	});
 }
 
-void Instance::playSound(Sound sound) {
-	switch (sound) {
-	case Sound::Busy: {
-		if (!_callBusyTrack) {
-			_callBusyTrack = Media::Audio::Current().createTrack();
-			_callBusyTrack->fillFromFile(
-				Core::App().settings().getSoundPath(qsl("call_busy")));
-		}
-		_callBusyTrack->playOnce();
-	} break;
-
-	case Sound::Ended: {
-		if (!_callEndedTrack) {
-			_callEndedTrack = Media::Audio::Current().createTrack();
-			_callEndedTrack->fillFromFile(
-				Core::App().settings().getSoundPath(qsl("call_end")));
-		}
-		_callEndedTrack->playOnce();
-	} break;
-
-	case Sound::Connecting: {
-		if (!_callConnectingTrack) {
-			_callConnectingTrack = Media::Audio::Current().createTrack();
-			_callConnectingTrack->fillFromFile(
-				Core::App().settings().getSoundPath(qsl("call_connect")));
-		}
-		_callConnectingTrack->playOnce();
-	} break;
+not_null<Media::Audio::Track*> Instance::ensureSoundLoaded(
+		const QString &key) {
+	const auto i = _tracks.find(key);
+	if (i != end(_tracks)) {
+		return i->second.get();
 	}
+	const auto result = _tracks.emplace(
+		key,
+		Media::Audio::Current().createTrack()).first->second.get();
+	result->fillFromFile(Core::App().settings().getSoundPath(key));
+	return result;
+}
+
+void Instance::playSoundOnce(const QString &key) {
+	ensureSoundLoaded(key)->playOnce();
+}
+
+void Instance::callPlaySound(CallSound sound) {
+	playSoundOnce([&] {
+		switch (sound) {
+		case CallSound::Busy: return "call_busy";
+		case CallSound::Ended: return "call_end";
+		case CallSound::Connecting: return "call_connect";
+		}
+		Unexpected("CallSound in Instance::callPlaySound.");
+		return "";
+	}());
+}
+
+void Instance::groupCallPlaySound(GroupCallSound sound) {
+	playSoundOnce([&] {
+		switch (sound) {
+		case GroupCallSound::Started: return "group_call_start";
+		case GroupCallSound::Ended: return "group_call_end";
+		case GroupCallSound::Connecting: return "group_call_connect";
+		}
+		Unexpected("GroupCallSound in Instance::groupCallPlaySound.");
+		return "";
+	}());
 }
 
 void Instance::destroyCall(not_null<Call*> call) {
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index 0e2820800..73844d24f 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -64,6 +64,9 @@ public:
 	[[nodiscard]] bool isQuitPrevent();
 
 private:
+	using CallSound = Call::Delegate::CallSound;
+	using GroupCallSound = GroupCall::Delegate::GroupCallSound;
+
 	[[nodiscard]] not_null<Call::Delegate*> getCallDelegate() {
 		return static_cast<Call::Delegate*>(this);
 	}
@@ -73,6 +76,10 @@ private:
 	[[nodiscard]] DhConfig getDhConfig() const override {
 		return _dhConfig;
 	}
+
+	not_null<Media::Audio::Track*> ensureSoundLoaded(const QString &key);
+	void playSoundOnce(const QString &key);
+
 	void callFinished(not_null<Call*> call) override;
 	void callFailed(not_null<Call*> call) override;
 	void callRedial(not_null<Call*> call) override;
@@ -81,15 +88,15 @@ private:
 			bool video) override {
 		requestPermissionsOrFail(std::move(onSuccess), video);
 	}
+	void callPlaySound(CallSound sound) override;
 
 	void groupCallFinished(not_null<GroupCall*> call) override;
 	void groupCallFailed(not_null<GroupCall*> call) override;
 	void groupCallRequestPermissionsOrFail(Fn<void()> onSuccess) override {
 		requestPermissionsOrFail(std::move(onSuccess), false);
 	}
+	void groupCallPlaySound(GroupCallSound sound) override;
 
-	using Sound = Call::Delegate::Sound;
-	void playSound(Sound sound) override;
 	void createCall(not_null<UserData*> user, Call::Type type, bool video);
 	void destroyCall(not_null<Call*> call);
 
@@ -98,7 +105,9 @@ private:
 		const MTPInputGroupCall &inputCall);
 	void destroyGroupCall(not_null<GroupCall*> call);
 
-	void requestPermissionOrFail(Platform::PermissionType type, Fn<void()> onSuccess);
+	void requestPermissionOrFail(
+		Platform::PermissionType type,
+		Fn<void()> onSuccess);
 
 	void refreshDhConfig();
 	void refreshServerConfig(not_null<Main::Session*> session);
@@ -132,9 +141,7 @@ private:
 	rpl::event_stream<GroupCall*> _currentGroupCallChanges;
 	std::unique_ptr<GroupPanel> _currentGroupCallPanel;
 
-	std::unique_ptr<Media::Audio::Track> _callConnectingTrack;
-	std::unique_ptr<Media::Audio::Track> _callEndedTrack;
-	std::unique_ptr<Media::Audio::Track> _callBusyTrack;
+	base::flat_map<QString, std::unique_ptr<Media::Audio::Track>> _tracks;
 
 };
 
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 407079e5b..abb615a7c 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 407079e5b1cffdad2a08b0e00eafb78a175680c0
+Subproject commit abb615a7c9cb3a3992f67637592b481ccc50f17a

From e73b522411637786b35aca6fdf3361cf8567b9f2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Dec 2020 18:43:49 +0400
Subject: [PATCH 339/370] Start using media device manager from lib_webrtc.

---
 .../SourceFiles/calls/calls_group_call.cpp    | 44 ++++++++++++++-----
 Telegram/SourceFiles/calls/calls_group_call.h |  8 ++++
 Telegram/lib_webrtc                           |  2 +-
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index e705c4377..cbeedcd57 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_group_call.h"
 #include "data/data_session.h"
 #include "base/global_shortcuts.h"
+#include "webrtc/webrtc_media_devices.h"
 
 #include <tgcalls/group/GroupInstanceImpl.h>
 
@@ -44,6 +45,14 @@ constexpr auto kCheckJoinedTimeout = 4 * crl::time(1000);
 constexpr auto kUpdateSendActionEach = crl::time(500);
 constexpr auto kPlayConnectingEach = crl::time(1056) + 2 * crl::time(1000);
 
+[[nodiscard]] std::unique_ptr<Webrtc::MediaDevices> CreateMediaDevices() {
+	const auto &settings = Core::App().settings();
+	return Webrtc::CreateMediaDevices(
+		settings.callInputDeviceId(),
+		settings.callOutputDeviceId(),
+		settings.callVideoInputDeviceId());
+}
+
 } // namespace
 
 GroupCall::GroupCall(
@@ -57,7 +66,8 @@ GroupCall::GroupCall(
 , _lastSpokeCheckTimer([=] { checkLastSpoke(); })
 , _checkJoinedTimer([=] { checkJoined(); })
 , _pushToTalkCancelTimer([=] { pushToTalkCancel(); })
-, _connectingSoundTimer([=] { playConnectingSoundOnce(); }) {
+, _connectingSoundTimer([=] { playConnectingSoundOnce(); })
+, _mediaDevices(CreateMediaDevices()) {
 	_muted.value(
 	) | rpl::combine_previous(
 	) | rpl::start_with_next([=](MuteState previous, MuteState state) {
@@ -83,6 +93,22 @@ GroupCall::GroupCall(
 	} else {
 		start();
 	}
+
+	_mediaDevices->audioInputId(
+	) | rpl::start_with_next([=](QString id) {
+		_audioInputId = id;
+		if (_instance) {
+			_instance->setAudioInputDevice(id.toStdString());
+		}
+	}, _lifetime);
+
+	_mediaDevices->audioOutputId(
+	) | rpl::start_with_next([=](QString id) {
+		_audioOutputId = id;
+		if (_instance) {
+			_instance->setAudioOutputDevice(id.toStdString());
+		}
+	}, _lifetime);
 }
 
 GroupCall::~GroupCall() {
@@ -553,8 +579,8 @@ void GroupCall::createAndStartController() {
 			}
 			crl::on_main(weak, [=] { audioLevelsUpdated(data); });
 		},
-		.initialInputDeviceId = settings.callInputDeviceId().toStdString(),
-		.initialOutputDeviceId = settings.callOutputDeviceId().toStdString(),
+		.initialInputDeviceId = _audioInputId.toStdString(),
+		.initialOutputDeviceId = _audioOutputId.toStdString(),
 	};
 	if (Logs::DebugEnabled()) {
 		auto callLogFolder = cWorkingDir() + qsl("DebugLogs");
@@ -574,6 +600,7 @@ void GroupCall::createAndStartController() {
 	LOG(("Call Info: Creating group instance"));
 	_instance = std::make_unique<tgcalls::GroupInstanceImpl>(
 		std::move(descriptor));
+
 	updateInstanceMuteState();
 
 	//raw->setAudioOutputDuckingEnabled(settings.callAudioDuckingEnabled());
@@ -740,13 +767,10 @@ void GroupCall::sendMutedUpdate() {
 }
 
 void GroupCall::setCurrentAudioDevice(bool input, const QString &deviceId) {
-	if (_instance) {
-		const auto id = deviceId.toStdString();
-		if (input) {
-			_instance->setAudioInputDevice(id);
-		} else {
-			_instance->setAudioOutputDevice(id);
-		}
+	if (input) {
+		_mediaDevices->switchToAudioInput(deviceId);
+	} else {
+		_mediaDevices->switchToAudioOutput(deviceId);
 	}
 }
 
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 8af623cee..78a7f41bb 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -25,6 +25,10 @@ class GlobalShortcutManager;
 class GlobalShortcutValue;
 } // namespace base
 
+namespace Webrtc {
+class MediaDevices;
+} // namespace Webrtc
+
 namespace Data {
 struct LastSpokeTimes;
 } // namespace Data
@@ -205,6 +209,10 @@ private:
 	base::Timer _connectingSoundTimer;
 	bool _hadJoinedState = false;
 
+	std::unique_ptr<Webrtc::MediaDevices> _mediaDevices;
+	QString _audioInputId;
+	QString _audioOutputId;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
index 0ed2a6cc0..beb63dd9a 160000
--- a/Telegram/lib_webrtc
+++ b/Telegram/lib_webrtc
@@ -1 +1 @@
-Subproject commit 0ed2a6cc048e30ee8bacf7212f3f12f4f7ae2b5a
+Subproject commit beb63dd9a68662cf96c4b3b165bad3907323ea89

From 4b41962ff6461d78f9d3e41eb67bcaf6641cfcbd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 14 Dec 2020 19:58:22 +0300
Subject: [PATCH 340/370] Added hiding of Blob animations in GroupCallBar.

---
 .../SourceFiles/history/history_widget.cpp    |  3 +-
 .../SourceFiles/ui/chat/group_call_bar.cpp    | 47 +++++++++++++++----
 Telegram/SourceFiles/ui/chat/group_call_bar.h |  6 ++-
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 4e141e7b5..19934e733 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5417,7 +5417,8 @@ void HistoryWidget::setupGroupCallTracker() {
 		channel);
 	_groupCallBar = std::make_unique<Ui::GroupCallBar>(
 		this,
-		_groupCallTracker->content());
+		_groupCallTracker->content(),
+		Core::App().appDeactivatedValue());
 
 	rpl::single(
 		rpl::empty_value()
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
index 521d3cb41..04723a0ae 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.cpp
@@ -89,7 +89,8 @@ struct GroupCallBar::Userpic {
 
 GroupCallBar::GroupCallBar(
 	not_null<QWidget*> parent,
-	rpl::producer<GroupCallBarContent> content)
+	rpl::producer<GroupCallBarContent> content,
+	rpl::producer<bool> &&hideBlobs)
 : _wrap(parent, object_ptr<RpWidget>(parent))
 , _inner(_wrap.entity())
 , _join(std::make_unique<RoundButton>(
@@ -147,11 +148,10 @@ GroupCallBar::GroupCallBar(
 	}, lifetime());
 
 	_speakingAnimation.init([=](crl::time now) {
-		//if (const auto &last = _speakingAnimationHideLastTime; (last > 0)
-		//	&& (now - last >= kBlobsEnterDuration)) {
-		//	_speakingAnimation.stop();
-		//	return false;
-		//}
+		if (const auto &last = _speakingAnimationHideLastTime; (last > 0)
+			&& (now - last >= kBlobsEnterDuration)) {
+			_speakingAnimation.stop();
+		}
 		for (auto &userpic : _userpics) {
 			if (const auto blobs = userpic.blobsAnimation.get()) {
 				blobs->blobs.updateLevel(now - blobs->lastTime);
@@ -161,6 +161,27 @@ GroupCallBar::GroupCallBar(
 		updateUserpics();
 	});
 
+	rpl::combine(
+		rpl::single(anim::Disabled()) | rpl::then(anim::Disables()),
+		std::move(hideBlobs)
+	) | rpl::start_with_next([=](bool animDisabled, bool deactivated) {
+		const auto hide = animDisabled || deactivated;
+
+		if (!(hide && _speakingAnimationHideLastTime)) {
+			_speakingAnimationHideLastTime = hide ? crl::now() : 0;
+		}
+		_skipLevelUpdate = hide;
+		for (auto &userpic : _userpics) {
+			if (const auto blobs = userpic.blobsAnimation.get()) {
+				blobs->blobs.setLevel(0.);
+			}
+		}
+		if (!hide && !_speakingAnimation.animating()) {
+			_speakingAnimation.start();
+		}
+		_skipLevelUpdate = hide;
+	}, lifetime());
+
 	setupInner();
 }
 
@@ -242,6 +263,7 @@ void GroupCallBar::paintUserpics(Painter &p) {
 	const auto middle = _inner->width()  / 2;
 	const auto size = st::historyGroupCallUserpicSize;
 	const auto factor = style::DevicePixelRatio();
+	const auto &minScale = kUserpicMinScale;
 	for (auto &userpic : ranges::view::reverse(_userpics)) {
 		const auto shown = userpic.shownAnimation.value(
 			userpic.hiding ? 0. : 1.);
@@ -253,10 +275,12 @@ void GroupCallBar::paintUserpics(Painter &p) {
 		const auto left = middle + userpic.leftAnimation.value(userpic.left);
 		const auto blobs = userpic.blobsAnimation.get();
 		const auto shownScale = 0.5 + shown / 2.;
-		const auto &minScale = kUserpicMinScale;
-		const auto scale = shownScale * (blobs
-			? (minScale + (1. - minScale) * blobs->blobs.currentLevel())
-			: 1.);
+		const auto scale = shownScale * (!blobs
+			? 1.
+			: (minScale
+				+ (1. - minScale) * (_speakingAnimationHideLastTime
+					? (1. - blobs->blobs.currentLevel())
+					: blobs->blobs.currentLevel())));
 		if (blobs) {
 			auto hq = PainterHighQualityEnabler(p);
 
@@ -323,6 +347,9 @@ void GroupCallBar::ensureBlobsAnimation(Userpic &userpic) {
 }
 
 void GroupCallBar::sendRandomLevels() {
+	if (_skipLevelUpdate) {
+		return;
+	}
 	for (auto &userpic : _userpics) {
 		if (const auto blobs = userpic.blobsAnimation.get()) {
 			const auto value = 30 + (openssl::RandomValue<uint32>() % 70);
diff --git a/Telegram/SourceFiles/ui/chat/group_call_bar.h b/Telegram/SourceFiles/ui/chat/group_call_bar.h
index 616babafc..2641ef586 100644
--- a/Telegram/SourceFiles/ui/chat/group_call_bar.h
+++ b/Telegram/SourceFiles/ui/chat/group_call_bar.h
@@ -35,7 +35,8 @@ class GroupCallBar final {
 public:
 	GroupCallBar(
 		not_null<QWidget*> parent,
-		rpl::producer<GroupCallBarContent> content);
+		rpl::producer<GroupCallBarContent> content,
+		rpl::producer<bool> &&hideBlobs);
 	~GroupCallBar();
 
 	void show();
@@ -89,6 +90,9 @@ private:
 	bool _shouldBeShown = false;
 	bool _forceHidden = false;
 
+	bool _skipLevelUpdate = false;
+	crl::time _speakingAnimationHideLastTime = 0;
+
 	GroupCallBarContent _content;
 
 };

From 2fb220985a8a48db1e78e33a51726f4e7ed1fac6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 18 Dec 2020 17:33:16 +0300
Subject: [PATCH 341/370] Updated doc for macOS.

---
 docs/building-osx.md   | 2 +-
 docs/building-xcode.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/building-osx.md b/docs/building-osx.md
index 6537f6940..8636bc89f 100644
--- a/docs/building-osx.md
+++ b/docs/building-osx.md
@@ -256,7 +256,7 @@ Go to ***BuildPath*** and run
     sudo make install
     cd ..
 
-    git clone https://github.com/desktop-app/tg_owt.git
+    git clone --recursive https://github.com/desktop-app/tg_owt.git
     cd tg_owt
     mkdir out
     cd out
diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index a5b043ed5..c4706456f 100644
--- a/docs/building-xcode.md
+++ b/docs/building-xcode.md
@@ -298,7 +298,7 @@ Go to ***BuildPath*** and run
     sudo make install
     cd ..
 
-    git clone https://github.com/desktop-app/tg_owt.git
+    git clone --recursive https://github.com/desktop-app/tg_owt.git
     cd tg_owt
     mkdir out
     cd out

From 7a07acb124f2137e201e9fe24b7045eddb782a3a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Dec 2020 19:21:57 +0400
Subject: [PATCH 342/370] Fix group call bar in legacy groups.

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

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 19934e733..33da747a7 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5407,14 +5407,14 @@ void HistoryWidget::refreshPinnedBarButton(bool many) {
 void HistoryWidget::setupGroupCallTracker() {
 	Expects(_history != nullptr);
 
-	const auto channel = _history->peer->asChannel();
-	if (!channel) {
+	const auto peer = _history->peer;
+	if (!peer->asMegagroup() && !peer->asChat()) {
 		_groupCallTracker = nullptr;
 		_groupCallBar = nullptr;
 		return;
 	}
 	_groupCallTracker = std::make_unique<HistoryView::GroupCallTracker>(
-		channel);
+		peer);
 	_groupCallBar = std::make_unique<Ui::GroupCallBar>(
 		this,
 		_groupCallTracker->content(),

From b85bbadd74c2f1177cbe5fbcfb5049baaf0cec6a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 18 Dec 2020 21:02:19 +0300
Subject: [PATCH 343/370] Added Connecting state to Calls::TopBar.

---
 .../SourceFiles/calls/calls_group_call.cpp    |  9 ++
 Telegram/SourceFiles/calls/calls_group_call.h |  1 +
 .../SourceFiles/calls/calls_group_panel.cpp   |  7 +-
 Telegram/SourceFiles/calls/calls_top_bar.cpp  | 97 +++++++++++++------
 Telegram/SourceFiles/calls/calls_top_bar.h    |  5 +-
 5 files changed, 81 insertions(+), 38 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_call.cpp b/Telegram/SourceFiles/calls/calls_group_call.cpp
index cbeedcd57..2a68b411e 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_call.cpp
@@ -766,6 +766,15 @@ void GroupCall::sendMutedUpdate() {
 	}).send();
 }
 
+rpl::producer<bool> GroupCall::connectingValue() const {
+	using namespace rpl::mappers;
+	return _state.value() | rpl::map(
+		_1 == State::Creating
+		|| _1 == State::Joining
+		|| _1 == State::Connecting
+	) | rpl::distinct_until_changed();
+}
+
 void GroupCall::setCurrentAudioDevice(bool input, const QString &deviceId) {
 	if (input) {
 		_mediaDevices->switchToAudioInput(deviceId);
diff --git a/Telegram/SourceFiles/calls/calls_group_call.h b/Telegram/SourceFiles/calls/calls_group_call.h
index 78a7f41bb..8b6907d2c 100644
--- a/Telegram/SourceFiles/calls/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/calls_group_call.h
@@ -120,6 +120,7 @@ public:
 	[[nodiscard]] rpl::producer<State> stateValue() const {
 		return _state.value();
 	}
+	[[nodiscard]] rpl::producer<bool> connectingValue() const;
 
 	[[nodiscard]] rpl::producer<LevelUpdate> levelUpdates() const {
 		return _levelUpdates.events();
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 3823f0c2d..92f1f6bc6 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -417,14 +417,9 @@ void GroupPanel::initWithCall(GroupCall *call) {
 		}
 	}, _callLifetime);
 
-	using namespace rpl::mappers;
 	rpl::combine(
 		_call->mutedValue() | MapPushToTalkToActive(),
-		_call->stateValue() | rpl::map(
-			_1 == State::Creating
-			|| _1 == State::Joining
-			|| _1 == State::Connecting
-		)
+		_call->connectingValue()
 	) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](MuteState mute, bool connecting) {
 		_mute->setState(Ui::CallMuteButtonState{
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 91cd44af9..550408083 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -35,6 +35,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 
 namespace Calls {
+
+enum class BarState {
+	Connecting,
+	Active,
+	Muted,
+	ForceMuted,
+};
+
 namespace {
 
 constexpr auto kMaxUsersInBar = 3;
@@ -47,6 +55,16 @@ constexpr auto kHideBlobsDuration = crl::time(500);
 constexpr auto kBlobLevelDuration = crl::time(250);
 constexpr auto kBlobUpdateInterval = crl::time(100);
 
+auto BarStateFromMuteState(MuteState state, bool connecting) {
+	return (connecting
+		? BarState::Connecting
+		: state == MuteState::ForceMuted
+		? BarState::ForceMuted
+		: state == MuteState::Muted
+		? BarState::Muted
+		: BarState::Active);
+};
+
 auto LinearBlobs() {
 	return std::vector<Ui::Paint::LinearBlobs::BlobData>{
 		{
@@ -79,22 +97,26 @@ auto LinearBlobs() {
 auto Colors() {
 	using Vector = std::vector<QColor>;
 	using Colors = anim::gradient_colors;
-	return base::flat_map<MuteState, Colors>{
+	return base::flat_map<BarState, Colors>{
 		{
-			MuteState::ForceMuted,
+			BarState::ForceMuted,
 			Colors(QGradientStops{
 				{ 0.0, st::groupCallForceMutedBar1->c },
 				{ .35, st::groupCallForceMutedBar2->c },
 				{ 1.0, st::groupCallForceMutedBar3->c } })
 		},
 		{
-			MuteState::Active,
+			BarState::Active,
 			Colors(Vector{ st::groupCallLive1->c, st::groupCallLive2->c })
 		},
 		{
-			MuteState::Muted,
+			BarState::Muted,
 			Colors(Vector{ st::groupCallMuted1->c, st::groupCallMuted2->c })
 		},
+		{
+			BarState::Connecting,
+			Colors(st::callBarBgMuted->c)
+		},
 	};
 }
 
@@ -257,21 +279,32 @@ void TopBar::initControls() {
 	const auto mapToState = [](bool muted) {
 		return muted ? MuteState::Muted : MuteState::Active;
 	};
-	const auto fromState = _mute->lifetime().make_state<MuteState>(
-		_call ? mapToState(_call->muted()) : _groupCall->muted());
+	const auto fromState = _mute->lifetime().make_state<BarState>(
+		BarStateFromMuteState(
+			_call
+				? mapToState(_call->muted())
+				: _groupCall->muted(),
+			false));
 	auto muted = _call
-		? _call->mutedValue() | rpl::map(mapToState)
-		: (_groupCall->mutedValue()
-			| MapPushToTalkToActive()
-			| rpl::distinct_until_changed()
-			| rpl::type_erased());
+		? rpl::combine(
+			_call->mutedValue() | rpl::map(mapToState),
+			rpl::single(false))
+		: rpl::combine(
+			(_groupCall->mutedValue()
+				| MapPushToTalkToActive()
+				| rpl::distinct_until_changed()
+				| rpl::type_erased()),
+			_groupCall->connectingValue());
 	std::move(
 		muted
-	) | rpl::start_with_next([=](MuteState state) {
-		setMuted(state != MuteState::Active);
+	) | rpl::map(
+		BarStateFromMuteState
+	) | rpl::start_with_next([=](BarState state) {
+		_isGroupConnecting = (state == BarState::Connecting);
+		setMuted(state != BarState::Active);
 		update();
 
-		const auto isForceMuted = (state == MuteState::ForceMuted);
+		const auto isForceMuted = (state == BarState::ForceMuted);
 		if (isForceMuted) {
 			_mute->clearState();
 		}
@@ -285,8 +318,8 @@ void TopBar::initControls() {
 		const auto toMuted = state;
 		*fromState = state;
 
-		const auto crossFrom = (fromMuted != MuteState::Active) ? 1. : 0.;
-		const auto crossTo = (toMuted != MuteState::Active) ? 1. : 0.;
+		const auto crossFrom = (fromMuted != BarState::Active) ? 1. : 0.;
+		const auto crossTo = (toMuted != BarState::Active) ? 1. : 0.;
 
 		auto animationCallback = [=](float64 value) {
 			if (_groupCall) {
@@ -312,6 +345,14 @@ void TopBar::initControls() {
 
 	if (const auto group = _groupCall.get()) {
 		subscribeToMembersChanges(group);
+
+		_isGroupConnecting.value(
+		) | rpl::start_with_next([=](bool isConnecting) {
+			_mute->setAttribute(
+				Qt::WA_TransparentForMouseEvents,
+				isConnecting);
+			updateInfoLabels();
+		}, lifetime());
 	}
 
 	if (const auto call = _call.get()) {
@@ -415,23 +456,14 @@ void TopBar::initBlobsUnder(
 	auto hideBlobs = rpl::combine(
 		rpl::single(anim::Disabled()) | rpl::then(anim::Disables()),
 		Core::App().appDeactivatedValue(),
-		group->stateValue(
-		) | rpl::map([](Calls::GroupCall::State state) {
-			using State = Calls::GroupCall::State;
-			if (state != State::Creating
-				&& state != State::Joining
-				&& state != State::Joined
-				&& state != State::Connecting) {
-				return true;
-			}
-			return false;
-		}) | rpl::distinct_until_changed()
-	) | rpl::map([](bool animDisabled, bool hide, bool isBadState) {
-		return isBadState || animDisabled || hide;
+		group->connectingValue()
+	) | rpl::map([](bool animDisabled, bool hide, bool connecting) {
+		return connecting || animDisabled || hide;
 	});
 
 	std::move(
 		hideBlobs
+	) | rpl::distinct_until_changed(
 	) | rpl::start_with_next([=](bool hide) {
 		if (hide) {
 			state->paint.setLevel(0.);
@@ -611,8 +643,11 @@ void TopBar::setInfoLabels() {
 	} else if (const auto group = _groupCall.get()) {
 		const auto peer = group->peer();
 		const auto name = peer->name;
-		_fullInfoLabel->setText(name.toUpper());
-		_shortInfoLabel->setText(name.toUpper());
+		const auto text = _isGroupConnecting.current()
+			? tr::lng_group_call_connecting(tr::now)
+			: name.toUpper();
+		_fullInfoLabel->setText(text);
+		_shortInfoLabel->setText(text);
 	}
 }
 
diff --git a/Telegram/SourceFiles/calls/calls_top_bar.h b/Telegram/SourceFiles/calls/calls_top_bar.h
index 6ea44da8f..2f89032de 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.h
+++ b/Telegram/SourceFiles/calls/calls_top_bar.h
@@ -33,6 +33,7 @@ class GroupCall;
 class SignalBars;
 class Mute;
 enum class MuteState;
+enum class BarState;
 
 class TopBar : public Ui::RpWidget {
 public:
@@ -83,8 +84,10 @@ private:
 	object_ptr<Ui::IconButton> _hangup;
 	base::unique_qptr<Ui::RpWidget> _blobs;
 
+	rpl::variable<bool> _isGroupConnecting = false;
+
 	QBrush _groupBrush;
-	anim::linear_gradients<MuteState> _gradients;
+	anim::linear_gradients<BarState> _gradients;
 	Ui::Animations::Simple _switchStateAnimation;
 
 	base::Timer _updateDurationTimer;

From eaf9b58337582eb4e5bfdc326f4e9cd5df6ec6ed Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 19 Dec 2020 12:44:34 +0400
Subject: [PATCH 344/370] Beta version 2.4.15.

- Improve design of voice chats.
- Fix sending of voice messages as replies.
- Fix 'Open With' menu position in macOS.
- Fix freeze on secondary screen disconnect.
---
 Telegram/SourceFiles/core/changelogs.cpp | 64 ++++--------------------
 Telegram/lib_ui                          |  2 +-
 changelog.txt                            |  7 +++
 3 files changed, 18 insertions(+), 55 deletions(-)

diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index cc68604b3..7bf982d01 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -21,60 +21,6 @@ namespace {
 
 std::map<int, const char*> BetaLogs() {
 	return {
-	{
-		2001008,
-		"- Add support for full group message history export.\n"
-
-		"- Allow export of a single chat message history in JSON format."
-	},
-	{
-		2001014,
-		"- Support for multiple accounts."
-	},
-	{
-		2001017,
-		"- Fix messages editing in a non-active account.\n"
-
-		"- Fix large animated emoji messages editing.\n"
-
-		"- Fix high definition GIF animations opening in media viewer.\n"
-
-		"- Multiple crash fixes."
-	},
-	{
-		2001018,
-		"- Fix a possible crash in Picture-in-Picture video player.\n"
-
-		"- Fix copying links from message texts.\n"
-
-		"- Raise file size limit to 2000 MB.\n"
-
-		"- Allow using system window frame in Windows and Linux."
-	},
-	{
-		2001019,
-		"- File uploading in an inactive account correctly finishes.\n"
-
-		"- Stickers panel works correctly after switching between accounts.\n"
-
-		"- Large .webp files are not shown as stickers.\n"
-
-		"- MacBook TouchBar support was fully rewritten with fixes for multiple accounts.\n"
-
-		"- Custom window title bar works in all Linux versions.\n"
-
-		"- Passcode doesn't auto-lock while you're active in other apps on Linux X11."
-	},
-	{
-		2001021,
-		"- Edit your scheduled messages.\n"
-
-		"- See the unread messages indicator for your additional accounts on the main menu button.\n"
-
-		"- Use Auto-Night Mode to make Telegram night mode match the system Dark Mode settings.\n"
-
-		"- 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"
@@ -119,6 +65,16 @@ std::map<int, const char*> BetaLogs() {
 		
 		"- Fix group members display.\n"
 	},
+	{
+		2004015,
+		"- Improve design of voice chats.\n"
+
+		"- Fix sending of voice messages as replies.\n"
+
+		"- Fix 'Open With' menu position in macOS.\n"
+
+		"- Fix freeze on secondary screen disconnect.\n"
+	},
 	};
 };
 
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index abb615a7c..a29e93ca5 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit abb615a7c9cb3a3992f67637592b481ccc50f17a
+Subproject commit a29e93ca55d40c3b50d654fd2a9a153ab0227b6c
diff --git a/changelog.txt b/changelog.txt
index ecd27ca4e..cce23c41f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+2.4.15 beta (19.12.20)
+
+- Improve design of voice chats.
+- Fix sending of voice messages as replies.
+- Fix 'Open With' menu position in macOS.
+- Fix freeze on secondary screen disconnect.
+
 2.4.14 beta (14.12.20)
 
 - Create voice chats in legacy groups.

From 4ef2918bcc3c70721220ebf3bb282bfd6c30ccb3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 19 Dec 2020 14:27:09 +0400
Subject: [PATCH 345/370] Beta version 2.4.15: Update version.

---
 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 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 62160af4c..9a0727161 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.14.0" />
+    Version="2.4.15.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 7d84eeaa4..782a8236b 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,14,0
- PRODUCTVERSION 2,4,14,0
+ FILEVERSION 2,4,15,0
+ PRODUCTVERSION 2,4,15,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.14.0"
+            VALUE "FileVersion", "2.4.15.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.14.0"
+            VALUE "ProductVersion", "2.4.15.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index e45574c78..5e2407756 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,14,0
- PRODUCTVERSION 2,4,14,0
+ FILEVERSION 2,4,15,0
+ PRODUCTVERSION 2,4,15,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.14.0"
+            VALUE "FileVersion", "2.4.15.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.14.0"
+            VALUE "ProductVersion", "2.4.15.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 05faa323b..4a947cfc2 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 = 2004014;
-constexpr auto AppVersionStr = "2.4.14";
+constexpr auto AppVersion = 2004015;
+constexpr auto AppVersionStr = "2.4.15";
 constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 864654f6b..d3e816d82 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2004014
+AppVersion         2004015
 AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.14
-AppVersionStr      2.4.14
+AppVersionStrSmall 2.4.15
+AppVersionStr      2.4.15
 BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 2.4.14.beta
+AppVersionOriginal 2.4.15.beta

From 9c20cf354385498adbfdf7acd02f3757806b90cd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 19 Dec 2020 18:39:29 +0400
Subject: [PATCH 346/370] Beta version 2.4.15: Fix build on macOS.

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

diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index 550408083..deade4dfb 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -288,7 +288,7 @@ void TopBar::initControls() {
 	auto muted = _call
 		? rpl::combine(
 			_call->mutedValue() | rpl::map(mapToState),
-			rpl::single(false))
+			rpl::single(false)) | rpl::type_erased()
 		: rpl::combine(
 			(_groupCall->mutedValue()
 				| MapPushToTalkToActive()

From af6c7c7d098b69915e3490e5a94981ea6b596f3a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 19 Dec 2020 19:35:45 +0400
Subject: [PATCH 347/370] Beta version 2.4.15: Update Dockerfile.

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 2c41e7986..6be2e6e26 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -28,7 +28,7 @@ WORKDIR $LibrariesPath
 
 FROM builder AS patches
 RUN git clone $GIT/desktop-app/patches.git
-RUN cd patches && git checkout f22ccc5
+RUN cd patches && git checkout 6afd91a
 
 FROM builder AS libffi
 RUN git clone -b v3.3 --depth=1 $GIT/libffi/libffi.git

From 25665167faee188de6dc8f615a807e7e0a02e986 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 19 Dec 2020 18:18:33 +0300
Subject: [PATCH 348/370] Updated Qt version in README.md.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 60e7598d5..5bb2235fc 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Version **1.8.15** was the last that supports older systems
 
 ## Third-party
 
-* Qt 5.12.8, 5.6.2 and 5.3.2 slightly patched ([LGPL](http://doc.qt.io/qt-5/lgpl.html))
+* Qt 5.15.2, 5.6.2 and 5.3.2 slightly patched ([LGPL](http://doc.qt.io/qt-5/lgpl.html))
 * OpenSSL 1.1.1 and 1.0.1 ([OpenSSL License](https://www.openssl.org/source/license.html))
 * WebRTC ([New BSD License](https://github.com/desktop-app/tg_owt/blob/master/LICENSE))
 * zlib 1.2.11 ([zlib License](http://www.zlib.net/zlib_license.html))

From c14313d64af9f824d355c6beb67a36cf2831d86d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 21 Dec 2020 09:57:45 +0300
Subject: [PATCH 349/370] Replaced bezier circles in record button with blobs.

---
 .../history_view_voice_record_button.cpp      | 739 +++---------------
 .../history_view_voice_record_button.h        |  19 +-
 Telegram/SourceFiles/ui/chat/chat.style       |  14 +-
 3 files changed, 125 insertions(+), 647 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
index a8bcc7036..fb9a4551c 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.cpp
@@ -7,631 +7,56 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/controls/history_view_voice_record_button.h"
 
+#include "ui/paint/blobs.h"
+
 #include "styles/style_chat.h"
 #include "styles/style_layers.h"
 
-#include <QMatrix>
-
 namespace HistoryView::Controls {
 
 namespace {
 
-constexpr auto kSegmentsCount = 12;
-constexpr auto kMajorDegreeOffset = 360 / kSegmentsCount;
-constexpr auto kSixtyDegrees = 60;
+constexpr auto kMaxLevel = 1800.;
+constexpr auto kBlobAlpha = 76. / 255.;
+constexpr auto kBlobMaxSpeed = 5.0;
+constexpr auto kLevelDuration = 100. + 500. * 0.33;
+constexpr auto kBlobsScaleEnterDuration = crl::time(250);
 
-constexpr auto kEnterIdleAnimationDuration = crl::time(1200);
-
-constexpr auto kRotationSpeed = 0.36 * 0.1;
-
-constexpr auto kRandomAdditionFactor = 0.15;
-
-constexpr auto kIdleRadiusGlobalFactor = 0.56;
-constexpr auto kIdleRadiusFactor = 0.15 * 0.5;
-
-constexpr auto kOpacityMajor = 0.30;
-constexpr auto kOpacityMinor = 0.15;
-
-constexpr auto kIdleRotationSpeed = 0.2;
-constexpr auto kIdleRotateDiff = 0.1 * kIdleRotationSpeed;
-
-constexpr auto kWaveAngle = 0.03;
-
-constexpr auto kAnimationSpeedMajor = 1.5 - 0.65;
-constexpr auto kAnimationSpeedMinor = 1.5 - 0.45;
-constexpr auto kAnimationSpeedCircle = 1.5 - 0.25;
-
-constexpr auto kAmplitudeDiffFactorMax = 500. - 100.;
-constexpr auto kAmplitudeDiffFactorMajor = 300. - 100.;
-constexpr auto kAmplitudeDiffFactorMinor = 400. - 100.;
-
-constexpr auto kFlingDistanceFactorMajor = 8 * 16;
-constexpr auto kFlingDistanceFactorMinor = 20 * 16;
-
-constexpr auto kFlingInAnimationDurationMajor = 200;
-constexpr auto kFlingInAnimationDurationMinor = 350;
-constexpr auto kFlingOutAnimationDurationMajor = 220;
-constexpr auto kFlingOutAnimationDurationMinor = 380;
-
-constexpr auto kSineWaveSpeedMajor = 0.02 * 0.2;
-constexpr auto kSineWaveSpeedMinor = 0.026 * 0.2;
-
-constexpr auto kSmallWaveRadius = 0.55;
-
-constexpr auto kFlingDistance = 0.50;
-
-constexpr auto kMinDivider = 100.;
-
-constexpr auto kMaxAmplitude = 1800.;
-
-constexpr auto kZeroPoint = QPointF(0, 0);
-
-template <typename Number>
-void Normalize(Number &value, Number right) {
-	if (value >= right) {
-		value -= right;
-	}
-}
-
-float64 RandomAdditional() {
-	return (rand_value<int>() % 100 / 100.);
-}
-
-void PerformAnimation(
-		rpl::producer<crl::time> &&animationTicked,
-		Fn<void(float64)> &&applyValue,
-		Fn<void()> &&finishCallback,
-		float64 duration,
-		float64 from,
-		float64 to,
-		rpl::lifetime &lifetime) {
-	lifetime.destroy();
-	const auto animValue =
-		lifetime.make_state<anim::value>(from, to);
-	const auto animStarted = crl::now();
-	std::move(
-		animationTicked
-	) | rpl::start_with_next([=,
-			applyValue = std::move(applyValue),
-			finishCallback = std::move(finishCallback),
-			&lifetime](crl::time now) mutable {
-		const auto dt = anim::Disabled()
-			? 1.
-			: ((now - animStarted) / duration);
-		if (dt >= 1.) {
-			animValue->finish();
-			applyValue(animValue->current());
-			lifetime.destroy();
-			if (finishCallback) {
-				finishCallback();
-			}
-		} else {
-			animValue->update(dt, anim::linear);
-			applyValue(animValue->current());
-		}
-	}, lifetime);
+auto Blobs() {
+	return std::vector<Ui::Paint::Blobs::BlobData>{
+		{
+			.segmentsCount = 9,
+			.minScale = 0.605229,
+			.minRadius = (float)st::historyRecordMinorBlobMinRadius,
+			.maxRadius = (float)st::historyRecordMinorBlobMaxRadius,
+			.speedScale = 1.,
+			.alpha = kBlobAlpha,
+			.maxSpeed = kBlobMaxSpeed,
+		},
+		{
+			.segmentsCount = 12,
+			.minScale = 0.553943,
+			.minRadius = (float)st::historyRecordMajorBlobMinRadius,
+			.maxRadius = (float)st::historyRecordMajorBlobMaxRadius,
+			.speedScale = 1.,
+			.alpha = kBlobAlpha,
+			.maxSpeed = kBlobMaxSpeed,
+		},
+	};
 }
 
 } // namespace
 
-class ContinuousValue {
-public:
-	ContinuousValue() = default;
-	ContinuousValue(float64 duration) : _duration(duration) {
-	}
-	void start(float64 to, float64 duration) {
-		_to = to;
-		_delta = (_to - _cur) / duration;
-	}
-	void start(float64 to) {
-		start(to, _duration);
-	}
-	void reset() {
-		_to = _cur = _delta = 0.;
-	}
-
-	float64 current() const {
-		return _cur;
-	}
-	float64 to() const {
-		return _to;
-	}
-	float64 delta() const {
-		return _delta;
-	}
-	void update(crl::time dt, Fn<void(float64 &)> &&callback = nullptr) {
-		if (_to != _cur) {
-			_cur += _delta * dt;
-			if ((_to != _cur) && ((_delta > 0) == (_cur > _to))) {
-				_cur = _to;
-			}
-			if (callback) {
-				callback(_cur);
-			}
-		}
-	}
-
-private:
-	float64 _duration = 0.;
-	float64 _to = 0.;
-
-	float64 _cur = 0.;
-	float64 _delta = 0.;
-
-};
-
-class CircleBezier final {
-public:
-	CircleBezier(int n);
-
-	void computeRandomAdditionals();
-	void paintCircle(
-		Painter &p,
-		const QColor &c,
-		float64 radius,
-		float64 cubicBezierFactor,
-		float64 idleStateDiff,
-		float64 radiusDiff,
-		float64 randomFactor);
-
-private:
-	struct Points {
-		QPointF point;
-		QPointF control;
-	};
-
-	const int _segmentsCount;
-	const float64 _segmentLength;
-	std::vector<float64> _randomAdditionals;
-
-};
-
-class Wave final {
-public:
-	Wave(
-		rpl::producer<crl::time> animationTicked,
-		int n,
-		float64 rotationOffset,
-		float64 amplitudeRadius,
-		float64 amplitudeWaveDiff,
-		float64 fling,
-		int flingDistanceFactor,
-		int flingInAnimationDuration,
-		int flingOutAnimationDuration,
-		float64 amplitudeDiffSpeed,
-		float64 amplitudeDiffFactor,
-		bool isDirectionClockwise);
-
-	void setValue(float64 to);
-	void tick(float64 circleRadius, crl::time dt);
-	void reset();
-
-	void paint(Painter &p, QColor c);
-
-private:
-
-	void initEnterIdleAnimation(rpl::producer<crl::time> animationTicked);
-	void initFlingAnimation(rpl::producer<crl::time> animationTicked);
-
-	const std::unique_ptr<CircleBezier> _circleBezier;
-
-	const float _rotationOffset;
-	const float64 _idleGlobalRadius;
-	const float64 _amplitudeRadius;
-	const float64 _amplitudeWaveDiff;
-	const float64 _randomAdditions;
-	const float64 _fling;
-	const int _flingDistanceFactor;
-	const int _flingInAnimationDuration;
-	const int _flingOutAnimationDuration;
-	const float64 _amplitudeInAnimationDuration;
-	const float64 _amplitudeOutAnimationDuration;
-	const int _directionClockwise;
-
-	bool _incRandomAdditionals = false;
-	bool _isIdle = true;
-	bool _wasFling = false;
-	float64 _flingRadius = 0.;
-	float64 _idleRadius = 0.;
-	float64 _idleRotation = 0.;
-	float64 _lastRadius = 0.;
-	float64 _rotation = 0.;
-	float64 _sineAngleMax = 0.;
-	float64 _waveAngle = 0.;
-	float64 _waveDiff = 0.;
-	ContinuousValue _levelValue;
-
-	rpl::event_stream<float64> _flingAnimationRequests;
-	rpl::event_stream<> _enterIdleAnimationRequests;
-	rpl::lifetime _animationEnterIdleLifetime;
-	rpl::lifetime _animationFlingLifetime;
-	rpl::lifetime _lifetime;
-};
-
-class RecordCircle final {
-public:
-	RecordCircle(rpl::producer<crl::time> animationTicked);
-
-	void reset();
-	void setAmplitude(float64 value);
-	void paint(Painter &p, QColor c);
-
-private:
-
-	const std::unique_ptr<Wave> _majorWave;
-	const std::unique_ptr<Wave> _minorWave;
-
-	crl::time _lastUpdateTime = 0;
-	ContinuousValue _levelValue;
-
-};
-
-CircleBezier::CircleBezier(int n)
-: _segmentsCount(n)
-, _segmentLength((4.0 / 3.0) * std::tan(M_PI / (2 * n)))
-, _randomAdditionals(n) {
-}
-
-void CircleBezier::computeRandomAdditionals() {
-	ranges::generate(_randomAdditionals, RandomAdditional);
-}
-
-void CircleBezier::paintCircle(
-		Painter &p,
-		const QColor &c,
-		float64 radius,
-		float64 cubicBezierFactor,
-		float64 idleStateDiff,
-		float64 radiusDiff,
-		float64 randomFactor) {
-	PainterHighQualityEnabler hq(p);
-
-	const auto r1 = radius - idleStateDiff / 2. - radiusDiff / 2.;
-	const auto r2 = radius + radiusDiff / 2. + idleStateDiff / 2.;
-	const auto l = _segmentLength * std::max(r1, r2) * cubicBezierFactor;
-
-	auto m = QMatrix();
-
-	const auto preparePoints = [&](int i, bool isStart) -> Points {
-		Normalize(i, _segmentsCount);
-		const auto randomAddition = randomFactor * _randomAdditionals[i];
-		const auto r = ((i % 2 == 0) ? r1 : r2) + randomAddition;
-
-		m.reset();
-		m.rotate(360. / _segmentsCount * i);
-		const auto sign = isStart ? 1 : -1;
-
-		return {
-			(isStart && i) ? QPointF() : m.map(QPointF(0, -r)),
-			m.map(QPointF(sign * (l + randomAddition * _segmentLength), -r)),
-		};
-	};
-
-	const auto &[startPoint, _] = preparePoints(0, true);
-
-	auto path = QPainterPath();
-	path.moveTo(startPoint);
-
-	for (auto i = 0; i < _segmentsCount; i++) {
-		const auto &[_, startControl] = preparePoints(i, true);
-		const auto &[end, endControl] = preparePoints(i + 1, false);
-
-		path.cubicTo(startControl, endControl, end);
-	}
-
-	p.setBrush(Qt::NoBrush);
-
-	auto pen = QPen(Qt::NoPen);
-	pen.setCapStyle(Qt::RoundCap);
-	pen.setJoinStyle(Qt::RoundJoin);
-
-	p.setPen(pen);
-	p.fillPath(path, c);
-	p.drawPath(path);
-}
-
-Wave::Wave(
-	rpl::producer<crl::time> animationTicked,
-	int n,
-	float64 rotationOffset,
-	float64 amplitudeRadius,
-	float64 amplitudeWaveDiff,
-	float64 fling,
-	int flingDistanceFactor,
-	int flingInAnimationDuration,
-	int flingOutAnimationDuration,
-	float64 amplitudeDiffSpeed,
-	float64 amplitudeDiffFactor,
-	bool isDirectionClockwise)
-: _circleBezier(std::make_unique<CircleBezier>(n))
-, _rotationOffset(rotationOffset)
-, _idleGlobalRadius(st::historyRecordRadiusDiffMin * kIdleRadiusGlobalFactor)
-, _amplitudeRadius(amplitudeRadius)
-, _amplitudeWaveDiff(amplitudeWaveDiff)
-, _randomAdditions(st::historyRecordRandomAddition * kRandomAdditionFactor)
-, _fling(fling)
-, _flingDistanceFactor(flingDistanceFactor)
-, _flingInAnimationDuration(flingInAnimationDuration)
-, _flingOutAnimationDuration(flingOutAnimationDuration)
-, _amplitudeInAnimationDuration(kMinDivider
-	+ amplitudeDiffFactor * amplitudeDiffSpeed)
-, _amplitudeOutAnimationDuration(kMinDivider
-	+ kAmplitudeDiffFactorMax * amplitudeDiffSpeed)
-, _directionClockwise(isDirectionClockwise ? 1 : -1)
-, _rotation(rotationOffset) {
-	initEnterIdleAnimation(rpl::duplicate(animationTicked));
-	initFlingAnimation(std::move(animationTicked));
-}
-
-void Wave::reset() {
-	_incRandomAdditionals = false;
-	_isIdle = true;
-	_wasFling = false;
-	_flingRadius = 0.;
-	_idleRadius = 0.;
-	_idleRotation = 0.;
-	_lastRadius = 0.;
-	_rotation = 0.;
-	_sineAngleMax = 0.;
-	_waveAngle = 0.;
-	_waveDiff = 0.;
-	_levelValue.reset();
-}
-
-void Wave::setValue(float64 to) {
-	const auto duration = (to <= _levelValue.current())
-		? _amplitudeOutAnimationDuration
-		: _amplitudeInAnimationDuration;
-	_levelValue.start(to, duration);
-
-	const auto idle = to < 0.1;
-	if (_isIdle != idle && idle) {
-		_enterIdleAnimationRequests.fire({});
-	}
-
-	_isIdle = idle;
-
-	if (!_isIdle) {
-		_animationEnterIdleLifetime.destroy();
-	}
-}
-
-void Wave::initEnterIdleAnimation(rpl::producer<crl::time> animationTicked) {
-	_enterIdleAnimationRequests.events(
-	) | rpl::start_with_next([=] {
-		const auto &k = kSixtyDegrees;
-
-		const auto rotation = _rotation;
-		const auto rotationTo = std::round(rotation / k) * k
-			+ _rotationOffset;
-		const auto waveDiff = _waveDiff;
-
-		auto applyValue = [=](float64 v) {
-			_rotation = rotationTo + (rotation - rotationTo) * v;
-			_waveDiff = 1. + (waveDiff - 1.) * v;
-			_waveAngle = std::acos(_waveDiff * _directionClockwise);
-		};
-
-		PerformAnimation(
-			rpl::duplicate(animationTicked),
-			std::move(applyValue),
-			nullptr,
-			kEnterIdleAnimationDuration,
-			1,
-			0,
-			_animationEnterIdleLifetime);
-
-	}, _lifetime);
-}
-
-void Wave::initFlingAnimation(rpl::producer<crl::time> animationTicked) {
-	_flingAnimationRequests.events(
-	) | rpl::start_with_next([=](float64 delta) {
-
-		const auto fling = _fling * 2;
-		const auto flingDistance = delta
-			* _amplitudeRadius
-			* _flingDistanceFactor
-			* fling;
-
-		const auto applyValue = [=](float64 v) {
-			_flingRadius = v;
-		};
-		auto finishCallback = [=] {
-			PerformAnimation(
-				rpl::duplicate(animationTicked),
-				applyValue,
-				nullptr,
-				_flingOutAnimationDuration * fling,
-				flingDistance,
-				0,
-				_animationFlingLifetime);
-		};
-
-		PerformAnimation(
-			rpl::duplicate(animationTicked),
-			applyValue,
-			std::move(finishCallback),
-			_flingInAnimationDuration * fling,
-			_flingRadius,
-			flingDistance,
-			_animationFlingLifetime);
-
-	}, _lifetime);
-}
-
-void Wave::tick(float64 circleRadius, crl::time dt) {
-
-	auto amplitudeCallback = [&](float64 &value) {
-		if (std::abs(value - _levelValue.to()) * _amplitudeRadius
-				< (st::historyRecordRandomAddition / 2)) {
-			if (!_wasFling) {
-				_flingAnimationRequests.fire_copy(_levelValue.delta());
-				_wasFling = true;
-			}
-		} else {
-			_wasFling = false;
-		}
-	};
-	_levelValue.update(dt, std::move(amplitudeCallback));
-
-	_idleRadius = circleRadius * kIdleRadiusFactor;
-
-	{
-		const auto to = _levelValue.to();
-		const auto delta = (_sineAngleMax - to);
-		if (std::abs(delta) - 0.25 < 0) {
-			_sineAngleMax = to;
-		} else {
-			_sineAngleMax -= 0.25 * ((delta < 0) ? -1 : 1);
-		}
-	}
-
-	if (!_isIdle) {
-		_rotation += dt
-			* (kRotationSpeed * 4. * std::min(_levelValue.current() / .5, 1.)
-				+ kRotationSpeed * 0.5);
-		Normalize(_rotation, 360.);
-	} else {
-		_idleRotation += kIdleRotateDiff * dt;
-		Normalize(_idleRotation, 360.);
-	}
-
-	_lastRadius = circleRadius;
-
-	if (!_isIdle) {
-		_waveAngle += (_amplitudeWaveDiff * _sineAngleMax) * dt;
-		_waveDiff = std::cos(_waveAngle) * _directionClockwise;
-
-		if ((_waveDiff != 0) && ((_waveDiff > 0) == _incRandomAdditionals)) {
-			_circleBezier->computeRandomAdditionals();
-			_incRandomAdditionals = !_incRandomAdditionals;
-		}
-	}
-}
-
-
-void Wave::paint(Painter &p, QColor c) {
-	const auto amplitude = _levelValue.current();
-	const auto waveAmplitude = std::min(amplitude / .3, 1.);
-	const auto radiusDiff = st::historyRecordRadiusDiffMin
-		+ st::historyRecordRadiusDiff * kWaveAngle * _levelValue.to();
-
-	const auto diffFactor = 0.35 * waveAmplitude * _waveDiff;
-
-	const auto radius = (_lastRadius + _amplitudeRadius * amplitude)
-		+ _idleGlobalRadius
-		+ (_flingRadius * waveAmplitude);
-
-	const auto cubicBezierFactor = 1.
-		+ std::abs(diffFactor) * waveAmplitude
-		+ (1. - waveAmplitude) * kIdleRadiusFactor;
-
-	const auto circleRadiusDiff = std::max(
-		radiusDiff * diffFactor,
-		st::historyRecordLevelMainRadius - radius);
-
-	p.rotate((_rotation + _idleRotation) * _directionClockwise);
-
-	_circleBezier->paintCircle(
-		p,
-		c,
-		radius,
-		cubicBezierFactor,
-		_idleRadius * (1. - waveAmplitude),
-		circleRadiusDiff,
-		waveAmplitude * _waveDiff * _randomAdditions);
-
-	p.rotate(0);
-}
-
-RecordCircle::RecordCircle(rpl::producer<crl::time> animationTicked)
-: _majorWave(std::make_unique<Wave>(
-	rpl::duplicate(animationTicked),
-	kSegmentsCount,
-	kMajorDegreeOffset,
-	st::historyRecordMajorAmplitudeRadius,
-	kSineWaveSpeedMajor,
-	0.,
-	kFlingDistanceFactorMajor,
-	kFlingInAnimationDurationMajor,
-	kFlingOutAnimationDurationMajor,
-	kAnimationSpeedMajor,
-	kAmplitudeDiffFactorMajor,
-	true))
-, _minorWave(std::make_unique<Wave>(
-	std::move(animationTicked),
-	kSegmentsCount,
-	0,
-	st::historyRecordMinorAmplitudeRadius
-		+ st::historyRecordMinorAmplitudeRadius * kSmallWaveRadius,
-	kSineWaveSpeedMinor,
-	kFlingDistance,
-	kFlingDistanceFactorMinor,
-	kFlingInAnimationDurationMinor,
-	kFlingOutAnimationDurationMinor,
-	kAnimationSpeedMinor,
-	kAmplitudeDiffFactorMinor,
-	false))
-, _levelValue(kMinDivider
-	+ kAmplitudeDiffFactorMax * kAnimationSpeedCircle) {
-}
-
-void RecordCircle::reset() {
-	_majorWave->reset();
-	_minorWave->reset();
-	_levelValue.reset();
-}
-
-void RecordCircle::setAmplitude(float64 value) {
-	const auto to = std::min(kMaxAmplitude, value) / kMaxAmplitude;
-	_levelValue.start(to);
-	_majorWave->setValue(to);
-	_minorWave->setValue(to);
-}
-
-void RecordCircle::paint(Painter &p, QColor c) {
-	const auto dt = crl::now() - _lastUpdateTime;
-	_levelValue.update(dt);
-
-	const auto &mainRadius = st::historyRecordLevelMainRadiusAmplitude;
-	const auto radius = (st::historyRecordLevelMainRadius
-		+ (anim::Disabled() ? 0 : mainRadius * _levelValue.current()));
-
-	if (!anim::Disabled()) {
-		_majorWave->tick(radius, dt);
-		_minorWave->tick(radius, dt);
-		_lastUpdateTime = crl::now();
-
-		const auto opacity = p.opacity();
-		p.setOpacity(kOpacityMajor);
-		_majorWave->paint(p, c);
-		p.setOpacity(kOpacityMinor);
-		_minorWave->paint(p, c);
-		p.setOpacity(opacity);
-	}
-
-	p.setPen(Qt::NoPen);
-	p.setBrush(c);
-	p.drawEllipse(kZeroPoint, radius, radius);
-}
-
 VoiceRecordButton::VoiceRecordButton(
 	not_null<Ui::RpWidget*> parent,
 	rpl::producer<> leaveWindowEventProducer)
 : AbstractButton(parent)
-, _recordCircle(std::make_unique<RecordCircle>(
-	_recordAnimationTicked.events()))
-, _center(st::historyRecordLevelMaxRadius)
-, _recordingAnimation([=](crl::time now) {
-	if (!anim::Disabled()) {
-		update();
-	}
-	_recordAnimationTicked.fire_copy(now);
-	return true;
-}) {
-	const auto h = st::historyRecordLevelMaxRadius * 2;
-	resize(h, h);
+, _blobs(std::make_unique<Ui::Paint::Blobs>(
+	Blobs(),
+	kLevelDuration,
+	kMaxLevel))
+, _center(_blobs->maxRadius()) {
+	resize(_center * 2, _center * 2);
 	std::move(
 		leaveWindowEventProducer
 	) | rpl::start_with_next([=] {
@@ -643,45 +68,71 @@ VoiceRecordButton::VoiceRecordButton(
 VoiceRecordButton::~VoiceRecordButton() = default;
 
 void VoiceRecordButton::requestPaintLevel(quint16 level) {
-	_recordCircle->setAmplitude(level);
+	if (_blobsHideLastTime) {
+		 return;
+	}
+	_blobs->setLevel(level);
 	update();
 }
 
 void VoiceRecordButton::init() {
-	const auto hasProgress = [](auto value) { return value != 0.; };
-
-	const auto stateChangedAnimation =
-		lifetime().make_state<Ui::Animations::Simple>();
 	const auto currentState = lifetime().make_state<Type>(_state.current());
 
+	rpl::single(
+		anim::Disabled()
+	) | rpl::then(
+		anim::Disables()
+	) | rpl::start_with_next([=](bool hide) {
+		if (hide) {
+			_blobs->setLevel(0.);
+		}
+		_blobsHideLastTime = hide ? crl::now() : 0;
+		if (!hide && !_animation.animating()) {
+			_animation.start();
+		}
+	}, lifetime());
+
+	const auto &mainRadiusMin = st::historyRecordMainBlobMinRadius;
+	const auto mainRadiusDiff = st::historyRecordMainBlobMaxRadius
+		- mainRadiusMin;
 	paintRequest(
 	) | rpl::start_with_next([=](const QRect &clip) {
 		Painter p(this);
 
-		const auto progress = _showProgress.current();
-		const auto complete = (progress == 1.);
+		const auto hideProgress = _blobsHideLastTime
+			? 1. - std::clamp(
+				((crl::now() - _blobsHideLastTime)
+					/ (float64)kBlobsScaleEnterDuration),
+				0.,
+				1.)
+			: 1.;
+		const auto showProgress = _showProgress.current();
+		const auto complete = (showProgress == 1.);
 
 		p.translate(_center, _center);
-		if (!complete) {
-			p.scale(progress, progress);
-		}
 		PainterHighQualityEnabler hq(p);
-		const auto color = anim::color(
+		const auto brush = QBrush(anim::color(
 			st::historyRecordVoiceFgInactive,
 			st::historyRecordVoiceFgActive,
-			_colorProgress.current());
-		_recordCircle->paint(p, color);
-		p.resetTransform();
+			_colorProgress));
+
+		_blobs->paint(p, brush, showProgress * hideProgress);
+
+		const auto radius = (mainRadiusMin
+			+ (mainRadiusDiff * _blobs->currentLevel())) * showProgress;
+
+		p.setPen(Qt::NoPen);
+		p.setBrush(brush);
+		p.drawEllipse(QPointF(), radius, radius);
 
 		if (!complete) {
-			p.setOpacity(progress);
+			p.setOpacity(showProgress);
 		}
 
 		// Paint icon.
 		{
-			const auto stateProgress = stateChangedAnimation->value(0.);
+			const auto stateProgress = _stateChangedAnimation.value(0.);
 			const auto scale = (std::cos(M_PI * 2 * stateProgress) + 1.) * .5;
-			p.translate(_center, _center);
 			if (scale < 1.) {
 				p.scale(scale, scale);
 			}
@@ -701,21 +152,33 @@ void VoiceRecordButton::init() {
 		}
 	}, lifetime());
 
+	_animation.init([=](crl::time now) {
+		if (const auto &last = _blobsHideLastTime; (last > 0)
+			&& (now - last >= kBlobsScaleEnterDuration)) {
+			_animation.stop();
+			return false;
+		}
+		_blobs->updateLevel(now - _lastUpdateTime);
+		_lastUpdateTime = now;
+		update();
+		return true;
+	});
+
 	rpl::merge(
 		shownValue(),
 		_showProgress.value(
-		) | rpl::map(hasProgress) | rpl::distinct_until_changed()
+		) | rpl::map(rpl::mappers::_1 != 0.) | rpl::distinct_until_changed()
 	) | rpl::start_with_next([=](bool show) {
 		setVisible(show);
 		setMouseTracking(show);
 		if (!show) {
-			_recordingAnimation.stop();
+			_animation.stop();
 			_showProgress = 0.;
-			_recordCircle->reset();
+			_blobs->resetLevel();
 			_state = Type::Record;
 		} else {
-			if (!_recordingAnimation.animating()) {
-				_recordingAnimation.start();
+			if (!_animation.animating()) {
+				_animation.start();
 			}
 		}
 	}, lifetime());
@@ -736,7 +199,7 @@ void VoiceRecordButton::init() {
 			update();
 		};
 		const auto duration = st::historyRecordVoiceDuration * 2;
-		stateChangedAnimation->start(std::move(callback), 0., to, duration);
+		_stateChangedAnimation.start(std::move(callback), 0., to, duration);
 	}, lifetime());
 }
 
@@ -757,8 +220,15 @@ rpl::producer<bool> VoiceRecordButton::actives() const {
 	});
 }
 
+rpl::producer<> VoiceRecordButton::clicks() const {
+	return Ui::AbstractButton::clicks(
+	) | rpl::to_empty | rpl::filter([=] {
+		return inCircle(mapFromGlobal(QCursor::pos()));
+	});
+}
+
 bool VoiceRecordButton::inCircle(const QPoint &localPos) const {
-	const auto &radii = st::historyRecordLevelMaxRadius;
+	const auto &radii = st::historyRecordMainBlobMaxRadius;
 	const auto dx = std::abs(localPos.x() - _center);
 	if (dx > radii) {
 		return false;
@@ -778,6 +248,9 @@ void VoiceRecordButton::requestPaintProgress(float64 progress) {
 }
 
 void VoiceRecordButton::requestPaintColor(float64 progress) {
+	if (_colorProgress == progress) {
+		return;
+	}
 	_colorProgress = progress;
 	update();
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
index beb96d0d4..97c3d5072 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_button.h
@@ -11,9 +11,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/animations.h"
 #include "ui/rp_widget.h"
 
-namespace HistoryView::Controls {
+namespace Ui {
+namespace Paint {
+class Blobs;
+} // namespace Paint
+} // namespace Ui
 
-class RecordCircle;
+namespace HistoryView::Controls {
 
 class VoiceRecordButton final : public Ui::AbstractButton {
 public:
@@ -34,25 +38,28 @@ public:
 	void requestPaintLevel(quint16 level);
 
 	[[nodiscard]] rpl::producer<bool> actives() const;
+	[[nodiscard]] rpl::producer<> clicks() const;
 
 	[[nodiscard]] bool inCircle(const QPoint &localPos) const;
 
 private:
 	void init();
 
-	rpl::event_stream<crl::time> _recordAnimationTicked;
-	std::unique_ptr<RecordCircle> _recordCircle;
+	std::unique_ptr<Ui::Paint::Blobs> _blobs;
 
+	crl::time _lastUpdateTime = 0;
+	crl::time _blobsHideLastTime = 0;
 	const int _center;
 
 	rpl::variable<float64> _showProgress = 0.;
-	rpl::variable<float64> _colorProgress = 0.;
+	float64 _colorProgress = 0.;
 	rpl::variable<bool> _inCircle = false;
 	rpl::variable<Type> _state = Type::Record;
 
 	// This can animate for a very long time (like in music playing),
 	// so it should be a Basic, not a Simple animation.
-	Ui::Animations::Basic _recordingAnimation;
+	Ui::Animations::Basic _animation;
+	Ui::Animations::Simple _stateChangedAnimation;
 };
 
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 320149008..c8f7b4842 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -345,14 +345,12 @@ historyRecordFont: font(13px);
 historyRecordDurationSkip: 12px;
 historyRecordDurationFg: historyComposeAreaFg;
 
-historyRecordLevelMainRadius: 23px;
-historyRecordLevelMainRadiusAmplitude: 14px;
-historyRecordMajorAmplitudeRadius: 14px;
-historyRecordMinorAmplitudeRadius: 7px;
-historyRecordRandomAddition: 8px;
-historyRecordRadiusDiff: 50px;
-historyRecordRadiusDiffMin: 10px;
-historyRecordLevelMaxRadius: 70px;
+historyRecordMainBlobMinRadius: 23px;
+historyRecordMainBlobMaxRadius: 37px;
+historyRecordMinorBlobMinRadius: 40px;
+historyRecordMinorBlobMaxRadius: 47px;
+historyRecordMajorBlobMinRadius: 43px;
+historyRecordMajorBlobMaxRadius: 50px;
 
 historyRecordTextStyle: TextStyle(defaultTextStyle) {
 	font: historyRecordFont;

From 055ce1ee24c860fab56587afba323395335b8d0d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 22 Dec 2020 07:56:51 +0300
Subject: [PATCH 350/370] Fixed editing of last message on Up arrow key when
 message is forwarded.

Fixed #9782.
---
 Telegram/SourceFiles/history/history_item.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index e1dce7896..517ed9a1c 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -776,7 +776,8 @@ bool HistoryItem::canBeEditedFromHistory() const {
 	}
 	if ((IsServerMsgId(id) || isScheduled())
 		&& !serviceMsg()
-		&& (out() || history()->peer->isSelf())) {
+		&& (out() || history()->peer->isSelf())
+		&& !Has<HistoryMessageForwarded>()) {
 		return true;
 	}
 	return false;

From b3f6fe1c107d9b9354d6834a7d225e2a5b839b1d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 22 Dec 2020 08:37:36 +0300
Subject: [PATCH 351/370] Removed Enter key from box for clearing history.

Fixed #9781.
---
 Telegram/SourceFiles/boxes/confirm_box.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/confirm_box.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp
index 0788195b0..61208028b 100644
--- a/Telegram/SourceFiles/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/boxes/confirm_box.cpp
@@ -801,7 +801,10 @@ void DeleteMessagesBox::resizeEvent(QResizeEvent *e) {
 
 void DeleteMessagesBox::keyPressEvent(QKeyEvent *e) {
 	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
-		deleteAndClear();
+		// Don't make the clearing history so easy.
+		if (!_wipeHistoryPeer) {
+			deleteAndClear();
+		}
 	} else {
 		BoxContent::keyPressEvent(e);
 	}

From 348712059b87cce5502d42da757d1be31773a161 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 17 Nov 2020 06:38:39 +0300
Subject: [PATCH 352/370] Moved date and progress text formatting to
 tg_ui:ui/text/format_values.

---
 .../media/view/media_view_overlay_widget.cpp  | 34 ++------
 .../SourceFiles/support/support_helper.cpp    | 29 ++-----
 .../SourceFiles/ui/text/format_values.cpp     | 84 +++++++++++++++----
 Telegram/SourceFiles/ui/text/format_values.h  |  2 +
 4 files changed, 80 insertions(+), 69 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 7139fb8ec..1f25222be 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -606,28 +606,10 @@ void OverlayWidget::updateDocSize() {
 		return;
 	}
 
-	if (_document->loading()) {
-		quint64 ready = _document->loadOffset(), total = _document->size;
-		QString readyStr, totalStr, mb;
-		if (total >= 1024 * 1024) { // more than 1 mb
-			qint64 readyTenthMb = (ready * 10 / (1024 * 1024)), totalTenthMb = (total * 10 / (1024 * 1024));
-			readyStr = QString::number(readyTenthMb / 10) + '.' + QString::number(readyTenthMb % 10);
-			totalStr = QString::number(totalTenthMb / 10) + '.' + QString::number(totalTenthMb % 10);
-			mb = qsl("MB");
-		} else if (total >= 1024) {
-			qint64 readyKb = (ready / 1024), totalKb = (total / 1024);
-			readyStr = QString::number(readyKb);
-			totalStr = QString::number(totalKb);
-			mb = qsl("KB");
-		} else {
-			readyStr = QString::number(ready);
-			totalStr = QString::number(total);
-			mb = qsl("B");
-		}
-		_docSize = tr::lng_media_save_progress(tr::now, lt_ready, readyStr, lt_total, totalStr, lt_mb, mb);
-	} else {
-		_docSize = Ui::FormatSizeText(_document->size);
-	}
+	const auto size = _document->size;
+	_docSize = _document->loading()
+		? Ui::FormatProgressText(_document->loadOffset(), size)
+		: Ui::FormatSizeText(size);
 	_docSizeWidth = st::mediaviewFont->width(_docSize);
 	int32 maxw = st::mediaviewFileSize.width() - st::mediaviewFileIconSize - st::mediaviewFilePadding * 3;
 	if (_docSizeWidth > maxw) {
@@ -739,13 +721,7 @@ void OverlayWidget::updateControls() {
 		}
 		return dNow;
 	}();
-	if (d.date() == dNow.date()) {
-		_dateText = tr::lng_mediaview_today(tr::now, lt_time, d.time().toString(cTimeFormat()));
-	} else if (d.date().addDays(1) == dNow.date()) {
-		_dateText = tr::lng_mediaview_yesterday(tr::now, lt_time, d.time().toString(cTimeFormat()));
-	} else {
-		_dateText = tr::lng_mediaview_date_time(tr::now, lt_date, d.date().toString(qsl("dd.MM.yy")), lt_time, d.time().toString(cTimeFormat()));
-	}
+	_dateText = Ui::FormatDateTime(d, cTimeFormat());
 	if (!_fromName.isEmpty()) {
 		_fromNameLabel.setText(st::mediaviewTextStyle, _fromName, Ui::NameTextOptions());
 		_nameNav = myrtlrect(st::mediaviewTextLeft, height() - st::mediaviewTextTop, qMin(_fromNameLabel.maxWidth(), width() / 3), st::mediaviewFont->height);
diff --git a/Telegram/SourceFiles/support/support_helper.cpp b/Telegram/SourceFiles/support/support_helper.cpp
index c660a5de7..ffbd3c1cb 100644
--- a/Telegram/SourceFiles/support/support_helper.cpp
+++ b/Telegram/SourceFiles/support/support_helper.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/chat/attach/attach_prepare.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_entity.h"
 #include "ui/text/text_options.h"
 #include "chat_helpers/message_field.h"
@@ -135,29 +136,6 @@ void EditInfoBox::setInnerFocus() {
 	_field->setFocusFast();
 }
 
-QString FormatDateTime(TimeId value) {
-	const auto now = QDateTime::currentDateTime();
-	const auto date = base::unixtime::parse(value);
-	if (date.date() == now.date()) {
-		return tr::lng_mediaview_today(
-			tr::now,
-			lt_time,
-			date.time().toString(cTimeFormat()));
-	} else if (date.date().addDays(1) == now.date()) {
-		return tr::lng_mediaview_yesterday(
-			tr::now,
-			lt_time,
-			date.time().toString(cTimeFormat()));
-	} else {
-		return tr::lng_mediaview_date_time(
-			tr::now,
-			lt_date,
-			date.date().toString(qsl("dd.MM.yy")),
-			lt_time,
-			date.time().toString(cTimeFormat()));
-	}
-}
-
 uint32 OccupationTag() {
 	return uint32(Core::Sandbox::Instance().installationTag() & 0xFFFFFFFF);
 }
@@ -484,7 +462,10 @@ rpl::producer<QString> Helper::infoLabelValue(
 	return infoValue(
 		user
 	) | rpl::map([](const Support::UserInfo &info) {
-		return info.author + ", " + FormatDateTime(info.date);
+		const auto time = Ui::FormatDateTime(
+			base::unixtime::parse(info.date),
+			cTimeFormat());
+		return info.author + ", " + time;
 	});
 }
 
diff --git a/Telegram/SourceFiles/ui/text/format_values.cpp b/Telegram/SourceFiles/ui/text/format_values.cpp
index 60534c3ad..9cb1e10ba 100644
--- a/Telegram/SourceFiles/ui/text/format_values.cpp
+++ b/Telegram/SourceFiles/ui/text/format_values.cpp
@@ -13,24 +13,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 
-QString FormatSizeText(qint64 size) {
-	if (size >= 1024 * 1024) { // more than 1 mb
-		qint64 sizeTenthMb = (size * 10 / (1024 * 1024));
-		return QString::number(sizeTenthMb / 10) + '.' + QString::number(sizeTenthMb % 10) + u" MB"_q;
-	}
-	if (size >= 1024) {
-		qint64 sizeTenthKb = (size * 10 / 1024);
-		return QString::number(sizeTenthKb / 10) + '.' + QString::number(sizeTenthKb % 10) + u" KB"_q;
-	}
-	return QString::number(size) + u" B"_q;
-}
+namespace {
 
-QString FormatDownloadText(qint64 ready, qint64 total) {
+QString FormatTextWithReadyAndTotal(
+		tr::phrase<lngtag_ready, lngtag_total, lngtag_mb> phrase,
+		qint64 ready,
+		qint64 total) {
 	QString readyStr, totalStr, mb;
 	if (total >= 1024 * 1024) { // more than 1 mb
-		qint64 readyTenthMb = (ready * 10 / (1024 * 1024)), totalTenthMb = (total * 10 / (1024 * 1024));
-		readyStr = QString::number(readyTenthMb / 10) + '.' + QString::number(readyTenthMb % 10);
-		totalStr = QString::number(totalTenthMb / 10) + '.' + QString::number(totalTenthMb % 10);
+		const qint64 readyTenthMb = (ready * 10 / (1024 * 1024));
+		const qint64 totalTenthMb = (total * 10 / (1024 * 1024));
+		readyStr = QString::number(readyTenthMb / 10)
+			+ '.'
+			+ QString::number(readyTenthMb % 10);
+		totalStr = QString::number(totalTenthMb / 10)
+			+ '.'
+			+ QString::number(totalTenthMb % 10);
 		mb = u"MB"_q;
 	} else if (total >= 1024) {
 		qint64 readyKb = (ready / 1024), totalKb = (total / 1024);
@@ -42,7 +40,61 @@ QString FormatDownloadText(qint64 ready, qint64 total) {
 		totalStr = QString::number(total);
 		mb = u"B"_q;
 	}
-	return tr::lng_save_downloaded(tr::now, lt_ready, readyStr, lt_total, totalStr, lt_mb, mb);
+	return phrase(tr::now, lt_ready, readyStr, lt_total, totalStr, lt_mb, mb);
+}
+
+} // namespace
+
+QString FormatSizeText(qint64 size) {
+	if (size >= 1024 * 1024) { // more than 1 mb
+		const qint64 sizeTenthMb = (size * 10 / (1024 * 1024));
+		return QString::number(sizeTenthMb / 10)
+			+ '.'
+			+ QString::number(sizeTenthMb % 10) + u" MB"_q;
+	}
+	if (size >= 1024) {
+		const qint64 sizeTenthKb = (size * 10 / 1024);
+		return QString::number(sizeTenthKb / 10)
+			+ '.'
+			+ QString::number(sizeTenthKb % 10) + u" KB"_q;
+	}
+	return QString::number(size) + u" B"_q;
+}
+
+QString FormatDownloadText(qint64 ready, qint64 total) {
+	return FormatTextWithReadyAndTotal(
+		tr::lng_save_downloaded,
+		ready,
+		total);
+}
+
+QString FormatProgressText(qint64 ready, qint64 total) {
+	return FormatTextWithReadyAndTotal(
+		tr::lng_media_save_progress,
+		ready,
+		total);
+}
+
+QString FormatDateTime(QDateTime date, QString format) {
+	const auto now = QDateTime::currentDateTime();
+	if (date.date() == now.date()) {
+		return tr::lng_mediaview_today(
+			tr::now,
+			lt_time,
+			date.time().toString(format));
+	} else if (date.date().addDays(1) == now.date()) {
+		return tr::lng_mediaview_yesterday(
+			tr::now,
+			lt_time,
+			date.time().toString(format));
+	} else {
+		return tr::lng_mediaview_date_time(
+			tr::now,
+			lt_date,
+			date.date().toString(u"dd.MM.yy"_q),
+			lt_time,
+			date.time().toString(format));
+	}
 }
 
 QString FormatDurationText(qint64 duration) {
diff --git a/Telegram/SourceFiles/ui/text/format_values.h b/Telegram/SourceFiles/ui/text/format_values.h
index 0e0ce8680..15f9b0211 100644
--- a/Telegram/SourceFiles/ui/text/format_values.h
+++ b/Telegram/SourceFiles/ui/text/format_values.h
@@ -15,6 +15,8 @@ inline constexpr auto FileStatusSizeFailed = 0x7FFFFFF2;
 
 [[nodiscard]] QString FormatSizeText(qint64 size);
 [[nodiscard]] QString FormatDownloadText(qint64 ready, qint64 total);
+[[nodiscard]] QString FormatProgressText(qint64 ready, qint64 total);
+[[nodiscard]] QString FormatDateTime(QDateTime date, QString format);
 [[nodiscard]] QString FormatDurationText(qint64 duration);
 [[nodiscard]] QString FormatDurationWords(qint64 duration);
 [[nodiscard]] QString FormatDurationAndSizeText(qint64 duration, qint64 size);

From 16c7ec5b0552a77cd2ea596e32007e79b1aea0f5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 22 Dec 2020 11:24:56 +0300
Subject: [PATCH 353/370] Fixed stack overflow crash in applying draft at end
 of voice recording.

Regression was introduced in 50ed60f443.
---
 .../history/view/controls/history_view_voice_record_bar.cpp  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 3fff14c43..d94d8cc92 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1389,8 +1389,9 @@ void VoiceRecordBar::hideFast() {
 void VoiceRecordBar::stopRecording(StopType type) {
 	using namespace ::Media::Capture;
 	if (type == StopType::Cancel) {
-		_cancelRequests.fire({});
-		instance()->stop();
+		instance()->stop(crl::guard(this, [=](Result &&data) {
+			_cancelRequests.fire({});
+		}));
 		return;
 	}
 	instance()->stop(crl::guard(this, [=](Result &&data) {

From 92bc27805272b1cca7ba00be5583f13e980aacc4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Dec 2020 23:43:23 +0400
Subject: [PATCH 354/370] Allow inviting contacts to voice chats.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/Resources/langs/lang.strings         |   5 +
 Telegram/SourceFiles/apiwrap.cpp              |   8 +-
 Telegram/SourceFiles/apiwrap.h                |   3 +-
 .../SourceFiles/boxes/add_contact_box.cpp     |   5 +-
 .../SourceFiles/boxes/edit_privacy_box.cpp    |  22 +-
 .../boxes/filters/edit_filter_box.cpp         |   4 +-
 .../boxes/filters/edit_filter_chats_list.cpp  |  14 +-
 .../boxes/filters/edit_filter_chats_list.h    |   4 +-
 Telegram/SourceFiles/boxes/peer_list_box.cpp  |  89 +++-
 Telegram/SourceFiles/boxes/peer_list_box.h    |  28 +-
 .../boxes/peer_list_controllers.cpp           |  55 ++-
 .../SourceFiles/boxes/peer_list_controllers.h |  34 +-
 Telegram/SourceFiles/boxes/peer_lists_box.cpp | 429 ++++++++++++++++++
 Telegram/SourceFiles/boxes/peer_lists_box.h   | 101 +++++
 .../boxes/peers/add_participants_box.cpp      |  20 +-
 .../boxes/peers/add_participants_box.h        |  12 +-
 Telegram/SourceFiles/calls/calls.style        |   8 +-
 .../SourceFiles/calls/calls_group_members.cpp |   7 +-
 .../SourceFiles/calls/calls_group_members.h   |   2 +-
 .../SourceFiles/calls/calls_group_panel.cpp   | 320 ++++++++++---
 Telegram/SourceFiles/data/data_group_call.cpp |   2 +-
 .../info_common_groups_inner_widget.cpp       |   4 -
 .../info_common_groups_inner_widget.h         |   1 -
 .../polls/info_polls_results_inner_widget.cpp |   6 -
 .../info/profile/info_profile_actions.cpp     |   2 +-
 .../info/profile/info_profile_members.cpp     |   4 -
 .../info/profile/info_profile_members.h       |   1 -
 .../SourceFiles/platform/win/windows_dlls.cpp |   1 +
 .../settings/settings_privacy_controllers.cpp |  16 +-
 .../SourceFiles/window/window_peer_menu.cpp   |   6 +-
 .../window/window_session_controller.cpp      |   4 +-
 32 files changed, 989 insertions(+), 230 deletions(-)
 create mode 100644 Telegram/SourceFiles/boxes/peer_lists_box.cpp
 create mode 100644 Telegram/SourceFiles/boxes/peer_lists_box.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 2ada5253d..d02ca0028 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -235,6 +235,8 @@ PRIVATE
     boxes/peer_list_box.h
     boxes/peer_list_controllers.cpp
     boxes/peer_list_controllers.h
+    boxes/peer_lists_box.cpp
+    boxes/peer_lists_box.h
     boxes/passcode_box.cpp
     boxes/passcode_box.h
     boxes/photo_crop_box.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 4ced0747c..cedef2dfa 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1835,6 +1835,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_invited_status" = "invited";
 "lng_group_call_invite_title" = "Invite members";
 "lng_group_call_invite_button" = "Invite";
+"lng_group_call_add_to_group_one" = "{user} isn't a member of «{group}» yet. Add them to the group?";
+"lng_group_call_add_to_group_some" = "Some of those users aren't members of «{group}» yet. Add them to the group?";
+"lng_group_call_add_to_group_all" = "Those users aren't members of «{group}» yet. Add them to the group?";
+"lng_group_call_invite_members" = "Group members";
+"lng_group_call_invite_search_results" = "Search results";
 "lng_group_call_new_muted" = "Mute new members";
 "lng_group_call_speakers" = "Speakers";
 "lng_group_call_microphone" = "Microphone";
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 7c94a819f..fa6e25ac9 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3458,7 +3458,8 @@ void ApiWrap::checkForUnreadMentions(
 
 void ApiWrap::addChatParticipants(
 		not_null<PeerData*> peer,
-		const std::vector<not_null<UserData*>> &users) {
+		const std::vector<not_null<UserData*>> &users,
+		Fn<void(bool)> done) {
 	if (const auto chat = peer->asChat()) {
 		for (const auto user : users) {
 			request(MTPmessages_AddChatUser(
@@ -3467,8 +3468,10 @@ void ApiWrap::addChatParticipants(
 				MTP_int(kForwardMessagesOnAdd)
 			)).done([=](const MTPUpdates &result) {
 				applyUpdates(result);
+				if (done) done(true);
 			}).fail([=](const RPCError &error) {
 				ShowAddParticipantsError(error.type(), peer, { 1, user });
+				if (done) done(false);
 			}).afterDelay(crl::time(5)).send();
 		}
 	} else if (const auto channel = peer->asChannel()) {
@@ -3480,14 +3483,17 @@ void ApiWrap::addChatParticipants(
 		auto list = QVector<MTPInputUser>();
 		list.reserve(qMin(int(users.size()), int(kMaxUsersPerInvite)));
 		const auto send = [&] {
+			const auto callback = base::take(done);
 			request(MTPchannels_InviteToChannel(
 				channel->inputChannel,
 				MTP_vector<MTPInputUser>(list)
 			)).done([=](const MTPUpdates &result) {
 				applyUpdates(result);
 				requestParticipantsCountDelayed(channel);
+				if (callback) callback(true);
 			}).fail([=](const RPCError &error) {
 				ShowAddParticipantsError(error.type(), peer, users);
+				if (callback) callback(false);
 			}).afterDelay(crl::time(5)).send();
 		};
 		for (const auto user : users) {
diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index 24c0d0960..dbe80b6f0 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -366,7 +366,8 @@ public:
 		Fn<void()> callbackNotModified = nullptr);
 	void addChatParticipants(
 		not_null<PeerData*> peer,
-		const std::vector<not_null<UserData*>> &users);
+		const std::vector<not_null<UserData*>> &users,
+		Fn<void(bool)> done = nullptr);
 
 	rpl::producer<SendAction> sendActions() const {
 		return _sendActions.events();
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index c0419a5ef..599edfc10 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -632,7 +632,7 @@ void GroupInfoBox::submit() {
 				not_null<PeerListBox*> box) {
 			auto create = [box, title, weak] {
 				if (weak) {
-					auto rows = box->peerListCollectSelectedRows();
+					auto rows = box->collectSelectedRows();
 					if (!rows.empty()) {
 						weak->createGroup(box, title, rows);
 					}
@@ -643,7 +643,8 @@ void GroupInfoBox::submit() {
 		};
 		Ui::show(
 			Box<PeerListBox>(
-				std::make_unique<AddParticipantsBoxController>(_navigation),
+				std::make_unique<AddParticipantsBoxController>(
+					&_navigation->session()),
 				std::move(initBox)),
 			Ui::LayerOption::KeepOther);
 	}
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 3be617c73..453840772 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -33,38 +33,36 @@ namespace {
 class PrivacyExceptionsBoxController : public ChatsListBoxController {
 public:
 	PrivacyExceptionsBoxController(
-		not_null<Window::SessionNavigation*> navigation,
+		not_null<Main::Session*> session,
 		rpl::producer<QString> title,
 		const std::vector<not_null<PeerData*>> &selected);
 
 	Main::Session &session() const override;
 	void rowClicked(not_null<PeerListRow*> row) override;
 
-	std::vector<not_null<PeerData*>> getResult() const;
-
 protected:
 	void prepareViewHook() override;
 	std::unique_ptr<Row> createRow(not_null<History*> history) override;
 
 private:
-	not_null<Window::SessionNavigation*> _navigation;
+	const not_null<Main::Session*> _session;
 	rpl::producer<QString> _title;
 	std::vector<not_null<PeerData*>> _selected;
 
 };
 
 PrivacyExceptionsBoxController::PrivacyExceptionsBoxController(
-	not_null<Window::SessionNavigation*> navigation,
+	not_null<Main::Session*> session,
 	rpl::producer<QString> title,
 	const std::vector<not_null<PeerData*>> &selected)
-: ChatsListBoxController(navigation)
-, _navigation(navigation)
+: ChatsListBoxController(session)
+, _session(session)
 , _title(std::move(title))
 , _selected(selected) {
 }
 
 Main::Session &PrivacyExceptionsBoxController::session() const {
-	return _navigation->session();
+	return *_session;
 }
 
 void PrivacyExceptionsBoxController::prepareViewHook() {
@@ -72,10 +70,6 @@ void PrivacyExceptionsBoxController::prepareViewHook() {
 	delegate()->peerListAddSelectedPeers(_selected);
 }
 
-std::vector<not_null<PeerData*>> PrivacyExceptionsBoxController::getResult() const {
-	return delegate()->peerListCollectSelectedRows();
-}
-
 void PrivacyExceptionsBoxController::rowClicked(not_null<PeerListRow*> row) {
 	const auto peer = row->peer();
 
@@ -146,13 +140,13 @@ void EditPrivacyBox::editExceptions(
 		Exception exception,
 		Fn<void()> done) {
 	auto controller = std::make_unique<PrivacyExceptionsBoxController>(
-		_window,
+		&_window->session(),
 		_controller->exceptionBoxTitle(exception),
 		exceptions(exception));
 	auto initBox = [=, controller = controller.get()](
 			not_null<PeerListBox*> box) {
 		box->addButton(tr::lng_settings_save(), crl::guard(this, [=] {
-			exceptions(exception) = controller->getResult();
+			exceptions(exception) = box->collectSelectedRows();
 			const auto type = [&] {
 				switch (exception) {
 				case Exception::Always: return Exception::Never;
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index 40cc48323..91c800534 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -320,7 +320,7 @@ void EditExceptions(
 	const auto include = (options & Flag::Contacts) != Flags(0);
 	const auto rules = data->current();
 	auto controller = std::make_unique<EditFilterChatsListController>(
-		window,
+		&window->session(),
 		(include
 			? tr::lng_filters_include_title()
 			: tr::lng_filters_exclude_title()),
@@ -331,7 +331,7 @@ void EditExceptions(
 	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->setCloseByOutsideClick(false);
 		box->addButton(tr::lng_settings_save(), crl::guard(context, [=] {
-			const auto peers = box->peerListCollectSelectedRows();
+			const auto peers = box->collectSelectedRows();
 			const auto rules = data->current();
 			auto &&histories = ranges::view::all(
 				peers
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
index 33ff95351..fd8c9cc6d 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp
@@ -68,7 +68,6 @@ public:
 	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
 	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
 	int peerListSelectedRowsCount() override;
-	std::vector<not_null<PeerData*>> peerListCollectSelectedRows() override;
 	void peerListScrollToTop() override;
 	void peerListAddSelectedPeerInBunch(
 		not_null<PeerData*> peer) override;
@@ -209,11 +208,6 @@ int TypeDelegate::peerListSelectedRowsCount() {
 	return 0;
 }
 
-auto TypeDelegate::peerListCollectSelectedRows()
--> std::vector<not_null<PeerData*>> {
-	return {};
-}
-
 void TypeDelegate::peerListScrollToTop() {
 }
 
@@ -347,13 +341,13 @@ void PaintFilterChatsTypeIcon(
 }
 
 EditFilterChatsListController::EditFilterChatsListController(
-	not_null<Window::SessionNavigation*> navigation,
+	not_null<Main::Session*> session,
 	rpl::producer<QString> title,
 	Flags options,
 	Flags selected,
 	const base::flat_set<not_null<History*>> &peers)
-: ChatsListBoxController(navigation)
-, _navigation(navigation)
+: ChatsListBoxController(session)
+, _session(session)
 , _title(std::move(title))
 , _peers(peers)
 , _options(options)
@@ -361,7 +355,7 @@ EditFilterChatsListController::EditFilterChatsListController(
 }
 
 Main::Session &EditFilterChatsListController::session() const {
-	return _navigation->session();
+	return *_session;
 }
 
 void EditFilterChatsListController::rowClicked(not_null<PeerListRow*> row) {
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h
index e993cafb7..4dc777eb2 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.h
@@ -41,7 +41,7 @@ public:
 	using Flags = Data::ChatFilter::Flags;
 
 	EditFilterChatsListController(
-		not_null<Window::SessionNavigation*> navigation,
+		not_null<Main::Session*> session,
 		rpl::producer<QString> title,
 		Flags options,
 		Flags selected,
@@ -64,7 +64,7 @@ private:
 
 	void updateTitle();
 
-	const not_null<Window::SessionNavigation*> _navigation;
+	const not_null<Main::Session*> _session;
 	rpl::producer<QString> _title;
 	base::flat_set<not_null<History*>> _peers;
 	Flags _options;
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 5a957773b..997876596 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -399,7 +399,7 @@ int PeerListBox::peerListSelectedRowsCount() {
 	return _select ? _select->entity()->getItemsCount() : 0;
 }
 
-auto PeerListBox::peerListCollectSelectedRows()
+auto PeerListBox::collectSelectedRows()
 -> std::vector<not_null<PeerData*>> {
 	auto result = std::vector<not_null<PeerData*>>();
 	auto items = _select
@@ -982,6 +982,18 @@ void PeerListContent::setAboveWidget(object_ptr<TWidget> widget) {
 	}
 }
 
+void PeerListContent::setAboveSearchWidget(object_ptr<TWidget> widget) {
+	_aboveSearchWidget = std::move(widget);
+	if (_aboveSearchWidget) {
+		_aboveSearchWidget->setParent(this);
+	}
+}
+
+void PeerListContent::setHideEmpty(bool hide) {
+	_hideEmpty = hide;
+	resizeToWidth(width());
+}
+
 void PeerListContent::setBelowWidget(object_ptr<TWidget> widget) {
 	_belowWidget = std::move(widget);
 	if (_belowWidget) {
@@ -990,6 +1002,9 @@ void PeerListContent::setBelowWidget(object_ptr<TWidget> widget) {
 }
 
 int PeerListContent::labelHeight() const {
+	if (_hideEmpty && !shownRowsCount()) {
+		return 0;
+	}
 	auto computeLabelHeight = [](auto &label) {
 		if (!label) {
 			return 0;
@@ -1082,34 +1097,45 @@ void PeerListContent::paintEvent(QPaintEvent *e) {
 }
 
 int PeerListContent::resizeGetHeight(int newWidth) {
+	const auto rowsCount = shownRowsCount();
+	const auto hideAll = !rowsCount && _hideEmpty;
 	_aboveHeight = 0;
 	if (_aboveWidget) {
 		_aboveWidget->resizeToWidth(newWidth);
 		_aboveWidget->moveToLeft(0, 0, newWidth);
-		if (showingSearch()) {
+		if (hideAll || showingSearch()) {
 			_aboveWidget->hide();
 		} else {
 			_aboveWidget->show();
 			_aboveHeight = _aboveWidget->height();
 		}
 	}
-	const auto rowsCount = shownRowsCount();
+	if (_aboveSearchWidget) {
+		_aboveSearchWidget->resizeToWidth(newWidth);
+		_aboveSearchWidget->moveToLeft(0, 0, newWidth);
+		if (hideAll || !showingSearch()) {
+			_aboveSearchWidget->hide();
+		} else {
+			_aboveSearchWidget->show();
+			_aboveHeight = _aboveSearchWidget->height();
+		}
+	}
 	const auto labelTop = rowsTop() + qMax(1, shownRowsCount()) * _rowHeight;
 	const auto labelWidth = newWidth - 2 * st::contactsPadding.left();
 	if (_description) {
 		_description->resizeToWidth(labelWidth);
 		_description->moveToLeft(st::contactsPadding.left(), labelTop + st::membersAboutLimitPadding.top(), newWidth);
-		_description->setVisible(!showingSearch());
+		_description->setVisible(!hideAll && !showingSearch());
 	}
 	if (_searchNoResults) {
 		_searchNoResults->resizeToWidth(labelWidth);
 		_searchNoResults->moveToLeft(st::contactsPadding.left(), labelTop + st::membersAboutLimitPadding.top(), newWidth);
-		_searchNoResults->setVisible(showingSearch() && _filterResults.empty() && !_controller->isSearchLoading());
+		_searchNoResults->setVisible(!hideAll && showingSearch() && _filterResults.empty() && !_controller->isSearchLoading());
 	}
 	if (_searchLoading) {
 		_searchLoading->resizeToWidth(labelWidth);
 		_searchLoading->moveToLeft(st::contactsPadding.left(), labelTop + st::membersAboutLimitPadding.top(), newWidth);
-		_searchLoading->setVisible(showingSearch() && _filterResults.empty() && _controller->isSearchLoading());
+		_searchLoading->setVisible(!hideAll && showingSearch() && _filterResults.empty() && _controller->isSearchLoading());
 	}
 	const auto label = labelHeight();
 	const auto belowTop = (label > 0 || rowsCount > 0)
@@ -1119,7 +1145,7 @@ int PeerListContent::resizeGetHeight(int newWidth) {
 	if (_belowWidget) {
 		_belowWidget->resizeToWidth(newWidth);
 		_belowWidget->moveToLeft(0, belowTop, newWidth);
-		if (showingSearch()) {
+		if (hideAll || showingSearch()) {
 			_belowWidget->hide();
 		} else {
 			_belowWidget->show();
@@ -1351,15 +1377,18 @@ crl::time PeerListContent::paintRow(
 	return (refreshStatusAt - ms);
 }
 
-void PeerListContent::selectSkip(int direction) {
-	if (_pressed.index.value >= 0) {
-		return;
+PeerListContent::SkipResult PeerListContent::selectSkip(int direction) {
+	if (hasPressed()) {
+		return { _selected.index.value, _selected.index.value };
 	}
 	_mouseSelection = false;
 	_lastMousePosition = std::nullopt;
 
 	auto newSelectedIndex = _selected.index.value + direction;
 
+	auto result = SkipResult();
+	result.shouldMoveTo = newSelectedIndex;
+
 	auto rowsCount = shownRowsCount();
 	auto index = 0;
 	auto firstEnabled = -1, lastEnabled = -1;
@@ -1415,14 +1444,36 @@ void PeerListContent::selectSkip(int direction) {
 	}
 
 	update();
+
+	_selectedIndex = _selected.index.value;
+	result.reallyMovedTo = _selected.index.value;
+	return result;
 }
 
 void PeerListContent::selectSkipPage(int height, int direction) {
 	auto rowsToSkip = height / _rowHeight;
-	if (!rowsToSkip) return;
+	if (!rowsToSkip) {
+		return;
+	}
 	selectSkip(rowsToSkip * direction);
 }
 
+rpl::producer<int> PeerListContent::selectedIndexValue() const {
+	return _selectedIndex.value();
+}
+
+bool PeerListContent::hasSelection() const {
+	return _selected.index.value >= 0;
+}
+
+bool PeerListContent::hasPressed() const {
+	return _pressed.index.value >= 0;
+}
+
+void PeerListContent::clearSelection() {
+	setSelected(Selected());
+}
+
 void PeerListContent::loadProfilePhotos() {
 	if (_visibleTop >= _visibleBottom) return;
 
@@ -1569,14 +1620,17 @@ void PeerListContent::setSearchQuery(
 	clearSearchRows();
 }
 
-void PeerListContent::submitted() {
+bool PeerListContent::submitted() {
 	if (const auto row = getRow(_selected.index)) {
 		_controller->rowClicked(row);
+		return true;
 	} else if (showingSearch()) {
 		if (const auto row = getRow(RowIndex(0))) {
 			_controller->rowClicked(row);
+			return true;
 		}
 	}
+	return false;
 }
 
 void PeerListContent::visibleTopBottomUpdated(
@@ -1590,11 +1644,14 @@ void PeerListContent::visibleTopBottomUpdated(
 
 void PeerListContent::setSelected(Selected selected) {
 	updateRow(_selected.index);
-	if (_selected != selected) {
-		_selected = selected;
-		updateRow(_selected.index);
-		setCursor(_selected.action ? style::cur_pointer : style::cur_default);
+	if (_selected == selected) {
+		return;
 	}
+	_selected = selected;
+	updateRow(_selected.index);
+	setCursor(_selected.action ? style::cur_pointer : style::cur_default);
+
+	_selectedIndex = _selected.index.value;
 }
 
 void PeerListContent::setContexted(Selected contexted) {
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index f5cedcbbc..0a8332c4e 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -254,10 +254,12 @@ class PeerListDelegate {
 public:
 	virtual void peerListSetTitle(rpl::producer<QString> title) = 0;
 	virtual void peerListSetAdditionalTitle(rpl::producer<QString> title) = 0;
+	virtual void peerListSetHideEmpty(bool hide) = 0;
 	virtual void peerListSetDescription(object_ptr<Ui::FlatLabel> description) = 0;
 	virtual void peerListSetSearchLoading(object_ptr<Ui::FlatLabel> loading) = 0;
 	virtual void peerListSetSearchNoResults(object_ptr<Ui::FlatLabel> noResults) = 0;
 	virtual void peerListSetAboveWidget(object_ptr<TWidget> aboveWidget) = 0;
+	virtual void peerListSetAboveSearchWidget(object_ptr<TWidget> aboveWidget) = 0;
 	virtual void peerListSetBelowWidget(object_ptr<TWidget> belowWidget) = 0;
 	virtual void peerListSetSearchMode(PeerListSearchMode mode) = 0;
 	virtual void peerListAppendRow(std::unique_ptr<PeerListRow> row) = 0;
@@ -299,7 +301,6 @@ public:
 	}
 
 	virtual int peerListSelectedRowsCount() = 0;
-	virtual std::vector<not_null<PeerData*>> peerListCollectSelectedRows() = 0;
 	virtual std::unique_ptr<PeerListState> peerListSaveState() const = 0;
 	virtual void peerListRestoreState(
 		std::unique_ptr<PeerListState> state) = 0;
@@ -499,13 +500,20 @@ public:
 		QWidget *parent,
 		not_null<PeerListController*> controller);
 
-	void selectSkip(int direction);
+	struct SkipResult {
+		int shouldMoveTo = 0;
+		int reallyMovedTo = 0;
+	};
+	SkipResult selectSkip(int direction);
 	void selectSkipPage(int height, int direction);
 
+	[[nodiscard]] rpl::producer<int> selectedIndexValue() const;
+	[[nodiscard]] bool hasSelection() const;
+	[[nodiscard]] bool hasPressed() const;
 	void clearSelection();
 
 	void searchQueryChanged(QString query);
-	void submitted();
+	bool submitted();
 
 	// Interface for the controller.
 	void appendRow(std::unique_ptr<PeerListRow> row);
@@ -525,7 +533,9 @@ public:
 	void setSearchLoading(object_ptr<Ui::FlatLabel> loading);
 	void setSearchNoResults(object_ptr<Ui::FlatLabel> noResults);
 	void setAboveWidget(object_ptr<TWidget> widget);
+	void setAboveSearchWidget(object_ptr<TWidget> widget);
 	void setBelowWidget(object_ptr<TWidget> width);
+	void setHideEmpty(bool hide);
 	void refreshRows();
 
 	void setSearchMode(PeerListSearchMode mode);
@@ -667,6 +677,7 @@ private:
 	Selected _selected;
 	Selected _pressed;
 	Selected _contexted;
+	rpl::variable<int> _selectedIndex = -1;
 	bool _mouseSelection = false;
 	std::optional<QPoint> _lastMousePosition;
 	Qt::MouseButton _pressButton = Qt::LeftButton;
@@ -685,7 +696,9 @@ private:
 
 	int _aboveHeight = 0;
 	int _belowHeight = 0;
+	bool _hideEmpty = false;
 	object_ptr<TWidget> _aboveWidget = { nullptr };
+	object_ptr<TWidget> _aboveSearchWidget = { nullptr };
 	object_ptr<TWidget> _belowWidget = { nullptr };
 	object_ptr<Ui::FlatLabel> _description = { nullptr };
 	object_ptr<Ui::FlatLabel> _searchNoResults = { nullptr };
@@ -703,6 +716,9 @@ public:
 		_content = content;
 	}
 
+	void peerListSetHideEmpty(bool hide) override {
+		_content->setHideEmpty(hide);
+	}
 	void peerListAppendRow(
 			std::unique_ptr<PeerListRow> row) override {
 		_content->appendRow(std::move(row));
@@ -767,6 +783,9 @@ public:
 	void peerListSetAboveWidget(object_ptr<TWidget> aboveWidget) override {
 		_content->setAboveWidget(std::move(aboveWidget));
 	}
+	void peerListSetAboveSearchWidget(object_ptr<TWidget> aboveWidget) override {
+		_content->setAboveSearchWidget(std::move(aboveWidget));
+	}
 	void peerListSetBelowWidget(object_ptr<TWidget> belowWidget) override {
 		_content->setBelowWidget(std::move(belowWidget));
 	}
@@ -824,6 +843,8 @@ public:
 		std::unique_ptr<PeerListController> controller,
 		Fn<void(not_null<PeerListBox*>)> init);
 
+	[[nodiscard]] std::vector<not_null<PeerData*>> collectSelectedRows();
+
 	void peerListSetTitle(rpl::producer<QString> title) override {
 		setTitle(std::move(title));
 	}
@@ -840,7 +861,6 @@ public:
 		anim::type animated) override;
 	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
 	int peerListSelectedRowsCount() override;
-	std::vector<not_null<PeerData*>> peerListCollectSelectedRows() override;
 	void peerListScrollToTop() override;
 
 protected:
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 4b8041fab..e16f9136a 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -23,7 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "history/history.h"
 #include "dialogs/dialogs_main_list.h"
-#include "window/window_session_controller.h"
+#include "window/window_session_controller.h" // onShowAddContact()
 #include "facades.h"
 #include "styles/style_boxes.h"
 #include "styles/style_profile.h"
@@ -115,7 +115,8 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 			[=] { controller->widget()->onShowAddContact(); });
 	};
 	return Box<PeerListBox>(
-		std::make_unique<ContactsBoxController>(controller),
+		std::make_unique<ContactsBoxController>(
+			&sessionController->session()),
 		std::move(delegate));
 }
 
@@ -159,9 +160,9 @@ void PeerListRowWithLink::paintAction(
 }
 
 PeerListGlobalSearchController::PeerListGlobalSearchController(
-	not_null<Window::SessionNavigation*> navigation)
-: _navigation(navigation)
-, _api(&_navigation->session().mtp()) {
+	not_null<Main::Session*> session)
+: _session(session)
+, _api(&session->mtp()) {
 	_timer.setCallback([this] { searchOnServer(); });
 }
 
@@ -210,8 +211,8 @@ void PeerListGlobalSearchController::searchDone(
 	auto &contacts = result.c_contacts_found();
 	auto query = _query;
 	if (requestId) {
-		_navigation->session().data().processUsers(contacts.vusers());
-		_navigation->session().data().processChats(contacts.vchats());
+		_session->data().processUsers(contacts.vusers());
+		_session->data().processChats(contacts.vchats());
 		auto it = _queries.find(requestId);
 		if (it != _queries.cend()) {
 			query = it->second;
@@ -221,7 +222,7 @@ void PeerListGlobalSearchController::searchDone(
 	}
 	const auto feedList = [&](const MTPVector<MTPPeer> &list) {
 		for (const auto &mtpPeer : list.v) {
-			const auto peer = _navigation->session().data().peerLoaded(
+			const auto peer = _session->data().peerLoaded(
 				peerFromMTP(mtpPeer));
 			if (peer) {
 				delegate()->peerListSearchAddRow(peer);
@@ -246,9 +247,9 @@ ChatsListBoxController::Row::Row(not_null<History*> history)
 }
 
 ChatsListBoxController::ChatsListBoxController(
-	not_null<Window::SessionNavigation*> navigation)
+	not_null<Main::Session*> session)
 : ChatsListBoxController(
-	std::make_unique<PeerListGlobalSearchController>(navigation)) {
+	std::make_unique<PeerListGlobalSearchController>(session)) {
 }
 
 ChatsListBoxController::ChatsListBoxController(
@@ -354,21 +355,21 @@ bool ChatsListBoxController::appendRow(not_null<History*> history) {
 }
 
 ContactsBoxController::ContactsBoxController(
-	not_null<Window::SessionNavigation*> navigation)
-: PeerListController(
-	std::make_unique<PeerListGlobalSearchController>(navigation))
-, _navigation(navigation) {
+	not_null<Main::Session*> session)
+: ContactsBoxController(
+	session,
+	std::make_unique<PeerListGlobalSearchController>(session)) {
 }
 
 ContactsBoxController::ContactsBoxController(
-	not_null<Window::SessionNavigation*> navigation,
+	not_null<Main::Session*> session,
 	std::unique_ptr<PeerListSearchController> searchController)
 : PeerListController(std::move(searchController))
-, _navigation(navigation) {
+, _session(session) {
 }
 
 Main::Session &ContactsBoxController::session() const {
-	return _navigation->session();
+	return *_session;
 }
 
 void ContactsBoxController::prepare() {
@@ -435,26 +436,24 @@ bool ContactsBoxController::appendRow(not_null<UserData*> user) {
 	return false;
 }
 
-std::unique_ptr<PeerListRow> ContactsBoxController::createRow(not_null<UserData*> user) {
+std::unique_ptr<PeerListRow> ContactsBoxController::createRow(
+		not_null<UserData*> user) {
 	return std::make_unique<PeerListRow>(user);
 }
 
-void AddBotToGroupBoxController::Start(
-		not_null<Window::SessionNavigation*> navigation,
-		not_null<UserData*> bot) {
+void AddBotToGroupBoxController::Start(not_null<UserData*> bot) {
 	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->addButton(tr::lng_cancel(), [box] { box->closeBox(); });
 	};
 	Ui::show(Box<PeerListBox>(
-		std::make_unique<AddBotToGroupBoxController>(navigation, bot),
+		std::make_unique<AddBotToGroupBoxController>(bot),
 		std::move(initBox)));
 }
 
 AddBotToGroupBoxController::AddBotToGroupBoxController(
-	not_null<Window::SessionNavigation*> navigation,
 	not_null<UserData*> bot)
 : ChatsListBoxController(SharingBotGame(bot)
-	? std::make_unique<PeerListGlobalSearchController>(navigation)
+	? std::make_unique<PeerListGlobalSearchController>(&bot->session())
 	: nullptr)
 , _bot(bot) {
 }
@@ -572,15 +571,15 @@ void AddBotToGroupBoxController::prepareViewHook() {
 }
 
 ChooseRecipientBoxController::ChooseRecipientBoxController(
-	not_null<Window::SessionNavigation*> navigation,
+	not_null<Main::Session*> session,
 	FnMut<void(not_null<PeerData*>)> callback)
-: ChatsListBoxController(navigation)
-, _navigation(navigation)
+: ChatsListBoxController(session)
+, _session(session)
 , _callback(std::move(callback)) {
 }
 
 Main::Session &ChooseRecipientBoxController::session() const {
-	return _navigation->session();
+	return *_session;
 }
 
 void ChooseRecipientBoxController::prepareViewHook() {
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.h b/Telegram/SourceFiles/boxes/peer_list_controllers.h
index 17d495241..3794d1eab 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.h
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.h
@@ -32,7 +32,6 @@ class History;
 
 namespace Window {
 class SessionController;
-class SessionNavigation;
 } // namespace Window
 
 [[nodiscard]] object_ptr<Ui::BoxContent> PrepareContactsBox(
@@ -65,8 +64,7 @@ private:
 
 class PeerListGlobalSearchController : public PeerListSearchController {
 public:
-	PeerListGlobalSearchController(
-		not_null<Window::SessionNavigation*> navigation);
+	explicit PeerListGlobalSearchController(not_null<Main::Session*> session);
 
 	void searchQuery(const QString &query) override;
 	bool isLoading() override;
@@ -79,7 +77,7 @@ private:
 	void searchOnServer();
 	void searchDone(const MTPcontacts_Found &result, mtpRequestId requestId);
 
-	const not_null<Window::SessionNavigation*> _navigation;
+	const not_null<Main::Session*> _session;
 	MTP::Sender _api;
 	base::Timer _timer;
 	QString _query;
@@ -104,7 +102,7 @@ public:
 
 	};
 
-	ChatsListBoxController(not_null<Window::SessionNavigation*> navigation);
+	ChatsListBoxController(not_null<Main::Session*> session);
 	ChatsListBoxController(
 		std::unique_ptr<PeerListSearchController> searchController);
 
@@ -127,15 +125,15 @@ private:
 
 class ContactsBoxController : public PeerListController {
 public:
+	explicit ContactsBoxController(not_null<Main::Session*> session);
 	ContactsBoxController(
-		not_null<Window::SessionNavigation*> navigation);
-	ContactsBoxController(
-		not_null<Window::SessionNavigation*> navigation,
+		not_null<Main::Session*> session,
 		std::unique_ptr<PeerListSearchController> searchController);
 
-	Main::Session &session() const override;
+	[[nodiscard]] Main::Session &session() const override;
 	void prepare() override final;
-	std::unique_ptr<PeerListRow> createSearchRow(not_null<PeerData*> peer) override final;
+	[[nodiscard]] std::unique_ptr<PeerListRow> createSearchRow(
+		not_null<PeerData*> peer) override final;
 	void rowClicked(not_null<PeerListRow*> row) override;
 
 protected:
@@ -150,7 +148,7 @@ private:
 	void checkForEmptyRows();
 	bool appendRow(not_null<UserData*> user);
 
-	const not_null<Window::SessionNavigation*> _navigation;
+	const not_null<Main::Session*> _session;
 
 };
 
@@ -158,13 +156,9 @@ class AddBotToGroupBoxController
 	: public ChatsListBoxController
 	, public base::has_weak_ptr {
 public:
-	static void Start(
-		not_null<Window::SessionNavigation*> navigation,
-		not_null<UserData*> bot);
+	static void Start(not_null<UserData*> bot);
 
-	AddBotToGroupBoxController(
-		not_null<Window::SessionNavigation*> navigation,
-		not_null<UserData*> bot);
+	explicit AddBotToGroupBoxController(not_null<UserData*> bot);
 
 	Main::Session &session() const override;
 	void rowClicked(not_null<PeerListRow*> row) override;
@@ -186,7 +180,7 @@ private:
 	void shareBotGame(not_null<PeerData*> chat);
 	void addBotToGroup(not_null<PeerData*> chat);
 
-	not_null<UserData*> _bot;
+	const not_null<UserData*> _bot;
 
 };
 
@@ -195,7 +189,7 @@ class ChooseRecipientBoxController
 	, public base::has_weak_ptr {
 public:
 	ChooseRecipientBoxController(
-		not_null<Window::SessionNavigation*> navigation,
+		not_null<Main::Session*> session,
 		FnMut<void(not_null<PeerData*>)> callback);
 
 	Main::Session &session() const override;
@@ -210,7 +204,7 @@ protected:
 	std::unique_ptr<Row> createRow(not_null<History*> history) override;
 
 private:
-	const not_null<Window::SessionNavigation*> _navigation;
+	const not_null<Main::Session*> _session;
 	FnMut<void(not_null<PeerData*>)> _callback;
 
 };
diff --git a/Telegram/SourceFiles/boxes/peer_lists_box.cpp b/Telegram/SourceFiles/boxes/peer_lists_box.cpp
new file mode 100644
index 000000000..7ea2c91b4
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peer_lists_box.cpp
@@ -0,0 +1,429 @@
+/*
+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 "boxes/peer_lists_box.h"
+
+#include "lang/lang_keys.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "ui/widgets/multi_select.h"
+#include "ui/widgets/scroll_area.h"
+#include "main/main_session.h"
+#include "data/data_session.h"
+#include "data/data_peer.h"
+#include "styles/style_boxes.h"
+#include "styles/style_layers.h"
+
+PeerListsBox::PeerListsBox(
+	QWidget*,
+	std::vector<std::unique_ptr<PeerListController>> controllers,
+	Fn<void(not_null<PeerListsBox*>)> init)
+: _lists(makeLists(std::move(controllers)))
+, _init(std::move(init)) {
+	Expects(!_lists.empty());
+}
+
+auto PeerListsBox::collectSelectedRows()
+-> std::vector<not_null<PeerData*>> {
+	auto result = std::vector<not_null<PeerData*>>();
+	auto items = _select
+		? _select->entity()->getItems()
+		: QVector<uint64>();
+	if (!items.empty()) {
+		result.reserve(items.size());
+		const auto session = &firstController()->session();
+		for (const auto itemId : items) {
+			const auto foreign = [&] {
+				for (const auto &list : _lists) {
+					if (list.controller->isForeignRow(itemId)) {
+						return true;
+					}
+				}
+				return false;
+			}();
+			if (!foreign) {
+				result.push_back(session->data().peer(itemId));
+			}
+		}
+	}
+	return result;
+}
+
+
+PeerListsBox::List PeerListsBox::makeList(
+		std::unique_ptr<PeerListController> controller) {
+	auto delegate = std::make_unique<Delegate>(this, controller.get());
+	return {
+		std::move(controller),
+		std::move(delegate),
+	};
+}
+
+std::vector<PeerListsBox::List> PeerListsBox::makeLists(
+		std::vector<std::unique_ptr<PeerListController>> controllers) {
+	auto result = std::vector<List>();
+	result.reserve(controllers.size());
+	for (auto &controller : controllers) {
+		result.push_back(makeList(std::move(controller)));
+	}
+	return result;
+}
+
+not_null<PeerListController*> PeerListsBox::firstController() const {
+	return _lists.front().controller.get();
+}
+
+void PeerListsBox::createMultiSelect() {
+	Expects(_select == nullptr);
+
+	auto entity = object_ptr<Ui::MultiSelect>(
+		this,
+		(firstController()->selectSt()
+			? *firstController()->selectSt()
+			: st::defaultMultiSelect),
+		tr::lng_participant_filter());
+	_select.create(this, std::move(entity));
+	_select->heightValue(
+	) | rpl::start_with_next(
+		[this] { updateScrollSkips(); },
+		lifetime());
+	_select->entity()->setSubmittedCallback([=](Qt::KeyboardModifiers) {
+		for (const auto &list : _lists) {
+			if (list.content->submitted()) {
+				break;
+			}
+		}
+	});
+	_select->entity()->setQueryChangedCallback([=](const QString &query) {
+		searchQueryChanged(query);
+	});
+	_select->entity()->setItemRemovedCallback([=](uint64 itemId) {
+		for (const auto &list : _lists) {
+			if (list.controller->handleDeselectForeignRow(itemId)) {
+				return;
+			}
+		}
+		const auto session = &firstController()->session();
+		if (const auto peer = session->data().peerLoaded(itemId)) {
+			const auto id = peer->id;
+			for (const auto &list : _lists) {
+				if (const auto row = list.delegate->peerListFindRow(id)) {
+					list.content->changeCheckState(
+						row,
+						false,
+						anim::type::normal);
+					update();
+				}
+				list.controller->itemDeselectedHook(peer);
+			}
+		}
+	});
+	_select->resizeToWidth(firstController()->contentWidth());
+	_select->moveToLeft(0, 0);
+}
+
+int PeerListsBox::getTopScrollSkip() const {
+	auto result = 0;
+	if (_select && !_select->isHidden()) {
+		result += _select->height();
+	}
+	return result;
+}
+
+void PeerListsBox::updateScrollSkips() {
+	// If we show / hide the search field scroll top is fixed.
+	// If we resize search field by bubbles scroll bottom is fixed.
+	setInnerTopSkip(getTopScrollSkip(), _scrollBottomFixed);
+	if (!_select->animating()) {
+		_scrollBottomFixed = true;
+	}
+}
+
+void PeerListsBox::prepare() {
+	auto rows = setInnerWidget(
+		object_ptr<Ui::VerticalLayout>(this),
+		st::boxScroll);
+	for (auto &list : _lists) {
+		const auto content = rows->add(object_ptr<PeerListContent>(
+			rows,
+			list.controller.get()));
+		list.content = content;
+		list.delegate->setContent(content);
+		list.controller->setDelegate(list.delegate.get());
+
+		content->scrollToRequests(
+		) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
+			const auto skip = content->y();
+			onScrollToY(
+				skip + request.ymin,
+				(request.ymax >= 0) ? (skip + request.ymax) : request.ymax);
+		}, lifetime());
+
+		content->selectedIndexValue(
+		) | rpl::filter([=](int index) {
+			return (index >= 0);
+		}) | rpl::start_with_next([=] {
+			for (const auto &list : _lists) {
+				if (list.content && list.content != content) {
+					list.content->clearSelection();
+				}
+			}
+		}, lifetime());
+	}
+	rows->resizeToWidth(firstController()->contentWidth());
+
+	setDimensions(firstController()->contentWidth(), st::boxMaxListHeight);
+	if (_select) {
+		_select->finishAnimating();
+		Ui::SendPendingMoveResizeEvents(_select);
+		_scrollBottomFixed = true;
+		onScrollToY(0);
+	}
+
+	if (_init) {
+		_init(this);
+	}
+}
+
+void PeerListsBox::keyPressEvent(QKeyEvent *e) {
+	const auto skipRows = [&](int rows) {
+		if (rows == 0) {
+			return;
+		}
+		for (const auto &list : _lists) {
+			if (list.content->hasPressed()) {
+				return;
+			}
+		}
+		const auto from = begin(_lists), till = end(_lists);
+		auto i = from;
+		for (; i != till; ++i) {
+			if (i->content->hasSelection()) {
+				break;
+			}
+		}
+		if (i == till && rows < 0) {
+			return;
+		}
+		if (rows > 0) {
+			if (i == till) {
+				i = from;
+			}
+			for (; i != till; ++i) {
+				const auto result = i->content->selectSkip(rows);
+				if (result.shouldMoveTo - result.reallyMovedTo >= rows) {
+					continue;
+				} else if (result.reallyMovedTo >= result.shouldMoveTo) {
+					return;
+				} else {
+					rows = result.shouldMoveTo - result.reallyMovedTo;
+				}
+			}
+		} else {
+			for (++i; i != from;) {
+				const auto result = (--i)->content->selectSkip(rows);
+				if (result.shouldMoveTo - result.reallyMovedTo <= rows) {
+					continue;
+				} else if (result.reallyMovedTo <= result.shouldMoveTo) {
+					return;
+				} else {
+					rows = result.shouldMoveTo - result.reallyMovedTo;
+				}
+			}
+		}
+	};
+	const auto rowsInPage = [&] {
+		const auto rowHeight = firstController()->computeListSt().item.height;
+		return height() / rowHeight;
+	};
+	if (e->key() == Qt::Key_Down) {
+		skipRows(1);
+	} else if (e->key() == Qt::Key_Up) {
+		skipRows(-1);
+	} else if (e->key() == Qt::Key_PageDown) {
+		skipRows(rowsInPage());
+	} else if (e->key() == Qt::Key_PageUp) {
+		skipRows(-rowsInPage());
+	} else if (e->key() == Qt::Key_Escape && _select && !_select->entity()->getQuery().isEmpty()) {
+		_select->entity()->clearQuery();
+	} else {
+		BoxContent::keyPressEvent(e);
+	}
+}
+
+void PeerListsBox::searchQueryChanged(const QString &query) {
+	onScrollToY(0);
+	for (const auto &list : _lists) {
+		list.content->searchQueryChanged(query);
+	}
+}
+
+void PeerListsBox::resizeEvent(QResizeEvent *e) {
+	BoxContent::resizeEvent(e);
+
+	if (_select) {
+		_select->resizeToWidth(width());
+		_select->moveToLeft(0, 0);
+
+		updateScrollSkips();
+	}
+
+	for (const auto &list : _lists) {
+		list.content->resizeToWidth(width());
+	}
+}
+
+void PeerListsBox::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+
+	const auto &bg = (firstController()->listSt()
+		? *firstController()->listSt()
+		: st::peerListBox).bg;
+	for (const auto rect : e->region()) {
+		p.fillRect(rect, bg);
+	}
+}
+
+void PeerListsBox::setInnerFocus() {
+	if (!_select || !_select->toggled()) {
+		_lists.front().content->setFocus();
+	} else {
+		_select->entity()->setInnerFocus();
+	}
+}
+
+PeerListsBox::Delegate::Delegate(
+	not_null<PeerListsBox*> box,
+	not_null<PeerListController*> controller)
+: _box(box)
+, _controller(controller) {
+}
+
+void PeerListsBox::Delegate::peerListSetTitle(rpl::producer<QString> title) {
+}
+
+void PeerListsBox::Delegate::peerListSetAdditionalTitle(
+	rpl::producer<QString> title) {
+}
+
+void PeerListsBox::Delegate::peerListSetRowChecked(
+		not_null<PeerListRow*> row,
+		bool checked) {
+	if (checked) {
+		_box->addSelectItem(row, anim::type::normal);
+		PeerListContentDelegate::peerListSetRowChecked(row, checked);
+		peerListUpdateRow(row);
+
+		// This call deletes row from _searchRows.
+		_box->_select->entity()->clearQuery();
+	} else {
+		// The itemRemovedCallback will call changeCheckState() here.
+		_box->_select->entity()->removeItem(row->id());
+		peerListUpdateRow(row);
+	}
+}
+
+void PeerListsBox::Delegate::peerListSetForeignRowChecked(
+		not_null<PeerListRow*> row,
+		bool checked,
+		anim::type animated) {
+	if (checked) {
+		_box->addSelectItem(row, animated);
+
+		// This call deletes row from _searchRows.
+		_box->_select->entity()->clearQuery();
+	} else {
+		// The itemRemovedCallback will call changeCheckState() here.
+		_box->_select->entity()->removeItem(row->id());
+	}
+}
+
+void PeerListsBox::Delegate::peerListScrollToTop() {
+	_box->onScrollToY(0);
+}
+
+void PeerListsBox::Delegate::peerListSetSearchMode(PeerListSearchMode mode) {
+	PeerListContentDelegate::peerListSetSearchMode(mode);
+	_box->setSearchMode(mode);
+}
+
+void PeerListsBox::setSearchMode(PeerListSearchMode mode) {
+	auto selectVisible = (mode != PeerListSearchMode::Disabled);
+	if (selectVisible && !_select) {
+		createMultiSelect();
+		_select->toggle(!selectVisible, anim::type::instant);
+	}
+	if (_select) {
+		_select->toggle(selectVisible, anim::type::normal);
+		_scrollBottomFixed = false;
+		setInnerFocus();
+	}
+}
+
+void PeerListsBox::Delegate::peerListFinishSelectedRowsBunch() {
+	Expects(_box->_select != nullptr);
+
+	_box->_select->entity()->finishItemsBunch();
+}
+
+bool PeerListsBox::Delegate::peerListIsRowChecked(
+		not_null<PeerListRow*> row) {
+	return _box->_select
+		? _box->_select->entity()->hasItem(row->id())
+		: false;
+}
+
+int PeerListsBox::Delegate::peerListSelectedRowsCount() {
+	return _box->_select ? _box->_select->entity()->getItemsCount() : 0;
+}
+
+void PeerListsBox::addSelectItem(
+		not_null<PeerData*> peer,
+		anim::type animated) {
+	addSelectItem(
+		peer->id,
+		peer->shortName(),
+		PaintUserpicCallback(peer, false),
+		animated);
+}
+
+void PeerListsBox::addSelectItem(
+		not_null<PeerListRow*> row,
+		anim::type animated) {
+	addSelectItem(
+		row->id(),
+		row->generateShortName(),
+		row->generatePaintUserpicCallback(),
+		animated);
+}
+
+void PeerListsBox::addSelectItem(
+		uint64 itemId,
+		const QString &text,
+		Ui::MultiSelect::PaintRoundImage paintUserpic,
+		anim::type animated) {
+	if (!_select) {
+		createMultiSelect();
+		_select->hide(anim::type::instant);
+	}
+	const auto &activeBg = (firstController()->selectSt()
+		? *firstController()->selectSt()
+		: st::defaultMultiSelect).item.textActiveBg;
+	if (animated == anim::type::instant) {
+		_select->entity()->addItemInBunch(
+			itemId,
+			text,
+			activeBg,
+			std::move(paintUserpic));
+	} else {
+		_select->entity()->addItem(
+			itemId,
+			text,
+			activeBg,
+			std::move(paintUserpic));
+	}
+}
diff --git a/Telegram/SourceFiles/boxes/peer_lists_box.h b/Telegram/SourceFiles/boxes/peer_lists_box.h
new file mode 100644
index 000000000..09e8e92e2
--- /dev/null
+++ b/Telegram/SourceFiles/boxes/peer_lists_box.h
@@ -0,0 +1,101 @@
+/*
+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 "boxes/peer_list_box.h"
+
+class PeerListsBox : public Ui::BoxContent {
+public:
+	PeerListsBox(
+		QWidget*,
+		std::vector<std::unique_ptr<PeerListController>> controllers,
+		Fn<void(not_null<PeerListsBox*>)> init);
+
+	[[nodiscard]] std::vector<not_null<PeerData*>> collectSelectedRows();
+
+protected:
+	void prepare() override;
+	void setInnerFocus() override;
+
+	void keyPressEvent(QKeyEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	class Delegate final : public PeerListContentDelegate {
+	public:
+		Delegate(
+			not_null<PeerListsBox*> box,
+			not_null<PeerListController*> controller);
+
+		void peerListSetTitle(rpl::producer<QString> title) override;
+		void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
+		void peerListSetSearchMode(PeerListSearchMode mode) override;
+		void peerListSetRowChecked(
+			not_null<PeerListRow*> row,
+			bool checked) override;
+		void peerListSetForeignRowChecked(
+			not_null<PeerListRow*> row,
+			bool checked,
+			anim::type animated) override;
+		bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
+		int peerListSelectedRowsCount() override;
+		void peerListScrollToTop() override;
+
+		void peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) override {
+			_box->addSelectItem(peer, anim::type::instant);
+		}
+		void peerListAddSelectedRowInBunch(not_null<PeerListRow*> row) override {
+			_box->addSelectItem(row, anim::type::instant);
+		}
+		void peerListFinishSelectedRowsBunch() override;
+
+	private:
+		const not_null<PeerListsBox*> _box;
+		const not_null<PeerListController*> _controller;
+
+	};
+	struct List {
+		std::unique_ptr<PeerListController> controller;
+		std::unique_ptr<Delegate> delegate;
+		PeerListContent *content = nullptr;
+	};
+
+	friend class Delegate;
+
+	[[nodiscard]] List makeList(
+		std::unique_ptr<PeerListController> controller);
+	[[nodiscard]] std::vector<List> makeLists(
+		std::vector<std::unique_ptr<PeerListController>> controllers);
+
+	[[nodiscard]] not_null<PeerListController*> firstController() const;
+
+	void addSelectItem(
+		not_null<PeerData*> peer,
+		anim::type animated);
+	void addSelectItem(
+		not_null<PeerListRow*> row,
+		anim::type animated);
+	void addSelectItem(
+		uint64 itemId,
+		const QString &text,
+		PaintRoundImageCallback paintUserpic,
+		anim::type animated);
+	void setSearchMode(PeerListSearchMode mode);
+	void createMultiSelect();
+	int getTopScrollSkip() const;
+	void updateScrollSkips();
+	void searchQueryChanged(const QString &query);
+
+	object_ptr<Ui::SlideWrap<Ui::MultiSelect>> _select = { nullptr };
+
+	std::vector<List> _lists;
+	Fn<void(PeerListsBox*)> _init;
+	bool _scrollBottomFixed = false;
+
+};
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
index dda179e00..9ac503df3 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
@@ -51,28 +51,21 @@ base::flat_set<not_null<UserData*>> GetAlreadyInFromPeer(PeerData *peer) {
 } // namespace
 
 AddParticipantsBoxController::AddParticipantsBoxController(
-	not_null<Window::SessionNavigation*> navigation)
-: ContactsBoxController(
-	navigation,
-	std::make_unique<PeerListGlobalSearchController>(navigation)) {
+	not_null<Main::Session*> session)
+: ContactsBoxController(session) {
 }
 
 AddParticipantsBoxController::AddParticipantsBoxController(
-	not_null<Window::SessionNavigation*> navigation,
 	not_null<PeerData*> peer)
 : AddParticipantsBoxController(
-	navigation,
 	peer,
 	GetAlreadyInFromPeer(peer)) {
 }
 
 AddParticipantsBoxController::AddParticipantsBoxController(
-	not_null<Window::SessionNavigation*> navigation,
 	not_null<PeerData*> peer,
 	base::flat_set<not_null<UserData*>> &&alreadyIn)
-: ContactsBoxController(
-	navigation,
-	std::make_unique<PeerListGlobalSearchController>(navigation))
+: ContactsBoxController(&peer->session())
 , _peer(peer)
 , _alreadyIn(std::move(alreadyIn)) {
 	subscribeToMigration();
@@ -179,7 +172,7 @@ bool AddParticipantsBoxController::inviteSelectedUsers(
 		not_null<PeerListBox*> box) const {
 	Expects(_peer != nullptr);
 
-	const auto rows = box->peerListCollectSelectedRows();
+	const auto rows = box->collectSelectedRows();
 	const auto users = ranges::view::all(
 		rows
 	) | ranges::view::transform([](not_null<PeerData*> peer) {
@@ -198,9 +191,7 @@ bool AddParticipantsBoxController::inviteSelectedUsers(
 void AddParticipantsBoxController::Start(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<ChatData*> chat) {
-	auto controller = std::make_unique<AddParticipantsBoxController>(
-		navigation,
-		chat);
+	auto controller = std::make_unique<AddParticipantsBoxController>(chat);
 	const auto weak = controller.get();
 	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->addButton(tr::lng_participant_invite(), [=] {
@@ -223,7 +214,6 @@ void AddParticipantsBoxController::Start(
 		base::flat_set<not_null<UserData*>> &&alreadyIn,
 		bool justCreated) {
 	auto controller = std::make_unique<AddParticipantsBoxController>(
-		navigation,
 		channel,
 		std::move(alreadyIn));
 	const auto weak = controller.get();
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.h b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
index 122491c6d..7bba41119 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.h
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
@@ -27,16 +27,16 @@ public:
 		not_null<ChannelData*> channel,
 		base::flat_set<not_null<UserData*>> &&alreadyIn);
 
-	explicit AddParticipantsBoxController(
-		not_null<Window::SessionNavigation*> navigation);
+	explicit AddParticipantsBoxController(not_null<Main::Session*> session);
+	explicit AddParticipantsBoxController(not_null<PeerData*> peer);
 	AddParticipantsBoxController(
-		not_null<Window::SessionNavigation*> navigation,
-		not_null<PeerData*> peer);
-	AddParticipantsBoxController(
-		not_null<Window::SessionNavigation*> navigation,
 		not_null<PeerData*> peer,
 		base::flat_set<not_null<UserData*>> &&alreadyIn);
 
+	[[nodiscard]] not_null<PeerData*> peer() const {
+		return _peer;
+	}
+
 	void rowClicked(not_null<PeerListRow*> row) override;
 	void itemDeselectedHook(not_null<PeerData*> peer) override;
 
diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 0fb1facc7..d1921073f 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -477,11 +477,17 @@ groupCallMembersListItem: PeerListItem(defaultPeerListItem) {
 groupCallMembersList: PeerList(defaultPeerList) {
 	bg: groupCallMembersBg;
 	about: FlatLabel(defaultPeerListAbout) {
-		textFg: groupCallMemberInactiveStatus;
+		textFg: groupCallMemberNotJoinedStatus;
 	}
 	item: groupCallMembersListItem;
 }
+groupCallInviteDividerLabel: FlatLabel(defaultFlatLabel) {
+	textFg: groupCallMemberNotJoinedStatus;
+}
+groupCallInviteDividerPadding: margins(17px, 7px, 17px, 7px);
+
 groupCallInviteMembersList: PeerList(groupCallMembersList) {
+	padding: margins(0px, 10px, 0px, 10px);
 	item: PeerListItem(groupCallMembersListItem) {
 		statusFg: groupCallMemberNotJoinedStatus;
 		statusFgOver: groupCallMemberNotJoinedStatus;
diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp
index e343454de..089bb5c50 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_members.cpp
@@ -1410,6 +1410,9 @@ void GroupMembers::peerListSetTitle(rpl::producer<QString> title) {
 void GroupMembers::peerListSetAdditionalTitle(rpl::producer<QString> title) {
 }
 
+void GroupMembers::peerListSetHideEmpty(bool hide) {
+}
+
 bool GroupMembers::peerListIsRowChecked(not_null<PeerListRow*> row) {
 	return false;
 }
@@ -1421,10 +1424,6 @@ int GroupMembers::peerListSelectedRowsCount() {
 	return 0;
 }
 
-std::vector<not_null<PeerData*>> GroupMembers::peerListCollectSelectedRows() {
-	return {};
-}
-
 void GroupMembers::peerListAddSelectedPeerInBunch(not_null<PeerData*> peer) {
 	Unexpected("Item selection in Calls::GroupMembers.");
 }
diff --git a/Telegram/SourceFiles/calls/calls_group_members.h b/Telegram/SourceFiles/calls/calls_group_members.h
index 6216e35f7..e255d2ee4 100644
--- a/Telegram/SourceFiles/calls/calls_group_members.h
+++ b/Telegram/SourceFiles/calls/calls_group_members.h
@@ -57,10 +57,10 @@ private:
 	// PeerListContentDelegate interface.
 	void peerListSetTitle(rpl::producer<QString> title) override;
 	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
+	void peerListSetHideEmpty(bool hide) override;
 	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
 	int peerListSelectedRowsCount() override;
 	void peerListScrollToTop() override;
-	std::vector<not_null<PeerData*>> peerListCollectSelectedRows() override;
 	void peerListAddSelectedPeerInBunch(
 		not_null<PeerData*> peer) override;
 	void peerListAddSelectedRowInBunch(
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 92f1f6bc6..0665318b1 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -29,6 +29,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "base/event_filter.h"
 #include "boxes/peers/edit_participants_box.h"
+#include "boxes/peers/add_participants_box.h"
+#include "boxes/peer_lists_box.h"
+#include "boxes/confirm_box.h"
 #include "app.h"
 #include "apiwrap.h" // api().kickParticipant.
 #include "styles/style_calls.h"
@@ -51,8 +54,7 @@ class InviteController final : public ParticipantsBoxController {
 public:
 	InviteController(
 		not_null<PeerData*> peer,
-		base::flat_set<not_null<UserData*>> alreadyIn,
-		int fullInCount);
+		base::flat_set<not_null<UserData*>> alreadyIn);
 
 	void prepare() override;
 
@@ -63,34 +65,81 @@ public:
 
 	void itemDeselectedHook(not_null<PeerData*> peer) override;
 
-	std::variant<int, not_null<UserData*>> inviteSelectedUsers(
-		not_null<PeerListBox*> box,
-		not_null<GroupCall*> call) const;
+	[[nodiscard]] auto peersWithRows() const
+		-> not_null<const base::flat_set<not_null<UserData*>>*>;
+	[[nodiscard]] rpl::producer<not_null<UserData*>> rowAdded() const;
+
+	[[nodiscard]] bool hasRowFor(not_null<PeerData*> peer) const;
 
 private:
-	[[nodiscard]] int alreadyInCount() const;
 	[[nodiscard]] bool isAlreadyIn(not_null<UserData*> user) const;
-	[[nodiscard]] int fullCount() const;
 
 	std::unique_ptr<PeerListRow> createRow(
 		not_null<UserData*> user) const override;
 
 	not_null<PeerData*> _peer;
 	const base::flat_set<not_null<UserData*>> _alreadyIn;
-	const int _fullInCount = 0;
-	mutable base::flat_set<not_null<UserData*>> _skippedUsers;
+	mutable base::flat_set<not_null<UserData*>> _inGroup;
+	rpl::event_stream<not_null<UserData*>> _rowAdded;
 
 };
 
+class InviteContactsController final : public AddParticipantsBoxController {
+public:
+	InviteContactsController(
+		not_null<PeerData*> peer,
+		base::flat_set<not_null<UserData*>> alreadyIn,
+		not_null<const base::flat_set<not_null<UserData*>>*> inGroup,
+		rpl::producer<not_null<UserData*>> discoveredInGroup);
+
+private:
+	void prepareViewHook() override;
+
+	std::unique_ptr<PeerListRow> createRow(
+		not_null<UserData*> user) override;
+
+	const not_null<const base::flat_set<not_null<UserData*>>*> _inGroup;
+	rpl::producer<not_null<UserData*>> _discoveredInGroup;
+
+	rpl::lifetime _lifetime;
+
+};
+
+[[nodiscard]] object_ptr<Ui::RpWidget> CreateSectionSubtitle(
+		QWidget *parent,
+		rpl::producer<QString> text) {
+	auto result = object_ptr<Ui::FixedHeightWidget>(
+		parent,
+		st::searchedBarHeight);
+
+	const auto raw = result.data();
+	raw->paintRequest(
+	) | rpl::start_with_next([=](QRect clip) {
+		auto p = QPainter(raw);
+		p.fillRect(clip, st::groupCallMembersBgOver);
+	}, raw->lifetime());
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		raw,
+		std::move(text),
+		st::groupCallBoxLabel);
+	raw->widthValue(
+	) | rpl::start_with_next([=](int width) {
+		const auto padding = st::groupCallInviteDividerPadding;
+		const auto available = width - padding.left() - padding.right();
+		label->resizeToNaturalWidth(available);
+		label->moveToLeft(padding.left(), padding.top(), width);
+	}, label->lifetime());
+
+	return result;
+}
+
 InviteController::InviteController(
 	not_null<PeerData*> peer,
-	base::flat_set<not_null<UserData*>> alreadyIn,
-	int fullInCount)
+	base::flat_set<not_null<UserData*>> alreadyIn)
 : ParticipantsBoxController(CreateTag{}, nullptr, peer, Role::Members)
 , _peer(peer)
-, _alreadyIn(std::move(alreadyIn))
-, _fullInCount(std::max(fullInCount, int(_alreadyIn.size()))) {
-	_skippedUsers.emplace(peer->session().user());
+, _alreadyIn(std::move(alreadyIn)) {
 	SubscribeToMigration(
 		_peer,
 		lifetime(),
@@ -98,8 +147,14 @@ InviteController::InviteController(
 }
 
 void InviteController::prepare() {
+	delegate()->peerListSetHideEmpty(true);
 	ParticipantsBoxController::prepare();
-	delegate()->peerListSetTitle(tr::lng_group_call_invite_title());
+	delegate()->peerListSetAboveWidget(CreateSectionSubtitle(
+		nullptr,
+		tr::lng_group_call_invite_members()));
+	delegate()->peerListSetAboveSearchWidget(CreateSectionSubtitle(
+		nullptr,
+		tr::lng_group_call_invite_members()));
 }
 
 void InviteController::rowClicked(not_null<PeerListRow*> row) {
@@ -115,44 +170,71 @@ base::unique_qptr<Ui::PopupMenu> InviteController::rowContextMenu(
 void InviteController::itemDeselectedHook(not_null<PeerData*> peer) {
 }
 
-int InviteController::alreadyInCount() const {
-	return std::max(_fullInCount, int(_alreadyIn.size()));
+bool InviteController::hasRowFor(not_null<PeerData*> peer) const {
+	return (delegate()->peerListFindRow(peer->id) != nullptr);
 }
 
 bool InviteController::isAlreadyIn(not_null<UserData*> user) const {
 	return _alreadyIn.contains(user);
 }
 
-int InviteController::fullCount() const {
-	return alreadyInCount() + delegate()->peerListSelectedRowsCount();
-}
-
 std::unique_ptr<PeerListRow> InviteController::createRow(
 		not_null<UserData*> user) const {
 	if (user->isSelf() || user->isBot()) {
-		_skippedUsers.emplace(user);
 		return nullptr;
 	}
 	auto result = std::make_unique<PeerListRow>(user);
+	_rowAdded.fire_copy(user);
+	_inGroup.emplace(user);
 	if (isAlreadyIn(user)) {
 		result->setDisabledState(PeerListRow::State::DisabledChecked);
 	}
 	return result;
 }
 
-std::variant<int, not_null<UserData*>> InviteController::inviteSelectedUsers(
-		not_null<PeerListBox*> box,
-		not_null<GroupCall*> call) const {
-	const auto rows = box->peerListCollectSelectedRows();
-	const auto users = ranges::view::all(
-		rows
-	) | ranges::view::transform([](not_null<PeerData*> peer) {
-		Expects(peer->isUser());
-		Expects(!peer->isSelf());
+auto InviteController::peersWithRows() const
+-> not_null<const base::flat_set<not_null<UserData*>>*> {
+	return &_inGroup;
+}
 
-		return not_null<UserData*>(peer->asUser());
-	}) | ranges::to_vector;
-	return call->inviteUsers(users);
+rpl::producer<not_null<UserData*>> InviteController::rowAdded() const {
+	return _rowAdded.events();
+}
+
+InviteContactsController::InviteContactsController(
+	not_null<PeerData*> peer,
+	base::flat_set<not_null<UserData*>> alreadyIn,
+	not_null<const base::flat_set<not_null<UserData*>>*> inGroup,
+	rpl::producer<not_null<UserData*>> discoveredInGroup)
+: AddParticipantsBoxController(peer, std::move(alreadyIn))
+, _inGroup(inGroup)
+, _discoveredInGroup(std::move(discoveredInGroup)) {
+}
+
+void InviteContactsController::prepareViewHook() {
+	AddParticipantsBoxController::prepareViewHook();
+
+	delegate()->peerListSetAboveWidget(CreateSectionSubtitle(
+		nullptr,
+		tr::lng_contacts_header()));
+	delegate()->peerListSetAboveSearchWidget(CreateSectionSubtitle(
+		nullptr,
+		tr::lng_group_call_invite_search_results()));
+
+	std::move(
+		_discoveredInGroup
+	) | rpl::start_with_next([=](not_null<UserData*> user) {
+		if (auto row = delegate()->peerListFindRow(user->id)) {
+			delegate()->peerListRemoveRow(row);
+		}
+	}, _lifetime);
+}
+
+std::unique_ptr<PeerListRow> InviteContactsController::createRow(
+		not_null<UserData*> user) {
+	return _inGroup->contains(user)
+		? nullptr
+		: AddParticipantsBoxController::createRow(user);
 }
 
 } // namespace
@@ -197,6 +279,21 @@ void LeaveGroupCallBox(
 	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 }
 
+void GroupCallConfirmBox(
+		not_null<Ui::GenericBox*> box,
+		const QString &text,
+		rpl::producer<QString> button,
+		Fn<void()> callback) {
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box.get(),
+			text,
+			st::groupCallBoxLabel),
+		st::boxPadding);
+	box->addButton(std::move(button), callback);
+	box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+}
+
 GroupPanel::GroupPanel(not_null<GroupCall*> call)
 : _call(call)
 , _peer(call->peer())
@@ -362,7 +459,7 @@ void GroupPanel::initControls() {
 	});
 
 	_settings->setText(tr::lng_menu_settings());
-	_hangup->setText(tr::lng_box_leave());
+	_hangup->setText(tr::lng_group_call_leave());
 
 	_members->desiredHeightValue(
 	) | rpl::start_with_next([=] {
@@ -460,52 +557,131 @@ void GroupPanel::addMembers() {
 	alreadyIn.emplace(_peer->session().user());
 	auto controller = std::make_unique<InviteController>(
 		_peer,
-		std::move(alreadyIn),
-		real->fullCount());
+		alreadyIn);
 	controller->setStyleOverrides(
 		&st::groupCallInviteMembersList,
 		&st::groupCallMultiSelect);
 
-	const auto weak = base::make_weak(_call);
-	auto initBox = [=, controller = controller.get()](
-			not_null<PeerListBox*> box) {
-		box->addButton(tr::lng_group_call_invite_button(), [=] {
-			if (const auto call = weak.get()) {
-				const auto result = controller->inviteSelectedUsers(box, call);
+	auto contactsController = std::make_unique<InviteContactsController>(
+		_peer,
+		std::move(alreadyIn),
+		controller->peersWithRows(),
+		controller->rowAdded());
+	contactsController->setStyleOverrides(
+		&st::groupCallInviteMembersList,
+		&st::groupCallMultiSelect);
 
-				if (const auto user = std::get_if<not_null<UserData*>>(&result)) {
-					Ui::Toast::Show(
-						widget(),
-						Ui::Toast::Config{
-							.text = tr::lng_group_call_invite_done_user(
-								tr::now,
-								lt_user,
-								Ui::Text::Bold((*user)->firstName),
-								Ui::Text::WithEntities),
-							.st = &st::defaultToast,
-						});
-				} else if (const auto count = std::get_if<int>(&result)) {
-					if (*count > 0) {
-						Ui::Toast::Show(
-							widget(),
-							Ui::Toast::Config{
-								.text = tr::lng_group_call_invite_done_many(
-									tr::now,
-									lt_count,
-									*count,
-									Ui::Text::RichLangValue),
-								.st = &st::defaultToast,
-							});
-					}
-				} else {
-					Unexpected("Result in GroupCall::inviteUsers.");
-				}
+	const auto weak = base::make_weak(_call);
+	const auto invite = [=](const std::vector<not_null<UserData*>> &users) {
+		const auto call = weak.get();
+		if (!call) {
+			return;
+		}
+		const auto result = call->inviteUsers(users);
+		if (const auto user = std::get_if<not_null<UserData*>>(&result)) {
+			Ui::Toast::Show(
+				widget(),
+				Ui::Toast::Config{
+					.text = tr::lng_group_call_invite_done_user(
+						tr::now,
+						lt_user,
+						Ui::Text::Bold((*user)->firstName),
+						Ui::Text::WithEntities),
+					.st = &st::defaultToast,
+				});
+		} else if (const auto count = std::get_if<int>(&result)) {
+			if (*count > 0) {
+				Ui::Toast::Show(
+					widget(),
+					Ui::Toast::Config{
+						.text = tr::lng_group_call_invite_done_many(
+							tr::now,
+							lt_count,
+							*count,
+							Ui::Text::RichLangValue),
+						.st = &st::defaultToast,
+					});
 			}
-			box->closeBox();
+		} else {
+			Unexpected("Result in GroupCall::inviteUsers.");
+		}
+	};
+	const auto inviteWithAdd = [=](
+			const std::vector<not_null<UserData*>> &users,
+			const std::vector<not_null<UserData*>> &nonMembers,
+			Fn<void()> finish) {
+		_peer->session().api().addChatParticipants(
+			_peer,
+			nonMembers,
+			[=](bool) { invite(users); finish(); });
+	};
+	const auto inviteWithConfirmation = [=](
+			const std::vector<not_null<UserData*>> &users,
+			const std::vector<not_null<UserData*>> &nonMembers,
+			Fn<void()> finish) {
+		if (nonMembers.empty()) {
+			invite(users);
+			finish();
+			return;
+		}
+		const auto name = _peer->name;
+		const auto text = (nonMembers.size() == 1)
+			? tr::lng_group_call_add_to_group_one(
+				tr::now,
+				lt_user,
+				nonMembers.front()->shortName(),
+				lt_group,
+				name)
+			: (nonMembers.size() < users.size())
+			? tr::lng_group_call_add_to_group_some(tr::now, lt_group, name)
+			: tr::lng_group_call_add_to_group_all(tr::now, lt_group, name);
+		const auto shared = std::make_shared<QPointer<Ui::GenericBox>>();
+		const auto finishWithConfirm = [=] {
+			if (*shared) {
+				(*shared)->closeBox();
+			}
+			finish();
+		};
+		auto box = Box(
+			GroupCallConfirmBox,
+			text,
+			tr::lng_participant_invite(),
+			[=] { inviteWithAdd(users, nonMembers, finishWithConfirm); });
+		*shared = box.data();
+		_layerBg->showBox(std::move(box));
+	};
+	auto initBox = [=, controller = controller.get()](
+			not_null<PeerListsBox*> box) {
+		box->setTitle(tr::lng_group_call_invite_title());
+		box->addButton(tr::lng_group_call_invite_button(), [=] {
+			const auto rows = box->collectSelectedRows();
+
+			const auto users = ranges::view::all(
+				rows
+			) | ranges::view::transform([](not_null<PeerData*> peer) {
+				return not_null<UserData*>(peer->asUser());
+			}) | ranges::to_vector;
+
+			const auto nonMembers = ranges::view::all(
+				users
+			) | ranges::view::filter([&](not_null<UserData*> user) {
+				return !controller->hasRowFor(user);
+			}) | ranges::to_vector;
+
+			const auto finish = [box = Ui::MakeWeak(box)]() {
+				if (box) {
+					box->closeBox();
+				}
+			};
+			inviteWithConfirmation(users, nonMembers, finish);
 		});
 		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 	};
-	_layerBg->showBox(Box<PeerListBox>(std::move(controller), initBox));
+
+	auto controllers = std::vector<std::unique_ptr<PeerListController>>();
+	controllers.push_back(std::move(controller));
+	controllers.push_back(std::move(contactsController));
+	_layerBg->showBox(Box<PeerListsBox>(std::move(controllers), initBox));
 }
 
 void GroupPanel::kickMember(not_null<UserData*> user) {
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index ed4fa9618..f74c8007b 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -33,7 +33,7 @@ GroupCall::GroupCall(
 	uint64 accessHash)
 : _id(id)
 , _accessHash(accessHash)
-, _peer(peer) // #TODO calls migration
+, _peer(peer)
 , _speakingByActiveFinishTimer([=] { checkFinishSpeakingByActive(); }) {
 }
 
diff --git a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
index fca98f1b6..7ddf3165e 100644
--- a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
@@ -258,10 +258,6 @@ int InnerWidget::peerListSelectedRowsCount() {
 	return 0;
 }
 
-std::vector<not_null<PeerData*>> InnerWidget::peerListCollectSelectedRows() {
-	return {};
-}
-
 void InnerWidget::peerListScrollToTop() {
 	_scrollToRequests.fire({ -1, -1 });
 }
diff --git a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.h b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.h
index f6f731400..3ad4b007d 100644
--- a/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.h
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.h
@@ -52,7 +52,6 @@ private:
 	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
 	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
 	int peerListSelectedRowsCount() override;
-	std::vector<not_null<PeerData*>> peerListCollectSelectedRows() override;
 	void peerListScrollToTop() override;
 	void peerListAddSelectedPeerInBunch(
 		not_null<PeerData*> peer) override;
diff --git a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
index 8f1a52fd6..48017e7a1 100644
--- a/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/polls/info_polls_results_inner_widget.cpp
@@ -57,7 +57,6 @@ public:
 	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
 	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
 	int peerListSelectedRowsCount() override;
-	std::vector<not_null<PeerData*>> peerListCollectSelectedRows() override;
 	void peerListScrollToTop() override;
 	void peerListAddSelectedPeerInBunch(
 		not_null<PeerData*> peer) override;
@@ -130,11 +129,6 @@ int ListDelegate::peerListSelectedRowsCount() {
 	return 0;
 }
 
-auto ListDelegate::peerListCollectSelectedRows()
--> std::vector<not_null<PeerData*>> {
-	return {};
-}
-
 void ListDelegate::peerListScrollToTop() {
 }
 
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index ba4c19842..f9ddf2910 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -493,7 +493,7 @@ void ActionsFiller::addInviteToGroupAction(
 		_wrap,
 		tr::lng_profile_invite_to_group(),
 		CanInviteBotToGroupValue(user),
-		[=] { AddBotToGroupBoxController::Start(controller, user); });
+		[=] { AddBotToGroupBoxController::Start(user); });
 }
 
 void ActionsFiller::addShareContactAction(not_null<UserData*> user) {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.cpp b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
index f071ab4e3..f3621ca6b 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_members.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_members.cpp
@@ -423,10 +423,6 @@ int Members::peerListSelectedRowsCount() {
 	return 0;
 }
 
-std::vector<not_null<PeerData*>> Members::peerListCollectSelectedRows() {
-	return {};
-}
-
 void Members::peerListScrollToTop() {
 	_scrollToRequests.fire({ -1, -1 });
 }
diff --git a/Telegram/SourceFiles/info/profile/info_profile_members.h b/Telegram/SourceFiles/info/profile/info_profile_members.h
index cdfba90ac..bf7c6332a 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_members.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_members.h
@@ -63,7 +63,6 @@ private:
 	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
 	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
 	int peerListSelectedRowsCount() override;
-	std::vector<not_null<PeerData*>> peerListCollectSelectedRows() override;
 	void peerListScrollToTop() override;
 	void peerListAddSelectedPeerInBunch(
 		not_null<PeerData*> peer) override;
diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.cpp b/Telegram/SourceFiles/platform/win/windows_dlls.cpp
index bac70f738..01301f702 100644
--- a/Telegram/SourceFiles/platform/win/windows_dlls.cpp
+++ b/Telegram/SourceFiles/platform/win/windows_dlls.cpp
@@ -42,6 +42,7 @@ void init() {
 		u"rstrtmgr.dll"_q,
 		u"psapi.dll"_q,
 		u"user32.dll"_q,
+		u"thai.dll"_q,
 	};
 	for (const auto &lib : list) {
 		SafeLoadLibrary(lib);
diff --git a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
index 466f1bc9a..efb774bcf 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_controllers.cpp
@@ -51,8 +51,7 @@ class BlockPeerBoxController
 	: public ChatsListBoxController
 	, private base::Subscriber {
 public:
-	explicit BlockPeerBoxController(
-		not_null<Window::SessionNavigation*> navigation);
+	explicit BlockPeerBoxController(not_null<Main::Session*> session);
 
 	Main::Session &session() const override;
 	void rowClicked(not_null<PeerListRow*> row) override;
@@ -72,19 +71,19 @@ protected:
 private:
 	void updateIsBlocked(not_null<PeerListRow*> row, PeerData *peer) const;
 
-	const not_null<Window::SessionNavigation*> _navigation;
+	const not_null<Main::Session*> _session;
 	Fn<void(not_null<PeerData*> peer)> _blockPeerCallback;
 
 };
 
 BlockPeerBoxController::BlockPeerBoxController(
-	not_null<Window::SessionNavigation*> navigation)
-: ChatsListBoxController(navigation)
-, _navigation(navigation) {
+	not_null<Main::Session*> session)
+: ChatsListBoxController(session)
+, _session(session) {
 }
 
 Main::Session &BlockPeerBoxController::session() const {
-	return _navigation->session();
+	return *_session;
 }
 
 void BlockPeerBoxController::prepareViewHook() {
@@ -294,7 +293,8 @@ void BlockedBoxController::handleBlockedEvent(not_null<PeerData*> user) {
 
 void BlockedBoxController::BlockNewPeer(
 		not_null<Window::SessionController*> window) {
-	auto controller = std::make_unique<BlockPeerBoxController>(window);
+	auto controller = std::make_unique<BlockPeerBoxController>(
+		&window->session());
 	auto initBox = [=, controller = controller.get()](
 			not_null<PeerListBox*> box) {
 		controller->setBlockPeerCallback([=](not_null<PeerData*> peer) {
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 3e8a06744..5caebf94c 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -483,7 +483,7 @@ void Filler::addUserActions(not_null<UserData*> user) {
 			using AddBotToGroup = AddBotToGroupBoxController;
 			_addAction(
 				tr::lng_profile_invite_to_group(tr::now),
-				[=] { AddBotToGroup::Start(controller, user); });
+				[=] { AddBotToGroup::Start(user); });
 		}
 		addPollAction(user);
 		if (user->canExportChatHistory()) {
@@ -803,7 +803,7 @@ void PeerMenuShareContactBox(
 	};
 	*weak = Ui::show(Box<PeerListBox>(
 		std::make_unique<ChooseRecipientBoxController>(
-			navigation,
+			&navigation->session(),
 			std::move(callback)),
 		[](not_null<PeerListBox*> box) {
 			box->addButton(tr::lng_cancel(), [=] {
@@ -1010,7 +1010,7 @@ QPointer<Ui::RpWidget> ShowForwardMessagesBox(
 	};
 	*weak = Ui::show(Box<PeerListBox>(
 		std::make_unique<ChooseRecipientBoxController>(
-			navigation,
+			&navigation->session(),
 			std::move(callback)),
 		std::move(initBox)), Ui::LayerOption::KeepOther);
 	return weak->data();
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index a4063bd14..148db3026 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -194,7 +194,7 @@ void SessionNavigation::showPeerByLinkResolved(
 		const auto user = peer->asUser();
 		if (user && user->isBot() && !info.startToken.isEmpty()) {
 			user->botInfo->shareGameShortName = info.startToken;
-			AddBotToGroupBoxController::Start(this, user);
+			AddBotToGroupBoxController::Start(user);
 		} else {
 			crl::on_main(this, [=] {
 				showPeerHistory(peer->id, params);
@@ -207,7 +207,7 @@ void SessionNavigation::showPeerByLinkResolved(
 			&& !user->botInfo->cantJoinGroups
 			&& !info.startToken.isEmpty()) {
 			user->botInfo->startGroupToken = info.startToken;
-			AddBotToGroupBoxController::Start(this, user);
+			AddBotToGroupBoxController::Start(user);
 		} else if (user && user->isBot()) {
 			// Always open bot chats, even from mention links.
 			crl::on_main(this, [=] {

From 91e97b3d65a9647421c92673ebef12f699818520 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 22 Dec 2020 12:45:50 +0300
Subject: [PATCH 355/370] Fixed paint of group with wide thumbs in media
 viewer.

Fixed #8392.
---
 .../media/view/media_view_group_thumbs.cpp        | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp b/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp
index 4ee26c3ae..5984494ca 100644
--- a/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_group_thumbs.cpp
@@ -193,9 +193,6 @@ private:
 GroupThumbs::Thumb::Thumb(Key key, Fn<void()> handler)
 : _key(key) {
 	_link = std::make_shared<LambdaClickHandler>(std::move(handler));
-	_fullWidth = std::min(
-		wantedPixSize().width(),
-		st::mediaviewGroupWidthMax);
 	validateImage();
 }
 
@@ -208,9 +205,6 @@ GroupThumbs::Thumb::Thumb(
 , _photoMedia(photo->createMediaView())
 , _origin(origin) {
 	_link = std::make_shared<LambdaClickHandler>(std::move(handler));
-	_fullWidth = std::min(
-		wantedPixSize().width(),
-		st::mediaviewGroupWidthMax);
 	_photoMedia->wanted(Data::PhotoSize::Thumbnail, origin);
 	validateImage();
 }
@@ -224,9 +218,6 @@ GroupThumbs::Thumb::Thumb(
 , _documentMedia(document->createMediaView())
 , _origin(origin) {
 	_link = std::make_shared<LambdaClickHandler>(std::move(handler));
-	_fullWidth = std::min(
-		wantedPixSize().width(),
-		st::mediaviewGroupWidthMax);
 	_documentMedia->thumbnailWanted(origin);
 	validateImage();
 }
@@ -257,7 +248,8 @@ void GroupThumbs::Thumb::validateImage() {
 		const auto originalHeight = _image->height();
 		const auto takeWidth = originalWidth * st::mediaviewGroupWidthMax
 			/ pixSize.width();
-		const auto original = _image->original();
+		auto original = _image->original();
+		original.setDevicePixelRatio(cRetinaFactor());
 		_full = App::pixmapFromImageInPlace(original.copy(
 			(originalWidth - takeWidth) / 2,
 			0,
@@ -274,6 +266,9 @@ void GroupThumbs::Thumb::validateImage() {
 			pixSize.height() * cIntRetinaFactor(),
 			Images::Option::Smooth);
 	}
+	_fullWidth = std::min(
+		wantedPixSize().width(),
+		st::mediaviewGroupWidthMax);
 }
 
 int GroupThumbs::Thumb::leftToUpdate() const {

From 902e0fc8fbe00a7d75df9f001b53d2c473d16835 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Dec 2020 14:26:19 +0400
Subject: [PATCH 356/370] Remove dll loading in harfbuzz on Windows.

---
 Telegram/SourceFiles/platform/win/windows_dlls.cpp | 1 -
 Telegram/lib_base                                  | 2 +-
 Telegram/lib_ui                                    | 2 +-
 docs/building-msvc.md                              | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.cpp b/Telegram/SourceFiles/platform/win/windows_dlls.cpp
index 01301f702..bac70f738 100644
--- a/Telegram/SourceFiles/platform/win/windows_dlls.cpp
+++ b/Telegram/SourceFiles/platform/win/windows_dlls.cpp
@@ -42,7 +42,6 @@ void init() {
 		u"rstrtmgr.dll"_q,
 		u"psapi.dll"_q,
 		u"user32.dll"_q,
-		u"thai.dll"_q,
 	};
 	for (const auto &lib : list) {
 		SafeLoadLibrary(lib);
diff --git a/Telegram/lib_base b/Telegram/lib_base
index b95d2b4b3..81df0d0b7 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit b95d2b4b378092daf3acb493515ff41a8e21f003
+Subproject commit 81df0d0b7842be2b6c88f93dfa136b8efea4c9ad
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index a29e93ca5..1e2799245 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit a29e93ca55d40c3b50d654fd2a9a153ab0227b6c
+Subproject commit 1e2799245cf2720a329ecb5cf5644fded669cce6
diff --git a/docs/building-msvc.md b/docs/building-msvc.md
index 3a6bb6430..243a385fb 100644
--- a/docs/building-msvc.md
+++ b/docs/building-msvc.md
@@ -33,7 +33,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     cd ThirdParty
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout f22ccc5
+    git checkout 41ead72
     cd ../
     git clone https://chromium.googlesource.com/external/gyp
     cd gyp
@@ -63,7 +63,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
 
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout f22ccc5
+    git checkout 41ead72
     cd ..
 
     git clone https://github.com/desktop-app/lzma.git

From 596c7892c7f7d4b3080e4926a87cc6fb4ec82adf Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 20 Dec 2020 17:28:40 +0400
Subject: [PATCH 357/370] Use desktop-app::external_qt_static_plugins

---
 Telegram/CMakeLists.txt                    | 29 ++++------
 Telegram/SourceFiles/qt_static_plugins.cpp | 63 ----------------------
 cmake                                      |  2 +-
 3 files changed, 10 insertions(+), 84 deletions(-)
 delete mode 100644 Telegram/SourceFiles/qt_static_plugins.cpp

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index d02ca0028..64ef7334e 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -60,6 +60,7 @@ PRIVATE
     desktop-app::external_rlottie
     desktop-app::external_zlib
     desktop-app::external_minizip
+    desktop-app::external_qt_static_plugins
     desktop-app::external_qt
     desktop-app::external_qr_code_generator
     desktop-app::external_crash_reports
@@ -71,8 +72,6 @@ PRIVATE
 if (LINUX)
     target_link_libraries(Telegram
     PRIVATE
-        desktop-app::external_nimf_qt5
-        desktop-app::external_qt5ct_support
         desktop-app::external_xcb_screensaver
         desktop-app::external_xcb
         desktop-app::external_glib
@@ -83,28 +82,19 @@ if (LINUX)
         PRIVATE
             desktop-app::external_statusnotifieritem
             desktop-app::external_dbusmenu_qt
-            desktop-app::external_fcitx_qt5
-            desktop-app::external_fcitx5_qt5
-            desktop-app::external_hime_qt
         )
     endif()
 
-    if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
-        target_link_libraries(Telegram
+    if (DESKTOP_APP_USE_PACKAGED
+        AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
+        AND Qt5WaylandClient_VERSION VERSION_LESS 5.13.0)
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client)
+
+        target_include_directories(Telegram
         PRIVATE
-            desktop-app::external_materialdecoration
+            ${WAYLAND_CLIENT_INCLUDE_DIRS}
         )
-
-        if (DESKTOP_APP_USE_PACKAGED
-            AND Qt5WaylandClient_VERSION VERSION_LESS 5.13.0)
-            find_package(PkgConfig REQUIRED)
-            pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client)
-
-            target_include_directories(Telegram
-            PRIVATE
-                ${WAYLAND_CLIENT_INCLUDE_DIRS}
-            )
-        endif()
     endif()
 
     if (NOT TDESKTOP_DISABLE_GTK_INTEGRATION)
@@ -1100,7 +1090,6 @@ PRIVATE
     mainwidget.h
     mainwindow.cpp
     mainwindow.h
-    qt_static_plugins.cpp
     settings.cpp
     settings.h
     stdafx.h
diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp
deleted file mode 100644
index b0704cc75..000000000
--- a/Telegram/SourceFiles/qt_static_plugins.cpp
+++ /dev/null
@@ -1,63 +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 <QtCore/QtPlugin>
-
-#ifndef DESKTOP_APP_USE_PACKAGED
-Q_IMPORT_PLUGIN(QWebpPlugin)
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
-Q_IMPORT_PLUGIN(QJpegPlugin)
-Q_IMPORT_PLUGIN(QGifPlugin)
-#endif // Qt 5.8.0
-
-#ifdef Q_OS_WIN
-Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
-#elif defined Q_OS_MAC // Q_OS_WIN
-Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
-Q_IMPORT_PLUGIN(QGenericEnginePlugin)
-#elif defined Q_OS_UNIX // Q_OS_WIN | Q_OS_MAC
-Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
-Q_IMPORT_PLUGIN(QGenericEnginePlugin)
-Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
-Q_IMPORT_PLUGIN(QSvgIconPlugin)
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-Q_IMPORT_PLUGIN(QConnmanEnginePlugin)
-Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin)
-Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin)
-Q_IMPORT_PLUGIN(QXdgDesktopPortalThemePlugin)
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-#ifndef DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
-Q_IMPORT_PLUGIN(QWaylandEglClientBufferPlugin)
-Q_IMPORT_PLUGIN(QWaylandIviShellIntegrationPlugin)
-Q_IMPORT_PLUGIN(QWaylandWlShellIntegrationPlugin)
-Q_IMPORT_PLUGIN(QWaylandXdgShellIntegrationPlugin)
-Q_IMPORT_PLUGIN(QWaylandBradientDecorationPlugin)
-Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin)
-Q_IMPORT_PLUGIN(QWaylandEglPlatformIntegrationPlugin)
-#endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
-#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_UNIX
-#endif // !DESKTOP_APP_USE_PACKAGED
-
-#if defined Q_OS_UNIX && !defined Q_OS_MAC
-#if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY
-Q_IMPORT_PLUGIN(NimfInputContextPlugin)
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin)
-Q_IMPORT_PLUGIN(QFcitx5PlatformInputContextPlugin)
-Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
-#ifndef DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
-Q_IMPORT_PLUGIN(QWaylandMaterialDecorationPlugin)
-#endif // !DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
-#endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY
-
-#if !defined DESKTOP_APP_USE_PACKAGED || defined DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES
-Q_IMPORT_PLUGIN(Qt5CTPlatformThemePlugin)
-Q_IMPORT_PLUGIN(Qt5CTStylePlugin)
-#endif // !DESKTOP_APP_USE_PACKAGED || DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES
-#endif // Q_OS_UNIX && !Q_OS_MAC
diff --git a/cmake b/cmake
index 783efab5a..a81345a28 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 783efab5aa41efb2db8a162174e016a254021b7d
+Subproject commit a81345a28d407fb5acd5267ec6afa1864f4e8d5b

From 0ff6c555b10a14ffc61db4b5a04fe8be237b49ac Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 20 Dec 2020 17:32:26 +0400
Subject: [PATCH 358/370] Use Platform::IsWayland in linux_gdk_helper

---
 .../platform/linux/linux_gdk_helper.cpp       | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/linux_gdk_helper.cpp b/Telegram/SourceFiles/platform/linux/linux_gdk_helper.cpp
index 5e4a00611..20a98191c 100644
--- a/Telegram/SourceFiles/platform/linux/linux_gdk_helper.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_gdk_helper.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/linux/linux_gdk_helper.h"
 
 #include "platform/linux/linux_libs.h"
+#include "base/platform/base_platform_info.h"
 #include "base/platform/linux/base_xcb_utilities_linux.h"
 
 extern "C" {
@@ -78,17 +79,19 @@ bool GdkHelperLoaded() {
 
 void XSetTransientForHint(GdkWindow *window, quintptr winId) {
 	if (gdk_helper_loaded == GtkLoaded::Gtk2) {
-		xcb_change_property(
-			base::Platform::XCB::GetConnectionFromQt(),
-			XCB_PROP_MODE_REPLACE,
-			gdk_x11_drawable_get_xid(window),
-			XCB_ATOM_WM_TRANSIENT_FOR,
-			XCB_ATOM_WINDOW,
-			32,
-			1,
-			&winId);
+		if (!IsWayland()) {
+			xcb_change_property(
+				base::Platform::XCB::GetConnectionFromQt(),
+				XCB_PROP_MODE_REPLACE,
+				gdk_x11_drawable_get_xid(window),
+				XCB_ATOM_WM_TRANSIENT_FOR,
+				XCB_ATOM_WINDOW,
+				32,
+				1,
+				&winId);
+		}
 	} else if (gdk_helper_loaded == GtkLoaded::Gtk3) {
-		if (gdk_is_x11_window_check(window)) {
+		if (!IsWayland() && gdk_is_x11_window_check(window)) {
 			xcb_change_property(
 				base::Platform::XCB::GetConnectionFromQt(),
 				XCB_PROP_MODE_REPLACE,

From f94280be7f6be071ddc5657d3ebb27aa3bc74b30 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Dec 2020 18:23:10 +0400
Subject: [PATCH 359/370] Use langpack strings in a better way.

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

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 5caebf94c..f9f1b70a9 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -517,7 +517,7 @@ void Filler::addChatActions(not_null<ChatData*> chat) {
 		}
 		if (chat->canAddMembers()) {
 			_addAction(
-				tr::lng_profile_add_participant(tr::now),
+				tr::lng_channel_add_members(tr::now),
 				[=] { AddChatMembers(controller, chat); });
 		}
 		addPollAction(chat);
@@ -567,7 +567,9 @@ void Filler::addChannelActions(not_null<ChannelData*> channel) {
 		}
 		if (channel->canAddMembers()) {
 			_addAction(
-				tr::lng_channel_add_members(tr::now),
+				(channel->isMegagroup()
+					? tr::lng_channel_add_members(tr::now)
+					: tr::lng_channel_add_users(tr::now)),
 				[=] { PeerMenuAddChannelMembers(navigation, channel); });
 		}
 		addPollAction(channel);

From d7496f98244fbbf3097b13ac227ac04ee4ab6ca0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Dec 2020 19:08:09 +0400
Subject: [PATCH 360/370] Fix possible crash in app shutdown.

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

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 33da747a7..70fa132e7 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1449,7 +1449,7 @@ void HistoryWidget::activate() {
 			updateHistoryGeometry();
 		}
 	}
-	if (App::wnd()) App::wnd()->setInnerFocus();
+	controller()->widget()->setInnerFocus();
 }
 
 void HistoryWidget::setInnerFocus() {
@@ -3347,7 +3347,7 @@ void HistoryWidget::doneShow() {
 		_groupCallBar->finishAnimating();
 	}
 	checkHistoryActivation();
-	App::wnd()->setInnerFocus();
+	controller()->widget()->setInnerFocus();
 	_preserveScrollTop = false;
 }
 

From 7fd09084fd9328834e31b37787d1111d61e9926d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Dec 2020 19:11:52 +0400
Subject: [PATCH 361/370] Use separate keys for message links and links.

---
 Telegram/Resources/langs/lang.strings                         | 1 +
 Telegram/SourceFiles/history/history_inner_widget.cpp         | 4 ++--
 .../SourceFiles/history/view/history_view_context_menu.cpp    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index cedef2dfa..5efaea8d4 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1498,6 +1498,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_add_to_group" = "Add to group";
 
 "lng_context_copy_link" = "Copy Link";
+"lng_context_copy_message_link" = "Copy Message Link";
 "lng_context_copy_post_link" = "Copy Post Link";
 "lng_context_copy_email" = "Copy Email Address";
 "lng_context_copy_hashtag" = "Copy Hashtag";
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 9e96faf10..cc24aca93 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1647,7 +1647,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			addDocumentActions(lnkDocument->document());
 		}
 		if (item && item->hasDirectLink() && isUponSelected != 2 && isUponSelected != -2) {
-			_menu->addAction(item->history()->peer->isMegagroup() ? tr::lng_context_copy_link(tr::now) : tr::lng_context_copy_post_link(tr::now), [=] {
+			_menu->addAction(item->history()->peer->isMegagroup() ? tr::lng_context_copy_message_link(tr::now) : tr::lng_context_copy_post_link(tr::now), [=] {
 				HistoryView::CopyPostLink(session, itemId, HistoryView::Context::History);
 			});
 		}
@@ -1788,7 +1788,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					QGuiApplication::clipboard()->setText(text);
 				});
 		} else if (item && item->hasDirectLink() && isUponSelected != 2 && isUponSelected != -2) {
-			_menu->addAction(item->history()->peer->isMegagroup() ? tr::lng_context_copy_link(tr::now) : tr::lng_context_copy_post_link(tr::now), [=] {
+			_menu->addAction(item->history()->peer->isMegagroup() ? tr::lng_context_copy_message_link(tr::now) : tr::lng_context_copy_post_link(tr::now), [=] {
 				HistoryView::CopyPostLink(session, itemId, HistoryView::Context::History);
 			});
 		}
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 961efe7d9..4eb646699 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -287,7 +287,7 @@ void AddPostLinkAction(
 		: Context::History;
 	menu->addAction(
 		(item->history()->peer->isMegagroup()
-			? tr::lng_context_copy_link
+			? tr::lng_context_copy_message_link
 			: tr::lng_context_copy_post_link)(tr::now),
 		[=] { CopyPostLink(session, itemId, context); });
 }

From c80da25450537f37366e09ee5f3bcbe6099e4dc8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Dec 2020 19:38:02 +0400
Subject: [PATCH 362/370] Show better tooltip for force muted in voice chat.

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

diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp
index deade4dfb..e5ab99765 100644
--- a/Telegram/SourceFiles/calls/calls_top_bar.cpp
+++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp
@@ -267,7 +267,7 @@ void TopBar::initControls() {
 			call->setMuted(!call->muted());
 		} else if (const auto group = _groupCall.get()) {
 			if (group->muted() == MuteState::ForceMuted) {
-				Ui::Toast::Show(tr::lng_group_call_force_muted(tr::now));
+				Ui::Toast::Show(tr::lng_group_call_force_muted_sub(tr::now));
 			} else {
 				group->setMuted((group->muted() == MuteState::Muted)
 					? MuteState::Active

From ae6decf70b868cf9635d61d3875ff18827486c13 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Dec 2020 20:09:32 +0400
Subject: [PATCH 363/370] Support ctrl+m/ctrl+w in voice chat panel.

---
 .../SourceFiles/calls/calls_group_panel.cpp   |  9 +++++++++
 .../SourceFiles/calls/calls_group_panel.h     |  2 ++
 Telegram/SourceFiles/calls/calls_instance.cpp | 19 +++++++++++++++++++
 Telegram/SourceFiles/calls/calls_instance.h   |  2 ++
 Telegram/SourceFiles/calls/calls_panel.cpp    |  4 ++++
 Telegram/SourceFiles/calls/calls_panel.h      |  1 +
 Telegram/SourceFiles/core/application.cpp     | 19 +++++++++++++------
 7 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 0665318b1..a6e260bb2 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -316,6 +316,7 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
 , _hangup(widget(), st::groupCallHangup) {
 	_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
 	_settings->setColorOverrides(_mute->colorOverrides());
+	_layerBg->setHideByBackgroundClick(true);
 
 	SubscribeToMigration(
 		_peer,
@@ -337,6 +338,14 @@ bool GroupPanel::isActive() const {
 		&& !(_window->windowState() & Qt::WindowMinimized);
 }
 
+void GroupPanel::minimize() {
+	_window->setWindowState(_window->windowState() | Qt::WindowMinimized);
+}
+
+void GroupPanel::close() {
+	_window->close();
+}
+
 void GroupPanel::showAndActivate() {
 	if (_window->isHidden()) {
 		_window->show();
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h
index c37778524..32cd06caa 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/calls_group_panel.h
@@ -68,6 +68,8 @@ public:
 	~GroupPanel();
 
 	[[nodiscard]] bool isActive() const;
+	void minimize();
+	void close();
 	void showAndActivate();
 	void closeBeforeDestroy();
 
diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index 7ce5ede23..79ad8a91b 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -486,6 +486,25 @@ bool Instance::activateCurrentCall() {
 	return false;
 }
 
+bool Instance::minimizeCurrentActiveCall() {
+	if (inCall() && _currentCallPanel->isActive()) {
+		_currentCallPanel->minimize();
+		return true;
+	} else if (inGroupCall() && _currentGroupCallPanel->isActive()) {
+		_currentGroupCallPanel->minimize();
+		return true;
+	}
+	return false;
+}
+
+bool Instance::closeCurrentActiveCall() {
+	if (inGroupCall() && _currentGroupCallPanel->isActive()) {
+		_currentGroupCallPanel->close();
+		return true;
+	}
+	return false;
+}
+
 Call *Instance::currentCall() const {
 	return _currentCall.get();
 }
diff --git a/Telegram/SourceFiles/calls/calls_instance.h b/Telegram/SourceFiles/calls/calls_instance.h
index 73844d24f..3aa192feb 100644
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -55,6 +55,8 @@ public:
 	[[nodiscard]] bool hasActivePanel(
 		not_null<Main::Session*> session) const;
 	bool activateCurrentCall();
+	bool minimizeCurrentActiveCall();
+	bool closeCurrentActiveCall();
 	auto getVideoCapture()
 		-> std::shared_ptr<tgcalls::VideoCaptureInterface> override;
 	void requestPermissionsOrFail(Fn<void()> onSuccess, bool video = true);
diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp
index cca21afcb..add124453 100644
--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -221,6 +221,10 @@ void Panel::showAndActivate() {
 	_window->setFocus();
 }
 
+void Panel::minimize() {
+	_window->setWindowState(_window->windowState() | Qt::WindowMinimized);
+}
+
 void Panel::replaceCall(not_null<Call*> call) {
 	reinitWithCall(call);
 	updateControlsGeometry();
diff --git a/Telegram/SourceFiles/calls/calls_panel.h b/Telegram/SourceFiles/calls/calls_panel.h
index 8b6580503..ec8d7e4ea 100644
--- a/Telegram/SourceFiles/calls/calls_panel.h
+++ b/Telegram/SourceFiles/calls/calls_panel.h
@@ -53,6 +53,7 @@ public:
 
 	[[nodiscard]] bool isActive() const;
 	void showAndActivate();
+	void minimize();
 	void replaceCall(not_null<Call*> call);
 	void closeBeforeDestroy();
 
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 6b527cc10..045146b0c 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -915,18 +915,25 @@ bool Application::closeActiveWindow() {
 	if (hideMediaView()) {
 		return true;
 	}
-	if (const auto window = activeWindow()) {
-		window->close();
-		return true;
+	if (!calls().closeCurrentActiveCall()) {
+		if (const auto window = activeWindow()) {
+			if (window->widget()->isVisible()
+				&& window->widget()->isActive()) {
+				window->close();
+				return true;
+			}
+		}
 	}
 	return false;
 }
 
 bool Application::minimizeActiveWindow() {
 	hideMediaView();
-	if (const auto window = activeWindow()) {
-		window->minimize();
-		return true;
+	if (!calls().minimizeCurrentActiveCall()) {
+		if (const auto window = activeWindow()) {
+			window->minimize();
+			return true;
+		}
 	}
 	return false;
 }

From 31417fd0052f6e6c9e4ad9e6eee69286195ed73e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Dec 2020 20:15:27 +0400
Subject: [PATCH 364/370] Fix highlighting of self row in voice chat.

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

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 997876596..acfb131f4 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1255,7 +1255,11 @@ void PeerListContent::contextMenuEvent(QContextMenuEvent *e) {
 				}));
 			_contextMenu->popup(e->globalPos());
 			e->accept();
+		} else {
+			setContexted(Selected());
 		}
+	} else {
+		setContexted(Selected());
 	}
 }
 

From d16bc36bae712091529645eb8efbeb60f05a4263 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Dec 2020 17:48:50 +0400
Subject: [PATCH 365/370] Update API scheme.

---
 Telegram/Resources/tl/api.tl                  |  4 +-
 Telegram/SourceFiles/api/api_sending.cpp      |  3 +-
 Telegram/SourceFiles/apiwrap.cpp              |  3 +-
 Telegram/SourceFiles/data/data_group_call.cpp | 60 +++++++------------
 Telegram/SourceFiles/data/data_group_call.h   |  2 -
 Telegram/lib_webrtc                           |  2 +-
 6 files changed, 28 insertions(+), 46 deletions(-)

diff --git a/Telegram/Resources/tl/api.tl b/Telegram/Resources/tl/api.tl
index 9dd424472..ce5735679 100644
--- a/Telegram/Resources/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -63,7 +63,7 @@ inputMediaPhoto#b3ba0635 flags:# id:InputPhoto ttl_seconds:flags.0?int = InputMe
 inputMediaGeoPoint#f9c44144 geo_point:InputGeoPoint = InputMedia;
 inputMediaContact#f8ab7dfb phone_number:string first_name:string last_name:string vcard:string = InputMedia;
 inputMediaUploadedDocument#5b38c6c1 flags:# nosound_video:flags.3?true force_file:flags.4?true file:InputFile thumb:flags.2?InputFile mime_type:string attributes:Vector<DocumentAttribute> stickers:flags.0?Vector<InputDocument> ttl_seconds:flags.1?int = InputMedia;
-inputMediaDocument#23ab23d2 flags:# id:InputDocument ttl_seconds:flags.0?int = InputMedia;
+inputMediaDocument#33473058 flags:# id:InputDocument ttl_seconds:flags.0?int query:flags.1?string = InputMedia;
 inputMediaVenue#c13d1c11 geo_point:InputGeoPoint title:string address:string provider:string venue_id:string venue_type:string = InputMedia;
 inputMediaPhotoExternal#e5bbfe1a flags:# url:string ttl_seconds:flags.0?int = InputMedia;
 inputMediaDocumentExternal#fb52dc99 flags:# url:string ttl_seconds:flags.0?int = InputMedia;
@@ -1195,7 +1195,7 @@ groupCall#55903081 flags:# join_muted:flags.1?true can_change_join_muted:flags.2
 
 inputGroupCall#d8aa840f id:long access_hash:long = InputGroupCall;
 
-groupCallParticipant#56b087c9 flags:# muted:flags.0?true left:flags.1?true can_self_unmute:flags.2?true just_joined:flags.4?true user_id:int date:int active_date:flags.3?int source:int = GroupCallParticipant;
+groupCallParticipant#56b087c9 flags:# muted:flags.0?true left:flags.1?true can_self_unmute:flags.2?true just_joined:flags.4?true versioned:flags.5?true user_id:int date:int active_date:flags.3?int source:int = GroupCallParticipant;
 
 phone.groupCall#66ab0bfc call:GroupCall participants:Vector<GroupCallParticipant> participants_next_offset:string users:Vector<User> = phone.GroupCall;
 
diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
index e2e370145..967048a39 100644
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -182,7 +182,8 @@ void SendExistingDocument(
 		return MTP_inputMediaDocument(
 			MTP_flags(0),
 			document->mtpInput(),
-			MTPint());
+			MTPint(), // ttl_seconds
+			MTPstring()); // query
 	};
 	SendExistingMedia(
 		std::move(message),
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index fa6e25ac9..f116c33cf 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -4645,7 +4645,8 @@ void ApiWrap::uploadAlbumMedia(
 					fields.vid(),
 					fields.vaccess_hash(),
 					fields.vfile_reference()),
-				MTP_int(data.vttl_seconds().value_or_empty()));
+				MTP_int(data.vttl_seconds().value_or_empty()),
+				MTPstring()); // query
 			sendAlbumWithUploaded(item, groupId, media);
 		} break;
 		}
diff --git a/Telegram/SourceFiles/data/data_group_call.cpp b/Telegram/SourceFiles/data/data_group_call.cpp
index f74c8007b..22a1a5961 100644
--- a/Telegram/SourceFiles/data/data_group_call.cpp
+++ b/Telegram/SourceFiles/data/data_group_call.cpp
@@ -312,36 +312,6 @@ void GroupCall::applyParticipantsSlice(
 	}
 }
 
-void GroupCall::applyParticipantsMutes(
-		const MTPDupdateGroupCallParticipants &update) {
-	for (const auto &participant : update.vparticipants().v) {
-		participant.match([&](const MTPDgroupCallParticipant &data) {
-			if (data.is_left()) {
-				return;
-			}
-			const auto userId = data.vuser_id().v;
-			const auto user = _peer->owner().user(userId);
-			const auto i = ranges::find(
-				_participants,
-				user,
-				&Participant::user);
-			if (i != end(_participants)) {
-				const auto was = *i;
-				i->muted = data.is_muted();
-				i->canSelfUnmute = !i->muted || data.is_can_self_unmute();
-				if (!i->canSelfUnmute) {
-					i->speaking = false;
-					_speakingByActiveFinishes.remove(i->user);
-				}
-				_participantUpdates.fire({
-					.was = was,
-					.now = *i,
-				});
-			}
-		});
-	}
-}
-
 void GroupCall::applyLastSpoke(
 		uint32 ssrc,
 		LastSpokeTimes when,
@@ -563,17 +533,29 @@ bool GroupCall::inCall() const {
 
 void GroupCall::applyUpdate(const MTPDupdateGroupCallParticipants &update) {
 	const auto version = update.vversion().v;
-	if (version < _version) {
-		return;
-	} else if (version == _version) {
-		applyParticipantsMutes(update);
-		return;
-	} else if (version != _version + 1) {
-		applyParticipantsMutes(update);
-		reload();
+	const auto applyUpdate = [&] {
+		if (version < _version) {
+			return false;
+		}
+		auto versionShouldIncrement = false;
+		for (const auto &participant : update.vparticipants().v) {
+			const auto versioned = participant.match([&](
+					const MTPDgroupCallParticipant &data) {
+				return data.is_versioned();
+			});
+			if (versioned) {
+				versionShouldIncrement = true;
+				break;
+			}
+		}
+		return versionShouldIncrement
+			? (version == _version + 1)
+			: (version == _version);
+	}();
+	if (!applyUpdate) {
 		return;
 	}
-	_version = update.vversion().v;
+	_version = version;
 	applyUpdateChecked(update);
 }
 
diff --git a/Telegram/SourceFiles/data/data_group_call.h b/Telegram/SourceFiles/data/data_group_call.h
index 3b778f8ec..2aad686a3 100644
--- a/Telegram/SourceFiles/data/data_group_call.h
+++ b/Telegram/SourceFiles/data/data_group_call.h
@@ -91,8 +91,6 @@ private:
 	void applyParticipantsSlice(
 		const QVector<MTPGroupCallParticipant> &list,
 		ApplySliceSource sliceSource);
-	void applyParticipantsMutes(
-		const MTPDupdateGroupCallParticipants &update);
 	void requestUnknownParticipants();
 	void changePeerEmptyCallFlag();
 	void checkFinishSpeakingByActive();
diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
index beb63dd9a..4bc51d6f6 160000
--- a/Telegram/lib_webrtc
+++ b/Telegram/lib_webrtc
@@ -1 +1 @@
-Subproject commit beb63dd9a68662cf96c4b3b165bad3907323ea89
+Subproject commit 4bc51d6f6d5740159fdb51cb1593e80ce149ed4e

From 670d6184399c2b51f55c130eb22385e32f9e66aa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Dec 2020 23:38:38 +0400
Subject: [PATCH 366/370] Workaround tg_owt/openal conflict in a patched OpenAL
 on macOS.

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

diff --git a/docs/building-xcode.md b/docs/building-xcode.md
index c4706456f..91c878b6a 100644
--- a/docs/building-xcode.md
+++ b/docs/building-xcode.md
@@ -240,10 +240,8 @@ Go to ***BuildPath*** and run
     sudo make install
     cd ..
 
-    git clone https://github.com/kcat/openal-soft.git
-    cd openal-soft
-    git checkout 3970252da9
-    cd build
+    git clone --branch capture_with_webrtc https://github.com/telegramdesktop/openal-soft.git
+    cd openal-soft/build
     CFLAGS=$UNGUARDED CPPFLAGS=$UNGUARDED cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr/local/macos -D ALSOFT_EXAMPLES=OFF -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.12 ..
     make $MAKE_THREADS_CNT
     sudo make install

From b7216c40fc5a624c88a7aa2e0f652d8b7be2a479 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 23 Dec 2020 11:59:50 +0400
Subject: [PATCH 367/370] Version 2.5.

- Turn any of your group chats into a hop-on, hop-off conference call.
- Get up to several thousand participants in each voice chat.
- Control the number of speakers with flexible admin tools.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 ++++----
 Telegram/Resources/winrc/Updater.rc          |  8 ++++----
 Telegram/SourceFiles/core/version.h          |  6 +++---
 Telegram/build/version                       | 12 ++++++------
 changelog.txt                                |  6 ++++++
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 9a0727161..d40bb5050 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.15.0" />
+    Version="2.5.0.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 782a8236b..ff5509c5a 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,15,0
- PRODUCTVERSION 2,4,15,0
+ FILEVERSION 2,5,0,0
+ PRODUCTVERSION 2,5,0,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.15.0"
+            VALUE "FileVersion", "2.5.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.15.0"
+            VALUE "ProductVersion", "2.5.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 5e2407756..39b551b2b 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,15,0
- PRODUCTVERSION 2,4,15,0
+ FILEVERSION 2,5,0,0
+ PRODUCTVERSION 2,5,0,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.15.0"
+            VALUE "FileVersion", "2.5.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.4.15.0"
+            VALUE "ProductVersion", "2.5.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 4a947cfc2..dc19f0a77 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 = 2004015;
-constexpr auto AppVersionStr = "2.4.15";
-constexpr auto AppBetaVersion = true;
+constexpr auto AppVersion = 2005000;
+constexpr auto AppVersionStr = "2.5";
+constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index d3e816d82..a99118770 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2004015
-AppVersionStrMajor 2.4
-AppVersionStrSmall 2.4.15
-AppVersionStr      2.4.15
-BetaChannel        1
+AppVersion         2005000
+AppVersionStrMajor 2.5
+AppVersionStrSmall 2.5
+AppVersionStr      2.5.0
+BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 2.4.15.beta
+AppVersionOriginal 2.5
diff --git a/changelog.txt b/changelog.txt
index cce23c41f..634f77c23 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+2.5 (23.12.20)
+
+- Turn any of your group chats into a hop-on, hop-off conference call.
+- Get up to several thousand participants in each voice chat.
+- Control the number of speakers with flexible admin tools.
+
 2.4.15 beta (19.12.20)
 
 - Improve design of voice chats.

From dfee8238c6aad1f8dedd80eeb4e0a3a652a5f97e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 23 Dec 2020 14:45:37 +0400
Subject: [PATCH 368/370] Fix crash in legacy groups speaking typings handling.

---
 Telegram/SourceFiles/api/api_updates.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index 2449c4fe3..188e06a22 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -928,6 +928,9 @@ void Updates::handleSendActionUpdate(
 	const auto isSpeakingInCall = (action.type()
 		== mtpc_speakingInGroupCallAction);
 	if (isSpeakingInCall) {
+		if (!peer->isChat() && !peer->isChannel()) {
+			return;
+		}
 		const auto call = peer->groupCall();
 		const auto now = crl::now();
 		if (call) {
@@ -943,8 +946,8 @@ void Updates::handleSendActionUpdate(
 				: (channel->flags() & MTPDchannel::Flag::f_call_active);
 			if (active) {
 				_pendingSpeakingCallMembers.emplace(
-					channel).first->second[userId] = now;
-				session().api().requestFullPeer(channel);
+					peer).first->second[userId] = now;
+				session().api().requestFullPeer(peer);
 			}
 		}
 	}

From b1b25b0df9d285400cee786fb22639e2ff7fc4d5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 23 Dec 2020 15:01:31 +0400
Subject: [PATCH 369/370] Version 2.5.1.

- Fix crash in voice calls.
---
 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                                | 4 ++++
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index d40bb5050..93884509d 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.5.0.0" />
+    Version="2.5.1.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 ff5509c5a..599fa1a7e 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,5,0,0
- PRODUCTVERSION 2,5,0,0
+ FILEVERSION 2,5,1,0
+ PRODUCTVERSION 2,5,1,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.5.0.0"
+            VALUE "FileVersion", "2.5.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.5.0.0"
+            VALUE "ProductVersion", "2.5.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 39b551b2b..d91d26525 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,5,0,0
- PRODUCTVERSION 2,5,0,0
+ FILEVERSION 2,5,1,0
+ PRODUCTVERSION 2,5,1,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.5.0.0"
+            VALUE "FileVersion", "2.5.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2020"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.5.0.0"
+            VALUE "ProductVersion", "2.5.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index dc19f0a77..6876564ac 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 = 2005000;
-constexpr auto AppVersionStr = "2.5";
+constexpr auto AppVersion = 2005001;
+constexpr auto AppVersionStr = "2.5.1";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index a99118770..565c3be2f 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         2005000
+AppVersion         2005001
 AppVersionStrMajor 2.5
-AppVersionStrSmall 2.5
-AppVersionStr      2.5.0
+AppVersionStrSmall 2.5.1
+AppVersionStr      2.5.1
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 2.5
+AppVersionOriginal 2.5.1
diff --git a/changelog.txt b/changelog.txt
index 634f77c23..27e6ccda7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+2.5.1 (23.12.20)
+
+- Fix crash in voice calls.
+
 2.5 (23.12.20)
 
 - Turn any of your group chats into a hop-on, hop-off conference call.

From feff514a07a2808f7a1a4f301467721dd17ad57d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 23 Dec 2020 19:52:55 +0400
Subject: [PATCH 370/370] Update openal in snap to 1.21.0

And remove unneeded dependencies
---
 snap/snapcraft.yaml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index a005dbbb6..ce3f6348f 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -223,18 +223,14 @@ parts:
   openal:
     source: https://github.com/kcat/openal-soft.git
     source-depth: 1
-    source-tag: openal-soft-1.20.1
+    source-tag: openal-soft-1.21.0
     plugin: cmake
     build-packages:
       - libasound2-dev
       - libpulse-dev
-      - libsndio-dev
-      - portaudio19-dev
     stage-packages:
       - libasound2
       - libpulse0
-      - libportaudio2
-      - libsndio7.0
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr